make textlayout respect -Gdpi

diff --git a/lib/common/fontmetrics.c b/lib/common/fontmetrics.c
index fa952ef4260a5798e1333d4ec77edfb6b1c8c3d8..2be2f4801d90160d549662303b6721ce62bef559 100644 (file)
--- a/lib/common/fontmetrics.c
+++ b/lib/common/fontmetrics.c
@@ -137,6 +137,7 @@ estimate_textlayout(graph_t *g, textpara_t * para, char **fontpath)
 
     para->width = 0.0;
     para->height = para->fontsize * LINESPACING;
+    para->yoffset = 0.0;
     para->xshow = NULL;
     para->layout = para->fontname;
     para->free_layout = NULL;
@@ -201,6 +202,10 @@ pointf textsize(graph_t *g, textpara_t * para, char *fontname, double fontsize)
     para->fontname = fontname;
     para->fontsize = fontsize;
 
+    para->dpi = GD_drawing(g)->dpi;
+    if (para->dpi < 1.)
+       para->dpi = (double)POINTS_PER_INCH;
+
     para->postscript_alias = translate_postscript_fontname(fontname);
 
     if (Verbose && emit_once(para->fontname))

diff --git a/lib/common/textpara.h b/lib/common/textpara.h
index a26817f7d3f05b2b49ce2c9258fa719b8efcaed0..583ab5e84914ba512e330da83d5be35bed6074fa 100644 (file)
--- a/lib/common/textpara.h
+++ b/lib/common/textpara.h
@@ -40,7 +40,7 @@ extern "C" {
        char *xshow;
        void *layout;
        void (*free_layout) (void *layout);   /* FIXME - this is ugly */
-       double fontsize, width, height;
+       double fontsize, width, height, dpi, yoffset;
        char just;
     } textpara_t;