fix breakage to htmltable rendering in svg caused by new postscript_alias mechanism

diff --git a/lib/common/htmltable.c b/lib/common/htmltable.c
index 6352343a172b11e4852fa219d8fec189aa73bc01..aa62a0f5318d4788a052ef4d1c75594d1d5a1a68 100644 (file)
--- a/lib/common/htmltable.c
+++ b/lib/common/htmltable.c
@@ -203,6 +203,7 @@ emit_htextparas(GVJ_t* job, int nparas, htextpara_t* paras, pointf p,
            tl.fontname = fname_;
            tl.fontsize = fsize_;
            tl.xshow = ti->xshow;
+           tl.postscript_alias = ti->postscript_alias;
            tl.layout = ti->layout;
            tl.width = paras[i].size;
            tl.height = paras[i].lfsize;
@@ -814,6 +815,7 @@ size_html_txt(graph_t *g, htmltxt_t* ftxt, htmlenv_t* env)
            ftxt->paras[i].items[j].str = lp.str;
            ftxt->paras[i].items[j].size = sz.x;
            ftxt->paras[i].items[j].xshow = lp.xshow;
+           ftxt->paras[i].items[j].postscript_alias = lp.postscript_alias;
            ftxt->paras[i].items[j].layout = lp.layout;
            ftxt->paras[i].items[j].free_layout = lp.free_layout;
            width += w;

diff --git a/lib/common/htmltable.h b/lib/common/htmltable.h
index 176bd982ac9a5fb65ecc5cd80e33a8719ba8791c..cad000674357b7b2c5b83dd48f96ad2a05d68c41 100644 (file)
--- a/lib/common/htmltable.h
+++ b/lib/common/htmltable.h
@@ -65,6 +65,7 @@ extern "C" {
     typedef struct {
        char *str;
        char *xshow;
+       PostscriptAlias *postscript_alias;
        void *layout;
        void (*free_layout) (void *layout);
        htmlfont_t *font;

diff --git a/lib/gvc/gvrender.c b/lib/gvc/gvrender.c
index af85b61f20889ef5624a6a722c24041fee48ef01..b4e657400e2ac74f56de0f5c67f09a7b1d2fb32d 100644 (file)
--- a/lib/gvc/gvrender.c
+++ b/lib/gvc/gvrender.c
@@ -609,9 +609,10 @@ void gvrender_end_edge(GVJ_t * job)
 void gvrender_begin_context(GVJ_t * job)
 {
 #ifdef WITH_CODEGENS
+    gvrender_engine_t *gvre = job->render.engine;
     codegen_t *cg = job->codegen;
 
-    if (cg && cg->begin_context)
+    if (!gvre && cg && cg->begin_context)
        cg->begin_context();
 #endif
 }
@@ -619,9 +620,10 @@ void gvrender_begin_context(GVJ_t * job)
 void gvrender_end_context(GVJ_t * job)
 {
 #ifdef WITH_CODEGENS
+    gvrender_engine_t *gvre = job->render.engine;
     codegen_t *cg = job->codegen;
 
-    if (cg && cg->end_context)
+    if (!gvre && cg && cg->end_context)
        cg->end_context();
 #endif
 }