From: ellson <devnull@localhost>
Date: Tue, 1 Aug 2006 15:28:50 +0000 (+0000)
Subject: fix breakage to htmltable rendering in svg caused by new postscript_alias mechanism
X-Git-Tag: LAST_LIBGRAPH~32^2~6013
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=93c0891b4f965ce9d7e1720bbdc71398be9bc62b;p=graphviz

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 6352343a1..aa62a0f53 100644
--- 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 176bd982a..cad000674 100644
--- 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 af85b61f2..b4e657400 100644
--- 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
 }