X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcairo.c;h=8cb504d2dd0e877309fb916a241e69439de031bc;hb=19616643b06c6f27463ecbd725ae25be0bf1cfd1;hp=22e060cf936d33bd915a235e5a563be139312f8d;hpb=d2ee46757c7602fb0d6827136fdb00af1140e2e1;p=pspp diff --git a/src/output/cairo.c b/src/output/cairo.c index 22e060cf93..8cb504d2dd 100644 --- a/src/output/cairo.c +++ b/src/output/cairo.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc. + Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,15 +25,18 @@ #include "libpspp/str.h" #include "libpspp/string-map.h" #include "libpspp/version.h" +#include "data/file-handle-def.h" #include "output/cairo-chart.h" #include "output/chart-item-provider.h" #include "output/charts/boxplot.h" #include "output/charts/np-plot.h" #include "output/charts/piechart.h" +#include "output/charts/barchart.h" #include "output/charts/plot-hist.h" #include "output/charts/roc-chart.h" #include "output/charts/spreadlevel-plot.h" #include "output/charts/scree.h" +#include "output/charts/scatterplot.h" #include "output/driver-provider.h" #include "output/message-item.h" #include "output/options.h" @@ -89,6 +92,7 @@ enum xr_font_type XR_FONT_PROPORTIONAL, XR_FONT_EMPHASIS, XR_FONT_FIXED, + XR_FONT_MARKER, XR_N_FONTS }; @@ -131,6 +135,8 @@ struct xr_driver int line_space; /* Space between lines. */ int line_width; /* Width of lines. */ + int cell_margin; + int min_break[TABLE_N_AXES]; /* Min cell size to break across pages. */ struct xr_color bg; /* Background color */ @@ -157,13 +163,13 @@ static void xr_driver_run_fsm (struct xr_driver *); static void xr_draw_line (void *, int bb[TABLE_N_AXES][2], enum render_line_style styles[TABLE_N_AXES][2]); static void xr_measure_cell_width (void *, const struct table_cell *, - int *min, int *max); + int footnote_idx, int *min, int *max); static int xr_measure_cell_height (void *, const struct table_cell *, - int width); -static void xr_draw_cell (void *, const struct table_cell *, + int footnote_idx, int width); +static void xr_draw_cell (void *, const struct table_cell *, int footnote_idx, int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2]); -static int xr_adjust_break (void *, const struct table_cell *, +static int xr_adjust_break (void *, const struct table_cell *, int footnote_idx, int width, int height); static struct xr_render_fsm *xr_render_output_item ( @@ -280,8 +286,10 @@ apply_options (struct xr_driver *xr, struct string_map *o) "serif", font_size); xr->fonts[XR_FONT_EMPHASIS].desc = parse_font (d, o, "emph-font", "serif italic", font_size); + xr->fonts[XR_FONT_MARKER].desc = parse_font (d, o, "marker-font", "serif", + font_size * PANGO_SCALE_X_SMALL); - xr->line_gutter = parse_dimension (opt (d, o, "gutter", "3pt")) * scale; + xr->line_gutter = XR_POINT / 2; xr->line_space = XR_POINT; xr->line_width = XR_POINT / 2; xr->page_number = 0; @@ -363,6 +371,7 @@ xr_set_cairo (struct xr_driver *xr, cairo_t *cairo) xr->char_width = MAX (xr->char_width, pango_to_xr (char_width)); xr->char_height = MAX (xr->char_height, pango_to_xr (char_height)); } + xr->cell_margin = xr->char_width; if (xr->params == NULL) { @@ -467,24 +476,30 @@ xr_create (const char *file_name, enum settings_output_devices device_type, } static struct output_driver * -xr_pdf_create (const char *file_name, enum settings_output_devices device_type, +xr_pdf_create (struct file_handle *fh, enum settings_output_devices device_type, struct string_map *o) { - return xr_create (file_name, device_type, o, XR_PDF); + struct output_driver *od = xr_create (fh_get_file_name (fh), device_type, o, XR_PDF); + fh_unref (fh); + return od ; } static struct output_driver * -xr_ps_create (const char *file_name, enum settings_output_devices device_type, +xr_ps_create (struct file_handle *fh, enum settings_output_devices device_type, struct string_map *o) { - return xr_create (file_name, device_type, o, XR_PS); + struct output_driver *od = xr_create (fh_get_file_name (fh), device_type, o, XR_PS); + fh_unref (fh); + return od ; } static struct output_driver * -xr_svg_create (const char *file_name, enum settings_output_devices device_type, +xr_svg_create (struct file_handle *fh, enum settings_output_devices device_type, struct string_map *o) { - return xr_create (file_name, device_type, o, XR_SVG); + struct output_driver *od = xr_create (fh_get_file_name (fh), device_type, o, XR_SVG); + fh_unref (fh); + return od ; } static void @@ -531,44 +546,6 @@ xr_flush (struct output_driver *driver) cairo_surface_flush (cairo_get_target (xr->cairo)); } -static void -xr_init_caption_cell (const char *caption, struct table_cell *cell, - struct cell_contents *contents) -{ - contents->options = TAB_LEFT; - contents->text = CONST_CAST (char *, caption); - contents->table = NULL; - cell->contents = contents; - cell->n_contents = 1; - cell->destructor = NULL; -} - -static struct render_pager * -xr_render_table_item (struct xr_driver *xr, const struct table_item *item, - int *caption_widthp, int *caption_heightp) -{ - const char *caption = table_item_get_caption (item); - - if (caption != NULL) - { - /* XXX doesn't do well with very large captions */ - struct cell_contents contents; - int min_width, max_width; - struct table_cell cell; - - xr_init_caption_cell (caption, &cell, &contents); - - xr_measure_cell_width (xr, &cell, &min_width, &max_width); - *caption_widthp = MIN (max_width, xr->width); - *caption_heightp = xr_measure_cell_height (xr, &cell, *caption_widthp); - } - else - *caption_heightp = 0; - - return render_pager_create (render_page_create (xr->params, - table_item_get_table (item))); -} - static void xr_submit (struct output_driver *driver, const struct output_item *output_item) { @@ -594,24 +571,19 @@ xr_submit (struct output_driver *driver, const struct output_item *output_item) See the big comment in cairo.h for intended usage. */ -/* Gives new page CAIRO to XR for output. CAIRO may be null to skip actually - rendering the page (which might be useful to find out how many pages an - output document has without actually rendering it). */ +/* Gives new page CAIRO to XR for output. */ void xr_driver_next_page (struct xr_driver *xr, cairo_t *cairo) { - if (cairo != NULL) - { - 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); - - cairo_translate (cairo, - xr_to_pt (xr->left_margin), - xr_to_pt (xr->top_margin)); - } + 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); + + cairo_translate (cairo, + xr_to_pt (xr->left_margin), + xr_to_pt (xr->top_margin)); xr->page_number++; xr->cairo = cairo; @@ -665,7 +637,7 @@ xr_driver_run_fsm (struct xr_driver *xr) } static void -xr_layout_cell (struct xr_driver *, const struct table_cell *, +xr_layout_cell (struct xr_driver *, const struct table_cell *, int footnote_idx, int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2], int *width, int *height, int *brk); @@ -739,9 +711,9 @@ xr_draw_line (void *xr_, int bb[TABLE_N_AXES][2], const int x3 = bb[H][1]; const int y3 = bb[V][1]; const int top = styles[H][0]; - const int left = styles[V][0]; const int bottom = styles[H][1]; - const int right = styles[V][1]; + const int start_of_line = render_direction_rtl() ? styles[V][1]: styles[V][0]; + const int end_of_line = render_direction_rtl() ? styles[V][0]: styles[V][1]; /* The algorithm here is somewhat subtle, to allow it to handle all the kinds of intersections that we need. @@ -781,7 +753,7 @@ xr_draw_line (void *xr_, int bb[TABLE_N_AXES][2], (It doesn't make sense to have different kinds of line on the same axis, so we don't try to gracefully handle that case.) */ bool double_vert = top == RENDER_LINE_DOUBLE || bottom == RENDER_LINE_DOUBLE; - bool double_horz = left == RENDER_LINE_DOUBLE || right == RENDER_LINE_DOUBLE; + bool double_horz = start_of_line == RENDER_LINE_DOUBLE || end_of_line == RENDER_LINE_DOUBLE; /* When horizontal lines are doubled, the left-side line along y1 normally runs from x0 to x2, @@ -816,8 +788,8 @@ xr_draw_line (void *xr_, int bb[TABLE_N_AXES][2], int x1 = xc - horz_line_ofs; int x2 = xc + horz_line_ofs; - bool shorten_x1_lines = left == RENDER_LINE_DOUBLE; - bool shorten_x2_lines = right == RENDER_LINE_DOUBLE; + bool shorten_x1_lines = start_of_line == RENDER_LINE_DOUBLE; + bool shorten_x2_lines = end_of_line == RENDER_LINE_DOUBLE; bool shorten_xc_line = shorten_x1_lines && shorten_x2_lines; int vert_line_ofs = double_horz ? double_line_ofs : 0; int yc = (y0 + y3) / 2; @@ -825,11 +797,11 @@ xr_draw_line (void *xr_, int bb[TABLE_N_AXES][2], int y2 = yc + vert_line_ofs; if (!double_horz) - horz_line (xr, x0, x1, x2, x3, yc, left, right, shorten_yc_line); + horz_line (xr, x0, x1, x2, x3, yc, start_of_line, end_of_line, shorten_yc_line); else { - horz_line (xr, x0, x1, x2, x3, y1, left, right, shorten_y1_lines); - horz_line (xr, x0, x1, x2, x3, y2, left, right, shorten_y2_lines); + horz_line (xr, x0, x1, x2, x3, y1, start_of_line, end_of_line, shorten_y1_lines); + horz_line (xr, x0, x1, x2, x3, y2, start_of_line, end_of_line, shorten_y2_lines); } if (!double_vert) @@ -843,7 +815,7 @@ xr_draw_line (void *xr_, int bb[TABLE_N_AXES][2], static void xr_measure_cell_width (void *xr_, const struct table_cell *cell, - int *min_width, int *max_width) + int footnote_idx, int *min_width, int *max_width) { struct xr_driver *xr = xr_; int bb[TABLE_N_AXES][2]; @@ -855,14 +827,20 @@ xr_measure_cell_width (void *xr_, const struct table_cell *cell, 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, max_width, &h, NULL); + xr_layout_cell (xr, cell, footnote_idx, bb, clip, max_width, &h, NULL); bb[H][1] = 1; - xr_layout_cell (xr, cell, bb, clip, min_width, &h, NULL); + xr_layout_cell (xr, cell, footnote_idx, bb, clip, min_width, &h, NULL); + + if (*min_width > 0) + *min_width += xr->cell_margin * 2; + if (*max_width > 0) + *max_width += xr->cell_margin * 2; } static int -xr_measure_cell_height (void *xr_, const struct table_cell *cell, int width) +xr_measure_cell_height (void *xr_, const struct table_cell *cell, + int footnote_idx, int width) { struct xr_driver *xr = xr_; int bb[TABLE_N_AXES][2]; @@ -870,26 +848,30 @@ xr_measure_cell_height (void *xr_, const struct table_cell *cell, int width) int w, h; bb[H][0] = 0; - bb[H][1] = width; + bb[H][1] = width - xr->cell_margin * 2; 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); + xr_layout_cell (xr, cell, footnote_idx, bb, clip, &w, &h, NULL); return h; } static void -xr_draw_cell (void *xr_, const struct table_cell *cell, +xr_draw_cell (void *xr_, const struct table_cell *cell, int footnote_idx, int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2]) { struct xr_driver *xr = xr_; int w, h, brk; - xr_layout_cell (xr, cell, bb, clip, &w, &h, &brk); + bb[H][0] += xr->cell_margin; + bb[H][1] -= xr->cell_margin; + if (bb[H][0] >= bb[H][1]) + return; + xr_layout_cell (xr, cell, footnote_idx, bb, clip, &w, &h, &brk); } static int -xr_adjust_break (void *xr_, const struct table_cell *cell, +xr_adjust_break (void *xr_, const struct table_cell *cell, int footnote_idx, int width, int height) { struct xr_driver *xr = xr_; @@ -897,15 +879,17 @@ xr_adjust_break (void *xr_, const struct table_cell *cell, int clip[TABLE_N_AXES][2]; int w, h, brk; - if (xr_measure_cell_height (xr_, cell, width) < height) + if (xr_measure_cell_height (xr_, cell, footnote_idx, width) < height) return -1; bb[H][0] = 0; - bb[H][1] = width; + bb[H][1] = width - 2 * xr->cell_margin; + if (bb[H][1] <= 0) + return 0; bb[V][0] = 0; bb[V][1] = height; clip[H][0] = clip[H][1] = clip[V][0] = clip[V][1] = 0; - xr_layout_cell (xr, cell, bb, clip, &w, &h, &brk); + xr_layout_cell (xr, cell, footnote_idx, bb, clip, &w, &h, &brk); return brk; } @@ -924,21 +908,99 @@ 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) +{ + attr->start_index = start_index; + pango_attr_list_insert (list, attr); +} + static int xr_layout_cell_text (struct xr_driver *xr, - const struct cell_contents *contents, + const struct cell_contents *contents, int footnote_idx, int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2], int y, int *widthp, int *brk) { unsigned int options = contents->options; struct xr_font *font; + bool merge_footnotes; + size_t length; int w, h; + if (contents->n_footnotes == 0) + merge_footnotes = false; + else if (contents->n_footnotes == 1 && (options & TAB_ALIGNMENT) == TAB_RIGHT) + { + PangoAttrList *attrs; + char marker[16]; + + font = &xr->fonts[XR_FONT_MARKER]; + + str_format_26adic (footnote_idx + 1, false, marker, sizeof marker); + pango_layout_set_text (font->layout, marker, strlen (marker)); + + 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); + + pango_layout_get_size (font->layout, &w, &h); + merge_footnotes = w > xr->cell_margin; + if (!merge_footnotes && clip[H][0] != clip[H][1]) + { + cairo_save (xr->cairo); + xr_clip (xr, clip); + cairo_translate (xr->cairo, + xr_to_pt (bb[H][1] + xr->x), + xr_to_pt (y + xr->y)); + pango_layout_set_alignment (font->layout, PANGO_ALIGN_LEFT); + pango_layout_set_width (font->layout, -1); + pango_cairo_show_layout (xr->cairo, font->layout); + cairo_restore (xr->cairo); + } + + pango_layout_set_attributes (font->layout, NULL); + } + else + merge_footnotes = true; + font = (options & TAB_FIX ? &xr->fonts[XR_FONT_FIXED] : options & TAB_EMPH ? &xr->fonts[XR_FONT_EMPHASIS] : &xr->fonts[XR_FONT_PROPORTIONAL]); - pango_layout_set_text (font->layout, contents->text, -1); + length = strlen (contents->text); + if (merge_footnotes) + { + PangoAttrList *attrs; + struct string s; + size_t i; + + bb[H][1] += xr->cell_margin; + + ds_init_empty (&s); + ds_extend (&s, length + contents->n_footnotes * 10); + ds_put_cstr (&s, contents->text); + for (i = 0; i < contents->n_footnotes; i++) + { + char marker[16]; + + if (i > 0) + ds_put_byte (&s, ','); + str_format_26adic (footnote_idx + i + 1, false, marker, sizeof marker); + ds_put_cstr (&s, marker); + } + pango_layout_set_text (font->layout, ds_cstr (&s), ds_length (&s)); + ds_destroy (&s); + + attrs = pango_attr_list_new (); + add_attr_with_start (attrs, pango_attr_rise_new (7000), length); + add_attr_with_start ( + attrs, pango_attr_font_desc_new (xr->fonts[XR_FONT_MARKER].desc), length); + pango_layout_set_attributes (font->layout, attrs); + pango_attr_list_unref (attrs); + } + else + pango_layout_set_text (font->layout, contents->text, -1); pango_layout_set_alignment ( font->layout, @@ -1016,12 +1078,14 @@ xr_layout_cell_text (struct xr_driver *xr, { if (brk && clip[H][0] != clip[H][1]) best = bottom; - *brk = bottom; + if (brk) + *brk = bottom; } else break; } while (pango_layout_iter_next_line (iter)); + pango_layout_iter_free (iter); /* If enabled, draws a green line across the chosen breakpoint, which can be useful for debugging issues with breaking. */ @@ -1036,16 +1100,18 @@ xr_layout_cell_text (struct xr_driver *xr, } } } + + pango_layout_set_attributes (font->layout, NULL); return y + h; } static int xr_layout_cell_subtable (struct xr_driver *xr, const struct cell_contents *contents, + int footnote_idx UNUSED, int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2], int *widthp, int *brk) { - const struct table *table = contents->table; int single_width, double_width; struct render_params params; struct render_pager *p; @@ -1074,7 +1140,7 @@ xr_layout_cell_subtable (struct xr_driver *xr, } xr->nest++; - p = render_pager_create (render_page_create (¶ms, table)); + p = render_pager_create (¶ms, contents->table); width = render_pager_get_size (p, H); height = render_pager_get_size (p, V); if (bb[V][0] + height >= bb[V][1]) @@ -1116,6 +1182,7 @@ xr_layout_cell_subtable (struct xr_driver *xr, static void xr_layout_cell (struct xr_driver *xr, const struct table_cell *cell, + int footnote_idx, int bb_[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2], int *width, int *height, int *brk) { @@ -1162,29 +1229,15 @@ xr_layout_cell (struct xr_driver *xr, const struct table_cell *cell, } if (contents->text) - bb[V][0] = xr_layout_cell_text (xr, contents, bb, clip, + bb[V][0] = xr_layout_cell_text (xr, contents, footnote_idx, bb, clip, bb[V][0], width, brk); else - bb[V][0] = xr_layout_cell_subtable (xr, contents, bb, clip, width, brk); + bb[V][0] = xr_layout_cell_subtable (xr, contents, footnote_idx, + bb, clip, width, brk); + footnote_idx += contents->n_footnotes; } *height = bb[V][0] - bb_[V][0]; } - -static void -xr_draw_title (struct xr_driver *xr, const char *title, - int title_width, int title_height) -{ - struct cell_contents contents; - struct table_cell cell; - int bb[TABLE_N_AXES][2]; - - xr_init_caption_cell (title, &cell, &contents); - bb[H][0] = 0; - bb[H][1] = title_width; - bb[V][0] = 0; - bb[V][1] = title_height; - xr_draw_cell (xr, &cell, bb, bb); -} struct output_driver_factory pdf_driver_factory = { "pdf", "pspp.pdf", xr_pdf_create }; @@ -1210,8 +1263,6 @@ struct xr_rendering /* Table items. */ struct render_pager *p; struct xr_driver *xr; - int title_width; - int title_height; }; #define CHART_WIDTH 500 @@ -1249,14 +1300,15 @@ 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); + table_item = table_item_create (table_from_string (TAB_LEFT, text), + NULL, NULL); r = xr_rendering_create (xr, &table_item->output_item, cr); table_item_unref (table_item); return r; } -void +void xr_rendering_apply_options (struct xr_rendering *xr, struct string_map *o) { if (is_table_item (xr->item)) @@ -1286,8 +1338,7 @@ xr_rendering_create (struct xr_driver *xr, const struct output_item *item, r->item = output_item_ref (item); r->xr = xr; xr_set_cairo (xr, cr); - r->p = xr_render_table_item (xr, to_table_item (item), - &r->title_width, &r->title_height); + r->p = render_pager_create (xr->params, to_table_item (item)); } else if (is_chart_item (item)) { @@ -1314,10 +1365,8 @@ xr_rendering_measure (struct xr_rendering *r, int *w, int *h) { if (is_table_item (r->item)) { - int w0 = render_pager_get_size (r->p, H); - int w1 = r->title_width; - *w = MAX (w0, w1) / XR_POINT; - *h = (render_pager_get_size (r->p, V) + r->title_height) / XR_POINT; + *w = render_pager_get_size (r->p, H) / XR_POINT; + *h = render_pager_get_size (r->p, V) / XR_POINT; } else { @@ -1329,11 +1378,9 @@ xr_rendering_measure (struct xr_rendering *r, int *w, int *h) static void xr_draw_chart (const struct chart_item *, cairo_t *, double x, double y, double width, double height); -/* Draws onto CR at least the region of R that is enclosed in (X,Y)-(X+W,Y+H), - and possibly some additional parts. */ +/* Draws onto CR */ void -xr_rendering_draw (struct xr_rendering *r, cairo_t *cr, - int x, int y, int w, int h) +xr_rendering_draw_all (struct xr_rendering *r, cairo_t *cr) { if (is_table_item (r->item)) { @@ -1341,17 +1388,8 @@ xr_rendering_draw (struct xr_rendering *r, cairo_t *cr, xr_set_cairo (xr, cr); - if (r->title_height > 0) - { - xr->y = 0; - xr_draw_title (xr, table_item_get_caption (to_table_item (r->item)), - r->title_width, r->title_height); - } + render_pager_draw (r->p); - xr->y = r->title_height; - render_pager_draw_region (r->p, - x * XR_POINT, (y * XR_POINT) - r->title_height, - w * XR_POINT, h * XR_POINT); } else xr_draw_chart (to_chart_item (r->item), cr, @@ -1376,12 +1414,16 @@ xr_draw_chart (const struct chart_item *chart_item, cairo_t *cr, xrchart_draw_np_plot (chart_item, cr, &geom); else if (is_piechart (chart_item)) xrchart_draw_piechart (chart_item, cr, &geom); + else if (is_barchart (chart_item)) + xrchart_draw_barchart (chart_item, cr, &geom); else if (is_roc_chart (chart_item)) xrchart_draw_roc (chart_item, cr, &geom); else if (is_scree (chart_item)) xrchart_draw_scree (chart_item, cr, &geom); else if (is_spreadlevel_plot_chart (chart_item)) xrchart_draw_spreadlevel (chart_item, cr, &geom); + else if (is_scatterplot_chart (chart_item)) + xrchart_draw_scatterplot (chart_item, cr, &geom); else NOT_REACHED (); xrchart_geometry_free (cr, &geom); @@ -1438,7 +1480,6 @@ struct xr_table_state struct xr_render_fsm fsm; struct table_item *table_item; struct render_pager *p; - int caption_height; }; static bool @@ -1448,28 +1489,16 @@ xr_table_render (struct xr_render_fsm *fsm, struct xr_driver *xr) while (render_pager_has_next (ts->p)) { - int caption_height = ts->caption_height; int used; - xr->y += caption_height; used = render_pager_draw_next (ts->p, xr->length - xr->y); - xr->y -= caption_height; if (!used) { assert (xr->y > 0); return true; } else - { - if (ts->caption_height) - { - if (xr->cairo) - xr_draw_title (xr, table_item_get_caption (ts->table_item), - xr->width, ts->caption_height); - ts->caption_height = 0; - } - xr->y += caption_height + used; - } + xr->y += used; } return false; } @@ -1488,7 +1517,6 @@ static struct xr_render_fsm * xr_render_table (struct xr_driver *xr, const struct table_item *table_item) { struct xr_table_state *ts; - int caption_width; ts = xmalloc (sizeof *ts); ts->fsm.render = xr_table_render; @@ -1498,9 +1526,7 @@ xr_render_table (struct xr_driver *xr, const struct table_item *table_item) if (xr->y > 0) xr->y += xr->char_height; - ts->p = xr_render_table_item (xr, table_item, - &caption_width, &ts->caption_height); - xr->params->size[V] = xr->length - ts->caption_height; + ts->p = render_pager_create (xr->params, table_item); return &ts->fsm; } @@ -1516,13 +1542,20 @@ xr_chart_render (struct xr_render_fsm *fsm, struct xr_driver *xr) { struct xr_chart_state *cs = UP_CAST (fsm, struct xr_chart_state, fsm); - if (xr->y > 0) + const int chart_height = xr->length; + + if (xr->y > xr->length - chart_height) return true; if (xr->cairo != NULL) - xr_draw_chart (cs->chart_item, xr->cairo, 0.0, 0.0, - xr_to_pt (xr->width), xr_to_pt (xr->length)); - xr->y = xr->length; + { + xr_draw_chart (cs->chart_item, xr->cairo, + 0.0, + xr_to_pt (xr->y), + xr_to_pt (xr->width), + xr_to_pt (chart_height)); + } + xr->y += chart_height; return false; } @@ -1579,7 +1612,8 @@ xr_create_text_renderer (struct xr_driver *xr, const char *text) struct table_item *table_item; struct xr_render_fsm *fsm; - table_item = table_item_create (table_from_string (TAB_LEFT, text), NULL); + table_item = table_item_create (table_from_string (TAB_LEFT, text), + NULL, NULL); fsm = xr_render_table (xr, table_item); table_item_unref (table_item);