Reviewed by Oliver.

Fixes: http://bugs.webkit.org/show_bug.cgi?id=14896 (SVG InlineText/Flow box sizes don't take rotated glyphs into account)
Introduce new helper function calculateGlyphBoundaries, which takes into account any per-character transformation.
This fixes box size calculations in svg/W3C-SVG-1.1/text-text-07-t.svg, svg/batik/text/textEffect3.svg (rotated glyphs)
-> These strings can be properly selected now, just as well as text path elements.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@26435 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f74fa978ea94a75d2e0d1a11a5d332eacf6bfc2a..4280941611c9156abb20203625d9a9aaf8f97a90 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,133 @@
+2007-08-08  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Rubber stamped by Oliver.
+
+        Update baseline after checking in the calculateGlyphBoundaries() fixes.
+
+        * svg/W3C-SVG-1.1/animate-elem-08-t-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-11-t-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-22-b-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-33-t-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-36-t-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-37-t-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-39-t-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-40-t-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-41-t-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-46-t-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-60-t-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-61-t-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-62-t-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-63-t-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-64-t-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-65-t-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-66-t-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-67-t-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-68-t-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-69-t-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-70-t-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-77-t-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-78-t-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-80-t-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-81-t-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-82-t-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-83-t-expected.txt:
+        * svg/W3C-SVG-1.1/animate-elem-84-t-expected.txt:
+        * svg/W3C-SVG-1.1/coords-viewattr-01-b-expected.txt:
+        * svg/W3C-SVG-1.1/coords-viewattr-02-b-expected.txt:
+        * svg/W3C-SVG-1.1/coords-viewattr-03-b-expected.txt:
+        * svg/W3C-SVG-1.1/extend-namespace-01-f-expected.txt:
+        * svg/W3C-SVG-1.1/filters-displace-01-f-expected.txt:
+        * svg/W3C-SVG-1.1/filters-felem-01-b-expected.txt:
+        * svg/W3C-SVG-1.1/filters-image-01-b-expected.txt:
+        * svg/W3C-SVG-1.1/filters-light-01-f-expected.txt:
+        * svg/W3C-SVG-1.1/filters-morph-01-f-expected.txt:
+        * svg/W3C-SVG-1.1/filters-tile-01-b-expected.txt:
+        * svg/W3C-SVG-1.1/filters-turb-01-f-expected.txt:
+        * svg/W3C-SVG-1.1/fonts-elem-05-t-expected.txt:
+        * svg/W3C-SVG-1.1/fonts-elem-06-t-expected.txt:
+        * svg/W3C-SVG-1.1/fonts-kern-01-t-expected.txt:
+        * svg/W3C-SVG-1.1/masking-intro-01-f-expected.txt:
+        * svg/W3C-SVG-1.1/pservers-grad-14-b-expected.txt:
+        * svg/W3C-SVG-1.1/pservers-grad-17-b-expected.txt:
+        * svg/W3C-SVG-1.1/render-elems-01-t-expected.txt:
+        * svg/W3C-SVG-1.1/render-elems-02-t-expected.txt:
+        * svg/W3C-SVG-1.1/render-elems-03-t-expected.txt:
+        * svg/W3C-SVG-1.1/script-handle-02-b-expected.txt:
+        * svg/W3C-SVG-1.1/script-handle-03-b-expected.txt:
+        * svg/W3C-SVG-1.1/script-handle-04-b-expected.txt:
+        * svg/W3C-SVG-1.1/struct-cond-03-t-expected.txt:
+        * svg/W3C-SVG-1.1/struct-frag-05-t-expected.txt:
+        * svg/W3C-SVG-1.1/struct-frag-06-t-expected.txt:
+        * svg/W3C-SVG-1.1/struct-group-03-t-expected.txt:
+        * svg/W3C-SVG-1.1/struct-image-06-t-expected.txt:
+        * svg/W3C-SVG-1.1/struct-image-07-t-expected.txt:
+        * svg/W3C-SVG-1.1/struct-use-03-t-expected.txt:
+        * svg/W3C-SVG-1.1/styling-css-04-f-expected.txt:
+        * svg/W3C-SVG-1.1/text-align-01-b-expected.txt:
+        * svg/W3C-SVG-1.1/text-align-02-b-expected.txt:
+        * svg/W3C-SVG-1.1/text-align-05-b-expected.txt:
+        * svg/W3C-SVG-1.1/text-align-06-b-expected.txt:
+        * svg/W3C-SVG-1.1/text-intro-05-t-expected.txt:
+        * svg/W3C-SVG-1.1/text-path-01-b-expected.txt:
+        * svg/W3C-SVG-1.1/text-text-04-t-expected.txt:
+        * svg/W3C-SVG-1.1/text-text-05-t-expected.txt:
+        * svg/W3C-SVG-1.1/text-text-06-t-expected.txt:
+        * svg/W3C-SVG-1.1/text-text-07-t-expected.txt:
+        * svg/W3C-SVG-1.1/text-tselect-02-f-expected.txt:
+        * svg/W3C-SVG-1.1/text-tspan-01-b-expected.txt:
+        * svg/batik/text/textAnchor-expected.txt:
+        * svg/batik/text/textAnchor2-expected.txt:
+        * svg/batik/text/textAnchor3-expected.txt:
+        * svg/batik/text/textBiDi-expected.txt:
+        * svg/batik/text/textDecoration2-expected.txt:
+        * svg/batik/text/textEffect-expected.checksum:
+        * svg/batik/text/textEffect-expected.png:
+        * svg/batik/text/textEffect-expected.txt:
+        * svg/batik/text/textEffect2-expected.txt:
+        * svg/batik/text/textEffect3-expected.checksum:
+        * svg/batik/text/textEffect3-expected.png:
+        * svg/batik/text/textEffect3-expected.txt:
+        * svg/batik/text/textFeatures-expected.txt:
+        * svg/batik/text/textGlyphOrientationHorizontal-expected.txt:
+        * svg/batik/text/textLayout-expected.txt:
+        * svg/batik/text/textLayout2-expected.txt:
+        * svg/batik/text/textOnPath-expected.txt:
+        * svg/batik/text/textOnPath2-expected.txt:
+        * svg/batik/text/textOnPath3-expected.txt:
+        * svg/batik/text/textOnPathSpaces-expected.txt:
+        * svg/batik/text/textPCDATA-expected.txt:
+        * svg/batik/text/textPosition-expected.txt:
+        * svg/batik/text/textProperties-expected.txt:
+        * svg/batik/text/textProperties2-expected.txt:
+        * svg/batik/text/textStyles-expected.txt:
+        * svg/batik/text/verticalText-expected.txt:
+        * svg/batik/text/verticalTextOnPath-expected.txt:
+        * svg/carto.net/button-expected.txt:
+        * svg/carto.net/colourpicker-expected.txt:
+        * svg/carto.net/combobox-expected.txt:
+        * svg/carto.net/scrollbar-expected.txt:
+        * svg/carto.net/selectionlist-expected.txt:
+        * svg/carto.net/window-expected.txt:
+        * svg/custom/path-textPath-simulation-expected.txt:
+        * svg/hixie/perf/001-expected.txt:
+        * svg/hixie/perf/002-expected.txt:
+        * svg/hixie/text/001-broken-expected.txt:
+        * svg/hixie/text/003a-expected.txt:
+        * svg/hixie/viewbox/preserveAspectRatio/001-expected.txt:
+        * svg/hixie/viewbox/preserveAspectRatio/002-expected.txt:
+        * svg/text/text-align-01-b-expected.txt:
+        * svg/text/text-align-02-b-expected.txt:
+        * svg/text/text-align-05-b-expected.txt:
+        * svg/text/text-align-06-b-expected.txt:
+        * svg/text/text-intro-05-t-expected.txt:
+        * svg/text/text-path-01-b-expected.txt:
+        * svg/text/text-text-04-t-expected.txt:
+        * svg/text/text-text-05-t-expected.txt:
+        * svg/text/text-text-06-t-expected.txt:
+        * svg/text/text-text-07-t-expected.txt:
+        * svg/text/text-tselect-02-f-expected.txt:
+        * svg/text/text-tspan-01-b-expected.txt:
+
 2007-08-08  Nikolas Zimmermann  <zimmermann@kde.org>
 
         Reviewed by Oliver.

diff --git a/LayoutTests/svg/batik/text/textAnchor-expected.txt b/LayoutTests/svg/batik/text/textAnchor-expected.txt
index e5e1c4996b550df387395710184e2eed71fc1cc6..5dafe4db708ac6cdc47909febadd12af98776fe1 100644 (file)
--- a/LayoutTests/svg/batik/text/textAnchor-expected.txt
+++ b/LayoutTests/svg/batik/text/textAnchor-expected.txt
@@ -32,15 +32,15 @@ layer at (0,0) size 450x500
             RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGContainer {g} at (108,124.50) size 276x28.50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,40.00)}]
           RenderSVGText {text} at (69,30) size 368x38 contains 2 chunk(s)
