update to trunk

(bzr r11950.1.120)

2 files changed, 39 insertions, 27 deletions

diff --git a/src/livarot/ShapeMisc.cpp b/src/livarot/ShapeMisc.cpp
index a7e5a6cdc..6fd40790f 100644
--- a/src/livarot/ShapeMisc.cpp
+++ b/src/livarot/ShapeMisc.cpp
@@ -374,6 +374,8 @@ Shape::ConvertToFormeNested (Path * dest, int nbP, Path * *orig, int wildPath,in
   do
   {
     int dadContour=-1;
+    int childEdge = -1;
+    bool foundChild = false;
     int startBord = -1;
     {
       int fi = 0;
@@ -389,6 +391,7 @@ Shape::ConvertToFormeNested (Path * dest, int nbP, Path * *orig, int wildPath,in
         } else {
           dadContour = GPOINTER_TO_INT(swdData[askTo].misc);
           dadContour-=1; // pour compenser le decalage
+          childEdge = getPoint(fi).incidentEdge[FIRST];
         }
       }
       lastPtUsed = fi + 1;
@@ -407,6 +410,9 @@ Shape::ConvertToFormeNested (Path * dest, int nbP, Path * *orig, int wildPath,in
     {
       // parcours en profondeur pour mettre les leF et riF a leurs valeurs
       swdData[startBord].misc = (void *)(intptr_t)(1 + nbNest);
+      if (startBord == childEdge) {
+          foundChild = true;
+      }
       //printf("part de %d\n",startBord);
       int curBord = startBord;
       bool back = false;
@@ -444,22 +450,23 @@ Shape::ConvertToFormeNested (Path * dest, int nbP, Path * *orig, int wildPath,in
             }
             else
             {
-              bool escapePath=false;
-              int tb=curBord;
-              while ( tb >= 0 && tb < numberOfEdges() ) {
-                if ( ebData[tb].pathID == wildPath ) {
-                  escapePath=true;
-                  break;
-                }
-                tb=swdData[tb].precParc;
-              }
+//              bool escapePath=false;
+//              int tb=curBord;
+//              while ( tb >= 0 && tb < numberOfEdges() ) {
+//                if ( ebData[tb].pathID == wildPath ) {
+//                  escapePath=true;
+//                  break;
+//                }
+//                tb=swdData[tb].precParc;
+//              }
               nesting=(int*)g_realloc(nesting,(nbNest+1)*sizeof(int));
               contStart=(int*)g_realloc(contStart,(nbNest+1)*sizeof(int));
               contStart[nbNest]=dest->descr_cmd.size();
-              if ( escapePath ) {
-                nesting[nbNest++]=-1; // contient des bouts de coupure -> a part
-              } else {
+              if (foundChild) {
                 nesting[nbNest++]=dadContour;
+                foundChild = false;
+              } else {
+                nesting[nbNest++]=-1; // contient des bouts de coupure -> a part
               }
               swdData[curBord].suivParc = -1;
               AddContour (dest, nbP, orig, startBord, curBord,splitWhenForced);
@@ -484,24 +491,24 @@ Shape::ConvertToFormeNested (Path * dest, int nbP, Path * *orig, int wildPath,in
             if ( getEdge(curBord).en == curStartPt ) {
               //printf("contour %i ",curStartPt);
               
-              bool escapePath=false;
-              int tb=curBord;
-              while ( tb >= 0 && tb < numberOfEdges() ) {
-                if ( ebData[tb].pathID == wildPath ) {
-                  escapePath=true;
-                  break;
-                }
-                tb=swdData[tb].precParc;
-              }
+//              bool escapePath=false;
+//              int tb=curBord;
+//              while ( tb >= 0 && tb < numberOfEdges() ) {
+//                if ( ebData[tb].pathID == wildPath ) {
+//                  escapePath=true;
+//                  break;
+//                }
+//                tb=swdData[tb].precParc;
+//              }
               nesting=(int*)g_realloc(nesting,(nbNest+1)*sizeof(int));
               contStart=(int*)g_realloc(contStart,(nbNest+1)*sizeof(int));
               contStart[nbNest]=dest->descr_cmd.size();
-              if ( escapePath ) {
-                nesting[nbNest++]=-1; // contient des bouts de coupure -> a part
-              } else {
+              if (foundChild) {
                 nesting[nbNest++]=dadContour;
+                foundChild = false;
+              } else {
+                nesting[nbNest++]=-1; // contient des bouts de coupure -> a part
               }
-
               swdData[curBord].suivParc = -1;
               AddContour (dest, nbP, orig, startBord, curBord,splitWhenForced);
               startBord=nb;
@@ -512,6 +519,9 @@ Shape::ConvertToFormeNested (Path * dest, int nbP, Path * *orig, int wildPath,in
           swdData[nb].precParc = curBord;
           swdData[curBord].suivParc = nb;
           curBord = nb;
+          if (nb == childEdge) {
+              foundChild = true;
+          }
           //printf("suite %d\n",curBord);
         }
 	    }
diff --git a/src/sp-shape.cpp b/src/sp-shape.cpp
index 4037b302c..be9f5388c 100644
--- a/src/sp-shape.cpp
+++ b/src/sp-shape.cpp
@@ -889,8 +889,8 @@ int SPShape::numberOfMarkers(int type)
     if (pathv.size() == 0) {
         return 0;
     }
-
     switch(type) {
+
         case SP_MARKER_LOC:
         {
             if ( this->_marker[SP_MARKER_LOC] ) {
@@ -914,7 +914,9 @@ int SPShape::numberOfMarkers(int type)
                 for(Geom::PathVector::const_iterator path_it = pathv.begin(); path_it != pathv.end(); ++path_it) {
                     n += path_it->size_default() + 1;
                 }
-                return n - 2; // minus the start and end marker.
+                n = (n > 1) ? (n - 2) : 0; // Minus the start and end marker, but never negative.
+                                           // A path or polyline may have only one point.
+                return n;
             } else {
                 return 0;
             }