working on CSS draw

share/base.css

@@ -81,7 +81,7 @@ span {
 }
 .a {
 }
-.cr {
+.Cd {
   position:absolute;
   transform-origin:0% 100%;
   -ms-transform-origin:0% 100%;

src/HTMLRenderer/draw.cc

@@ -30,6 +30,10 @@ static bool is_rectangle(GfxSubpath * path)
               && _equal(path->getY(0), path->getY(4)))))
             return false;
 
+    for(int i = 1; i < path->getNumPoints(); ++i)
+        if(path->getCurve(i))
+            return false;
+
     return (_equal(path->getY(0), path->getY(1))
             && _equal(path->getX(1), path->getX(2))
             && _equal(path->getY(2), path->getY(3))
@@ -42,7 +46,7 @@ static bool is_rectangle(GfxSubpath * path)
 
 //TODO track state
 //TODO connection style
-void HTMLRenderer::stroke(GfxState *state)
+void HTMLRenderer::css_draw(GfxState *state, bool fill)
 {
     GfxPath * path = state->getPath();
     for(int i = 0; i < path->getNumSubpaths(); ++i)
@@ -51,18 +55,19 @@ void HTMLRenderer::stroke(GfxState *state)
 
         if(is_horizontal_line(subpath))
         {
-            close_text_line();
             double x1 = subpath->getX(0);
             double x2 = subpath->getX(1);
             double y = subpath->getY(0);
             if(x1 > x2) swap(x1, x2);
 
-            _transform(state->getCTM(), x1, y);
+            GfxRGB stroke_color;
+            state->getStrokeRGB(&stroke_color);
 
-            html_fout << "<div style=\"border:solid red;border-width:1px 0 0 0;position:absolute;bottom:" 
-                << _round(y) << "px;left:" 
-                << _round(x1) << "px;width:"
-                << _round(x2-x1) << "px;height:0;\"></div>";
+            double lw = state->getLineWidth();
+
+            css_draw_rectangle(x1, y - lw/2, x2-x1, lw,
+                    nullptr, 0,
+                    nullptr, &stroke_color, state);
         }
         else if (is_rectangle(subpath))
         {
@@ -75,22 +80,85 @@ void HTMLRenderer::stroke(GfxState *state)
             if(x1 > x2) swap(x1, x2);
             if(y1 > y2) swap(y1, y2);
 
-            double x,y,w,h,w1,w2;
+            double x,y,w,h,lw[2];
             css_fix_rectangle_border_width(x1, y1, x2, y2, state->getLineWidth(), 
-                    x,y,w,h,w1,w2);
-            
-            _transform(state->getCTM(), x, y);
+                    x,y,w,h,lw[0],lw[1]);
 
-            html_fout << "<div class=\"cr t" << install_transform_matrix(state->getCTM())
-                << "\" style=\"border:solid red;border-width:"
-                << _round(w1) << "px " 
-                << _round(w2) << " px;left:" 
-                << _round(x) << "px;bottom:" 
-                << _round(y) << "px;width:"
-                << _round(w) << "px;height:"
-                << _round(h) << "px;\"></div>";
+            GfxRGB stroke_color;
+            state->getStrokeRGB(&stroke_color);
+
+            GfxRGB fill_color;
+            if(fill) state->getFillRGB(&fill_color);
+
+            int lw_count = 2;
+
+            GfxRGB * ps = &stroke_color;
+            GfxRGB * pf = fill ? (&fill_color) : nullptr;
+
+            if(_equal(h, 0) || _equal(w, 0))
+            {
+                // orthogonal line
+
+                // TODO: check length
+                ps = nullptr;
+                pf = &stroke_color;
+                h += lw[0];
+                w += lw[1];
+            }
+
+            css_draw_rectangle(x, y, w, h,
+                    lw, lw_count,
+                    ps, pf, state);
         }
     }
 }
 
+void HTMLRenderer::css_draw_rectangle(double x, double y, double w, double h,
+        double * line_width_array, int line_width_count,
+        const GfxRGB * line_color, const GfxRGB * fill_color,
+        GfxState * state)
+{
+    close_text_line();
+
+    html_fout << "<div class=\"Cd t" << install_transform_matrix(state->getCTM()) << "\" style=\"";
+
+    if(line_color)
+    {
+        html_fout << "border-color:" << *line_color << ";";
+
+        html_fout << "border-width:";
+        for(int i = 0; i < line_width_count; ++i)
+        {
+            if(i > 0) html_fout << ' ';
+
+            double lw = line_width_array[i];
+            html_fout << _round(lw);
+            if(lw > EPS) html_fout << "px";
+        }
+        html_fout << ";";
+    }
+    else
+    {
+        html_fout << "border:none;";
+    }
+
+    if(fill_color)
+    {
+        html_fout << "background-color:" << (*fill_color) << ";";
+    }
+    else
+    {
+        html_fout << "background-color:transparent;";
+    }
+
+    _transform(state->getCTM(), x, y);
+
+    html_fout << "bottom:" << _round(y) << "px;"
+        << "left:" << _round(x) << "px;"
+        << "width:" << _round(w) << "px;"
+        << "height:" << _round(h) << "px;"
+        << "\"></div>";
+}
+
+
 } // namespace pdf2htmlEX

