static void xr_draw_line (void *, int bb[TABLE_N_AXES][2],
enum render_line_style styles[TABLE_N_AXES][2]);
static void xr_measure_cell_width (void *, const struct table_cell *,
- int footnote_idx, int *min, int *max);
+ int *min, int *max);
static int xr_measure_cell_height (void *, const struct table_cell *,
- int footnote_idx, int width);
-static void xr_draw_cell (void *, const struct table_cell *, int footnote_idx,
+ int width);
+static void xr_draw_cell (void *, const struct table_cell *,
int bb[TABLE_N_AXES][2],
int clip[TABLE_N_AXES][2]);
-static int xr_adjust_break (void *, const struct table_cell *, int footnote_idx,
+static int xr_adjust_break (void *, const struct table_cell *,
int width, int height);
static struct xr_render_fsm *xr_render_output_item (
xr->fonts[XR_FONT_FIXED].desc = parse_font (d, o, "fixed-font", "monospace",
font_size);
xr->fonts[XR_FONT_PROPORTIONAL].desc = parse_font (d, o, "prop-font",
- "serif", font_size);
+ "sans serif", font_size);
xr->fonts[XR_FONT_EMPHASIS].desc = parse_font (d, o, "emph-font",
- "serif italic", font_size);
- xr->fonts[XR_FONT_MARKER].desc = parse_font (d, o, "marker-font", "serif",
+ "sans serif italic", font_size);
+ xr->fonts[XR_FONT_MARKER].desc = parse_font (d, o, "marker-font", "sans serif",
font_size * PANGO_SCALE_X_SMALL);
xr->line_gutter = XR_POINT / 2;
xr->char_width = MAX (xr->char_width, pango_to_xr (char_width));
xr->char_height = MAX (xr->char_height, pango_to_xr (char_height));
}
- xr->cell_margin = xr->char_width;
+ xr->cell_margin = xr->char_width / 2;
if (xr->params == NULL)
{
- int single_width, double_width;
-
xr->params = xmalloc (sizeof *xr->params);
xr->params->draw_line = xr_draw_line;
xr->params->measure_cell_width = xr_measure_cell_width;
xr->params->font_size[H] = xr->char_width;
xr->params->font_size[V] = xr->char_height;
- single_width = 2 * xr->line_gutter + xr->line_width;
- double_width = 2 * xr->line_gutter + xr->line_space + 2 * xr->line_width;
+ int lg = xr->line_gutter;
+ int lw = xr->line_width;
+ int ls = xr->line_space;
for (i = 0; i < TABLE_N_AXES; i++)
{
xr->params->line_widths[i][RENDER_LINE_NONE] = 0;
- xr->params->line_widths[i][RENDER_LINE_SINGLE] = single_width;
- xr->params->line_widths[i][RENDER_LINE_DOUBLE] = double_width;
+ xr->params->line_widths[i][RENDER_LINE_SINGLE] = 2 * lg + lw;
+ xr->params->line_widths[i][RENDER_LINE_DASHED] = 2 * lg + lw;
+ xr->params->line_widths[i][RENDER_LINE_THICK] = 2 * lg + lw * 3;
+ xr->params->line_widths[i][RENDER_LINE_THIN] = 2 * lg + lw / 2;
+ xr->params->line_widths[i][RENDER_LINE_DOUBLE] = 2 * (lg + lw) + ls;
}
for (i = 0; i < TABLE_N_AXES; i++)
xr->params->min_break[i] = xr->min_break[i];
+ xr->params->supports_margins = true;
}
cairo_set_source_rgb (xr->cairo, xr->fg.red, xr->fg.green, xr->fg.blue);
cairo_destroy (xr->cairo);
}
- free (xr->command_name);
for (i = 0; i < XR_N_FONTS; i++)
{
struct xr_font *font = &xr->fonts[i];
{
struct xr_driver *xr = xr_driver_cast (driver);
- output_driver_track_current_command (output_item, &xr->command_name);
-
xr_driver_output_item (xr, output_item);
while (xr_driver_need_new_page (xr))
{
}
\f
static void
-xr_layout_cell (struct xr_driver *, const struct table_cell *, int footnote_idx,
+xr_layout_cell (struct xr_driver *, const struct table_cell *,
int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2],
int *width, int *height, int *brk);
static void
-dump_line (struct xr_driver *xr, int x0, int y0, int x1, int y1)
+dump_line (struct xr_driver *xr, int x0, int y0, int x1, int y1, int style)
{
cairo_new_path (xr->cairo);
+ cairo_set_line_width (
+ xr->cairo,
+ xr_to_pt (style == RENDER_LINE_THICK ? xr->line_width * 3
+ : style == RENDER_LINE_THIN ? xr->line_width / 2
+ : xr->line_width));
cairo_move_to (xr->cairo, xr_to_pt (x0 + xr->x), xr_to_pt (y0 + xr->y));
cairo_line_to (xr->cairo, xr_to_pt (x1 + xr->x), xr_to_pt (y1 + xr->y));
cairo_stroke (xr->cairo);
dump_rectangle (struct xr_driver *xr, int x0, int y0, int x1, int y1)
{
cairo_new_path (xr->cairo);
+ cairo_set_line_width (xr->cairo, xr_to_pt (xr->line_width));
cairo_move_to (xr->cairo, xr_to_pt (x0 + xr->x), xr_to_pt (y0 + xr->y));
cairo_line_to (xr->cairo, xr_to_pt (x1 + xr->x), xr_to_pt (y0 + xr->y));
cairo_line_to (xr->cairo, xr_to_pt (x1 + xr->x), xr_to_pt (y1 + xr->y));
cairo_stroke (xr->cairo);
}
+static void
+fill_rectangle (struct xr_driver *xr, int x0, int y0, int x1, int y1)
+{
+ cairo_new_path (xr->cairo);
+ cairo_set_line_width (xr->cairo, xr_to_pt (xr->line_width));
+ cairo_rectangle (xr->cairo,
+ xr_to_pt (x0 + xr->x), xr_to_pt (y0 + xr->y),
+ xr_to_pt (x1 - x0), xr_to_pt (y1 - y0));
+ cairo_fill (xr->cairo);
+}
+
/* Draws a horizontal line X0...X2 at Y if LEFT says so,
shortening it to X0...X1 if SHORTEN is true.
Draws a horizontal line X1...X3 at Y if RIGHT says so,
bool shorten)
{
if (left != RENDER_LINE_NONE && right != RENDER_LINE_NONE && !shorten)
- dump_line (xr, x0, y, x3, y);
+ dump_line (xr, x0, y, x3, y, left);
else
{
if (left != RENDER_LINE_NONE)
- dump_line (xr, x0, y, shorten ? x1 : x2, y);
+ dump_line (xr, x0, y, shorten ? x1 : x2, y, left);
if (right != RENDER_LINE_NONE)
- dump_line (xr, shorten ? x2 : x1, y, x3, y);
+ dump_line (xr, shorten ? x2 : x1, y, x3, y, right);
}
}
bool shorten)
{
if (top != RENDER_LINE_NONE && bottom != RENDER_LINE_NONE && !shorten)
- dump_line (xr, x, y0, x, y3);
+ dump_line (xr, x, y0, x, y3, top);
else
{
if (top != RENDER_LINE_NONE)
- dump_line (xr, x, y0, x, shorten ? y1 : y2);
+ dump_line (xr, x, y0, x, shorten ? y1 : y2, top);
if (bottom != RENDER_LINE_NONE)
- dump_line (xr, x, shorten ? y2 : y1, x, y3);
+ dump_line (xr, x, shorten ? y2 : y1, x, y3, bottom);
}
}
static void
xr_measure_cell_width (void *xr_, const struct table_cell *cell,
- int footnote_idx, int *min_width, int *max_width)
+ int *min_width, int *max_width)
{
struct xr_driver *xr = xr_;
int bb[TABLE_N_AXES][2];
bb[V][0] = 0;
bb[V][1] = INT_MAX;
clip[H][0] = clip[H][1] = clip[V][0] = clip[V][1] = 0;
- xr_layout_cell (xr, cell, footnote_idx, bb, clip, max_width, &h, NULL);
+ xr_layout_cell (xr, cell, bb, clip, max_width, &h, NULL);
bb[H][1] = 1;
- xr_layout_cell (xr, cell, footnote_idx, bb, clip, min_width, &h, NULL);
+ xr_layout_cell (xr, cell, bb, clip, min_width, &h, NULL);
if (*min_width > 0)
*min_width += xr->cell_margin * 2;
}
static int
-xr_measure_cell_height (void *xr_, const struct table_cell *cell,
- int footnote_idx, int width)
+xr_measure_cell_height (void *xr_, const struct table_cell *cell, int width)
{
struct xr_driver *xr = xr_;
int bb[TABLE_N_AXES][2];
bb[V][0] = 0;
bb[V][1] = INT_MAX;
clip[H][0] = clip[H][1] = clip[V][0] = clip[V][1] = 0;
- xr_layout_cell (xr, cell, footnote_idx, bb, clip, &w, &h, NULL);
+ xr_layout_cell (xr, cell, bb, clip, &w, &h, NULL);
return h;
}
+static void xr_clip (struct xr_driver *, int clip[TABLE_N_AXES][2]);
+
static void
-xr_draw_cell (void *xr_, const struct table_cell *cell, int footnote_idx,
+xr_draw_cell (void *xr_, const struct table_cell *cell,
int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2])
{
struct xr_driver *xr = xr_;
int w, h, brk;
+ cairo_save (xr->cairo);
+ xr_clip (xr, clip);
+ cairo_set_source_rgb (xr->cairo,
+ cell->style->bg.r / 255.,
+ cell->style->bg.g / 255.,
+ cell->style->bg.b / 255.);
+ fill_rectangle (xr, bb[H][0], bb[V][0], bb[H][1], bb[V][1]);
+ cairo_restore (xr->cairo);
+
+ cairo_save (xr->cairo);
+ cairo_set_source_rgb (xr->cairo,
+ cell->style->fg.r / 255.,
+ cell->style->fg.g / 255.,
+ cell->style->fg.b / 255.);
+
bb[H][0] += xr->cell_margin;
bb[H][1] -= xr->cell_margin;
- if (bb[H][0] >= bb[H][1])
- return;
- xr_layout_cell (xr, cell, footnote_idx, bb, clip, &w, &h, &brk);
+ if (bb[H][0] < bb[H][1])
+ xr_layout_cell (xr, cell, bb, clip, &w, &h, &brk);
+ cairo_restore (xr->cairo);
}
static int
-xr_adjust_break (void *xr_, const struct table_cell *cell, int footnote_idx,
+xr_adjust_break (void *xr_, const struct table_cell *cell,
int width, int height)
{
struct xr_driver *xr = xr_;
int clip[TABLE_N_AXES][2];
int w, h, brk;
- if (xr_measure_cell_height (xr_, cell, footnote_idx, width) < height)
+ if (xr_measure_cell_height (xr_, cell, width) < height)
return -1;
bb[H][0] = 0;
bb[V][0] = 0;
bb[V][1] = height;
clip[H][0] = clip[H][1] = clip[V][0] = clip[V][1] = 0;
- xr_layout_cell (xr, cell, footnote_idx, bb, clip, &w, &h, &brk);
+ xr_layout_cell (xr, cell, bb, clip, &w, &h, &brk);
return brk;
}
\f
static int
xr_layout_cell_text (struct xr_driver *xr,
- const struct cell_contents *contents, int footnote_idx,
+ const struct cell_contents *contents,
int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2],
- int y, int *widthp, int *brk)
+ int *widthp, int *brk)
{
unsigned int options = contents->options;
struct xr_font *font;
if (contents->n_footnotes == 0)
merge_footnotes = false;
- else if (contents->n_footnotes == 1 && (options & TAB_ALIGNMENT) == TAB_RIGHT)
+ else if (contents->n_footnotes == 1 && (options & TAB_HALIGN) == TAB_RIGHT)
{
PangoAttrList *attrs;
- char marker[16];
font = &xr->fonts[XR_FONT_MARKER];
- str_format_26adic (footnote_idx + 1, false, marker, sizeof marker);
+ const char *marker = contents->footnotes[0]->marker;
pango_layout_set_text (font->layout, marker, strlen (marker));
attrs = pango_attr_list_new ();
xr_clip (xr, clip);
cairo_translate (xr->cairo,
xr_to_pt (bb[H][1] + xr->x),
- xr_to_pt (y + xr->y));
+ xr_to_pt (bb[V][0] + xr->y));
pango_layout_set_alignment (font->layout, PANGO_ALIGN_LEFT);
pango_layout_set_width (font->layout, -1);
pango_cairo_show_layout (xr->cairo, font->layout);
{
PangoAttrList *attrs;
struct string s;
- size_t i;
bb[H][1] += xr->cell_margin;
ds_init_empty (&s);
ds_extend (&s, length + contents->n_footnotes * 10);
ds_put_cstr (&s, contents->text);
- for (i = 0; i < contents->n_footnotes; i++)
- {
- char marker[16];
-
- if (i > 0)
- ds_put_byte (&s, ',');
- str_format_26adic (footnote_idx + i + 1, false, marker, sizeof marker);
- ds_put_cstr (&s, marker);
- }
+ cell_contents_format_footnote_markers (contents, &s);
pango_layout_set_text (font->layout, ds_cstr (&s), ds_length (&s));
ds_destroy (&s);
pango_layout_set_alignment (
font->layout,
- ((options & TAB_ALIGNMENT) == TAB_RIGHT ? PANGO_ALIGN_RIGHT
- : (options & TAB_ALIGNMENT) == TAB_LEFT ? PANGO_ALIGN_LEFT
+ ((options & TAB_HALIGN) == TAB_RIGHT ? PANGO_ALIGN_RIGHT
+ : (options & TAB_HALIGN) == TAB_LEFT ? PANGO_ALIGN_LEFT
: PANGO_ALIGN_CENTER));
pango_layout_set_width (
font->layout,
xr_clip (xr, clip);
cairo_translate (xr->cairo,
xr_to_pt (bb[H][0] + xr->x),
- xr_to_pt (y + xr->y));
+ xr_to_pt (bb[V][0] + xr->y));
pango_cairo_show_layout (xr->cairo, font->layout);
/* If enabled, this draws a blue rectangle around the extents of each
h = pango_to_xr (h);
if (w > *widthp)
*widthp = w;
- if (y + h >= bb[V][1])
+ if (bb[V][0] + h >= bb[V][1])
{
PangoLayoutIter *iter;
int best UNUSED = 0;
extents.y = pango_to_xr (y0);
extents.width = pango_to_xr (extents.width);
extents.height = pango_to_xr (y1 - y0);
- bottom = y + extents.y + extents.height;
+ bottom = bb[V][0] + extents.y + extents.height;
if (bottom < bb[V][1])
{
if (brk && clip[H][0] != clip[H][1])
{
cairo_save (xr->cairo);
cairo_set_source_rgb (xr->cairo, 0, 1, 0);
- dump_line (xr, -xr->left_margin, best, xr->width + xr->right_margin, best);
+ dump_line (xr, -xr->left_margin, best,
+ xr->width + xr->right_margin, best,
+ RENDER_LINE_SINGLE);
cairo_restore (xr->cairo);
}
}
}
pango_layout_set_attributes (font->layout, NULL);
- return y + h;
-}
-
-static int
-xr_layout_cell_subtable (struct xr_driver *xr,
- const struct cell_contents *contents,
- int footnote_idx UNUSED,
- int bb[TABLE_N_AXES][2],
- int clip[TABLE_N_AXES][2], int *widthp, int *brk)
-{
- int single_width, double_width;
- struct render_params params;
- struct render_pager *p;
- int r[TABLE_N_AXES][2];
- int width, height;
- int i;
-
- params.draw_line = xr_draw_line;
- params.measure_cell_width = xr_measure_cell_width;
- params.measure_cell_height = xr_measure_cell_height;
- params.adjust_break = NULL;
- params.draw_cell = xr_draw_cell;
- params.aux = xr;
- params.size[H] = bb[H][1] - bb[H][0];
- params.size[V] = bb[V][1] - bb[V][0];
- params.font_size[H] = xr->char_width;
- params.font_size[V] = xr->char_height;
-
- single_width = 2 * xr->line_gutter + xr->line_width;
- double_width = 2 * xr->line_gutter + xr->line_space + 2 * xr->line_width;
- for (i = 0; i < TABLE_N_AXES; i++)
- {
- params.line_widths[i][RENDER_LINE_NONE] = 0;
- params.line_widths[i][RENDER_LINE_SINGLE] = single_width;
- params.line_widths[i][RENDER_LINE_DOUBLE] = double_width;
- }
-
- xr->nest++;
- p = render_pager_create (¶ms, contents->table);
- width = render_pager_get_size (p, H);
- height = render_pager_get_size (p, V);
- if (bb[V][0] + height >= bb[V][1])
- *brk = bb[V][0] + render_pager_get_best_breakpoint (p, bb[V][1] - bb[V][0]);
-
- /* r = intersect(bb, clip) - bb. */
- for (i = 0; i < TABLE_N_AXES; i++)
- {
- r[i][0] = MAX (bb[i][0], clip[i][0]) - bb[i][0];
- r[i][1] = MIN (bb[i][1], clip[i][1]) - bb[i][0];
- }
-
- if (r[H][0] < r[H][1] && r[V][0] < r[V][1])
- {
- unsigned int alignment = contents->options & TAB_ALIGNMENT;
- int save_x = xr->x;
-
- cairo_save (xr->cairo);
- xr_clip (xr, clip);
- xr->x += bb[H][0];
- if (alignment == TAB_RIGHT)
- xr->x += params.size[H] - width;
- else if (alignment == TAB_CENTER)
- xr->x += (params.size[H] - width) / 2;
- xr->y += bb[V][0];
- render_pager_draw_region (p, r[H][0], r[V][0],
- r[H][1] - r[H][0], r[V][1] - r[V][0]);
- xr->y -= bb[V][0];
- xr->x = save_x;
- cairo_restore (xr->cairo);
- }
- render_pager_destroy (p);
- xr->nest--;
-
- if (width > *widthp)
- *widthp = width;
- return bb[V][0] + height;
+ return bb[V][0] + h;
}
static void
xr_layout_cell (struct xr_driver *xr, const struct table_cell *cell,
- int footnote_idx,
int bb_[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2],
int *width, int *height, int *brk)
{
*brk = bb[V][0];
}
- if (contents->text)
- bb[V][0] = xr_layout_cell_text (xr, contents, footnote_idx, bb, clip,
- bb[V][0], width, brk);
- else
- bb[V][0] = xr_layout_cell_subtable (xr, contents, footnote_idx,
- bb, clip, width, brk);
- footnote_idx += contents->n_footnotes;
+ bb[V][0] = xr_layout_cell_text (xr, contents, bb, clip, width, brk);
}
*height = bb[V][0] - bb_[V][0];
}
struct xr_render_fsm *fsm;
char *s;
- s = msg_to_string (msg, xr->command_name);
+ s = msg_to_string (msg, message_item->command_name);
fsm = xr_create_text_renderer (xr, s);
free (s);
projects / pspp / blobdiff