projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add missing _() around messages.
[pspp-builds.git]
/
src
/
output
/
postscript.c
diff --git
a/src/output/postscript.c
b/src/output/postscript.c
index 919d1bb7debd31de3f6f5338fbbedc9db2c638c0..f737baea2ff9183f1daffacb8e6c94212996a3c4 100644
(file)
--- a/
src/output/postscript.c
+++ b/
src/output/postscript.c
@@
-1,6
+1,5
@@
/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
/* PSPP - computes sample statistics.
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
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@
-27,6
+26,7
@@
#include <unistd.h>
#include <libpspp/alloc.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 <libpspp/bit-vector.h>
#include <libpspp/compiler.h>
#include <libpspp/freaderror.h>
@@
-46,7
+46,6
@@
#include "minmax.h"
#include "output.h"
#include "size_max.h"
#include "minmax.h"
#include "output.h"
#include "size_max.h"
-#include "strsep.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-108,8
+107,7
@@
struct ps_driver_ext
struct font *fonts[OUTP_FONT_CNT];
int last_font; /* Index of last font set with setfont. */
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))
/* Transform logical y-ordinate Y into a page ordinate. */
#define YT(Y) (this->length - (Y))
@@
-129,7
+127,7
@@
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 *this,
const struct string *
options)
+ps_open_driver (struct outp_driver *this,
struct substring
options)
{
struct ps_driver_ext *x;
size_t i;
{
struct ps_driver_ext *x;
size_t i;
@@
-270,7
+268,7
@@
enum
};
/* All the options that the PostScript driver supports. */
};
/* 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},
{
{"output-file", output_file_arg,0},
{"paper-size", paper_size_arg, 0},
@@
-300,7
+298,7
@@
handle_option (struct outp_driver *this, const char *key,
{
struct ps_driver_ext *x = this->ext;
int subcat;
{
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))
{
switch (outp_match_keyword (key, option_tab, &subcat))
{
@@
-374,7
+372,7
@@
handle_option (struct outp_driver *this, const char *key,
this->font_height = arg;
break;
default:
this->font_height = arg;
break;
default:
-
abort
();
+
NOT_REACHED
();
}
}
break;
}
}
break;
@@
-400,7
+398,7
@@
handle_option (struct outp_driver *this, const char *key,
x->line_width = dimension;
break;
default:
x->line_width = dimension;
break;
default:
-
abort
();
+
NOT_REACHED
();
}
}
break;
}
}
break;
@@
-417,7
+415,7
@@
handle_option (struct outp_driver *this, const char *key,
}
break;
default:
}
break;
default:
-
abort
();
+
NOT_REACHED
();
}
return true;
}
return true;
@@
-434,7
+432,7
@@
find_ps_file (const char *name)
else
{
char *base_name = xasprintf ("psfonts/%s", 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;
}
free (base_name);
return file_name;
}
@@
-542,15
+540,15
@@
quote_ps_name (const char *string)
if (!isalpha (c) && strchr ("^_|!$&:;.,-+", c) == NULL
&& (cp == string || !isdigit (c)))
{
if (!isalpha (c) && strchr ("^_|!$&:;.,-+", c) == NULL
&& (cp == string || !isdigit (c)))
{
- struct string out = DS_INITIALIZER;
- ds_put
c
(&out, '<');
+ struct string out = DS_
EMPTY_
INITIALIZER;
+ ds_put
_char
(&out, '<');
for (cp = string; *cp != '\0'; cp++)
{
c = *cp;
for (cp = string; *cp != '\0'; cp++)
{
c = *cp;
- ds_p
rintf
(&out, "%02x", c);
+ ds_p
ut_format
(&out, "%02x", c);
}
}
- ds_put
s
(&out, ">cvn");
- return ds_c
_
str (&out);
+ ds_put
_cstr
(&out, ">cvn");
+ return ds_cstr (&out);
}
}
return xasprintf ("/%s", string);
}
}
return xasprintf ("/%s", string);
@@
-608,8
+606,7
@@
ps_submit (struct outp_driver *this UNUSED, struct som_entity *s)
case SOM_CHART:
break;
default:
case SOM_CHART:
break;
default:
- abort ();
- break;
+ NOT_REACHED ();
}
}
\f
}
}
\f
@@
-784,7
+781,7
@@
draw_text (struct outp_driver *this,
text.font = OUTP_PROPORTIONAL;
text.justification = justification;
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;
text.h = max_width;
text.v = this->font_height;
text.x = x;
@@
-874,7
+871,7
@@
write_text (struct outp_driver *this,
fprintf (ext->file, "F%d setfont\n", font);
}
fprintf (ext->file, "F%d setfont\n", font);
}
- ds_init (&out);
+ ds_init
_empty
(&out);
for (i = 0; i < char_cnt; i = j)
{
for (j = i + 1; j < char_cnt; j++)
for (i = 0; i < char_cnt; i = j)
{
for (j = i + 1; j < char_cnt; j++)
@@
-888,7
+885,7
@@
write_text (struct outp_driver *this,
size_t encoded = afm_encode_string (afm, chars + i, j - i, &out);
if (encoded > 0)
{
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;
}
ds_clear (&out);
i += encoded;
}
@@
-990,8
+987,8
@@
text (struct outp_driver *this, const struct outp_text *text, bool draw,
s.max_width = 0;
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;
{
const struct afm_character *cur;
int char_width;
@@
-1006,7
+1003,7
@@
text (struct outp_driver *this, const struct outp_text *text, bool draw,
/* Get character and resolve ligatures. */
cur = afm_get_character (afm, *cp);
/* 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);
{
const struct afm_character *next = afm_get_character (afm, *cp);
const struct afm_character *ligature = afm_get_ligature (cur, next);
@@
-1024,7
+1021,7
@@
text (struct outp_driver *this, const struct outp_text *text, bool draw,
kern_adjust = 0;
/* Record the current status if this is a space character. */
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;
{
s.space_char = cp;
s.space_glyph_cnt = s.glyph_cnt;
@@
-1382,8
+1379,8
@@
reencode_font (struct outp_driver *this, struct font *font)
line_number = 0;
line_number = 0;
- ds_init (&line);
- 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;
{
char *pschar, *code;
char *save_ptr, *tail;
@@
-1392,7
+1389,7
@@
reencode_font (struct outp_driver *this, struct font *font)
if (ds_is_empty (&line) == 0)
continue;
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;
code = strtok_r (NULL, " \t\r\n", &save_ptr);
if (pschar == NULL || code == NULL)
continue;
@@
-1423,11
+1420,12
@@
reencode_font (struct outp_driver *this, struct font *font)
fputs ("] RF\n", x->file);
if (freaderror (file) != 0)
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. */
}
/* PostScript driver class. */
-struct outp_class postscript_class =
+
const
struct outp_class postscript_class =
{
"postscript",
0,
{
"postscript",
0,