projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
piechart: Fix spelling of "magnitude".
[pspp-builds.git]
/
src
/
output
/
postscript.c
diff --git
a/src/output/postscript.c
b/src/output/postscript.c
index 11116b9b6d7a0d3b49db98dda6c7eb455043e5ca..1fdc8d692ad482766e113e7a9d90105273724d4f 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, 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
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
@@
-110,7
+110,7
@@
struct ps_driver_ext
/* Transform logical y-ordinate Y into a page ordinate. */
#define YT(Y) (this->length - (Y))
/* 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);
const struct string *val);
static void draw_headers (struct outp_driver *this);
@@
-125,11
+125,13
@@
static void setup_font (struct outp_driver *this, struct font *, int index);
/* Driver initialization. */
static bool
/* Driver initialization. */
static bool
-ps_open_driver (
struct outp_driver *thi
s, struct substring options)
+ps_open_driver (
const char *name, int type
s, struct substring options)
{
{
+ struct outp_driver *this;
struct ps_driver_ext *x;
size_t i;
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;
this->width = this->length = 0;
this->font_height = PSUS * 10 / 72;
@@
-150,7
+152,7
@@
ps_open_driver (struct outp_driver *this, struct substring options)
for (i = 0; i < OUTP_FONT_CNT; i++)
x->fonts[i] = NULL;
for (i = 0; i < OUTP_FONT_CNT; i++)
x->fonts[i] = NULL;
- 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)
x->file = fn_open (x->file_name, "w");
if (x->file == NULL)
@@
-219,10
+221,12
@@
ps_open_driver (struct outp_driver *this, struct substring options)
write_ps_prologue (this);
write_ps_prologue (this);
+ outp_register_driver (this);
return true;
error:
this->class->close_driver (this);
return true;
error:
this->class->close_driver (this);
+ outp_free_driver (this);
return false;
}
return false;
}
@@
-295,9
+299,10
@@
static const struct outp_option option_tab[] =
};
static bool
};
static bool
-handle_option (
struct outp_driver *this
, const char *key,
+handle_option (
void *this_
, const char *key,
const struct string *val)
{
const struct string *val)
{
+ struct outp_driver *this = this_;
struct ps_driver_ext *x = this->ext;
int subcat;
char *value = ds_cstr (val);
struct ps_driver_ext *x = this->ext;
int subcat;
char *value = ds_cstr (val);