added dotted and dashed styles to tables and cells

diff --git a/lib/common/const.h b/lib/common/const.h
index f067d4d358262501fba5f46e3997df0e8fbbec62..0bfb306163b15deb52c4ac9d43166e640429db47 100644 (file)
--- a/lib/common/const.h
+++ b/lib/common/const.h
@@ -214,6 +214,8 @@
 #define BOX3D (1 << 9)
 #define COMPONENT (1 << 10)
 #define STRIPED (1 << 11)
+#define DOTTED (1 << 12)
+#define DASHED (1 << 13)
 
 /* fill types */
 #define FILL      1

diff --git a/lib/common/htmllex.c b/lib/common/htmllex.c
index 068c651a79b20da8319f5c2ca1f1e067600dcece..d0257e0b4bce34bc6d7b6298a9dcd3b4d54438c8 100644 (file)
--- a/lib/common/htmllex.c
+++ b/lib/common/htmllex.c
@@ -153,6 +153,10 @@ static int stylefn(htmldata_t * p, char *v)
                rv = 1;
            }
        }
+       else if(!strcasecmp(tk,"SOLID")) p->style &= ~(DOTTED|DASHED);
+       else if(!strcasecmp(tk,"INVISIBLE") || !strcasecmp(tk,"INVIS")) p->style |= INVISIBLE;
+       else if(!strcasecmp(tk,"DOTTED")) p->style |= DOTTED;
+       else if(!strcasecmp(tk,"DASHED")) p->style |= DASHED;
        else {
            agerr(AGWARN, "Illegal value %s for STYLE - ignored\n", tk);
            rv = 1;

diff --git a/lib/common/htmltable.c b/lib/common/htmltable.c
index 21acf1b0e0efbf9cfda99905de58e8cb17cd7077..3b16fb62b7d8d39aa0b0d5a33bf6407dd143aa3c 100644 (file)
--- a/lib/common/htmltable.c
+++ b/lib/common/htmltable.c
@@ -227,9 +227,6 @@ static void doSide(GVJ_t * job, pointf p, double wd, double ht)
  */
 static void doBorder(GVJ_t * job, char *color, int border, boxf BF)
 {
-    pointf pt;
-    double wd, ht;
-
     if (!color)
        color = DEFAULT_COLOR;
     gvrender_set_fillcolor(job, color);
@@ -238,17 +235,12 @@ static void doBorder(GVJ_t * job, char *color, int border, boxf BF)
     if (border == 1) {
        gvrender_box(job, BF, 0);
     } else {
-       border--;
-       ht = BF.UR.y - BF.LL.y;
-       wd = BF.UR.x - BF.LL.x;
-       doSide(job, BF.LL, border, ht);
-       pt.x = BF.LL.x;
-       pt.y = BF.UR.y;
-       doSide(job, pt, wd, -border);
-       doSide(job, BF.UR, -border, -ht);
-       pt.x = BF.UR.x;
-       pt.y = BF.LL.y;
-       doSide(job, pt, -wd, border);
+      BF.UR.y -= border;
+      BF.UR.x -= border;
+      BF.LL.y += border;
+      BF.LL.x += border;
+      gvrender_box(job, BF, 0);
+
     }
 }
 
@@ -452,6 +444,7 @@ emit_html_tbl(GVJ_t * job, htmltbl_t * tbl, htmlenv_t * env)
     int anchor; /* if true, we need to undo anchor settings. */
     int doAnchor = (tbl->data.href || tbl->data.target);
     pointf AF[4];
+    char *sptr[2];
 
     if (tbl->font)
        pushFontInfo(env, tbl->font, &savef);
@@ -511,11 +504,28 @@ emit_html_tbl(GVJ_t * job, htmltbl_t * tbl, htmlenv_t * env)
     }
 
     if (tbl->data.border) {
-       if (tbl->data.style & ROUNDED) {
+       if ((tbl->data.style & ROUNDED) ||
+           (tbl->data.style & DASHED) ||
+           (tbl->data.style & DOTTED) ||
+           (tbl->data.style & INVISIBLE)) {
            char* color = (tbl->data.pencolor ? tbl->data.pencolor : DEFAULT_COLOR);
            gvrender_set_penwidth(job, tbl->data.border);
            gvrender_set_pencolor(job, color);
-           round_corners (job, AF, 4, tbl->data.style, 0);
+           sptr[0] = sptr[1] = NULL;
+           if(tbl->data.style & DASHED)
+             sptr[0] = "dashed";
+           else if(tbl->data.style & DOTTED)
+             sptr[0] = "dotted";
+           else if(tbl->data.style & INVISIBLE)
+             sptr[0] = "invisible";
+           if(sptr[0] != NULL)
+             gvrender_set_style(job,sptr);
+           else
+             gvrender_set_style(job, job->gvc->defaultlinestyle);
+           if (tbl->data.style & ROUNDED)
+             round_corners (job, AF, 4, tbl->data.style, 0);         
+           else
+             doBorder(job, tbl->data.pencolor, tbl->data.border, pts);
        }
        else
            doBorder(job, tbl->data.pencolor, tbl->data.border, pts);
@@ -571,6 +581,8 @@ emit_html_cell(GVJ_t * job, htmlcell_t * cp, htmlenv_t * env)
     boxf pts = cp->data.box;
     pointf pos = env->pos;
     int inAnchor, doAnchor = (cp->data.href || cp->data.target);
+    pointf AF[4];
+    char *sptr[2];
 
     pts.LL.x += pos.x;
     pts.UR.x += pos.x;
@@ -581,6 +593,23 @@ emit_html_cell(GVJ_t * job, htmlcell_t * cp, htmlenv_t * env)
        inAnchor = initAnchor(job, env, &cp->data, pts, &saved, 1);
     else
        inAnchor = 0;
+    
+    /* Set up rounded style */
+    if (cp->data.style & ROUNDED) {
+       AF[0] = pts.LL;
+       AF[2] = pts.UR;
+       if (cp->data.border) {
+           double delta = ((double)cp->data.border)/2.0;
+           AF[0].x += delta;
+           AF[0].y += delta;
+           AF[2].x -= delta;
+           AF[2].y -= delta;
+       }
+       AF[1].x = AF[2].x;
+       AF[1].y = AF[0].y;
+       AF[3].x = AF[0].x;
+       AF[3].y = AF[2].y;
+    }
 
     if (cp->data.bgcolor) {
        char* clrs[2];
@@ -589,7 +618,32 @@ emit_html_cell(GVJ_t * job, htmlcell_t * cp, htmlenv_t * env)
        free (clrs[0]);
     }
 
-    if (cp->data.border)
+    if (cp->data.border) {
+       if ((cp->data.style & ROUNDED) ||
+           (cp->data.style & DASHED) ||
+           (cp->data.style & DOTTED) ||
+           (cp->data.style & INVISIBLE)) {
+           char* color = (cp->data.pencolor ? cp->data.pencolor : DEFAULT_COLOR);
+           gvrender_set_penwidth(job, cp->data.border);
+           gvrender_set_pencolor(job, color);
+           sptr[0] = sptr[1] = NULL;
+           if(cp->data.style & DASHED)
+             sptr[0] = "dashed";
+           else if(cp->data.style & DOTTED)
+             sptr[0] = "dotted";
+           else if(cp->data.style & INVISIBLE)
+             sptr[0] = "invisible";
+           if(sptr[0] == NULL)
+               gvrender_set_style(job, job->gvc->defaultlinestyle);
+           else
+               gvrender_set_style(job,sptr);
+           if (cp->data.style & ROUNDED)
+             round_corners (job, AF, 4, cp->data.style, 0);          
+           else 
+             doBorder(job, cp->data.pencolor, cp->data.border, pts);
+           }
+    }
+    else
        doBorder(job, cp->data.pencolor, cp->data.border, pts);
 
     if (cp->child.kind == HTML_TBL)

diff --git a/lib/common/htmltable.h b/lib/common/htmltable.h
index 1892291d856c00557a56ba43d593f11c464cfdc0..fa5013fe3bcb988e031cba0263f0ab2b4c8183ac 100644 (file)
--- a/lib/common/htmltable.h
+++ b/lib/common/htmltable.h
@@ -77,7 +77,7 @@ extern "C" {
        unsigned short flags;
        unsigned short width;
        unsigned short height;
-       unsigned char style;
+       unsigned short style;
        boxf box;               /* its geometric placement in points */
     } htmldata_t;