#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 <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>
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;
+ double font_scale;
int char_width, char_height;
char *command_name;
char *title;
return driver_option_get (d, options, key, default_value);
}
+static int
+lookup_color_name (const char *s)
+{
+ struct color
+ {
+ struct hmap_node hmap_node;
+ const char *name;
+ int code;
+ };
+
+ static struct color colors[] =
+ {
+ { .name = "aliceblue", .code = 0xf0f8ff },
+ { .name = "antiquewhite", .code = 0xfaebd7 },
+ { .name = "aqua", .code = 0x00ffff },
+ { .name = "aquamarine", .code = 0x7fffd4 },
+ { .name = "azure", .code = 0xf0ffff },
+ { .name = "beige", .code = 0xf5f5dc },
+ { .name = "bisque", .code = 0xffe4c4 },
+ { .name = "black", .code = 0x000000 },
+ { .name = "blanchedalmond", .code = 0xffebcd },
+ { .name = "blue", .code = 0x0000ff },
+ { .name = "blueviolet", .code = 0x8a2be2 },
+ { .name = "brown", .code = 0xa52a2a },
+ { .name = "burlywood", .code = 0xdeb887 },
+ { .name = "cadetblue", .code = 0x5f9ea0 },
+ { .name = "chartreuse", .code = 0x7fff00 },
+ { .name = "chocolate", .code = 0xd2691e },
+ { .name = "coral", .code = 0xff7f50 },
+ { .name = "cornflowerblue", .code = 0x6495ed },
+ { .name = "cornsilk", .code = 0xfff8dc },
+ { .name = "crimson", .code = 0xdc143c },
+ { .name = "cyan", .code = 0x00ffff },
+ { .name = "darkblue", .code = 0x00008b },
+ { .name = "darkcyan", .code = 0x008b8b },
+ { .name = "darkgoldenrod", .code = 0xb8860b },
+ { .name = "darkgray", .code = 0xa9a9a9 },
+ { .name = "darkgreen", .code = 0x006400 },
+ { .name = "darkgrey", .code = 0xa9a9a9 },
+ { .name = "darkkhaki", .code = 0xbdb76b },
+ { .name = "darkmagenta", .code = 0x8b008b },
+ { .name = "darkolivegreen", .code = 0x556b2f },
+ { .name = "darkorange", .code = 0xff8c00 },
+ { .name = "darkorchid", .code = 0x9932cc },
+ { .name = "darkred", .code = 0x8b0000 },
+ { .name = "darksalmon", .code = 0xe9967a },
+ { .name = "darkseagreen", .code = 0x8fbc8f },
+ { .name = "darkslateblue", .code = 0x483d8b },
+ { .name = "darkslategray", .code = 0x2f4f4f },
+ { .name = "darkslategrey", .code = 0x2f4f4f },
+ { .name = "darkturquoise", .code = 0x00ced1 },
+ { .name = "darkviolet", .code = 0x9400d3 },
+ { .name = "deeppink", .code = 0xff1493 },
+ { .name = "deepskyblue", .code = 0x00bfff },
+ { .name = "dimgray", .code = 0x696969 },
+ { .name = "dimgrey", .code = 0x696969 },
+ { .name = "dodgerblue", .code = 0x1e90ff },
+ { .name = "firebrick", .code = 0xb22222 },
+ { .name = "floralwhite", .code = 0xfffaf0 },
+ { .name = "forestgreen", .code = 0x228b22 },
+ { .name = "fuchsia", .code = 0xff00ff },
+ { .name = "gainsboro", .code = 0xdcdcdc },
+ { .name = "ghostwhite", .code = 0xf8f8ff },
+ { .name = "gold", .code = 0xffd700 },
+ { .name = "goldenrod", .code = 0xdaa520 },
+ { .name = "gray", .code = 0x808080 },
+ { .name = "green", .code = 0x008000 },
+ { .name = "greenyellow", .code = 0xadff2f },
+ { .name = "grey", .code = 0x808080 },
+ { .name = "honeydew", .code = 0xf0fff0 },
+ { .name = "hotpink", .code = 0xff69b4 },
+ { .name = "indianred", .code = 0xcd5c5c },
+ { .name = "indigo", .code = 0x4b0082 },
+ { .name = "ivory", .code = 0xfffff0 },
+ { .name = "khaki", .code = 0xf0e68c },
+ { .name = "lavender", .code = 0xe6e6fa },
+ { .name = "lavenderblush", .code = 0xfff0f5 },
+ { .name = "lawngreen", .code = 0x7cfc00 },
+ { .name = "lemonchiffon", .code = 0xfffacd },
+ { .name = "lightblue", .code = 0xadd8e6 },
+ { .name = "lightcoral", .code = 0xf08080 },
+ { .name = "lightcyan", .code = 0xe0ffff },
+ { .name = "lightgoldenrodyellow", .code = 0xfafad2 },
+ { .name = "lightgray", .code = 0xd3d3d3 },
+ { .name = "lightgreen", .code = 0x90ee90 },
+ { .name = "lightgrey", .code = 0xd3d3d3 },
+ { .name = "lightpink", .code = 0xffb6c1 },
+ { .name = "lightsalmon", .code = 0xffa07a },
+ { .name = "lightseagreen", .code = 0x20b2aa },
+ { .name = "lightskyblue", .code = 0x87cefa },
+ { .name = "lightslategray", .code = 0x778899 },
+ { .name = "lightslategrey", .code = 0x778899 },
+ { .name = "lightsteelblue", .code = 0xb0c4de },
+ { .name = "lightyellow", .code = 0xffffe0 },
+ { .name = "lime", .code = 0x00ff00 },
+ { .name = "limegreen", .code = 0x32cd32 },
+ { .name = "linen", .code = 0xfaf0e6 },
+ { .name = "magenta", .code = 0xff00ff },
+ { .name = "maroon", .code = 0x800000 },
+ { .name = "mediumaquamarine", .code = 0x66cdaa },
+ { .name = "mediumblue", .code = 0x0000cd },
+ { .name = "mediumorchid", .code = 0xba55d3 },
+ { .name = "mediumpurple", .code = 0x9370db },
+ { .name = "mediumseagreen", .code = 0x3cb371 },
+ { .name = "mediumslateblue", .code = 0x7b68ee },
+ { .name = "mediumspringgreen", .code = 0x00fa9a },
+ { .name = "mediumturquoise", .code = 0x48d1cc },
+ { .name = "mediumvioletred", .code = 0xc71585 },
+ { .name = "midnightblue", .code = 0x191970 },
+ { .name = "mintcream", .code = 0xf5fffa },
+ { .name = "mistyrose", .code = 0xffe4e1 },
+ { .name = "moccasin", .code = 0xffe4b5 },
+ { .name = "navajowhite", .code = 0xffdead },
+ { .name = "navy", .code = 0x000080 },
+ { .name = "oldlace", .code = 0xfdf5e6 },
+ { .name = "olive", .code = 0x808000 },
+ { .name = "olivedrab", .code = 0x6b8e23 },
+ { .name = "orange", .code = 0xffa500 },
+ { .name = "orangered", .code = 0xff4500 },
+ { .name = "orchid", .code = 0xda70d6 },
+ { .name = "palegoldenrod", .code = 0xeee8aa },
+ { .name = "palegreen", .code = 0x98fb98 },
+ { .name = "paleturquoise", .code = 0xafeeee },
+ { .name = "palevioletred", .code = 0xdb7093 },
+ { .name = "papayawhip", .code = 0xffefd5 },
+ { .name = "peachpuff", .code = 0xffdab9 },
+ { .name = "peru", .code = 0xcd853f },
+ { .name = "pink", .code = 0xffc0cb },
+ { .name = "plum", .code = 0xdda0dd },
+ { .name = "powderblue", .code = 0xb0e0e6 },
+ { .name = "purple", .code = 0x800080 },
+ { .name = "red", .code = 0xff0000 },
+ { .name = "rosybrown", .code = 0xbc8f8f },
+ { .name = "royalblue", .code = 0x4169e1 },
+ { .name = "saddlebrown", .code = 0x8b4513 },
+ { .name = "salmon", .code = 0xfa8072 },
+ { .name = "sandybrown", .code = 0xf4a460 },
+ { .name = "seagreen", .code = 0x2e8b57 },
+ { .name = "seashell", .code = 0xfff5ee },
+ { .name = "sienna", .code = 0xa0522d },
+ { .name = "silver", .code = 0xc0c0c0 },
+ { .name = "skyblue", .code = 0x87ceeb },
+ { .name = "slateblue", .code = 0x6a5acd },
+ { .name = "slategray", .code = 0x708090 },
+ { .name = "slategrey", .code = 0x708090 },
+ { .name = "snow", .code = 0xfffafa },
+ { .name = "springgreen", .code = 0x00ff7f },
+ { .name = "steelblue", .code = 0x4682b4 },
+ { .name = "tan", .code = 0xd2b48c },
+ { .name = "teal", .code = 0x008080 },
+ { .name = "thistle", .code = 0xd8bfd8 },
+ { .name = "tomato", .code = 0xff6347 },
+ { .name = "turquoise", .code = 0x40e0d0 },
+ { .name = "violet", .code = 0xee82ee },
+ { .name = "wheat", .code = 0xf5deb3 },
+ { .name = "white", .code = 0xffffff },
+ { .name = "whitesmoke", .code = 0xf5f5f5 },
+ { .name = "yellow", .code = 0xffff00 },
+ { .name = "yellowgreen", .code = 0x9acd32 },
+ };
+
+ static struct hmap color_table = HMAP_INITIALIZER (color_table);
+
+ if (hmap_is_empty (&color_table))
+ for (size_t i = 0; i < sizeof colors / sizeof *colors; i++)
+ hmap_insert (&color_table, &colors[i].hmap_node,
+ hash_string (colors[i].name, 0));
+
+ const struct color *color;
+ HMAP_FOR_EACH_WITH_HASH (color, struct color, hmap_node,
+ hash_string (s, 0), &color_table)
+ if (!strcmp (color->name, s))
+ return color->code;
+ return -1;
+}
+
+static bool
+parse_color__ (const char *s, struct cell_color *color)
+{
+ /* #rrrrggggbbbb */
+ uint16_t r16, g16, b16;
+ int len;
+ if (sscanf (s, "#%4"SCNx16"%4"SCNx16"%4"SCNx16"%n",
+ &r16, &g16, &b16, &len) == 3
+ && len == 13
+ && !s[len])
+ {
+ color->r = r16 >> 8;
+ color->g = g16 >> 8;
+ color->b = b16 >> 8;
+ return true;
+ }
+
+ /* #rrggbb */
+ uint8_t r, g, b;
+ if (sscanf (s, "#%2"SCNx8"%2"SCNx8"%2"SCNx8"%n", &r, &g, &b, &len) == 3
+ && len == 7
+ && !s[len])
+ {
+ color->r = r;
+ color->g = g;
+ color->b = b;
+ return true;
+ }
+
+ /* rrggbb */
+ if (sscanf (s, "%2"SCNx8"%2"SCNx8"%2"SCNx8"%n", &r, &g, &b, &len) == 3
+ && len == 6
+ && !s[len])
+ {
+ color->r = r;
+ color->g = g;
+ color->b = b;
+ return true;
+ }
+
+ /* rgb(r,g,b) */
+ if (sscanf (s, "rgb (%"SCNi8" , %"SCNi8" , %"SCNi8") %n",
+ &r, &g, &b, &len) == 3
+ && !s[len])
+ {
+ color->r = r;
+ color->g = g;
+ color->b = b;
+ return true;
+ }
+
+ /* rgba(r,g,b,a), ignoring a. */
+ if (sscanf (s, "rgba (%"SCNi8" , %"SCNi8" , %"SCNi8", %*f) %n",
+ &r, &g, &b, &len) == 3
+ && !s[len])
+ {
+ color->r = r;
+ color->g = g;
+ color->b = b;
+ return true;
+ }
+
+ int code = lookup_color_name (s);
+ if (code >= 0)
+ {
+ color->r = code >> 16;
+ color->g = code >> 8;
+ color->b = code;
+ return true;
+ }
+
+ return false;
+}
+
/* 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
void
parse_color (struct output_driver *d, struct string_map *options,
const char *key, const char *default_value,
- struct xr_color *color)
+ struct cell_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;
- }
- }
-
+ if (!parse_color__ (string, color) && !parse_color__ (default_value, color))
+ *color = (struct cell_color) CELL_COLOR_BLACK;
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_color (d, o, "background-color", "#FFFFFFFFFFFF", &xr->bg);
parse_color (d, o, "foreground-color", "#000000000000", &xr->fg);
+ 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);
left_margin = parse_dimension (opt (d, o, "left-margin", ".5in"));
}
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;
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);
return xr;
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 *
cairo_status_t status;
double width_pt, length_pt;
- xr = xr_allocate (file_name, device_type, o);
+ xr = xr_allocate (file_name, device_type, o, 72.0 / 128.0);
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);
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);
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]));
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
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]);
for (int axis = 0; axis < TABLE_N_AXES; axis++)
{
}
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
{
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 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 (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,
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;
}
struct table_item *table_item;
struct xr_rendering *r;
- table_item = table_item_create (table_from_string (TABLE_HALIGN_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);
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;
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);
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 ();
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));
}
projects / pspp / blobdiff