PathParser: fix handling of a second decimal while parsing a float (closes #71)

joshtynjala · joshtynjala · commit a2d49054f076 · 2025-02-18T15:14:07.000-08:00
A float can contain only one decimal, so this should be considered the start of a new float.
diff --git a/format/svg/PathParser.hx b/format/svg/PathParser.hx
@@ -95,28 +95,34 @@ class PathParser {
                     var code =  ch<0 || ch>127 ? UNKNOWN :sCommandArgs[ch];
                     if (code>FLOAT )
                         break;
-                    if (code==FLOAT_DOT && seen_dot)
-                        break;
+                    if (code==FLOAT_DOT)
+                    {
+                        if (seen_dot) {
+                            // a second dot indicates the start of a new float
+                            break;
+                        }
+                        seen_dot = true;
+                    }
                     if (e_pos>=0)
                     {
                         if (code==FLOAT_SIGN)
                         {
-                        if (e_pos!=0)
-                            break;
+                            if (e_pos!=0)
+                                break;
                         }
                         else if (code!=FLOAT)
-                        break;
+                            break;
                         e_pos++;
                     }
                     else if (code==FLOAT_EXP)
                     {
                         if (e_pos>=0)
-                        break;
+                            break;
                         e_pos = 0;
                         seen_dot = true;
                     }
                     else if (code==FLOAT_SIGN)
-                    break;
+                        break;
                     end++;
                 }
                 if (current_command<0)
diff --git a/test/images/path-two-float-decimals-256x256.png b/test/images/path-two-float-decimals-256x256.png
diff --git a/test/images/path-two-float-decimals.svg b/test/images/path-two-float-decimals.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
+<path d="M235,8c6.26.83,8.12,3.83,8,9.56-.39,16.48-.12,33-.16,219.46,0,6-.22,6.09-195.91,-90.75Z" fill="#f00"/>
+</svg>
diff --git a/test/src/SvgGenerationTest.hx b/test/src/SvgGenerationTest.hx
@@ -66,6 +66,11 @@ class SvgGenerationTest extends Test
         generateAndCompare("arc-radius-too-small.svg");
     }
     
+    public function testPathWithTwoFloatDecimals()
+    {
+        generateAndCompare("path-two-float-decimals.svg");
+    }
+    
     public function testFancySunIconRendersCorrectly()
     {
         generateAndCompare("fancy-sun.svg");

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,11 @@ class SvgGenerationTest extends Test`
`66`	`66`	`generateAndCompare("arc-radius-too-small.svg");`
`67`	`67`	`}`
`68`	`68`
	`69`	`+ public function testPathWithTwoFloatDecimals()`
	`70`	`+ {`
	`71`	`+ generateAndCompare("path-two-float-decimals.svg");`
	`72`	`+ }`
	`73`	`+`
`69`	`74`	`public function testFancySunIconRendersCorrectly()`
`70`	`75`	`{`
`71`	`76`	`generateAndCompare("fancy-sun.svg");`