X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcairo.c;h=03d090ba8ed26a5c0f1101caf0b9a5ba17581530;hb=a06dd54ab3d37656a1edfb8ee7de859cc0baac0e;hp=32369a7a0e5071e609cfbf863fc3981e676c8d8a;hpb=d523d6fa44e79bbca2b2cce792a7f25cca0d3aef;p=pspp diff --git a/src/output/cairo.c b/src/output/cairo.c index 32369a7a0e..03d090ba8e 100644 --- a/src/output/cairo.c +++ b/src/output/cairo.c @@ -20,6 +20,7 @@ #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" @@ -44,7 +45,6 @@ #include "output/options.h" #include "output/page-setup-item.h" #include "output/render.h" -#include "output/tab.h" #include "output/table-item.h" #include "output/table.h" #include "output/text-item.h" @@ -53,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -153,8 +154,10 @@ struct xr_driver 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; @@ -163,17 +166,13 @@ struct xr_driver /* Internal state. */ struct render_params *params; + 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; + int y; struct xr_render_fsm *fsm; - int nest; - struct string_map heading_vars; }; static const struct output_driver_class cairo_driver_class; @@ -189,7 +188,7 @@ static void xr_measure_cell_width (void *, const struct table_cell *, 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 *, @@ -214,37 +213,6 @@ opt (struct output_driver *d, struct string_map *options, const char *key, 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) { @@ -325,8 +293,11 @@ apply_options (struct xr_driver *xr, struct string_map *o) 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); @@ -356,14 +327,20 @@ apply_options (struct xr_driver *xr, struct string_map *o) } 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); @@ -408,6 +385,14 @@ xr_measure_fonts (cairo_t *cairo, const struct xr_font fonts[XR_N_FONTS], } } +static int +get_layout_height (PangoLayout *layout) +{ + int w, h; + pango_layout_get_size (layout, &w, &h); + return h; +} + static int xr_render_page_heading (cairo_t *cairo, const PangoFontDescription *font, const struct page_heading *ph, int page_number, @@ -426,10 +411,12 @@ xr_render_page_heading (cairo_t *cairo, const PangoFontDescription *font, pango_layout_set_markup (layout, markup, -1); free (markup); - pango_layout_set_alignment (layout, - (pp->halign == TAB_RIGHT ? PANGO_ALIGN_RIGHT - : pp->halign == TAB_LEFT ? PANGO_ALIGN_LEFT - : PANGO_ALIGN_CENTER)); + pango_layout_set_alignment ( + layout, + (pp->halign == TABLE_HALIGN_LEFT ? PANGO_ALIGN_LEFT + : pp->halign == TABLE_HALIGN_CENTER ? PANGO_ALIGN_CENTER + : pp->halign == TABLE_HALIGN_MIXED ? PANGO_ALIGN_LEFT + : PANGO_ALIGN_RIGHT)); pango_layout_set_width (layout, xr_to_pango (width)); if (draw) { @@ -439,9 +426,7 @@ xr_render_page_heading (cairo_t *cairo, const PangoFontDescription *font, cairo_restore (cairo); } - int w, h; - pango_layout_get_size (layout, &w, &h); - y += pango_to_xr (h); + y += pango_to_xr (get_layout_height (layout)); } g_object_unref (G_OBJECT (layout)); @@ -553,21 +538,19 @@ xr_set_cairo (struct xr_driver *xr, cairo_t *cairo) xr->params->rtl = render_direction_rtl (); } - cairo_set_source_rgb (xr->cairo, xr->fg.red, xr->fg.green, xr->fg.blue); + 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) @@ -577,20 +560,22 @@ xr_create (const char *file_name, enum settings_output_devices device_type, 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; } @@ -599,27 +584,21 @@ static struct output_driver * 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 @@ -635,9 +614,9 @@ xr_destroy (struct output_driver *driver) 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); @@ -750,19 +729,22 @@ xr_submit (struct output_driver *driver, const struct output_item *output_item) 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, @@ -824,20 +806,28 @@ 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 +set_source_rgba (cairo_t *cairo, const struct cell_color *color) +{ + cairo_set_source_rgba (cairo, + color->r / 255., color->g / 255., color->b / 255., + color->alpha / 255.); +} + static void dump_line (struct xr_driver *xr, int x0, int y0, int x1, int y1, int style, const struct cell_color *color) { cairo_new_path (xr->cairo); - cairo_set_source_rgb (xr->cairo, - color->r / 255.0, color->g / 255.0, color->b / 255.0); + 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); } @@ -846,12 +836,12 @@ 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_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 @@ -860,7 +850,7 @@ 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 (x0), xr_to_pt (y0 + xr->y), xr_to_pt (x1 - x0), xr_to_pt (y1 - y0)); cairo_fill (xr->cairo); } @@ -1056,11 +1046,11 @@ xr_measure_cell_width (void *xr_, const struct table_cell *cell, xr_layout_cell (xr, cell, bb, clip, min_width, &h, NULL); if (*min_width > 0) - *min_width += px_to_xr (cell->style->margin[H][0] - + cell->style->margin[H][1]); + *min_width += px_to_xr (cell->style->cell_style.margin[H][0] + + cell->style->cell_style.margin[H][1]); if (*max_width > 0) - *max_width += px_to_xr (cell->style->margin[H][0] - + cell->style->margin[H][1]); + *max_width += px_to_xr (cell->style->cell_style.margin[H][0] + + cell->style->cell_style.margin[H][1]); } static int @@ -1072,13 +1062,14 @@ xr_measure_cell_height (void *xr_, const struct table_cell *cell, int width) int w, h; bb[H][0] = 0; - bb[H][1] = width - px_to_xr (cell->style->margin[H][0] - + cell->style->margin[H][1]); + bb[H][1] = width - px_to_xr (cell->style->cell_style.margin[H][0] + + cell->style->cell_style.margin[H][1]); 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, bb, clip, &w, &h, NULL); - h += px_to_xr (cell->style->margin[V][0] + cell->style->margin[V][1]); + h += px_to_xr (cell->style->cell_style.margin[V][0] + + cell->style->cell_style.margin[V][1]); return h; } @@ -1086,47 +1077,46 @@ 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 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); - cairo_set_source_rgb (xr->cairo, - cell->style->bg[color_idx].r / 255., - cell->style->bg[color_idx].g / 255., - cell->style->bg[color_idx].b / 255.); - 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); - cairo_set_source_rgb (xr->cairo, - cell->style->fg[color_idx].r / 255., - cell->style->fg[color_idx].g / 255., - cell->style->fg[color_idx].b / 255.); + 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++) { - bb[axis][0] += px_to_xr (cell->style->margin[axis][0]); - bb[axis][1] -= px_to_xr (cell->style->margin[axis][1]); + bb[axis][0] += px_to_xr (cell->style->cell_style.margin[axis][0]); + bb[axis][1] -= px_to_xr (cell->style->cell_style.margin[axis][1]); } if (bb[H][0] < bb[H][1] && bb[V][0] < bb[V][1]) xr_layout_cell (xr, cell, bb, clip, &w, &h, &brk); @@ -1146,13 +1136,13 @@ xr_adjust_break (void *xr_, const struct table_cell *cell, return -1; bb[H][0] = 0; - bb[H][1] = width - px_to_xr (cell->style->margin[H][0] - + cell->style->margin[H][1]); + bb[H][1] = width - px_to_xr (cell->style->cell_style.margin[H][0] + + cell->style->cell_style.margin[H][1]); if (bb[H][1] <= 0) return 0; bb[V][0] = 0; - bb[V][1] = height - px_to_xr (cell->style->margin[V][0] - + cell->style->margin[V][1]); + bb[V][1] = height - px_to_xr (cell->style->cell_style.margin[V][0] + + cell->style->cell_style.margin[V][1]); clip[H][0] = clip[H][1] = clip[V][0] = clip[V][1] = 0; xr_layout_cell (xr, cell, bb, clip, &w, &h, &brk); return brk; @@ -1163,9 +1153,9 @@ xr_clip (struct xr_driver *xr, int clip[TABLE_N_AXES][2]) { 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); @@ -1174,31 +1164,45 @@ xr_clip (struct xr_driver *xr, int clip[TABLE_N_AXES][2]) } 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) -{ - 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; - } +markup_escape (struct string *out, unsigned int options, + const char *in, size_t len) +{ + 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 @@ -1214,7 +1218,8 @@ xr_layout_cell_text (struct xr_driver *xr, const struct table_cell *cell, int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2], int *widthp, int *brk) { - const struct cell_style *style = cell->style; + const struct font_style *font_style = &cell->style->font_style; + const struct cell_style *cell_style = &cell->style->cell_style; unsigned int options = cell->options; enum table_axis X = options & TAB_ROTATE ? V : H; @@ -1222,15 +1227,14 @@ xr_layout_cell_text (struct xr_driver *xr, const struct table_cell *cell, int R = options & TAB_ROTATE ? 0 : 1; struct xr_font *font = (options & TAB_FIX ? &xr->fonts[XR_FONT_FIXED] - : options & TAB_EMPH ? &xr->fonts[XR_FONT_EMPHASIS] : &xr->fonts[XR_FONT_PROPORTIONAL]); struct xr_font local_font; - if (cell->style->font) + if (font_style->typeface) { PangoFontDescription *desc = parse_font ( - style->font, - style->font_size ? style->font_size * 1000 * 72 / 128 : 10000, - style->bold, style->italic); + font_style->typeface, + font_style->size ? font_style->size * 1000 * xr->font_scale : 10000, + font_style->bold, font_style->italic); if (desc) { PangoLayout *layout = pango_cairo_create_layout (xr->cairo); @@ -1242,30 +1246,27 @@ xr_layout_cell_text (struct xr_driver *xr, const struct table_cell *cell, } } - int footnote_adjustment; - if (cell->n_footnotes == 0) - footnote_adjustment = 0; - else if (cell->n_footnotes == 1 && (options & TAB_HALIGN) == TAB_RIGHT) + const char *text = cell->text; + enum table_halign halign = table_halign_interpret ( + cell_style->halign, cell->options & TAB_NUMERIC); + if (cell_style->halign == TABLE_HALIGN_DECIMAL && !(options & TAB_ROTATE)) { - const char *marker = cell->footnotes[0]->marker; - pango_layout_set_text (font->layout, marker, strlen (marker)); + int margin_adjustment = -px_to_xr (cell_style->decimal_offset); - 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); + const char *decimal = strrchr (text, cell_style->decimal_char); + if (decimal) + { + pango_layout_set_text (font->layout, decimal, strlen (decimal)); + pango_layout_set_width (font->layout, -1); + margin_adjustment += get_layout_dimension (font->layout, H); + } - pango_layout_set_attributes (font->layout, NULL); + if (margin_adjustment < 0) + bb[H][1] += margin_adjustment; } - else - footnote_adjustment = px_to_xr (cell->style->margin[X][R]); struct string tmp = DS_EMPTY_INITIALIZER; - const char *text = cell->text; + 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 @@ -1281,7 +1282,23 @@ xr_layout_cell_text (struct xr_driver *xr, const struct table_cell *cell, 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] @@ -1289,78 +1306,112 @@ xr_layout_cell_text (struct xr_driver *xr, const struct table_cell *cell, && (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 (footnote_adjustment) + if (font_style->underline) { - 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 initial_length = ds_length (&tmp); + 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 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 (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 (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, - ((options & TAB_HALIGN) == TAB_RIGHT ? PANGO_ALIGN_RIGHT - : (options & TAB_HALIGN) == TAB_LEFT ? PANGO_ALIGN_LEFT - : PANGO_ALIGN_CENTER)); + pango_layout_set_alignment (font->layout, + (halign == TABLE_HALIGN_RIGHT ? PANGO_ALIGN_RIGHT + : halign == TABLE_HALIGN_LEFT ? PANGO_ALIGN_LEFT + : PANGO_ALIGN_CENTER)); pango_layout_set_width ( font->layout, bb[X][1] == INT_MAX ? -1 : xr_to_pango (bb[X][1] - bb[X][0])); @@ -1374,13 +1425,13 @@ xr_layout_cell_text (struct xr_driver *xr, const struct table_cell *cell, 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); @@ -1399,9 +1450,9 @@ xr_layout_cell_text (struct xr_driver *xr, const struct table_cell *cell, 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); } @@ -1421,7 +1472,7 @@ xr_layout_cell_text (struct xr_driver *xr, const struct table_cell *cell, if (bb[V][0] + h >= bb[V][1] && !(options & TAB_ROTATE)) { PangoLayoutIter *iter; - int best UNUSED = 0; + int best = 0; /* Choose a breakpoint between lines instead of in the middle of one. */ iter = pango_layout_get_iter (font->layout); @@ -1455,7 +1506,7 @@ xr_layout_cell_text (struct xr_driver *xr, const struct table_cell *cell, 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, @@ -1488,13 +1539,9 @@ xr_layout_cell (struct xr_driver *xr, const struct table_cell *cell, { 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); } } @@ -1538,7 +1585,7 @@ struct xr_rendering 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; } @@ -1561,8 +1608,7 @@ 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 (TAB_LEFT, text), - NULL, NULL); + table_item = table_item_create (table_from_string (text), NULL, NULL); r = xr_rendering_create (xr, &table_item->output_item, cr); table_item_unref (table_item); @@ -1624,18 +1670,25 @@ xr_rendering_destroy (struct xr_rendering *r) } void -xr_rendering_measure (struct xr_rendering *r, int *w, int *h) +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; + 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; + 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 *, @@ -1698,9 +1751,8 @@ xr_draw_chart (const struct chart_item *chart_item, cairo_t *cr, 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; @@ -1713,18 +1765,18 @@ xr_draw_png_chart (const struct chart_item *item, 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); @@ -1738,7 +1790,48 @@ xr_draw_png_chart (const struct chart_item *item, return file_name; } + + +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) +{ + const int width = 640; + const int length = 480; + + cairo_surface_t *surface; + const char *number_pos; + char *file_name; + cairo_t *cr; + + 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); + + surface = cairo_ps_surface_create (file_name, width, length); + cairo_ps_surface_set_eps (surface, true); + cr = cairo_create (surface); + + 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->r / 255.0, fg->g / 255.0, fg->b / 255.0); + + xr_draw_chart (item, cr, 0.0, 0.0, width, length); + + cairo_destroy (cr); + cairo_surface_destroy (surface); + + return file_name; +} + + struct xr_table_state { struct xr_render_fsm fsm; @@ -1872,17 +1965,10 @@ 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); 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: @@ -1903,7 +1989,7 @@ 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); + struct text_item *item = text_item_create (TEXT_ITEM_LOG, s); free (s); return xr_render_table (xr, text_item_to_table_item (item)); } @@ -1923,3 +2009,23 @@ xr_render_output_item (struct xr_driver *xr, else return NULL; } + +bool +xr_draw_svg_file (struct xr_rendering *r, + const char *filename) +{ + int width, height; + g_assert (r); + xr_rendering_measure (r, &width, &height); + cairo_surface_t *surface = cairo_svg_surface_create (filename, width, height); + if (!surface) + { + g_error ("Could not create cairo svg surface with file %s", filename); + return FALSE; + } + cairo_t *cr = cairo_create (surface); + xr_rendering_draw (r, cr, 0, 0, width, height); + cairo_destroy (cr); + cairo_surface_destroy (surface); + return TRUE; +}