02111-1307, USA. */
#include <config.h>
-#include <assert.h>
+#include "error.h"
#include <ctype.h>
#include <errno.h>
#include <limits.h>
width=130
lpi=6 Only used to determine font size.
cpi=10
+ squeeze=off|on Squeeze multiple newlines into exactly one.
left-margin=0
right-margin=0
struct len_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. */
/* Internal state. */
struct file_ext file; /* Output file. */
static int postopen (struct file_ext *);
static int preclose (struct file_ext *);
-int
-ascii_open_global (struct outp_class *this unused)
+static int
+ascii_open_global (struct outp_class *this UNUSED)
{
ascii_pool = pool_create ();
return 1;
}
-int
-ascii_close_global (struct outp_class *this unused)
+static int
+ascii_close_global (struct outp_class *this UNUSED)
{
pool_destroy (ascii_pool);
return 1;
}
-int *
-ascii_font_sizes (struct outp_class *this unused, int *n_valid_sizes)
+static int *
+ascii_font_sizes (struct outp_class *this UNUSED, int *n_valid_sizes)
{
static int valid_sizes[] = {12, 12, 0, 0};
return valid_sizes;
}
-int
+static int
ascii_preopen_driver (struct outp_driver *this)
{
struct ascii_driver_ext *x;
ls_null (&x->fonts[i]);
x->overstrike_style = OVS_SINGLE;
x->carriage_return_style = CRS_BS;
+ x->squeeze_blank_lines = 0;
x->file.filename = NULL;
x->file.mode = "wb";
x->file.file = NULL;
return 1;
}
-int
+static int
ascii_postopen_driver (struct outp_driver *this)
{
struct ascii_driver_ext *x = this->ext;
return 1;
}
-int
+static int
ascii_close_driver (struct outp_driver *this)
{
struct ascii_driver_ext *x = this->ext;
{"overstrike-style", 3, 0},
{"tab-width", nonneg_int_arg, 4},
{"carriage-return-style", 4, 0},
+ {"squeeze", boolean_arg, 2},
{"", 0, 0},
};
static struct outp_option_info option_info;
-void
+static void
ascii_option (struct outp_driver *this, const char *key,
const struct string *val)
{
}
cat = outp_match_keyword (key, option_tab, &option_info, &subcat);
-
switch (cat)
{
case 0:
break;
default:
assert (0);
+ abort ();
}
ls_create (ascii_pool, s, value);
}
switch (subcat)
{
case 0:
- x->headers = 0;
+ x->headers = setting;
break;
case 1:
x->paginate = setting;
break;
+ case 2:
+ x->squeeze_blank_lines = setting;
+ break;
default:
assert (0);
}
return 1;
}
-int
+static int
ascii_open_page (struct outp_driver *this)
{
struct ascii_driver_ext *x = this->ext;
#define B(STYLE) (STYLE<<LNS_BOTTOM)
#define R(STYLE) (STYLE<<LNS_RIGHT)
-void
+static void
ascii_line_horz (struct outp_driver *this, const struct rect *r,
- const struct color *c unused, int style)
+ const struct color *c UNUSED, int style)
{
struct ascii_driver_ext *ext = this->ext;
int x1 = r->x1 / this->horiz;
draw_line (x, y1, (style << LNS_LEFT) | (style << LNS_RIGHT));
}
-void
+static void
ascii_line_vert (struct outp_driver *this, const struct rect *r,
- const struct color *c unused, int style)
+ const struct color *c UNUSED, int style)
{
struct ascii_driver_ext *ext = this->ext;
int x1 = r->x1 / this->horiz;
draw_line (x1, y, (style << LNS_TOP) | (style << LNS_BOTTOM));
}
-void
+static void
ascii_line_intersection (struct outp_driver *this, const struct rect *r,
- const struct color *c unused,
+ const struct color *c UNUSED,
const struct outp_styles *style)
{
struct ascii_driver_ext *ext = this->ext;
draw_line (x, y, l);
}
-void
-ascii_line_width (struct outp_driver *this, int *width, int *height)
-{
- int i;
-
- assert (this->driver_open && this->page_open);
- width[0] = height[0] = 0;
- for (i = 1; i < OUTP_L_COUNT; i++)
- {
- width[i] = this->horiz;
- height[i] = this->vert;
- }
-}
-
/* FIXME: Later we could set this up so that for certain devices it
performs shading? */
-void
-ascii_box (struct outp_driver *this unused, const struct rect *r unused,
- const struct color *bord unused, const struct color *fill unused)
+static void
+ascii_box (struct outp_driver *this UNUSED, const struct rect *r UNUSED,
+ const struct color *bord UNUSED, const struct color *fill UNUSED)
{
assert (this->driver_open && this->page_open);
}
/* Polylines not supported. */
-void
-ascii_polyline_begin (struct outp_driver *this unused, const struct color *c unused)
+static void
+ascii_polyline_begin (struct outp_driver *this UNUSED, const struct color *c UNUSED)
{
assert (this->driver_open && this->page_open);
}
-void
-ascii_polyline_point (struct outp_driver *this unused, int x unused, int y unused)
+static void
+ascii_polyline_point (struct outp_driver *this UNUSED, int x UNUSED, int y UNUSED)
{
assert (this->driver_open && this->page_open);
}
-void
-ascii_polyline_end (struct outp_driver *this unused)
+static void
+ascii_polyline_end (struct outp_driver *this UNUSED)
{
assert (this->driver_open && this->page_open);
}
-void
+static void
ascii_text_set_font_by_name (struct outp_driver * this, const char *s)
{
struct ascii_driver_ext *x = this->ext;
x->cur_font = OUTP_F_B;
}
-void
+static void
ascii_text_set_font_by_position (struct outp_driver *this, int pos)
{
struct ascii_driver_ext *x = this->ext;
x->cur_font = pos >= 0 && pos < 4 ? pos : 0;
}
-void
-ascii_text_set_font_by_family (struct outp_driver *this unused, const char *s unused)
+static void
+ascii_text_set_font_by_family (struct outp_driver *this UNUSED, const char *s UNUSED)
{
assert (this->driver_open && this->page_open);
}
-const char *
+static const char *
ascii_text_get_font_name (struct outp_driver *this)
{
struct ascii_driver_ext *x = this->ext;
abort ();
}
-const char *
-ascii_text_get_font_family (struct outp_driver *this unused)
+static const char *
+ascii_text_get_font_family (struct outp_driver *this UNUSED)
{
assert (this->driver_open && this->page_open);
return "";
}
-int
+static int
ascii_text_set_size (struct outp_driver *this, int size)
{
assert (this->driver_open && this->page_open);
return size == this->vert;
}
-int
+static int
ascii_text_get_size (struct outp_driver *this, int *em_width)
{
assert (this->driver_open && this->page_open);
t->v = (temp.y * this->vert) - t->y;
}
-void
+static void
ascii_text_metrics (struct outp_driver *this, struct outp_text *t)
{
assert (this->driver_open && this->page_open);
delineate (this, t, 0);
}
-void
+static void
ascii_text_draw (struct outp_driver *this, struct outp_text *t)
{
/* FIXME: orientations not supported. */
break;
default:
assert (0);
+ abort ();
}
if (!on)
{
break;
default:
assert (0);
+ abort ();
}
else
{
break;
default:
assert (0);
+ abort ();
}
}
output_lines (struct outp_driver *this, int first, int count)
{
struct ascii_driver_ext *ext = this->ext;
+ int line_num;
- unsigned short *p = &ext->page[ext->w * first];
- int *len = &ext->line_len[first];
struct len_string *newline = &ext->ops[OPS_NEWLINE];
int n_chars;
if (NULL == ext->file.file)
return;
- while (count--) /* Iterate over all the lines to be output. */
+ /* Iterate over all the lines to be output. */
+ for (line_num = first; line_num < first + count; line_num++)
{
- unsigned short *end_p;
+ unsigned short *p = &ext->page[ext->w * line_num];
+ unsigned short *end_p = p + ext->line_len[line_num];
unsigned short *bp, *ep;
unsigned short attr = 0;
- end_p = p + *len++;
assert (end_p >= p);
+ /* Squeeze multiple blank lines into a single blank line if
+ requested. */
+ if (ext->squeeze_blank_lines
+ && line_num > first
+ && ext->line_len[line_num] == 0
+ && ext->line_len[line_num - 1] == 0)
+ continue;
+
/* Output every character in the line in the appropriate
manner. */
n_passes = 1;
break;
default:
assert (0);
+ abort ();
}
if (off)
output_string (this, ls_value (off), ls_end (off));
break;
default:
assert (0);
+ abort ();
}
if (on)
output_string (this, ls_value (on), ls_end (on));
ch = *ep;
n_passes = 3;
break;
+ default:
+ assert (0);
+ abort ();
}
output_char (this, 1, ch);
n_chars += ep - bp + 1;
ep = bp;
}
}
- p += ext->w;
output_string (this, ls_value (newline), ls_end (newline));
}
}
-int
+static int
ascii_close_page (struct outp_driver *this)
{
static unsigned char *s;
cp += nl_len;
}
memcpy (cp, ls_value (&x->ops[OPS_FORMFEED]), ff_len);
- output_string (this, s, &s[total_len]);
+ if ( x->paginate )
+ output_string (this, s, &s[total_len]);
if (line_p != line_buf && !commit_line_buf (this))
return 0;
projects / pspp-builds.git / blobdiff