Make interactive output go to the terminal (bug #17213), by

[pspp-builds.git] / src / output / postscript.c

diff --git a/src/output/postscript.c b/src/output/postscript.c
index d65162dad4c3e1bd8fd0cb2b687b4fef0276f283..f49970c5b0875014b5b638b3dd28635e8ac860be 100644 (file)
--- a/src/output/postscript.c
+++ b/src/output/postscript.c
@@ -1,21 +1,18 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
 
-   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 <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 
@@ -27,6 +24,7 @@
 #include <unistd.h>
 
 #include <libpspp/alloc.h>
+#include <libpspp/assertion.h>
 #include <libpspp/bit-vector.h>
 #include <libpspp/compiler.h>
 #include <libpspp/freaderror.h>
@@ -46,7 +44,6 @@
 #include "minmax.h"
 #include "output.h"
 #include "size_max.h"
-#include "strsep.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))
@@ -165,7 +161,7 @@ ps_open_driver (struct outp_driver *this, struct substring options)
       goto error;
     }
 
-  if (x->portrait) 
+  if (x->portrait)
     {
       this->width = x->paper_width;
       this->length = x->paper_length;
@@ -174,7 +170,7 @@ ps_open_driver (struct outp_driver *this, struct substring 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)
@@ -270,7 +266,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},
@@ -374,7 +370,7 @@ handle_option (struct outp_driver *this, const char *key,
            this->font_height = arg;
            break;
          default:
-           abort ();
+           NOT_REACHED ();
          }
       }
       break;
@@ -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;
     }
@@ -608,8 +604,7 @@ ps_submit (struct outp_driver *this UNUSED, struct som_entity *s)
     case SOM_CHART:
       break;
     default:
-      abort ();
-      break;
+      NOT_REACHED ();
     }
 }
 \f
@@ -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)
@@ -1017,7 +1012,7 @@ 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
@@ -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,