#include "libpspp/assertion.h"
#include "libpspp/cast.h"
+#include "libpspp/hash-functions.h"
#include "libpspp/message.h"
#include "libpspp/pool.h"
#include "libpspp/start-date.h"
#include "libpspp/version.h"
#include "data/file-handle-def.h"
#include "output/cairo-chart.h"
+#include "output/cairo-fsm.h"
#include "output/chart-item-provider.h"
#include "output/charts/boxplot.h"
#include "output/charts/np-plot.h"
#include "output/group-item.h"
#include "output/message-item.h"
#include "output/options.h"
+#include "output/page-eject-item.h"
#include "output/page-setup-item.h"
#include "output/render.h"
#include "output/table-item.h"
#include <cairo/cairo-pdf.h>
#include <cairo/cairo-ps.h>
#include <cairo/cairo-svg.h>
+
#include <cairo/cairo.h>
+#include <inttypes.h>
#include <math.h>
#include <pango/pango-font.h>
#include <pango/pango-layout.h>
XR_SVG
};
-/* Cairo fonts. */
-enum xr_font_type
- {
- XR_FONT_PROPORTIONAL,
- XR_FONT_EMPHASIS,
- XR_FONT_FIXED,
- XR_N_FONTS
- };
-
/* A font for use with Cairo. */
struct xr_font
{
PangoLayout *layout;
};
-/* An output item whose rendering is in progress. */
-struct xr_render_fsm
- {
- /* Renders as much of itself as it can on the current page. Returns true
- if rendering is complete, false if the output item needs another
- page. */
- bool (*render) (struct xr_render_fsm *, struct xr_driver *);
-
- /* Destroys the output item. */
- void (*destroy) (struct xr_render_fsm *);
- };
-
/* Cairo output driver. */
struct xr_driver
{
int top_margin; /* Top margin in inch/(72 * XR_POINT). */
int bottom_margin; /* Bottom margin in inch/(72 * XR_POINT). */
- int line_space; /* Space between lines. */
- int line_width; /* Width of lines. */
-
int min_break[TABLE_N_AXES]; /* Min cell size to break across pages. */
int object_spacing; /* Space between output objects. */
- struct xr_color bg; /* Background color */
- struct xr_color fg; /* Foreground color */
+ struct cell_color bg; /* Background color */
+ struct cell_color fg; /* Foreground color */
+ bool transparent; /* true -> do not render background */
+ bool systemcolors; /* true -> do not change colors */
int initial_page_number;
/* Internal state. */
struct render_params *params;
+ struct xr_fsm_style *style;
+ double font_scale;
int char_width, char_height;
- char *command_name;
- char *title;
- char *subtitle;
cairo_t *cairo;
cairo_surface_t *surface;
int page_number; /* Current page number. */
- int x, y;
- struct xr_render_fsm *fsm;
- int nest;
- struct string_map heading_vars;
+ int y;
+ struct xr_fsm *fsm;
};
static const struct output_driver_class cairo_driver_class;
static int xr_measure_cell_height (void *, const struct table_cell *,
int width);
static void xr_draw_cell (void *, const struct table_cell *, int color_idx,
- int bb[TABLE_N_AXES][2],
+ int bb[TABLE_N_AXES][2], int valign_offset,
int spill[TABLE_N_AXES][2],
int clip[TABLE_N_AXES][2]);
static int xr_adjust_break (void *, const struct table_cell *,
int width, int height);
-
-static struct xr_render_fsm *xr_render_output_item (
- struct xr_driver *, const struct output_item *);
\f
/* Output driver basics. */
return driver_option_get (d, options, key, default_value);
}
-/* Parse color information specified by KEY into {RED,GREEN,BLUE}.
- Currently, the input string must be of the form "#RRRRGGGGBBBB"
- Future implementations might allow things like "yellow" and
- "sky-blue-ultra-brown"
-*/
-void
-parse_color (struct output_driver *d, struct string_map *options,
- const char *key, const char *default_value,
- struct xr_color *color)
-{
- int red, green, blue;
- char *string = parse_string (opt (d, options, key, default_value));
-
- if (3 != sscanf (string, "#%04x%04x%04x", &red, &green, &blue))
- {
- /* If the parsed option string fails, then try the default value */
- if ( 3 != sscanf (default_value, "#%04x%04x%04x", &red, &green, &blue))
- {
- /* ... and if that fails set everything to zero */
- red = green = blue = 0;
- }
- }
-
- free (string);
-
- /* Convert 16 bit ints to float */
- color->red = red / (double) 0xFFFF;
- color->green = green / (double) 0xFFFF;
- color->blue = blue / (double) 0xFFFF;
-}
-
static PangoFontDescription *
parse_font (const char *font, int default_size, bool bold, bool italic)
{
(d, o, "fixed-font", "monospace", font_size, false, false);
xr->fonts[XR_FONT_PROPORTIONAL].desc = parse_font_option (
d, o, "prop-font", "sans serif", font_size, false, false);
- xr->fonts[XR_FONT_EMPHASIS].desc = parse_font_option (
- d, o, "emph-font", "sans serif", font_size, false, true);
- parse_color (d, o, "background-color", "#FFFFFFFFFFFF", &xr->bg);
- parse_color (d, o, "foreground-color", "#000000000000", &xr->fg);
+ xr->fg = parse_color (opt (d, o, "foreground-color", "#000000000000"));
+ xr->bg = parse_color (opt (d, o, "background-color", "#FFFFFFFFFFFF"));
+
+ xr->transparent = parse_boolean (opt (d, o, "transparent", "false"));
+ xr->systemcolors = parse_boolean (opt (d, o, "systemcolors", "false"));
/* Get dimensions. */
parse_paper_size (opt (d, o, "paper-size", ""), &paper_width, &paper_length);
}
static struct xr_driver *
-xr_allocate (const char *name, int device_type, struct string_map *o)
+xr_allocate (const char *name, int device_type, struct string_map *o,
+ double font_scale)
{
struct xr_driver *xr = xzalloc (sizeof *xr);
struct output_driver *d = &xr->driver;
output_driver_init (d, &cairo_driver_class, name, device_type);
- string_map_init (&xr->heading_vars);
+ /* This is a nasty kluge for an issue that does not make sense. On any
+ surface other than a screen (e.g. for output to PDF or PS or SVG), the
+ fonts are way too big by default. A "9-point" font seems to appear about
+ 16 points tall. We use a scale factor for these surfaces to help, but the
+ underlying issue is a mystery. */
+ xr->font_scale = font_scale;
apply_options (xr, o);
if (xr->params == NULL)
{
+ static const struct render_ops xr_render_ops = {
+ .draw_line = xr_draw_line,
+ .measure_cell_width = xr_measure_cell_width,
+ .measure_cell_height = xr_measure_cell_height,
+ .adjust_break = xr_adjust_break,
+ .draw_cell = xr_draw_cell,
+ };
+
xr->params = xmalloc (sizeof *xr->params);
- xr->params->draw_line = xr_draw_line;
- xr->params->measure_cell_width = xr_measure_cell_width;
- xr->params->measure_cell_height = xr_measure_cell_height;
- xr->params->adjust_break = xr_adjust_break;
- xr->params->draw_cell = xr_draw_cell;
+ xr->params->ops = &xr_render_ops;
xr->params->aux = xr;
xr->params->size[H] = xr->width;
xr->params->size[V] = xr->length;
xr->params->font_size[H] = xr->char_width;
xr->params->font_size[V] = xr->char_height;
- int lw = XR_LINE_WIDTH;
- int ls = XR_LINE_SPACE;
- for (int i = 0; i < TABLE_N_AXES; i++)
+ enum { LW = XR_LINE_WIDTH, LS = XR_LINE_SPACE };
+ static const int xr_line_widths[RENDER_N_LINES] =
{
- xr->params->line_widths[i][RENDER_LINE_NONE] = 0;
- xr->params->line_widths[i][RENDER_LINE_SINGLE] = lw;
- xr->params->line_widths[i][RENDER_LINE_DASHED] = lw;
- xr->params->line_widths[i][RENDER_LINE_THICK] = lw * 2;
- xr->params->line_widths[i][RENDER_LINE_THIN] = lw / 2;
- xr->params->line_widths[i][RENDER_LINE_DOUBLE] = 2 * lw + ls;
- }
+ [RENDER_LINE_NONE] = 0,
+ [RENDER_LINE_SINGLE] = LW,
+ [RENDER_LINE_DASHED] = LW,
+ [RENDER_LINE_THICK] = LW * 2,
+ [RENDER_LINE_THIN] = LW / 2,
+ [RENDER_LINE_DOUBLE] = 2 * LW + LS,
+ };
+ xr->params->line_widths = xr_line_widths;
for (int i = 0; i < TABLE_N_AXES; i++)
xr->params->min_break[i] = xr->min_break[i];
xr->params->rtl = render_direction_rtl ();
}
- cairo_set_source_rgb (xr->cairo, xr->fg.red, xr->fg.green, xr->fg.blue);
+ if (xr->style == NULL)
+ {
+ xr->style = xmalloc (sizeof *xr->style);
+ *xr->style = (struct xr_fsm_style) {
+ .ref_cnt = 1,
+ .size = { [H] = xr->width, [V] = xr->length },
+ .min_break = { [H] = xr->min_break[H], [V] = xr->min_break[V] },
+ .use_system_colors = xr->systemcolors,
+ .transparent = xr->transparent,
+ .font_scale = xr->font_scale,
+ };
+
+ for (size_t i = 0; i < XR_N_FONTS; i++)
+ xr->style->fonts[i] = pango_font_description_copy (xr->fonts[i].desc);
+ }
+
+ if (!xr->systemcolors)
+ cairo_set_source_rgb (xr->cairo,
+ xr->fg.r / 255.0, xr->fg.g / 255.0, xr->fg.b / 255.0);
}
static struct output_driver *
-xr_create (const char *file_name, enum settings_output_devices device_type,
+xr_create (struct file_handle *fh, enum settings_output_devices device_type,
struct string_map *o, enum xr_output_type file_type)
{
- struct xr_driver *xr;
- cairo_status_t status;
- double width_pt, length_pt;
-
- xr = xr_allocate (file_name, device_type, o);
-
- width_pt = xr_to_pt (xr->width + xr->left_margin + xr->right_margin);
- length_pt = xr_to_pt (xr->length + xr->top_margin + xr->bottom_margin);
+ const char *file_name = fh_get_file_name (fh);
+ struct xr_driver *xr = xr_allocate (file_name, device_type, o, 72.0 / 128.0);
+ double width_pt = xr_to_pt (xr->width + xr->left_margin + xr->right_margin);
+ double length_pt = xr_to_pt (xr->length + xr->top_margin + xr->bottom_margin);
if (file_type == XR_PDF)
xr->surface = cairo_pdf_surface_create (file_name, width_pt, length_pt);
else if (file_type == XR_PS)
else
NOT_REACHED ();
- status = cairo_surface_status (xr->surface);
+ cairo_status_t status = cairo_surface_status (xr->surface);
if (status != CAIRO_STATUS_SUCCESS)
{
msg (ME, _("error opening output file `%s': %s"),
- file_name, cairo_status_to_string (status));
+ file_name, cairo_status_to_string (status));
goto error;
}
if (!xr_check_fonts (xr->surface, xr->fonts, xr->width, xr->length))
goto error;
+ fh_unref (fh);
return &xr->driver;
error:
+ fh_unref (fh);
output_driver_destroy (&xr->driver);
return NULL;
}
xr_pdf_create (struct file_handle *fh, enum settings_output_devices device_type,
struct string_map *o)
{
- struct output_driver *od = xr_create (fh_get_file_name (fh), device_type, o, XR_PDF);
- fh_unref (fh);
- return od ;
+ return xr_create (fh, device_type, o, XR_PDF);
}
static struct output_driver *
xr_ps_create (struct file_handle *fh, enum settings_output_devices device_type,
struct string_map *o)
{
- struct output_driver *od = xr_create (fh_get_file_name (fh), device_type, o, XR_PS);
- fh_unref (fh);
- return od ;
+ return xr_create (fh, device_type, o, XR_PS);
}
static struct output_driver *
xr_svg_create (struct file_handle *fh, enum settings_output_devices device_type,
struct string_map *o)
{
- struct output_driver *od = xr_create (fh_get_file_name (fh), device_type, o, XR_SVG);
- fh_unref (fh);
- return od ;
+ return xr_create (fh, device_type, o, XR_SVG);
}
static void
cairo_surface_finish (xr->surface);
cairo_status_t status = cairo_status (xr->cairo);
if (status != CAIRO_STATUS_SUCCESS)
- msg (ME, _("error drawing output for %s driver: %s"),
- output_driver_get_name (driver),
- cairo_status_to_string (status));
+ fprintf (stderr, _("error drawing output for %s driver: %s"),
+ output_driver_get_name (driver),
+ cairo_status_to_string (status));
cairo_surface_destroy (xr->surface);
cairo_destroy (xr->cairo);
g_object_unref (font->layout);
}
+ xr_fsm_style_unref (xr->style);
free (xr->params);
free (xr);
}
void
xr_driver_next_page (struct xr_driver *xr, cairo_t *cairo)
{
- cairo_save (cairo);
- cairo_set_source_rgb (cairo, xr->bg.red, xr->bg.green, xr->bg.blue);
- cairo_rectangle (cairo, 0, 0, xr->width, xr->length);
- cairo_fill (cairo);
- cairo_restore (cairo);
-
+ if (!xr->transparent)
+ {
+ cairo_save (cairo);
+ cairo_set_source_rgb (cairo,
+ xr->bg.r / 255.0, xr->bg.g / 255.0, xr->bg.b / 255.0);
+ cairo_rectangle (cairo, 0, 0, xr->width, xr->length);
+ cairo_fill (cairo);
+ cairo_restore (cairo);
+ }
cairo_translate (cairo,
xr_to_pt (xr->left_margin),
xr_to_pt (xr->top_margin + xr->headings_height[0]));
xr->page_number++;
xr->cairo = cairo;
- xr->x = xr->y = 0;
+ xr->y = 0;
xr_render_page_heading (xr->cairo, xr->fonts[XR_FONT_PROPORTIONAL].desc,
&xr->headings[0], xr->page_number, xr->width, true,
const struct output_item *output_item)
{
assert (xr->fsm == NULL);
- xr->fsm = xr_render_output_item (xr, output_item);
+ xr->fsm = xr_fsm_create (output_item, xr->style, xr->cairo);
xr_driver_run_fsm (xr);
}
static void
xr_driver_destroy_fsm (struct xr_driver *xr)
{
- if (xr->fsm != NULL)
- {
- xr->fsm->destroy (xr->fsm);
- xr->fsm = NULL;
- }
+ xr_fsm_destroy (xr->fsm);
+ xr->fsm = NULL;
}
static void
xr_driver_run_fsm (struct xr_driver *xr)
{
- if (xr->fsm != NULL && !xr->fsm->render (xr->fsm, xr))
- xr_driver_destroy_fsm (xr);
+ if (xr->fsm != NULL)
+ {
+ cairo_save (xr->cairo);
+ cairo_translate (xr->cairo, 0, xr_to_pt (xr->y));
+ int used = xr_fsm_draw_slice (xr->fsm, xr->cairo, xr->length - xr->y);
+ xr->y += used;
+ cairo_restore (xr->cairo);
+
+ if (xr_fsm_is_empty (xr->fsm))
+ xr_driver_destroy_fsm (xr);
+ }
}
\f
static void
const struct cell_color *color)
{
cairo_new_path (xr->cairo);
- set_source_rgba (xr->cairo, color);
+ if (!xr->systemcolors)
+ set_source_rgba (xr->cairo, color);
cairo_set_line_width (
xr->cairo,
xr_to_pt (style == RENDER_LINE_THICK ? XR_LINE_WIDTH * 2
: 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_move_to (xr->cairo, xr_to_pt (x0), xr_to_pt (y0 + xr->y));
+ cairo_line_to (xr->cairo, xr_to_pt (x1), xr_to_pt (y1 + xr->y));
cairo_stroke (xr->cairo);
}
{
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_line_to (xr->cairo, xr_to_pt (x0 + xr->x), xr_to_pt (y1 + xr->y));
cairo_close_path (xr->cairo);
cairo_stroke (xr->cairo);
+ cairo_move_to (xr->cairo, xr_to_pt (x0), xr_to_pt (y0 + xr->y));
+ cairo_line_to (xr->cairo, xr_to_pt (x1), xr_to_pt (y0 + xr->y));
+ cairo_line_to (xr->cairo, xr_to_pt (x1), xr_to_pt (y1 + xr->y));
+ cairo_line_to (xr->cairo, xr_to_pt (x0), xr_to_pt (y1 + xr->y));
}
static void
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 (x0), xr_to_pt (y0 + xr->y),
xr_to_pt (x1 - x0), xr_to_pt (y1 - y0));
cairo_fill (xr->cairo);
}
static void
xr_draw_cell (void *xr_, const struct table_cell *cell, int color_idx,
- int bb[TABLE_N_AXES][2],
+ int bb[TABLE_N_AXES][2], int valign_offset,
int spill[TABLE_N_AXES][2],
int clip[TABLE_N_AXES][2])
{
struct xr_driver *xr = xr_;
int w, h, brk;
- cairo_save (xr->cairo);
- int bg_clip[TABLE_N_AXES][2];
- for (int axis = 0; axis < TABLE_N_AXES; axis++)
+ if (!xr->transparent)
{
- bg_clip[axis][0] = clip[axis][0];
- if (bb[axis][0] == clip[axis][0])
- bg_clip[axis][0] -= spill[axis][0];
+ cairo_save (xr->cairo);
+ int bg_clip[TABLE_N_AXES][2];
+ for (int axis = 0; axis < TABLE_N_AXES; axis++)
+ {
+ bg_clip[axis][0] = clip[axis][0];
+ if (bb[axis][0] == clip[axis][0])
+ bg_clip[axis][0] -= spill[axis][0];
- bg_clip[axis][1] = clip[axis][1];
- if (bb[axis][1] == clip[axis][1])
- bg_clip[axis][1] += spill[axis][1];
+ bg_clip[axis][1] = clip[axis][1];
+ if (bb[axis][1] == clip[axis][1])
+ bg_clip[axis][1] += spill[axis][1];
+ }
+ xr_clip (xr, bg_clip);
+ set_source_rgba (xr->cairo, &cell->style->font_style.bg[color_idx]);
+ fill_rectangle (xr,
+ bb[H][0] - spill[H][0],
+ bb[V][0] - spill[V][0],
+ bb[H][1] + spill[H][1],
+ bb[V][1] + spill[V][1]);
+ cairo_restore (xr->cairo);
}
- xr_clip (xr, bg_clip);
- set_source_rgba (xr->cairo, &cell->style->font_style.bg[color_idx]);
- fill_rectangle (xr,
- bb[H][0] - spill[H][0],
- bb[V][0] - spill[V][0],
- bb[H][1] + spill[H][1],
- bb[V][1] + spill[V][1]);
- cairo_restore (xr->cairo);
-
cairo_save (xr->cairo);
- set_source_rgba (xr->cairo, &cell->style->font_style.fg[color_idx]);
+ if (!xr->systemcolors)
+ set_source_rgba (xr->cairo, &cell->style->font_style.fg[color_idx]);
+
+ bb[V][0] += valign_offset;
for (int axis = 0; axis < TABLE_N_AXES; axis++)
{
{
if (clip[H][1] != INT_MAX || clip[V][1] != INT_MAX)
{
- double x0 = xr_to_pt (clip[H][0] + xr->x);
+ double x0 = xr_to_pt (clip[H][0]);
double y0 = xr_to_pt (clip[V][0] + xr->y);
- double x1 = xr_to_pt (clip[H][1] + xr->x);
+ double x1 = xr_to_pt (clip[H][1]);
double y1 = xr_to_pt (clip[V][1] + xr->y);
cairo_rectangle (xr->cairo, x0, y0, x1 - x0, y1 - y0);
}
static void
-add_attr_with_start (PangoAttrList *list, PangoAttribute *attr, guint start_index)
+add_attr (PangoAttrList *list, PangoAttribute *attr,
+ guint start_index, guint end_index)
{
attr->start_index = start_index;
+ attr->end_index = end_index;
pango_attr_list_insert (list, attr);
}
static void
-markup_escape (const char *in, struct string *out)
+markup_escape (struct string *out, unsigned int options,
+ const char *in, size_t len)
{
- for (int c = *in++; c; c = *in++)
- switch (c)
- {
- case '&':
- ds_put_cstr (out, "&");
- break;
- case '<':
- ds_put_cstr (out, "<");
- break;
- case '>':
- ds_put_cstr (out, ">");
- break;
- default:
- ds_put_byte (out, c);
- break;
- }
+ if (!(options & TAB_MARKUP))
+ {
+ ds_put_substring (out, ss_buffer (in, len == -1 ? strlen (in) : len));
+ return;
+ }
+
+ while (len-- > 0)
+ {
+ int c = *in++;
+ switch (c)
+ {
+ case 0:
+ return;
+ case '&':
+ ds_put_cstr (out, "&");
+ break;
+ case '<':
+ ds_put_cstr (out, "<");
+ break;
+ case '>':
+ ds_put_cstr (out, ">");
+ break;
+ default:
+ ds_put_byte (out, c);
+ break;
+ }
+ }
}
static int
{
PangoFontDescription *desc = parse_font (
font_style->typeface,
- font_style->size ? font_style->size * 1000 * 72 / 128 : 10000,
+ font_style->size ? font_style->size * 1000 * xr->font_scale : 10000,
font_style->bold, font_style->italic);
if (desc)
{
}
struct string tmp = DS_EMPTY_INITIALIZER;
+ PangoAttrList *attrs = NULL;
/* Deal with an oddity of the Unicode line-breaking algorithm (or perhaps in
Pango's implementation of it): it will break after a period or a comma
happen with grouping like 1,234,567.89 or 1.234.567,89 because if groups
are present then there will always be a digit on both sides of every
period and comma. */
- if (options & TAB_ROTATE || bb[H][1] != INT_MAX)
+ if (options & TAB_MARKUP)
+ {
+ PangoAttrList *new_attrs;
+ char *new_text;
+ if (pango_parse_markup (text, -1, 0, &new_attrs, &new_text, NULL, NULL))
+ {
+ attrs = new_attrs;
+ tmp.ss = ss_cstr (new_text);
+ tmp.capacity = tmp.ss.length;
+ }
+ else
+ {
+ /* XXX should we report the error? */
+ ds_put_cstr (&tmp, text);
+ }
+ }
+ else if (options & TAB_ROTATE || bb[H][1] != INT_MAX)
{
const char *decimal = text + strcspn (text, ".,");
if (decimal[0]
&& (decimal == text || !c_isdigit (decimal[-1])))
{
ds_extend (&tmp, strlen (text) + 16);
- ds_put_substring (&tmp, ss_buffer (text, decimal - text + 1));
+ markup_escape (&tmp, options, text, decimal - text + 1);
ds_put_unichar (&tmp, 0x2060 /* U+2060 WORD JOINER */);
- ds_put_cstr (&tmp, decimal + 1);
+ markup_escape (&tmp, options, decimal + 1, -1);
}
}
- if (cell->n_footnotes)
+ if (font_style->underline)
{
- int footnote_adjustment;
- if (cell->n_footnotes == 1 && halign == TABLE_HALIGN_RIGHT)
- {
- const char *marker = cell->footnotes[0]->marker;
- pango_layout_set_text (font->layout, marker, strlen (marker));
-
- PangoAttrList *attrs = pango_attr_list_new ();
- pango_attr_list_insert (attrs, pango_attr_rise_new (7000));
- pango_layout_set_attributes (font->layout, attrs);
- pango_attr_list_unref (attrs);
-
- int w = get_layout_dimension (font->layout, X);
- int right_margin = px_to_xr (cell_style->margin[X][R]);
- footnote_adjustment = MIN (w, right_margin);
-
- pango_layout_set_attributes (font->layout, NULL);
- }
- else
- footnote_adjustment = px_to_xr (cell_style->margin[X][R]);
-
- if (R)
- bb[X][R] += footnote_adjustment;
- else
- bb[X][R] -= footnote_adjustment;
+ if (!attrs)
+ attrs = pango_attr_list_new ();
+ pango_attr_list_insert (attrs, pango_attr_underline_new (
+ PANGO_UNDERLINE_SINGLE));
+ }
+ if (cell->n_footnotes || cell->n_subscripts || cell->superscript)
+ {
+ /* If we haven't already put TEXT into tmp, do it now. */
if (ds_is_empty (&tmp))
{
ds_extend (&tmp, strlen (text) + 16);
- ds_put_cstr (&tmp, text);
+ markup_escape (&tmp, options, text, -1);
+ }
+
+ size_t subscript_ofs = ds_length (&tmp);
+ for (size_t i = 0; i < cell->n_subscripts; i++)
+ {
+ if (i)
+ ds_put_byte (&tmp, ',');
+ ds_put_cstr (&tmp, cell->subscripts[i]);
}
- size_t initial_length = ds_length (&tmp);
+ size_t superscript_ofs = ds_length (&tmp);
+ if (cell->superscript)
+ ds_put_cstr (&tmp, cell->superscript);
+
+ size_t footnote_ofs = ds_length (&tmp);
for (size_t i = 0; i < cell->n_footnotes; i++)
{
if (i)
ds_put_byte (&tmp, ',');
+ ds_put_cstr (&tmp, cell->footnotes[i]->marker);
+ }
- const char *marker = cell->footnotes[i]->marker;
- if (options & TAB_MARKUP)
- markup_escape (marker, &tmp);
- else
- ds_put_cstr (&tmp, marker);
+ /* Allow footnote markers to occupy the right margin. That way, numbers
+ in the column are still aligned. */
+ if (cell->n_footnotes && halign == TABLE_HALIGN_RIGHT)
+ {
+ /* Measure the width of the footnote marker, so we know how much we
+ need to make room for. */
+ pango_layout_set_text (font->layout, ds_cstr (&tmp) + footnote_ofs,
+ ds_length (&tmp) - footnote_ofs);
+
+ PangoAttrList *fn_attrs = pango_attr_list_new ();
+ pango_attr_list_insert (
+ fn_attrs, pango_attr_scale_new (PANGO_SCALE_SMALL));
+ pango_attr_list_insert (fn_attrs, pango_attr_rise_new (3000));
+ pango_layout_set_attributes (font->layout, fn_attrs);
+ pango_attr_list_unref (fn_attrs);
+ int footnote_width = get_layout_dimension (font->layout, X);
+
+ /* Bound the adjustment by the width of the right margin. */
+ int right_margin = px_to_xr (cell_style->margin[X][R]);
+ int footnote_adjustment = MIN (footnote_width, right_margin);
+
+ /* Adjust the bounding box. */
+ if (options & TAB_ROTATE)
+ footnote_adjustment = -footnote_adjustment;
+ bb[X][R] += footnote_adjustment;
+
+ /* Clean up. */
+ pango_layout_set_attributes (font->layout, NULL);
}
- if (options & TAB_MARKUP)
- pango_layout_set_markup (font->layout,
- ds_cstr (&tmp), ds_length (&tmp));
- else
- pango_layout_set_text (font->layout, ds_cstr (&tmp), ds_length (&tmp));
-
- PangoAttrList *attrs = pango_attr_list_new ();
- if (font_style->underline)
- pango_attr_list_insert (attrs, pango_attr_underline_new (
- PANGO_UNDERLINE_SINGLE));
- add_attr_with_start (attrs, pango_attr_rise_new (7000), initial_length);
- add_attr_with_start (
- attrs, pango_attr_font_desc_new (font->desc), initial_length);
+ /* Set attributes. */
+ if (!attrs)
+ attrs = pango_attr_list_new ();
+ add_attr (attrs, pango_attr_font_desc_new (font->desc), subscript_ofs,
+ PANGO_ATTR_INDEX_TO_TEXT_END);
+ add_attr (attrs, pango_attr_scale_new (PANGO_SCALE_SMALL),
+ subscript_ofs, PANGO_ATTR_INDEX_TO_TEXT_END);
+ if (cell->n_subscripts)
+ add_attr (attrs, pango_attr_rise_new (-3000), subscript_ofs,
+ superscript_ofs - subscript_ofs);
+ if (cell->superscript || cell->n_footnotes)
+ add_attr (attrs, pango_attr_rise_new (3000), superscript_ofs,
+ PANGO_ATTR_INDEX_TO_TEXT_END);
+ }
+
+ /* Set the attributes, if any. */
+ if (attrs)
+ {
pango_layout_set_attributes (font->layout, attrs);
pango_attr_list_unref (attrs);
}
- else
- {
- const char *content = ds_is_empty (&tmp) ? text : ds_cstr (&tmp);
- if (options & TAB_MARKUP)
- pango_layout_set_markup (font->layout, content, -1);
- else
- pango_layout_set_text (font->layout, content, -1);
- if (font_style->underline)
- {
- PangoAttrList *attrs = pango_attr_list_new ();
- pango_attr_list_insert (attrs, pango_attr_underline_new (
- PANGO_UNDERLINE_SINGLE));
- pango_layout_set_attributes (font->layout, attrs);
- pango_attr_list_unref (attrs);
- }
- }
+ /* Set the text. */
+ if (ds_is_empty (&tmp))
+ pango_layout_set_text (font->layout, text, -1);
+ else
+ pango_layout_set_text (font->layout, ds_cstr (&tmp), ds_length (&tmp));
ds_destroy (&tmp);
pango_layout_set_alignment (font->layout,
if (options & TAB_ROTATE)
{
cairo_translate (xr->cairo,
- xr_to_pt (bb[H][0] + xr->x),
+ xr_to_pt (bb[H][0]),
xr_to_pt (bb[V][1] + xr->y));
cairo_rotate (xr->cairo, -M_PI_2);
}
else
cairo_translate (xr->cairo,
- xr_to_pt (bb[H][0] + xr->x),
+ xr_to_pt (bb[H][0]),
xr_to_pt (bb[V][0] + xr->y));
pango_cairo_show_layout (xr->cairo, font->layout);
cairo_save (xr->cairo);
cairo_set_source_rgb (xr->cairo, 1, 0, 0);
dump_rectangle (xr,
- pango_to_xr (extents.x) - xr->x,
+ pango_to_xr (extents.x),
pango_to_xr (extents.y) - xr->y,
- pango_to_xr (extents.x + extents.width) - xr->x,
+ pango_to_xr (extents.x + extents.width),
pango_to_xr (extents.y + extents.height) - xr->y);
cairo_restore (xr->cairo);
}
be useful for debugging issues with breaking. */
if (0)
{
- if (best && !xr->nest)
+ if (best)
dump_line (xr, -xr->left_margin, best,
xr->width + xr->right_margin, best,
RENDER_LINE_SINGLE,
{
if (clip[H][0] != clip[H][1])
{
- int offset = (xr->nest) * XR_POINT;
-
cairo_save (xr->cairo);
cairo_set_source_rgb (xr->cairo, 0, 0, 1);
- dump_rectangle (xr,
- bb[H][0] + offset, bb[V][0] + offset,
- bb[H][1] - offset, bb[V][1] - offset);
+ dump_rectangle (xr, bb[H][0], bb[V][0], bb[H][1], bb[V][1]);
cairo_restore (xr->cairo);
}
}
xr_flush,
};
\f
-/* GUI rendering helpers. */
-
-struct xr_rendering
- {
- struct output_item *item;
-
- /* Table items. */
- struct render_pager *p;
- struct xr_driver *xr;
- };
-
-#define CHART_WIDTH 500
-#define CHART_HEIGHT 375
-
-
-
struct xr_driver *
xr_driver_create (cairo_t *cairo, struct string_map *options)
{
- struct xr_driver *xr = xr_allocate ("cairo", 0, options);
+ struct xr_driver *xr = xr_allocate ("cairo", 0, options, 1.0);
xr_set_cairo (xr, cairo);
return xr;
}
output_driver_destroy (&xr->driver);
}
}
-
-static struct xr_rendering *
-xr_rendering_create_text (struct xr_driver *xr, const char *text, cairo_t *cr)
-{
- struct table_item *table_item;
- struct xr_rendering *r;
-
- table_item = table_item_create (table_from_string (TABLE_HALIGN_LEFT, text),
- NULL, NULL);
- r = xr_rendering_create (xr, &table_item->output_item, cr);
- table_item_unref (table_item);
-
- return r;
-}
-
-void
-xr_rendering_apply_options (struct xr_rendering *xr, struct string_map *o)
-{
- if (is_table_item (xr->item))
- apply_options (xr->xr, o);
-}
-
-struct xr_rendering *
-xr_rendering_create (struct xr_driver *xr, const struct output_item *item,
- cairo_t *cr)
-{
- struct xr_rendering *r = NULL;
-
- if (is_text_item (item))
- r = xr_rendering_create_text (xr, text_item_get_text (to_text_item (item)),
- cr);
- else if (is_message_item (item))
- {
- const struct message_item *message_item = to_message_item (item);
- char *s = msg_to_string (message_item_get_msg (message_item));
- r = xr_rendering_create_text (xr, s, cr);
- free (s);
- }
- else if (is_table_item (item))
- {
- r = xzalloc (sizeof *r);
- r->item = output_item_ref (item);
- r->xr = xr;
- xr_set_cairo (xr, cr);
- r->p = render_pager_create (xr->params, to_table_item (item));
- }
- else if (is_chart_item (item))
- {
- r = xzalloc (sizeof *r);
- r->item = output_item_ref (item);
- }
- else if (is_group_open_item (item))
- r = xr_rendering_create_text (xr, to_group_open_item (item)->command_name,
- cr);
-
- return r;
-}
-
-void
-xr_rendering_destroy (struct xr_rendering *r)
-{
- if (r)
- {
- output_item_unref (r->item);
- render_pager_destroy (r->p);
- free (r);
- }
-}
-
-void
-xr_rendering_measure (const struct xr_rendering *r, int *wp, int *hp)
-{
- int w, h;
-
- if (is_table_item (r->item))
- {
- w = render_pager_get_size (r->p, H) / XR_POINT;
- h = render_pager_get_size (r->p, V) / XR_POINT;
- }
- else
- {
- w = CHART_WIDTH;
- h = CHART_HEIGHT;
- }
-
- if (wp)
- *wp = w;
- if (hp)
- *hp = h;
-}
-
-static void xr_draw_chart (const struct chart_item *, cairo_t *,
- double x, double y, double width, double height);
-
-/* Draws onto CR */
-void
-xr_rendering_draw (struct xr_rendering *r, cairo_t *cr,
- int x0, int y0, int x1, int y1)
-{
- if (is_table_item (r->item))
- {
- struct xr_driver *xr = r->xr;
-
- xr_set_cairo (xr, cr);
-
- render_pager_draw_region (r->p, x0 * XR_POINT, y0 * XR_POINT,
- (x1 - x0) * XR_POINT, (y1 - y0) * XR_POINT);
- }
- else
- xr_draw_chart (to_chart_item (r->item), cr,
- 0, 0, CHART_WIDTH, CHART_HEIGHT);
-}
-
static void
xr_draw_chart (const struct chart_item *chart_item, cairo_t *cr,
double x, double y, double width, double height)
char *
xr_draw_png_chart (const struct chart_item *item,
const char *file_name_template, int number,
- const struct xr_color *fg,
- const struct xr_color *bg
- )
+ const struct cell_color *fg,
+ const struct cell_color *bg)
{
const int width = 640;
const int length = 480;
number_pos = strchr (file_name_template, '#');
if (number_pos != NULL)
- file_name = xasprintf ("%.*s%d%s", (int) (number_pos - file_name_template),
+ file_name = xasprintf ("%.*s%d%s.png", (int) (number_pos - file_name_template),
file_name_template, number, number_pos + 1);
else
- file_name = xstrdup (file_name_template);
+ file_name = xasprintf ("%s.png", file_name_template);
surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, width, length);
cr = cairo_create (surface);
- cairo_set_source_rgb (cr, bg->red, bg->green, bg->blue);
+ cairo_set_source_rgb (cr, bg->r / 255.0, bg->g / 255.0, bg->b / 255.0);
cairo_paint (cr);
- cairo_set_source_rgb (cr, fg->red, fg->green, fg->blue);
+ cairo_set_source_rgb (cr, fg->r / 255.0, fg->g / 255.0, fg->b / 255.0);
xr_draw_chart (item, cr, 0.0, 0.0, width, length);
return file_name;
}
-\f
-struct xr_table_state
- {
- struct xr_render_fsm fsm;
- struct render_pager *p;
- };
-
-static bool
-xr_table_render (struct xr_render_fsm *fsm, struct xr_driver *xr)
-{
- struct xr_table_state *ts = UP_CAST (fsm, struct xr_table_state, fsm);
-
- while (render_pager_has_next (ts->p))
- {
- int used;
-
- used = render_pager_draw_next (ts->p, xr->length - xr->y);
- if (!used)
- {
- assert (xr->y > 0);
- return true;
- }
- else
- xr->y += used;
- }
- return false;
-}
-
-static void
-xr_table_destroy (struct xr_render_fsm *fsm)
-{
- struct xr_table_state *ts = UP_CAST (fsm, struct xr_table_state, fsm);
-
- render_pager_destroy (ts->p);
- free (ts);
-}
-
-static struct xr_render_fsm *
-xr_render_table (struct xr_driver *xr, struct table_item *table_item)
-{
- struct xr_table_state *ts;
-
- ts = xmalloc (sizeof *ts);
- ts->fsm.render = xr_table_render;
- ts->fsm.destroy = xr_table_destroy;
-
- if (xr->y > 0)
- xr->y += xr->char_height;
-
- ts->p = render_pager_create (xr->params, table_item);
- table_item_unref (table_item);
-
- return &ts->fsm;
-}
-\f
-struct xr_chart_state
- {
- struct xr_render_fsm fsm;
- struct chart_item *chart_item;
- };
-
-static bool
-xr_chart_render (struct xr_render_fsm *fsm, struct xr_driver *xr)
-{
- struct xr_chart_state *cs = UP_CAST (fsm, struct xr_chart_state, fsm);
-
- const int chart_height = 0.8 * (xr->length < xr->width ? xr->length : xr->width);
-
- if (xr->y > xr->length - chart_height)
- return true;
-
- if (xr->cairo != NULL)
- {
- xr_draw_chart (cs->chart_item, xr->cairo,
- 0.0,
- xr_to_pt (xr->y),
- xr_to_pt (xr->width),
- xr_to_pt (chart_height));
- }
- xr->y += chart_height;
-
- return false;
-}
-
-static void
-xr_chart_destroy (struct xr_render_fsm *fsm)
-{
- struct xr_chart_state *cs = UP_CAST (fsm, struct xr_chart_state, fsm);
- chart_item_unref (cs->chart_item);
- free (cs);
-}
-static struct xr_render_fsm *
-xr_render_chart (const struct chart_item *chart_item)
+char *
+xr_draw_eps_chart (const struct chart_item *item,
+ const char *file_name_template, int number,
+ const struct cell_color *fg,
+ const struct cell_color *bg)
{
- struct xr_chart_state *cs;
+ const int width = 640;
+ const int length = 480;
- cs = xmalloc (sizeof *cs);
- cs->fsm.render = xr_chart_render;
- cs->fsm.destroy = xr_chart_destroy;
- cs->chart_item = chart_item_ref (chart_item);
+ cairo_surface_t *surface;
+ const char *number_pos;
+ char *file_name;
+ cairo_t *cr;
- return &cs->fsm;
-}
-\f
-static bool
-xr_eject_render (struct xr_render_fsm *fsm UNUSED, struct xr_driver *xr)
-{
- return xr->y > 0;
-}
+ number_pos = strchr (file_name_template, '#');
+ if (number_pos != NULL)
+ file_name = xasprintf ("%.*s%d%s.eps", (int) (number_pos - file_name_template),
+ file_name_template, number, number_pos + 1);
+ else
+ file_name = xasprintf ("%s.eps", file_name_template);
-static void
-xr_eject_destroy (struct xr_render_fsm *fsm UNUSED)
-{
- /* Nothing to do. */
-}
+ surface = cairo_ps_surface_create (file_name, width, length);
+ cairo_ps_surface_set_eps (surface, true);
+ cr = cairo_create (surface);
-static struct xr_render_fsm *
-xr_render_eject (void)
-{
- static struct xr_render_fsm eject_renderer =
- {
- xr_eject_render,
- xr_eject_destroy
- };
+ cairo_set_source_rgb (cr, bg->r / 255.0, bg->g / 255.0, bg->b / 255.0);
+ cairo_paint (cr);
- return &eject_renderer;
-}
-\f
-static struct xr_render_fsm *
-xr_render_text (struct xr_driver *xr, const struct text_item *text_item)
-{
- enum text_item_type type = text_item_get_type (text_item);
- const char *text = text_item_get_text (text_item);
+ cairo_set_source_rgb (cr, fg->r / 255.0, fg->g / 255.0, fg->b / 255.0);
- switch (type)
- {
- case TEXT_ITEM_PAGE_TITLE:
- string_map_replace (&xr->heading_vars, "PageTitle", text);
- break;
-
- case TEXT_ITEM_BLANK_LINE:
- if (xr->y > 0)
- xr->y += xr->char_height;
- break;
-
- case TEXT_ITEM_EJECT_PAGE:
- if (xr->y > 0)
- return xr_render_eject ();
- break;
-
- default:
- return xr_render_table (
- xr, text_item_to_table_item (text_item_ref (text_item)));
- }
+ xr_draw_chart (item, cr, 0.0, 0.0, width, length);
- return NULL;
-}
+ cairo_destroy (cr);
+ cairo_surface_destroy (surface);
-static struct xr_render_fsm *
-xr_render_message (struct xr_driver *xr,
- const struct message_item *message_item)
-{
- char *s = msg_to_string (message_item_get_msg (message_item));
- struct text_item *item = text_item_create (TEXT_ITEM_PARAGRAPH, s);
- free (s);
- return xr_render_table (xr, text_item_to_table_item (item));
+ return file_name;
}
-static struct xr_render_fsm *
-xr_render_output_item (struct xr_driver *xr,
- const struct output_item *output_item)
-{
- if (is_table_item (output_item))
- return xr_render_table (xr, table_item_ref (to_table_item (output_item)));
- else if (is_chart_item (output_item))
- return xr_render_chart (to_chart_item (output_item));
- else if (is_text_item (output_item))
- return xr_render_text (xr, to_text_item (output_item));
- else if (is_message_item (output_item))
- return xr_render_message (xr, to_message_item (output_item));
- else
- return NULL;
-}