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;
struct xr_render_fsm *fsm;
- int nest;
struct string_map heading_vars;
};
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 *,
}
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, 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);
+ 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
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])
{
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->cell_style.margin[axis][0]);
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);
}
}
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);
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;
+}
+
\f
+
struct xr_table_state
{
struct xr_render_fsm fsm;
projects / pspp / blobdiff