X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fpostscript.c;h=394ebbb27dc5fb3c7d0e251908905db97bd54ddc;hb=e30e79108bdfe24672d6d365881d61b87631579d;hp=d4f5b9f3fb4ac94b1a183b78d450d586950864e9;hpb=9f087e7aa4cdff1d5d46d5e188c0017a9d2d0029;p=pspp-builds.git diff --git a/src/output/postscript.c b/src/output/postscript.c index d4f5b9f3..394ebbb2 100644 --- a/src/output/postscript.c +++ b/src/output/postscript.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2007, 2009 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,10 +19,12 @@ #include #include #include +#include #include #include #include +#include #include #include #include @@ -31,18 +33,15 @@ #include #include #include +#include +#include +#include +#include +#include -#include - -#include "afm.h" -#include "chart.h" #include "error.h" -#include "manager.h" -#include "output.h" - #include "intprops.h" #include "minmax.h" -#include "size_max.h" #include "xalloc.h" #include "gettext.h" @@ -105,12 +104,14 @@ struct ps_driver_ext struct font *fonts[OUTP_FONT_CNT]; int last_font; /* Index of last font set with setfont. */ + + int doc_num; /* %%DocumentNumber counter. */ }; /* Transform logical y-ordinate Y into a page ordinate. */ #define YT(Y) (this->length - (Y)) -static bool handle_option (struct outp_driver *this, const char *key, +static bool handle_option (void *this, const char *key, const struct string *val); static void draw_headers (struct outp_driver *this); @@ -125,11 +126,13 @@ static void setup_font (struct outp_driver *this, struct font *, int index); /* Driver initialization. */ static bool -ps_open_driver (struct outp_driver *this, struct substring options) +ps_open_driver (const char *name, int types, struct substring options) { + struct outp_driver *this; struct ps_driver_ext *x; size_t i; + this = outp_allocate_driver (&postscript_class, name, types); this->width = this->length = 0; this->font_height = PSUS * 10 / 72; @@ -149,8 +152,9 @@ ps_open_driver (struct outp_driver *this, struct substring options) x->line_width = PSUS / 144; for (i = 0; i < OUTP_FONT_CNT; i++) x->fonts[i] = NULL; + x->doc_num = 0; - outp_parse_options (options, handle_option, this); + outp_parse_options (this->name, options, handle_option, this); x->file = fn_open (x->file_name, "w"); if (x->file == NULL) @@ -219,10 +223,12 @@ ps_open_driver (struct outp_driver *this, struct substring options) write_ps_prologue (this); + outp_register_driver (this); return true; error: this->class->close_driver (this); + outp_free_driver (this); return false; } @@ -295,9 +301,10 @@ static const struct outp_option option_tab[] = }; static bool -handle_option (struct outp_driver *this, const char *key, +handle_option (void *this_, const char *key, const struct string *val) { + struct outp_driver *this = this_; struct ps_driver_ext *x = this->ext; int subcat; char *value = ds_cstr (val); @@ -601,8 +608,6 @@ ps_submit (struct outp_driver *this UNUSED, struct som_entity *s) { switch (s->type) { - case SOM_CHART: - break; default: NOT_REACHED (); } @@ -1082,72 +1087,6 @@ ps_text_draw (struct outp_driver *this, const struct outp_text *t) text (this, t, true, NULL, NULL); } -static void -ps_chart_initialise (struct outp_driver *this UNUSED, struct chart *ch) -{ -#ifdef NO_CHARTS - ch->lp = NULL; -#else - struct ps_driver_ext *x = this->ext; - char page_size[128]; - int size; - int x_origin, y_origin; - - ch->file = tmpfile (); - if (ch->file == NULL) - { - ch->lp = NULL; - return; - } - - size = this->width < this->length ? this->width : this->length; - x_origin = x->left_margin + (size - this->width) / 2; - y_origin = x->bottom_margin + (size - this->length) / 2; - - snprintf (page_size, sizeof page_size, - "a,xsize=%.3f,ysize=%.3f,xorigin=%.3f,yorigin=%.3f", - (double) size / PSUS, (double) size / PSUS, - (double) x_origin / PSUS, (double) y_origin / PSUS); - - ch->pl_params = pl_newplparams (); - pl_setplparam (ch->pl_params, "PAGESIZE", page_size); - ch->lp = pl_newpl_r ("ps", NULL, ch->file, stderr, ch->pl_params); -#endif -} - -static void -ps_chart_finalise (struct outp_driver *this UNUSED, struct chart *ch UNUSED) -{ -#ifndef NO_CHARTS - struct ps_driver_ext *x = this->ext; - char buf[BUFSIZ]; - static int doc_num = 0; - - outp_eject_page (this); - fprintf (x->file, - "/sp save def\n" - "%d %d translate 1000 dup scale\n" - "userdict begin\n" - "/showpage { } def\n" - "0 setgray 0 setlinecap 1 setlinewidth\n" - "0 setlinejoin 10 setmiterlimit [ ] 0 setdash newpath clear\n" - "%%%%BeginDocument: %d\n", - -x->left_margin, -x->bottom_margin, - doc_num++); - - rewind (ch->file); - while (fwrite (buf, 1, fread (buf, 1, sizeof buf, ch->file), x->file)) - continue; - fclose (ch->file); - - fputs ("%%EndDocument\n" - "end\n" - "sp restore\n", - x->file); - outp_close_page (this); -#endif -} - static void embed_font (struct outp_driver *this, struct font *font); static void reencode_font (struct outp_driver *this, struct font *font); @@ -1435,12 +1374,11 @@ const struct outp_class postscript_class = ps_close_page, NULL, + NULL, /* output_chart */ + ps_submit, ps_line, ps_text_metrics, ps_text_draw, - - ps_chart_initialise, - ps_chart_finalise };