X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fpostscript.c;h=11116b9b6d7a0d3b49db98dda6c7eb455043e5ca;hb=1dde249bcf2bbdb0ecc5bc972a62c45f2a1623df;hp=419042c1a118f0531eb3586e8cdc696438fedd37;hpb=f5c108becd49d78f4898cab11352291f5689d24e;p=pspp-builds.git

diff --git a/src/output/postscript.c b/src/output/postscript.c
index 419042c1..11116b9b 100644
--- a/src/output/postscript.c
+++ b/src/output/postscript.c
@@ -1,31 +1,29 @@
-/* PSPP - computes sample statistics.
-   Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
+/* 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 <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
 
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <libpspp/bit-vector.h>
 #include <libpspp/compiler.h>
@@ -40,12 +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 "intprops.h"
+#include "minmax.h"
+#include "xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -141,8 +139,7 @@ ps_open_driver (struct outp_driver *this, struct substring 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;
@@ -233,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]);
@@ -378,14 +380,10 @@ handle_option (struct outp_driver *this, const char *key,
       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:
@@ -1435,6 +1433,7 @@ const struct outp_class postscript_class =
 
   ps_open_page,
   ps_close_page,
+  NULL,
 
   ps_submit,