Merging in from trunk

(bzr r8254.1.37)

2 files changed, 7 insertions, 2 deletions

diff --git a/src/livarot/PathStroke.cpp b/src/livarot/PathStroke.cpp
index 465bb205c..93280d794 100644
--- a/src/livarot/PathStroke.cpp
+++ b/src/livarot/PathStroke.cpp
@@ -63,7 +63,13 @@ void Path::Stroke(Shape *dest, bool doClose, double width, JoinType join,
         }
 
         if ( lastP > lastM+1 ) {
-            if ( pts[lastP - 1].closed ) {
+            Geom::Point sbStart = pts[lastM].p;
+            Geom::Point sbEnd = pts[lastP - 1].p;
+            // if ( pts[lastP - 1].closed ) { // this is correct, but this bugs text rendering (doesn't close text stroke)...
+            if ( Geom::LInfty(sbEnd-sbStart) < 0.00001 ) {       // why close lines that shouldn't be closed?
+                // ah I see, because close is defined here for
+                // a whole path and should be defined per subpath.
+                // debut==fin => ferme (on devrait garder un element pour les close(), mais tant pis)
                 DoStroke(lastM, lastP - lastM, dest, true, width, join, butt, miter, true);
             } else {
                 DoStroke(lastM, lastP - lastM, dest, doClose, width, join, butt, miter, true);
diff --git a/src/livarot/ShapeDraw.cpp b/src/livarot/ShapeDraw.cpp
index f3a8dbd1f..d222cc49c 100644
--- a/src/livarot/ShapeDraw.cpp
+++ b/src/livarot/ShapeDraw.cpp
@@ -24,7 +24,6 @@ Shape::Plot (double ix, double iy, double ir, double mx, double my, bool doPoint
   fprintf(outFile,"\"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd\">\n");
   fprintf(outFile,"<svg:svg\n");
   fprintf(outFile,"   id=\"svg1\"\n");
-  fprintf(outFile,"   sodipodi:version=\"0.32\"\n");
   fprintf(outFile,"   inkscape:version=\"0.38cvs\"\n");
   fprintf(outFile,"   xmlns:svg=\"http://www.w3.org/2000/svg\"\n");
   fprintf(outFile,"   xmlns:sodipodi=\"http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd\"\n");