update to trunk

(bzr r12588.1.32)

1 files changed, 44 insertions, 20 deletions

diff --git a/src/display/nr-style.cpp b/src/display/nr-style.cpp
index 317f38635..125d0c6d6 100644
--- a/src/display/nr-style.cpp
+++ b/src/display/nr-style.cpp
@@ -68,7 +68,11 @@ NRStyle::NRStyle()
     , line_through_thickness(0)
     , line_through_position(0)
     , font_size(0)
-{}
+{
+#ifdef WITH_SVG2
+    paint_order_layer[0] = PAINT_ORDER_NORMAL;
+#endif
+}
 
 NRStyle::~NRStyle()
 {
@@ -148,18 +152,38 @@ void NRStyle::set(SPStyle *style)
         delete [] dash;
     }
 
-    n_dash = style->stroke_dash.n_dash;
+    n_dash = style->stroke_dasharray.values.size();
     if (n_dash != 0) {
-        dash_offset = style->stroke_dash.offset;
+        dash_offset = style->stroke_dashoffset.value;
         dash = new double[n_dash];
         for (unsigned int i = 0; i < n_dash; ++i) {
-            dash[i] = style->stroke_dash.dash[i];
+            dash[i] = style->stroke_dasharray.values[i];
         }
     } else {
         dash_offset = 0.0;
         dash = NULL;
     }
 
+
+#ifdef WITH_SVG2
+    for( unsigned i = 0; i < PAINT_ORDER_LAYERS; ++i) {
+        switch (style->paint_order.layer[i]) {
+            case SP_CSS_PAINT_ORDER_NORMAL:
+                paint_order_layer[i]=PAINT_ORDER_NORMAL;
+                break;
+            case SP_CSS_PAINT_ORDER_FILL:
+                paint_order_layer[i]=PAINT_ORDER_FILL;
+                break;
+            case SP_CSS_PAINT_ORDER_STROKE:
+                paint_order_layer[i]=PAINT_ORDER_STROKE;
+                break;
+            case SP_CSS_PAINT_ORDER_MARKER:
+                paint_order_layer[i]=PAINT_ORDER_MARKER;
+                break;
+        }
+    }
+#endif
+
     text_decoration_line = TEXT_DECORATION_LINE_CLEAR;
     if(style->text_decoration_line.inherit     ){ text_decoration_line |= TEXT_DECORATION_LINE_INHERIT;                                }
     if(style->text_decoration_line.underline   ){ text_decoration_line |= TEXT_DECORATION_LINE_UNDERLINE   + TEXT_DECORATION_LINE_SET; }
@@ -207,14 +231,14 @@ void NRStyle::set(SPStyle *style)
     update();
 }
 
-bool NRStyle::prepareFill(Inkscape::DrawingContext &ct, Geom::OptRect const &paintbox)
+bool NRStyle::prepareFill(Inkscape::DrawingContext &dc, Geom::OptRect const &paintbox)
 {
     // update fill pattern
     if (!fill_pattern) {
         switch (fill.type) {
         case PAINT_SERVER: {
-            //fill_pattern = sp_paint_server_create_pattern(fill.server, ct.raw(), paintbox, fill.opacity);
-        	fill_pattern = fill.server->pattern_new(ct.raw(), paintbox, fill.opacity);
+            //fill_pattern = sp_paint_server_create_pattern(fill.server, dc.raw(), paintbox, fill.opacity);
+        	fill_pattern = fill.server->pattern_new(dc.raw(), paintbox, fill.opacity);
 
 		} break;
         case PAINT_COLOR: {
@@ -229,19 +253,19 @@ bool NRStyle::prepareFill(Inkscape::DrawingContext &ct, Geom::OptRect const &pai
     return true;
 }
 
-void NRStyle::applyFill(Inkscape::DrawingContext &ct)
+void NRStyle::applyFill(Inkscape::DrawingContext &dc)
 {
-    ct.setSource(fill_pattern);
-    ct.setFillRule(fill_rule);
+    dc.setSource(fill_pattern);
+    dc.setFillRule(fill_rule);
 }
 
-bool NRStyle::prepareStroke(Inkscape::DrawingContext &ct, Geom::OptRect const &paintbox)
+bool NRStyle::prepareStroke(Inkscape::DrawingContext &dc, Geom::OptRect const &paintbox)
 {
     if (!stroke_pattern) {
         switch (stroke.type) {
         case PAINT_SERVER: {
-            //stroke_pattern = sp_paint_server_create_pattern(stroke.server, ct.raw(), paintbox, stroke.opacity);
-        	stroke_pattern = stroke.server->pattern_new(ct.raw(), paintbox, stroke.opacity);
+            //stroke_pattern = sp_paint_server_create_pattern(stroke.server, dc.raw(), paintbox, stroke.opacity);
+        	stroke_pattern = stroke.server->pattern_new(dc.raw(), paintbox, stroke.opacity);
 
 		} break;
         case PAINT_COLOR: {
@@ -256,14 +280,14 @@ bool NRStyle::prepareStroke(Inkscape::DrawingContext &ct, Geom::OptRect const &p
     return true;
 }
 
-void NRStyle::applyStroke(Inkscape::DrawingContext &ct)
+void NRStyle::applyStroke(Inkscape::DrawingContext &dc)
 {
-    ct.setSource(stroke_pattern);
-    ct.setLineWidth(stroke_width);
-    ct.setLineCap(line_cap);
-    ct.setLineJoin(line_join);
-    ct.setMiterLimit(miter_limit);
-    cairo_set_dash(ct.raw(), dash, n_dash, dash_offset); // fixme
+    dc.setSource(stroke_pattern);
+    dc.setLineWidth(stroke_width);
+    dc.setLineCap(line_cap);
+    dc.setLineJoin(line_join);
+    dc.setMiterLimit(miter_limit);
+    cairo_set_dash(dc.raw(), dash, n_dash, dash_offset); // fixme
 }
 
 void NRStyle::update()