Make SVG pass through raw font names, but allow -Gfontmangling attribute

to enable Postscript name translation.  (The job still isn't done, as the
raw names aren't always right and should be mapped to the 7 standard
SVG names, I guess.)

diff --git a/lib/common/input.c b/lib/common/input.c
index ca3d195be950b85bd033c82117b22aa8761856f4..61aeb8d03beda9476e0c0a66e97f74f218fcebcd 100644 (file)
--- a/lib/common/input.c
+++ b/lib/common/input.c
@@ -626,6 +626,7 @@ void graph_init(graph_t * g, boolean use_rankdir)
     GD_ranksep(g) = POINTS(xf);
 
     GD_showboxes(g) = late_int(g, agfindattr(g, "showboxes"), 0, 0);
+    GD_fontmangling(g) = mapbool(agget(g,"fontmangling"));
 
     setRatio(g);
     GD_drawing(g)->filled =

diff --git a/lib/common/types.h b/lib/common/types.h
index 7fb9f83fbcdcef6cd9154b5f3c7571ac2546ab3c..006e2c9569a77a2d852d9c5c60a4f31629e52e0b 100644 (file)
--- a/lib/common/types.h
+++ b/lib/common/types.h
@@ -354,6 +354,7 @@ extern "C" {
        boolean has_flat_edges;
        unsigned char   showboxes;
        boolean cluster_was_collapsed;
+       boolean fontmangling;           /* to override in SVG */
 
        int nodesep, ranksep;
        node_t *ln, *rn;        /* left, right nodes of bounding box */
@@ -419,6 +420,7 @@ extern "C" {
 #define GD_set_type(g) (g)->u.set_type
 #define GD_label_pos(g) (g)->u.label_pos
 #define GD_showboxes(g) (g)->u.showboxes
+#define GD_fontmangling(g) (g)->u.fontmangling
 #define GD_spring(g) (g)->u.spring
 #define GD_sum_t(g) (g)->u.sum_t
 #define GD_t(g) (g)->u.t

diff --git a/lib/gvc/gvcint.h b/lib/gvc/gvcint.h
index eee5eca19ded2ec3da420db8f2f6815484c61754..0acf27375b4a997f0d627a81c8d48702672dbbbe 100644 (file)
--- a/lib/gvc/gvcint.h
+++ b/lib/gvc/gvcint.h
@@ -132,6 +132,9 @@ extern "C" {
 
        /* render defaults set from graph */
        gvcolor_t bgcolor;      /* background color */
+
+       /* whether to mangle font names (at least in SVG), usually false */
+       boolean fontmangling;
     };
 
 #ifdef __cplusplus

diff --git a/plugin/core/gvrender_core_svg.c b/plugin/core/gvrender_core_svg.c
index c56402b829d52aade411bcba79e16291473c439a..2882153fc85c1e7e1e1d87e7b07f7dacf5a7bdcc 100644 (file)
--- a/plugin/core/gvrender_core_svg.c
+++ b/plugin/core/gvrender_core_svg.c
@@ -36,6 +36,7 @@
 #include "const.h"
 
 #include "gvplugin_render.h"
+#include "gvcint.h"
 #include "graph.h"
 
 typedef enum { FORMAT_SVG, FORMAT_SVGZ, } format_type;
@@ -298,7 +299,12 @@ static void svg_textpara(GVJ_t * job, pointf p, textpara_t * para)
     }
     core_printf(job, " x=\"%g\" y=\"%g\"", p.x, -p.y);
     core_fputs(job, " style=\"");
-    if (para->postscript_alias) {
+    if (para->postscript_alias && GD_fontmangling(job->gvc->g)) {
+       /* i'm disabling this as the default because mapping "Times-Roman"
+           to "Nimbus Roman No9" does no good in the rendered SVG. in SVG
+           the only universal font families are Serif, Sans-Serif, Monospace,
+           Cursive and Fantasy but according to w3c, CSS can generally handle
+           the standard Postrscript names. */
         core_printf(job, "font-family:%s;", para->postscript_alias->family);
         if (para->postscript_alias->weight)
            core_printf(job, "font-weight:%s;", para->postscript_alias->weight);