cairo: Fix rendering of wide titles for GUI rendering.

[pspp-builds.git] / src / output / cairo.c

diff --git a/src/output/cairo.c b/src/output/cairo.c
index 896f3d5fe7cdc2a62fa561f3776d7625b9cbb37d..866be03f6528eaa084bbb39de04078f3670c6d4e 100644 (file)
--- a/src/output/cairo.c
+++ b/src/output/cairo.c
@@ -95,10 +95,8 @@ enum xr_font_type
 /* A font for use with Cairo. */
 struct xr_font
   {
 /* A font for use with Cairo. */
 struct xr_font
   {

-    char *string;

     PangoFontDescription *desc;
     PangoLayout *layout;
     PangoFontDescription *desc;
     PangoLayout *layout;

-    PangoFontMetrics *metrics;

   };
 
 /* An output item whose rendering is in progress. */
   };
 
 /* An output item whose rendering is in progress. */


@@ -119,10 +117,7 @@ struct xr_driver
     struct output_driver driver;
 
     /* User parameters. */
     struct output_driver driver;
 
     /* User parameters. */

-    bool headers;               /* Draw headers at top of page? */
-

     struct xr_font fonts[XR_N_FONTS];
     struct xr_font fonts[XR_N_FONTS];

-    int font_height;            /* In XR units. */

 
     int width;                  /* Page width minus margins. */
     int length;                 /* Page length minus margins and header. */
 
     int width;                  /* Page width minus margins. */
     int length;                 /* Page length minus margins and header. */


@@ -138,6 +133,7 @@ struct xr_driver
 
     /* Internal state. */
     struct render_params *params;
 
     /* Internal state. */
     struct render_params *params;

+    int char_width, char_height;

     char *command_name;
     char *title;
     char *subtitle;
     char *command_name;
     char *title;
     char *subtitle;


@@ -149,13 +145,9 @@ struct xr_driver
 
 static const struct output_driver_class cairo_driver_class;
 
 
 static const struct output_driver_class cairo_driver_class;
 

-static void draw_headers (struct xr_driver *);

 static void xr_driver_destroy_fsm (struct xr_driver *);
 static void xr_driver_run_fsm (struct xr_driver *);
 
 static void xr_driver_destroy_fsm (struct xr_driver *);
 static void xr_driver_run_fsm (struct xr_driver *);
 

-static bool load_font (struct xr_driver *, struct xr_font *);
-static void free_font (struct xr_font *);
-

 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 *,
 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 *,


@@ -185,56 +177,126 @@ opt (struct output_driver *d, struct string_map *options, const char *key,
   return driver_option_get (d, options, key, default_value);
 }
 
   return driver_option_get (d, options, key, default_value);
 }
 