-            RenderSVGTSpan {tspan} at (0,0) size 51x18
-              RenderSVGInlineText {#text} at (0,6) size 51x18
+            RenderSVGTSpan {tspan} at (0,0) size 52x18
+              RenderSVGInlineText {#text} at (0,6) size 52x18
                 chunk 1 (middle anchor) text run 1 at (69.50,50.00) startOffset 0 endOffset 8 width 51.00: "I am the"
-            RenderSVGInlineText {#text} at (51,6) size 4x18
+            RenderSVGInlineText {#text} at (51,6) size 5x18
               chunk 1 (middle anchor) text run 2 at (120.50,50.00) startOffset 0 endOffset 1 width 4.00: " "
-            RenderSVGTSpan {tspan} at (0,0) size 102x18 [color=#FF0000]
-              RenderSVGInlineText {#text} at (55,6) size 102x18
+            RenderSVGTSpan {tspan} at (0,0) size 103x18 [color=#FF0000]
+              RenderSVGInlineText {#text} at (55,6) size 103x18
                 chunk 1 (middle anchor) text run 3 at (124.50,50.00) startOffset 0 endOffset 15 width 102.00: "same text chunk"
-            RenderSVGInlineText {#text} at (157,6) size 4x18
+            RenderSVGInlineText {#text} at (157,6) size 5x18
               chunk 1 (middle anchor) text run 4 at (226.50,50.00) startOffset 0 endOffset 1 width 4.00: " "
             RenderSVGTSpan {tspan} at (0,0) size 117x18
               RenderSVGInlineText {#text} at (251,-14) size 117x18
@@ -62,9 +62,9 @@ layer at (0,0) size 450x500
               RenderSVGInlineText {#text} at (331,-14) size 117x18
                 chunk 2 text run 1 at (320.00,30.00) startOffset 0 endOffset 18 width 117.00: "another text chunk"
             RenderSVGInlineText {#text} at (0,0) size 0x0
-      RenderSVGContainer {g} at (48,222) size 291.75x88.50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,50.00)}]
-        RenderSVGContainer {g} at (168.75,222) size 171x28.50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,120.00)}]
-          RenderSVGText {text} at (150,30) size 228x38 contains 2 chunk(s)
+      RenderSVGContainer {g} at (48,222) size 292.50x88.50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,50.00)}]
+        RenderSVGContainer {g} at (168.75,222) size 171.75x28.50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,120.00)}]
+          RenderSVGText {text} at (150,30) size 229x38 contains 2 chunk(s)
             RenderSVGTSpan {tspan} at (0,0) size 51x18
               RenderSVGInlineText {#text} at (0,6) size 51x18
                 chunk 1 text run 1 at (150.00,50.00) startOffset 0 endOffset 8 width 51.00: "I am the"
@@ -75,28 +75,28 @@ layer at (0,0) size 450x500
                 chunk 1 text run 3 at (205.00,50.00) startOffset 0 endOffset 15 width 102.00: "same text chunk"
             RenderSVGInlineText {#text} at (157,6) size 4x18
               chunk 1 text run 4 at (307.00,50.00) startOffset 0 endOffset 1 width 4.00: " "
-            RenderSVGTSpan {tspan} at (0,0) size 117x18
-              RenderSVGInlineText {#text} at (111,-14) size 117x18
+            RenderSVGTSpan {tspan} at (0,0) size 118x18
+              RenderSVGInlineText {#text} at (111,-14) size 118x18
                 chunk 2 (middle anchor) text run 1 at (261.50,30.00) startOffset 0 endOffset 18 width 117.00: "another text chunk"
             RenderSVGInlineText {#text} at (0,0) size 0x0
-        RenderSVGContainer {g} at (108,252) size 231.75x28.50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,160.00)}]
-          RenderSVGText {text} at (69,30) size 309x38 contains 2 chunk(s)
-            RenderSVGTSpan {tspan} at (0,0) size 51x18
-              RenderSVGInlineText {#text} at (0,6) size 51x18
+        RenderSVGContainer {g} at (108,252) size 232.50x28.50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,160.00)}]
+          RenderSVGText {text} at (69,30) size 310x38 contains 2 chunk(s)
+            RenderSVGTSpan {tspan} at (0,0) size 52x18
+              RenderSVGInlineText {#text} at (0,6) size 52x18
                 chunk 1 (middle anchor) text run 1 at (69.50,50.00) startOffset 0 endOffset 8 width 51.00: "I am the"
-            RenderSVGInlineText {#text} at (51,6) size 4x18
+            RenderSVGInlineText {#text} at (51,6) size 5x18
               chunk 1 (middle anchor) text run 2 at (120.50,50.00) startOffset 0 endOffset 1 width 4.00: " "
-            RenderSVGTSpan {tspan} at (0,0) size 102x18 [color=#FF0000]
-              RenderSVGInlineText {#text} at (55,6) size 102x18
+            RenderSVGTSpan {tspan} at (0,0) size 103x18 [color=#FF0000]
+              RenderSVGInlineText {#text} at (55,6) size 103x18
                 chunk 1 (middle anchor) text run 3 at (124.50,50.00) startOffset 0 endOffset 15 width 102.00: "same text chunk"
-            RenderSVGInlineText {#text} at (157,6) size 4x18
+            RenderSVGInlineText {#text} at (157,6) size 5x18
               chunk 1 (middle anchor) text run 4 at (226.50,50.00) startOffset 0 endOffset 1 width 4.00: " "
-            RenderSVGTSpan {tspan} at (0,0) size 117x18
-              RenderSVGInlineText {#text} at (192,-14) size 117x18
+            RenderSVGTSpan {tspan} at (0,0) size 118x18
+              RenderSVGInlineText {#text} at (192,-14) size 118x18
                 chunk 2 (middle anchor) text run 1 at (261.50,30.00) startOffset 0 endOffset 18 width 117.00: "another text chunk"
             RenderSVGInlineText {#text} at (0,0) size 0x0
-        RenderSVGContainer {g} at (48,282) size 291.75x28.50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,200.00)}]
-          RenderSVGText {text} at (-11,30) size 389x38 contains 2 chunk(s)
+        RenderSVGContainer {g} at (48,282) size 292.50x28.50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,200.00)}]
+          RenderSVGText {text} at (-11,30) size 390x38 contains 2 chunk(s)
             RenderSVGTSpan {tspan} at (0,0) size 51x18
               RenderSVGInlineText {#text} at (0,6) size 51x18
                 chunk 1 (end anchor) text run 1 at (-11.00,50.00) startOffset 0 endOffset 8 width 51.00: "I am the"
@@ -107,8 +107,8 @@ layer at (0,0) size 450x500
                 chunk 1 (end anchor) text run 3 at (44.00,50.00) startOffset 0 endOffset 15 width 102.00: "same text chunk"
             RenderSVGInlineText {#text} at (157,6) size 4x18
               chunk 1 (end anchor) text run 4 at (146.00,50.00) startOffset 0 endOffset 1 width 4.00: " "
-            RenderSVGTSpan {tspan} at (0,0) size 117x18
-              RenderSVGInlineText {#text} at (272,-14) size 117x18
+            RenderSVGTSpan {tspan} at (0,0) size 118x18
+              RenderSVGInlineText {#text} at (272,-14) size 118x18
                 chunk 2 (middle anchor) text run 1 at (261.50,30.00) startOffset 0 endOffset 18 width 117.00: "another text chunk"
             RenderSVGInlineText {#text} at (0,0) size 0x0
       RenderSVGContainer {g} at (48,349.50) size 248.25x88.50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,80.00)}]
@@ -130,15 +130,15 @@ layer at (0,0) size 450x500
             RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGContainer {g} at (108,379.50) size 188.25x28.50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,300.00)}]
           RenderSVGText {text} at (69,30) size 251x38 contains 2 chunk(s)
-            RenderSVGTSpan {tspan} at (0,0) size 51x18
-              RenderSVGInlineText {#text} at (0,6) size 51x18
+            RenderSVGTSpan {tspan} at (0,0) size 52x18
+              RenderSVGInlineText {#text} at (0,6) size 52x18
                 chunk 1 (middle anchor) text run 1 at (69.50,50.00) startOffset 0 endOffset 8 width 51.00: "I am the"
-            RenderSVGInlineText {#text} at (51,6) size 4x18
+            RenderSVGInlineText {#text} at (51,6) size 5x18
               chunk 1 (middle anchor) text run 2 at (120.50,50.00) startOffset 0 endOffset 1 width 4.00: " "
-            RenderSVGTSpan {tspan} at (0,0) size 102x18 [color=#FF0000]
-              RenderSVGInlineText {#text} at (55,6) size 102x18
+            RenderSVGTSpan {tspan} at (0,0) size 103x18 [color=#FF0000]
+              RenderSVGInlineText {#text} at (55,6) size 103x18
                 chunk 1 (middle anchor) text run 3 at (124.50,50.00) startOffset 0 endOffset 15 width 102.00: "same text chunk"
-            RenderSVGInlineText {#text} at (157,6) size 4x18
+            RenderSVGInlineText {#text} at (157,6) size 5x18
               chunk 1 (middle anchor) text run 4 at (226.50,50.00) startOffset 0 endOffset 1 width 4.00: " "
             RenderSVGTSpan {tspan} at (0,0) size 117x18
               RenderSVGInlineText {#text} at (134,-14) size 117x18

diff --git a/LayoutTests/svg/batik/text/textAnchor2-expected.txt b/LayoutTests/svg/batik/text/textAnchor2-expected.txt
index ac635bdea66dfafe08fbed97b22b3c7e10757f6a..171c72b938e681284daa1fd25224358856b691a4 100644 (file)
--- a/LayoutTests/svg/batik/text/textAnchor2-expected.txt
+++ b/LayoutTests/svg/batik/text/textAnchor2-expected.txt
@@ -54,7 +54,7 @@ layer at (0,0) size 450x500
             chunk 5 text run 1 at (160.00,0.00) startOffset 4 endOffset 5 width 8.00: "k"
       RenderSVGText {text} at (-6,0) size 169x18 contains 5 chunk(s)
         RenderSVGTSpan {tspan} at (0,0) size 169x18
-          RenderSVGInlineText {#text} at (0,-14) size 169x18
+          RenderSVGInlineText {#text} at (1,-14) size 169x18
             chunk 1 (middle anchor) text run 1 at (-5.50,0.00) startOffset 0 endOffset 1 width 11.00: "B"
             chunk 2 (middle anchor) text run 1 at (36.50,0.00) startOffset 1 endOffset 2 width 7.00: "a"
             chunk 3 (middle anchor) text run 1 at (78.00,0.00) startOffset 2 endOffset 3 width 4.00: "t"
@@ -90,7 +90,7 @@ layer at (0,0) size 450x500
             chunk 5 text run 1 at (160.00,0.00) startOffset 4 endOffset 5 width 8.00: "k"
       RenderSVGText {text} at (-6,0) size 169x28 contains 5 chunk(s)
         RenderSVGTSpan {tspan} at (0,0) size 169x28
-          RenderSVGInlineText {#text} at (0,-14) size 169x28
+          RenderSVGInlineText {#text} at (1,-14) size 169x28
             chunk 1 (middle anchor) text run 1 at (-5.50,0.00) startOffset 0 endOffset 1 width 11.00: "B"
             chunk 2 (middle anchor) text run 1 at (36.50,10.00) startOffset 1 endOffset 2 width 7.00: "a"
             chunk 3 (middle anchor) text run 1 at (78.00,0.00) startOffset 2 endOffset 3 width 4.00: "t"

diff --git a/LayoutTests/svg/batik/text/textAnchor3-expected.txt b/LayoutTests/svg/batik/text/textAnchor3-expected.txt
index 5ce5069c56441fe9d9b99e87b6370a2025b372d8..00c0a32f33feeedcc137176dc034e29494c8b90f 100644 (file)
--- a/LayoutTests/svg/batik/text/textAnchor3-expected.txt
+++ b/LayoutTests/svg/batik/text/textAnchor3-expected.txt
@@ -56,20 +56,20 @@ layer at (0,0) size 450x500
         RenderSVGTSpan {tspan} at (0,0) size 39x18 [color=#DC143C]
           RenderSVGInlineText {#text} at (168,-4) size 39x18
             chunk 5 text run 2 at (168.00,10.00) startOffset 0 endOffset 7 width 39.00: " rules!"
-      RenderSVGText {text} at (-6,0) size 188x28 contains 5 chunk(s)
-        RenderSVGTSpan {tspan} at (0,0) size 149x28
-          RenderSVGInlineText {#text} at (0,-14) size 150x28
+      RenderSVGText {text} at (-6,0) size 189x28 contains 5 chunk(s)
+        RenderSVGTSpan {tspan} at (0,0) size 150x28
+          RenderSVGInlineText {#text} at (1,-14) size 150x28
             chunk 1 (middle anchor) text run 1 at (-5.50,0.00) startOffset 0 endOffset 1 width 11.00: "B"
             chunk 2 (middle anchor) text run 1 at (36.50,0.00) startOffset 1 endOffset 2 width 7.00: "a"
             chunk 3 (middle anchor) text run 1 at (78.00,0.00) startOffset 2 endOffset 3 width 4.00: "t"
             chunk 4 (middle anchor) text run 1 at (118.00,0.00) startOffset 3 endOffset 4 width 4.00: "i"
             chunk 5 (middle anchor) text run 1 at (136.50,10.00) startOffset 4 endOffset 5 width 8.00: "k"
-        RenderSVGTSpan {tspan} at (0,0) size 39x18 [color=#DC143C]
-          RenderSVGInlineText {#text} at (150,-4) size 39x18
+        RenderSVGTSpan {tspan} at (0,0) size 40x18 [color=#DC143C]
+          RenderSVGInlineText {#text} at (150,-4) size 40x18
             chunk 5 (middle anchor) text run 2 at (144.50,10.00) startOffset 0 endOffset 7 width 39.00: " rules!"
       RenderSVGText {text} at (-11,0) size 171x28 contains 5 chunk(s)
-        RenderSVGTSpan {tspan} at (0,0) size 135x28
-          RenderSVGInlineText {#text} at (0,-14) size 135x28
+        RenderSVGTSpan {tspan} at (0,0) size 132x28
+          RenderSVGInlineText {#text} at (0,-14) size 132x28
             chunk 1 (end anchor) text run 1 at (-11.00,0.00) startOffset 0 endOffset 1 width 11.00: "B"
             chunk 2 (end anchor) text run 1 at (33.00,0.00) startOffset 1 endOffset 2 width 7.00: "a"
             chunk 3 (end anchor) text run 1 at (76.00,0.00) startOffset 2 endOffset 3 width 4.00: "t"
@@ -86,7 +86,7 @@ layer at (0,0) size 450x500
             chunk 3 text run 1 at (80.00,0.00) startOffset 2 endOffset 5 width 16.00: "tik"
       RenderSVGText {text} at (-6,0) size 93x18 contains 3 chunk(s)
         RenderSVGTSpan {tspan} at (0,0) size 93x18
-          RenderSVGInlineText {#text} at (0,-14) size 93x18
+          RenderSVGInlineText {#text} at (1,-14) size 93x18
             chunk 1 (middle anchor) text run 1 at (-5.50,0.00) startOffset 0 endOffset 1 width 11.00: "B"
             chunk 2 (middle anchor) text run 1 at (36.50,0.00) startOffset 1 endOffset 2 width 7.00: "a"
             chunk 3 (middle anchor) text run 1 at (72.00,0.00) startOffset 2 endOffset 5 width 16.00: "tik"
@@ -106,19 +106,19 @@ layer at (0,0) size 450x500
         RenderSVGTSpan {tspan} at (0,0) size 39x18 [color=#DC143C]
           RenderSVGInlineText {#text} at (132,-4) size 39x18
             chunk 4 text run 2 at (132.00,10.00) startOffset 0 endOffset 7 width 39.00: " rules!"
-      RenderSVGText {text} at (-6,0) size 150x28 contains 4 chunk(s)
-        RenderSVGTSpan {tspan} at (0,0) size 111x28
-          RenderSVGInlineText {#text} at (0,-14) size 112x28
+      RenderSVGText {text} at (-6,0) size 151x28 contains 4 chunk(s)
+        RenderSVGTSpan {tspan} at (0,0) size 112x28
+          RenderSVGInlineText {#text} at (1,-14) size 112x28
             chunk 1 (middle anchor) text run 1 at (-5.50,0.00) startOffset 0 endOffset 1 width 11.00: "B"
             chunk 2 (middle anchor) text run 1 at (36.50,10.00) startOffset 1 endOffset 2 width 7.00: "a"
             chunk 3 (middle anchor) text run 1 at (78.00,0.00) startOffset 2 endOffset 3 width 4.00: "t"
             chunk 4 (middle anchor) text run 1 at (94.50,10.00) startOffset 3 endOffset 5 width 12.00: "ik"
-        RenderSVGTSpan {tspan} at (0,0) size 39x18 [color=#DC143C]
-          RenderSVGInlineText {#text} at (112,-4) size 39x18
+        RenderSVGTSpan {tspan} at (0,0) size 40x18 [color=#DC143C]
+          RenderSVGInlineText {#text} at (112,-4) size 40x18
             chunk 4 (middle anchor) text run 2 at (106.50,10.00) startOffset 0 endOffset 7 width 39.00: " rules!"
       RenderSVGText {text} at (-11,0) size 131x28 contains 4 chunk(s)
-        RenderSVGTSpan {tspan} at (0,0) size 95x28
-          RenderSVGInlineText {#text} at (0,-14) size 95x28
+        RenderSVGTSpan {tspan} at (0,0) size 92x28
+          RenderSVGInlineText {#text} at (0,-14) size 92x28
             chunk 1 (end anchor) text run 1 at (-11.00,0.00) startOffset 0 endOffset 1 width 11.00: "B"
             chunk 2 (end anchor) text run 1 at (33.00,10.00) startOffset 1 endOffset 2 width 7.00: "a"
             chunk 3 (end anchor) text run 1 at (76.00,0.00) startOffset 2 endOffset 3 width 4.00: "t"

diff --git a/LayoutTests/svg/batik/text/textBiDi-expected.txt b/LayoutTests/svg/batik/text/textBiDi-expected.txt
index 793aa4152ca9df42a227ba86f8eca5bde1de63a2..304a9ac6455e7821cedabffbb5c8472450760127 100644 (file)
--- a/LayoutTests/svg/batik/text/textBiDi-expected.txt
+++ b/LayoutTests/svg/batik/text/textBiDi-expected.txt
@@ -1,34 +1,34 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 450x500
-  RenderSVGRoot {svg} at (45,36) size 343x368
-    RenderSVGContainer {g} at (45,36) size 343x368
+  RenderSVGRoot {svg} at (45,36) size 344x368
+    RenderSVGContainer {g} at (45,36) size 344x368
       RenderSVGText {text} at (133,50) size 184x17 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-14) size 184x17
           chunk 1 (middle anchor) text run 1 at (133.00,50.00) startOffset 0 endOffset 30 width 184.00: "BiDi Text / International Text"
-      RenderSVGText {text} at (67,125) size 315x15 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-12) size 85x15
+      RenderSVGText {text} at (67,125) size 316x15 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-12) size 86x15
           chunk 1 (middle anchor) text run 1 at (67.50,125.00) startOffset 0 endOffset 15 width 85.00: "Some text goes "
-        RenderSVGTSpan {tspan} at (0,0) size 69x15 [color=#0000FF]
-          RenderSVGInlineText {#text} at (85,-12) size 69x15
+        RenderSVGTSpan {tspan} at (0,0) size 70x15 [color=#0000FF]
+          RenderSVGInlineText {#text} at (85,-12) size 70x15
             chunk 1 (middle anchor) text run 2 at (152.50,125.00) startOffset 0 endOffset 15 width 69.00 RTL override: "(right to left)"
-        RenderSVGInlineText {#text} at (154,-12) size 161x15
+        RenderSVGInlineText {#text} at (154,-12) size 162x15
           chunk 1 (middle anchor) text run 3 at (221.50,125.00) startOffset 0 endOffset 34 width 161.00: ", other text goes (left to right)."
-      RenderSVGText {text} at (150,150) size 149x15 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-12) size 33x15
+      RenderSVGText {text} at (150,150) size 150x15 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-12) size 34x15
           chunk 1 (middle anchor) text run 1 at (150.50,150.00) startOffset 0 endOffset 5 width 33.00: "Some "
-        RenderSVGTSpan {tspan} at (0,0) size 89x15 [color=#8B0000]
-          RenderSVGInlineText {#text} at (33,-12) size 89x15
+        RenderSVGTSpan {tspan} at (0,0) size 90x15 [color=#8B0000]
+          RenderSVGInlineText {#text} at (33,-12) size 90x15
             chunk 1 (middle anchor) text run 2 at (183.50,150.00) startOffset 0 endOffset 1 width 4.00 RTL: ")"
             chunk 1 (middle anchor) text run 3 at (187.50,150.00) startOffset 0 endOffset 13 width 81.00: "embedded bidi"
             chunk 1 (middle anchor) text run 4 at (268.50,150.00) startOffset 0 endOffset 1 width 4.00 RTL: "("
-        RenderSVGInlineText {#text} at (122,-12) size 27x15
+        RenderSVGInlineText {#text} at (122,-12) size 28x15
           chunk 1 (middle anchor) text run 5 at (272.50,150.00) startOffset 0 endOffset 6 width 27.00: " text."
-      RenderSVGText {text} at (61,175) size 327x13 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-10) size 327x13
+      RenderSVGText {text} at (61,175) size 328x13 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-10) size 328x13
           chunk 1 (middle anchor) text run 1 at (61.50,175.00) startOffset 0 endOffset 45 width 181.00: "Text selection allows visually discontiguous "
           chunk 1 (middle anchor) text run 2 at (242.50,175.00) startOffset 0 endOffset 38 width 146.00: "selections across bi-directional text."
-      RenderSVGContainer {g} at (45,212) size 314x192
+      RenderSVGContainer {g} at (45,212) size 311x192
         RenderSVGText {text} at (45,225) size 296x17 contains 1 chunk(s) [color=#191970]
           RenderSVGInlineText {#text} at (0,-13) size 296x17
             chunk 1 text run 1 at (45.00,225.00) startOffset 0 endOffset 7 width 35.00: "latin: "
@@ -46,18 +46,18 @@ layer at (0,0) size 450x500
           RenderSVGInlineText {#text} at (0,-13) size 293x17
             chunk 1 text run 1 at (45.00,300.00) startOffset 0 endOffset 7 width 43.00: "greek: "
             chunk 1 text run 2 at (88.00,300.00) startOffset 0 endOffset 30 width 250.00: "\x{391}\x{392}\x{393}\x{394} \x{3B1}\x{3B2}\x{3B3}\x{3B4}\x{3B5}\x{3B6}\x{3B7}\x{3B8}\x{3B9}\x{3BA}\x{3BB}\x{3BC}\x{3BD}\x{3BE}\x{3BF}\x{3C0}\x{3C1}\x{3C2}\x{3C3}\x{3C4}\x{3C5}\x{3C6}\x{3C7}\x{3C8}\x{3C9}"
-        RenderSVGText {text} at (45,325) size 290x17 contains 1 chunk(s) [color=#556B2F]
-          RenderSVGInlineText {#text} at (0,-13) size 290x17
+        RenderSVGText {text} at (45,325) size 289x17 contains 1 chunk(s) [color=#556B2F]
+          RenderSVGInlineText {#text} at (0,-13) size 289x17
             chunk 1 text run 1 at (45.00,325.00) startOffset 0 endOffset 8 width 54.00: "hebrew: "
             chunk 1 text run 2 at (99.00,325.00) startOffset 0 endOffset 27 width 225.00 RTL: "\x{5D0}\x{5D1}\x{5D2}\x{5D3}\x{5D4}\x{5D5}\x{5D6}\x{5D7}\x{5D8}\x{5D9}\x{5DA}\x{5DB}\x{5DC}\x{5DD}\x{5DE}\x{5DF}\x{5E0}\x{5E1}\x{5E2}\x{5E3}\x{5E4}\x{5E5}\x{5E6}\x{5E7}\x{5E8}\x{5E9}\x{5EA}"
-        RenderSVGText {text} at (45,350) size 236x17 contains 1 chunk(s) [color=#556B2F]
-          RenderSVGInlineText {#text} at (0,-13) size 236x17
+        RenderSVGText {text} at (45,350) size 235x17 contains 1 chunk(s) [color=#556B2F]
+          RenderSVGInlineText {#text} at (0,-13) size 235x17
             chunk 1 text run 1 at (45.00,350.00) startOffset 0 endOffset 27 width 225.00 RTL: "\x{5D0}\x{5D1}\x{5D2}\x{5D3}\x{5D4}\x{5D5}\x{5D6}\x{5D7}\x{5D8}\x{5D9}\x{5DA}\x{5DB}\x{5DC}\x{5DD}\x{5DE}\x{5DF}\x{5E0}\x{5E1}\x{5E2}\x{5E3}\x{5E4}\x{5E5}\x{5E6}\x{5E7}\x{5E8}\x{5E9}\x{5EA}"
-        RenderSVGText {text} at (45,375) size 314x17 contains 1 chunk(s) [color=#8B0000]
-          RenderSVGInlineText {#text} at (0,-13) size 314x17
+        RenderSVGText {text} at (45,375) size 311x17 contains 1 chunk(s) [color=#8B0000]
+          RenderSVGInlineText {#text} at (0,-13) size 311x17
             chunk 1 text run 1 at (45.00,375.00) startOffset 0 endOffset 8 width 46.00: "arabic: "
             chunk 1 text run 2 at (91.00,375.00) startOffset 0 endOffset 36 width 216.00 RTL: "\x{621}\x{623}\x{624}\x{625}\x{626}\x{627}\x{628}\x{629}\x{62A}\x{62B}\x{62C}\x{62D}\x{62E}\x{62F}\x{630}\x{631}\x{632}\x{633}\x{634}\x{635}\x{636}\x{637}\x{638}\x{639}\x{640}\x{641}\x{642}\x{643}\x{644}\x{645}\x{646}\x{647}\x{648}\x{649}\x{650}\x{676}"
-        RenderSVGText {text} at (45,400) size 268x17 contains 1 chunk(s) [color=#8B0000]
-          RenderSVGInlineText {#text} at (0,-13) size 268x17
+        RenderSVGText {text} at (45,400) size 265x17 contains 1 chunk(s) [color=#8B0000]
+          RenderSVGInlineText {#text} at (0,-13) size 265x17
             chunk 1 text run 1 at (45.00,400.00) startOffset 0 endOffset 36 width 216.00 RTL: "\x{621}\x{623}\x{624}\x{625}\x{626}\x{627}\x{628}\x{629}\x{62A}\x{62B}\x{62C}\x{62D}\x{62E}\x{62F}\x{630}\x{631}\x{632}\x{633}\x{634}\x{635}\x{636}\x{637}\x{638}\x{639}\x{640}\x{641}\x{642}\x{643}\x{644}\x{645}\x{646}\x{647}\x{648}\x{649}\x{650}\x{676}"
     RenderSVGContainer {use} at (0,0) size 0x0

diff --git a/LayoutTests/svg/batik/text/textDecoration2-expected.txt b/LayoutTests/svg/batik/text/textDecoration2-expected.txt
index 369b125c05d5e4aac55bfb88120662486fe34e96..8c07204db176e40b4f90c388a1fb90ceaec80a80 100644 (file)
--- a/LayoutTests/svg/batik/text/textDecoration2-expected.txt
+++ b/LayoutTests/svg/batik/text/textDecoration2-expected.txt
@@ -2,8 +2,8 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 450x500
   RenderSVGRoot {svg} at (31,26) size 380x402
-    RenderSVGText {text} at (110,40) size 229x17 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,-14) size 229x17
+    RenderSVGText {text} at (110,40) size 230x17 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,-14) size 230x17
         chunk 1 (middle anchor) text run 1 at (110.50,40.00) startOffset 0 endOffset 33 width 229.00: "Text Decoration with dx, dy tests"
     RenderSVGContainer {g} at (31,60) size 380x368 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,50.00)}]
       RenderSVGText {text} at (31,24) size 180x53 contains 3 chunk(s)

diff --git a/LayoutTests/svg/batik/text/textEffect-expected.checksum b/LayoutTests/svg/batik/text/textEffect-expected.checksum
index 0de2d6a4a5e817b9d1ba3e20ea01956894385b1f..24284e4e7f958a6bcf293e0c78eb870f3c765025 100644 (file)
--- a/LayoutTests/svg/batik/text/textEffect-expected.checksum
+++ b/LayoutTests/svg/batik/text/textEffect-expected.checksum
@@ -1 +1 @@
-414479a23d76f6f352114c595149adff
\ No newline at end of file
+3c8af3933d6e4fac08dbe1e2e86657f9
\ No newline at end of file

diff --git a/LayoutTests/svg/batik/text/textEffect-expected.png b/LayoutTests/svg/batik/text/textEffect-expected.png
index 693df6757d3823e575996eff82e62971bcecd0ea..ca09df72999f3e8c63f161c4b3388f8769e8d839 100644 (file)
Binary files a/LayoutTests/svg/batik/text/textEffect-expected.png and b/LayoutTests/svg/batik/text/textEffect-expected.png differ

diff --git a/LayoutTests/svg/batik/text/textEffect-expected.txt b/LayoutTests/svg/batik/text/textEffect-expected.txt
index b22187bee8765d6871ec12601ae8b0b6f5d52ac3..ea2317f8c5a6090ba7c8c84f219a8b2e8cadac3c 100644 (file)
--- a/LayoutTests/svg/batik/text/textEffect-expected.txt
+++ b/LayoutTests/svg/batik/text/textEffect-expected.txt
@@ -4,10 +4,10 @@ KCanvasResource {id="dropShadow" [type=FILTER]  [bounding box=at (-10.00%,-10.00
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 450x500
-  RenderSVGRoot {svg} at (42,16) size 370x387
-    RenderSVGContainer {g} at (42,16) size 370x387
-      RenderSVGText {text} at (136,30) size 177x17 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-14) size 177x17
+  RenderSVGRoot {svg} at (42,16) size 371x387
+    RenderSVGContainer {g} at (42,16) size 371x387
+      RenderSVGText {text} at (136,30) size 178x17 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-14) size 178x17
           chunk 1 (middle anchor) text run 1 at (136.50,30.00) startOffset 0 endOffset 27 width 177.00: "Gradient and filter on text"
       RenderSVGText {text} at (106,50) size 238x17 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-14) size 238x17
@@ -24,25 +24,25 @@ layer at (0,0) size 450x500
       RenderSVGText {text} at (44,160) size 152x59 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-48) size 152x59
           chunk 1 (middle anchor) text run 1 at (44.00,160.00) startOffset 0 endOffset 5 width 152.00: "BATIK"
-      RenderSVGText {text} at (249,160) size 161x61 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-48) size 161x61
+      RenderSVGText {text} at (249,160) size 162x61 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-48) size 162x61
           chunk 1 (middle anchor) text run 1 at (249.50,160.00) startOffset 0 endOffset 5 width 161.00: "BATIK"
       RenderSVGText {text} at (44,260) size 152x59 contains 1 chunk(s) [color=#FFFFFF]
         RenderSVGInlineText {#text} at (0,-48) size 152x59
           chunk 1 (middle anchor) text run 1 at (44.00,260.00) startOffset 0 endOffset 5 width 152.00: "BATIK"
-      RenderSVGText {text} at (249,260) size 161x61 contains 1 chunk(s) [color=#FFFFFF]
-        RenderSVGInlineText {#text} at (0,-48) size 161x61
+      RenderSVGText {text} at (249,260) size 162x61 contains 1 chunk(s) [color=#FFFFFF]
+        RenderSVGInlineText {#text} at (0,-48) size 162x61
           chunk 1 (middle anchor) text run 1 at (249.50,260.00) startOffset 0 endOffset 5 width 161.00: "BATIK"
       RenderSVGText {text} at (44,360) size 152x59 contains 1 chunk(s) [color=#FF0000]
         RenderSVGInlineText {#text} at (0,-48) size 152x59
           chunk 1 (middle anchor) text run 1 at (44.00,360.00) startOffset 0 endOffset 5 width 152.00: "BATIK"
-      RenderSVGText {text} at (249,360) size 161x61 contains 1 chunk(s) [color=#FF0000]
-        RenderSVGInlineText {#text} at (0,-48) size 161x61
+      RenderSVGText {text} at (249,360) size 162x61 contains 1 chunk(s) [color=#FF0000]
+        RenderSVGInlineText {#text} at (0,-48) size 162x61
           chunk 1 (middle anchor) text run 1 at (249.50,360.00) startOffset 0 endOffset 5 width 161.00: "BATIK"
-      RenderSVGText {text} at (87,400) size 65x14 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-11) size 65x14
+      RenderSVGText {text} at (87,400) size 66x14 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-11) size 66x14
           chunk 1 (middle anchor) text run 1 at (87.50,400.00) startOffset 0 endOffset 13 width 65.00: "(System font)"
-      RenderSVGText {text} at (302,400) size 55x14 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-11) size 55x14
+      RenderSVGText {text} at (302,400) size 56x14 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-11) size 56x14
           chunk 1 (middle anchor) text run 1 at (302.50,400.00) startOffset 0 endOffset 10 width 55.00: "(SVG font)"
     RenderSVGContainer {use} at (0,0) size 0x0

diff --git a/LayoutTests/svg/batik/text/textEffect2-expected.txt b/LayoutTests/svg/batik/text/textEffect2-expected.txt
index 0c0a925b6e3b2631fd119f7f68f743e2526f4fa3..f727535dfa0af91146600f794880f6b798717e76 100644 (file)
--- a/LayoutTests/svg/batik/text/textEffect2-expected.txt
+++ b/LayoutTests/svg/batik/text/textEffect2-expected.txt
@@ -6,8 +6,8 @@ layer at (0,0) size 800x600
 layer at (0,0) size 450x500
   RenderSVGRoot {svg} at (100,16) size 265x289
     RenderSVGContainer {g} at (100,16) size 265x289
-      RenderSVGText {text} at (158,30) size 133x17 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-14) size 133x17
+      RenderSVGText {text} at (158,30) size 134x17 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-14) size 134x17
           chunk 1 (middle anchor) text run 1 at (158.50,30.00) startOffset 0 endOffset 20 width 133.00: "clip-path using text"
       RenderSVGText {text} at (106,50) size 238x17 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-14) size 238x17

diff --git a/LayoutTests/svg/batik/text/textEffect3-expected.checksum b/LayoutTests/svg/batik/text/textEffect3-expected.checksum
index ecd3cd2b03259b33672de809bad3b5faef5b4993..9c31f60cb08e7034576bcdbbdfe432eaa0472470 100644 (file)
--- a/LayoutTests/svg/batik/text/textEffect3-expected.checksum
+++ b/LayoutTests/svg/batik/text/textEffect3-expected.checksum
@@ -1 +1 @@
-c16e7ef8955cfd27217f81ea9de9722d
\ No newline at end of file
+6f77cc9b4c94d75ae3dcfac75925981c
\ No newline at end of file

diff --git a/LayoutTests/svg/batik/text/textEffect3-expected.png b/LayoutTests/svg/batik/text/textEffect3-expected.png
index 09200ff0bf6913885c0a6c4d93b80485701554d2..313e8a5db03b45af46f684086610ba56f4000249 100644 (file)
Binary files a/LayoutTests/svg/batik/text/textEffect3-expected.png and b/LayoutTests/svg/batik/text/textEffect3-expected.png differ

diff --git a/LayoutTests/svg/batik/text/textEffect3-expected.txt b/LayoutTests/svg/batik/text/textEffect3-expected.txt
index d9d3015c3af305efbd384d4af0c2b5ea449f9a6b..fa7da23b1210def6954f306d3af4ea5d0ddbc8b4 100644 (file)
--- a/LayoutTests/svg/batik/text/textEffect3-expected.txt
+++ b/LayoutTests/svg/batik/text/textEffect3-expected.txt
@@ -4,10 +4,10 @@ KCanvasResource {id="dropShadow" [type=FILTER]  [bounding box=at (-10.00%,-10.00
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 450x500
-  RenderSVGRoot {svg} at (52,16) size 348x387
-    RenderSVGContainer {g} at (52,16) size 348x387
-      RenderSVGText {text} at (99,30) size 251x17 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-14) size 251x17
+  RenderSVGRoot {svg} at (52,16) size 367x387
+    RenderSVGContainer {g} at (52,16) size 367x387
+      RenderSVGText {text} at (99,30) size 252x17 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-14) size 252x17
           chunk 1 (middle anchor) text run 1 at (99.50,30.00) startOffset 0 endOffset 37 width 251.00: "Gradient and filter on text and tspan"
       RenderSVGText {text} at (106,50) size 238x17 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-14) size 238x17
@@ -21,100 +21,100 @@ layer at (0,0) size 450x500
           RenderSVGGradientStop {stop} at (0,0) size 0x0
           RenderSVGGradientStop {stop} at (0,0) size 0x0
           RenderSVGGradientStop {stop} at (0,0) size 0x0
-      RenderSVGText {text} at (54,140) size 131x79 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-28) size 35x59
+      RenderSVGText {text} at (54,140) size 150x99 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-28) size 36x59
           chunk 1 (middle anchor) text run 1 at (54.50,160.00) startOffset 0 endOffset 1 width 35.00: "B"
-        RenderSVGTSpan {tspan} at (0,0) size 18x30
-          RenderSVGInlineText {#text} at (35,-24) size 18x30
+        RenderSVGTSpan {tspan} at (0,0) size 19x30
+          RenderSVGInlineText {#text} at (35,-24) size 19x30
             chunk 1 (middle anchor) text run 2 at (89.50,140.00) startOffset 0 endOffset 1 width 18.00: "A"
-        RenderSVGInlineText {#text} at (53,-48) size 32x59
+        RenderSVGInlineText {#text} at (53,-48) size 33x59
           chunk 1 (middle anchor) text run 3 at (107.50,140.00) startOffset 0 endOffset 1 width 32.00: "T"
-        RenderSVGTSpan {tspan} at (0,0) size 11x44
-          RenderSVGInlineText {#text} at (85,-36) size 11x44
+        RenderSVGTSpan {tspan} at (0,0) size 12x44
+          RenderSVGInlineText {#text} at (85,-36) size 12x44
             chunk 1 (middle anchor) text run 4 at (139.50,140.00) startOffset 0 endOffset 1 width 11.00: "I"
-        RenderSVGTSpan {tspan} at (0,0) size 35x59
-          RenderSVGInlineText {#text} at (96,-48) size 35x59
+        RenderSVGTSpan {tspan} at (0,0) size 54x68
+          RenderSVGInlineText {#text} at (96,-68) size 54x68
             chunk 1 (middle anchor) text run 5 at (150.50,140.00) startOffset 0 endOffset 1 width 35.00: "K"
         RenderSVGInlineText {#text} at (0,0) size 0x0
-      RenderSVGText {text} at (261,140) size 137x81 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-28) size 35x61
+      RenderSVGText {text} at (261,140) size 156x102 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-28) size 36x61
           chunk 1 (middle anchor) text run 1 at (261.50,160.00) startOffset 0 endOffset 1 width 35.00: "B"
-        RenderSVGTSpan {tspan} at (0,0) size 19x31
-          RenderSVGInlineText {#text} at (35,-24) size 19x31
+        RenderSVGTSpan {tspan} at (0,0) size 20x31
+          RenderSVGInlineText {#text} at (35,-24) size 20x31
             chunk 1 (middle anchor) text run 2 at (296.50,140.00) startOffset 0 endOffset 1 width 19.00: "A"
-        RenderSVGInlineText {#text} at (54,-48) size 32x61
+        RenderSVGInlineText {#text} at (54,-48) size 33x61
           chunk 1 (middle anchor) text run 3 at (315.50,140.00) startOffset 0 endOffset 1 width 32.00: "T"
-        RenderSVGTSpan {tspan} at (0,0) size 13x46
-          RenderSVGInlineText {#text} at (86,-36) size 13x46
+        RenderSVGTSpan {tspan} at (0,0) size 14x46
+          RenderSVGInlineText {#text} at (86,-36) size 14x46
             chunk 1 (middle anchor) text run 4 at (347.50,140.00) startOffset 0 endOffset 1 width 13.00: "I"
-        RenderSVGTSpan {tspan} at (0,0) size 38x61
-          RenderSVGInlineText {#text} at (99,-48) size 38x61
+        RenderSVGTSpan {tspan} at (0,0) size 57x71
+          RenderSVGInlineText {#text} at (99,-69) size 57x71
             chunk 1 (middle anchor) text run 5 at (360.50,140.00) startOffset 0 endOffset 1 width 38.00: "K"
         RenderSVGInlineText {#text} at (0,0) size 0x0
-      RenderSVGText {text} at (54,240) size 131x79 contains 1 chunk(s) [color=#FFFFFF]
-        RenderSVGInlineText {#text} at (0,-28) size 35x59
+      RenderSVGText {text} at (54,240) size 150x99 contains 1 chunk(s) [color=#FFFFFF]
+        RenderSVGInlineText {#text} at (0,-28) size 36x59
           chunk 1 (middle anchor) text run 1 at (54.50,260.00) startOffset 0 endOffset 1 width 35.00: "B"
-        RenderSVGTSpan {tspan} at (0,0) size 18x30
-          RenderSVGInlineText {#text} at (35,-24) size 18x30
+        RenderSVGTSpan {tspan} at (0,0) size 19x30
+          RenderSVGInlineText {#text} at (35,-24) size 19x30
             chunk 1 (middle anchor) text run 2 at (89.50,240.00) startOffset 0 endOffset 1 width 18.00: "A"
-        RenderSVGInlineText {#text} at (53,-48) size 32x59
+        RenderSVGInlineText {#text} at (53,-48) size 33x59
           chunk 1 (middle anchor) text run 3 at (107.50,240.00) startOffset 0 endOffset 1 width 32.00: "T"
-        RenderSVGTSpan {tspan} at (0,0) size 11x44
-          RenderSVGInlineText {#text} at (85,-36) size 11x44
+        RenderSVGTSpan {tspan} at (0,0) size 12x44
+          RenderSVGInlineText {#text} at (85,-36) size 12x44
             chunk 1 (middle anchor) text run 4 at (139.50,240.00) startOffset 0 endOffset 1 width 11.00: "I"
-        RenderSVGTSpan {tspan} at (0,0) size 35x59
-          RenderSVGInlineText {#text} at (96,-48) size 35x59
+        RenderSVGTSpan {tspan} at (0,0) size 54x68
+          RenderSVGInlineText {#text} at (96,-68) size 54x68
             chunk 1 (middle anchor) text run 5 at (150.50,240.00) startOffset 0 endOffset 1 width 35.00: "K"
         RenderSVGInlineText {#text} at (0,0) size 0x0
-      RenderSVGText {text} at (261,240) size 137x81 contains 1 chunk(s) [color=#FFFFFF]
-        RenderSVGInlineText {#text} at (0,-28) size 35x61
+      RenderSVGText {text} at (261,240) size 156x102 contains 1 chunk(s) [color=#FFFFFF]
+        RenderSVGInlineText {#text} at (0,-28) size 36x61
           chunk 1 (middle anchor) text run 1 at (261.50,260.00) startOffset 0 endOffset 1 width 35.00: "B"
-        RenderSVGTSpan {tspan} at (0,0) size 19x31
-          RenderSVGInlineText {#text} at (35,-24) size 19x31
+        RenderSVGTSpan {tspan} at (0,0) size 20x31
+          RenderSVGInlineText {#text} at (35,-24) size 20x31
             chunk 1 (middle anchor) text run 2 at (296.50,240.00) startOffset 0 endOffset 1 width 19.00: "A"
-        RenderSVGInlineText {#text} at (54,-48) size 32x61
+        RenderSVGInlineText {#text} at (54,-48) size 33x61
           chunk 1 (middle anchor) text run 3 at (315.50,240.00) startOffset 0 endOffset 1 width 32.00: "T"
-        RenderSVGTSpan {tspan} at (0,0) size 13x46
-          RenderSVGInlineText {#text} at (86,-36) size 13x46
+        RenderSVGTSpan {tspan} at (0,0) size 14x46
+          RenderSVGInlineText {#text} at (86,-36) size 14x46
             chunk 1 (middle anchor) text run 4 at (347.50,240.00) startOffset 0 endOffset 1 width 13.00: "I"
-        RenderSVGTSpan {tspan} at (0,0) size 38x61
-          RenderSVGInlineText {#text} at (99,-48) size 38x61
+        RenderSVGTSpan {tspan} at (0,0) size 57x71
+          RenderSVGInlineText {#text} at (99,-69) size 57x71
             chunk 1 (middle anchor) text run 5 at (360.50,240.00) startOffset 0 endOffset 1 width 38.00: "K"
         RenderSVGInlineText {#text} at (0,0) size 0x0
-      RenderSVGText {text} at (54,340) size 131x79 contains 1 chunk(s) [color=#FF0000]
-        RenderSVGInlineText {#text} at (0,-28) size 35x59
+      RenderSVGText {text} at (54,340) size 150x99 contains 1 chunk(s) [color=#FF0000]
+        RenderSVGInlineText {#text} at (0,-28) size 36x59
           chunk 1 (middle anchor) text run 1 at (54.50,360.00) startOffset 0 endOffset 1 width 35.00: "B"
-        RenderSVGTSpan {tspan} at (0,0) size 18x30
-          RenderSVGInlineText {#text} at (35,-24) size 18x30
+        RenderSVGTSpan {tspan} at (0,0) size 19x30
+          RenderSVGInlineText {#text} at (35,-24) size 19x30
             chunk 1 (middle anchor) text run 2 at (89.50,340.00) startOffset 0 endOffset 1 width 18.00: "A"
-        RenderSVGInlineText {#text} at (53,-48) size 32x59
+        RenderSVGInlineText {#text} at (53,-48) size 33x59
           chunk 1 (middle anchor) text run 3 at (107.50,340.00) startOffset 0 endOffset 1 width 32.00: "T"
-        RenderSVGTSpan {tspan} at (0,0) size 11x44
-          RenderSVGInlineText {#text} at (85,-36) size 11x44
+        RenderSVGTSpan {tspan} at (0,0) size 12x44
+          RenderSVGInlineText {#text} at (85,-36) size 12x44
             chunk 1 (middle anchor) text run 4 at (139.50,340.00) startOffset 0 endOffset 1 width 11.00: "I"
-        RenderSVGTSpan {tspan} at (0,0) size 35x59
-          RenderSVGInlineText {#text} at (96,-48) size 35x59
+        RenderSVGTSpan {tspan} at (0,0) size 54x68
+          RenderSVGInlineText {#text} at (96,-68) size 54x68
             chunk 1 (middle anchor) text run 5 at (150.50,340.00) startOffset 0 endOffset 1 width 35.00: "K"
         RenderSVGInlineText {#text} at (0,0) size 0x0
-      RenderSVGText {text} at (261,340) size 137x81 contains 1 chunk(s) [color=#FF0000]
-        RenderSVGInlineText {#text} at (0,-28) size 35x61
+      RenderSVGText {text} at (261,340) size 156x102 contains 1 chunk(s) [color=#FF0000]
+        RenderSVGInlineText {#text} at (0,-28) size 36x61
           chunk 1 (middle anchor) text run 1 at (261.50,360.00) startOffset 0 endOffset 1 width 35.00: "B"
-        RenderSVGTSpan {tspan} at (0,0) size 19x31
-          RenderSVGInlineText {#text} at (35,-24) size 19x31
+        RenderSVGTSpan {tspan} at (0,0) size 20x31
+          RenderSVGInlineText {#text} at (35,-24) size 20x31
             chunk 1 (middle anchor) text run 2 at (296.50,340.00) startOffset 0 endOffset 1 width 19.00: "A"
-        RenderSVGInlineText {#text} at (54,-48) size 32x61
+        RenderSVGInlineText {#text} at (54,-48) size 33x61
           chunk 1 (middle anchor) text run 3 at (315.50,340.00) startOffset 0 endOffset 1 width 32.00: "T"
-        RenderSVGTSpan {tspan} at (0,0) size 13x46
-          RenderSVGInlineText {#text} at (86,-36) size 13x46
+        RenderSVGTSpan {tspan} at (0,0) size 14x46
+          RenderSVGInlineText {#text} at (86,-36) size 14x46
             chunk 1 (middle anchor) text run 4 at (347.50,340.00) startOffset 0 endOffset 1 width 13.00: "I"
-        RenderSVGTSpan {tspan} at (0,0) size 38x61
-          RenderSVGInlineText {#text} at (99,-48) size 38x61
+        RenderSVGTSpan {tspan} at (0,0) size 57x71
+          RenderSVGInlineText {#text} at (99,-69) size 57x71
             chunk 1 (middle anchor) text run 5 at (360.50,340.00) startOffset 0 endOffset 1 width 38.00: "K"
         RenderSVGInlineText {#text} at (0,0) size 0x0
-      RenderSVGText {text} at (87,400) size 65x14 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-11) size 65x14
+      RenderSVGText {text} at (87,400) size 66x14 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-11) size 66x14
           chunk 1 (middle anchor) text run 1 at (87.50,400.00) startOffset 0 endOffset 13 width 65.00: "(System font)"
-      RenderSVGText {text} at (302,400) size 55x14 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-11) size 55x14
+      RenderSVGText {text} at (302,400) size 56x14 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-11) size 56x14
           chunk 1 (middle anchor) text run 1 at (302.50,400.00) startOffset 0 endOffset 10 width 55.00: "(SVG font)"
     RenderSVGContainer {use} at (0,0) size 0x0

diff --git a/LayoutTests/svg/batik/text/textFeatures-expected.txt b/LayoutTests/svg/batik/text/textFeatures-expected.txt
index 0b8a7a6db4f9a47ef583af1b7b0402b4a3a0e3f5..71cd074e997425f32c818c1c7444f69e2b7ae284 100644 (file)
--- a/LayoutTests/svg/batik/text/textFeatures-expected.txt
+++ b/LayoutTests/svg/batik/text/textFeatures-expected.txt
@@ -72,33 +72,33 @@ layer at (0,0) size 450x500
               chunk 1 text run 4 at (297.00,275.00) startOffset 0 endOffset 9 width 55.00: "overline,"
           RenderSVGInlineText {#text} at (307,-13) size 27x17
             chunk 1 text run 5 at (352.00,275.00) startOffset 0 endOffset 4 width 27.00: " and"
-        RenderSVGText {text} at (45,293) size 301x26 contains 1 chunk(s) [color=#191970]
+        RenderSVGText {text} at (45,293) size 301x27 contains 1 chunk(s) [color=#191970]
           RenderSVGTSpan {tspan} at (0,0) size 87x17
             RenderSVGInlineText {#text} at (0,-6) size 87x17
               chunk 1 text run 1 at (45.00,300.00) startOffset 0 endOffset 14 width 87.00: "strikethrough."
           RenderSVGInlineText {#text} at (87,-6) size 4x17
             chunk 1 text run 2 at (132.00,300.00) startOffset 0 endOffset 1 width 4.00: " "
-          RenderSVGTSpan {tspan} at (0,0) size 25x13
-            RenderSVGInlineText {#text} at (91,-9) size 25x13
+          RenderSVGTSpan {tspan} at (0,0) size 25x14
+            RenderSVGInlineText {#text} at (91,-10) size 25x14
               chunk 1 text run 3 at (136.00,293.50) startOffset 0 endOffset 5 width 25.00: "super"
           RenderSVGInlineText {#text} at (116,-6) size 37x17
             chunk 1 text run 4 at (161.00,300.00) startOffset 0 endOffset 6 width 37.00: "-and- "
-          RenderSVGTSpan {tspan} at (0,0) size 16x13
-            RenderSVGInlineText {#text} at (153,3) size 16x13
+          RenderSVGTSpan {tspan} at (0,0) size 16x14
+            RenderSVGInlineText {#text} at (153,3) size 16x14
               chunk 1 text run 5 at (198.00,306.50) startOffset 0 endOffset 3 width 16.00: "sub"
           RenderSVGInlineText {#text} at (169,-6) size 132x17
             chunk 1 text run 6 at (214.00,300.00) startOffset 0 endOffset 9 width 49.00: "-scripts "
             chunk 1 text run 7 at (263.00,300.00) startOffset 0 endOffset 14 width 83.00: "are available."
-        RenderSVGText {text} at (45,319) size 342x24 contains 1 chunk(s) [color=#191970]
+        RenderSVGText {text} at (45,319) size 342x25 contains 1 chunk(s) [color=#191970]
           RenderSVGInlineText {#text} at (0,-7) size 177x17
             chunk 1 text run 1 at (45.00,325.00) startOffset 0 endOffset 29 width 177.00: "Baseline can also be shifted "
-          RenderSVGTSpan {tspan} at (0,0) size 12x13
-            RenderSVGInlineText {#text} at (177,-9) size 12x13
+          RenderSVGTSpan {tspan} at (0,0) size 12x14
+            RenderSVGInlineText {#text} at (177,-10) size 12x14
               chunk 1 text run 2 at (222.00,319.50) startOffset 0 endOffset 2 width 12.00: "up"
           RenderSVGInlineText {#text} at (189,-7) size 31x17
             chunk 1 text run 3 at (234.00,325.00) startOffset 0 endOffset 5 width 31.00: " and "
-          RenderSVGTSpan {tspan} at (0,0) size 26x13
-            RenderSVGInlineText {#text} at (220,1) size 26x13
+          RenderSVGTSpan {tspan} at (0,0) size 26x14
+            RenderSVGInlineText {#text} at (220,1) size 26x14
               chunk 1 text run 4 at (265.00,330.50) startOffset 0 endOffset 4 width 26.00: "down"
           RenderSVGInlineText {#text} at (246,-7) size 96x17
             chunk 1 text run 5 at (291.00,325.00) startOffset 0 endOffset 1 width 4.00: " "

diff --git a/LayoutTests/svg/batik/text/textGlyphOrientationHorizontal-expected.txt b/LayoutTests/svg/batik/text/textGlyphOrientationHorizontal-expected.txt
index a94b14160fda7a29be95611e91c0c83b88accf3d..e02a0e936b671f3ed68886dc7d92c3e8795f5c75 100644 (file)
--- a/LayoutTests/svg/batik/text/textGlyphOrientationHorizontal-expected.txt
+++ b/LayoutTests/svg/batik/text/textGlyphOrientationHorizontal-expected.txt
@@ -1,87 +1,87 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 450x500
-  RenderSVGRoot {svg} at (49,16) size 351x375.52
+  RenderSVGRoot {svg} at (40,16) size 360x375.52
     RenderSVGHiddenContainer {defs} at (0,0) size 0x0
       RenderPath {path} at (19.65,8.96) size 160.35x42.08 [stroke={[type=SOLID] [color=#0000FF]}] [data="M20.00,40.00C40.00,20.00,60.00,0.00,80.00,20.00C100.00,40.00,120.00,60.00,140.00,40.00C160.00,20.00,180.00,20.00,180.00,20.00"]
       RenderPath {path} at (19.78,8.99) size 320.22x42.02 [stroke={[type=SOLID] [color=#0000FF]}] [data="M20.00,40.00C60.00,20.00,100.00,0.00,140.00,20.00C180.00,40.00,220.00,60.00,260.00,40.00C300.00,20.00,340.00,20.00,340.00,20.00"]
     RenderSVGText {text} at (130,30) size 190x17 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,-14) size 190x17
         chunk 1 (middle anchor) text run 1 at (130.00,30.00) startOffset 0 endOffset 27 width 190.00: "Text Orientation Horizontal"
-    RenderSVGContainer {g} at (49,42) size 351x349.52
+    RenderSVGContainer {g} at (40,45) size 360x346.52
       RenderPath {line} at (50,79) size 150x2 [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M50.00,80.00L200.00,80.00"]
       RenderSVGText {text} at (50,80) size 142x27 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-22) size 142x27
           chunk 1 text run 1 at (50.00,80.00) startOffset 0 endOffset 13 width 142.00: "Batik is Good"
-      RenderSVGContainer {g} at (237,42) size 163x71 [transform={m=((1.00,0.00)(0.00,1.00)) t=(220.00,60.00)}]
+      RenderSVGContainer {g} at (224,45) size 176x69 [transform={m=((1.00,0.00)(0.00,1.00)) t=(220.00,60.00)}]
         RenderSVGContainer {use} at (239.29,68.42) size 160.71x43.16
           RenderSVGContainer {g} at (239.29,68.42) size 160.71x43.16
             RenderPath {path} at (239.29,68.42) size 160.71x43.16 [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M20.00,40.00C40.00,20.00,60.00,0.00,80.00,20.00C100.00,40.00,120.00,60.00,140.00,40.00C160.00,20.00,180.00,20.00,180.00,20.00"]
-        RenderSVGText {text} at (17,4) size 122x71 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 122x71
-            RenderSVGInlineText {#text} at (0,-13) size 52x49
+        RenderSVGText {text} at (17,4) size 137x69 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 137x69
+            RenderSVGInlineText {#text} at (-13,-14) size 71x54
               chunk 1 text run 1 at (17.67,12.16) startOffset 0 endOffset 6 width 60.00: "Batik "
-            RenderSVGTSpan {tspan} at (0,0) size 16x32 [color=#FF0000]
-              RenderSVGInlineText {#text} at (52,-21) size 15x31
+            RenderSVGTSpan {tspan} at (0,0) size 34x35 [color=#FF0000]
+              RenderSVGInlineText {#text} at (55,-19) size 34x35
                 chunk 1 text run 2 at (69.83,4.21) startOffset 0 endOffset 2 width 17.00: "is"
-            RenderSVGTSpan {tspan} at (0,0) size 57x50
-              RenderSVGInlineText {#text} at (65,0) size 57x49
+            RenderSVGTSpan {tspan} at (0,0) size 62x47
+              RenderSVGInlineText {#text} at (62,3) size 62x47
                 chunk 1 text run 3 at (82.43,25.89) startOffset 0 endOffset 5 width 65.00: " Good"
           RenderSVGInlineText {#text} at (0,0) size 0x0
       RenderPath {line} at (50,129) size 350x2 [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M50.00,130.00L400.00,130.00"]
       RenderSVGText {text} at (50,130) size 142x27 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-22) size 142x27
           chunk 1 text run 1 at (50.00,130.00) startOffset 0 endOffset 13 width 142.00: "Batik is Good"
-      RenderSVGContainer {g} at (49,131) size 321x70.52 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,150.00)}]
+      RenderSVGContainer {g} at (40,132) size 330x69.52 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,150.00)}]
         RenderSVGContainer {use} at (49.55,158.48) size 320.45x43.05
           RenderSVGContainer {g} at (49.55,158.48) size 320.45x43.05
             RenderPath {path} at (49.55,158.48) size 320.45x43.05 [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M20.00,40.00C60.00,20.00,100.00,0.00,140.00,20.00C180.00,40.00,220.00,60.00,260.00,40.00C300.00,20.00,340.00,20.00,340.00,20.00"]
-        RenderSVGText {text} at (19,3) size 135x60 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 135x60
-            RenderSVGInlineText {#text} at (0,-7) size 56x46
+        RenderSVGText {text} at (19,3) size 153x62 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 153x62
+            RenderSVGInlineText {#text} at (-9,-7) size 67x48
               chunk 1 text run 1 at (19.16,17.35) startOffset 0 endOffset 6 width 60.00: "Batik "
-            RenderSVGTSpan {tspan} at (0,0) size 17x29 [color=#FF0000]
-              RenderSVGInlineText {#text} at (55,-21) size 16x28
+            RenderSVGTSpan {tspan} at (0,0) size 25x29 [color=#FF0000]
+              RenderSVGInlineText {#text} at (47,-21) size 25x29
                 chunk 1 text run 2 at (74.95,3.71) startOffset 0 endOffset 2 width 17.00: "is"
-            RenderSVGTSpan {tspan} at (0,0) size 63x39
-              RenderSVGInlineText {#text} at (72,-13) size 62x39
+            RenderSVGTSpan {tspan} at (0,0) size 74x41
+              RenderSVGInlineText {#text} at (70,-13) size 74x41
                 chunk 1 text run 3 at (91.61,11.78) startOffset 0 endOffset 5 width 65.00: " Good"
           RenderSVGInlineText {#text} at (0,0) size 0x0
       RenderPath {line} at (50,239) size 150x2 [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M50.00,240.00L200.00,240.00"]
       RenderSVGText {text} at (50,240) size 142x27 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-22) size 142x27
           chunk 1 text run 1 at (50.00,240.00) startOffset 0 endOffset 13 width 142.00: "Batik is Good"
-      RenderSVGContainer {g} at (237,202) size 163x71 [transform={m=((1.00,0.00)(0.00,1.00)) t=(220.00,220.00)}]
+      RenderSVGContainer {g} at (224,205) size 176x69 [transform={m=((1.00,0.00)(0.00,1.00)) t=(220.00,220.00)}]
         RenderSVGContainer {use} at (239.29,228.42) size 160.71x43.16
           RenderSVGContainer {g} at (239.29,228.42) size 160.71x43.16
             RenderPath {path} at (239.29,228.42) size 160.71x43.16 [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M20.00,40.00C40.00,20.00,60.00,0.00,80.00,20.00C100.00,40.00,120.00,60.00,140.00,40.00C160.00,20.00,180.00,20.00,180.00,20.00"]
-        RenderSVGText {text} at (17,4) size 122x71 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 122x71
-            RenderSVGInlineText {#text} at (0,-13) size 52x49
+        RenderSVGText {text} at (17,4) size 137x69 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 137x69
+            RenderSVGInlineText {#text} at (-13,-14) size 71x54
               chunk 1 text run 1 at (17.67,12.16) startOffset 0 endOffset 6 width 60.00: "Batik "
-            RenderSVGTSpan {tspan} at (0,0) size 16x32 [color=#FF0000]
-              RenderSVGInlineText {#text} at (52,-21) size 15x31
+            RenderSVGTSpan {tspan} at (0,0) size 34x35 [color=#FF0000]
+              RenderSVGInlineText {#text} at (55,-19) size 34x35
                 chunk 1 text run 2 at (69.83,4.21) startOffset 0 endOffset 2 width 17.00: "is"
-            RenderSVGTSpan {tspan} at (0,0) size 57x50
-              RenderSVGInlineText {#text} at (65,0) size 57x49
+            RenderSVGTSpan {tspan} at (0,0) size 62x47
+              RenderSVGInlineText {#text} at (62,3) size 62x47
                 chunk 1 text run 3 at (82.43,25.89) startOffset 0 endOffset 5 width 65.00: " Good"
           RenderSVGInlineText {#text} at (0,0) size 0x0
       RenderPath {line} at (50,319) size 350x2 [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M50.00,320.00L400.00,320.00"]
       RenderSVGText {text} at (50,320) size 142x27 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-22) size 142x27
           chunk 1 text run 1 at (50.00,320.00) startOffset 0 endOffset 13 width 142.00: "Batik is Good"
-      RenderSVGContainer {g} at (49,321) size 321x70.52 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,340.00)}]
+      RenderSVGContainer {g} at (40,322) size 330x69.52 [transform={m=((1.00,0.00)(0.00,1.00)) t=(30.00,340.00)}]
         RenderSVGContainer {use} at (49.55,348.48) size 320.45x43.05
           RenderSVGContainer {g} at (49.55,348.48) size 320.45x43.05
             RenderPath {path} at (49.55,348.48) size 320.45x43.05 [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M20.00,40.00C60.00,20.00,100.00,0.00,140.00,20.00C180.00,40.00,220.00,60.00,260.00,40.00C300.00,20.00,340.00,20.00,340.00,20.00"]
-        RenderSVGText {text} at (19,3) size 135x60 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 135x60
-            RenderSVGInlineText {#text} at (0,-7) size 56x46
+        RenderSVGText {text} at (19,3) size 153x62 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 153x62
+            RenderSVGInlineText {#text} at (-9,-7) size 67x48
               chunk 1 text run 1 at (19.16,17.35) startOffset 0 endOffset 6 width 60.00: "Batik "
-            RenderSVGTSpan {tspan} at (0,0) size 17x29 [color=#FF0000]
-              RenderSVGInlineText {#text} at (55,-21) size 16x28
+            RenderSVGTSpan {tspan} at (0,0) size 25x29 [color=#FF0000]
+              RenderSVGInlineText {#text} at (47,-21) size 25x29
                 chunk 1 text run 2 at (74.95,3.71) startOffset 0 endOffset 2 width 17.00: "is"
-            RenderSVGTSpan {tspan} at (0,0) size 63x39
-              RenderSVGInlineText {#text} at (72,-13) size 62x39
+            RenderSVGTSpan {tspan} at (0,0) size 74x41
+              RenderSVGInlineText {#text} at (70,-13) size 74x41
                 chunk 1 text run 3 at (91.61,11.78) startOffset 0 endOffset 5 width 65.00: " Good"
           RenderSVGInlineText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/svg/batik/text/textLayout-expected.txt b/LayoutTests/svg/batik/text/textLayout-expected.txt
index 65ea49ce88964c0bd1f5f4ef231e3bac544d2d0e..079d737969c2db935de320093476f7a129eafcd1 100644 (file)
--- a/LayoutTests/svg/batik/text/textLayout-expected.txt
+++ b/LayoutTests/svg/batik/text/textLayout-expected.txt
@@ -113,8 +113,8 @@ layer at (0,0) size 450x500
         RenderSVGText {text} at (290,290) size 64x9 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-7) size 64x9
             chunk 1 text run 1 at (290.00,290.00) startOffset 0 endOffset 19 width 64.00: "letter-spacing=\"10\""
-      RenderSVGText {text} at (171,320) size 107x13 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-10) size 107x13
+      RenderSVGText {text} at (171,320) size 108x13 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-10) size 108x13
           chunk 1 (middle anchor) text run 1 at (171.50,320.00) startOffset 0 endOffset 23 width 107.00: "Word Spacing Adjustment"
       RenderSVGContainer {g} at (40,337) size 199x30
         RenderSVGText {text} at (40,350) size 199x17 contains 1 chunk(s)

diff --git a/LayoutTests/svg/batik/text/textLayout2-expected.txt b/LayoutTests/svg/batik/text/textLayout2-expected.txt
index d50107e9a869e5202e2b1f0652b8c94b11029aa5..87618d5af6edb4574caed257bbe7739445e46c0a 100644 (file)
--- a/LayoutTests/svg/batik/text/textLayout2-expected.txt
+++ b/LayoutTests/svg/batik/text/textLayout2-expected.txt
@@ -1,32 +1,32 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 450x500
-  RenderSVGRoot {svg} at (90,36) size 249x433
+  RenderSVGRoot {svg} at (90,36) size 250x433
     RenderSVGHiddenContainer {defs} at (0,0) size 0x0
       RenderSVGText {text} at (0,0) size 44x18 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-14) size 44x18
           chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 6 width 44.00: "sample"
-    RenderSVGContainer {g} at (90,36) size 249x433
+    RenderSVGContainer {g} at (90,36) size 250x433
       RenderSVGText {text} at (140,50) size 170x17 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-14) size 170x17
           chunk 1 (middle anchor) text run 1 at (140.00,50.00) startOffset 0 endOffset 26 width 170.00: "Text Layout Properties (2)"
-      RenderSVGText {text} at (186,75) size 77x13 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-10) size 77x13
+      RenderSVGText {text} at (186,75) size 78x13 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-10) size 78x13
           chunk 1 (middle anchor) text run 1 at (186.50,75.00) startOffset 0 endOffset 19 width 77.00: "Baseline Properties"
-      RenderSVGContainer {g} at (154,88) size 141x49
-        RenderSVGText {text} at (161,101) size 127x34 contains 1 chunk(s)
-          RenderSVGTSpan {tspan} at (0,0) size 34x17 [color=#0000FF]
-            RenderSVGInlineText {#text} at (0,-12) size 34x17
+      RenderSVGContainer {g} at (154,88) size 142x49
+        RenderSVGText {text} at (161,101) size 128x35 contains 1 chunk(s)
+          RenderSVGTSpan {tspan} at (0,0) size 35x18 [color=#0000FF]
+            RenderSVGInlineText {#text} at (0,-13) size 35x18
               chunk 1 (middle anchor) text run 1 at (161.50,101.50) startOffset 0 endOffset 5 width 34.00: "super"
-          RenderSVGInlineText {#text} at (34,-4) size 31x17
+          RenderSVGInlineText {#text} at (34,-4) size 32x17
             chunk 1 (middle anchor) text run 2 at (195.50,110.00) startOffset 0 endOffset 5 width 31.00: " and "
-          RenderSVGTSpan {tspan} at (0,0) size 22x17 [color=#008000]
-            RenderSVGInlineText {#text} at (65,4) size 22x17
+          RenderSVGTSpan {tspan} at (0,0) size 23x18 [color=#008000]
+            RenderSVGInlineText {#text} at (65,4) size 23x18
               chunk 1 (middle anchor) text run 3 at (226.50,118.50) startOffset 0 endOffset 3 width 22.00: "sub"
-          RenderSVGInlineText {#text} at (87,-4) size 40x17
+          RenderSVGInlineText {#text} at (87,-4) size 41x17
             chunk 1 (middle anchor) text run 4 at (248.50,110.00) startOffset 0 endOffset 7 width 40.00: "scripts"
-        RenderSVGText {text} at (154,135) size 141x9 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-7) size 141x9
+        RenderSVGText {text} at (154,135) size 142x9 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (0,-7) size 142x9
             chunk 1 (middle anchor) text run 1 at (154.50,135.00) startOffset 0 endOffset 43 width 141.00: "baseline-shift=\"super\"/baseline-shift=\"sub\""
       RenderSVGContainer {g} at (115,149) size 220x33
         RenderSVGText {text} at (115,162) size 220x23 contains 1 chunk(s)
@@ -46,8 +46,8 @@ layer at (0,0) size 450x500
       RenderSVGText {text} at (174,210) size 102x13 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-10) size 102x13
           chunk 1 (middle anchor) text run 1 at (174.00,210.00) startOffset 0 endOffset 25 width 102.00: "Multi-line Text Selection"
-      RenderSVGText {text} at (159,225) size 131x9 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-7) size 131x9
+      RenderSVGText {text} at (159,225) size 132x9 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-7) size 132x9
           chunk 1 (middle anchor) text run 1 at (159.50,225.00) startOffset 0 endOffset 42 width 131.00: "(Try selecting the following text regions)"
       RenderSVGText {text} at (120,250) size 211x32 contains 2 chunk(s)
         RenderSVGTSpan {tspan} at (0,0) size 207x17
@@ -59,9 +59,9 @@ layer at (0,0) size 450x500
           RenderSVGInlineText {#text} at (0,2) size 168x17
             chunk 2 text run 1 at (120.00,265.00) startOffset 0 endOffset 27 width 168.00: "lines via <tspan> elements."
         RenderSVGInlineText {#text} at (0,0) size 0x0
-      RenderSVGText {text} at (0,-50) size 105x123 contains 12 chunk(s) [color=#0000FF]
-        RenderSVGTSpan {tspan} at (0,0) size 105x123
-          RenderSVGInlineText {#text} at (0,-18) size 105x123
+      RenderSVGText {text} at (0,-50) size 106x123 contains 12 chunk(s) [color=#0000FF]
+        RenderSVGTSpan {tspan} at (0,0) size 106x123
+          RenderSVGInlineText {#text} at (0,-18) size 106x123
             chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 1 width 12.00: "T"
             chunk 2 text run 1 at (10.00,-25.00) startOffset 1 endOffset 2 width 9.00: "e"
             chunk 3 text run 1 at (25.00,-40.00) startOffset 2 endOffset 3 width 10.00: "x"
@@ -75,8 +75,8 @@ layer at (0,0) size 450x500
             chunk 11 text run 1 at (25.00,40.00) startOffset 10 endOffset 11 width 9.00: "e"
             chunk 12 text run 1 at (10.00,25.00) startOffset 11 endOffset 12 width 5.00: "."
         RenderSVGInlineText {#text} at (0,0) size 0x0
-      RenderSVGText {text} at (0,0) size 89x103 contains 16 chunk(s) [color=#008000]
-        RenderSVGInlineText {#text} at (0,-18) size 89x103
+      RenderSVGText {text} at (0,0) size 90x103 contains 16 chunk(s) [color=#008000]
+        RenderSVGInlineText {#text} at (0,-18) size 90x103
           chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 1 width 12.00: "T"
           chunk 2 text run 1 at (20.00,0.00) startOffset 1 endOffset 2 width 9.00: "e"
           chunk 3 text run 1 at (40.00,0.00) startOffset 2 endOffset 3 width 10.00: "x"
@@ -93,15 +93,15 @@ layer at (0,0) size 450x500
           chunk 14 text run 1 at (0.00,60.00) startOffset 13 endOffset 14 width 9.00: "a"
           chunk 15 text run 1 at (0.00,40.00) startOffset 14 endOffset 15 width 7.00: "r"
           chunk 16 text run 1 at (0.00,20.00) startOffset 15 endOffset 16 width 9.00: "e"
-      RenderSVGText {text} at (149,450) size 152x17 contains 1 chunk(s)
+      RenderSVGText {text} at (149,450) size 152x43 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-13) size 63x17
           chunk 1 (middle anchor) text run 1 at (149.00,450.00) startOffset 0 endOffset 10 width 63.00: "Text with "
-        RenderSVGTSpan {tspan} at (0,0) size 43x17 [color=#FF0000]
-          RenderSVGInlineText {#text} at (63,-13) size 43x17
+        RenderSVGTSpan {tspan} at (0,0) size 46x43 [color=#FF0000]
+          RenderSVGInlineText {#text} at (63,-26) size 46x43
             chunk 1 (middle anchor) text run 2 at (212.00,450.00) startOffset 0 endOffset 7 width 43.00: "rotated"
         RenderSVGInlineText {#text} at (106,-13) size 46x17
           chunk 1 (middle anchor) text run 3 at (255.00,450.00) startOffset 0 endOffset 7 width 46.00: " glyphs"
-      RenderSVGText {text} at (162,465) size 126x17 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-13) size 126x17
+      RenderSVGText {text} at (162,465) size 125x33 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (1,-29) size 125x33
           chunk 1 (middle anchor) text run 1 at (162.00,465.00) startOffset 0 endOffset 19 width 126.00: "More rotated glyphs"
     RenderSVGContainer {use} at (0,0) size 0x0

diff --git a/LayoutTests/svg/batik/text/textOnPath-expected.txt b/LayoutTests/svg/batik/text/textOnPath-expected.txt
index 6ed5443aff5e41c8a572447c9367e0be50d5ee5f..ab9fbc8f69b7abb3e5f8c521d5810ddd121dfdfd 100644 (file)
--- a/LayoutTests/svg/batik/text/textOnPath-expected.txt
+++ b/LayoutTests/svg/batik/text/textOnPath-expected.txt
@@ -1,27 +1,27 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 450x500
-  RenderSVGRoot {svg} at (24,26) size 400x417
-    RenderSVGContainer {g} at (24,26) size 400x417
+  RenderSVGRoot {svg} at (11,26) size 427x417
+    RenderSVGContainer {g} at (11,26) size 427x417
       RenderSVGText {text} at (160,40) size 130x17 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-14) size 130x17
           chunk 1 (middle anchor) text run 1 at (160.00,40.00) startOffset 0 endOffset 19 width 130.00: "Text on a path test"
       RenderSVGHiddenContainer {defs} at (0,0) size 0x0
         RenderPath {path} at (14.95,7.04) size 120.05x30.91 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF]}] [data="M100.00,200.00C200.00,100.00,300.00,0.00,400.00,100.00C500.00,200.00,600.00,300.00,700.00,200.00C800.00,100.00,900.00,100.00,900.00,100.00"]
         RenderPath {path} at (29.85,12.25) size 90.30x37.75 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF]}] [data="M100.00,100.00C100.00,0.00,400.00,0.00,400.00,100.00"]
-      RenderSVGContainer {g} at (24,55) size 96.30x88 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,70.00)}]
+      RenderSVGContainer {g} at (11,55) size 122x88 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,70.00)}]
         RenderSVGContainer {use} at (29.70,70.67) size 90.60x49.33
           RenderSVGContainer {g} at (29.70,70.67) size 90.60x49.33
             RenderPath {path} at (29.70,70.67) size 90.60x49.33 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,100.00C100.00,0.00,400.00,0.00,400.00,100.00"]
-        RenderSVGText {text} at (24,3) size 96x64 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 96x64
-            RenderSVGInlineText {#text} at (0,-2) size 27x48
+        RenderSVGText {text} at (24,3) size 122x66 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 122x66
+            RenderSVGInlineText {#text} at (-13,-2) size 43x50
               chunk 1 text run 1 at (24.45,18.29) startOffset 0 endOffset 5 width 42.00: "Text "
-            RenderSVGTSpan {tspan} at (0,0) size 20x25 [color=#FF0000]
-              RenderSVGInlineText {#text} at (27,-17) size 19x25
+            RenderSVGTSpan {tspan} at (0,0) size 28x27 [color=#FF0000]
+              RenderSVGInlineText {#text} at (19,-18) size 28x27
                 chunk 1 text run 2 at (51.75,3.11) startOffset 0 endOffset 2 width 20.00: "on"
-            RenderSVGTSpan {tspan} at (0,0) size 49x42
-              RenderSVGInlineText {#text} at (47,-8) size 48x42
+            RenderSVGTSpan {tspan} at (0,0) size 62x44
+              RenderSVGInlineText {#text} at (47,-8) size 62x44
                 chunk 1 text run 3 at (71.44,12.51) startOffset 0 endOffset 7 width 55.00: " a Path"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (35,60) size 68x13 contains 1 chunk(s)
@@ -34,15 +34,15 @@ layer at (0,0) size 450x500
         RenderSVGContainer {use} at (179.70,70.67) size 90.60x49.33
           RenderSVGContainer {g} at (179.70,70.67) size 90.60x49.33
             RenderPath {path} at (179.70,70.67) size 90.60x49.33 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,100.00C100.00,0.00,400.00,0.00,400.00,100.00"]
-        RenderSVGText {text} at (-6,-10) size 74x77 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 74x77
-            RenderSVGInlineText {#text} at (0,-8) size 45x23
+        RenderSVGText {text} at (-6,-10) size 75x75 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 75x75
+            RenderSVGInlineText {#text} at (0,-8) size 46x23
               chunk 1 (middle anchor) text run 1 at (-6.00,0.00) startOffset 0 endOffset 5 width 42.00: "Text "
-            RenderSVGTSpan {tspan} at (0,0) size 20x23 [color=#FF0000]
-              RenderSVGInlineText {#text} at (43,-18) size 20x23
+            RenderSVGTSpan {tspan} at (0,0) size 20x24 [color=#FF0000]
+              RenderSVGInlineText {#text} at (43,-18) size 20x24
                 chunk 1 (middle anchor) text run 2 at (37.00,-10.00) startOffset 0 endOffset 2 width 20.00: "on"
-            RenderSVGTSpan {tspan} at (0,0) size 41x54
-              RenderSVGInlineText {#text} at (33,5) size 40x53
+            RenderSVGTSpan {tspan} at (0,0) size 57x51
+              RenderSVGInlineText {#text} at (18,6) size 57x51
                 chunk 1 (middle anchor) text run 3 at (27.72,13.71) startOffset 0 endOffset 7 width 55.00: " a Path"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (35,60) size 68x13 contains 1 chunk(s)
@@ -55,15 +55,15 @@ layer at (0,0) size 450x500
         RenderSVGContainer {use} at (329.70,70.67) size 90.60x49.33
           RenderSVGContainer {g} at (329.70,70.67) size 90.60x49.33
             RenderPath {path} at (329.70,70.67) size 90.60x49.33 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,100.00C100.00,0.00,400.00,0.00,400.00,100.00"]
-        RenderSVGText {text} at (-6,-10) size 81x70 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 81x70
-            RenderSVGInlineText {#text} at (0,-8) size 45x23
+        RenderSVGText {text} at (-6,-10) size 81x77 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 81x77
+            RenderSVGInlineText {#text} at (0,-8) size 46x23
               chunk 1 (end anchor) text run 1 at (-6.00,0.00) startOffset 0 endOffset 5 width 42.00: "Text "
-            RenderSVGTSpan {tspan} at (0,0) size 22x67 [color=#FF0000]
-              RenderSVGInlineText {#text} at (31,-18) size 21x67
+            RenderSVGTSpan {tspan} at (0,0) size 46x77 [color=#FF0000]
+              RenderSVGInlineText {#text} at (7,-18) size 46x77
                 chunk 1 (end anchor) text run 2 at (25.39,-10.00) startOffset 0 endOffset 2 width 20.00: "on"
-            RenderSVGTSpan {tspan} at (0,0) size 46x48
-              RenderSVGInlineText {#text} at (35,4) size 45x47
+            RenderSVGTSpan {tspan} at (0,0) size 61x46
+              RenderSVGInlineText {#text} at (20,5) size 61x46
                 chunk 1 (end anchor) text run 3 at (29.74,12.71) startOffset 0 endOffset 7 width 55.00: " a Path"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (35,60) size 73x13 contains 1 chunk(s)
@@ -72,19 +72,19 @@ layer at (0,0) size 450x500
         RenderSVGText {text} at (35,70) size 72x13 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-10) size 72x13
             chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 17 width 72.00: "text-anchor=\"end\""
-      RenderSVGContainer {g} at (29.70,164) size 139.30x79 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,170.00)}]
+      RenderSVGContainer {g} at (29.70,165) size 140.30x78 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,170.00)}]
         RenderSVGContainer {use} at (29.70,170.67) size 90.60x49.33
           RenderSVGContainer {g} at (29.70,170.67) size 90.60x49.33
             RenderPath {path} at (29.70,170.67) size 90.60x49.33 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,100.00C100.00,0.00,400.00,0.00,400.00,100.00"]
-        RenderSVGText {text} at (74,12) size 95x59 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 95x59
-            RenderSVGInlineText {#text} at (0,-17) size 38x36
+        RenderSVGText {text} at (74,12) size 96x59 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 96x59
+            RenderSVGInlineText {#text} at (0,-17) size 52x37
               chunk 1 text run 1 at (74.99,12.80) startOffset 0 endOffset 5 width 42.00: "Text "
-            RenderSVGTSpan {tspan} at (0,0) size 14x32 [color=#FF0000]
-              RenderSVGInlineText {#text} at (36,-7) size 13x32
+            RenderSVGTSpan {tspan} at (0,0) size 30x32 [color=#FF0000]
+              RenderSVGInlineText {#text} at (43,1) size 30x32
                 chunk 1 text run 2 at (110.39,22.26) startOffset 0 endOffset 2 width 20.00: "on"
-            RenderSVGTSpan {tspan} at (0,0) size 52x23
-              RenderSVGInlineText {#text} at (43,18) size 52x23
+            RenderSVGTSpan {tspan} at (0,0) size 56x24
+              RenderSVGInlineText {#text} at (40,18) size 56x24
                 chunk 1 text run 3 at (117.49,48.94) startOffset 0 endOffset 7 width 55.00: " a Path"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (35,60) size 73x13 contains 1 chunk(s)
@@ -93,19 +93,19 @@ layer at (0,0) size 450x500
         RenderSVGText {text} at (35,70) size 75x13 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-10) size 75x13
             chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 19 width 75.00: "text-anchor=\"start\""
-      RenderSVGContainer {g} at (176,154) size 97x89 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,170.00)}]
+      RenderSVGContainer {g} at (163,155) size 124x88 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,170.00)}]
         RenderSVGContainer {use} at (179.70,170.67) size 90.60x49.33
           RenderSVGContainer {g} at (179.70,170.67) size 90.60x49.33
             RenderPath {path} at (179.70,170.67) size 90.60x49.33 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,100.00C100.00,0.00,400.00,0.00,400.00,100.00"]
-        RenderSVGText {text} at (26,2) size 97x59 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 97x59
-            RenderSVGInlineText {#text} at (0,-4) size 32x44
+        RenderSVGText {text} at (26,2) size 124x60 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 124x60
+            RenderSVGInlineText {#text} at (-13,-4) size 47x47
               chunk 1 (middle anchor) text run 1 at (26.24,15.53) startOffset 0 endOffset 5 width 42.00: "Text "
-            RenderSVGTSpan {tspan} at (0,0) size 20x24 [color=#FF0000]
-              RenderSVGInlineText {#text} at (32,-17) size 19x24
+            RenderSVGTSpan {tspan} at (0,0) size 25x25 [color=#FF0000]
+              RenderSVGInlineText {#text} at (27,-17) size 25x25
                 chunk 1 (middle anchor) text run 2 at (58.57,2.52) startOffset 0 endOffset 2 width 20.00: "on"
-            RenderSVGTSpan {tspan} at (0,0) size 45x49
-              RenderSVGInlineText {#text} at (52,-7) size 44x48
+            RenderSVGTSpan {tspan} at (0,0) size 59x50
+              RenderSVGInlineText {#text} at (52,-7) size 59x50
                 chunk 1 (middle anchor) text run 3 at (78.49,12.80) startOffset 0 endOffset 7 width 55.00: " a Path"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (35,60) size 73x13 contains 1 chunk(s)
@@ -114,19 +114,19 @@ layer at (0,0) size 450x500
         RenderSVGText {text} at (35,70) size 86x13 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-10) size 86x13
             chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 20 width 86.00: "text-anchor=\"middle\""
-      RenderSVGContainer {g} at (329,154) size 95x89 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,170.00)}]
+      RenderSVGContainer {g} at (317,155) size 121x88 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,170.00)}]
         RenderSVGContainer {use} at (329.70,170.67) size 90.60x49.33
           RenderSVGContainer {g} at (329.70,170.67) size 90.60x49.33
             RenderPath {path} at (329.70,170.67) size 90.60x49.33 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,100.00C100.00,0.00,400.00,0.00,400.00,100.00"]
-        RenderSVGText {text} at (29,2) size 95x66 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 95x66
-            RenderSVGInlineText {#text} at (0,-6) size 36x40
+        RenderSVGText {text} at (29,2) size 121x66 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 121x66
+            RenderSVGInlineText {#text} at (-12,-6) size 50x43
               chunk 1 (end anchor) text run 1 at (29.43,13.68) startOffset 0 endOffset 5 width 42.00: "Text "
-            RenderSVGTSpan {tspan} at (0,0) size 20x23 [color=#FF0000]
-              RenderSVGInlineText {#text} at (36,-17) size 19x23
+            RenderSVGTSpan {tspan} at (0,0) size 25x23 [color=#FF0000]
+              RenderSVGInlineText {#text} at (34,-17) size 25x23
                 chunk 1 (end anchor) text run 2 at (65.56,2.66) startOffset 0 endOffset 2 width 20.00: "on"
-            RenderSVGTSpan {tspan} at (0,0) size 39x55
-              RenderSVGInlineText {#text} at (56,-6) size 39x54
+            RenderSVGTSpan {tspan} at (0,0) size 54x55
+              RenderSVGInlineText {#text} at (55,-6) size 54x55
                 chunk 1 (end anchor) text run 3 at (85.45,13.92) startOffset 0 endOffset 7 width 55.00: " a Path"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (35,60) size 78x13 contains 1 chunk(s)
@@ -135,19 +135,19 @@ layer at (0,0) size 450x500
         RenderSVGText {text} at (35,70) size 72x13 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-10) size 72x13
             chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 17 width 72.00: "text-anchor=\"end\""
-      RenderSVGContainer {g} at (29.70,256) size 119.30x87 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,270.00)}]
+      RenderSVGContainer {g} at (29.70,257) size 120.30x86 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,270.00)}]
         RenderSVGContainer {use} at (29.70,270.67) size 90.60x49.33
           RenderSVGContainer {g} at (29.70,270.67) size 90.60x49.33
             RenderPath {path} at (29.70,270.67) size 90.60x49.33 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,100.00C100.00,0.00,400.00,0.00,400.00,100.00"]
-        RenderSVGText {text} at (45,4) size 104x59 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 104x59
-            RenderSVGInlineText {#text} at (0,-9) size 41x28
+        RenderSVGText {text} at (45,4) size 112x60 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 112x60
+            RenderSVGInlineText {#text} at (-7,-9) size 51x30
               chunk 1 text run 1 at (45.19,12.60) startOffset 0 endOffset 5 width 42.00: "Text "
-            RenderSVGTSpan {tspan} at (0,0) size 19x27 [color=#FF0000]
-              RenderSVGInlineText {#text} at (41,-17) size 19x26
+            RenderSVGTSpan {tspan} at (0,0) size 31x29 [color=#FF0000]
+              RenderSVGInlineText {#text} at (42,-17) size 31x29
                 chunk 1 text run 2 at (86.23,4.76) startOffset 0 endOffset 2 width 20.00: "on"
-            RenderSVGTSpan {tspan} at (0,0) size 45x41
-              RenderSVGInlineText {#text} at (59,0) size 45x40
+            RenderSVGTSpan {tspan} at (0,0) size 49x41
+              RenderSVGInlineText {#text} at (56,2) size 49x41
                 chunk 1 text run 3 at (104.30,22.53) startOffset 0 endOffset 7 width 55.00: " a Path"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (35,60) size 65x13 contains 1 chunk(s)
@@ -160,15 +160,15 @@ layer at (0,0) size 450x500
         RenderSVGContainer {use} at (179.70,270.67) size 90.60x49.33
           RenderSVGContainer {g} at (179.70,270.67) size 90.60x49.33
             RenderPath {path} at (179.70,270.67) size 90.60x49.33 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,100.00C100.00,0.00,400.00,0.00,400.00,100.00"]
-        RenderSVGText {text} at (-6,0) size 108x70 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 108x70
-            RenderSVGInlineText {#text} at (0,-18) size 41x70
+        RenderSVGText {text} at (-6,0) size 115x71 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 115x71
+            RenderSVGInlineText {#text} at (0,-18) size 45x71
               chunk 1 (middle anchor) text run 1 at (-6.00,0.00) startOffset 0 endOffset 5 width 42.00: "Text "
-            RenderSVGTSpan {tspan} at (0,0) size 17x30 [color=#FF0000]
-              RenderSVGInlineText {#text} at (38,-6) size 17x29
+            RenderSVGTSpan {tspan} at (0,0) size 34x33 [color=#FF0000]
+              RenderSVGInlineText {#text} at (18,-4) size 34x33
                 chunk 1 (middle anchor) text run 2 at (32.42,11.40) startOffset 0 endOffset 2 width 20.00: "on"
-            RenderSVGTSpan {tspan} at (0,0) size 54x28
-              RenderSVGInlineText {#text} at (54,-5) size 53x28
+            RenderSVGTSpan {tspan} at (0,0) size 68x29
+              RenderSVGInlineText {#text} at (47,-5) size 68x29
                 chunk 1 (middle anchor) text run 3 at (48.69,12.55) startOffset 0 endOffset 7 width 55.00: " a Path"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (35,60) size 65x13 contains 1 chunk(s)
@@ -181,15 +181,15 @@ layer at (0,0) size 450x500
         RenderSVGContainer {use} at (329.70,270.67) size 90.60x49.33
           RenderSVGContainer {g} at (329.70,270.67) size 90.60x49.33
             RenderPath {path} at (329.70,270.67) size 90.60x49.33 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,100.00C100.00,0.00,400.00,0.00,400.00,100.00"]
-        RenderSVGText {text} at (-6,-10) size 89x78 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 89x78
-            RenderSVGInlineText {#text} at (0,-8) size 45x23
+        RenderSVGText {text} at (-6,-10) size 85x80 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 85x80
+            RenderSVGInlineText {#text} at (0,-8) size 46x23
               chunk 1 (end anchor) text run 1 at (-6.00,0.00) startOffset 0 endOffset 5 width 42.00: "Text "
-            RenderSVGTSpan {tspan} at (0,0) size 20x23 [color=#FF0000]
-              RenderSVGInlineText {#text} at (43,-18) size 20x23
+            RenderSVGTSpan {tspan} at (0,0) size 20x24 [color=#FF0000]
+              RenderSVGInlineText {#text} at (43,-18) size 20x24
                 chunk 1 (end anchor) text run 2 at (37.00,-10.00) startOffset 0 endOffset 2 width 20.00: "on"
-            RenderSVGTSpan {tspan} at (0,0) size 59x68
-              RenderSVGInlineText {#text} at (30,-8) size 58x68
+            RenderSVGTSpan {tspan} at (0,0) size 68x70
+              RenderSVGInlineText {#text} at (17,-8) size 68x70
                 chunk 1 (end anchor) text run 3 at (24.75,0.00) startOffset 0 endOffset 7 width 55.00: " a Path"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (35,60) size 65x13 contains 1 chunk(s)
@@ -198,21 +198,21 @@ layer at (0,0) size 450x500
         RenderSVGText {text} at (35,70) size 72x13 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-10) size 72x13
             chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 17 width 72.00: "text-anchor=\"end\""
-      RenderSVGContainer {g} at (24,365) size 121x78 [transform={m=((1.00,0.00)(0.00,1.00)) t=(10.00,370.00)}]
+      RenderSVGContainer {g} at (15,366) size 130x77 [transform={m=((1.00,0.00)(0.00,1.00)) t=(10.00,370.00)}]
         RenderSVGContainer {use} at (24.89,377.29) size 120.11x30.43
           RenderSVGContainer {g} at (24.89,377.29) size 120.11x30.43
             RenderPath {path} at (24.89,377.29) size 120.11x30.43 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00C200.00,100.00,300.00,0.00,400.00,100.00C500.00,200.00,600.00,300.00,700.00,200.00C800.00,100.00,900.00,100.00,900.00,100.00"]
-        RenderSVGText {text} at (14,8) size 106x44 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 106x44
-            RenderSVGTSpan {tspan} at (0,0) size 27x29 [color=#008000]
-              RenderSVGInlineText {#text} at (0,-10) size 27x29
+        RenderSVGText {text} at (14,8) size 117x45 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 117x45
+            RenderSVGTSpan {tspan} at (0,0) size 38x31 [color=#008000]
+              RenderSVGInlineText {#text} at (-9,-10) size 38x31
                 chunk 1 text run 1 at (14.12,10.38) startOffset 0 endOffset 5 width 34.00: "super"
-            RenderSVGInlineText {#text} at (27,-12) size 26x29
+            RenderSVGInlineText {#text} at (25,-12) size 38x30
               chunk 1 text run 2 at (41.70,8.97) startOffset 0 endOffset 5 width 31.00: " and "
-            RenderSVGTSpan {tspan} at (0,0) size 20x21 [color=#FF0000]
-              RenderSVGInlineText {#text} at (52,8) size 19x21
+            RenderSVGTSpan {tspan} at (0,0) size 27x23 [color=#FF0000]
+              RenderSVGInlineText {#text} at (51,8) size 27x23
                 chunk 1 text run 3 at (66.99,29.16) startOffset 0 endOffset 3 width 22.00: "sub"
-            RenderSVGInlineText {#text} at (71,0) size 34x32
+            RenderSVGInlineText {#text} at (70,-1) size 38x34
               chunk 1 text run 4 at (85.60,20.46) startOffset 0 endOffset 7 width 40.00: "scripts"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (20,60) size 88x13 contains 1 chunk(s)
@@ -221,36 +221,36 @@ layer at (0,0) size 450x500
         RenderSVGText {text} at (20,70) size 98x13 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-10) size 98x13
             chunk 1 text run 1 at (20.00,70.00) startOffset 0 endOffset 24 width 98.00: "and baseline-shift=\"sub\""
-      RenderSVGContainer {g} at (168,365) size 122x68 [transform={m=((1.00,0.00)(0.00,1.00)) t=(155.00,370.00)}]
+      RenderSVGContainer {g} at (160,366) size 130x67 [transform={m=((1.00,0.00)(0.00,1.00)) t=(155.00,370.00)}]
         RenderSVGContainer {use} at (169.89,377.29) size 120.11x30.43
           RenderSVGContainer {g} at (169.89,377.29) size 120.11x30.43
             RenderPath {path} at (169.89,377.29) size 120.11x30.43 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00C200.00,100.00,300.00,0.00,400.00,100.00C500.00,200.00,600.00,300.00,700.00,200.00C800.00,100.00,900.00,100.00,900.00,100.00"]
-        RenderSVGText {text} at (13,8) size 112x45 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 112x45
-            RenderSVGTSpan {tspan} at (0,0) size 43x33 [color=#008000]
-              RenderSVGInlineText {#text} at (0,-12) size 42x32
+        RenderSVGText {text} at (13,8) size 122x46 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 122x46
+            RenderSVGTSpan {tspan} at (0,0) size 56x34 [color=#008000]
+              RenderSVGInlineText {#text} at (-8,-12) size 56x34
                 chunk 1 text run 1 at (13.83,8.83) startOffset 0 endOffset 8 width 49.00: "positive"
-            RenderSVGInlineText {#text} at (42,-8) size 24x34
+            RenderSVGInlineText {#text} at (40,-7) size 34x34
               chunk 1 text run 2 at (55.69,12.92) startOffset 0 endOffset 5 width 31.00: " and "
-            RenderSVGTSpan {tspan} at (0,0) size 47x35 [color=#FF0000]
-              RenderSVGInlineText {#text} at (65,-2) size 47x35
+            RenderSVGTSpan {tspan} at (0,0) size 50x38 [color=#FF0000]
+              RenderSVGInlineText {#text} at (64,-4) size 50x38
                 chunk 1 text run 3 at (78.94,18.06) startOffset 0 endOffset 8 width 53.00: "negative"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (20,60) size 97x13 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-10) size 97x13
             chunk 1 text run 1 at (20.00,60.00) startOffset 0 endOffset 23 width 97.00: "baseline-shift=\"+/-20%\""
-      RenderSVGContainer {g} at (314,366) size 104.50x67 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,390.00)}]
-        RenderSVGContainer {g} at (314,366) size 104.50x49 [transform={m=((0.50,0.00)(0.00,0.50)) t=(0.00,0.00)}]
+      RenderSVGContainer {g} at (304,366) size 115.50x67 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,390.00)}]
+        RenderSVGContainer {g} at (304,366) size 115.50x49 [transform={m=((0.50,0.00)(0.00,0.50)) t=(0.00,0.00)}]
           RenderSVGContainer {use} at (314.85,390.33) size 45.30x24.67
             RenderSVGContainer {g} at (314.85,390.33) size 45.30x24.67
               RenderPath {path} at (314.85,390.33) size 45.30x24.67 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,100.00C100.00,0.00,400.00,0.00,400.00,100.00"]
-          RenderSVGText {text} at (28,-20) size 210x86 contains 1 chunk(s)
-            RenderSVGInlineText {#text} at (2,-28) size 143x36
+          RenderSVGText {text} at (28,-20) size 231x89 contains 1 chunk(s)
+            RenderSVGInlineText {#text} at (2,-28) size 143x37
               chunk 1 text run 1 at (30.00,-20.00) startOffset 0 endOffset 12 width 143.00: "before path "
-            RenderSVGTextPath {textPath} at (0,0) size 82x54 [color=#FF0000]
-              RenderSVGInlineText {#text} at (0,4) size 82x53
+            RenderSVGTextPath {textPath} at (0,0) size 116x56 [color=#FF0000]
+              RenderSVGInlineText {#text} at (-20,5) size 116x56
                 chunk 1 text run 2 at (28.21,12.90) startOffset 0 endOffset 7 width 89.00: "on path"
-            RenderSVGInlineText {#text} at (89,11) size 120x36
+            RenderSVGInlineText {#text} at (89,12) size 122x36
               chunk 1 text run 3 at (117.77,19.76) startOffset 0 endOffset 11 width 121.00: " after path"
         RenderSVGText {text} at (15,40) size 98x13 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-10) size 98x13

diff --git a/LayoutTests/svg/batik/text/textOnPath2-expected.txt b/LayoutTests/svg/batik/text/textOnPath2-expected.txt
index 5e7d289f088ec1c058609b01704ebdfab2ffe342..3c6dd18664f472950c22cf42fb1d7fae2ae55957 100644 (file)
--- a/LayoutTests/svg/batik/text/textOnPath2-expected.txt
+++ b/LayoutTests/svg/batik/text/textOnPath2-expected.txt
@@ -22,51 +22,51 @@ layer at (0,0) size 450x500
         chunk 1 text run 1 at (40.00,354.00) startOffset 0 endOffset 41 width 230.00: "textPath with startOffset and text-anchor"
     RenderSVGHiddenContainer {defs} at (0,0) size 0x0
       RenderPath {path} at (99.50,-125.67) size 141x125.67 [stroke={[type=SOLID] [color=#0000FF]}] [data="M100.00,0.00C100.00,-125.00,240.00,-125.00,240.00,0.00"]
-    RenderSVGContainer {g} at (50,59.33) size 402x129.67 [transform={m=((1.00,0.00)(0.00,1.00)) t=(40.00,185.00)}]
+    RenderSVGContainer {g} at (50,59.33) size 403x129.67 [transform={m=((1.00,0.00)(0.00,1.00)) t=(40.00,185.00)}]
       RenderSVGContainer {use} at (139.50,59.33) size 141x125.67
         RenderSVGContainer {g} at (139.50,59.33) size 141x125.67
           RenderPath {path} at (139.50,59.33) size 141x125.67 [stroke={[type=SOLID] [color=#0000FF]}] [data="M100.00,0.00C100.00,-125.00,240.00,-125.00,240.00,0.00"]
-      RenderSVGText {text} at (10,-104) size 402x121 contains 1 chunk(s)
+      RenderSVGText {text} at (10,-104) size 403x121 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,90) size 87x18
           chunk 1 text run 1 at (10.00,0.00) startOffset 0 endOffset 14 width 87.00: "This is simple"
-        RenderSVGTextPath {textPath} at (0,0) size 128x119 [color=#DC143C]
-          RenderSVGInlineText {#text} at (86,15) size 33x90
+        RenderSVGTextPath {textPath} at (0,0) size 149x117 [color=#DC143C]
+          RenderSVGInlineText {#text} at (75,17) size 46x87
             chunk 1 text run 2 at (96.67,-74.64) startOffset 0 endOffset 14 width 85.00: "text on a path"
-          RenderSVGTSpan {tspan} at (0,0) size 69x30 [color=#FFA500]
-            RenderSVGInlineText {#text} at (117,-13) size 68x30
+          RenderSVGTSpan {tspan} at (0,0) size 91x36 [color=#FFA500]
+            RenderSVGInlineText {#text} at (104,-13) size 91x36
               chunk 1 text run 3 at (127.33,-103.72) startOffset 0 endOffset 11 width 72.00: "with nested"
-          RenderSVGTSpan {tspan} at (0,0) size 29x39 [color=#008000]
-            RenderSVGInlineText {#text} at (185,2) size 29x38
+          RenderSVGTSpan {tspan} at (0,0) size 41x40 [color=#008000]
+            RenderSVGInlineText {#text} at (183,4) size 41x40
               chunk 1 text run 4 at (195.48,-87.01) startOffset 0 endOffset 6 width 37.00: " tspan"
-        RenderSVGInlineText {#text} at (218,23) size 32x18
+        RenderSVGInlineText {#text} at (218,24) size 33x18
           chunk 1 text run 5 at (228.78,-66.97) startOffset 0 endOffset 5 width 32.00: " xxx "
-        RenderSVGTSpan {tspan} at (0,0) size 51x18 [color=#0000FF]
-          RenderSVGInlineText {#text} at (260,23) size 51x18
+        RenderSVGTSpan {tspan} at (0,0) size 52x18 [color=#0000FF]
+          RenderSVGInlineText {#text} at (260,24) size 52x18
             chunk 1 text run 6 at (270.78,-66.97) startOffset 0 endOffset 9 width 51.00: "all with "
-        RenderSVGInlineText {#text} at (311,23) size 91x18
+        RenderSVGInlineText {#text} at (311,24) size 92x18
           chunk 1 text run 7 at (321.78,-66.97) startOffset 0 endOffset 16 width 91.00: "different links."
-    RenderSVGContainer {g} at (50,204.33) size 414x129.67 [transform={m=((1.00,0.00)(0.00,1.00)) t=(40.00,330.00)}]
+    RenderSVGContainer {g} at (50,204.33) size 415x129.67 [transform={m=((1.00,0.00)(0.00,1.00)) t=(40.00,330.00)}]
       RenderSVGContainer {use} at (139.50,204.33) size 141x125.67
         RenderSVGContainer {g} at (139.50,204.33) size 141x125.67
           RenderPath {path} at (139.50,204.33) size 141x125.67 [stroke={[type=SOLID] [color=#0000FF]}] [data="M100.00,0.00C100.00,-125.00,240.00,-125.00,240.00,0.00"]
-      RenderSVGText {text} at (10,-104) size 414x121 contains 1 chunk(s)
+      RenderSVGText {text} at (10,-104) size 415x121 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,90) size 87x18
           chunk 1 text run 1 at (10.00,0.00) startOffset 0 endOffset 14 width 87.00: "This is simple"
-        RenderSVGTextPath {textPath} at (0,0) size 136x94 [color=#DC143C]
-          RenderSVGInlineText {#text} at (90,0) size 50x79
+        RenderSVGTextPath {textPath} at (0,0) size 159x93 [color=#DC143C]
+          RenderSVGInlineText {#text} at (78,1) size 64x79
             chunk 1 text run 2 at (100.31,-89.20) startOffset 0 endOffset 14 width 85.00: "text on a path"
-          RenderSVGTSpan {tspan} at (0,0) size 67x36 [color=#FFA500]
-            RenderSVGInlineText {#text} at (140,-13) size 66x36
+          RenderSVGTSpan {tspan} at (0,0) size 88x41 [color=#FFA500]
+            RenderSVGInlineText {#text} at (135,-13) size 88x41
               chunk 1 text run 3 at (150.76,-103.73) startOffset 0 endOffset 11 width 72.00: "with nested"
-          RenderSVGTSpan {tspan} at (0,0) size 21x44 [color=#008000]
-            RenderSVGInlineText {#text} at (205,19) size 21x44
+          RenderSVGTSpan {tspan} at (0,0) size 34x43 [color=#008000]
+            RenderSVGInlineText {#text} at (203,23) size 34x43
               chunk 1 text run 4 at (215.71,-70.80) startOffset 0 endOffset 6 width 37.00: " tspan"
-        RenderSVGInlineText {#text} at (230,45) size 31x18
+        RenderSVGInlineText {#text} at (230,46) size 33x19
           chunk 1 text run 5 at (240.96,-44.00) startOffset 0 endOffset 5 width 32.00: " xxx "
-        RenderSVGTSpan {tspan} at (0,0) size 51x18 [color=#0000FF]
-          RenderSVGInlineText {#text} at (272,45) size 51x18
+        RenderSVGTSpan {tspan} at (0,0) size 52x19 [color=#0000FF]
+          RenderSVGInlineText {#text} at (272,46) size 52x19
             chunk 1 text run 6 at (282.96,-44.00) startOffset 0 endOffset 9 width 51.00: "all with "
-        RenderSVGInlineText {#text} at (323,45) size 91x18
+        RenderSVGInlineText {#text} at (323,46) size 92x19
           chunk 1 text run 7 at (333.96,-44.00) startOffset 0 endOffset 16 width 91.00: "different links."
     RenderSVGContainer {g} at (50,349.33) size 417x129.67 [transform={m=((1.00,0.00)(0.00,1.00)) t=(40.00,475.00)}]
       RenderSVGContainer {use} at (139.50,349.33) size 141x125.67
@@ -75,19 +75,19 @@ layer at (0,0) size 450x500
       RenderSVGText {text} at (10,-104) size 417x121 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,90) size 87x18
           chunk 1 text run 1 at (10.00,0.00) startOffset 0 endOffset 14 width 87.00: "This is simple"
-        RenderSVGTextPath {textPath} at (0,0) size 137x86 [color=#DC143C]
-          RenderSVGInlineText {#text} at (92,-1) size 55x74
+        RenderSVGTextPath {textPath} at (0,0) size 160x86 [color=#DC143C]
+          RenderSVGInlineText {#text} at (80,-2) size 69x75
             chunk 1 text run 2 at (102.26,-91.59) startOffset 0 endOffset 14 width 85.00: "text on a path"
-          RenderSVGTSpan {tspan} at (0,0) size 64x42 [color=#FFA500]
-            RenderSVGInlineText {#text} at (148,-13) size 64x41
+          RenderSVGTSpan {tspan} at (0,0) size 85x48 [color=#FFA500]
+            RenderSVGInlineText {#text} at (145,-13) size 85x48
               chunk 1 text run 3 at (158.01,-103.72) startOffset 0 endOffset 11 width 72.00: "with nested"
-          RenderSVGTSpan {tspan} at (0,0) size 19x45 [color=#008000]
-            RenderSVGInlineText {#text} at (210,25) size 18x45
+          RenderSVGTSpan {tspan} at (0,0) size 33x43 [color=#008000]
+            RenderSVGInlineText {#text} at (207,30) size 33x43
               chunk 1 text run 4 at (220.21,-64.99) startOffset 0 endOffset 6 width 37.00: " tspan"
-        RenderSVGInlineText {#text} at (233,52) size 32x18
+        RenderSVGInlineText {#text} at (233,53) size 32x19
           chunk 1 text run 5 at (243.21,-37.01) startOffset 0 endOffset 5 width 32.00: " xxx "
-        RenderSVGTSpan {tspan} at (0,0) size 51x18 [color=#0000FF]
-          RenderSVGInlineText {#text} at (275,52) size 51x18
+        RenderSVGTSpan {tspan} at (0,0) size 51x19 [color=#0000FF]
+          RenderSVGInlineText {#text} at (275,53) size 51x19
             chunk 1 text run 6 at (285.21,-37.01) startOffset 0 endOffset 9 width 51.00: "all with "
-        RenderSVGInlineText {#text} at (326,52) size 91x18
+        RenderSVGInlineText {#text} at (326,53) size 91x19
           chunk 1 text run 7 at (336.21,-37.01) startOffset 0 endOffset 16 width 91.00: "different links."

diff --git a/LayoutTests/svg/batik/text/textOnPath3-expected.txt b/LayoutTests/svg/batik/text/textOnPath3-expected.txt
index c4af4272aad238a13244c6e67ca02f9ee8bb07fd..7cd2ae66150baed08b2b544b065813489a836306 100644 (file)
--- a/LayoutTests/svg/batik/text/textOnPath3-expected.txt
+++ b/LayoutTests/svg/batik/text/textOnPath3-expected.txt
@@ -2,50 +2,50 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 450x500
   RenderSVGRoot {svg} at (-65,26) size 485.50x454.50
-    RenderSVGText {text} at (101,40) size 247x17 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,-14) size 247x17
+    RenderSVGText {text} at (101,40) size 248x17 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,-14) size 248x17
         chunk 1 (middle anchor) text run 1 at (101.50,40.00) startOffset 0 endOffset 38 width 247.00: "Text on Path with for text with an 'x'"
     RenderSVGHiddenContainer {defs} at (0,0) size 0x0
       RenderPath {path} at (99.50,-125.67) size 141x125.67 [stroke={[type=SOLID] [color=#0000FF]}] [data="M100.00,0.00C100.00,-125.00,240.00,-125.00,240.00,0.00"]
     RenderSVGContainer {g} at (29.50,49.50) size 391x141 [transform={m=((1.00,0.00)(0.00,1.00)) t=(40.00,185.00)}]
       RenderPath {rect} at (29.50,49.50) size 391x21 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#000000]}] [data="M-10.00,-135.00L380.00,-135.00L380.00,-115.00L-10.00,-115.00"]
       RenderPath {rect} at (29.50,69.50) size 391x121 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FFFFFF]}] [data="M-10.00,-115.00L380.00,-115.00L380.00,5.00L-10.00,5.00"]
-      RenderSVGText {text} at (-10,-120) size 230x17 contains 1 chunk(s) [color=#FFFFFF]
-        RenderSVGInlineText {#text} at (0,-13) size 230x17
+      RenderSVGText {text} at (-10,-120) size 230x18 contains 1 chunk(s) [color=#FFFFFF]
+        RenderSVGInlineText {#text} at (0,-13) size 230x18
           chunk 1 text run 1 at (-10.00,-120.00) startOffset 0 endOffset 39 width 230.00: "Text with one textPath child and x=\"10\""
       RenderSVGContainer {use} at (139.50,59.33) size 141x125.67
         RenderSVGContainer {g} at (139.50,59.33) size 141x125.67
           RenderPath {path} at (139.50,59.33) size 141x125.67 [stroke={[type=SOLID] [color=#0000FF]}] [data="M100.00,0.00C100.00,-125.00,240.00,-125.00,240.00,0.00"]
-      RenderSVGText {text} at (105,-94) size 133x80 contains 1 chunk(s)
-        RenderSVGTextPath {textPath} at (0,0) size 133x80 [color=#DC143C]
-          RenderSVGInlineText {#text} at (0,-13) size 132x80
+      RenderSVGText {text} at (105,-94) size 156x80 contains 1 chunk(s)
+        RenderSVGTextPath {textPath} at (0,0) size 156x80 [color=#DC143C]
+          RenderSVGInlineText {#text} at (-10,-13) size 156x80
             chunk 1 (middle anchor) text run 1 at (105.76,-93.75) startOffset 0 endOffset 31 width 182.00: "Text on a path for text w/ 'x'."
     RenderSVGContainer {g} at (29.50,194.50) size 391x141 [transform={m=((1.00,0.00)(0.00,1.00)) t=(40.00,330.00)}]
       RenderPath {rect} at (29.50,194.50) size 391x21 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#000000]}] [data="M-10.00,-135.00L380.00,-135.00L380.00,-115.00L-10.00,-115.00"]
       RenderPath {rect} at (29.50,214.50) size 391x121 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FFFFFF]}] [data="M-10.00,-115.00L380.00,-115.00L380.00,5.00L-10.00,5.00"]
-      RenderSVGText {text} at (-10,-120) size 237x17 contains 1 chunk(s) [color=#FFFFFF]
-        RenderSVGInlineText {#text} at (0,-13) size 237x17
+      RenderSVGText {text} at (-10,-120) size 237x18 contains 1 chunk(s) [color=#FFFFFF]
+        RenderSVGInlineText {#text} at (0,-13) size 237x18
           chunk 1 text run 1 at (-10.00,-120.00) startOffset 0 endOffset 40 width 237.00: "Text with one textPath child and x=\"100\""
       RenderSVGContainer {use} at (139.50,204.33) size 141x125.67
         RenderSVGContainer {g} at (139.50,204.33) size 141x125.67
           RenderPath {path} at (139.50,204.33) size 141x125.67 [stroke={[type=SOLID] [color=#0000FF]}] [data="M100.00,0.00C100.00,-125.00,240.00,-125.00,240.00,0.00"]
-      RenderSVGText {text} at (178,-93) size 124x107 contains 1 chunk(s)
-        RenderSVGTextPath {textPath} at (0,0) size 124x107 [color=#DC143C]
-          RenderSVGInlineText {#text} at (0,-13) size 124x107
+      RenderSVGText {text} at (178,-93) size 125x108 contains 1 chunk(s)
+        RenderSVGTextPath {textPath} at (0,0) size 125x108 [color=#DC143C]
+          RenderSVGInlineText {#text} at (0,-13) size 125x108
             chunk 1 (middle anchor) text run 1 at (178.87,-92.10) startOffset 0 endOffset 31 width 182.00: "Text on a path for text w/ 'x'."
     RenderSVGContainer {g} at (-65,339.50) size 485.50x141 [transform={m=((1.00,0.00)(0.00,1.00)) t=(40.00,475.00)}]
       RenderPath {rect} at (29.50,339.50) size 391x21 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#000000]}] [data="M-10.00,-135.00L380.00,-135.00L380.00,-115.00L-10.00,-115.00"]
       RenderPath {rect} at (29.50,359.50) size 391x121 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FFFFFF]}] [data="M-10.00,-115.00L380.00,-115.00L380.00,5.00L-10.00,5.00"]
-      RenderSVGText {text} at (-10,-120) size 287x17 contains 1 chunk(s) [color=#FFFFFF]
-        RenderSVGInlineText {#text} at (0,-13) size 287x17
+      RenderSVGText {text} at (-10,-120) size 287x18 contains 1 chunk(s) [color=#FFFFFF]
+        RenderSVGInlineText {#text} at (0,-13) size 287x18
           chunk 1 text run 1 at (-10.00,-120.00) startOffset 0 endOffset 48 width 287.00: "Text with one textPath child and x=\"-100\" y=\"10\""
       RenderSVGContainer {use} at (139.50,349.33) size 141x125.67
         RenderSVGContainer {g} at (139.50,349.33) size 141x125.67
           RenderPath {path} at (139.50,349.33) size 141x125.67 [stroke={[type=SOLID] [color=#0000FF]}] [data="M100.00,0.00C100.00,-125.00,240.00,-125.00,240.00,0.00"]
-      RenderSVGText {text} at (-105,-94) size 335x111 contains 2 chunk(s)
-        RenderSVGTextPath {textPath} at (0,0) size 335x111 [color=#DC143C]
-          RenderSVGInlineText {#text} at (0,78) size 207x19
+      RenderSVGText {text} at (-105,-94) size 347x111 contains 2 chunk(s)
+        RenderSVGTextPath {textPath} at (0,0) size 347x111 [color=#DC143C]
+          RenderSVGInlineText {#text} at (0,80) size 209x18
             chunk 1 (middle anchor) text run 1 at (-105.00,-1.44) startOffset 0 endOffset 10 width 64.00: "Text on a "
-          RenderSVGTSpan {tspan} at (0,0) size 99x58
-            RenderSVGInlineText {#text} at (236,-13) size 99x57
+          RenderSVGTSpan {tspan} at (0,0) size 119x58
+            RenderSVGInlineText {#text} at (228,-13) size 119x58
               chunk 2 (middle anchor) text run 1 at (131.30,-93.74) startOffset 0 endOffset 21 width 118.00: "path for text w/ 'x'."

diff --git a/LayoutTests/svg/batik/text/textOnPathSpaces-expected.txt b/LayoutTests/svg/batik/text/textOnPathSpaces-expected.txt
index fadfbed500e4789db6a7d07a92947290f1f8f93c..41a6c97a4258282da9368b364736b46ab83f3c9e 100644 (file)
--- a/LayoutTests/svg/batik/text/textOnPathSpaces-expected.txt
+++ b/LayoutTests/svg/batik/text/textOnPathSpaces-expected.txt
@@ -1,35 +1,35 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 450x500
-  RenderSVGRoot {svg} at (13,26) size 424x417
-    RenderSVGContainer {g} at (13,26) size 424x417
-      RenderSVGText {text} at (95,40) size 259x17 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-14) size 259x17
+  RenderSVGRoot {svg} at (2,26) size 435x417
+    RenderSVGContainer {g} at (2,26) size 435x417
+      RenderSVGText {text} at (95,40) size 260x17 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-14) size 260x17
           chunk 1 (middle anchor) text run 1 at (95.50,40.00) startOffset 0 endOffset 36 width 259.00: "Text on a path with adjusted spacing"
       RenderSVGHiddenContainer {defs} at (0,0) size 0x0
         RenderPath {path} at (14.95,7.04) size 120.05x30.91 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF]}] [data="M100.00,200.00C200.00,100.00,300.00,0.00,400.00,100.00C500.00,200.00,600.00,300.00,700.00,200.00C800.00,100.00,900.00,100.00,900.00,100.00"]
         RenderPath {path} at (29.85,12.25) size 90.30x37.75 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF]}] [data="M100.00,100.00C100.00,0.00,400.00,0.00,400.00,100.00"]
-      RenderSVGContainer {g} at (13,60) size 122x73 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,70.00)}]
+      RenderSVGContainer {g} at (2,61) size 133x72 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,70.00)}]
         RenderSVGContainer {use} at (14.89,77.29) size 120.11x30.43
           RenderSVGContainer {g} at (14.89,77.29) size 120.11x30.43
             RenderPath {path} at (14.89,77.29) size 120.11x30.43 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00C200.00,100.00,300.00,0.00,400.00,100.00C500.00,200.00,600.00,300.00,700.00,200.00C800.00,100.00,900.00,100.00,900.00,100.00"]
-        RenderSVGText {text} at (13,8) size 51x42 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 51x42
-            RenderSVGTSpan {tspan} at (0,0) size 51x42
-              RenderSVGInlineText {#text} at (0,-17) size 50x41
+        RenderSVGText {text} at (13,8) size 73x43 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 73x43
+            RenderSVGTSpan {tspan} at (0,0) size 73x43
+              RenderSVGInlineText {#text} at (-11,-17) size 73x43
                 chunk 1 text run 1 at (13.83,8.83) startOffset 0 endOffset 6 width 58.00: "sample"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (35,60) size 60x13 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-10) size 60x13
             chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 15 width 60.00: "default spacing"
-      RenderSVGContainer {g} at (164.89,61) size 123.11x82 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,70.00)}]
+      RenderSVGContainer {g} at (160,61) size 128x82 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,70.00)}]
         RenderSVGContainer {use} at (164.89,77.29) size 120.11x30.43
           RenderSVGContainer {g} at (164.89,77.29) size 120.11x30.43
             RenderPath {path} at (164.89,77.29) size 120.11x30.43 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00C200.00,100.00,300.00,0.00,400.00,100.00C500.00,200.00,600.00,300.00,700.00,200.00C800.00,100.00,900.00,100.00,900.00,100.00"]
-        RenderSVGText {text} at (21,9) size 93x49 contains 6 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 93x49
-            RenderSVGTSpan {tspan} at (0,0) size 93x49
-              RenderSVGInlineText {#text} at (0,-17) size 93x49
+        RenderSVGText {text} at (21,9) size 106x50 contains 6 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 106x50
+            RenderSVGTSpan {tspan} at (0,0) size 106x50
+              RenderSVGInlineText {#text} at (-11,-18) size 106x50
                 chunk 1 text run 1 at (21.07,20.27) startOffset 0 endOffset 1 width 8.00: "s"
                 chunk 2 text run 1 at (37.74,9.42) startOffset 1 endOffset 2 width 9.00: "a"
                 chunk 3 text run 1 at (54.76,17.75) startOffset 2 endOffset 3 width 16.00: "m"
@@ -43,62 +43,62 @@ layer at (0,0) size 450x500
         RenderSVGText {text} at (35,70) size 34x13 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-10) size 34x13
             chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 7 width 34.00: "y=\"110\""
-      RenderSVGContainer {g} at (313,60) size 122x73 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,70.00)}]
+      RenderSVGContainer {g} at (302,54) size 133x79 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,70.00)}]
         RenderSVGContainer {use} at (314.89,77.29) size 120.11x30.43
           RenderSVGContainer {g} at (314.89,77.29) size 120.11x30.43
             RenderPath {path} at (314.89,77.29) size 120.11x30.43 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00C200.00,100.00,300.00,0.00,400.00,100.00C500.00,200.00,600.00,300.00,700.00,200.00C800.00,100.00,900.00,100.00,900.00,100.00"]
-        RenderSVGText {text} at (13,8) size 101x42 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 101x42
-            RenderSVGTSpan {tspan} at (0,0) size 101x42
-              RenderSVGInlineText {#text} at (0,-17) size 100x41
+        RenderSVGText {text} at (13,8) size 109x72 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 109x72
+            RenderSVGTSpan {tspan} at (0,0) size 109x72
+              RenderSVGInlineText {#text} at (-11,-24) size 109x72
                 chunk 1 text run 1 at (13.83,8.83) startOffset 0 endOffset 6 width 58.00: "sample"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (15,60) size 118x13 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-10) size 118x13
             chunk 1 text run 1 at (15.00,60.00) startOffset 0 endOffset 27 width 118.00: "tspan dx=\"0,10,10,10,10,10\""
-      RenderSVGContainer {g} at (13,150) size 122x73 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,160.00)}]
+      RenderSVGContainer {g} at (2,151) size 133x72 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,160.00)}]
         RenderSVGContainer {use} at (14.89,167.29) size 120.11x30.43
           RenderSVGContainer {g} at (14.89,167.29) size 120.11x30.43
             RenderPath {path} at (14.89,167.29) size 120.11x30.43 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00C200.00,100.00,300.00,0.00,400.00,100.00C500.00,200.00,600.00,300.00,700.00,200.00C800.00,100.00,900.00,100.00,900.00,100.00"]
-        RenderSVGText {text} at (13,8) size 51x42 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 51x42
-            RenderSVGInlineText {#text} at (0,-17) size 50x41
+        RenderSVGText {text} at (13,8) size 73x43 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 73x43
+            RenderSVGInlineText {#text} at (-11,-17) size 73x43
               chunk 1 text run 1 at (13.83,8.83) startOffset 0 endOffset 6 width 58.00: "sample"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (35,60) size 72x13 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-10) size 72x13
             chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 16 width 72.00: "textLength=\"140\""
-      RenderSVGContainer {g} at (163,150) size 122x73 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,160.00)}]
+      RenderSVGContainer {g} at (152,151) size 133x72 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,160.00)}]
         RenderSVGContainer {use} at (164.89,167.29) size 120.11x30.43
           RenderSVGContainer {g} at (164.89,167.29) size 120.11x30.43
             RenderPath {path} at (164.89,167.29) size 120.11x30.43 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00C200.00,100.00,300.00,0.00,400.00,100.00C500.00,200.00,600.00,300.00,700.00,200.00C800.00,100.00,900.00,100.00,900.00,100.00"]
-        RenderSVGText {text} at (13,8) size 51x42 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 51x42
-            RenderSVGInlineText {#text} at (0,-17) size 50x41
+        RenderSVGText {text} at (13,8) size 73x43 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 73x43
+            RenderSVGInlineText {#text} at (-11,-17) size 73x43
               chunk 1 text run 1 at (13.83,8.83) startOffset 0 endOffset 6 width 58.00: "sample"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (35,60) size 67x13 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-10) size 67x13
             chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 15 width 67.00: "textLength=\"70\""
-      RenderSVGContainer {g} at (313,150) size 122x73 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,160.00)}]
+      RenderSVGContainer {g} at (302,151) size 133x72 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,160.00)}]
         RenderSVGContainer {use} at (314.89,167.29) size 120.11x30.43
           RenderSVGContainer {g} at (314.89,167.29) size 120.11x30.43
             RenderPath {path} at (314.89,167.29) size 120.11x30.43 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00C200.00,100.00,300.00,0.00,400.00,100.00C500.00,200.00,600.00,300.00,700.00,200.00C800.00,100.00,900.00,100.00,900.00,100.00"]
-        RenderSVGText {text} at (13,8) size 51x42 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 51x42
-            RenderSVGInlineText {#text} at (0,-17) size 50x41
+        RenderSVGText {text} at (13,8) size 73x43 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 73x43
+            RenderSVGInlineText {#text} at (-11,-17) size 73x43
               chunk 1 text run 1 at (13.83,8.83) startOffset 0 endOffset 6 width 58.00: "sample"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (35,60) size 54x13 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-10) size 54x13
             chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 12 width 54.00: "kerning=\"10\""
-      RenderSVGContainer {g} at (13,240) size 122x93 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,250.00)}]
+      RenderSVGContainer {g} at (2,241) size 133x92 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,250.00)}]
         RenderSVGContainer {use} at (14.89,257.29) size 120.11x30.43
           RenderSVGContainer {g} at (14.89,257.29) size 120.11x30.43
             RenderPath {path} at (14.89,257.29) size 120.11x30.43 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00C200.00,100.00,300.00,0.00,400.00,100.00C500.00,200.00,600.00,300.00,700.00,200.00C800.00,100.00,900.00,100.00,900.00,100.00"]
-        RenderSVGText {text} at (13,8) size 51x42 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 51x42
-            RenderSVGInlineText {#text} at (0,-17) size 50x41
+        RenderSVGText {text} at (13,8) size 73x43 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 73x43
+            RenderSVGInlineText {#text} at (-11,-17) size 73x43
               chunk 1 text run 1 at (13.83,8.83) startOffset 0 endOffset 6 width 58.00: "sample"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (35,60) size 72x13 contains 1 chunk(s)
@@ -110,13 +110,13 @@ layer at (0,0) size 450x500
         RenderSVGText {text} at (35,80) size 84x13 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-10) size 84x13
             chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 18 width 84.00: "\"spacingAndGlyphs\""
-      RenderSVGContainer {g} at (163,240) size 122x93 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,250.00)}]
+      RenderSVGContainer {g} at (152,241) size 133x92 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,250.00)}]
         RenderSVGContainer {use} at (164.89,257.29) size 120.11x30.43
           RenderSVGContainer {g} at (164.89,257.29) size 120.11x30.43
             RenderPath {path} at (164.89,257.29) size 120.11x30.43 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00C200.00,100.00,300.00,0.00,400.00,100.00C500.00,200.00,600.00,300.00,700.00,200.00C800.00,100.00,900.00,100.00,900.00,100.00"]
-        RenderSVGText {text} at (13,8) size 51x42 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 51x42
-            RenderSVGInlineText {#text} at (0,-17) size 50x41
+        RenderSVGText {text} at (13,8) size 73x43 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 73x43
+            RenderSVGInlineText {#text} at (-11,-17) size 73x43
               chunk 1 text run 1 at (13.83,8.83) startOffset 0 endOffset 6 width 58.00: "sample"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (35,60) size 67x13 contains 1 chunk(s)
@@ -128,13 +128,13 @@ layer at (0,0) size 450x500
         RenderSVGText {text} at (35,80) size 84x13 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-10) size 84x13
             chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 18 width 84.00: "\"spacingAndGlyphs\""
-      RenderSVGContainer {g} at (305,240) size 132x93 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,250.00)}]
+      RenderSVGContainer {g} at (302,241) size 135x92 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,250.00)}]
         RenderSVGContainer {use} at (314.89,257.29) size 120.11x30.43
           RenderSVGContainer {g} at (314.89,257.29) size 120.11x30.43
             RenderPath {path} at (314.89,257.29) size 120.11x30.43 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00C200.00,100.00,300.00,0.00,400.00,100.00C500.00,200.00,600.00,300.00,700.00,200.00C800.00,100.00,900.00,100.00,900.00,100.00"]
-        RenderSVGText {text} at (13,8) size 51x42 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 51x42
-            RenderSVGInlineText {#text} at (0,-17) size 50x41
+        RenderSVGText {text} at (13,8) size 73x43 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 73x43
+            RenderSVGInlineText {#text} at (-11,-17) size 73x43
               chunk 1 text run 1 at (13.83,8.83) startOffset 0 endOffset 6 width 58.00: "sample"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (5,60) size 132x13 contains 1 chunk(s)
@@ -146,25 +146,25 @@ layer at (0,0) size 450x500
         RenderSVGText {text} at (5,80) size 84x13 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-10) size 84x13
             chunk 1 text run 1 at (5.00,80.00) startOffset 0 endOffset 18 width 84.00: "\"spacingAndGlyphs\""
-      RenderSVGContainer {g} at (14,340) size 121x73 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,350.00)}]
+      RenderSVGContainer {g} at (2,341) size 133x72 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,350.00)}]
         RenderSVGContainer {use} at (14.89,357.29) size 120.11x30.43
           RenderSVGContainer {g} at (14.89,357.29) size 120.11x30.43
             RenderPath {path} at (14.89,357.29) size 120.11x30.43 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00C200.00,100.00,300.00,0.00,400.00,100.00C500.00,200.00,600.00,300.00,700.00,200.00C800.00,100.00,900.00,100.00,900.00,100.00"]
-        RenderSVGText {text} at (14,8) size 33x43 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 33x43
-            RenderSVGInlineText {#text} at (0,-17) size 33x42
+        RenderSVGText {text} at (14,8) size 46x43 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 46x43
+            RenderSVGInlineText {#text} at (-12,-17) size 46x43
               chunk 1 text run 1 at (14.27,8.93) startOffset 0 endOffset 6 width 40.00: "sample"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (35,60) size 75x13 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-10) size 75x13
             chunk 1 text run 1 at (35.00,60.00) startOffset 0 endOffset 19 width 75.00: "letter-spacing=\"-3\""
-      RenderSVGContainer {g} at (163,340) size 122x83 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,350.00)}]
+      RenderSVGContainer {g} at (152,341) size 133x82 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,350.00)}]
         RenderSVGContainer {use} at (164.89,357.29) size 120.11x30.43
           RenderSVGContainer {g} at (164.89,357.29) size 120.11x30.43
             RenderPath {path} at (164.89,357.29) size 120.11x30.43 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00C200.00,100.00,300.00,0.00,400.00,100.00C500.00,200.00,600.00,300.00,700.00,200.00C800.00,100.00,900.00,100.00,900.00,100.00"]
-        RenderSVGText {text} at (13,8) size 102x50 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 102x50
-            RenderSVGInlineText {#text} at (0,-17) size 101x49
+        RenderSVGText {text} at (13,8) size 116x52 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 116x52
+            RenderSVGInlineText {#text} at (-11,-17) size 116x52
               chunk 1 text run 1 at (13.83,8.83) startOffset 0 endOffset 13 width 161.00: "sample sample"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (35,60) size 72x13 contains 1 chunk(s)
@@ -173,13 +173,13 @@ layer at (0,0) size 450x500
         RenderSVGText {text} at (35,70) size 84x13 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-10) size 84x13
             chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 18 width 84.00: "word-spacing=\"2em\""
-      RenderSVGContainer {g} at (313,340) size 122x103 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,350.00)}]
+      RenderSVGContainer {g} at (302,341) size 133x102 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,350.00)}]
         RenderSVGContainer {use} at (314.89,357.29) size 120.11x30.43
           RenderSVGContainer {g} at (314.89,357.29) size 120.11x30.43
             RenderPath {path} at (314.89,357.29) size 120.11x30.43 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00C200.00,100.00,300.00,0.00,400.00,100.00C500.00,200.00,600.00,300.00,700.00,200.00C800.00,100.00,900.00,100.00,900.00,100.00"]
-        RenderSVGText {text} at (13,8) size 102x50 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 102x50
-            RenderSVGInlineText {#text} at (0,-17) size 101x49
+        RenderSVGText {text} at (13,8) size 116x52 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 116x52
+            RenderSVGInlineText {#text} at (-11,-17) size 116x52
               chunk 1 text run 1 at (13.83,8.83) startOffset 0 endOffset 13 width 116.00: "sample sample"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (35,60) size 72x13 contains 1 chunk(s)

diff --git a/LayoutTests/svg/batik/text/textPCDATA-expected.txt b/LayoutTests/svg/batik/text/textPCDATA-expected.txt
index e035c6605c4b46ac366094d296717aeede59701f..682a2f6d2d42d6a1c6004a60067d5d7b82e518cd 100644 (file)
--- a/LayoutTests/svg/batik/text/textPCDATA-expected.txt
+++ b/LayoutTests/svg/batik/text/textPCDATA-expected.txt
@@ -1,44 +1,44 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 450x500
-  RenderSVGRoot {svg} at (-27,16) size 503x248
-    RenderSVGContainer {g} at (-27,16) size 503x248
-      RenderSVGText {text} at (136,30) size 177x17 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-14) size 177x17
+  RenderSVGRoot {svg} at (-26,16) size 503x248
+    RenderSVGContainer {g} at (-26,16) size 503x248
+      RenderSVGText {text} at (136,30) size 178x17 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-14) size 178x17
           chunk 1 (middle anchor) text run 1 at (136.50,30.00) startOffset 0 endOffset 24 width 177.00: "Character Data on <text>"
-      RenderSVGContainer {g} at (128,106) size 193x38 [transform={m=((1.00,0.00)(0.00,1.00)) t=(225.00,120.00)}]
-        RenderSVGText {text} at (-45,0) size 88x18 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-14) size 89x18
+      RenderSVGContainer {g} at (129,106) size 193x38 [transform={m=((1.00,0.00)(0.00,1.00)) t=(225.00,120.00)}]
+        RenderSVGText {text} at (-45,0) size 89x18 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (1,-14) size 89x18
             chunk 1 (middle anchor) text run 1 at (-44.50,0.00) startOffset 0 endOffset 10 width 89.00: "CDATA only"
-        RenderSVGText {text} at (-97,20) size 192x18 contains 1 chunk(s) [color=#DC143C]
-          RenderSVGInlineText {#cdata-section} at (0,-14) size 193x18
+        RenderSVGText {text} at (-97,20) size 193x18 contains 1 chunk(s) [color=#DC143C]
+          RenderSVGInlineText {#cdata-section} at (1,-14) size 193x18
             chunk 1 (middle anchor) text run 1 at (-96.50,20.00) startOffset 0 endOffset 27 width 193.00: "<text> with a CDATA section"
-      RenderSVGContainer {g} at (59,166) size 331x38 [transform={m=((1.00,0.00)(0.00,1.00)) t=(225.00,180.00)}]
-        RenderSVGText {text} at (-60,0) size 118x18 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-14) size 119x18
+      RenderSVGContainer {g} at (60,166) size 331x38 [transform={m=((1.00,0.00)(0.00,1.00)) t=(225.00,180.00)}]
+        RenderSVGText {text} at (-60,0) size 119x18 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (1,-14) size 119x18
             chunk 1 (middle anchor) text run 1 at (-59.50,0.00) startOffset 0 endOffset 17 width 119.00: "text, CDATA, text"
-        RenderSVGText {text} at (-166,20) size 330x18 contains 1 chunk(s) [color=#DC143C]
-          RenderSVGInlineText {#text} at (0,-14) size 96x18
+        RenderSVGText {text} at (-166,20) size 331x18 contains 1 chunk(s) [color=#DC143C]
+          RenderSVGInlineText {#text} at (1,-14) size 96x18
             chunk 1 (middle anchor) text run 1 at (-165.50,20.00) startOffset 0 endOffset 17 width 96.00: "Text first, then "
-          RenderSVGInlineText {#cdata-section} at (96,-14) size 166x18
+          RenderSVGInlineText {#cdata-section} at (97,-14) size 166x18
             chunk 1 (middle anchor) text run 2 at (-69.50,20.00) startOffset 0 endOffset 23 width 166.00: "CDATA section in <text>"
-          RenderSVGInlineText {#text} at (262,-14) size 69x18
+          RenderSVGInlineText {#text} at (262,-14) size 70x18
             chunk 1 (middle anchor) text run 3 at (96.50,20.00) startOffset 0 endOffset 12 width 69.00: ", text again"
-      RenderSVGContainer {g} at (-27,226) size 503x38 [transform={m=((1.00,0.00)(0.00,1.00)) t=(225.00,240.00)}]
-        RenderSVGText {text} at (-113,0) size 224x18 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-14) size 225x18
+      RenderSVGContainer {g} at (-26,226) size 503x38 [transform={m=((1.00,0.00)(0.00,1.00)) t=(225.00,240.00)}]
+        RenderSVGText {text} at (-113,0) size 225x18 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (1,-14) size 225x18
             chunk 1 (middle anchor) text run 1 at (-112.50,0.00) startOffset 0 endOffset 31 width 225.00: "text, CDATA, tspan, CDATA, text"
-        RenderSVGText {text} at (-252,20) size 502x18 contains 1 chunk(s) [color=#DC143C]
-          RenderSVGInlineText {#text} at (0,-14) size 31x18
+        RenderSVGText {text} at (-252,20) size 503x18 contains 1 chunk(s) [color=#DC143C]
+          RenderSVGInlineText {#text} at (1,-14) size 31x18
             chunk 1 (middle anchor) text run 1 at (-251.50,20.00) startOffset 0 endOffset 6 width 31.00: "text, "
-          RenderSVGInlineText {#cdata-section} at (31,-14) size 166x18
+          RenderSVGInlineText {#cdata-section} at (32,-14) size 166x18
             chunk 1 (middle anchor) text run 2 at (-220.50,20.00) startOffset 0 endOffset 23 width 166.00: "CDATA section in <text>"
-          RenderSVGInlineText {#text} at (197,-14) size 8x18
+          RenderSVGInlineText {#text} at (198,-14) size 8x18
             chunk 1 (middle anchor) text run 3 at (-54.50,20.00) startOffset 0 endOffset 2 width 8.00: ", "
-          RenderSVGTSpan {tspan} at (0,0) size 228x18 [color=#FFD700]
-            RenderSVGInlineText {#text} at (205,-14) size 53x18
+          RenderSVGTSpan {tspan} at (0,0) size 229x18 [color=#FFD700]
+            RenderSVGInlineText {#text} at (206,-14) size 53x18
               chunk 1 (middle anchor) text run 4 at (-46.50,20.00) startOffset 0 endOffset 8 width 53.00: "tspan w/"
-            RenderSVGInlineText {#cdata-section} at (258,-14) size 176x18
+            RenderSVGInlineText {#cdata-section} at (258,-14) size 177x18
               chunk 1 (middle anchor) text run 5 at (6.50,20.00) startOffset 0 endOffset 24 width 176.00: "CDATA section in <tspan>"
-          RenderSVGInlineText {#text} at (434,-14) size 69x18
+          RenderSVGInlineText {#text} at (434,-14) size 70x18
             chunk 1 (middle anchor) text run 6 at (182.50,20.00) startOffset 0 endOffset 12 width 69.00: ", text again"

diff --git a/LayoutTests/svg/batik/text/textPosition-expected.txt b/LayoutTests/svg/batik/text/textPosition-expected.txt
index 2b72a0ed443514de2d412a34523fb76c96900cbe..7221755b0299e975328093d2ab867a4d50808b66 100644 (file)
--- a/LayoutTests/svg/batik/text/textPosition-expected.txt
+++ b/LayoutTests/svg/batik/text/textPosition-expected.txt
@@ -2,8 +2,8 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 450x500
   RenderSVGRoot {svg} at (50,16) size 2147483648.00x2147483648.00
-    RenderSVGText {text} at (178,30) size 93x17 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,-14) size 93x17
+    RenderSVGText {text} at (178,30) size 94x17 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,-14) size 94x17
         chunk 1 (middle anchor) text run 1 at (178.50,30.00) startOffset 0 endOffset 13 width 93.00: "Text Position"
     RenderSVGContainer {g} at (50,58) size 2147483648.00x2147483648.00
       RenderSVGText {text} at (50,80) size 53x27 contains 1 chunk(s)

diff --git a/LayoutTests/svg/batik/text/textProperties-expected.txt b/LayoutTests/svg/batik/text/textProperties-expected.txt
index 1f75191510c6a8c04b5ac62e81d27c2edcd2e7ff..a838481a66ae9a62e7a374f9de3a8083ead09560 100644 (file)
--- a/LayoutTests/svg/batik/text/textProperties-expected.txt
+++ b/LayoutTests/svg/batik/text/textProperties-expected.txt
@@ -4,12 +4,12 @@ KRenderingPaintServer {id="gradient" [type=LINEAR-GRADIENT] [stops=[(0.00,#0000F
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 450x500
-  RenderSVGRoot {svg} at (15,36) size 415x433
+  RenderSVGRoot {svg} at (16,36) size 414x433
     RenderSVGHiddenContainer {defs} at (0,0) size 0x0
       RenderSVGText {text} at (-22,0) size 44x18 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-14) size 44x18
           chunk 1 (middle anchor) text run 1 at (-22.00,0.00) startOffset 0 endOffset 6 width 44.00: "sample"
-    RenderSVGContainer {g} at (15,36) size 415x433
+    RenderSVGContainer {g} at (16,36) size 414x433
       RenderSVGText {text} at (59,50) size 332x17 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-14) size 332x17
           chunk 1 (middle anchor) text run 1 at (59.00,50.00) startOffset 0 endOffset 47 width 332.00: "Text Alignment, Geometry, References, and Spans"
@@ -24,9 +24,9 @@ layer at (0,0) size 450x500
         RenderSVGText {text} at (111,130) size 114x17 contains 1 chunk(s) [color=#228B22]
           RenderSVGInlineText {#text} at (0,-13) size 114x17
             chunk 1 (end anchor) text run 1 at (111.00,130.00) startOffset 0 endOffset 17 width 114.00: "text-anchor=\"end\""
-      RenderSVGContainer {g} at (45,145) size 109x54 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,180.00)}]
-        RenderSVGText {text} at (-55,0) size 108x45 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-35) size 109x45
+      RenderSVGContainer {g} at (46,145) size 109x54 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,180.00)}]
+        RenderSVGText {text} at (-55,0) size 109x45 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (1,-35) size 109x45
             chunk 1 (middle anchor) text run 1 at (-54.50,0.00) startOffset 0 endOffset 6 width 109.00: "sample"
         RenderSVGText {text} at (-52,15) size 104x18 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-14) size 104x18
@@ -42,28 +42,28 @@ layer at (0,0) size 450x500
         RenderSVGText {text} at (-57,0) size 114x46 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-36) size 114x46
             chunk 1 (middle anchor) text run 1 at (-57.00,0.00) startOffset 0 endOffset 6 width 114.00: "sample"
-        RenderSVGText {text} at (-47,15) size 92x18 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-14) size 93x18
+        RenderSVGText {text} at (-47,15) size 93x18 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (1,-14) size 93x18
             chunk 1 (middle anchor) text run 1 at (-46.50,15.00) startOffset 0 endOffset 14 width 93.00: "font-size=\"28\""
-      RenderSVGContainer {g} at (20,197) size 159x47 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,225.00)}]
+      RenderSVGContainer {g} at (21,197) size 159x47 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,225.00)}]
         RenderSVGText {text} at (-42,0) size 84x36 contains 1 chunk(s)
           RenderSVGInline {tref} at (0,0) size 84x36
             RenderSVGInlineText {#text} at (0,-28) size 84x36
               chunk 1 (middle anchor) text run 1 at (-42.00,0.00) startOffset 0 endOffset 6 width 84.00: "sample"
-        RenderSVGText {text} at (-80,15) size 158x18 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-14) size 159x18
+        RenderSVGText {text} at (-80,15) size 159x18 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (1,-14) size 159x18
             chunk 1 (middle anchor) text run 1 at (-79.50,15.00) startOffset 0 endOffset 26 width 159.00: "referenced text via <tref>"
-      RenderSVGContainer {g} at (178,197) size 93x47 [transform={m=((1.00,0.00)(0.00,1.00)) t=(225.00,225.00)}]
+      RenderSVGContainer {g} at (179,197) size 93x47 [transform={m=((1.00,0.00)(0.00,1.00)) t=(225.00,225.00)}]
         RenderSVGText {text} at (-43,0) size 86x36 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-28) size 25x36
+          RenderSVGInlineText {#text} at (0,-28) size 26x36
             chunk 1 (middle anchor) text run 1 at (-43.00,0.00) startOffset 0 endOffset 2 width 25.00: "sa"
           RenderSVGTSpan {tspan} at (0,0) size 25x36 [color=#8B0000]
             RenderSVGInlineText {#text} at (25,-28) size 25x36
               chunk 1 (middle anchor) text run 2 at (-18.00,0.00) startOffset 0 endOffset 1 width 25.00: "m"
           RenderSVGInlineText {#text} at (50,-28) size 36x36
             chunk 1 (middle anchor) text run 3 at (7.00,0.00) startOffset 0 endOffset 3 width 36.00: "ple"
-        RenderSVGText {text} at (-47,15) size 92x18 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-14) size 93x18
+        RenderSVGText {text} at (-47,15) size 93x18 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (1,-14) size 93x18
             chunk 1 (middle anchor) text run 1 at (-46.50,15.00) startOffset 0 endOffset 14 width 93.00: "use of <tspan>"
       RenderSVGContainer {g} at (270,197) size 160x47 [transform={m=((1.00,0.00)(0.00,1.00)) t=(350.00,225.00)}]
         RenderSVGContainer {g} at (308,197) size 84x36
@@ -75,8 +75,8 @@ layer at (0,0) size 450x500
         RenderSVGText {text} at (-80,15) size 160x18 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-14) size 160x18
             chunk 1 (middle anchor) text run 1 at (-80.00,15.00) startOffset 0 endOffset 25 width 160.00: "predefined text via <use>"
-      RenderSVGText {text} at (143,280) size 163x17 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-13) size 163x17
+      RenderSVGText {text} at (143,280) size 164x17 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-13) size 164x17
           chunk 1 (middle anchor) text run 1 at (143.50,280.00) startOffset 0 endOffset 25 width 163.00: "Text Rendering Properties"
       RenderSVGContainer {g} at (24,297) size 152x42 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,305.00)}]
         RenderSVGContainer {g} at (58.00,297) size 84x36 [transform={m=((-1.00,-0.00)(0.00,-1.00)) t=(0.00,0.00)}]
@@ -88,15 +88,15 @@ layer at (0,0) size 450x500
         RenderSVGText {text} at (-76,30) size 152x18 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-14) size 152x18
             chunk 1 (middle anchor) text run 1 at (-76.00,30.00) startOffset 0 endOffset 23 width 152.00: "transform=\"rotate(180)\""
-      RenderSVGContainer {g} at (180,292) size 89x47 [transform={m=((1.00,0.00)(0.00,1.00)) t=(225.00,320.00)}]
+      RenderSVGContainer {g} at (181,292) size 89x47 [transform={m=((1.00,0.00)(0.00,1.00)) t=(225.00,320.00)}]
         RenderSVGContainer {g} at (183,292) size 84x36 [opacity=0.50]
           RenderSVGContainer {use} at (183,292) size 84x36
             RenderSVGContainer {g} at (183,292) size 84x36
               RenderSVGText {text} at (-42,0) size 84x36 contains 1 chunk(s)
                 RenderSVGInlineText {#text} at (0,-28) size 84x36
                   chunk 1 (middle anchor) text run 1 at (-42.00,0.00) startOffset 0 endOffset 6 width 84.00: "sample"
-        RenderSVGText {text} at (-45,15) size 88x18 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-14) size 89x18
+        RenderSVGText {text} at (-45,15) size 89x18 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (1,-14) size 89x18
             chunk 1 (middle anchor) text run 1 at (-44.50,15.00) startOffset 0 endOffset 13 width 89.00: "opacity=\"0.5\""
       RenderSVGContainer {g} at (301,292) size 98x47 [transform={m=((1.00,0.00)(0.00,1.00)) t=(350.00,320.00)}]
         RenderSVGContainer {g} at (308,292) size 84x36
@@ -108,28 +108,28 @@ layer at (0,0) size 450x500
         RenderSVGText {text} at (-49,15) size 98x18 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-14) size 98x18
             chunk 1 (middle anchor) text run 1 at (-49.00,15.00) startOffset 0 endOffset 14 width 98.00: "fill=\"DarkRed\""
-      RenderSVGContainer {g} at (15,342) size 169x47 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,370.00)}]
+      RenderSVGContainer {g} at (16,342) size 169x47 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,370.00)}]
         RenderSVGContainer {g} at (58,342) size 84x36 [filter=#gaussianBlur]
           RenderSVGContainer {use} at (58,342) size 84x36
             RenderSVGContainer {g} at (58,342) size 84x36
               RenderSVGText {text} at (-42,0) size 84x36 contains 1 chunk(s)
                 RenderSVGInlineText {#text} at (0,-28) size 84x36
                   chunk 1 (middle anchor) text run 1 at (-42.00,0.00) startOffset 0 endOffset 6 width 84.00: "sample"
-        RenderSVGText {text} at (-85,15) size 168x18 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-14) size 169x18
+        RenderSVGText {text} at (-85,15) size 169x18 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (1,-14) size 169x18
             chunk 1 (middle anchor) text run 1 at (-84.50,15.00) startOffset 0 endOffset 27 width 169.00: "filter=\"url(#gaussianBlur)\""
-      RenderSVGContainer {g} at (150,342) size 149x57 [transform={m=((1.00,0.00)(0.00,1.00)) t=(225.00,370.00)}]
+      RenderSVGContainer {g} at (151,342) size 149x57 [transform={m=((1.00,0.00)(0.00,1.00)) t=(225.00,370.00)}]
         RenderSVGContainer {g} at (183,342) size 84x36
           RenderSVGContainer {use} at (183,342) size 84x36
             RenderSVGContainer {g} at (183,342) size 84x36
               RenderSVGText {text} at (-42,0) size 84x36 contains 1 chunk(s) [color=#191970]
                 RenderSVGInlineText {#text} at (0,-28) size 84x36
                   chunk 1 (middle anchor) text run 1 at (-42.00,0.00) startOffset 0 endOffset 6 width 84.00: "sample"
-        RenderSVGText {text} at (-44,15) size 86x18 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-14) size 87x18
+        RenderSVGText {text} at (-44,15) size 87x18 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (1,-14) size 87x18
             chunk 1 (middle anchor) text run 1 at (-43.50,15.00) startOffset 0 endOffset 14 width 87.00: "fill=\"yellow\";"
-        RenderSVGText {text} at (-75,25) size 148x18 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-14) size 149x18
+        RenderSVGText {text} at (-75,25) size 149x18 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (1,-14) size 149x18
             chunk 1 (middle anchor) text run 1 at (-74.50,25.00) startOffset 0 endOffset 21 width 149.00: "stroke=\"MidnightBlue\""
       RenderSVGHiddenContainer {defs} at (0,0) size 0x0
         RenderSVGHiddenContainer {linearGradient} at (0,0) size 0x0
@@ -137,20 +137,20 @@ layer at (0,0) size 450x500
           RenderSVGGradientStop {stop} at (0,0) size 0x0
       RenderSVGContainer {g} at (300,345) size 100x50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(350.00,370.00)}]
         RenderPath {rect} at (300,345) size 100x50 [fill={[type=LINEAR-GRADIENT] [stops=[(0.00,#0000FF), (1.00,#008000)]] [bounding box mode=0] [start=(-50,-25)] [end=(50,25)]}] [clip path="#textClip"] [data="M-50.00,-25.00L50.00,-25.00L50.00,25.00L-50.00,25.00"]
-        RenderSVGText {text} at (-50,15) size 98x18 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-14) size 99x18
+        RenderSVGText {text} at (-50,15) size 99x18 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (1,-14) size 99x18
             chunk 1 (middle anchor) text run 1 at (-49.50,15.00) startOffset 0 endOffset 17 width 99.00: "text as clip-path"
-      RenderSVGText {text} at (136,440) size 27x69 contains 1 chunk(s) [color=#8B0000]
-        RenderSVGInlineText {#text} at (0,-54) size 27x69
+      RenderSVGText {text} at (136,440) size 28x69 contains 1 chunk(s) [color=#8B0000]
+        RenderSVGInlineText {#text} at (0,-54) size 28x69
           chunk 1 (middle anchor) text run 1 at (136.50,440.00) startOffset 0 endOffset 1 width 27.00: "a"
-      RenderSVGText {text} at (77,455) size 145x18 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-14) size 145x18
+      RenderSVGText {text} at (77,455) size 146x18 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-14) size 146x18
           chunk 1 (middle anchor) text run 1 at (77.50,455.00) startOffset 0 endOffset 23 width 145.00: "stroke-linejoin=\"miter\""
       RenderSVGText {text} at (74,465) size 152x18 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-14) size 152x18
           chunk 1 (middle anchor) text run 1 at (74.00,465.00) startOffset 0 endOffset 23 width 152.00: "stroke-linecap=\"square\""
-      RenderSVGText {text} at (286,440) size 27x69 contains 1 chunk(s) [color=#8B0000]
-        RenderSVGInlineText {#text} at (0,-54) size 27x69
+      RenderSVGText {text} at (286,440) size 28x69 contains 1 chunk(s) [color=#8B0000]
+        RenderSVGInlineText {#text} at (0,-54) size 28x69
           chunk 1 (middle anchor) text run 1 at (286.50,440.00) startOffset 0 endOffset 1 width 27.00: "a"
       RenderSVGText {text} at (225,455) size 150x18 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-14) size 150x18

diff --git a/LayoutTests/svg/batik/text/textProperties2-expected.txt b/LayoutTests/svg/batik/text/textProperties2-expected.txt
index cfd9ef85e3893d8393947aae8f4f7ca6afd90795..c895e586ef0171d3f1a4c85ed03be7aed03848e6 100644 (file)
--- a/LayoutTests/svg/batik/text/textProperties2-expected.txt
+++ b/LayoutTests/svg/batik/text/textProperties2-expected.txt
@@ -10,8 +10,8 @@ layer at (0,0) size 450x500
       RenderSVGText {text} at (143,74) size 164x18 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-14) size 164x18
           chunk 1 (middle anchor) text run 1 at (143.00,74.00) startOffset 0 endOffset 27 width 164.00: "Visibility on text & tspans"
-      RenderSVGText {text} at (147,200) size 155x18 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-14) size 155x18
+      RenderSVGText {text} at (147,200) size 156x18 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-14) size 156x18
           chunk 1 (middle anchor) text run 1 at (147.50,200.00) startOffset 0 endOffset 24 width 155.00: "Display on text & tspans"
       RenderSVGContainer {g} at (12,81.50) size 426x251
         RenderPath {rect} at (12,81.50) size 426x26 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#EEEEEE]}] [data="M12.50,82.00L437.50,82.00L437.50,107.00L12.50,107.00"]

diff --git a/LayoutTests/svg/batik/text/textStyles-expected.txt b/LayoutTests/svg/batik/text/textStyles-expected.txt
index 76f0a413a843e69d54d3b2b7a94c200730d4d0c0..15b8104d676b992f09ddf9889a346174181cafe9 100644 (file)
--- a/LayoutTests/svg/batik/text/textStyles-expected.txt
+++ b/LayoutTests/svg/batik/text/textStyles-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 450x500
-  RenderSVGRoot {svg} at (-71,36) size 581x397
+  RenderSVGRoot {svg} at (-71,36) size 582x397
     RenderSVGHiddenContainer {defs} at (0,0) size 0x0
       RenderSVGText {text} at (-22,0) size 44x18 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-14) size 44x18
           chunk 1 (middle anchor) text run 1 at (-22.00,0.00) startOffset 0 endOffset 6 width 44.00: "sample"
-    RenderSVGContainer {g} at (-71,36) size 581x397
+    RenderSVGContainer {g} at (-71,36) size 582x397
       RenderSVGText {text} at (135,50) size 180x17 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-14) size 180x17
           chunk 1 (middle anchor) text run 1 at (135.00,50.00) startOffset 0 endOffset 26 width 180.00: "Text Font Faces and Styles"
@@ -32,40 +32,40 @@ layer at (0,0) size 450x500
           RenderSVGInlineText {#text} at (0,-28) size 184x36
             chunk 1 (middle anchor) text run 1 at (-92.00,15.00) startOffset 0 endOffset 15 width 184.00: "SansSerif, bold"
       RenderSVGContainer {g} at (240,82) size 220x51 [transform={m=((1.00,0.00)(0.00,1.00)) t=(350.00,110.00)}]
-        RenderSVGContainer {use} at (307,82) size 85x36
-          RenderSVGContainer {g} at (307,82) size 85x36
-            RenderSVGText {text} at (-43,0) size 84x36 contains 1 chunk(s)
-              RenderSVGInlineText {#text} at (0,-28) size 85x36
+        RenderSVGContainer {use} at (308,82) size 85x36
+          RenderSVGContainer {g} at (308,82) size 85x36
+            RenderSVGText {text} at (-43,0) size 85x36 contains 1 chunk(s)
+              RenderSVGInlineText {#text} at (1,-28) size 85x36
                 chunk 1 (middle anchor) text run 1 at (-42.50,0.00) startOffset 0 endOffset 6 width 85.00: "sample"
         RenderSVGText {text} at (-110,15) size 220x36 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-28) size 220x36
             chunk 1 (middle anchor) text run 1 at (-110.00,15.00) startOffset 0 endOffset 18 width 220.00: "SansSerif, oblique"
-      RenderSVGContainer {g} at (-24,132) size 247x51 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,160.00)}]
+      RenderSVGContainer {g} at (-23,132) size 247x51 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,160.00)}]
         RenderSVGContainer {use} at (58,132) size 84x36
           RenderSVGContainer {g} at (58,132) size 84x36
             RenderSVGText {text} at (-42,0) size 84x36 contains 1 chunk(s)
               RenderSVGInlineText {#text} at (0,-28) size 84x36
                 chunk 1 (middle anchor) text run 1 at (-42.00,0.00) startOffset 0 endOffset 6 width 84.00: "sample"
-        RenderSVGText {text} at (-124,15) size 246x36 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-28) size 247x36
+        RenderSVGText {text} at (-124,15) size 247x36 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (1,-28) size 247x36
             chunk 1 (middle anchor) text run 1 at (-123.50,15.00) startOffset 0 endOffset 20 width 247.00: "Serif, normal weight"
-      RenderSVGContainer {g} at (161,132) size 127x51 [transform={m=((1.00,0.00)(0.00,1.00)) t=(225.00,160.00)}]
+      RenderSVGContainer {g} at (162,132) size 127x51 [transform={m=((1.00,0.00)(0.00,1.00)) t=(225.00,160.00)}]
         RenderSVGContainer {use} at (180,132) size 90x36
           RenderSVGContainer {g} at (180,132) size 90x36
             RenderSVGText {text} at (-45,0) size 90x36 contains 1 chunk(s)
               RenderSVGInlineText {#text} at (0,-28) size 90x36
                 chunk 1 (middle anchor) text run 1 at (-45.00,0.00) startOffset 0 endOffset 6 width 90.00: "sample"
-        RenderSVGText {text} at (-64,15) size 126x36 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-28) size 127x36
+        RenderSVGText {text} at (-64,15) size 127x36 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (1,-28) size 127x36
             chunk 1 (middle anchor) text run 1 at (-63.50,15.00) startOffset 0 endOffset 11 width 127.00: "Serif, bold"
-      RenderSVGContainer {g} at (268,132) size 163x51 [transform={m=((1.00,0.00)(0.00,1.00)) t=(350.00,160.00)}]
-        RenderSVGContainer {use} at (307,132) size 85x36
-          RenderSVGContainer {g} at (307,132) size 85x36
-            RenderSVGText {text} at (-43,0) size 84x36 contains 1 chunk(s)
-              RenderSVGInlineText {#text} at (0,-28) size 85x36
+      RenderSVGContainer {g} at (269,132) size 163x51 [transform={m=((1.00,0.00)(0.00,1.00)) t=(350.00,160.00)}]
+        RenderSVGContainer {use} at (308,132) size 85x36
+          RenderSVGContainer {g} at (308,132) size 85x36
+            RenderSVGText {text} at (-43,0) size 85x36 contains 1 chunk(s)
+              RenderSVGInlineText {#text} at (1,-28) size 85x36
                 chunk 1 (middle anchor) text run 1 at (-42.50,0.00) startOffset 0 endOffset 6 width 85.00: "sample"
-        RenderSVGText {text} at (-82,15) size 162x36 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-28) size 163x36
+        RenderSVGText {text} at (-82,15) size 163x36 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (1,-28) size 163x36
             chunk 1 (middle anchor) text run 1 at (-81.50,15.00) startOffset 0 endOffset 14 width 163.00: "Serif, oblique"
       RenderSVGContainer {g} at (-71,182) size 342x51 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,210.00)}]
         RenderSVGContainer {use} at (58,182) size 84x36
@@ -86,10 +86,10 @@ layer at (0,0) size 450x500
           RenderSVGInlineText {#text} at (0,-28) size 222x36
             chunk 1 (middle anchor) text run 1 at (-111.00,15.00) startOffset 0 endOffset 16 width 222.00: "Monospaced, bold"
       RenderSVGContainer {g} at (221,182) size 258x51 [transform={m=((1.00,0.00)(0.00,1.00)) t=(350.00,210.00)}]
-        RenderSVGContainer {use} at (307,182) size 85x36
-          RenderSVGContainer {g} at (307,182) size 85x36
-            RenderSVGText {text} at (-43,0) size 84x36 contains 1 chunk(s)
-              RenderSVGInlineText {#text} at (0,-28) size 85x36
+        RenderSVGContainer {use} at (308,182) size 85x36
+          RenderSVGContainer {g} at (308,182) size 85x36
+            RenderSVGText {text} at (-43,0) size 85x36 contains 1 chunk(s)
+              RenderSVGInlineText {#text} at (1,-28) size 85x36
                 chunk 1 (middle anchor) text run 1 at (-42.50,0.00) startOffset 0 endOffset 6 width 85.00: "sample"
         RenderSVGText {text} at (-129,15) size 258x36 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-28) size 258x36
@@ -124,8 +124,8 @@ layer at (0,0) size 450x500
       RenderSVGText {text} at (181,310) size 88x13 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-10) size 88x13
           chunk 1 (middle anchor) text run 1 at (181.00,310.00) startOffset 0 endOffset 19 width 88.00: "Named Font Families"
-      RenderSVGText {text} at (128,325) size 193x13 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-10) size 193x13
+      RenderSVGText {text} at (128,325) size 194x13 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-10) size 194x13
           chunk 1 (middle anchor) text run 1 at (128.50,325.00) startOffset 0 endOffset 49 width 193.00: "(Not all typefaces are available on all systems.)"
       RenderSVGContainer {g} at (58,332) size 84x51 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,360.00)}]
         RenderSVGContainer {use} at (58,332) size 84x36
@@ -142,17 +142,17 @@ layer at (0,0) size 450x500
             RenderSVGText {text} at (-54,0) size 108x36 contains 1 chunk(s)
               RenderSVGInlineText {#text} at (0,-30) size 108x36
                 chunk 1 (middle anchor) text run 1 at (-54.00,0.00) startOffset 0 endOffset 6 width 108.00: "sample"
-        RenderSVGText {text} at (-51,15) size 100x36 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-28) size 101x36
+        RenderSVGText {text} at (-51,15) size 101x36 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (1,-28) size 101x36
             chunk 1 (middle anchor) text run 1 at (-50.50,15.00) startOffset 0 endOffset 7 width 101.00: "Verdana"
-      RenderSVGContainer {g} at (293,332) size 113x51 [transform={m=((1.00,0.00)(0.00,1.00)) t=(350.00,360.00)}]
+      RenderSVGContainer {g} at (294,332) size 113x51 [transform={m=((1.00,0.00)(0.00,1.00)) t=(350.00,360.00)}]
         RenderSVGContainer {use} at (301,332) size 98x35
           RenderSVGContainer {g} at (301,332) size 98x35
             RenderSVGText {text} at (-49,0) size 98x35 contains 1 chunk(s)
               RenderSVGInlineText {#text} at (0,-28) size 98x35
                 chunk 1 (middle anchor) text run 1 at (-49.00,0.00) startOffset 0 endOffset 6 width 98.00: "sample"
-        RenderSVGText {text} at (-57,15) size 112x36 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-28) size 113x36
+        RenderSVGText {text} at (-57,15) size 113x36 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (1,-28) size 113x36
             chunk 1 (middle anchor) text run 1 at (-56.50,15.00) startOffset 0 endOffset 9 width 113.00: "Helvetica"
       RenderSVGContainer {g} at (-8,383) size 216x50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,410.00)}]
         RenderSVGText {text} at (-49,0) size 98x33 contains 1 chunk(s)
@@ -162,21 +162,21 @@ layer at (0,0) size 450x500
         RenderSVGText {text} at (-108,15) size 216x36 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-28) size 216x36
             chunk 1 (middle anchor) text run 1 at (-108.00,15.00) startOffset 0 endOffset 18 width 216.00: "Arial (underlined)"
-      RenderSVGContainer {g} at (179,380) size 91x53 [transform={m=((1.00,0.00)(0.00,1.00)) t=(225.00,410.00)}]
-        RenderSVGContainer {use} at (179,380) size 91x36
-          RenderSVGContainer {g} at (179,380) size 91x36
-            RenderSVGText {text} at (-46,0) size 90x36 contains 1 chunk(s)
-              RenderSVGInlineText {#text} at (0,-30) size 91x36
+      RenderSVGContainer {g} at (180,380) size 91x53 [transform={m=((1.00,0.00)(0.00,1.00)) t=(225.00,410.00)}]
+        RenderSVGContainer {use} at (180,380) size 91x36
+          RenderSVGContainer {g} at (180,380) size 91x36
+            RenderSVGText {text} at (-46,0) size 91x36 contains 1 chunk(s)
+              RenderSVGInlineText {#text} at (1,-30) size 91x36
                 chunk 1 (middle anchor) text run 1 at (-45.50,0.00) startOffset 0 endOffset 6 width 91.00: "sample"
         RenderSVGText {text} at (-41,15) size 82x36 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-28) size 82x36
             chunk 1 (middle anchor) text run 1 at (-41.00,15.00) startOffset 0 endOffset 6 width 82.00: "Impact"
-      RenderSVGContainer {g} at (189,382) size 321x51 [transform={m=((1.00,0.00)(0.00,1.00)) t=(350.00,410.00)}]
+      RenderSVGContainer {g} at (190,382) size 321x51 [transform={m=((1.00,0.00)(0.00,1.00)) t=(350.00,410.00)}]
         RenderSVGText {text} at (-42,0) size 84x36 contains 1 chunk(s)
           RenderSVGInline {tref} at (0,0) size 84x36
             RenderSVGInlineText {#text} at (0,-28) size 84x36
               chunk 1 (middle anchor) text run 1 at (-42.00,0.00) startOffset 0 endOffset 6 width 84.00: "sample"
-        RenderSVGText {text} at (-161,15) size 320x36 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-28) size 321x36
+        RenderSVGText {text} at (-161,15) size 321x36 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (1,-28) size 321x36
             chunk 1 (middle anchor) text run 1 at (-160.50,15.00) startOffset 0 endOffset 25 width 321.00: "AvantGarde (line-through)"
     RenderSVGContainer {use} at (0,0) size 0x0

diff --git a/LayoutTests/svg/batik/text/verticalText-expected.txt b/LayoutTests/svg/batik/text/verticalText-expected.txt
index 01a369a8d99be33570867ffa42591385596d9be2..15858a52ac9b639a0913b0cdf1a0515b5124a250 100644 (file)
--- a/LayoutTests/svg/batik/text/verticalText-expected.txt
+++ b/LayoutTests/svg/batik/text/verticalText-expected.txt
@@ -26,47 +26,47 @@ layer at (0,0) size 450x500
         RenderPath {line} at (299.50,75) size 1x375 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M300.00,75.00L300.00,450.00"]
         RenderPath {line} at (349.50,75) size 1x375 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M350.00,75.00L350.00,450.00"]
         RenderPath {line} at (399.50,75) size 1x375 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M400.00,75.00L400.00,450.00"]
-      RenderSVGText {text} at (42,92) size 21x391 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-13) size 20x391
+      RenderSVGText {text} at (42,92) size 16x391 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-13) size 16x391
           chunk 1 (vertical) text run 1 at (42.50,92.00) startOffset 0 endOffset 23 height 391.00: "Writing top to bottom\x{753B}\x{50CF}"
-      RenderSVGText {text} at (92,92) size 21x408 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-13) size 20x408
+      RenderSVGText {text} at (92,92) size 16x408 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-13) size 16x408
           chunk 1 (vertical) text run 1 at (92.50,92.00) startOffset 0 endOffset 24 height 408.00: "Glyph Orientation:auto\x{753B}\x{50CF}"
-      RenderSVGText {text} at (142,92) size 21x357 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-13) size 20x357
+      RenderSVGText {text} at (142,92) size 16x357 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-13) size 16x357
           chunk 1 (vertical) text run 1 at (142.50,92.00) startOffset 0 endOffset 21 height 357.00: "Glyph Orientation:0\x{753B}\x{50CF}"
-      RenderSVGText {text} at (192,92) size 21x374 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-13) size 20x374
+      RenderSVGText {text} at (192,92) size 16x374 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-13) size 16x374
           chunk 1 (vertical) text run 1 at (192.50,92.00) startOffset 0 endOffset 22 height 374.00: "Glyph Orientation:90\x{753B}\x{50CF}"
-      RenderSVGText {text} at (242,92) size 21x391 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-13) size 20x391
+      RenderSVGText {text} at (242,92) size 16x391 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-13) size 16x391
           chunk 1 (vertical) text run 1 at (242.50,92.00) startOffset 0 endOffset 23 height 391.00: "Glyph Orientation:180\x{753B}\x{50CF}"
-      RenderSVGText {text} at (292,92) size 21x391 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-13) size 20x391
+      RenderSVGText {text} at (292,92) size 16x391 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-13) size 16x391
           chunk 1 (vertical) text run 1 at (292.50,92.00) startOffset 0 endOffset 23 height 391.00: "Glyph Orientation:270\x{753B}\x{50CF}"
       RenderSVGText {text} at (344,92) size 12x408 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-13) size 8x153
+        RenderSVGInlineText {#text} at (0,-13) size 12x153
           chunk 1 (vertical) text run 1 at (344.00,92.00) startOffset 0 endOffset 9 height 153.00: "Embedded "
-        RenderSVGTSpan {tspan} at (0,0) size 10x119 [color=#FF0000]
-          RenderSVGInlineText {#text} at (2,140) size 10x119
+        RenderSVGTSpan {tspan} at (0,0) size 8x119 [color=#FF0000]
+          RenderSVGInlineText {#text} at (2,140) size 8x119
             chunk 1 (vertical) text run 2 at (346.00,245.00) startOffset 0 endOffset 7 height 119.00: "<tspan>"
-        RenderSVGInlineText {#text} at (0,259) size 8x136
+        RenderSVGInlineText {#text} at (0,259) size 12x136
           chunk 1 (vertical) text run 3 at (344.00,364.00) startOffset 0 endOffset 8 height 136.00: " element"
       RenderSVGText {text} at (394,92) size 12x459 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-13) size 8x153
+        RenderSVGInlineText {#text} at (0,-13) size 12x153
           chunk 1 (vertical) text run 1 at (394.00,92.00) startOffset 0 endOffset 9 height 153.00: "Embedded "
-        RenderSVGTSpan {tspan} at (0,0) size 10x170 [color=#0000FF]
-          RenderSVGInlineText {#text} at (2,140) size 10x170
+        RenderSVGTSpan {tspan} at (0,0) size 8x170 [color=#0000FF]
+          RenderSVGInlineText {#text} at (2,140) size 8x170
             chunk 1 (vertical) text run 2 at (396.00,245.00) startOffset 0 endOffset 10 height 170.00: "orientated"
-        RenderSVGInlineText {#text} at (0,310) size 8x136
+        RenderSVGInlineText {#text} at (0,310) size 12x136
           chunk 1 (vertical) text run 3 at (394.00,415.00) startOffset 0 endOffset 8 height 136.00: " element"
-      RenderSVGContainer {g} at (54.89,454) size 315.21x42 [transform={m=((1.00,0.00)(0.00,1.00)) t=(40.00,450.00)}]
+      RenderSVGContainer {g} at (42,454) size 328.11x43 [transform={m=((1.00,0.00)(0.00,1.00)) t=(40.00,450.00)}]
         RenderSVGContainer {use} at (54.89,457.29) size 315.21x30.43
           RenderSVGContainer {g} at (54.89,457.29) size 315.21x30.43
             RenderPath {path} at (54.89,457.29) size 315.21x30.43 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00C200.00,100.00,300.00,0.00,400.00,100.00C500.00,200.00,600.00,300.00,700.00,200.00C800.00,100.00,900.00,0.00,1000.00,100.00C1100.00,200.00,1200.00,300.00,1300.00,200.00C1400.00,100.00,1500.00,0.00,1600.00,100.00C1700.00,200.00,1800.00,300.00,1900.00,200.00C2000.00,100.00,2100.00,0.00,2200.00,100.00"]
-        RenderSVGText {text} at (15,15) size 289x42 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 289x42
-            RenderSVGInlineText {#text} at (0,-10) size 288x41
+        RenderSVGText {text} at (15,15) size 297x43 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 297x43
+            RenderSVGInlineText {#text} at (-13,-11) size 297x43
               chunk 1 (vertical) text run 1 at (15.47,15.79) startOffset 0 endOffset 25 height 350.00: "Vertical text on a Path\x{753B}\x{50CF}"
           RenderSVGInlineText {#text} at (0,0) size 0x0
     RenderSVGContainer {use} at (0,0) size 0x0

diff --git a/LayoutTests/svg/batik/text/verticalTextOnPath-expected.txt b/LayoutTests/svg/batik/text/verticalTextOnPath-expected.txt
index c7b756e66710be884265a0002c5e32e57f6ddefa..da5546aae640c04421b12352e266bbab59d29cb7 100644 (file)
--- a/LayoutTests/svg/batik/text/verticalTextOnPath-expected.txt
+++ b/LayoutTests/svg/batik/text/verticalTextOnPath-expected.txt
@@ -1,27 +1,27 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 450x500
-  RenderSVGRoot {svg} at (14.89,26) size 432.11x623
-    RenderSVGContainer {g} at (14.89,26) size 432.11x623
+  RenderSVGRoot {svg} at (1,26) size 446x624
+    RenderSVGContainer {g} at (1,26) size 446x624
       RenderSVGText {text} at (134,40) size 182x17 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-14) size 182x17
           chunk 1 (middle anchor) text run 1 at (134.00,40.00) startOffset 0 endOffset 28 width 182.00: "Vertical text on a path test"
       RenderSVGHiddenContainer {defs} at (0,0) size 0x0
         RenderPath {path} at (14.95,7.04) size 120.05x30.91 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF]}] [data="M100.00,200.00C200.00,100.00,300.00,0.00,400.00,100.00C500.00,200.00,600.00,300.00,700.00,200.00C800.00,100.00,900.00,100.00,900.00,100.00"]
         RenderPath {path} at (29.85,12.25) size 90.30x37.75 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF]}] [data="M100.00,100.00C100.00,0.00,400.00,0.00,400.00,100.00"]
-      RenderSVGContainer {g} at (14.89,74) size 120.11x129 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,70.00)}]
+      RenderSVGContainer {g} at (1,75) size 134x128 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,70.00)}]
         RenderSVGContainer {use} at (14.89,77.29) size 120.11x30.43
           RenderSVGContainer {g} at (14.89,77.29) size 120.11x30.43
             RenderPath {path} at (14.89,77.29) size 120.11x30.43 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00C200.00,100.00,300.00,0.00,400.00,100.00C500.00,200.00,600.00,300.00,700.00,200.00C800.00,100.00,900.00,100.00,900.00,100.00"]
-        RenderSVGText {text} at (16,17) size 110x129 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 110x129
-            RenderSVGInlineText {#text} at (0,-12) size 61x37
+        RenderSVGText {text} at (16,17) size 124x128 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 124x128
+            RenderSVGInlineText {#text} at (-15,-12) size 89x41
               chunk 1 (vertical) text run 1 at (16.55,17.65) startOffset 0 endOffset 5 height 85.00: "Text "
-            RenderSVGTSpan {tspan} at (0,0) size 22x25 [color=#FF0000]
-              RenderSVGInlineText {#text} at (82,6) size 22x24
+            RenderSVGTSpan {tspan} at (0,0) size 18x32 [color=#FF0000]
+              RenderSVGInlineText {#text} at (79,0) size 18x32
                 chunk 1 (vertical) text run 2 at (98.08,36.91) startOffset 0 endOffset 2 height 34.00: "on"
-            RenderSVGTSpan {tspan} at (0,0) size 10x119
-              RenderSVGInlineText {#text} at (100,-2) size 10x119
+            RenderSVGTSpan {tspan} at (0,0) size 16x119
+              RenderSVGInlineText {#text} at (93,-3) size 16x119
                 chunk 1 (vertical) text run 3 at (116.63,27.37) startOffset 0 endOffset 7 height 119.00: " a Path"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (35,60) size 68x13 contains 1 chunk(s)
@@ -33,19 +33,19 @@ layer at (0,0) size 450x500
         RenderSVGText {text} at (35,80) size 100x13 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-10) size 100x13
             chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 24 width 100.00: "glyph-orientation=\"auto\""
-      RenderSVGContainer {g} at (146,65) size 141x119 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,70.00)}]
+      RenderSVGContainer {g} at (146,66) size 141x119 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,70.00)}]
         RenderSVGContainer {use} at (164.89,77.29) size 120.11x30.43
           RenderSVGContainer {g} at (164.89,77.29) size 120.11x30.43
             RenderPath {path} at (164.89,77.29) size 120.11x30.43 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00C200.00,100.00,300.00,0.00,400.00,100.00C500.00,200.00,600.00,300.00,700.00,200.00C800.00,100.00,900.00,100.00,900.00,100.00"]
-        RenderSVGText {text} at (-5,8) size 114x119 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 114x119
-            RenderSVGInlineText {#text} at (0,-12) size 6x85
+        RenderSVGText {text} at (-5,8) size 109x119 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 109x119
+            RenderSVGInlineText {#text} at (1,-12) size 9x85
               chunk 1 (middle anchor, vertical) text run 1 at (-4.50,8.50) startOffset 0 endOffset 5 height 85.00: "Text "
-            RenderSVGTSpan {tspan} at (0,0) size 8x34 [color=#FF0000]
-              RenderSVGInlineText {#text} at (11,72) size 8x34
+            RenderSVGTSpan {tspan} at (0,0) size 8x35 [color=#FF0000]
+              RenderSVGInlineText {#text} at (11,72) size 8x35
                 chunk 1 (middle anchor, vertical) text run 2 at (6.00,93.50) startOffset 0 endOffset 2 height 34.00: "on"
-            RenderSVGTSpan {tspan} at (0,0) size 91x44
-              RenderSVGInlineText {#text} at (24,-3) size 91x44
+            RenderSVGTSpan {tspan} at (0,0) size 101x44
+              RenderSVGInlineText {#text} at (9,-3) size 101x44
                 chunk 1 (middle anchor, vertical) text run 3 at (19.05,17.65) startOffset 0 endOffset 7 height 119.00: " a Path"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (35,60) size 68x13 contains 1 chunk(s)
@@ -57,19 +57,19 @@ layer at (0,0) size 450x500
         RenderSVGText {text} at (35,80) size 102x13 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-10) size 102x13
             chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 24 width 102.00: "glyph-orientation=\"0deg\""
-      RenderSVGContainer {g} at (296,65) size 151x170 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,70.00)}]
+      RenderSVGContainer {g} at (296,66) size 151x170 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,70.00)}]
         RenderSVGContainer {use} at (314.89,77.29) size 120.11x30.43
           RenderSVGContainer {g} at (314.89,77.29) size 120.11x30.43
             RenderPath {path} at (314.89,77.29) size 120.11x30.43 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00C200.00,100.00,300.00,0.00,400.00,100.00C500.00,200.00,600.00,300.00,700.00,200.00C800.00,100.00,900.00,100.00,900.00,100.00"]
-        RenderSVGText {text} at (-5,8) size 74x170 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 74x170
-            RenderSVGInlineText {#text} at (0,-12) size 6x85
+        RenderSVGText {text} at (-5,8) size 87x170 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 87x170
+            RenderSVGInlineText {#text} at (1,-12) size 9x85
               chunk 1 (end anchor, vertical) text run 1 at (-4.50,8.50) startOffset 0 endOffset 5 height 85.00: "Text "
-            RenderSVGTSpan {tspan} at (0,0) size 8x34 [color=#FF0000]
-              RenderSVGInlineText {#text} at (11,72) size 8x34
+            RenderSVGTSpan {tspan} at (0,0) size 8x35 [color=#FF0000]
+              RenderSVGInlineText {#text} at (11,72) size 8x35
                 chunk 1 (end anchor, vertical) text run 2 at (6.00,93.50) startOffset 0 endOffset 2 height 34.00: "on"
-            RenderSVGTSpan {tspan} at (0,0) size 73x160
-              RenderSVGInlineText {#text} at (1,-2) size 73x159
+            RenderSVGTSpan {tspan} at (0,0) size 86x160
+              RenderSVGInlineText {#text} at (2,-2) size 86x160
                 chunk 1 (end anchor, vertical) text run 3 at (-3.50,18.66) startOffset 0 endOffset 7 height 119.00: " a Path"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (35,60) size 73x13 contains 1 chunk(s)
@@ -85,14 +85,14 @@ layer at (0,0) size 450x500
         RenderSVGContainer {use} at (14.89,177.29) size 120.11x30.43
           RenderSVGContainer {g} at (14.89,177.29) size 120.11x30.43
             RenderPath {path} at (14.89,177.29) size 120.11x30.43 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00C200.00,100.00,300.00,0.00,400.00,100.00C500.00,200.00,600.00,300.00,700.00,200.00C800.00,100.00,900.00,100.00,900.00,100.00"]
-        RenderSVGText {text} at (74,26) size 63x187 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 63x187
-            RenderSVGInlineText {#text} at (0,-12) size 50x35
+        RenderSVGText {text} at (74,26) size 61x187 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 61x187
+            RenderSVGInlineText {#text} at (3,-13) size 49x37
               chunk 1 (vertical) text run 1 at (74.72,26.10) startOffset 0 endOffset 5 height 85.00: "Text "
-            RenderSVGTSpan {tspan} at (0,0) size 8x34 [color=#FF0000]
-              RenderSVGInlineText {#text} at (55,21) size 8x34
+            RenderSVGTSpan {tspan} at (0,0) size 9x34 [color=#FF0000]
+              RenderSVGInlineText {#text} at (55,21) size 9x34
                 chunk 1 (vertical) text run 2 at (129.61,60.10) startOffset 0 endOffset 2 height 34.00: "on"
-            RenderSVGTSpan {tspan} at (0,0) size 10x119
+            RenderSVGTSpan {tspan} at (0,0) size 9x119
               RenderSVGInlineText {#text} at (45,55) size 9x119
                 chunk 1 (vertical) text run 3 at (119.61,94.10) startOffset 0 endOffset 7 height 119.00: " a Path"
           RenderSVGInlineText {#text} at (0,0) size 0x0
@@ -105,19 +105,19 @@ layer at (0,0) size 450x500
         RenderSVGText {text} at (35,80) size 112x13 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-10) size 112x13
             chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 26 width 112.00: "glyph-orientation=\"270deg\""
-      RenderSVGContainer {g} at (146,165) size 141x88 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,170.00)}]
+      RenderSVGContainer {g} at (146,166) size 141x87 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,170.00)}]
         RenderSVGContainer {use} at (164.89,177.29) size 120.11x30.43
           RenderSVGContainer {g} at (164.89,177.29) size 120.11x30.43
             RenderPath {path} at (164.89,177.29) size 120.11x30.43 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00C200.00,100.00,300.00,0.00,400.00,100.00C500.00,200.00,600.00,300.00,700.00,200.00C800.00,100.00,900.00,100.00,900.00,100.00"]
-        RenderSVGText {text} at (-5,8) size 133x86 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 133x86
-            RenderSVGInlineText {#text} at (0,-12) size 43x51
+        RenderSVGText {text} at (-5,8) size 132x85 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 132x85
+            RenderSVGInlineText {#text} at (1,-12) size 40x51
               chunk 1 (middle anchor, vertical) text run 1 at (-4.50,8.50) startOffset 0 endOffset 5 height 85.00: "Text "
-            RenderSVGTSpan {tspan} at (0,0) size 21x28 [color=#FF0000]
-              RenderSVGInlineText {#text} at (64,-2) size 20x27
+            RenderSVGTSpan {tspan} at (0,0) size 30x36 [color=#FF0000]
+              RenderSVGInlineText {#text} at (65,3) size 30x36
                 chunk 1 (middle anchor, vertical) text run 2 at (59.23,18.66) startOffset 0 endOffset 2 height 34.00: "on"
-            RenderSVGTSpan {tspan} at (0,0) size 52x68
-              RenderSVGInlineText {#text} at (82,5) size 52x68
+            RenderSVGTSpan {tspan} at (0,0) size 49x70
+              RenderSVGInlineText {#text} at (84,3) size 49x70
                 chunk 1 (middle anchor, vertical) text run 3 at (77.22,26.10) startOffset 0 endOffset 7 height 119.00: " a Path"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (35,60) size 73x13 contains 1 chunk(s)
@@ -129,19 +129,19 @@ layer at (0,0) size 450x500
         RenderSVGText {text} at (35,80) size 102x13 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-10) size 102x13
             chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 24 width 102.00: "glyph-orientation=\"0deg\""
-      RenderSVGContainer {g} at (296,165) size 146x102 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,170.00)}]
+      RenderSVGContainer {g} at (296,166) size 146x102 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,170.00)}]
         RenderSVGContainer {use} at (314.89,177.29) size 120.11x30.43
           RenderSVGContainer {g} at (314.89,177.29) size 120.11x30.43
             RenderPath {path} at (314.89,177.29) size 120.11x30.43 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00C200.00,100.00,300.00,0.00,400.00,100.00C500.00,200.00,600.00,300.00,700.00,200.00C800.00,100.00,900.00,100.00,900.00,100.00"]
-        RenderSVGText {text} at (-5,8) size 134x102 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 134x102
-            RenderSVGInlineText {#text} at (0,-12) size 6x85
+        RenderSVGText {text} at (-5,8) size 133x102 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 133x102
+            RenderSVGInlineText {#text} at (1,-12) size 9x85
               chunk 1 (end anchor, vertical) text run 1 at (-4.50,8.50) startOffset 0 endOffset 5 height 85.00: "Text "
-            RenderSVGTSpan {tspan} at (0,0) size 33x82 [color=#FF0000]
-              RenderSVGInlineText {#text} at (11,7) size 33x82
+            RenderSVGTSpan {tspan} at (0,0) size 26x90 [color=#FF0000]
+              RenderSVGInlineText {#text} at (11,0) size 26x90
                 chunk 1 (end anchor, vertical) text run 2 at (6.00,28.12) startOffset 0 endOffset 2 height 34.00: "on"
-            RenderSVGTSpan {tspan} at (0,0) size 93x42
-              RenderSVGInlineText {#text} at (42,-2) size 92x41
+            RenderSVGTSpan {tspan} at (0,0) size 100x45
+              RenderSVGInlineText {#text} at (34,-3) size 100x45
                 chunk 1 (end anchor, vertical) text run 3 at (37.84,18.71) startOffset 0 endOffset 7 height 119.00: " a Path"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (35,60) size 78x13 contains 1 chunk(s)
@@ -153,19 +153,19 @@ layer at (0,0) size 450x500
         RenderSVGText {text} at (35,80) size 107x13 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-10) size 107x13
             chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 25 width 107.00: "glyph-orientation=\"90deg\""
-      RenderSVGContainer {g} at (14.89,274) size 132.11x162 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,270.00)}]
+      RenderSVGContainer {g} at (14.89,275) size 132.11x162 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,270.00)}]
         RenderSVGContainer {use} at (14.89,277.29) size 120.11x30.43
           RenderSVGContainer {g} at (14.89,277.29) size 120.11x30.43
             RenderPath {path} at (14.89,277.29) size 120.11x30.43 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00C200.00,100.00,300.00,0.00,400.00,100.00C500.00,200.00,600.00,300.00,700.00,200.00C800.00,100.00,900.00,100.00,900.00,100.00"]
         RenderSVGText {text} at (46,17) size 89x162 contains 1 chunk(s)
           RenderSVGTextPath {textPath} at (0,0) size 89x162
-            RenderSVGInlineText {#text} at (0,-12) size 62x43
+            RenderSVGInlineText {#text} at (1,-12) size 58x44
               chunk 1 (vertical) text run 1 at (46.63,17.90) startOffset 0 endOffset 5 height 85.00: "Text "
-            RenderSVGTSpan {tspan} at (0,0) size 8x34 [color=#FF0000]
-              RenderSVGInlineText {#text} at (81,-3) size 8x34
+            RenderSVGTSpan {tspan} at (0,0) size 19x40 [color=#FF0000]
+              RenderSVGInlineText {#text} at (71,-9) size 19x40
                 chunk 1 (vertical) text run 2 at (127.54,26.96) startOffset 0 endOffset 2 height 34.00: "on"
-            RenderSVGTSpan {tspan} at (0,0) size 10x119
-              RenderSVGInlineText {#text} at (71,30) size 10x119
+            RenderSVGTSpan {tspan} at (0,0) size 9x120
+              RenderSVGInlineText {#text} at (71,30) size 9x120
                 chunk 1 (vertical) text run 3 at (117.54,60.96) startOffset 0 endOffset 7 height 119.00: " a Path"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (35,60) size 65x13 contains 1 chunk(s)
@@ -177,19 +177,19 @@ layer at (0,0) size 450x500
         RenderSVGText {text} at (35,80) size 112x13 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-10) size 112x13
             chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 26 width 112.00: "glyph-orientation=\"180deg\""
-      RenderSVGContainer {g} at (146,265) size 139x85 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,270.00)}]
+      RenderSVGContainer {g} at (146,266) size 139x85 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,270.00)}]
         RenderSVGContainer {use} at (164.89,277.29) size 120.11x30.43
           RenderSVGContainer {g} at (164.89,277.29) size 120.11x30.43
             RenderPath {path} at (164.89,277.29) size 120.11x30.43 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00C200.00,100.00,300.00,0.00,400.00,100.00C500.00,200.00,600.00,300.00,700.00,200.00C800.00,100.00,900.00,100.00,900.00,100.00"]
-        RenderSVGText {text} at (-5,8) size 131x85 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 131x85
-            RenderSVGInlineText {#text} at (0,-12) size 6x85
+        RenderSVGText {text} at (-5,8) size 130x85 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 130x85
+            RenderSVGInlineText {#text} at (1,-12) size 9x85
               chunk 1 (middle anchor, vertical) text run 1 at (-4.50,8.50) startOffset 0 endOffset 5 height 85.00: "Text "
-            RenderSVGTSpan {tspan} at (0,0) size 21x27 [color=#FF0000]
-              RenderSVGInlineText {#text} at (32,0) size 21x27
+            RenderSVGTSpan {tspan} at (0,0) size 34x29 [color=#FF0000]
+              RenderSVGInlineText {#text} at (15,-7) size 34x29
                 chunk 1 (middle anchor, vertical) text run 2 at (27.77,21.16) startOffset 0 endOffset 2 height 34.00: "on"
-            RenderSVGTSpan {tspan} at (0,0) size 78x44
-              RenderSVGInlineText {#text} at (54,-3) size 78x43
+            RenderSVGTSpan {tspan} at (0,0) size 76x44
+              RenderSVGInlineText {#text} at (55,-3) size 76x44
                 chunk 1 (middle anchor, vertical) text run 3 at (49.13,17.90) startOffset 0 endOffset 7 height 119.00: " a Path"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (35,60) size 65x13 contains 1 chunk(s)
@@ -198,19 +198,19 @@ layer at (0,0) size 450x500
         RenderSVGText {text} at (35,70) size 86x13 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-10) size 86x13
             chunk 1 text run 1 at (35.00,70.00) startOffset 0 endOffset 20 width 86.00: "text-anchor=\"middle\""
-      RenderSVGContainer {g} at (296,265) size 146x204 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,270.00)}]
+      RenderSVGContainer {g} at (296,266) size 146x204 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,270.00)}]
         RenderSVGContainer {use} at (314.89,277.29) size 120.11x30.43
           RenderSVGContainer {g} at (314.89,277.29) size 120.11x30.43
             RenderPath {path} at (314.89,277.29) size 120.11x30.43 [transform={m=((0.15,0.00)(0.00,0.15)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,200.00C200.00,100.00,300.00,0.00,400.00,100.00C500.00,200.00,600.00,300.00,700.00,200.00C800.00,100.00,900.00,100.00,900.00,100.00"]
-        RenderSVGText {text} at (-5,8) size 42x204 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 42x204
-            RenderSVGInlineText {#text} at (0,-12) size 6x85
+        RenderSVGText {text} at (-5,8) size 39x204 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 39x204
+            RenderSVGInlineText {#text} at (1,-12) size 9x85
               chunk 1 (end anchor, vertical) text run 1 at (-4.50,8.50) startOffset 0 endOffset 5 height 85.00: "Text "
-            RenderSVGTSpan {tspan} at (0,0) size 8x34 [color=#FF0000]
-              RenderSVGInlineText {#text} at (11,72) size 8x34
+            RenderSVGTSpan {tspan} at (0,0) size 8x35 [color=#FF0000]
+              RenderSVGInlineText {#text} at (11,72) size 8x35
                 chunk 1 (end anchor, vertical) text run 2 at (6.00,93.50) startOffset 0 endOffset 2 height 34.00: "on"
-            RenderSVGTSpan {tspan} at (0,0) size 42x191
-              RenderSVGInlineText {#text} at (1,0) size 42x191
+            RenderSVGTSpan {tspan} at (0,0) size 39x193
+              RenderSVGInlineText {#text} at (1,-1) size 39x193
                 chunk 1 (end anchor, vertical) text run 3 at (-4.00,21.16) startOffset 0 endOffset 7 height 119.00: " a Path"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (35,60) size 65x13 contains 1 chunk(s)
@@ -222,21 +222,21 @@ layer at (0,0) size 450x500
         RenderSVGText {text} at (35,80) size 107x13 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-10) size 107x13
             chunk 1 text run 1 at (35.00,80.00) startOffset 0 endOffset 25 width 107.00: "glyph-orientation=\"90deg\""
-      RenderSVGContainer {g} at (30,370.67) size 103x261.33 [transform={m=((1.00,0.00)(0.00,1.00)) t=(10.00,370.00)}]
+      RenderSVGContainer {g} at (25,370.67) size 123x262.33 [transform={m=((1.00,0.00)(0.00,1.00)) t=(10.00,370.00)}]
         RenderSVGContainer {use} at (39.70,370.67) size 90.60x49.33
           RenderSVGContainer {g} at (39.70,370.67) size 90.60x49.33
             RenderPath {path} at (39.70,370.67) size 90.60x49.33 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,100.00C100.00,0.00,400.00,0.00,400.00,100.00"]
-        RenderSVGText {text} at (34,21) size 89x254 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 89x254
-            RenderSVGTSpan {tspan} at (0,0) size 54x46 [color=#008000]
-              RenderSVGInlineText {#text} at (0,-12) size 53x45
+        RenderSVGText {text} at (34,21) size 123x256 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 123x256
+            RenderSVGTSpan {tspan} at (0,0) size 77x51 [color=#008000]
+              RenderSVGInlineText {#text} at (-19,-14) size 77x51
                 chunk 1 (vertical) text run 1 at (34.73,21.30) startOffset 0 endOffset 5 height 85.00: "super"
-            RenderSVGInlineText {#text} at (65,-6) size 22x78
+            RenderSVGInlineText {#text} at (68,-4) size 36x76
               chunk 1 (vertical) text run 2 at (99.82,27.69) startOffset 0 endOffset 5 height 85.00: " and "
-            RenderSVGTSpan {tspan} at (0,0) size 9x51 [color=#FF0000]
-              RenderSVGInlineText {#text} at (73,71) size 9x51
+            RenderSVGTSpan {tspan} at (0,0) size 8x52 [color=#FF0000]
+              RenderSVGInlineText {#text} at (73,71) size 8x52
                 chunk 1 (vertical) text run 3 at (107.34,105.89) startOffset 0 endOffset 3 height 51.00: "sub"
-            RenderSVGInlineText {#text} at (81,122) size 8x119
+            RenderSVGInlineText {#text} at (81,122) size 9x120
               chunk 1 (vertical) text run 4 at (115.84,156.89) startOffset 0 endOffset 7 height 119.00: "scripts"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (20,65) size 88x13 contains 1 chunk(s)
@@ -248,19 +248,19 @@ layer at (0,0) size 450x500
         RenderSVGText {text} at (20,85) size 100x13 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-10) size 100x13
             chunk 1 text run 1 at (20.00,85.00) startOffset 0 endOffset 24 width 100.00: "glyph-orientation=\"auto\""
-      RenderSVGContainer {g} at (320,370.67) size 103x278.33 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,370.00)}]
+      RenderSVGContainer {g} at (308,370.67) size 130x279.33 [transform={m=((1.00,0.00)(0.00,1.00)) t=(300.00,370.00)}]
         RenderSVGContainer {use} at (329.70,370.67) size 90.60x49.33
           RenderSVGContainer {g} at (329.70,370.67) size 90.60x49.33
             RenderPath {path} at (329.70,370.67) size 90.60x49.33 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,100.00C100.00,0.00,400.00,0.00,400.00,100.00"]
-        RenderSVGText {text} at (29,21) size 94x271 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 94x271
-            RenderSVGTSpan {tspan} at (0,0) size 94x50 [color=#008000]
-              RenderSVGInlineText {#text} at (0,-12) size 93x50
+        RenderSVGText {text} at (29,21) size 130x272 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 130x272
+            RenderSVGTSpan {tspan} at (0,0) size 130x62 [color=#008000]
+              RenderSVGInlineText {#text} at (-21,-13) size 130x62
                 chunk 1 (vertical) text run 1 at (29.93,21.30) startOffset 0 endOffset 8 height 136.00: "positive"
-            RenderSVGInlineText {#text} at (83,37) size 6x85
+            RenderSVGInlineText {#text} at (83,37) size 9x86
               chunk 1 (vertical) text run 2 at (112.84,71.89) startOffset 0 endOffset 5 height 85.00: " and "
-            RenderSVGTSpan {tspan} at (0,0) size 9x136 [color=#FF0000]
-              RenderSVGInlineText {#text} at (80,122) size 9x136
+            RenderSVGTSpan {tspan} at (0,0) size 9x137 [color=#FF0000]
+              RenderSVGInlineText {#text} at (80,122) size 9x137
                 chunk 1 (vertical) text run 3 at (109.84,156.89) startOffset 0 endOffset 8 height 136.00: "negative"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderSVGText {text} at (20,65) size 97x13 contains 1 chunk(s)
@@ -269,18 +269,18 @@ layer at (0,0) size 450x500
         RenderSVGText {text} at (20,75) size 100x13 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-10) size 100x13
             chunk 1 text run 1 at (20.00,75.00) startOffset 0 endOffset 24 width 100.00: "glyph-orientation=\"auto\""
-      RenderSVGContainer {g} at (180,358.75) size 100x265.50 [transform={m=((1.00,0.00)(0.00,1.00)) t=(180.00,370.00)}]
-        RenderSVGContainer {g} at (183.75,358.75) size 89.25x265.50 [transform={m=((0.75,0.00)(0.00,0.75)) t=(0.00,0.00)}]
+      RenderSVGContainer {g} at (180,358.75) size 107.25x266.25 [transform={m=((1.00,0.00)(0.00,1.00)) t=(180.00,370.00)}]
+        RenderSVGContainer {g} at (183.75,358.75) size 103.50x266.25 [transform={m=((0.75,0.00)(0.00,0.75)) t=(0.00,0.00)}]
           RenderSVGContainer {use} at (202.27,370.50) size 67.95x37
             RenderSVGContainer {g} at (202.27,370.50) size 67.95x37
               RenderPath {path} at (202.27,370.50) size 67.95x37 [transform={m=((0.30,0.00)(0.00,0.50)) t=(0.00,0.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=2.00]}] [data="M100.00,100.00C100.00,0.00,400.00,0.00,400.00,100.00"]
-          RenderSVGText {text} at (5,3) size 119x354 contains 1 chunk(s)
-            RenderSVGInlineText {#text} at (0,-18) size 7x276
+          RenderSVGText {text} at (5,3) size 138x355 contains 1 chunk(s)
+            RenderSVGInlineText {#text} at (0,-18) size 10x276
               chunk 1 (vertical) text run 1 at (5.00,3.00) startOffset 0 endOffset 12 height 276.00: "before path "
-            RenderSVGTextPath {textPath} at (0,0) size 91x92 [color=#FF0000]
-              RenderSVGInlineText {#text} at (28,3) size 91x92
+            RenderSVGTextPath {textPath} at (0,0) size 133x92 [color=#FF0000]
+              RenderSVGInlineText {#text} at (5,3) size 133x92
                 chunk 1 (vertical) text run 2 at (33.14,24.21) startOffset 0 endOffset 7 height 161.00: "on path"
-            RenderSVGInlineText {#text} at (107,106) size 12x230
+            RenderSVGInlineText {#text} at (107,106) size 10x231
               chunk 1 (vertical) text run 3 at (112.22,127.87) startOffset 0 endOffset 10 height 230.00: "after path"
         RenderSVGText {text} at (0,100) size 98x13 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-10) size 98x13

diff --git a/LayoutTests/svg/text/text-align-01-b-expected.txt b/LayoutTests/svg/text/text-align-01-b-expected.txt
index ab2706bebac635892b8d0dca5a0c36073faadaad..4dceae4d54a9a54872c1f8a38046bece7d8a22da 100644 (file)
--- a/LayoutTests/svg/text/text-align-01-b-expected.txt
+++ b/LayoutTests/svg/text/text-align-01-b-expected.txt
@@ -19,11 +19,11 @@ layer at (0,0) size 800x600
           RenderSVGText {text} at (0,0) size 217x33 contains 1 chunk(s) [color=#FF0000]
             RenderSVGInlineText {#text} at (0,-27) size 217x33
               chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 17 width 217.00: "text-anchor:start"
-        RenderSVGContainer {g} at (175.00,338.33) size 415x55 [transform={m=((1.00,0.00)(0.00,1.00)) t=(230.00,230.00)}]
+        RenderSVGContainer {g} at (176.67,338.33) size 415x55 [transform={m=((1.00,0.00)(0.00,1.00)) t=(230.00,230.00)}]
           RenderPath {line} at (341.67,382.50) size 83.33x1.67 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#000000]}] [data="M-25.00,0.00L25.00,0.00"]
           RenderPath {circle} at (378.33,378.33) size 10x10 [fill={[type=SOLID] [color=#000000]}] [data="M3.00,0.00L2.99,0.19L2.98,0.38L2.95,0.56L2.91,0.75L2.85,0.93L2.79,1.10L2.71,1.28L2.63,1.45L2.53,1.61L2.43,1.76L2.31,1.91L2.19,2.05L2.05,2.19L1.91,2.31L1.76,2.43L1.61,2.53L1.45,2.63L1.28,2.71L1.10,2.79L0.93,2.85L0.75,2.91L0.56,2.95L0.38,2.98L0.19,2.99L0.00,3.00L-0.19,2.99L-0.38,2.98L-0.56,2.95L-0.75,2.91L-0.93,2.85L-1.10,2.79L-1.28,2.71L-1.45,2.63L-1.61,2.53L-1.76,2.43L-1.91,2.31L-2.05,2.19L-2.19,2.05L-2.31,1.91L-2.43,1.76L-2.53,1.61L-2.63,1.45L-2.71,1.28L-2.79,1.10L-2.85,0.93L-2.91,0.75L-2.95,0.56L-2.98,0.38L-2.99,0.19L-3.00,0.00L-2.99,-0.19L-2.98,-0.38L-2.95,-0.56L-2.91,-0.75L-2.85,-0.93L-2.79,-1.10L-2.71,-1.28L-2.63,-1.45L-2.53,-1.61L-2.43,-1.76L-2.31,-1.91L-2.19,-2.05L-2.05,-2.19L-1.91,-2.31L-1.76,-2.43L-1.61,-2.53L-1.45,-2.63L-1.28,-2.71L-1.10,-2.79L-0.93,-2.85L-0.75,-2.91L-0.56,-2.95L-0.38,-2.98L-0.19,-2.99L-0.00,-3.00L0.19,-2.99L0.38,-2.98L0.56,-2.95L0.75,-2.91L0.93,-2.85L1.10,-2.79L1.28,-2.71L1.45,-2.63L1.61,-2.53L1.76,-2.43L1.91,-2.31L2.05,-2.19L2.19,-2.05L2.31,-1.91L2.43,-1.76L2.53,-1.61L2.63,-1.45L2.71,-1.28L2.79,-1.10L2.85,-0.93L2.91,-0.75L2.95,-0.56L2.98,-0.38L2.99,-0.19"]
-          RenderSVGText {text} at (-125,0) size 248x33 contains 1 chunk(s) [color=#008000]
-            RenderSVGInlineText {#text} at (0,-27) size 249x33
+          RenderSVGText {text} at (-125,0) size 249x33 contains 1 chunk(s) [color=#008000]
+            RenderSVGInlineText {#text} at (1,-27) size 249x33
               chunk 1 (middle anchor) text run 1 at (-124.50,0.00) startOffset 0 endOffset 18 width 249.00: "text-anchor:middle"
         RenderSVGContainer {g} at (33.33,421.67) size 355x55 [transform={m=((1.00,0.00)(0.00,1.00)) t=(230.00,280.00)}]
           RenderPath {line} at (300.00,465.83) size 83.33x1.67 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#000000]}] [data="M-50.00,0.00L0.00,0.00"]

diff --git a/LayoutTests/svg/text/text-align-02-b-expected.txt b/LayoutTests/svg/text/text-align-02-b-expected.txt
index f59eeb3af0f6997b96268cf4a2bb66e8bf06a020..09bb35565710d0874c314e11301f0beac56856eb 100644 (file)
--- a/LayoutTests/svg/text/text-align-02-b-expected.txt
+++ b/LayoutTests/svg/text/text-align-02-b-expected.txt
@@ -2,16 +2,16 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderSVGRoot {svg} at (0.83,0.83) size 798.33x598.33
-    RenderSVGContainer {g} at (8.33,15) size 778.33x455
+    RenderSVGContainer {g} at (8.33,15) size 778.33x456.67
       RenderSVGText {text} at (5,40) size 467x38 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-31) size 467x38
           chunk 1 text run 1 at (5.00,40.00) startOffset 0 endOffset 34 width 467.00: "Test 'baseline-shift' (horizontal)"
-      RenderSVGContainer {g} at (25,143.33) size 673.33x326.67 [transform={m=((1.00,0.00)(0.00,1.00)) t=(15.00,120.00)}]
+      RenderSVGContainer {g} at (25,143.33) size 673.33x328.33 [transform={m=((1.00,0.00)(0.00,1.00)) t=(15.00,120.00)}]
         RenderSVGText {text} at (0,-7) size 350x40 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-20) size 98x33
             chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 6 width 98.00: "Normal"
-          RenderSVGTSpan {tspan} at (0,0) size 204x33 [color=#FF0000]
-            RenderSVGInlineText {#text} at (98,-27) size 204x33
+          RenderSVGTSpan {tspan} at (0,0) size 204x34 [color=#FF0000]
+            RenderSVGInlineText {#text} at (98,-27) size 204x34
               chunk 1 text run 2 at (98.00,-7.00) startOffset 0 endOffset 16 width 204.00: "baseline-shift:7"
           RenderSVGInlineText {#text} at (302,-20) size 48x33
             chunk 1 text run 3 at (302.00,0.00) startOffset 0 endOffset 4 width 48.00: "text"
@@ -23,14 +23,14 @@ layer at (0,0) size 800x600
               chunk 1 text run 2 at (98.00,91.00) startOffset 0 endOffset 19 width 258.00: "baseline-shift:-70%"
           RenderSVGInlineText {#text} at (356,-27) size 48x33
             chunk 1 text run 3 at (356.00,70.00) startOffset 0 endOffset 4 width 48.00: "text"
-        RenderSVGText {text} at (0,123) size 271x66 contains 1 chunk(s)
+        RenderSVGText {text} at (0,123) size 271x67 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-10) size 98x33
             chunk 1 text run 1 at (0.00,140.00) startOffset 0 endOffset 6 width 98.00: "Normal"
-          RenderSVGTSpan {tspan} at (0,0) size 49x33 [color=#FF0000]
-            RenderSVGInlineText {#text} at (98,6) size 49x33
+          RenderSVGTSpan {tspan} at (0,0) size 49x34 [color=#FF0000]
+            RenderSVGInlineText {#text} at (98,6) size 49x34
               chunk 1 text run 2 at (98.00,156.50) startOffset 0 endOffset 3 width 49.00: "sub"
-          RenderSVGTSpan {tspan} at (0,0) size 76x33 [color=#008000]
-            RenderSVGInlineText {#text} at (147,-26) size 76x33
+          RenderSVGTSpan {tspan} at (0,0) size 76x34 [color=#008000]
+            RenderSVGInlineText {#text} at (147,-27) size 76x34
               chunk 1 text run 3 at (147.00,123.50) startOffset 0 endOffset 5 width 76.00: "super"
           RenderSVGTSpan {tspan} at (0,0) size 25x33 [color=#0000FF]
             RenderSVGInlineText {#text} at (223,-10) size 25x33

diff --git a/LayoutTests/svg/text/text-align-05-b-expected.txt b/LayoutTests/svg/text/text-align-05-b-expected.txt
index d146bb3386be5f7c40ceecfbd2f3dc40be027138..d8c43d475e5bff03ef070a143825ff023fe47d82 100644 (file)
--- a/LayoutTests/svg/text/text-align-05-b-expected.txt
+++ b/LayoutTests/svg/text/text-align-05-b-expected.txt
@@ -6,22 +6,22 @@ layer at (0,0) size 800x600
       RenderSVGText {text} at (5,40) size 465x44 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-36) size 465x44
           chunk 1 text run 1 at (5.00,40.00) startOffset 0 endOffset 29 width 465.00: "Test 'text-anchor' (vertical)"
-      RenderSVGContainer {g} at (251.67,95) size 195x440
-        RenderSVGContainer {g} at (251.67,95) size 195x440 [transform={m=((1.00,0.00)(0.00,1.00)) t=(160.00,150.00)}]
-          RenderSVGContainer {g} at (251.67,245) size 20x290
+      RenderSVGContainer {g} at (253.33,95) size 195x440
+        RenderSVGContainer {g} at (253.33,95) size 195x440 [transform={m=((1.00,0.00)(0.00,1.00)) t=(160.00,150.00)}]
+          RenderSVGContainer {g} at (253.33,245) size 28.33x290
             RenderPath {circle} at (261.67,245) size 10x10 [fill={[type=SOLID] [color=#000000]}] [data="M3.00,0.00L2.99,0.19L2.98,0.38L2.95,0.56L2.91,0.75L2.85,0.93L2.79,1.10L2.71,1.28L2.63,1.45L2.53,1.61L2.43,1.76L2.31,1.91L2.19,2.05L2.05,2.19L1.91,2.31L1.76,2.43L1.61,2.53L1.45,2.63L1.28,2.71L1.10,2.79L0.93,2.85L0.75,2.91L0.56,2.95L0.38,2.98L0.19,2.99L0.00,3.00L-0.19,2.99L-0.38,2.98L-0.56,2.95L-0.75,2.91L-0.93,2.85L-1.10,2.79L-1.28,2.71L-1.45,2.63L-1.61,2.53L-1.76,2.43L-1.91,2.31L-2.05,2.19L-2.19,2.05L-2.31,1.91L-2.43,1.76L-2.53,1.61L-2.63,1.45L-2.71,1.28L-2.79,1.10L-2.85,0.93L-2.91,0.75L-2.95,0.56L-2.98,0.38L-2.99,0.19L-3.00,0.00L-2.99,-0.19L-2.98,-0.38L-2.95,-0.56L-2.91,-0.75L-2.85,-0.93L-2.79,-1.10L-2.71,-1.28L-2.63,-1.45L-2.53,-1.61L-2.43,-1.76L-2.31,-1.91L-2.19,-2.05L-2.05,-2.19L-1.91,-2.31L-1.76,-2.43L-1.61,-2.53L-1.45,-2.63L-1.28,-2.71L-1.10,-2.79L-0.93,-2.85L-0.75,-2.91L-0.56,-2.95L-0.38,-2.98L-0.19,-2.99L-0.00,-3.00L0.19,-2.99L0.38,-2.98L0.56,-2.95L0.75,-2.91L0.93,-2.85L1.10,-2.79L1.28,-2.71L1.45,-2.63L1.61,-2.53L1.76,-2.43L1.91,-2.31L2.05,-2.19L2.19,-2.05L2.31,-1.91L2.43,-1.76L2.53,-1.61L2.63,-1.45L2.71,-1.28L2.79,-1.10L2.85,-0.93L2.91,-0.75L2.95,-0.56L2.98,-0.38L2.99,-0.19"]
-            RenderSVGText {text} at (-9,33) size 12x165 contains 1 chunk(s) [color=#FF0000]
-              RenderSVGInlineText {#text} at (0,-27) size 12x165
+            RenderSVGText {text} at (-9,33) size 17x165 contains 1 chunk(s) [color=#FF0000]
+              RenderSVGInlineText {#text} at (1,-27) size 17x165
                 chunk 1 (vertical) text run 1 at (-8.50,33.00) startOffset 0 endOffset 5 height 165.00: "start"
-          RenderSVGContainer {g} at (328.33,95) size 43.33x330 [transform={m=((1.00,0.00)(0.00,1.00)) t=(50.00,0.00)}]
+          RenderSVGContainer {g} at (330,95) size 41.67x330 [transform={m=((1.00,0.00)(0.00,1.00)) t=(50.00,0.00)}]
             RenderPath {circle} at (345,245) size 10x10 [fill={[type=SOLID] [color=#000000]}] [data="M3.00,0.00L2.99,0.19L2.98,0.38L2.95,0.56L2.91,0.75L2.85,0.93L2.79,1.10L2.71,1.28L2.63,1.45L2.53,1.61L2.43,1.76L2.31,1.91L2.19,2.05L2.05,2.19L1.91,2.31L1.76,2.43L1.61,2.53L1.45,2.63L1.28,2.71L1.10,2.79L0.93,2.85L0.75,2.91L0.56,2.95L0.38,2.98L0.19,2.99L0.00,3.00L-0.19,2.99L-0.38,2.98L-0.56,2.95L-0.75,2.91L-0.93,2.85L-1.10,2.79L-1.28,2.71L-1.45,2.63L-1.61,2.53L-1.76,2.43L-1.91,2.31L-2.05,2.19L-2.19,2.05L-2.31,1.91L-2.43,1.76L-2.53,1.61L-2.63,1.45L-2.71,1.28L-2.79,1.10L-2.85,0.93L-2.91,0.75L-2.95,0.56L-2.98,0.38L-2.99,0.19L-3.00,0.00L-2.99,-0.19L-2.98,-0.38L-2.95,-0.56L-2.91,-0.75L-2.85,-0.93L-2.79,-1.10L-2.71,-1.28L-2.63,-1.45L-2.53,-1.61L-2.43,-1.76L-2.31,-1.91L-2.19,-2.05L-2.05,-2.19L-1.91,-2.31L-1.76,-2.43L-1.61,-2.53L-1.45,-2.63L-1.28,-2.71L-1.10,-2.79L-0.93,-2.85L-0.75,-2.91L-0.56,-2.95L-0.38,-2.98L-0.19,-2.99L-0.00,-3.00L0.19,-2.99L0.38,-2.98L0.56,-2.95L0.75,-2.91L0.93,-2.85L1.10,-2.79L1.28,-2.71L1.45,-2.63L1.61,-2.53L1.76,-2.43L1.91,-2.31L2.05,-2.19L2.19,-2.05L2.31,-1.91L2.43,-1.76L2.53,-1.61L2.63,-1.45L2.71,-1.28L2.79,-1.10L2.85,-0.93L2.91,-0.75L2.95,-0.56L2.98,-0.38L2.99,-0.19"]
             RenderSVGText {text} at (-13,-66) size 25x198 contains 1 chunk(s) [color=#008000]
-              RenderSVGInlineText {#text} at (0,-27) size 26x198
+              RenderSVGInlineText {#text} at (1,-27) size 25x198
                 chunk 1 (middle anchor, vertical) text run 1 at (-12.50,-66.00) startOffset 0 endOffset 6 height 198.00: "middle"
-          RenderSVGContainer {g} at (418.33,95) size 28.33x165 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,0.00)}]
+          RenderSVGContainer {g} at (420.00,95) size 28.33x165 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,0.00)}]
             RenderPath {circle} at (428.33,245) size 10x10 [fill={[type=SOLID] [color=#000000]}] [data="M3.00,0.00L2.99,0.19L2.98,0.38L2.95,0.56L2.91,0.75L2.85,0.93L2.79,1.10L2.71,1.28L2.63,1.45L2.53,1.61L2.43,1.76L2.31,1.91L2.19,2.05L2.05,2.19L1.91,2.31L1.76,2.43L1.61,2.53L1.45,2.63L1.28,2.71L1.10,2.79L0.93,2.85L0.75,2.91L0.56,2.95L0.38,2.98L0.19,2.99L0.00,3.00L-0.19,2.99L-0.38,2.98L-0.56,2.95L-0.75,2.91L-0.93,2.85L-1.10,2.79L-1.28,2.71L-1.45,2.63L-1.61,2.53L-1.76,2.43L-1.91,2.31L-2.05,2.19L-2.19,2.05L-2.31,1.91L-2.43,1.76L-2.53,1.61L-2.63,1.45L-2.71,1.28L-2.79,1.10L-2.85,0.93L-2.91,0.75L-2.95,0.56L-2.98,0.38L-2.99,0.19L-3.00,0.00L-2.99,-0.19L-2.98,-0.38L-2.95,-0.56L-2.91,-0.75L-2.85,-0.93L-2.79,-1.10L-2.71,-1.28L-2.63,-1.45L-2.53,-1.61L-2.43,-1.76L-2.31,-1.91L-2.19,-2.05L-2.05,-2.19L-1.91,-2.31L-1.76,-2.43L-1.61,-2.53L-1.45,-2.63L-1.28,-2.71L-1.10,-2.79L-0.93,-2.85L-0.75,-2.91L-0.56,-2.95L-0.38,-2.98L-0.19,-2.99L-0.00,-3.00L0.19,-2.99L0.38,-2.98L0.56,-2.95L0.75,-2.91L0.93,-2.85L1.10,-2.79L1.28,-2.71L1.45,-2.63L1.61,-2.53L1.76,-2.43L1.91,-2.31L2.05,-2.19L2.19,-2.05L2.31,-1.91L2.43,-1.76L2.53,-1.61L2.63,-1.45L2.71,-1.28L2.79,-1.10L2.85,-0.93L2.91,-0.75L2.95,-0.56L2.98,-0.38L2.99,-0.19"]
-            RenderSVGText {text} at (-9,-66) size 16x99 contains 1 chunk(s) [color=#0000FF]
-              RenderSVGInlineText {#text} at (0,-27) size 17x99
+            RenderSVGText {text} at (-9,-66) size 17x99 contains 1 chunk(s) [color=#0000FF]
+              RenderSVGInlineText {#text} at (1,-27) size 17x99
                 chunk 1 (end anchor, vertical) text run 1 at (-8.50,-66.00) startOffset 0 endOffset 3 height 99.00: "end"
     RenderSVGText {text} at (10,340) size 264x46 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,-36) size 264x46

diff --git a/LayoutTests/svg/text/text-align-06-b-expected.txt b/LayoutTests/svg/text/text-align-06-b-expected.txt
index 7d398120bc7400708f2347bcc3654cdf85dc59bc..9e0a77416b73014cc52c5f73b8227326959dbe3b 100644 (file)
--- a/LayoutTests/svg/text/text-align-06-b-expected.txt
+++ b/LayoutTests/svg/text/text-align-06-b-expected.txt
@@ -6,43 +6,43 @@ layer at (0,0) size 800x600
       RenderSVGText {text} at (0,40) size 481x44 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-36) size 481x44
           chunk 1 text run 1 at (0.00,40.00) startOffset 0 endOffset 31 width 481.00: "Test 'baseline-shift' (vertic.)"
-      RenderSVGContainer {g} at (135,110) size 483.33x495
-        RenderSVGContainer {g} at (135,110) size 483.33x495 [transform={m=((1.00,0.00)(0.00,1.00)) t=(90.00,60.00)}]
-          RenderSVGText {text} at (-9,33) size 23x165 contains 1 chunk(s)
-            RenderSVGInlineText {#text} at (0,-27) size 21x66
+      RenderSVGContainer {g} at (136.67,110) size 488.33x495
+        RenderSVGContainer {g} at (136.67,110) size 488.33x495 [transform={m=((1.00,0.00)(0.00,1.00)) t=(90.00,60.00)}]
+          RenderSVGText {text} at (-9,33) size 24x165 contains 1 chunk(s)
+            RenderSVGInlineText {#text} at (1,-27) size 17x66
               chunk 1 (vertical) text run 1 at (-8.50,33.00) startOffset 0 endOffset 2 height 66.00: "te"
-            RenderSVGTSpan {tspan} at (0,0) size 16x33 [color=#FF0000]
-              RenderSVGInlineText {#text} at (7,39) size 17x33
+            RenderSVGTSpan {tspan} at (0,0) size 17x33 [color=#FF0000]
+              RenderSVGInlineText {#text} at (8,39) size 17x33
                 chunk 1 (vertical) text run 2 at (-1.50,99.00) startOffset 0 endOffset 1 height 33.00: "7"
-            RenderSVGInlineText {#text} at (1,72) size 11x66
+            RenderSVGInlineText {#text} at (2,72) size 15x66
               chunk 1 (vertical) text run 3 at (-7.50,132.00) startOffset 0 endOffset 2 height 66.00: "xt"
-          RenderSVGText {text} at (45,33) size 48x264 contains 1 chunk(s)
-            RenderSVGInlineText {#text} at (26,-27) size 21x66
+          RenderSVGText {text} at (45,33) size 44x264 contains 1 chunk(s)
+            RenderSVGInlineText {#text} at (26,-27) size 18x66
               chunk 1 (vertical) text run 1 at (71.50,33.00) startOffset 0 endOffset 2 height 66.00: "te"
-            RenderSVGTSpan {tspan} at (0,0) size 36x132 [color=#FF0000]
-              RenderSVGInlineText {#text} at (0,39) size 35x132
+            RenderSVGTSpan {tspan} at (0,0) size 28x132 [color=#FF0000]
+              RenderSVGInlineText {#text} at (0,39) size 28x132
                 chunk 1 (vertical) text run 2 at (45.50,99.00) startOffset 0 endOffset 4 height 132.00: "-70%"
-            RenderSVGInlineText {#text} at (27,171) size 11x66
+            RenderSVGInlineText {#text} at (27,171) size 16x66
               chunk 1 (vertical) text run 3 at (72.50,231.00) startOffset 0 endOffset 2 height 66.00: "xt"
-          RenderSVGText {text} at (155,33) size 38x231 contains 1 chunk(s)
-            RenderSVGInlineText {#text} at (16,-27) size 21x66
+          RenderSVGText {text} at (155,33) size 34x231 contains 1 chunk(s)
+            RenderSVGInlineText {#text} at (16,-27) size 18x66
               chunk 1 (vertical) text run 1 at (171.50,33.00) startOffset 0 endOffset 2 height 66.00: "te"
-            RenderSVGTSpan {tspan} at (0,0) size 18x99 [color=#FF0000]
-              RenderSVGInlineText {#text} at (0,39) size 18x99
+            RenderSVGTSpan {tspan} at (0,0) size 17x99 [color=#FF0000]
+              RenderSVGInlineText {#text} at (0,39) size 17x99
                 chunk 1 (vertical) text run 2 at (155.00,99.00) startOffset 0 endOffset 3 height 99.00: "sub"
-            RenderSVGTSpan {tspan} at (0,0) size 15x33 [color=#0000FF]
-              RenderSVGInlineText {#text} at (17,138) size 15x33
+            RenderSVGTSpan {tspan} at (0,0) size 16x33 [color=#0000FF]
+              RenderSVGInlineText {#text} at (17,138) size 16x33
                 chunk 1 (vertical) text run 3 at (172.50,198.00) startOffset 0 endOffset 1 height 33.00: "x"
             RenderSVGInlineText {#text} at (21,171) size 8x33
               chunk 1 (vertical) text run 4 at (176.00,231.00) startOffset 0 endOffset 1 height 33.00: "t"
-          RenderSVGText {text} at (251,33) size 30x297 contains 1 chunk(s)
-            RenderSVGInlineText {#text} at (0,-27) size 21x66
+          RenderSVGText {text} at (251,33) size 34x297 contains 1 chunk(s)
+            RenderSVGInlineText {#text} at (0,-27) size 18x66
               chunk 1 (vertical) text run 1 at (251.50,33.00) startOffset 0 endOffset 2 height 66.00: "te"
-            RenderSVGTSpan {tspan} at (0,0) size 13x165 [color=#008000]
-              RenderSVGInlineText {#text} at (17,39) size 13x165
+            RenderSVGTSpan {tspan} at (0,0) size 17x165 [color=#008000]
+              RenderSVGInlineText {#text} at (17,39) size 17x165
                 chunk 1 (vertical) text run 2 at (268.00,99.00) startOffset 0 endOffset 5 height 165.00: "super"
-            RenderSVGTSpan {tspan} at (0,0) size 15x33 [color=#0000FF]
-              RenderSVGInlineText {#text} at (1,204) size 15x33
+            RenderSVGTSpan {tspan} at (0,0) size 16x33 [color=#0000FF]
+              RenderSVGInlineText {#text} at (1,204) size 16x33
                 chunk 1 (vertical) text run 3 at (252.50,264.00) startOffset 0 endOffset 1 height 33.00: "x"
             RenderSVGInlineText {#text} at (5,237) size 8x33
               chunk 1 (vertical) text run 4 at (256.00,297.00) startOffset 0 endOffset 1 height 33.00: "t"

diff --git a/LayoutTests/svg/text/text-intro-05-t-expected.txt b/LayoutTests/svg/text/text-intro-05-t-expected.txt
index 1c419521d4791d3dbab3368f70c326b55e2ae492..52a969c4c7d7e7ba4ec181765952e79fe0097ba8 100644 (file)
--- a/LayoutTests/svg/text/text-intro-05-t-expected.txt
+++ b/LayoutTests/svg/text/text-intro-05-t-expected.txt
@@ -1,16 +1,16 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
-  RenderSVGRoot {svg} at (0.83,0.83) size 982.50x598.33
-    RenderSVGContainer {g} at (80,86.67) size 903.33x326.67
-      RenderSVGText {text} at (119,80) size 455x36 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-28) size 455x36
+  RenderSVGRoot {svg} at (0.83,0.83) size 989.17x598.33
+    RenderSVGContainer {g} at (80,86.67) size 910x326.67
+      RenderSVGText {text} at (119,80) size 458x36 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-28) size 458x36
           chunk 1 (end anchor) text run 1 at (119.00,80.00) startOffset 0 endOffset 37 width 341.00 RTL: "\x{644}\x{645}\x{627}\x{630}\x{627} \x{644}\x{627} \x{64A}\x{62A}\x{643}\x{644}\x{645}\x{648}\x{646} \x{627}\x{644}\x{644}\x{651}\x{63A}\x{629} \x{627}\x{644}\x{639}\x{631}\x{628}\x{64A}\x{629} \x{641}\x{62D}\x{633}\x{628}\x{61F}"
-      RenderSVGText {text} at (48,160) size 542x41 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-32) size 542x41
+      RenderSVGText {text} at (48,160) size 546x41 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-32) size 546x41
           chunk 1 (end anchor) text run 1 at (48.00,160.00) startOffset 0 endOffset 37 width 412.00 RTL: "\x{644}\x{645}\x{627}\x{630}\x{627} \x{644}\x{627} \x{64A}\x{62A}\x{643}\x{644}\x{645}\x{648}\x{646} \x{627}\x{644}\x{644}\x{651}\x{63A}\x{629} \x{627}\x{644}\x{639}\x{631}\x{628}\x{64A}\x{629} \x{641}\x{62D}\x{633}\x{628}\x{61F}"
-      RenderSVGText {text} at (119,240) size 455x36 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-28) size 455x36
+      RenderSVGText {text} at (119,240) size 458x36 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-28) size 458x36
           chunk 1 (end anchor) text run 1 at (119.00,240.00) startOffset 0 endOffset 37 width 341.00 RTL: "\x{644}\x{645}\x{627}\x{630}\x{627} \x{644}\x{627} \x{64A}\x{62A}\x{643}\x{644}\x{645}\x{648}\x{646} \x{627}\x{644}\x{644}\x{651}\x{63A}\x{629} \x{627}\x{644}\x{639}\x{631}\x{628}\x{64A}\x{629} \x{641}\x{62D}\x{633}\x{628}\x{61F}"
     RenderSVGText {text} at (10,340) size 264x46 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,-36) size 264x46

diff --git a/LayoutTests/svg/text/text-path-01-b-expected.txt b/LayoutTests/svg/text/text-path-01-b-expected.txt
index 51709b508c3246e127a3a9dafa6627c9fd44e0b5..df5ad4e189106ca2bf0d46baa398b82b5abee3d1 100644 (file)
--- a/LayoutTests/svg/text/text-path-01-b-expected.txt
+++ b/LayoutTests/svg/text/text-path-01-b-expected.txt
@@ -1,34 +1,34 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
-  RenderSVGRoot {svg} at (0.83,-10) size 798.33x609.17
-    RenderSVGContainer {g} at (27.50,-10) size 669.67x495.83
+  RenderSVGRoot {svg} at (-13.33,-10) size 812.50x609.17
+    RenderSVGContainer {g} at (-13.33,-10) size 710.50x495.83
       RenderSVGHiddenContainer {defs} at (0,0) size 0x0
         RenderPath {path} at (198.53,22.02) size 219.77x84.55 [stroke={[type=SOLID] [color=#0000FF]}] [data="M199.00,89.30C206.60,66.60,235.80,13.20,270.00,30.30C286.60,38.60,298.90,59.40,310.00,73.30C321.70,87.90,338.60,99.00,356.00,103.30C387.30,111.10,396.60,90.40,418.00,74.30"]
         RenderPath {path} at (33.03,78.52) size 219.77x84.55 [stroke={[type=SOLID] [color=#0000FF]}] [data="M33.50,145.80C41.00,123.00,70.30,69.70,104.50,86.80C121.00,95.00,133.00,116.00,144.50,129.80C156.20,144.40,173.00,155.50,190.50,159.80C221.80,167.60,231.00,146.90,252.50,130.80"]
         RenderPath {path} at (113,231) size 300x4 [stroke={[type=SOLID] [color=#0000FF] [stroke width=4.00]}] [data="M113.00,233.00L413.00,233.00"]
-      RenderSVGContainer {g} at (320,-10) size 377.17x193.33
+      RenderSVGContainer {g} at (280,-10) size 417.17x198.33
         RenderSVGContainer {use} at (330.88,36.70) size 366.29x140.92
           RenderSVGContainer {g} at (330.88,36.70) size 366.29x140.92
             RenderPath {path} at (330.88,36.70) size 366.29x140.92 [stroke={[type=SOLID] [color=#0000FF]}] [data="M199.00,89.30C206.60,66.60,235.80,13.20,270.00,30.30C286.60,38.60,298.90,59.40,310.00,73.30C321.70,87.90,338.60,99.00,356.00,103.30C387.30,111.10,396.60,90.40,418.00,74.30"]
-        RenderSVGText {text} at (192,27) size 171x116 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 171x116
-            RenderSVGInlineText {#text} at (0,-32) size 171x116
+        RenderSVGText {text} at (192,27) size 204x119 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 204x119
+            RenderSVGInlineText {#text} at (-24,-33) size 204x119
               chunk 1 text run 1 at (192.04,27.04) startOffset 0 endOffset 14 width 226.00: "Text on a path"
           RenderSVGInlineText {#text} at (0,0) size 0x0
-      RenderSVGContainer {g} at (27.50,83.33) size 458.33x268.33
+      RenderSVGContainer {g} at (-13.33,81.67) size 499.17x270
         RenderSVGContainer {use} at (55.04,130.86) size 366.29x140.91
           RenderSVGContainer {g} at (55.04,130.86) size 366.29x140.91
             RenderPath {path} at (55.04,130.86) size 366.29x140.91 [stroke={[type=SOLID] [color=#0000FF]}] [data="M33.50,145.80C41.00,123.00,70.30,69.70,104.50,86.80C121.00,95.00,133.00,116.00,144.50,129.80C156.20,144.40,173.00,155.50,190.50,159.80C221.80,167.60,231.00,146.90,252.50,130.80"]
-        RenderSVGText {text} at (26,83) size 172x117 contains 1 chunk(s)
-          RenderSVGTextPath {textPath} at (0,0) size 172x117
-            RenderSVGTSpan {tspan} at (0,0) size 29x58 [color=#FF0000]
-              RenderSVGInlineText {#text} at (0,-9) size 28x58
+        RenderSVGText {text} at (26,83) size 215x121 contains 1 chunk(s)
+          RenderSVGTextPath {textPath} at (0,0) size 215x121
+            RenderSVGTSpan {tspan} at (0,0) size 56x57 [color=#FF0000]
+              RenderSVGInlineText {#text} at (-34,4) size 56x57
                 chunk 1 text run 1 at (26.50,106.31) startOffset 0 endOffset 2 width 39.00: "Te"
-            RenderSVGTSpan {tspan} at (0,0) size 18x41
-              RenderSVGInlineText {#text} at (21,-11) size 18x41
+            RenderSVGTSpan {tspan} at (0,0) size 44x40
+              RenderSVGInlineText {#text} at (-1,-7) size 44x40
                 chunk 1 text run 2 at (47.67,104.04) startOffset 0 endOffset 1 width 18.00: "x"
-            RenderSVGInlineText {#text} at (35,-32) size 136x116
+            RenderSVGInlineText {#text} at (15,-34) size 166x121
               chunk 1 text run 3 at (61.18,83.54) startOffset 0 endOffset 11 width 169.00: "t on a path"
           RenderSVGInlineText {#text} at (0,0) size 0x0
         RenderPath {rect} at (27.50,280.83) size 458.33x70 [stroke={[type=SOLID] [color=#000000]}] [data="M17.00,169.00L291.00,169.00L291.00,210.00L17.00,210.00"]

diff --git a/LayoutTests/svg/text/text-text-04-t-expected.txt b/LayoutTests/svg/text/text-text-04-t-expected.txt
index fafe8c17c50c31141834f0f3b273ca681001a6ef..733228c522d06a0ee0a59641c2e7de8135c9bddf 100644 (file)
--- a/LayoutTests/svg/text/text-text-04-t-expected.txt
+++ b/LayoutTests/svg/text/text-text-04-t-expected.txt
@@ -5,8 +5,8 @@ layer at (0,0) size 800x600
     RenderSVGHiddenContainer {defs} at (0,0) size 0x0
     RenderSVGContainer {g} at (60,36.67) size 696.67x480
       RenderSVGContainer {g} at (60.00,36.67) size 238.33x38.33 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,40.00)}]
-        RenderSVGText {text} at (-94,0) size 64x18 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-14) size 64x18
+        RenderSVGText {text} at (-94,0) size 65x18 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (0,-14) size 65x18
             chunk 1 (end anchor) text run 1 at (-94.00,0.00) startOffset 0 endOffset 9 width 64.00: "Reference"
         RenderSVGContainer {g} at (210.00,36.67) size 88.33x38.33
           RenderSVGContainer {use} at (210.00,60.00) size 13.33x13.33
@@ -27,8 +27,8 @@ layer at (0,0) size 800x600
       RenderSVGHiddenContainer {defs} at (0,0) size 0x0
         RenderPath {rect} at (-4,-4) size 8x8 [fill={[type=SOLID] [color=#000000]}] [data="M-4.00,-4.00L4.00,-4.00L4.00,4.00L-4.00,4.00"]
       RenderSVGContainer {g} at (121.67,103.33) size 245x38.33 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,80.00)}]
-        RenderSVGText {text} at (-57,0) size 27x18 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-14) size 27x18
+        RenderSVGText {text} at (-57,0) size 28x18 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (0,-14) size 28x18
             chunk 1 (end anchor) text run 1 at (-57.00,0.00) startOffset 0 endOffset 5 width 27.00: "x all"
         RenderSVGContainer {use} at (210.00,126.67) size 13.33x13.33
           RenderSVGContainer {g} at (210.00,126.67) size 13.33x13.33
@@ -52,8 +52,8 @@ layer at (0,0) size 800x600
             chunk 3 text run 1 at (60.00,0.00) startOffset 2 endOffset 3 width 10.00: "3"
             chunk 4 text run 1 at (80.00,0.00) startOffset 3 endOffset 4 width 10.00: "4"
       RenderSVGContainer {g} at (93.33,170) size 296.67x38.33 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,120.00)}]
-        RenderSVGText {text} at (-74,0) size 44x18 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-14) size 44x18
+        RenderSVGText {text} at (-74,0) size 45x18 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (0,-14) size 45x18
             chunk 1 (end anchor) text run 1 at (-74.00,0.00) startOffset 0 endOffset 6 width 44.00: "x more"
         RenderSVGContainer {use} at (210.00,193.33) size 13.33x13.33
           RenderSVGContainer {g} at (210.00,193.33) size 13.33x13.33
@@ -80,8 +80,8 @@ layer at (0,0) size 800x600
             chunk 3 text run 1 at (60.00,0.00) startOffset 2 endOffset 3 width 10.00: "3"
             chunk 4 text run 1 at (80.00,0.00) startOffset 3 endOffset 4 width 10.00: "4"
       RenderSVGContainer {g} at (86.67,236.67) size 263.33x38.33 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,160.00)}]
-        RenderSVGText {text} at (-78,0) size 48x18 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-14) size 48x18
+        RenderSVGText {text} at (-78,0) size 49x18 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (0,-14) size 49x18
             chunk 1 (end anchor) text run 1 at (-78.00,0.00) startOffset 0 endOffset 7 width 48.00: "x fewer"
         RenderSVGContainer {use} at (210.00,260) size 13.33x13.33
           RenderSVGContainer {g} at (210.00,260) size 13.33x13.33
@@ -104,8 +104,8 @@ layer at (0,0) size 800x600
             chunk 2 text run 1 at (40.00,0.00) startOffset 1 endOffset 2 width 10.00: "2"
             chunk 3 text run 1 at (60.00,0.00) startOffset 2 endOffset 4 width 20.00: "34"
       RenderSVGContainer {g} at (121.67,286.67) size 176.67x71.67 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,200.00)}]
-        RenderSVGText {text} at (-57,0) size 27x18 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-14) size 27x18
+        RenderSVGText {text} at (-57,0) size 28x18 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (0,-14) size 28x18
             chunk 1 (end anchor) text run 1 at (-57.00,0.00) startOffset 0 endOffset 5 width 27.00: "y all"
         RenderSVGContainer {use} at (210.00,310.00) size 13.33x13.33
           RenderSVGContainer {g} at (210.00,310) size 13.33x13.33 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,-10.00)}]
@@ -123,8 +123,8 @@ layer at (0,0) size 800x600
           RenderSVGInlineText {#text} at (0,-18) size 40x43
             chunk 1 text run 1 at (0.00,-10.00) startOffset 0 endOffset 4 width 40.00: "1234"
       RenderSVGContainer {g} at (93.33,370) size 205x71.67 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,250.00)}]
-        RenderSVGText {text} at (-74,0) size 44x18 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-14) size 44x18
+        RenderSVGText {text} at (-74,0) size 45x18 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (0,-14) size 45x18
             chunk 1 (end anchor) text run 1 at (-74.00,0.00) startOffset 0 endOffset 6 width 44.00: "y more"
         RenderSVGContainer {use} at (210.00,393.33) size 13.33x13.33
           RenderSVGContainer {g} at (210.00,393.33) size 13.33x13.33 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,-10.00)}]
@@ -142,8 +142,8 @@ layer at (0,0) size 800x600
           RenderSVGInlineText {#text} at (0,-18) size 40x43
             chunk 1 text run 1 at (0.00,-10.00) startOffset 0 endOffset 4 width 40.00: "1234"
       RenderSVGContainer {g} at (86.67,453.33) size 211.67x63.33 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,300.00)}]
-        RenderSVGText {text} at (-78,0) size 48x18 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-14) size 48x18
+        RenderSVGText {text} at (-78,0) size 49x18 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (0,-14) size 49x18
             chunk 1 (end anchor) text run 1 at (-78.00,0.00) startOffset 0 endOffset 7 width 48.00: "y fewer"
         RenderSVGContainer {use} at (210.00,476.67) size 13.33x13.33
           RenderSVGContainer {g} at (210.00,476.67) size 13.33x13.33 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,-10.00)}]
@@ -162,8 +162,8 @@ layer at (0,0) size 800x600
             chunk 1 text run 1 at (0.00,-10.00) startOffset 0 endOffset 4 width 40.00: "1234"
       RenderSVGContainer {g} at (401.67,86.67) size 355x338.33 [transform={m=((1.00,0.00)(0.00,1.00)) t=(220.00,0.00)}]
         RenderSVGContainer {g} at (468.33,86.67) size 265x71.67 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,80.00)}]
-          RenderSVGText {text} at (-69,0) size 39x18 contains 1 chunk(s)
-            RenderSVGInlineText {#text} at (0,-14) size 39x18
+          RenderSVGText {text} at (-69,0) size 40x18 contains 1 chunk(s)
+            RenderSVGInlineText {#text} at (0,-14) size 40x18
               chunk 1 (end anchor) text run 1 at (-69.00,0.00) startOffset 0 endOffset 7 width 39.00: "x/y all"
           RenderSVGContainer {use} at (576.67,126.67) size 13.33x13.33
             RenderSVGContainer {g} at (576.67,126.67) size 13.33x13.33
@@ -187,8 +187,8 @@ layer at (0,0) size 800x600
               chunk 3 text run 1 at (60.00,5.00) startOffset 2 endOffset 3 width 10.00: "3"
               chunk 4 text run 1 at (80.00,10.00) startOffset 3 endOffset 4 width 10.00: "4"
         RenderSVGContainer {g} at (440.00,153.33) size 316.67x86.67 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,120.00)}]
-          RenderSVGText {text} at (-86,0) size 56x18 contains 1 chunk(s)
-            RenderSVGInlineText {#text} at (0,-14) size 56x18
+          RenderSVGText {text} at (-86,0) size 57x18 contains 1 chunk(s)
+            RenderSVGInlineText {#text} at (0,-14) size 57x18
               chunk 1 (end anchor) text run 1 at (-86.00,0.00) startOffset 0 endOffset 8 width 56.00: "x/y more"
           RenderSVGContainer {use} at (576.67,193.33) size 13.33x13.33
             RenderSVGContainer {g} at (576.67,193.33) size 13.33x13.33
@@ -215,8 +215,8 @@ layer at (0,0) size 800x600
               chunk 3 text run 1 at (60.00,5.00) startOffset 2 endOffset 3 width 10.00: "3"
               chunk 4 text run 1 at (80.00,10.00) startOffset 3 endOffset 4 width 10.00: "4"
         RenderSVGContainer {g} at (433.33,220.00) size 283.33x63.33 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,160.00)}]
-          RenderSVGText {text} at (-90,0) size 60x18 contains 1 chunk(s)
-            RenderSVGInlineText {#text} at (0,-14) size 60x18
+          RenderSVGText {text} at (-90,0) size 61x18 contains 1 chunk(s)
+            RenderSVGInlineText {#text} at (0,-14) size 61x18
               chunk 1 (end anchor) text run 1 at (-90.00,0.00) startOffset 0 endOffset 9 width 60.00: "x/y fewer"
           RenderSVGContainer {use} at (576.67,260) size 13.33x13.33
             RenderSVGContainer {g} at (576.67,260) size 13.33x13.33
@@ -239,8 +239,8 @@ layer at (0,0) size 800x600
               chunk 2 text run 1 at (40.00,-5.00) startOffset 1 endOffset 2 width 10.00: "2"
               chunk 3 text run 1 at (60.00,5.00) startOffset 2 endOffset 4 width 20.00: "34"
         RenderSVGContainer {g} at (401.67,286.67) size 331.67x63.33 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,200.00)}]
-          RenderSVGText {text} at (-109,0) size 79x18 contains 1 chunk(s)
-            RenderSVGInlineText {#text} at (0,-14) size 79x18
+          RenderSVGText {text} at (-109,0) size 80x18 contains 1 chunk(s)
+            RenderSVGInlineText {#text} at (0,-14) size 80x18
               chunk 1 (end anchor) text run 1 at (-109.00,0.00) startOffset 0 endOffset 13 width 79.00: "x all y fewer"
           RenderSVGContainer {use} at (576.67,326.67) size 13.33x13.33
             RenderSVGContainer {g} at (576.67,326.67) size 13.33x13.33
@@ -264,8 +264,8 @@ layer at (0,0) size 800x600
               chunk 3 text run 1 at (60.00,5.00) startOffset 2 endOffset 3 width 10.00: "3"
               chunk 4 text run 1 at (80.00,5.00) startOffset 3 endOffset 4 width 10.00: "4"
         RenderSVGContainer {g} at (401.67,353.33) size 317.53x71.67 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,240.00)}]
-          RenderSVGText {text} at (-109,0) size 79x18 contains 1 chunk(s)
-            RenderSVGInlineText {#text} at (0,-14) size 79x18
+          RenderSVGText {text} at (-109,0) size 80x18 contains 1 chunk(s)
+            RenderSVGInlineText {#text} at (0,-14) size 80x18
               chunk 1 (end anchor) text run 1 at (-109.00,0.00) startOffset 0 endOffset 13 width 79.00: "x fewer y all"
           RenderSVGContainer {use} at (576.67,393.33) size 13.33x13.33
             RenderSVGContainer {g} at (576.67,393.33) size 13.33x13.33

diff --git a/LayoutTests/svg/text/text-text-05-t-expected.txt b/LayoutTests/svg/text/text-text-05-t-expected.txt
index 60b62472b163780588f07325aa49e3fbe2265b2c..c9d3b5664eb72e1947c471f01644b5bab8e0bb38 100644 (file)
--- a/LayoutTests/svg/text/text-text-05-t-expected.txt
+++ b/LayoutTests/svg/text/text-text-05-t-expected.txt
@@ -36,9 +36,9 @@ layer at (0,0) size 800x600
         RenderSVGText {text} at (0,270) size 44x18 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-14) size 44x18
             chunk 1 text run 1 at (0.00,270.00) startOffset 0 endOffset 7 width 44.00: "2.x 2.y"
-      RenderSVGContainer {g} at (190,15.00) size 185x535 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,40.00)}]
-        RenderSVGText {text} at (-36,-17) size 70x18 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-14) size 71x18
+      RenderSVGContainer {g} at (191.67,15.00) size 183.33x535 [transform={m=((1.00,0.00)(0.00,1.00)) t=(150.00,40.00)}]
+        RenderSVGText {text} at (-36,-17) size 71x19 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (1,-14) size 71x19
             chunk 1 (middle anchor) text run 1 at (-35.50,-17.00) startOffset 0 endOffset 11 width 71.00: "text-anchor"
         RenderSVGText {text} at (-13,-3) size 26x18 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-14) size 26x18
@@ -204,8 +204,8 @@ layer at (0,0) size 800x600
                 RenderSVGContainer {g} at (310,433.33) size 13.33x31.67
                   RenderPath {line} at (315.83,433.33) size 1.67x25 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [data="M0.00,0.00L0.00,-15.00"]
                   RenderPath {rect} at (310,451.67) size 13.33x13.33 [fill={[type=SOLID] [color=#8888FF]}] [data="M-4.00,-4.00L4.00,-4.00L4.00,4.00L-4.00,4.00"]
-            RenderSVGText {text} at (10,-10) size 35x18 contains 4 chunk(s)
-              RenderSVGInlineText {#text} at (0,-10) size 35x18
+            RenderSVGText {text} at (10,-10) size 35x19 contains 4 chunk(s)
+              RenderSVGInlineText {#text} at (0,-10) size 35x19
                 chunk 1 text run 1 at (10.00,-10.00) startOffset 0 endOffset 1 width 5.00: "1"
                 chunk 2 text run 1 at (20.00,-5.00) startOffset 1 endOffset 2 width 5.00: "2"
                 chunk 3 text run 1 at (30.00,-5.00) startOffset 2 endOffset 3 width 5.00: "3"
@@ -221,21 +221,21 @@ layer at (0,0) size 800x600
                 RenderSVGContainer {g} at (343.33,483.33) size 13.33x31.67
                   RenderPath {line} at (349.17,483.33) size 1.67x25 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [data="M0.00,0.00L0.00,-15.00"]
                   RenderPath {rect} at (343.33,501.67) size 13.33x13.33 [fill={[type=SOLID] [color=#8888FF]}] [data="M-4.00,-4.00L4.00,-4.00L4.00,4.00L-4.00,4.00"]
-            RenderSVGText {text} at (10,-10) size 65x18 contains 2 chunk(s)
-              RenderSVGInlineText {#text} at (0,-10) size 65x18
+            RenderSVGText {text} at (10,-10) size 65x19 contains 2 chunk(s)
+              RenderSVGInlineText {#text} at (0,-10) size 65x19
                 chunk 1 text run 1 at (10.00,-10.00) startOffset 0 endOffset 1 width 5.00: "1"
                 chunk 2 text run 1 at (60.00,-5.00) startOffset 1 endOffset 4 width 15.00: "234"
-      RenderSVGContainer {g} at (356.67,15.00) size 171.67x535 [transform={m=((1.00,0.00)(0.00,1.00)) t=(250.00,40.00)}]
-        RenderSVGText {text} at (-36,-17) size 70x18 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-14) size 71x18
+      RenderSVGContainer {g} at (358.33,15.00) size 171.67x535 [transform={m=((1.00,0.00)(0.00,1.00)) t=(250.00,40.00)}]
+        RenderSVGText {text} at (-36,-17) size 71x19 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (1,-14) size 71x19
             chunk 1 (middle anchor) text run 1 at (-35.50,-17.00) startOffset 0 endOffset 11 width 71.00: "text-anchor"
-        RenderSVGText {text} at (-22,-3) size 42x18 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-14) size 43x18
+        RenderSVGText {text} at (-22,-3) size 43x18 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (1,-14) size 43x18
             chunk 1 (middle anchor) text run 1 at (-21.50,-3.00) startOffset 0 endOffset 6 width 43.00: "middle"
         RenderPath {line} at (415.83,83.33) size 1.67x466.67 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,10.00L0.00,290.00"]
-        RenderSVGContainer {use} at (400,91.67) size 128.33x423.33
-          RenderSVGContainer {g} at (400,91.67) size 128.33x423.33
-            RenderSVGContainer {g} at (400,91.67) size 128.33x423.33
+        RenderSVGContainer {use} at (400,91.67) size 130x423.33
+          RenderSVGContainer {g} at (400,91.67) size 130x423.33
+            RenderSVGContainer {g} at (400,91.67) size 130x423.33
               RenderSVGContainer {g} at (410,91.67) size 13.33x31.67 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,30.00)}]
                 RenderSVGContainer {g} at (410,91.67) size 13.33x31.67
                   RenderPath {line} at (415.83,91.67) size 1.67x25 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [data="M0.00,0.00L0.00,-15.00"]
@@ -259,8 +259,8 @@ layer at (0,0) size 800x600
                 RenderSVGContainer {g} at (476.67,141.67) size 13.33x31.67
                   RenderPath {line} at (482.50,141.67) size 1.67x25 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [data="M0.00,0.00L0.00,-15.00"]
                   RenderPath {rect} at (476.67,160.00) size 13.33x13.33 [fill={[type=SOLID] [color=#8888FF]}] [data="M-4.00,-4.00L4.00,-4.00L4.00,4.00L-4.00,4.00"]
-              RenderSVGText {text} at (7,60) size 35x13 contains 4 chunk(s)
-                RenderSVGInlineText {#text} at (0,-10) size 35x13
+              RenderSVGText {text} at (7,60) size 36x13 contains 4 chunk(s)
+                RenderSVGInlineText {#text} at (0,-10) size 36x13
                   chunk 1 (middle anchor) text run 1 at (7.50,60.00) startOffset 0 endOffset 1 width 5.00: "1"
                   chunk 2 (middle anchor) text run 1 at (17.50,60.00) startOffset 1 endOffset 2 width 5.00: "2"
                   chunk 3 (middle anchor) text run 1 at (27.50,60.00) startOffset 2 endOffset 3 width 5.00: "3"
@@ -273,8 +273,8 @@ layer at (0,0) size 800x600
                 RenderSVGContainer {g} at (510.00,191.67) size 13.33x31.67
                   RenderPath {line} at (515.83,191.67) size 1.67x25 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [data="M0.00,0.00L0.00,-15.00"]
                   RenderPath {rect} at (510.00,210.00) size 13.33x13.33 [fill={[type=SOLID] [color=#8888FF]}] [data="M-4.00,-4.00L4.00,-4.00L4.00,4.00L-4.00,4.00"]
-              RenderSVGText {text} at (7,90) size 60x13 contains 2 chunk(s)
-                RenderSVGInlineText {#text} at (0,-10) size 60x13
+              RenderSVGText {text} at (7,90) size 61x13 contains 2 chunk(s)
+                RenderSVGInlineText {#text} at (0,-10) size 61x13
                   chunk 1 (middle anchor) text run 1 at (7.50,90.00) startOffset 0 endOffset 1 width 5.00: "1"
                   chunk 2 (middle anchor) text run 1 at (52.50,90.00) startOffset 1 endOffset 4 width 15.00: "234"
               RenderSVGContainer {g} at (400,225.00) size 98.33x65 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,120.00)}]
@@ -314,8 +314,8 @@ layer at (0,0) size 800x600
                   RenderSVGContainer {g} at (476.67,308.33) size 13.33x31.67
                     RenderPath {line} at (482.50,308.33) size 1.67x25 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [data="M0.00,0.00L0.00,-15.00"]
                     RenderPath {rect} at (476.67,326.67) size 13.33x13.33 [fill={[type=SOLID] [color=#8888FF]}] [data="M-4.00,-4.00L4.00,-4.00L4.00,4.00L-4.00,4.00"]
-                RenderSVGText {text} at (7,-10) size 35x33 contains 4 chunk(s)
-                  RenderSVGInlineText {#text} at (0,-10) size 35x33
+                RenderSVGText {text} at (7,-10) size 36x33 contains 4 chunk(s)
+                  RenderSVGInlineText {#text} at (0,-10) size 36x33
                     chunk 1 (middle anchor) text run 1 at (7.50,-10.00) startOffset 0 endOffset 1 width 5.00: "1"
                     chunk 2 (middle anchor) text run 1 at (17.50,-5.00) startOffset 1 endOffset 2 width 5.00: "2"
                     chunk 3 (middle anchor) text run 1 at (27.50,5.00) startOffset 2 endOffset 3 width 5.00: "3"
@@ -337,8 +337,8 @@ layer at (0,0) size 800x600
                   RenderSVGContainer {g} at (493.33,358.33) size 13.33x31.67
                     RenderPath {line} at (499.17,358.33) size 1.67x25 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [data="M0.00,0.00L0.00,-15.00"]
                     RenderPath {rect} at (493.33,376.67) size 13.33x13.33 [fill={[type=SOLID] [color=#8888FF]}] [data="M-4.00,-4.00L4.00,-4.00L4.00,4.00L-4.00,4.00"]
-                RenderSVGText {text} at (7,-10) size 20x33 contains 2 chunk(s)
-                  RenderSVGInlineText {#text} at (0,-10) size 20x33
+                RenderSVGText {text} at (7,-10) size 21x33 contains 2 chunk(s)
+                  RenderSVGInlineText {#text} at (0,-10) size 21x33
                     chunk 1 (middle anchor) text run 1 at (7.50,-10.00) startOffset 0 endOffset 1 width 5.00: "1"
                     chunk 2 (middle anchor) text run 1 at (12.50,-5.00) startOffset 1 endOffset 4 width 15.00: "234"
               RenderSVGContainer {g} at (400,375) size 48.33x56.67 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,210.00)}]
@@ -370,13 +370,13 @@ layer at (0,0) size 800x600
                   RenderSVGContainer {g} at (476.67,433.33) size 13.33x31.67
                     RenderPath {line} at (482.50,433.33) size 1.67x25 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [data="M0.00,0.00L0.00,-15.00"]
                     RenderPath {rect} at (476.67,451.67) size 13.33x13.33 [fill={[type=SOLID] [color=#8888FF]}] [data="M-4.00,-4.00L4.00,-4.00L4.00,4.00L-4.00,4.00"]
-                RenderSVGText {text} at (7,-10) size 35x18 contains 4 chunk(s)
-                  RenderSVGInlineText {#text} at (0,-10) size 35x18
+                RenderSVGText {text} at (7,-10) size 36x19 contains 4 chunk(s)
+                  RenderSVGInlineText {#text} at (0,-10) size 36x19
                     chunk 1 (middle anchor) text run 1 at (7.50,-10.00) startOffset 0 endOffset 1 width 5.00: "1"
                     chunk 2 (middle anchor) text run 1 at (17.50,-5.00) startOffset 1 endOffset 2 width 5.00: "2"
                     chunk 3 (middle anchor) text run 1 at (27.50,-5.00) startOffset 2 endOffset 3 width 5.00: "3"
                     chunk 4 (middle anchor) text run 1 at (37.50,-5.00) startOffset 3 endOffset 4 width 5.00: "4"
-              RenderSVGContainer {g} at (426.67,475.00) size 101.67x40 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,270.00)}]
+              RenderSVGContainer {g} at (426.67,475.00) size 103.33x40 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,270.00)}]
                 RenderSVGContainer {g} at (426.67,475.00) size 13.33x31.67 [transform={m=((1.00,0.00)(0.00,1.00)) t=(10.00,-10.00)}]
                   RenderSVGContainer {g} at (426.67,475.00) size 13.33x31.67
                     RenderPath {line} at (432.50,475.00) size 1.67x25 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [data="M0.00,0.00L0.00,-15.00"]
@@ -385,16 +385,16 @@ layer at (0,0) size 800x600
                   RenderSVGContainer {g} at (510.00,483.33) size 13.33x31.67
                     RenderPath {line} at (515.83,483.33) size 1.67x25 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [data="M0.00,0.00L0.00,-15.00"]
                     RenderPath {rect} at (510.00,501.67) size 13.33x13.33 [fill={[type=SOLID] [color=#8888FF]}] [data="M-4.00,-4.00L4.00,-4.00L4.00,4.00L-4.00,4.00"]
-                RenderSVGText {text} at (7,-10) size 60x18 contains 2 chunk(s)
-                  RenderSVGInlineText {#text} at (0,-10) size 60x18
+                RenderSVGText {text} at (7,-10) size 61x19 contains 2 chunk(s)
+                  RenderSVGInlineText {#text} at (0,-10) size 61x19
                     chunk 1 (middle anchor) text run 1 at (7.50,-10.00) startOffset 0 endOffset 1 width 5.00: "1"
                     chunk 2 (middle anchor) text run 1 at (52.50,-5.00) startOffset 1 endOffset 4 width 15.00: "234"
-      RenderSVGContainer {g} at (523.33,15.00) size 166.67x535 [transform={m=((1.00,0.00)(0.00,1.00)) t=(350.00,40.00)}]
-        RenderSVGText {text} at (-36,-17) size 70x18 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-14) size 71x18
+      RenderSVGContainer {g} at (525,15.00) size 165x535 [transform={m=((1.00,0.00)(0.00,1.00)) t=(350.00,40.00)}]
+        RenderSVGText {text} at (-36,-17) size 71x19 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (1,-14) size 71x19
             chunk 1 (middle anchor) text run 1 at (-35.50,-17.00) startOffset 0 endOffset 11 width 71.00: "text-anchor"
-        RenderSVGText {text} at (-12,-3) size 22x18 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-14) size 23x18
+        RenderSVGText {text} at (-12,-3) size 23x18 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (1,-14) size 23x18
             chunk 1 (middle anchor) text run 1 at (-11.50,-3.00) startOffset 0 endOffset 3 width 23.00: "end"
         RenderPath {line} at (582.50,83.33) size 1.67x466.67 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,10.00L0.00,290.00"]
         RenderSVGContainer {use} at (550,91.67) size 140x423.33
@@ -534,8 +534,8 @@ layer at (0,0) size 800x600
                   RenderSVGContainer {g} at (643.33,433.33) size 13.33x31.67
                     RenderPath {line} at (649.17,433.33) size 1.67x25 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [data="M0.00,0.00L0.00,-15.00"]
                     RenderPath {rect} at (643.33,451.67) size 13.33x13.33 [fill={[type=SOLID] [color=#8888FF]}] [data="M-4.00,-4.00L4.00,-4.00L4.00,4.00L-4.00,4.00"]
-                RenderSVGText {text} at (5,-10) size 35x18 contains 4 chunk(s)
-                  RenderSVGInlineText {#text} at (0,-10) size 35x18
+                RenderSVGText {text} at (5,-10) size 35x19 contains 4 chunk(s)
+                  RenderSVGInlineText {#text} at (0,-10) size 35x19
                     chunk 1 (end anchor) text run 1 at (5.00,-10.00) startOffset 0 endOffset 1 width 5.00: "1"
                     chunk 2 (end anchor) text run 1 at (15.00,-5.00) startOffset 1 endOffset 2 width 5.00: "2"
                     chunk 3 (end anchor) text run 1 at (25.00,-5.00) startOffset 2 endOffset 3 width 5.00: "3"
@@ -549,8 +549,8 @@ layer at (0,0) size 800x600
                   RenderSVGContainer {g} at (676.67,483.33) size 13.33x31.67
                     RenderPath {line} at (682.50,483.33) size 1.67x25 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [data="M0.00,0.00L0.00,-15.00"]
                     RenderPath {rect} at (676.67,501.67) size 13.33x13.33 [fill={[type=SOLID] [color=#8888FF]}] [data="M-4.00,-4.00L4.00,-4.00L4.00,4.00L-4.00,4.00"]
-                RenderSVGText {text} at (5,-10) size 55x18 contains 2 chunk(s)
-                  RenderSVGInlineText {#text} at (0,-10) size 55x18
+                RenderSVGText {text} at (5,-10) size 55x19 contains 2 chunk(s)
+                  RenderSVGInlineText {#text} at (0,-10) size 55x19
                     chunk 1 (end anchor) text run 1 at (5.00,-10.00) startOffset 0 endOffset 1 width 5.00: "1"
                     chunk 2 (end anchor) text run 1 at (45.00,-5.00) startOffset 1 endOffset 4 width 15.00: "234"
     RenderSVGText {text} at (10,350) size 264x46 contains 1 chunk(s)

diff --git a/LayoutTests/svg/text/text-text-06-t-expected.txt b/LayoutTests/svg/text/text-text-06-t-expected.txt
index 3e8c387e108f485935d320691aa49869f902e2a4..9beeab74afeb43bfa6ff562eac9541083b24afde 100644 (file)
--- a/LayoutTests/svg/text/text-text-06-t-expected.txt
+++ b/LayoutTests/svg/text/text-text-06-t-expected.txt
@@ -2,13 +2,13 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderSVGRoot {svg} at (0.83,0.83) size 798.33x598.33
-    RenderSVGContainer {g} at (50,91.67) size 458.33x348.33
+    RenderSVGContainer {g} at (50,91.67) size 456.67x348.33
       RenderSVGHiddenContainer {defs} at (0,0) size 0x0
       RenderSVGHiddenContainer {defs} at (0,0) size 0x0
         RenderSVGContainer {g} at (-4,-15) size 8x19
           RenderPath {line} at (-0.50,-15) size 1x15 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00L0.00,-15.00"]
           RenderPath {rect} at (-4,-4) size 8x8 [fill={[type=SOLID] [color=#000000]}] [data="M-4.00,-4.00L4.00,-4.00L4.00,4.00L-4.00,4.00"]
-      RenderSVGContainer {g} at (50,91.67) size 458.33x348.33 [transform={m=((1.00,0.00)(0.00,1.00)) t=(20.00,30.00)}]
+      RenderSVGContainer {g} at (50,91.67) size 456.67x348.33 [transform={m=((1.00,0.00)(0.00,1.00)) t=(20.00,30.00)}]
         RenderSVGContainer {g} at (50,98.33) size 118.33x256.67 [transform={m=((1.00,0.00)(0.00,1.00)) t=(10.00,40.00)}]
           RenderSVGText {text} at (0,0) size 62x14 contains 1 chunk(s)
             RenderSVGInlineText {#text} at (0,-11) size 62x14
@@ -19,7 +19,7 @@ layer at (0,0) size 800x600
           RenderSVGText {text} at (0,140) size 71x14 contains 1 chunk(s)
             RenderSVGInlineText {#text} at (0,-11) size 71x14
               chunk 1 text run 1 at (0.00,140.00) startOffset 0 endOffset 15 width 71.00: "x/y positioning"
-        RenderSVGContainer {g} at (210,91.67) size 298.33x31.67 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,40.00)}]
+        RenderSVGContainer {g} at (210,91.67) size 296.67x31.67 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,40.00)}]
           RenderSVGContainer {use} at (210,91.67) size 13.33x31.67
             RenderSVGContainer {g} at (210,91.67) size 13.33x31.67 [transform={m=((1.00,0.00)(0.00,1.00)) t=(10.00,0.00)}]
               RenderSVGContainer {g} at (210,91.67) size 13.33x31.67
@@ -50,8 +50,8 @@ layer at (0,0) size 800x600
               RenderSVGContainer {g} at (410,91.67) size 13.33x31.67
                 RenderPath {line} at (415.83,91.67) size 1.67x25 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [data="M0.00,0.00L0.00,-15.00"]
                 RenderPath {rect} at (410,110) size 13.33x13.33 [fill={[type=SOLID] [color=#8888FF]}] [data="M-4.00,-4.00L4.00,-4.00L4.00,4.00L-4.00,4.00"]
-          RenderSVGText {text} at (10,0) size 175x13 contains 6 chunk(s)
-            RenderSVGInlineText {#text} at (0,-10) size 175x13
+          RenderSVGText {text} at (10,0) size 173x13 contains 6 chunk(s)
+            RenderSVGInlineText {#text} at (0,-10) size 173x13
               chunk 1 text run 1 at (10.00,0.00) startOffset 0 endOffset 1 width 3.00: "f"
               chunk 2 text run 1 at (180.00,0.00) startOffset 1 endOffset 2 width 3.00: "i"
               chunk 3 text run 1 at (40.00,0.00) startOffset 2 endOffset 3 width 5.00: "1"
@@ -92,7 +92,7 @@ layer at (0,0) size 800x600
           RenderSVGText {text} at (0,-10) size 26x73 contains 1 chunk(s)
             RenderSVGInlineText {#text} at (0,-10) size 26x73
               chunk 1 text run 1 at (0.00,-10.00) startOffset 0 endOffset 6 width 26.00: "fi1234"
-        RenderSVGContainer {g} at (210,308.33) size 298.33x131.67 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,180.00)}]
+        RenderSVGContainer {g} at (210,308.33) size 296.67x131.67 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,180.00)}]
           RenderSVGContainer {use} at (210,308.33) size 13.33x31.67
             RenderSVGContainer {g} at (210,308.33) size 13.33x31.67 [transform={m=((1.00,0.00)(0.00,1.00)) t=(10.00,-10.00)}]
               RenderSVGContainer {g} at (210,308.33) size 13.33x31.67
@@ -123,8 +123,8 @@ layer at (0,0) size 800x600
               RenderSVGContainer {g} at (410,375) size 13.33x31.67
                 RenderPath {line} at (415.83,375) size 1.67x25 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#8888FF]}] [data="M0.00,0.00L0.00,-15.00"]
                 RenderPath {rect} at (410,393.33) size 13.33x13.33 [fill={[type=SOLID] [color=#8888FF]}] [data="M-4.00,-4.00L4.00,-4.00L4.00,4.00L-4.00,4.00"]
-          RenderSVGText {text} at (10,-10) size 175x73 contains 6 chunk(s)
-            RenderSVGInlineText {#text} at (0,-10) size 175x73
+          RenderSVGText {text} at (10,-10) size 173x73 contains 6 chunk(s)
+            RenderSVGInlineText {#text} at (0,-10) size 173x73
               chunk 1 text run 1 at (10.00,-10.00) startOffset 0 endOffset 1 width 3.00: "f"
               chunk 2 text run 1 at (180.00,50.00) startOffset 1 endOffset 2 width 3.00: "i"
               chunk 3 text run 1 at (40.00,0.00) startOffset 2 endOffset 3 width 5.00: "1"

diff --git a/LayoutTests/svg/text/text-text-07-t-expected.txt b/LayoutTests/svg/text/text-text-07-t-expected.txt
index 15df5d2bd7909a6a2a6f343d80def84a3111dfee..3719d322618d0f148bf3b903f42a4f3bd667bda8 100644 (file)
--- a/LayoutTests/svg/text/text-text-07-t-expected.txt
+++ b/LayoutTests/svg/text/text-text-07-t-expected.txt
@@ -12,11 +12,11 @@ layer at (0,0) size 800x600
           chunk 5 text run 1 at (320.00,140.00) startOffset 4 endOffset 5 width 10.00: "i"
           chunk 6 text run 1 at (340.00,160.00) startOffset 5 endOffset 6 width 9.00: " "
           chunk 7 text run 1 at (360.00,180.00) startOffset 6 endOffset 9 width 59.00: "X Y"
-      RenderSVGText {text} at (10,60) size 136x40 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,-31) size 136x40
+      RenderSVGText {text} at (10,60) size 152x53 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-31) size 152x53
           chunk 1 text run 1 at (10.00,60.00) startOffset 0 endOffset 6 width 136.00: "ROTATE"
-      RenderSVGText {text} at (10,180) size 252x160 contains 13 chunk(s)
-        RenderSVGInlineText {#text} at (0,-31) size 252x160
+      RenderSVGText {text} at (10,180) size 248x144 contains 13 chunk(s)
+        RenderSVGInlineText {#text} at (0,-15) size 248x144
           chunk 1 text run 1 at (10.00,300.00) startOffset 0 endOffset 1 width 23.00: "B"
           chunk 2 text run 1 at (30.00,290.00) startOffset 1 endOffset 2 width 18.00: "o"
           chunk 3 text run 1 at (50.00,280.00) startOffset 2 endOffset 3 width 10.00: "t"

diff --git a/LayoutTests/svg/text/text-tselect-02-f-expected.txt b/LayoutTests/svg/text/text-tselect-02-f-expected.txt
index 8fe480470c92fbf300e242884a0da17a4c60fc17..d2879dfcbe9547251502c7d59d209ab279d928d4 100644 (file)
--- a/LayoutTests/svg/text/text-tselect-02-f-expected.txt
+++ b/LayoutTests/svg/text/text-tselect-02-f-expected.txt
@@ -25,12 +25,12 @@ layer at (0,0) size 800x600
             RenderSVGInlineText {#text} at (0,-14) size 72x18
               chunk 1 (middle anchor) text run 1 at (134.00,175.00) startOffset 0 endOffset 12 width 72.00: "startIndex--"
           RenderPath {rect} at (383.33,366.67) size 166.67x33.33 [fill={[type=SOLID] [color=#0000FF]}] [data="M230.00,160.00L330.00,160.00L330.00,180.00L230.00,180.00"]
-          RenderSVGText {text} at (238,175) size 83x18 contains 1 chunk(s) [color=#FFFFFF]
-            RenderSVGInlineText {#text} at (0,-14) size 83x18
+          RenderSVGText {text} at (238,175) size 84x18 contains 1 chunk(s) [color=#FFFFFF]
+            RenderSVGInlineText {#text} at (0,-14) size 84x18
               chunk 1 (middle anchor) text run 1 at (238.50,175.00) startOffset 0 endOffset 10 width 83.00: "numChars++"
           RenderPath {rect} at (566.67,366.67) size 166.67x33.33 [fill={[type=SOLID] [color=#0000FF]}] [data="M340.00,160.00L440.00,160.00L440.00,180.00L340.00,180.00"]
-          RenderSVGText {text} at (352,175) size 75x18 contains 1 chunk(s) [color=#FFFFFF]
-            RenderSVGInlineText {#text} at (0,-14) size 75x18
+          RenderSVGText {text} at (352,175) size 76x18 contains 1 chunk(s) [color=#FFFFFF]
+            RenderSVGInlineText {#text} at (0,-14) size 76x18
               chunk 1 (middle anchor) text run 1 at (352.50,175.00) startOffset 0 endOffset 10 width 75.00: "numChars--"
     RenderSVGText {text} at (10,340) size 264x46 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,-36) size 264x46

diff --git a/LayoutTests/svg/text/text-tspan-01-b-expected.txt b/LayoutTests/svg/text/text-tspan-01-b-expected.txt
index fb9b45e781dc793d130c042ae51a7eb47fe7e2bf..c930d7ff541de3b57de3d7bfef1b8ff970bf5dcd 100644 (file)
--- a/LayoutTests/svg/text/text-tspan-01-b-expected.txt
+++ b/LayoutTests/svg/text/text-tspan-01-b-expected.txt
@@ -6,47 +6,47 @@ layer at (0,0) size 800x600
       RenderSVGText {text} at (25,20) size 420x17 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,-14) size 420x17
           chunk 1 text run 1 at (25.00,20.00) startOffset 0 endOffset 60 width 420.00: "Basics of tspan: changing visual properties and positioning."
-      RenderSVGContainer {g} at (78.33,81.67) size 519.17x133.33
-        RenderSVGText {text} at (74,63) size 160x17 contains 1 chunk(s) [color=#0000FF]
-          RenderSVGInlineText {#text} at (0,-13) size 56x17
+      RenderSVGContainer {g} at (78.33,81.67) size 519.17x132.08
+        RenderSVGText {text} at (74,63) size 160x18 contains 1 chunk(s) [color=#0000FF]
+          RenderSVGInlineText {#text} at (0,-14) size 56x18
             chunk 1 text run 1 at (74.00,63.75) startOffset 0 endOffset 7 width 56.00: "You are"
-          RenderSVGTSpan {tspan} at (0,0) size 33x17 [color=#FF0000]
-            RenderSVGInlineText {#text} at (56,-13) size 33x17
+          RenderSVGTSpan {tspan} at (0,0) size 33x18 [color=#FF0000]
+            RenderSVGInlineText {#text} at (56,-14) size 33x18
               chunk 1 text run 2 at (130.00,63.75) startOffset 0 endOffset 5 width 33.00: " not "
-          RenderSVGInlineText {#text} at (89,-13) size 71x17
+          RenderSVGInlineText {#text} at (89,-14) size 71x18
             chunk 1 text run 3 at (163.00,63.75) startOffset 0 endOffset 9 width 71.00: "a banana."
         RenderPath {rect} at (78.33,122.92) size 519.17x90.83 [stroke={[type=SOLID] [color=#000000]}] [data="M47.50,74.25L358.00,74.25L358.00,127.75L47.50,127.75"]
-        RenderSVGText {text} at (65,90) size 208x17 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-13) size 208x17
+        RenderSVGText {text} at (65,90) size 208x18 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (0,-14) size 208x18
             chunk 1 text run 1 at (65.25,90.75) startOffset 0 endOffset 29 width 208.00: "Text: \"You are not a banana.\""
         RenderSVGText {text} at (65,108) size 284x17 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-14) size 284x17
             chunk 1 text run 1 at (65.25,108.00) startOffset 0 endOffset 43 width 284.00: "'tspan' changes visual attributes of \"not\","
         RenderSVGText {text} at (65,125) size 83x17 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-13) size 83x17
+          RenderSVGInlineText {#text} at (0,-14) size 83x17
             chunk 1 text run 1 at (65.25,125.25) startOffset 0 endOffset 13 width 83.00: "to red, bold."
       RenderSVGContainer {g} at (374.17,215) size 410.83x173.33
-        RenderSVGText {text} at (257,143) size 175x42 contains 1 chunk(s) [color=#0000FF]
-          RenderSVGInlineText {#text} at (0,-3) size 54x17
+        RenderSVGText {text} at (257,143) size 176x43 contains 1 chunk(s) [color=#0000FF]
+          RenderSVGInlineText {#text} at (0,-4) size 55x18
             chunk 1 text run 1 at (257.50,153.75) startOffset 0 endOffset 7 width 54.00: "But you"
-          RenderSVGTSpan {tspan} at (0,0) size 24x17 [color=#FF0000]
-            RenderSVGInlineText {#text} at (86,-14) size 24x17
+          RenderSVGTSpan {tspan} at (0,0) size 25x17 [color=#FF0000]
+            RenderSVGInlineText {#text} at (86,-14) size 25x17
               chunk 1 text run 2 at (343.50,143.00) startOffset 0 endOffset 3 width 24.00: "are"
-          RenderSVGTSpan {tspan} at (0,0) size 65x17
-            RenderSVGInlineText {#text} at (110,11) size 65x17
+          RenderSVGTSpan {tspan} at (0,0) size 66x18
+            RenderSVGInlineText {#text} at (110,11) size 66x18
               chunk 1 text run 3 at (367.50,168.50) startOffset 0 endOffset 9 width 65.00: " a peach!"
         RenderPath {rect} at (374.17,297.50) size 410.83x90.83 [stroke={[type=SOLID] [color=#000000]}] [data="M225.00,179.00L470.50,179.00L470.50,232.50L225.00,232.50"]
         RenderSVGText {text} at (238,195) size 197x17 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,-14) size 197x17
             chunk 1 text run 1 at (238.00,195.00) startOffset 0 endOffset 28 width 197.00: "Text: \"But you are a peach!\""
         RenderSVGText {text} at (238,212) size 227x17 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-13) size 227x17
+          RenderSVGInlineText {#text} at (0,-14) size 227x17
             chunk 1 text run 1 at (238.00,212.25) startOffset 0 endOffset 34 width 227.00: "Using dx,dy, 'tspan' raises \"are\","
-        RenderSVGText {text} at (238,229) size 173x17 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-13) size 173x17
+        RenderSVGText {text} at (238,229) size 173x18 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (0,-14) size 173x18
             chunk 1 text run 1 at (238.00,229.50) startOffset 0 endOffset 25 width 173.00: "'tspan' lowers \"a peach!\""
       RenderSVGContainer {g} at (28.33,310) size 560.83x187.92
-        RenderSVGText {text} at (35,200) size 144x47 contains 13 chunk(s) [color=#FFA400]
+        RenderSVGText {text} at (35,200) size 144x48 contains 13 chunk(s) [color=#FFA400]
           RenderSVGTSpan {tspan} at (0,0) size 144x17
             RenderSVGInlineText {#text} at (0,-14) size 144x17
               chunk 1 text run 1 at (35.00,200.00) startOffset 0 endOffset 1 width 12.00: "C"
@@ -58,8 +58,8 @@ layer at (0,0) size 800x600
               chunk 7 text run 1 at (147.50,200.00) startOffset 6 endOffset 7 width 9.00: "n"
               chunk 8 text run 1 at (166.25,200.00) startOffset 7 endOffset 9 width 13.00: "d "
           RenderSVGInlineText {#text} at (0,0) size 0x0
-          RenderSVGTSpan {tspan} at (0,0) size 87x17
-            RenderSVGInlineText {#text} at (28,16) size 87x17
+          RenderSVGTSpan {tspan} at (0,0) size 87x18
+            RenderSVGInlineText {#text} at (28,16) size 87x18
               chunk 9 text run 1 at (63.13,230.50) startOffset 0 endOffset 1 width 4.00: "f"
               chunk 10 text run 1 at (81.88,230.50) startOffset 1 endOffset 2 width 9.00: "u"
               chunk 11 text run 1 at (100.63,230.50) startOffset 2 endOffset 3 width 8.00: "z"
@@ -71,10 +71,10 @@ layer at (0,0) size 800x600
           RenderSVGInlineText {#text} at (0,-14) size 161x17
             chunk 1 text run 1 at (25.25,258.00) startOffset 0 endOffset 23 width 161.00: "Text: \"Cute and fuzzy.\""
         RenderSVGText {text} at (25,275) size 318x17 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-13) size 318x17
+          RenderSVGInlineText {#text} at (0,-14) size 318x17
             chunk 1 text run 1 at (25.25,275.25) startOffset 0 endOffset 45 width 318.00: "'tspan' char-by-char placement of \"Cute and\","
-        RenderSVGText {text} at (25,292) size 258x17 contains 1 chunk(s)
-          RenderSVGInlineText {#text} at (0,-13) size 258x17
+        RenderSVGText {text} at (25,292) size 258x18 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (0,-14) size 258x18
             chunk 1 text run 1 at (25.25,292.50) startOffset 0 endOffset 39 width 258.00: "'tspan' char-by-char \"fuzzy\", below it."
     RenderSVGText {text} at (10,340) size 264x46 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,-36) size 264x46

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5411ab61a53f98c6ffe94a62be053b220f15bb4c..60ad1b18a2e35b9e31f295c62ed7e67421e8e769 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2007-08-08  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed by Oliver.
+
+        Fixes: http://bugs.webkit.org/show_bug.cgi?id=14896 (SVG InlineText/Flow box sizes don't take rotated glyphs into account)
+
+        Introduce new helper function calculateGlyphBoundaries, which takes into account any per-character transformation.
+        This fixes box size calculations in svg/W3C-SVG-1.1/text-text-07-t.svg, svg/batik/text/textEffect3.svg (rotated glyphs)
+        -> These strings can be properly selected now, just as well as text path elements.
+
+        * rendering/SVGInlineTextBox.cpp:
+        (WebCore::SVGInlineTextBox::calculateGlyphBoundaries):
+        (WebCore::SVGInlineTextBox::closestCharacterToPosition):
+        (WebCore::SVGInlineTextBox::nodeAtPoint):
+        (WebCore::SVGInlineTextBox::selectionRect):
+        * rendering/SVGInlineTextBox.h:
+        * rendering/SVGRootInlineBox.cpp:
+        (WebCore::SVGRootInlineBox::layoutInlineBoxes):
+
 2007-08-08  Nikolas Zimmermann  <zimmermann@kde.org>
 
         Reviewed by Oliver.

diff --git a/WebCore/rendering/SVGInlineTextBox.cpp b/WebCore/rendering/SVGInlineTextBox.cpp
index 46411c4205d3011f205c3bacbccf165ecb785632..211b8f247d5aa5a68a9c8e5616d25ee008d6ffee 100644 (file)
--- a/WebCore/rendering/SVGInlineTextBox.cpp
+++ b/WebCore/rendering/SVGInlineTextBox.cpp
@@ -78,6 +78,33 @@ float SVGInlineTextBox::calculateGlyphHeight(RenderStyle* style, int offset) con
     return style->font().ascent() + style->font().descent();
 }
 
+FloatRect SVGInlineTextBox::calculateGlyphBoundaries(RenderStyle* style, int offset, const SVGChar& svgChar) const
+{
+    const Font& font = style->font();
+
+    // Take RTL text into account and pick right glyph width/height.
+    float glyphWidth = 0.0;
+
+    if (!m_reversed)
+        glyphWidth = calculateGlyphWidth(style, offset);
+    else
+        glyphWidth = calculateGlyphWidth(style, start() + end() - offset);
+
+    float x1 = svgChar.x;
+    float x2 = svgChar.x + glyphWidth;
+
+    float y1 = svgChar.y - font.ascent();
+    float y2 = svgChar.y + font.descent();
+
+    FloatRect glyphRect(x1, y1, x2 - x1, y2 - y1);
+
+    // Take per-character transformations into account
+    if (!svgChar.transform.isIdentity())
+        glyphRect = svgChar.transform.mapRect(glyphRect);
+
+    return glyphRect;
+}
+
 SVGChar* SVGInlineTextBox::closestCharacterToPosition(int x, int y, int& offset) const
 {
     // Find corresponding text chunk for our inline box & reference x position
@@ -127,17 +154,11 @@ SVGChar* SVGInlineTextBox::closestCharacterToPosition(int x, int y, int& offset)
                 unsigned int newOffset = start() + (itChar - itCharBegin) + firstRangeInFirstChunkStartOffset;
 
                 // Take RTL text into account and pick right glyph width/height.
-                float glyphWidth = 0.0;
-                float glyphHeight = 0.0;
-
-                if (!m_reversed) {
-                    glyphWidth = calculateGlyphWidth(style, newOffset);
-                    glyphHeight = calculateGlyphHeight(style, newOffset);
-                } else {    
-                    glyphWidth = calculateGlyphWidth(style, start() + end() - newOffset);
-                    glyphHeight = calculateGlyphHeight(style, start() + end() - newOffset);
+                if (m_reversed)
                     newOffset = start() + end() - newOffset;
-                }
+
+                float glyphWidth = calculateGlyphWidth(style, newOffset);
+                float glyphHeight = calculateGlyphHeight(style, newOffset);
 
                 // Calculate distances relative to the glyph mid-point. I hope this is accurate enough.
                 float xDistance = (*itChar).x + glyphWidth / 2.0 - x;
@@ -230,9 +251,7 @@ bool SVGInlineTextBox::nodeAtPoint(const HitTestRequest& request, HitTestResult&
 {
     ASSERT(!isLineBreak());
 
-    RenderStyle* style = textObject()->style(m_firstLine);
-    IntRect rect = selectionRect(0, -style->font().ascent(), 0, len());
-
+    IntRect rect = selectionRect(0, 0, 0, len());
     if (object()->style()->visibility() == VISIBLE && rect.contains(x, y)) {
         object()->updateHitTestResult(result, IntPoint(x - tx, y - ty));
         return true;
@@ -241,21 +260,19 @@ bool SVGInlineTextBox::nodeAtPoint(const HitTestRequest& request, HitTestResult&
     return false;
 }
 
-IntRect SVGInlineTextBox::selectionRect(int tx, int ty, int startPos, int endPos)
+IntRect SVGInlineTextBox::selectionRect(int, int, int startPos, int endPos)
 {
     if (startPos >= endPos)
         return IntRect();
 
     // TODO: Actually respect startPos/endPos - we're returning the _full_ selectionRect
     // here. This won't lead to visible bugs, but to extra work being done. Investigate.
-    
+
     // Find corresponding text chunk for our inline box & reference x position
     SVGRootInlineBox* rootBox = svgRootInlineBox();
     Vector<SVGTextChunk>& chunks = const_cast<Vector<SVGTextChunk>& >(rootBox->svgTextChunks());
 
     RenderStyle* style = textObject()->style();
-    const Font& font = style->font();
-
     FloatRect selectionRect;
     
     Vector<SVGTextChunk>::iterator it = chunks.begin();
@@ -289,31 +306,8 @@ IntRect SVGInlineTextBox::selectionRect(int tx, int ty, int startPos, int endPos
             for (Vector<SVGChar>::iterator itChar = itCharBegin; itChar != itCharEnd; ++itChar) {
                 unsigned int newOffset = start() + (itChar - itCharBegin) + firstRangeInFirstChunkStartOffset;
 
-                // Take RTL text into account and pick right glyph width/height.
-                float glyphWidth = 0.0;
-                float glyphHeight = 0.0;
-
-                if (!m_reversed) {
-                    glyphWidth = calculateGlyphWidth(style, newOffset);
-                    glyphHeight = calculateGlyphHeight(style, newOffset);
-                } else {    
-                    glyphWidth = calculateGlyphWidth(style, start() + end() - newOffset);
-                    glyphHeight = calculateGlyphHeight(style, start() + end() - newOffset);
-                }
-
-                float x1 = (*itChar).x;
-                float x2 = (*itChar).x + glyphWidth;
-
-                float y1 = (*itChar).y - font.ascent();
-                float y2 = (*itChar).y + font.descent();
-
-                FloatRect glyphRect(x1, y1, x2 - x1, y2 - y1);
-
-                // Take per-character transformations into account
-                if (!(*itChar).transform.isIdentity())
-                    glyphRect = (*itChar).transform.mapRect(glyphRect);
-
-                selectionRect.unite(glyphRect);
+                int offset = m_reversed ? start() + end() - newOffset : newOffset;
+                selectionRect.unite(calculateGlyphBoundaries(style, offset, *itChar));
             }
 
             chunkOffset += range.endOffset - range.startOffset;

diff --git a/WebCore/rendering/SVGInlineTextBox.h b/WebCore/rendering/SVGInlineTextBox.h
index 32d76c71480dbe024fbecf20a4b3fc9fe8de3ba8..ee909911ae4f9c1e8b420222bbf74d78341a049d 100644 (file)
--- a/WebCore/rendering/SVGInlineTextBox.h
+++ b/WebCore/rendering/SVGInlineTextBox.h
@@ -52,6 +52,8 @@ namespace WebCore {
         float calculateGlyphWidth(RenderStyle*, int offset) const;
         float calculateGlyphHeight(RenderStyle*, int offset) const;
 
+        FloatRect calculateGlyphBoundaries(RenderStyle*, int offset, const SVGChar&) const;
+
     private:
         friend class RenderSVGInlineText;
         bool svgCharacterHitsPosition(int x, int y, int& offset) const;

diff --git a/WebCore/rendering/SVGRootInlineBox.cpp b/WebCore/rendering/SVGRootInlineBox.cpp
index 1c0900399129c337687d3ec82918836bea797262..c40634d998bd087b6e655b32a8547f564c7b39ad 100644 (file)
--- a/WebCore/rendering/SVGRootInlineBox.cpp
+++ b/WebCore/rendering/SVGRootInlineBox.cpp
@@ -469,51 +469,38 @@ void SVGRootInlineBox::layoutInlineBoxes()
 void SVGRootInlineBox::layoutInlineBoxes(InlineFlowBox* start, Vector<SVGChar>::iterator& it, int& lowX, int& highX, int& lowY, int& highY)
 {
     for (InlineBox* curr = start->firstChild(); curr; curr = curr->nextOnLine()) {
-        const Font& font = curr->object()->style()->font();
-   
+        RenderStyle* style = curr->object()->style();    
+        const Font& font = style->font();
+
         if (curr->object()->isText()) {
-            InlineTextBox* textBox = static_cast<InlineTextBox*>(curr);
+            SVGInlineTextBox* textBox = static_cast<SVGInlineTextBox*>(curr);
             unsigned length = textBox->len();
 
-            SVGChar curChar = *it;
-            ASSERT(it != m_svgChars.end());
- 
-            float minX = curChar.x, minY = curChar.y;
-            float maxX = minX, maxY = minY;
-
-            it++;
+            SVGChar curChar = *it; 
+            ASSERT(it != m_svgChars.end());  
 
-            for (unsigned i = 1; i < length; ++i) {
+            FloatRect stringRect;
+            for (unsigned i = 0; i < length; ++i) {
                 ASSERT(it != m_svgChars.end());
-                SVGChar curChar = *it;
-
-                if (curChar.x < minX)
-                    minX = curChar.x;
-
-                if (curChar.x > maxX)
-                    maxX = curChar.x;
-
-                if (curChar.y < minY)
-                    minY = curChar.y;
-
-                if (curChar.y > maxY)
-                    maxY = curChar.y;
 
+                stringRect.unite(textBox->calculateGlyphBoundaries(style, textBox->start() + i, *it));
                 it++;
             }
 
-            RenderText* text = textBox->textObject();
-            ASSERT(text);
+            IntRect enclosedStringRect = enclosingIntRect(stringRect);
 
-            maxX += text->width(textBox->end(), 1, font, 0);
-            maxY += font.ascent() + font.descent();
+            int minX = enclosedStringRect.x();
+            int maxX = minX + enclosedStringRect.width();
+
+            int minY = enclosedStringRect.y();
+            int maxY = minY + enclosedStringRect.height();
 
             curr->setXPos(minX - object()->xPos());
-            curr->setWidth(maxX - minX);
+            curr->setWidth(enclosedStringRect.width());
 
-            curr->setYPos(minY - object()->yPos() - font.ascent());
+            curr->setYPos(minY - object()->yPos());
             curr->setBaseline(font.ascent());
-            curr->setHeight(maxY - minY);
+            curr->setHeight(enclosedStringRect.height());
 
             if (minX < lowX)
                 lowX = minX;
@@ -540,7 +527,7 @@ void SVGRootInlineBox::layoutInlineBoxes(InlineFlowBox* start, Vector<SVGChar>::
             curr->setXPos(minX - object()->xPos());
             curr->setWidth(maxX - minX);
 
-            curr->setYPos(minY - object()->yPos() - font.ascent());
+            curr->setYPos(minY - object()->yPos());
             curr->setBaseline(font.ascent());
             curr->setHeight(maxY - minY);
 
@@ -559,9 +546,7 @@ void SVGRootInlineBox::layoutInlineBoxes(InlineFlowBox* start, Vector<SVGChar>::
     }
 
     if (start->isRootInlineBox()) {
-        const Font& font = start->object()->style()->font();
- 
-        int top = lowY - object()->yPos() - font.ascent();
+        int top = lowY - object()->yPos();
         int bottom = highY - object()->yPos();
 
         start->setXPos(lowX - object()->xPos());