add support for "color" property to <table> and <cell> to permit

  overriding of inherited pencolor.

diff --git a/lib/common/htmllex.c b/lib/common/htmllex.c
index 0c5939c5d8ceaa9e0d487662fc7395b79fa2a1d7..534c6dcf2f5bf66c5aa0009b1d170766254f1cb3 100644 (file)
--- a/lib/common/htmllex.c
+++ b/lib/common/htmllex.c
@@ -114,6 +114,12 @@ static int bgcolorfn(htmldata_t * p, char *v)
     return 0;
 }
 
+static int pencolorfn(htmldata_t * p, char *v)
+{
+    p->pencolor = strdup(v);
+    return 0;
+}
+
 static int hreffn(htmldata_t * p, char *v)
 {
     p->href = strdup(v);
@@ -330,7 +336,7 @@ static int colspanfn(htmlcell_t * p, char *v)
     return 0;
 }
 
-static int colorfn(htmlfont_t * p, char *v)
+static int fontcolorfn(htmlfont_t * p, char *v)
 {
     p->color = strdup(v);
     return 0;
@@ -389,6 +395,7 @@ static attr_item tbl_items[] = {
     {"cellborder", (attrFn) cellborderfn},
     {"cellpadding", (attrFn) cellpaddingfn},
     {"cellspacing", (attrFn) cellspacingfn},
+    {"color", (attrFn) pencolorfn},
     {"fixedsize", (attrFn) fixedsizefn},
     {"height", (attrFn) heightfn},
     {"href", (attrFn) hreffn},
@@ -407,6 +414,7 @@ static attr_item cell_items[] = {
     {"border", (attrFn) borderfn},
     {"cellpadding", (attrFn) cellpaddingfn},
     {"cellspacing", (attrFn) cellspacingfn},
+    {"color", (attrFn) pencolorfn},
     {"colspan", (attrFn) colspanfn},
     {"fixedsize", (attrFn) fixedsizefn},
     {"height", (attrFn) heightfn},
@@ -421,7 +429,7 @@ static attr_item cell_items[] = {
 };
 
 static attr_item font_items[] = {
-    {"color", (attrFn) colorfn},
+    {"color", (attrFn) fontcolorfn},
     {"face", (attrFn) facefn},
     {"point-size", (attrFn) ptsizefn},
 };