+static PangoFontDescription *
+parse_font (struct output_driver *d, struct string_map *options,
+            const char *key, const char *default_value,
+            int default_points)
+{
+  PangoFontDescription *desc;
+  char *string;
+
+  /* Parse KEY as a font description. */
+  string = parse_string (opt (d, options, key, default_value));
+  desc = pango_font_description_from_string (string);
+  if (desc == NULL)
+    {
+      error (0, 0, _("`%s': bad font specification"), string);
+
+      /* Fall back to DEFAULT_VALUE, which had better be a valid font
+         description. */
+      desc = pango_font_description_from_string (default_value);
+      assert (desc != NULL);
+    }
+  free (string);
+
+  /* If the font description didn't include an explicit font size, then set it
+     to DEFAULT_POINTS. */
+  if (!(pango_font_description_get_set_fields (desc) & PANGO_FONT_MASK_SIZE))
+    pango_font_description_set_size (desc,
+                                     default_points / 1000.0 * PANGO_SCALE);
+
+  return desc;
+}
+

 static struct xr_driver *
 xr_allocate (const char *name, int device_type, struct string_map *o)
 {
   int paper_width, paper_length;
   struct output_driver *d;
   struct xr_driver *xr;
 static struct xr_driver *
 xr_allocate (const char *name, int device_type, struct string_map *o)
 {
   int paper_width, paper_length;
   struct output_driver *d;
   struct xr_driver *xr;

+  int font_points;

 
   xr = xzalloc (sizeof *xr);
   d = &xr->driver;
   output_driver_init (d, &cairo_driver_class, name, device_type);
 
   xr = xzalloc (sizeof *xr);
   d = &xr->driver;
   output_driver_init (d, &cairo_driver_class, name, device_type);

-  xr->font_height = XR_POINT * 10;
-  xr->fonts[XR_FONT_FIXED].string
-    = parse_string (opt (d, o, "fixed-font", "monospace"));
-  xr->fonts[XR_FONT_PROPORTIONAL].string
-    = parse_string (opt (d, o, "prop-font", "serif"));
-  xr->fonts[XR_FONT_EMPHASIS].string
-    = parse_string (opt (d, o, "emph-font", "serif italic"));
+
+  font_points = parse_int (opt (d, o, "font-size", "10000"),
+                           1000, 1000000);
+  xr->fonts[XR_FONT_FIXED].desc = parse_font (d, o, "fixed-font", "monospace",
+                                              font_points);
+  xr->fonts[XR_FONT_PROPORTIONAL].desc = parse_font (d, o, "prop-font",
+                                                     "serif", font_points);
+  xr->fonts[XR_FONT_EMPHASIS].desc = parse_font (d, o, "emph-font",
+                                                 "serif italic", font_points);
+

   xr->line_gutter = XR_POINT;
   xr->line_space = XR_POINT;
   xr->line_width = XR_POINT / 2;
   xr->page_number = 0;
 
   xr->line_gutter = XR_POINT;
   xr->line_space = XR_POINT;
   xr->line_width = XR_POINT / 2;
   xr->page_number = 0;
 

-  xr->headers = parse_boolean (opt (d, o, "headers", "true"));
-

   parse_paper_size (opt (d, o, "paper-size", ""), &paper_width, &paper_length);
   xr->left_margin = parse_dimension (opt (d, o, "left-margin", ".5in"));
   xr->right_margin = parse_dimension (opt (d, o, "right-margin", ".5in"));
   xr->top_margin = parse_dimension (opt (d, o, "top-margin", ".5in"));
   xr->bottom_margin = parse_dimension (opt (d, o, "bottom-margin", ".5in"));
 
   parse_paper_size (opt (d, o, "paper-size", ""), &paper_width, &paper_length);
   xr->left_margin = parse_dimension (opt (d, o, "left-margin", ".5in"));
   xr->right_margin = parse_dimension (opt (d, o, "right-margin", ".5in"));
   xr->top_margin = parse_dimension (opt (d, o, "top-margin", ".5in"));
   xr->bottom_margin = parse_dimension (opt (d, o, "bottom-margin", ".5in"));
 

-  if (xr->headers)
-    xr->top_margin += 3 * xr->font_height;

   xr->width = paper_width - xr->left_margin - xr->right_margin;
   xr->length = paper_length - xr->top_margin - xr->bottom_margin;
 
   return xr;
 }
 
   xr->width = paper_width - xr->left_margin - xr->right_margin;
   xr->length = paper_length - xr->top_margin - xr->bottom_margin;
 
   return xr;
 }
 

