eliminate xshow code and structs

diff --git a/lib/common/fontmetrics.c b/lib/common/fontmetrics.c
index f126569f0d7f76abcaf4ad80ca4f74d7e6a859c6..021b905bd555b452d9ab91fd64f84a8cbd547143 100644 (file)
--- a/lib/common/fontmetrics.c
+++ b/lib/common/fontmetrics.c
@@ -139,7 +139,6 @@ estimate_textlayout(graph_t *g, textpara_t * para, char **fontpath)
     para->height = para->fontsize * LINESPACING;
     para->yoffset_layout = 0.0;
     para->yoffset_centerline = 0.1 * para->fontsize;
-    para->xshow = NULL;
     para->layout = para->fontname;
     para->free_layout = NULL;
 

diff --git a/lib/common/htmltable.c b/lib/common/htmltable.c
index 0b779092be78f0bcbde0149abd88e5615cbf75f6..151ea9b3ca392b5265f648f82143c17ad78a1d36 100644 (file)
--- a/lib/common/htmltable.c
+++ b/lib/common/htmltable.c
@@ -173,7 +173,6 @@ emit_htextparas(GVJ_t* job, int nparas, htextpara_t* paras, pointf p,
            tl.str = ti->str;
            tl.fontname = fname_;
            tl.fontsize = fsize_;
-           tl.xshow = ti->xshow;
            tl.yoffset_layout = ti->yoffset_layout;
            tl.yoffset_centerline = ti->yoffset_centerline;
            tl.postscript_alias = ti->postscript_alias;
@@ -595,7 +594,6 @@ void free_html_text(htmltxt_t* t)
        for (i = 0; i < t->nparas; i++) {
            for (j = 0; j < tl->nitems; j++) {
                if (ti->str) free (ti->str);
-               if (ti->xshow) free (ti->xshow);
                if (ti->font) free_html_font(ti->font);
                if (ti->layout && ti->free_layout) ti->free_layout (ti->layout);
                ti++;
@@ -821,7 +819,6 @@ size_html_txt(graph_t *g, htmltxt_t* ftxt, htmlenv_t* env)
            free (ftxt->paras[i].items[j].str);
            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].yoffset_layout = lp.yoffset_layout;
            ftxt->paras[i].items[j].yoffset_centerline = lp.yoffset_centerline;
            ftxt->paras[i].items[j].postscript_alias = lp.postscript_alias;

diff --git a/lib/common/labels.c b/lib/common/labels.c
index caa58443ffb6288c7e46eee268bdcd3c81ec96f6..e8087b132a72e4c4122732affd0172824f73f18e 100644 (file)
--- a/lib/common/labels.c
+++ b/lib/common/labels.c
@@ -151,8 +151,6 @@ static void free_textpara(textpara_t * tl)
     if (tl) {
        if (tl->str)
            free(tl->str);
-       if (tl->xshow)
-           free(tl->xshow);
        if (tl->layout && tl->free_layout)
            tl->free_layout (tl->layout);
        free(tl);