#include "output/cairo-pager.h"
#include "output/driver-provider.h"
#include "output/options.h"
+#include "output/output-item.h"
#include "output/table.h"
#include <cairo/cairo-pdf.h>
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"));
},
.initial_page_number = 1,
- .object_spacing = object_spacing,
.include_outline = include_outline,
};
.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,
+ .object_spacing = object_spacing,
.font_resolution = font_resolution,
};
},
.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++)
[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,
+ .object_spacing = setup->object_spacing * 72 * XR_POINT,
.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,
}
static void
-xr_submit (struct output_driver *driver, const struct output_item *output_item)
+xr_submit (struct output_driver *driver, const struct output_item *item)
{
struct xr_driver *xr = xr_driver_cast (driver);
- if (is_page_setup_item (output_item))
+ if (item->type == OUTPUT_ITEM_PAGE_SETUP)
{
if (!xr->pager)
- xr_update_page_setup (driver,
- to_page_setup_item (output_item)->page_setup);
+ xr_update_page_setup (driver, item->page_setup);
return;
}
xr_pager_add_page (xr->pager, cairo_create (xr->drawing_surface));
}
- xr_pager_add_item (xr->pager, output_item);
+ xr_pager_add_item (xr->pager, item);
while (xr_pager_needs_new_page (xr->pager))
{
xr_finish_page (xr);