From 6b7a05013a304f53fe14d9f26d6ef969e85366c2 Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Sat, 31 Jan 2009 09:18:44 -0600
Subject: [PATCH 1/2] Update svg for xml api changes

---
 extra/svg/svg.factor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extra/svg/svg.factor b/extra/svg/svg.factor
index 6df7314653..4d8a6e6a17 100644
--- a/extra/svg/svg.factor
+++ b/extra/svg/svg.factor
@@ -79,7 +79,7 @@ transform-list = wsp* transforms?:t wsp*
 ;EBNF
 
 : tag-transform ( tag -- transform )
-    "transform" svg-name swap at svg-transform>affine-transform ;
+    "transform" svg-name attr svg-transform>affine-transform ;
 
 TUPLE: moveto p relative? ;
 TUPLE: closepath ;
@@ -221,4 +221,4 @@ svg-path = wsp* moveto-drawto-command-groups?:x wsp* => [[ x ]]
 ;EBNF
 
 : tag-d ( tag -- d )
-    "d" svg-name swap at svg-path>array ;
+    "d" svg-name attr svg-path>array ;

From 5f681d4f3399e7c2c3dac4f500c2ced83bab6a82 Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Sat, 31 Jan 2009 17:29:04 -0600
Subject: [PATCH 2/2] add test cases to svg to cover recent breakage

---
 extra/svg/svg-tests.factor | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/extra/svg/svg-tests.factor b/extra/svg/svg-tests.factor
index 2e1f88b29b..3a28310d71 100644
--- a/extra/svg/svg-tests.factor
+++ b/extra/svg/svg-tests.factor
@@ -1,6 +1,6 @@
 ! (c)2009 Joe Groff, see BSD license
-USING: arrays literals math math.affine-transforms math.functions multiline
-svg tools.test ;
+USING: accessors arrays literals math math.affine-transforms
+math.functions multiline sequences svg tools.test xml xml.utilities ;
 IN: svg.tests
 
 { 1.0 2.25 } { -3.0 4.0 } { 5.5 0.000001 } <affine-transform> 1array [
@@ -94,3 +94,18 @@ IN: svg.tests
     A 5 6 7 1 0 8 9
     "> svg-path>array
 ] unit-test
+
+STRING: test-svg-string
+<svg xmlns="http://www.w3.org/2000/svg">
+        <path transform="translate(1 2)" d="M -1 -1 l 2 2" />
+</svg>
+;
+
+: test-svg-path
+    test-svg-string string>xml body>> children-tags first ;
+
+[ { T{ moveto f { -1.0 -1.0 } f } T{ lineto f { 2.0 2.0 } t } } ]
+[ test-svg-path tag-d ] unit-test
+
+[ T{ affine-transform f { 1.0 0.0 } { 0.0 1.0 } { 1.0 2.0 } } ]
+[ test-svg-path tag-transform ] unit-test