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., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA. */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA. */
#include <config.h>
#include "error.h"
#include "alloc.h"
#include "error.h"
#include "filename.h"
+#include "glob.h"
#include "main.h"
#include "misc.h"
#include "output.h"
#include "pool.h"
#include "version.h"
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
/* ASCII driver options: (defaults listed first)
output-file="pspp.list"
int bottom_margin; /* Bottom margin in lines. */
int paginate; /* 1=insert formfeeds. */
int tab_width; /* Width of a tab; 0 not to use tabs. */
- struct len_string ops[OPS_COUNT]; /* Basic output strings. */
- struct len_string box[LNS_COUNT]; /* Line & box drawing characters. */
- struct len_string fonts[FSTY_COUNT]; /* Font styles; NULL=overstrike. */
+ struct fixed_string ops[OPS_COUNT]; /* Basic output strings. */
+ struct fixed_string box[LNS_COUNT]; /* Line & box drawing characters. */
+ struct fixed_string fonts[FSTY_COUNT]; /* Font styles; NULL=overstrike. */
int overstrike_style; /* OVS_SINGLE or OVS_LINE. */
int carriage_return_style; /* Carriage return style. */
int squeeze_blank_lines; /* 1=squeeze multiple blank lines into one. */
static int postopen (struct file_ext *);
static int preclose (struct file_ext *);
+static struct outp_option_info *option_info;
+
static int
ascii_open_global (struct outp_class *this UNUSED)
{
+ option_info = xmalloc (sizeof *option_info);
+ option_info->initial = 0;
+ option_info->options = 0;
return 1;
}
+static char *s;
static int
ascii_close_global (struct outp_class *this UNUSED)
{
+ free(option_info->initial);
+ free(option_info->options);
+ free(option_info);
+ free(s);
return 1;
}
assert (this->driver_open == 0);
msg (VM (1), _("ASCII driver initializing as `%s'..."), this->name);
- this->ext = x = xmalloc (sizeof (struct ascii_driver_ext));
+ this->ext = x = xmalloc (sizeof *x);
x->char_set = CHS_ASCII;
x->headers = 1;
x->page_length = 66;
{"squeeze", boolean_arg, 2},
{"", 0, 0},
};
-static struct outp_option_info option_info;
static void
ascii_option (struct outp_driver *this, const char *key,
return;
}
- cat = outp_match_keyword (key, option_tab, &option_info, &subcat);
+ cat = outp_match_keyword (key, option_tab, option_info, &subcat);
switch (cat)
{
case 0:
break;
case string_arg:
{
- struct len_string *s;
+ struct fixed_string *s;
switch (subcat)
{
case 0:
postopen (struct file_ext *f)
{
struct ascii_driver_ext *x = f->param;
- struct len_string *s = &x->ops[OPS_INIT];
+ struct fixed_string *s = &x->ops[OPS_INIT];
if (!ls_empty_p (s) && fwrite (ls_c_str (s), ls_length (s), 1, f->file) < 1)
{
preclose (struct file_ext *f)
{
struct ascii_driver_ext *x = f->param;
- struct len_string *d = &x->ops[OPS_DONE];
+ struct fixed_string *d = &x->ops[OPS_DONE];
if (!ls_empty_p (d) && fwrite (ls_c_str (d), ls_length (d), 1, f->file) < 1)
{
if (x->l > x->lines_cap)
{
- x->lines = xrealloc (x->lines, sizeof *x->lines * x->l);
+ x->lines = xnrealloc (x->lines, x->l, sizeof *x->lines);
for (i = x->lines_cap; i < x->l; i++)
{
struct line *line = &x->lines[i];
if (l > line->char_cap)
{
line->char_cap = l * 2;
- line->chars = xrealloc (line->chars,
- line->char_cap * sizeof *line->chars);
+ line->chars = xnrealloc (line->chars,
+ line->char_cap, sizeof *line->chars);
}
for (j = line->char_cnt; j < l; j++)
line->chars[j] = ' ';
/* ascii_close_page () and support routines. */
#define LINE_BUF_SIZE 1024
-static unsigned char *line_buf;
-static unsigned char *line_p;
+static char *line_buf;
+static char *line_p;
static inline int
commit_line_buf (struct outp_driver *this)
{
if (*bp & 0x800)
{
- struct len_string *box = &ext->box[*bp & 0xff];
+ struct fixed_string *box = &ext->box[*bp & 0xff];
size_t len = ls_length (box);
if (remaining >= len)
}
else if (*bp & 0x0300)
{
- struct len_string *on;
+ struct fixed_string *on;
char buf[5];
int len;
/* Writes CH into line_buf N times, or to THIS->output if line_buf
overflows. */
static inline void
-output_char (struct outp_driver *this, int n, int ch)
+output_char (struct outp_driver *this, int n, char ch)
{
if (LINE_BUF_SIZE - (line_p - line_buf) >= n)
{
struct ascii_driver_ext *ext = this->ext;
int line_num;
- struct len_string *newline = &ext->ops[OPS_NEWLINE];
+ struct fixed_string *newline = &ext->ops[OPS_NEWLINE];
int n_chars;
int n_passes;
/* Turn off old font. */
if (attr != (OUTP_F_R << 8))
{
- struct len_string *off;
+ struct fixed_string *off;
switch (attr)
{
attr = (*bp & 0x0300);
if (attr != (OUTP_F_R << 8))
{
- struct len_string *on;
+ struct fixed_string *on;
switch (attr)
{
}
if (n_passes > 1)
{
- unsigned char ch;
+ char ch;
return_carriage (this, n_chars);
n_chars = 0;
}
}
+
static int
ascii_close_page (struct outp_driver *this)
{
- static unsigned char *s;
static int s_len;
struct ascii_driver_ext *x = this->ext;
int nl_len, ff_len, total_len;
- unsigned char *cp;
+ char *cp;
int i;
assert (this->driver_open && this->page_open);
{
char temp[40];
- snprintf (temp, 80, _("%s - Page %d"), curdate, x->page_number);
+ snprintf (temp, 80, _("%s - Page %d"), get_start_date (),
+ x->page_number);
memcpy (&s[x->w - strlen (temp)], temp, strlen (temp));
}
memcpy (cp, ls_c_str (&x->ops[OPS_FORMFEED]), ff_len);
if ( x->paginate )
output_string (this, s, &s[total_len]);
+
if (line_p != line_buf && !commit_line_buf (this))
return 0;
return 1;
}
+
+
+static void
+ascii_chart_initialise(struct outp_driver *d UNUSED, struct chart *ch )
+{
+ msg(MW, _("Charts are unsupported with ascii drivers."));
+ ch->lp = 0;
+}
+
+static void
+ascii_chart_finalise(struct outp_driver *d UNUSED, struct chart *ch UNUSED)
+{
+
+}
+
struct outp_class ascii_class =
{
"ascii",
ascii_text_get_size,
ascii_text_metrics,
ascii_text_draw,
+
+ ascii_chart_initialise,
+ ascii_chart_finalise
};
projects / pspp-builds.git / blobdiff