+static bool
+xr_is_72dpi (cairo_t *cr)
+{
+  cairo_surface_type_t type;
+  cairo_surface_t *surface;
+
+  surface = cairo_get_target (cr);
+  type = cairo_surface_get_type (surface);
+  return type == CAIRO_SURFACE_TYPE_PDF || type == CAIRO_SURFACE_TYPE_PS;
+}
+

 static bool
 xr_set_cairo (struct xr_driver *xr, cairo_t *cairo)
 {
 static bool
 xr_set_cairo (struct xr_driver *xr, cairo_t *cairo)
 {

+  PangoContext *context;
+  PangoFontMap *map;

   int i;
 
   xr->cairo = cairo;
 
   cairo_set_line_width (xr->cairo, xr_to_pt (xr->line_width));
 
   int i;
 
   xr->cairo = cairo;
 
   cairo_set_line_width (xr->cairo, xr_to_pt (xr->line_width));
 

+  map = pango_cairo_font_map_get_default ();
+  context = pango_cairo_font_map_create_context (PANGO_CAIRO_FONT_MAP (map));
+  if (xr_is_72dpi (cairo))
+    {
+      /* Pango seems to always scale fonts according to the DPI specified
+         in the font map, even if the surface has a real DPI.  The default
+         DPI is 96, so on a 72 DPI device fonts end up being 96/72 = 133%
+         of their desired size.  We deal with this by fixing the resolution
+         here.  Presumably there is a better solution, but what? */
+      pango_cairo_context_set_resolution (context, 72.0);
+    }
+
+  xr->char_width = 0;
+  xr->char_height = 0;

   for (i = 0; i < XR_N_FONTS; i++)
   for (i = 0; i < XR_N_FONTS; i++)

-    if (!load_font (xr, &xr->fonts[i]))
-      return false;
+    {
+      struct xr_font *font = &xr->fonts[i];
+      int char_width, char_height;
+
+      font->layout = pango_layout_new (context);
+      pango_layout_set_font_description (font->layout, font->desc);
+
+      pango_layout_set_text (font->layout, "0", 1);
+      pango_layout_get_size (font->layout, &char_width, &char_height);
+      xr->char_width = MAX (xr->char_width, char_width);
+      xr->char_height = MAX (xr->char_height, char_height);
+    }
+
+  g_object_unref (G_OBJECT (context));

 
   if (xr->params == NULL)
     {
 
   if (xr->params == NULL)
     {


@@ -248,8 +310,8 @@ xr_set_cairo (struct xr_driver *xr, cairo_t *cairo)
       xr->params->aux = xr;
       xr->params->size[H] = xr->width;
       xr->params->size[V] = xr->length;
       xr->params->aux = xr;
       xr->params->size[H] = xr->width;
       xr->params->size[V] = xr->length;

-      xr->params->font_size[H] = xr->font_height / 2; /* XXX */
-      xr->params->font_size[V] = xr->font_height;
+      xr->params->font_size[H] = xr->char_width;
+      xr->params->font_size[V] = xr->char_height;

 
       single_width = 2 * xr->line_gutter + xr->line_width;
       double_width = 2 * xr->line_gutter + xr->line_space + 2 * xr->line_width;
 
       single_width = 2 * xr->line_gutter + xr->line_width;
       double_width = 2 * xr->line_gutter + xr->line_space + 2 * xr->line_width;


@@ -292,7 +354,7 @@ xr_create (const char *file_name, enum settings_output_devices device_type,
   status = cairo_surface_status (surface);
   if (status != CAIRO_STATUS_SUCCESS)
     {
   status = cairo_surface_status (surface);
   if (status != CAIRO_STATUS_SUCCESS)
     {

-      error (0, 0, _("error opening output file \"%s\": %s"),
+      error (0, 0, _("error opening output file `%s': %s"),

              file_name, cairo_status_to_string (status));
       cairo_surface_destroy (surface);
       goto error;
              file_name, cairo_status_to_string (status));
       cairo_surface_destroy (surface);
       goto error;


@@ -307,29 +369,26 @@ xr_create (const char *file_name, enum settings_output_devices device_type,
   cairo_save (xr->cairo);
   xr_driver_next_page (xr, xr->cairo);
 
   cairo_save (xr->cairo);
   xr_driver_next_page (xr, xr->cairo);
 

-  if (xr->width / (xr->font_height / 2) < MIN_WIDTH)
+  if (xr->width / xr->char_width < MIN_WIDTH)

     {
       error (0, 0, _("The defined page is not wide enough to hold at least %d "
                      "characters in the default font.  In fact, there's only "
                      "room for %d characters."),
              MIN_WIDTH,
     {
       error (0, 0, _("The defined page is not wide enough to hold at least %d "
                      "characters in the default font.  In fact, there's only "
                      "room for %d characters."),
              MIN_WIDTH,

-             xr->width / (xr->font_height / 2));
+             xr->width / xr->char_width);

       goto error;
     }
 
       goto error;
     }
 

-  if (xr->length / xr->font_height < MIN_LENGTH)
+  if (xr->length / xr->char_height < MIN_LENGTH)

     {
     {

-      error (0, 0, _("The defined page is not long "
-                     "enough to hold margins and headers, plus least %d "
-                     "lines of the default fonts.  In fact, there's only "
+      error (0, 0, _("The defined page is not long enough to hold at least %d "
+                     "lines in the default font.  In fact, there's only "

                      "room for %d lines."),
              MIN_LENGTH,
                      "room for %d lines."),
              MIN_LENGTH,

-             xr->length / xr->font_height);
+             xr->length / xr->char_height);

       goto error;
     }
 
       goto error;
     }
 

-  draw_headers (xr);
-

   return &xr->driver;
 
  error:
   return &xr->driver;
 
  error:


@@ -381,7 +440,15 @@ xr_destroy (struct output_driver *driver)
 
   free (xr->command_name);
   for (i = 0; i < XR_N_FONTS; i++)
 
   free (xr->command_name);
   for (i = 0; i < XR_N_FONTS; i++)

-    free_font (&xr->fonts[i]);
+    {
+      struct xr_font *font = &xr->fonts[i];
+
+      if (font->desc != NULL)
+        pango_font_description_free (font->desc);
+      if (font->layout != NULL)
+        g_object_unref (font->layout);
+    }
+

   free (xr->params);
   free (xr);
 }
   free (xr->params);
   free (xr);
 }


@@ -404,16 +471,21 @@ xr_init_caption_cell (const char *caption, struct table_cell *cell)
 
 static struct render_page *
 xr_render_table_item (struct xr_driver *xr, const struct table_item *item,
 
 static struct render_page *
 xr_render_table_item (struct xr_driver *xr, const struct table_item *item,

-                      int *caption_heightp)
+                      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 */
 {
   const char *caption = table_item_get_caption (item);
 
   if (caption != NULL)
     {
       /* XXX doesn't do well with very large captions */

+      int min_width, max_width;

       struct table_cell cell;
       struct table_cell cell;

+

       xr_init_caption_cell (caption, &cell);
       xr_init_caption_cell (caption, &cell);

-      *caption_heightp = xr_measure_cell_height (xr, &cell, xr->width);
+
+      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;
     }
   else
     *caption_heightp = 0;


@@ -437,7 +509,7 @@ xr_submit (struct output_driver *driver, const struct output_item *output_item)
 }
 \f
 /* Functions for rendering a series of output items to a series of Cairo
 }
 \f
 /* Functions for rendering a series of output items to a series of Cairo

-   contexts, with pagination, possibly including headers.
+   contexts, with pagination.

 
    Used by PSPPIRE for printing, and by the basic Cairo output driver above as
    its underlying implementation.
 
    Used by PSPPIRE for printing, and by the basic Cairo output driver above as
    its underlying implementation.


@@ -458,7 +530,6 @@ xr_driver_next_page (struct xr_driver *xr, cairo_t *cairo)
   xr->page_number++;
   xr->cairo = cairo;
   xr->y = 0;
   xr->page_number++;
   xr->cairo = cairo;
   xr->y = 0;

-  draw_headers (xr);

   xr_driver_run_fsm (xr);
 }
 
   xr_driver_run_fsm (xr);
 }
 


@@ -483,8 +554,7 @@ xr_driver_need_new_page (const struct xr_driver *xr)
   return xr->fsm != NULL;
 }
 
   return xr->fsm != NULL;
 }
 

-/* Returns true if the current page doesn't have any content yet (besides
-   headers, if enabled). */
+/* Returns true if the current page doesn't have any content yet. */

 bool
 xr_driver_is_page_blank (const struct xr_driver *xr)
 {
 bool
 xr_driver_is_page_blank (const struct xr_driver *xr)
 {


@@ -720,79 +790,6 @@ xr_draw_cell (void *xr_, const struct table_cell *cell,
   xr_layout_cell (xr, cell, bb, clip, PANGO_WRAP_WORD, &w, &h);
 }
 \f
   xr_layout_cell (xr, cell, bb, clip, PANGO_WRAP_WORD, &w, &h);
 }
 \f

-/* Writes STRING at location (X,Y) trimmed to the given MAX_WIDTH
-   and with the given cell OPTIONS for XR. */
-static int
-draw_text (struct xr_driver *xr, const char *string, int x, int y,
-           int max_width, unsigned int options)
-{
-  struct table_cell cell;
-  int bb[TABLE_N_AXES][2];
-  int w, h;
-
-  cell.contents = string;
-  cell.options = options;
-  bb[H][0] = x;
-  bb[V][0] = y - xr->y;
-  bb[H][1] = x + max_width;
-  bb[V][1] = xr->font_height - xr->y;
-  xr_layout_cell (xr, &cell, bb, bb, PANGO_WRAP_WORD_CHAR, &w, &h);
-  return w;
-}
-
-/* Writes LEFT left-justified and RIGHT right-justified within
-   (X0...X1) at Y.  LEFT or RIGHT or both may be null. */
-static void
-draw_header_line (struct xr_driver *xr, const char *left, const char *right,
-                  int x0, int x1, int y)
-{
-  int right_width = 0;
-  if (right != NULL)
-    right_width = (draw_text (xr, right, x0, y, x1 - x0, TAB_RIGHT)
-                   + xr->font_height / 2);
-  if (left != NULL)
-    draw_text (xr, left, x0, y, x1 - x0 - right_width, TAB_LEFT);
-}
-
-/* Draw top of page headers for XR. */
-static void
-draw_headers (struct xr_driver *xr)
-{
-  char *r1, *r2;
-  int x0, x1;
-  int y;
-
-  if (!xr->headers || xr->cairo == NULL)
-    return;
-
-  y = -3 * xr->font_height;
-  x0 = xr->font_height / 2;
-  x1 = xr->width - xr->font_height / 2;
-
-  /* Draw box. */
-  cairo_rectangle (xr->cairo, 0, xr_to_pt (y), xr_to_pt (xr->width),
-                   xr_to_pt (2 * (xr->font_height
-                                  + xr->line_width + xr->line_gutter)));
-  cairo_save (xr->cairo);
-  cairo_set_source_rgb (xr->cairo, 0.9, 0.9, 0.9);
-  cairo_fill_preserve (xr->cairo);
-  cairo_restore (xr->cairo);
-  cairo_stroke (xr->cairo);
-
-  y += xr->line_width + xr->line_gutter;
-
-  r1 = xasprintf (_("%s - Page %d"), get_start_date (), xr->page_number);
-  r2 = xasprintf ("%s - %s", version, host_system);
-
-  draw_header_line (xr, xr->title, r1, x0, x1, y);
-  y += xr->font_height;
-
-  draw_header_line (xr, xr->subtitle, r2, x0, x1, y);
-
-  free (r1);
-  free (r2);
-}
-\f

 static void
 xr_layout_cell (struct xr_driver *xr, const struct table_cell *cell,
                 int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2],
 static void
 xr_layout_cell (struct xr_driver *xr, const struct table_cell *cell,
                 int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2],


@@ -848,46 +845,22 @@ xr_layout_cell (struct xr_driver *xr, const struct table_cell *cell,
         *height = h;
     }
 }
         *height = h;
     }
 }

-\f
-/* Attempts to load FONT, initializing its other members based on
-   its 'string' member and the information in DRIVER.  Returns true
-   if successful, otherwise false. */
-static bool
-load_font (struct xr_driver *xr, struct xr_font *font)
-{
-  PangoContext *context;
-  PangoLanguage *language;
-
-  font->desc = pango_font_description_from_string (font->string);
-  if (font->desc == NULL)
-    {
-      error (0, 0, _("\"%s\": bad font specification"), font->string);
-      return false;
-    }
-  pango_font_description_set_absolute_size (font->desc, xr->font_height);
-
-  font->layout = pango_cairo_create_layout (xr->cairo);
-  pango_layout_set_font_description (font->layout, font->desc);
-
-  language = pango_language_get_default ();
-  context = pango_layout_get_context (font->layout);
-  font->metrics = pango_context_get_metrics (context, font->desc, language);
-
-  return true;
-}

 
 

-/* Frees FONT. */

 static void
 static void

-free_font (struct xr_font *font)
+xr_draw_title (struct xr_driver *xr, const char *title,
+               int title_width, int title_height)

 {
 {

-  free (font->string);
-  if (font->desc != NULL)
-    pango_font_description_free (font->desc);
-  pango_font_metrics_unref (font->metrics);
-  if (font->layout != NULL)
-    g_object_unref (font->layout);
-}
+  struct table_cell cell;
+  int bb[TABLE_N_AXES][2];

 
 

+  xr_init_caption_cell (title, &cell);
+  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);
+}
+\f

 struct output_driver_factory pdf_driver_factory = { "pdf", xr_pdf_create };
 struct output_driver_factory ps_driver_factory = { "ps", xr_ps_create };
 struct output_driver_factory svg_driver_factory = { "svg", xr_svg_create };
 struct output_driver_factory pdf_driver_factory = { "pdf", xr_pdf_create };
 struct output_driver_factory ps_driver_factory = { "ps", xr_ps_create };
 struct output_driver_factory svg_driver_factory = { "svg", xr_svg_create };


@@ -904,13 +877,13 @@ static const struct output_driver_class cairo_driver_class =
 
 struct xr_rendering
   {
 
 struct xr_rendering
   {

+    struct output_item *item;
+

     /* Table items. */
     struct render_page *page;
     struct xr_driver *xr;
     /* Table items. */
     struct render_page *page;
     struct xr_driver *xr;

+    int title_width;

     int title_height;
     int title_height;

-
-    /* Chart items. */
-    struct chart_item *chart;

   };
 
 #define CHART_WIDTH 500
   };
 
 #define CHART_WIDTH 500


@@ -973,15 +946,16 @@ xr_rendering_create (struct xr_driver *xr, const struct output_item *item,
   else if (is_table_item (item))
     {
       r = xzalloc (sizeof *r);
   else if (is_table_item (item))
     {
       r = xzalloc (sizeof *r);

+      r->item = output_item_ref (item);

       r->xr = xr;
       xr_set_cairo (xr, cr);
       r->page = xr_render_table_item (xr, to_table_item (item),
       r->xr = xr;
       xr_set_cairo (xr, cr);
       r->page = xr_render_table_item (xr, to_table_item (item),

-                                      &r->title_height);
+                                      &r->title_width, &r->title_height);

     }
   else if (is_chart_item (item))
     {
       r = xzalloc (sizeof *r);
     }
   else if (is_chart_item (item))
     {
       r = xzalloc (sizeof *r);

-      r->chart = to_chart_item (output_item_ref (item));
+      r->item = output_item_ref (item);

     }
 
   return r;
     }
 
   return r;


@@ -990,9 +964,11 @@ xr_rendering_create (struct xr_driver *xr, const struct output_item *item,
 void
 xr_rendering_measure (struct xr_rendering *r, int *w, int *h)
 {
 void
 xr_rendering_measure (struct xr_rendering *r, int *w, int *h)
 {

-  if (r->chart == NULL)
+  if (is_table_item (r->item))

     {
     {

-      *w = render_page_get_size (r->page, H) / 1024;
+      int w0 = render_page_get_size (r->page, H);
+      int w1 = r->title_width;
+      *w = MAX (w0, w1) / 1024;

       *h = (render_page_get_size (r->page, V) + r->title_height) / 1024;
     }
   else
       *h = (render_page_get_size (r->page, V) + r->title_height) / 1024;
     }
   else


@@ -1008,17 +984,26 @@ void
 xr_rendering_draw (struct xr_rendering *r, cairo_t *cr,
                    int x, int y, int w, int h)
 {
 xr_rendering_draw (struct xr_rendering *r, cairo_t *cr,
                    int x, int y, int w, int h)
 {

-  if (r->chart == NULL)
+  if (is_table_item (r->item))

     {
       struct xr_driver *xr = r->xr;
 
       xr_set_cairo (xr, cr);
     {
       struct xr_driver *xr = r->xr;
 
       xr_set_cairo (xr, cr);

-      xr->y = 0;
+
+      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);
+        }
+
+      xr->y = r->title_height;

       render_page_draw_region (r->page,
                                x * 1024, y * 1024, w * 1024, h * 1024);
     }
   else
       render_page_draw_region (r->page,
                                x * 1024, y * 1024, w * 1024, h * 1024);
     }
   else

-    xr_draw_chart (r->chart, cr, 0, 0, CHART_WIDTH, CHART_HEIGHT);
+    xr_draw_chart (to_chart_item (r->item), cr,
+                   0, 0, CHART_WIDTH, CHART_HEIGHT);

 }
 
 void
 }
 
 void


@@ -1085,7 +1070,7 @@ xr_draw_png_chart (const struct chart_item *item,
 
   status = cairo_surface_write_to_png (surface, file_name);
   if (status != CAIRO_STATUS_SUCCESS)
 
   status = cairo_surface_write_to_png (surface, file_name);
   if (status != CAIRO_STATUS_SUCCESS)

-    error (0, 0, _("error writing output file \"%s\": %s"),
+    error (0, 0, _("error writing output file `%s': %s"),

            file_name, cairo_status_to_string (status));
 
   cairo_destroy (cr);
            file_name, cairo_status_to_string (status));
 
   cairo_destroy (cr);


@@ -1136,18 +1121,9 @@ xr_table_render (struct xr_render_fsm *fsm, struct xr_driver *xr)
       if (ts->caption_height)
         {
           if (xr->cairo)
       if (ts->caption_height)
         {
           if (xr->cairo)

-            {
-              struct table_cell cell;
-              int bb[TABLE_N_AXES][2];
-
-              xr_init_caption_cell (table_item_get_caption (ts->table_item),
-                                    &cell);
-              bb[H][0] = 0;
-              bb[H][1] = xr->width;
-              bb[V][0] = 0;
-              bb[V][1] = ts->caption_height;
-              xr_draw_cell (xr, &cell, bb, bb);
-            }
+            xr_draw_title (xr, table_item_get_caption (ts->table_item),
+                           xr->width, ts->caption_height);
+

           xr->y += ts->caption_height;
           ts->caption_height = 0;
         }
           xr->y += ts->caption_height;
           ts->caption_height = 0;
         }


@@ -1175,6 +1151,7 @@ xr_render_table (struct xr_driver *xr, const struct table_item *table_item)
 {
   struct xr_table_state *ts;
   struct render_page *page;
 {
   struct xr_table_state *ts;
   struct render_page *page;

+  int caption_width;

 
   ts = xmalloc (sizeof *ts);
   ts->fsm.render = xr_table_render;
 
   ts = xmalloc (sizeof *ts);
   ts->fsm.render = xr_table_render;


@@ -1182,9 +1159,10 @@ xr_render_table (struct xr_driver *xr, const struct table_item *table_item)
   ts->table_item = table_item_ref (table_item);
 
   if (xr->y > 0)
   ts->table_item = table_item_ref (table_item);
 
   if (xr->y > 0)

-    xr->y += xr->font_height;
+    xr->y += xr->char_height;

 
 

-  page = xr_render_table_item (xr, table_item, &ts->caption_height);
+  page = xr_render_table_item (xr, table_item,
+                               &caption_width, &ts->caption_height);

   xr->params->size[V] = xr->length - ts->caption_height;
 
   render_break_init (&ts->x_break, page, H);
   xr->params->size[V] = xr->length - ts->caption_height;
 
   render_break_init (&ts->x_break, page, H);


@@ -1285,13 +1263,11 @@ xr_render_text (struct xr_driver *xr, const struct text_item *text_item)
     case TEXT_ITEM_TITLE:
       free (xr->title);
       xr->title = xstrdup (text);
     case TEXT_ITEM_TITLE:
       free (xr->title);
       xr->title = xstrdup (text);

-      draw_headers (xr);

       break;
 
     case TEXT_ITEM_SUBTITLE:
       free (xr->subtitle);
       xr->subtitle = xstrdup (text);
       break;
 
     case TEXT_ITEM_SUBTITLE:
       free (xr->subtitle);
       xr->subtitle = xstrdup (text);

-      draw_headers (xr);

       break;
 
     case TEXT_ITEM_COMMAND_CLOSE:
       break;
 
     case TEXT_ITEM_COMMAND_CLOSE:


@@ -1299,7 +1275,7 @@ xr_render_text (struct xr_driver *xr, const struct text_item *text_item)
 
     case TEXT_ITEM_BLANK_LINE:
       if (xr->y > 0)
 
     case TEXT_ITEM_BLANK_LINE:
       if (xr->y > 0)

-        xr->y += xr->font_height;
+        xr->y += xr->char_height;

       break;
 
     case TEXT_ITEM_EJECT_PAGE:
       break;
 
     case TEXT_ITEM_EJECT_PAGE: