projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove redundant test in lex_is_idn().
[pspp]
/
src
/
output
/
postscript.c
diff --git
a/src/output/postscript.c
b/src/output/postscript.c
index 27d0404f8166fb8996677882a9743e6b7e0d86de..11116b9b6d7a0d3b49db98dda6c7eb455043e5ca 100644
(file)
--- a/
src/output/postscript.c
+++ b/
src/output/postscript.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
+ 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
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,11
+19,11
@@
#include <ctype.h>
#include <errno.h>
#include <limits.h>
#include <ctype.h>
#include <errno.h>
#include <limits.h>
+#include <stdint.h>
#include <stdlib.h>
#include <time.h>
#include <unistd.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>
#include <libpspp/assertion.h>
#include <libpspp/bit-vector.h>
#include <libpspp/compiler.h>
@@
-38,11
+38,12
@@
#include "afm.h"
#include "chart.h"
#include "error.h"
#include "afm.h"
#include "chart.h"
#include "error.h"
-#include "intprops.h"
#include "manager.h"
#include "manager.h"
-#include "minmax.h"
#include "output.h"
#include "output.h"
-#include "size_max.h"
+
+#include "intprops.h"
+#include "minmax.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-138,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->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;
x->left_margin = PSUS / 2;
x->right_margin = PSUS / 2;
x->top_margin = PSUS / 2;
@@
-380,14
+380,10
@@
handle_option (struct outp_driver *this, const char *key,
break;
case dimension_arg:
{
break;
case dimension_arg:
{
- int dimension = outp_evaluate_dimension (value
, NULL
);
+ int dimension = outp_evaluate_dimension (value);
if (dimension <= 0)
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:
switch (subcat)
{
case 0: