-/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
+/* 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 <unistd.h>
#include <libpspp/alloc.h>
+#include <libpspp/assertion.h>
#include <libpspp/bit-vector.h>
#include <libpspp/compiler.h>
#include <libpspp/freaderror.h>
#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 "gettext.h"
#define _(msgid) gettext (msgid)
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))
/* 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;
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;
goto error;
}
- if (x->portrait)
+ if (x->portrait)
{
this->width = x->paper_width;
this->length = x->paper_length;
{
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)
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]);
};
/* 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},
{
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))
{
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:
x->line_width = dimension;
break;
default:
- abort ();
+ NOT_REACHED ();
}
}
break;
}
break;
default:
- abort ();
+ NOT_REACHED ();
}
return true;
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;
}
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);
case SOM_CHART:
break;
default:
- abort ();
- break;
+ NOT_REACHED ();
}
}
\f
enum outp_line_style top, enum outp_line_style left,
enum outp_line_style bottom, enum outp_line_style right)
{
-/* The algorithm here is somewhat subtle, to allow it to handle
- all the kinds of intersections that we need.
-
- Three additional ordinates are assigned along the x axis. The
- first is xc, midway between x0 and x3. The others are x1 and
- x2; for a single vertical line these are equal to xc, and for
- a double vertical line they are the ordinates of the left and
- right half of the double line.
-
- yc, y1, and y2 are assigned similarly along the y axis.
-
- The following diagram shows the coordinate system and output
- for double top and bottom lines, single left line, and no
- right line:
-
- x0 x1 xc x2 x3
- y0 ________________________
- | # # |
- | # # |
- | # # |
- | # # |
- | # # |
- y1 = y2 = yc |######### # |
- | # # |
- | # # |
- | # # |
- | # # |
- y3 |________#_____#_______|
-*/
+ /* The algorithm here is somewhat subtle, to allow it to handle
+ all the kinds of intersections that we need.
+
+ Three additional ordinates are assigned along the x axis. The
+ first is xc, midway between x0 and x3. The others are x1 and
+ x2; for a single vertical line these are equal to xc, and for
+ a double vertical line they are the ordinates of the left and
+ right half of the double line.
+
+ yc, y1, and y2 are assigned similarly along the y axis.
+
+ The following diagram shows the coordinate system and output
+ for double top and bottom lines, single left line, and no
+ right line:
+
+ x0 x1 xc x2 x3
+ y0 ________________________
+ | # # |
+ | # # |
+ | # # |
+ | # # |
+ | # # |
+ y1 = y2 = yc |######### # |
+ | # # |
+ | # # |
+ | # # |
+ | # # |
+ y3 |________#_____#_______|
+ */
struct ps_driver_ext *ext = this->ext;
/* Offset from center of each line in a pair of double lines. */
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;
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)
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);
}
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)
fprintf (ext->file, "F%d setfont\n", font);
}
- ds_init (&out, 0);
+ ds_init_empty (&out);
for (i = 0; i < char_cnt; i = j)
{
for (j = i + 1; j < char_cnt; j++)
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;
}
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;
/* 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);
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;
continue;
fclose (ch->file);
- fputs ("%%%%EndDocument\n"
+ fputs ("%%EndDocument\n"
"end\n"
"sp restore\n",
x->file);
line_number = 0;
- ds_init (&line, 0);
- 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;
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;
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,
ps_open_page,
ps_close_page,
+ NULL,
ps_submit,
projects / pspp-builds.git / blobdiff