min_break[a] = size[a] / 2;
int font_size = parse_int (opt (d, o, "font-size", "10000"), 1000, 1000000);
- PangoFontDescription *fixed_font = parse_font_option
- (d, o, "fixed-font", "monospace", font_size, false, false);
- PangoFontDescription *proportional_font = parse_font_option (
- d, o, "prop-font", "sans serif", font_size, false, false);
+ PangoFontDescription *font = parse_font_option (
+ d, o, "prop-font", "Sans Serif", font_size, false, false);
struct cell_color fg = parse_color (opt (d, o, "foreground-color", "black"));
xr->trim = parse_boolean (opt (d, o, "trim", "false"));
+ /* Cairo 1.16.0 has a bug that causes crashes if outlines are enabled at the
+ same time as trimming:
+ https://lists.cairographics.org/archives/cairo/2020-December/029151.html
+ For now, just disable the outline if trimming is enabled. */
+ bool include_outline
+ = (output_type == XR_PDF
+ && parse_boolean (opt (d, o, "outline", xr->trim ? "false" : "true")));
+
xr->page_style = xmalloc (sizeof *xr->page_style);
*xr->page_style = (struct xr_page_style) {
.ref_cnt = 1,
.initial_page_number = 1,
.object_spacing = object_spacing,
+ .include_outline = include_outline,
};
xr->fsm_style = xmalloc (sizeof *xr->fsm_style);
.ref_cnt = 1,
.size = { [H] = size[H], [V] = size[V] },
.min_break = { [H] = min_break[H], [V] = min_break[V] },
- .fonts = {
- [XR_FONT_PROPORTIONAL] = proportional_font,
- [XR_FONT_FIXED] = fixed_font,
- },
+ .font = font,
.fg = fg,
.use_system_colors = systemcolors,
.font_resolution = font_resolution,
static void
xr_finish_page (struct xr_driver *xr)
{
+ xr_pager_finish_page (xr->pager);
+
/* For 'trim' true:
- If the destination is PDF or PostScript, set the dest surface size, copy
if (xr->pager)
xr_finish_page (xr);
+ xr_pager_destroy (xr->pager);
+
if (xr->drawing_surface && xr->drawing_surface != xr->dest_surface)
cairo_surface_destroy (xr->drawing_surface);
if (xr->dest_surface)
cairo_surface_destroy (xr->dest_surface);
}
- xr_pager_destroy (xr->pager);
xr_page_style_unref (xr->page_style);
xr_fsm_style_unref (xr->fsm_style);
free (xr);
static void
xr_update_page_setup (struct output_driver *driver,
- const struct page_setup *ps)
+ const struct page_setup *setup)
{
struct xr_driver *xr = xr_driver_cast (driver);
const double scale = 72 * XR_POINT;
- int swap = ps->orientation == PAGE_LANDSCAPE;
+ int swap = setup->orientation == PAGE_LANDSCAPE;
enum table_axis h = H ^ swap;
enum table_axis v = V ^ swap;
- xr_page_style_unref (xr->page_style);
+ struct xr_page_style *old_ps = xr->page_style;
xr->page_style = xmalloc (sizeof *xr->page_style);
*xr->page_style = (struct xr_page_style) {
.ref_cnt = 1,
.margins = {
- [H] = { ps->margins[h][0] * scale, ps->margins[h][1] * scale },
- [V] = { ps->margins[v][0] * scale, ps->margins[v][1] * scale },
+ [H] = { setup->margins[h][0] * scale, setup->margins[h][1] * scale },
+ [V] = { setup->margins[v][0] * scale, setup->margins[v][1] * scale },
},
- .initial_page_number = ps->initial_page_number,
- .object_spacing = ps->object_spacing * 72 * XR_POINT,
+ .initial_page_number = setup->initial_page_number,
+ .object_spacing = setup->object_spacing * 72 * XR_POINT,
+ .include_outline = old_ps->include_outline,
};
for (size_t i = 0; i < 2; i++)
- page_heading_copy (&xr->page_style->headings[i], &ps->headings[i]);
+ page_heading_copy (&xr->page_style->headings[i], &setup->headings[i]);
+ xr_page_style_unref (old_ps);
struct xr_fsm_style *old_fs = xr->fsm_style;
xr->fsm_style = xmalloc (sizeof *xr->fsm_style);
*xr->fsm_style = (struct xr_fsm_style) {
.ref_cnt = 1,
- .size = { [H] = ps->paper[H] * scale, [V] = ps->paper[V] * scale },
+ .size = { [H] = setup->paper[H] * scale, [V] = setup->paper[V] * scale },
.min_break = {
- [H] = ps->paper[H] * scale / 2,
- [V] = ps->paper[V] * scale / 2,
+ [H] = setup->paper[H] * scale / 2,
+ [V] = setup->paper[V] * scale / 2,
},
+ .font = pango_font_description_copy (old_fs->font),
.fg = old_fs->fg,
.use_system_colors = old_fs->use_system_colors,
.font_resolution = old_fs->font_resolution,
};
- for (size_t i = 0; i < XR_N_FONTS; i++)
- xr->fsm_style->fonts[i] = pango_font_description_copy (old_fs->fonts[i]);
xr_fsm_style_unref (old_fs);
- xr_set_surface_size (xr->dest_surface, xr->output_type, ps->paper[H] * 72.0,
- ps->paper[V] * 72.0);
+ xr_set_surface_size (xr->dest_surface, xr->output_type,
+ setup->paper[H] * 72.0, setup->paper[V] * 72.0);
}
static void