src/HTMLRenderer/export.cc

@@ -141,9 +141,7 @@ void HTMLRenderer::export_word_space (long long ws_id, double word_space)
 
 void HTMLRenderer::export_color (long long color_id, const GfxRGB * rgb) 
 {
-    css_fout << ".c" << color_id << "{color:rgb("
-        << dec << (int)colToByte(rgb->r) << "," << (int)colToByte(rgb->g) << "," << (int)colToByte(rgb->b) << ");}" << hex
-        << endl;
+    css_fout << ".c" << color_id << "{color:" << (*rgb) << ";}" << endl;
 }
 
 void HTMLRenderer::export_whitespace (long long ws_id, double ws_width) 

src/HTMLRenderer/link.cc

@@ -184,7 +184,7 @@ void HTMLRenderer::processLink(AnnotLink * al)
         html_fout << ">";
     }
 
-    html_fout << "<div class=\"cr tm"
+    html_fout << "<div class=\"Cd t"
         << install_transform_matrix(default_ctm)
         << "\" style=\"";
 
@@ -206,7 +206,7 @@ void HTMLRenderer::processLink(AnnotLink * al)
         if(border_width > 0)
         {
             {
-                css_fix_rectangle_border_width(x1, y2, x2, y2, border_width, 
+                css_fix_rectangle_border_width(x1, y1, x2, y2, border_width, 
                         x, y, w, h,
                         border_top_bottom_width, border_left_right_width);
 

src/include/HTMLRenderer.h

@@ -42,7 +42,7 @@
  * j - Js data
  * p - Page
  *
- * cr - CSS draw Rectangle
+ * Cd - CSS Draw
  *
  * Reusable CSS classes
  *
@@ -123,7 +123,8 @@ class HTMLRenderer : public OutputDev
 
         virtual void drawImage(GfxState * state, Object * ref, Stream * str, int width, int height, GfxImageColorMap * colorMap, GBool interpolate, int *maskColors, GBool inlineImg);
 
-        virtual void stroke(GfxState *state);
+        virtual void stroke(GfxState *state) { css_draw(state, false); }
+        virtual void fill(GfxState *state) { css_draw(state, true); }
 
         virtual void processLink(AnnotLink * al);
 
@@ -200,7 +201,18 @@ class HTMLRenderer : public OutputDev
         ////////////////////////////////////////////////////
         // CSS drawing
         ////////////////////////////////////////////////////
-        void css_draw_rectange();
+        void css_draw(GfxState *state, bool fill);
+        /*
+         * coordinates are to transformed by state->getCTM()
+         * (x,y) should be the bottom-left corner INCLUDING border
+         * w,h should be the metrics WITHOUT border
+         *
+         * line_color & fill_color may be specified as nullptr to indicate none
+         */
+        void css_draw_rectangle(double x, double y, double w, double h,
+                double * line_width_array, int line_width_count,
+                const GfxRGB * line_color, const GfxRGB * fill_color,
+                GfxState * state);
 
 
         ////////////////////////////////////////////////////

src/include/util.h

@@ -235,5 +235,7 @@ void css_fix_rectangle_border_width(double x1, double y1, double x2, double y2,
         double & border_top_bottom_width, 
         double & border_left_right_width);
 
+std::ostream & operator << (std::ostream & out, const GfxRGB & rgb);
+
 } // namespace util
 #endif //UTIL_H__

src/util.cc

@@ -295,4 +295,15 @@ void css_fix_rectangle_border_width(double x1, double y1,
     y = y1 - border_width / 2;
 }
 
+ostream & operator << (ostream & out, const GfxRGB & rgb)
+{
+    auto flags= out.flags();
+    out << std::dec << "rgb(" 
+        << (int)colToByte(rgb.r) << "," 
+        << (int)colToByte(rgb.g) << "," 
+        << (int)colToByte(rgb.b) << ")";
+    out.flags(flags);
+    return out;
+}
+
 } // namespace pdf2htmlEX