X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fpostscript.c;h=11116b9b6d7a0d3b49db98dda6c7eb455043e5ca;hb=38d5e09c01ddffc98430c3c55ed3ccb821180cbf;hp=919d1bb7debd31de3f6f5338fbbedc9db2c638c0;hpb=7a2039fb1ebfd48013ab259b28091e74e7f50588;p=pspp-builds.git diff --git a/src/output/postscript.c b/src/output/postscript.c index 919d1bb7..11116b9b 100644 --- a/src/output/postscript.c +++ b/src/output/postscript.c @@ -1,32 +1,30 @@ -/* PSPP - computes sample statistics. - Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. - Written by Ben Pfaff . +/* PSPP - a program for statistical analysis. + Copyright (C) 1997-9, 2000, 2006, 2007 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 the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ + along with this program. If not, see . */ #include #include #include #include +#include #include #include #include -#include +#include #include #include #include @@ -40,13 +38,12 @@ #include "afm.h" #include "chart.h" #include "error.h" -#include "getline.h" -#include "intprops.h" #include "manager.h" -#include "minmax.h" #include "output.h" -#include "size_max.h" -#include "strsep.h" + +#include "intprops.h" +#include "minmax.h" +#include "xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -108,8 +105,7 @@ struct ps_driver_ext struct font *fonts[OUTP_FONT_CNT]; int last_font; /* Index of last font set with setfont. */ - } -ps_driver_ext; + }; /* Transform logical y-ordinate Y into a page ordinate. */ #define YT(Y) (this->length - (Y)) @@ -129,7 +125,7 @@ static void setup_font (struct outp_driver *this, struct font *, int index); /* Driver initialization. */ static bool -ps_open_driver (struct outp_driver *this, const struct string *options) +ps_open_driver (struct outp_driver *this, struct substring options) { struct ps_driver_ext *x; size_t i; @@ -143,8 +139,7 @@ ps_open_driver (struct outp_driver *this, const struct string *options) x->draw_headers = true; x->page_number = 0; x->portrait = true; - x->paper_width = PSUS * 17 / 2; - x->paper_length = PSUS * 11; + outp_get_paper_size ("", &x->paper_width, &x->paper_length); x->left_margin = PSUS / 2; x->right_margin = PSUS / 2; x->top_margin = PSUS / 2; @@ -165,7 +160,7 @@ ps_open_driver (struct outp_driver *this, const struct string *options) goto error; } - if (x->portrait) + if (x->portrait) { this->width = x->paper_width; this->length = x->paper_length; @@ -174,7 +169,7 @@ ps_open_driver (struct outp_driver *this, const struct string *options) { this->width = x->paper_length; this->length = x->paper_width; - } + } this->width -= x->left_margin + x->right_margin; this->length -= x->top_margin + x->bottom_margin; if (x->draw_headers) @@ -235,18 +230,23 @@ static bool ps_close_driver (struct outp_driver *this) { struct ps_driver_ext *x = this->ext; - bool ok; + bool ok = true; size_t i; - fprintf (x->file, - "%%%%Trailer\n" - "%%%%Pages: %d\n" - "%%%%EOF\n", - x->page_number); - - ok = fn_close (x->file_name, x->file) == 0; - if (!ok) - error (0, errno, _("closing PostScript output file \"%s\""), x->file_name); + if (x->file != NULL) + { + fprintf (x->file, + "%%%%Trailer\n" + "%%%%Pages: %d\n" + "%%%%EOF\n", + x->page_number); + + ok = fn_close (x->file_name, x->file) == 0; + if (!ok) + error (0, errno, _("closing PostScript output file \"%s\""), + x->file_name); + } + free (x->file_name); for (i = 0; i < OUTP_FONT_CNT; i++) free_font (x->fonts[i]); @@ -270,7 +270,7 @@ enum }; /* All the options that the PostScript driver supports. */ -static struct outp_option option_tab[] = +static const struct outp_option option_tab[] = { {"output-file", output_file_arg,0}, {"paper-size", paper_size_arg, 0}, @@ -300,7 +300,7 @@ handle_option (struct outp_driver *this, const char *key, { struct ps_driver_ext *x = this->ext; int subcat; - char *value = ds_c_str (val); + char *value = ds_cstr (val); switch (outp_match_keyword (key, option_tab, &subcat)) { @@ -374,20 +374,16 @@ handle_option (struct outp_driver *this, const char *key, this->font_height = arg; break; default: - abort (); + NOT_REACHED (); } } break; case dimension_arg: { - int dimension = outp_evaluate_dimension (value, NULL); + int dimension = outp_evaluate_dimension (value); if (dimension <= 0) - { - error (0, 0, _("value for `%s' must be a dimension of positive " - "length (i.e., `1in')"), key); - break; - } + break; switch (subcat) { case 0: @@ -400,7 +396,7 @@ handle_option (struct outp_driver *this, const char *key, x->line_width = dimension; break; default: - abort (); + NOT_REACHED (); } } break; @@ -417,7 +413,7 @@ handle_option (struct outp_driver *this, const char *key, } break; default: - abort (); + NOT_REACHED (); } return true; @@ -434,7 +430,7 @@ find_ps_file (const char *name) else { char *base_name = xasprintf ("psfonts/%s", name); - char *file_name = fn_search_path (base_name, config_path, NULL); + char *file_name = fn_search_path (base_name, config_path); free (base_name); return file_name; } @@ -542,15 +538,15 @@ quote_ps_name (const char *string) if (!isalpha (c) && strchr ("^_|!$&:;.,-+", c) == NULL && (cp == string || !isdigit (c))) { - struct string out = DS_INITIALIZER; - ds_putc (&out, '<'); + struct string out = DS_EMPTY_INITIALIZER; + ds_put_char (&out, '<'); for (cp = string; *cp != '\0'; cp++) { c = *cp; - ds_printf (&out, "%02x", c); + ds_put_format (&out, "%02x", c); } - ds_puts (&out, ">cvn"); - return ds_c_str (&out); + ds_put_cstr (&out, ">cvn"); + return ds_cstr (&out); } } return xasprintf ("/%s", string); @@ -608,8 +604,7 @@ ps_submit (struct outp_driver *this UNUSED, struct som_entity *s) case SOM_CHART: break; default: - abort (); - break; + NOT_REACHED (); } } @@ -784,7 +779,7 @@ draw_text (struct outp_driver *this, text.font = OUTP_PROPORTIONAL; text.justification = justification; - ls_init (&text.string, (char *) string, strlen (string)); + text.string = ss_cstr (string); text.h = max_width; text.v = this->font_height; text.x = x; @@ -799,7 +794,7 @@ draw_text (struct outp_driver *this, static void draw_header_line (struct outp_driver *this, const char *left, const char *right, - int x0, int x1, int y) + int x0, int x1, int y) { int right_width = 0; if (right != NULL) @@ -830,12 +825,12 @@ draw_headers (struct outp_driver *this) r1 = xasprintf (_("%s - Page %d"), get_start_date (), ext->page_number); r2 = xasprintf ("%s - %s", version, host_system); - + draw_header_line (this, outp_title, r1, x0, x1, y); y += this->font_height; - + draw_header_line (this, outp_subtitle, r2, x0, x1, y); - + free (r1); free (r2); } @@ -850,7 +845,7 @@ draw_headers (struct outp_driver *this) static void write_text (struct outp_driver *this, int x0, int y0, - enum outp_font font, + enum outp_font font, enum outp_justification justification, const struct afm_character **chars, int *kerns, size_t char_cnt, int width_left) @@ -874,7 +869,7 @@ write_text (struct outp_driver *this, fprintf (ext->file, "F%d setfont\n", font); } - ds_init (&out); + ds_init_empty (&out); for (i = 0; i < char_cnt; i = j) { for (j = i + 1; j < char_cnt; j++) @@ -888,7 +883,7 @@ write_text (struct outp_driver *this, size_t encoded = afm_encode_string (afm, chars + i, j - i, &out); if (encoded > 0) { - fprintf (ext->file, "%sS\n", ds_c_str (&out)); + fprintf (ext->file, "%sS\n", ds_cstr (&out)); ds_clear (&out); i += encoded; } @@ -990,8 +985,8 @@ text (struct outp_driver *this, const struct outp_text *text, bool draw, s.max_width = 0; - cp = ls_c_str (&s.text->string); - while (s.height_left >= this->font_height && cp < ls_end (&s.text->string)) + cp = ss_data (s.text->string); + while (s.height_left >= this->font_height && cp < ss_end (s.text->string)) { const struct afm_character *cur; int char_width; @@ -1006,7 +1001,7 @@ text (struct outp_driver *this, const struct outp_text *text, bool draw, /* Get character and resolve ligatures. */ cur = afm_get_character (afm, *cp); - while (++cp < ls_end (&s.text->string)) + while (++cp < ss_end (s.text->string)) { const struct afm_character *next = afm_get_character (afm, *cp); const struct afm_character *ligature = afm_get_ligature (cur, next); @@ -1017,14 +1012,14 @@ text (struct outp_driver *this, const struct outp_text *text, bool draw, char_width = cur->width * this->font_height / 1000; /* Get kern adjustment. */ - if (s.glyph_cnt > 0) + if (s.glyph_cnt > 0) kern_adjust = (afm_get_kern_adjustment (s.glyphs[s.glyph_cnt - 1], cur) * this->font_height / 1000); else kern_adjust = 0; /* Record the current status if this is a space character. */ - if (cur->code == ' ' && cp > ls_c_str (&s.text->string)) + if (cur->code == ' ' && cp > ss_data (s.text->string)) { s.space_char = cp; s.space_glyph_cnt = s.glyph_cnt; @@ -1382,8 +1377,8 @@ reencode_font (struct outp_driver *this, struct font *font) line_number = 0; - ds_init (&line); - while (ds_get_config_line (file, &line, &line_number)) + ds_init_empty (&line); + while (ds_read_config_line (&line, &line_number, file)) { char *pschar, *code; char *save_ptr, *tail; @@ -1392,7 +1387,7 @@ reencode_font (struct outp_driver *this, struct font *font) if (ds_is_empty (&line) == 0) continue; - pschar = strtok_r (ds_c_str (&line), " \t\r\n", &save_ptr); + pschar = strtok_r (ds_cstr (&line), " \t\r\n", &save_ptr); code = strtok_r (NULL, " \t\r\n", &save_ptr); if (pschar == NULL || code == NULL) continue; @@ -1423,11 +1418,12 @@ reencode_font (struct outp_driver *this, struct font *font) fputs ("] RF\n", x->file); if (freaderror (file) != 0) - error (errno, 0, "closing Postscript encoding \"%s\"", font->encoding_fn); + error (errno, 0, _("closing Postscript encoding \"%s\""), + font->encoding_fn); } /* PostScript driver class. */ -struct outp_class postscript_class = +const struct outp_class postscript_class = { "postscript", 0, @@ -1437,6 +1433,7 @@ struct outp_class postscript_class = ps_open_page, ps_close_page, + NULL, ps_submit,