Bug #: 5881
authoreseidel <eseidel@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 Nov 2005 09:21:12 +0000 (09:21 +0000)
committereseidel <eseidel@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 Nov 2005 09:21:12 +0000 (09:21 +0000)
Submitted by: Rob Buis  <rwlbuis@xs4all.nl>
Reviewed by: eseidel
        Fixes 5 test cases:
        - paths-data-02-t.svg (most noticeable)
        - fonts-elem-01-t.svg
        - fonts-elem-02-t.svg
        - fonts-elem-03-t.svg
        - fonts-elem-04-t.svg

        http://bugzilla.opendarwin.org/show_bug.cgi?id=5881
        Quadratic bezier path render error

        * ksvg2/svg/svgpathparser.cpp:
        (SVGPathParser::parseSVG):

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

18 files changed:
LayoutTests/svg/W3C-SVG-1.1/fonts-elem-01-t-expected.checksum
LayoutTests/svg/W3C-SVG-1.1/fonts-elem-01-t-expected.png
LayoutTests/svg/W3C-SVG-1.1/fonts-elem-01-t-expected.txt
LayoutTests/svg/W3C-SVG-1.1/fonts-elem-02-t-expected.checksum
LayoutTests/svg/W3C-SVG-1.1/fonts-elem-02-t-expected.png
LayoutTests/svg/W3C-SVG-1.1/fonts-elem-02-t-expected.txt
LayoutTests/svg/W3C-SVG-1.1/fonts-elem-03-b-expected.checksum
LayoutTests/svg/W3C-SVG-1.1/fonts-elem-03-b-expected.png
LayoutTests/svg/W3C-SVG-1.1/fonts-elem-03-b-expected.txt
LayoutTests/svg/W3C-SVG-1.1/fonts-elem-04-b-expected.checksum
LayoutTests/svg/W3C-SVG-1.1/fonts-elem-04-b-expected.png
LayoutTests/svg/W3C-SVG-1.1/fonts-elem-04-b-expected.txt
LayoutTests/svg/W3C-SVG-1.1/paths-data-02-t-expected.checksum
LayoutTests/svg/W3C-SVG-1.1/paths-data-02-t-expected.png
LayoutTests/svg/W3C-SVG-1.1/paths-data-02-t-expected.txt
LayoutTests/svg/custom/simpleCDF.xml
WebCore/ChangeLog-2005-12-19
WebCore/ksvg2/svg/svgpathparser.cpp

index 8c3ddddb67f35330e0baed8f7bd997d0d8a49063..0f8c4c9e465a2771e5adceb0d3283ee52ac67a3c 100644 (file)
@@ -1 +1 @@
-ee7d72e92abf5ec5bb6f2017829dd6ce
\ No newline at end of file
+4778d907fc08436b580c2bace7152682
\ No newline at end of file
index 5e7928004f261cbcf9cfe82db9eca0da0a3ba518..58437864747e230a9c9753257cc41325b53ea972 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/fonts-elem-01-t-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/fonts-elem-01-t-expected.png differ
index 29861ccd620daaeae3869fb826d0a06b9bf08be2..ff74bd53b210ed2360eafc3ab8a10f33a0fce2fb 100644 (file)
@@ -7,15 +7,15 @@ layer at (0,0) size 480x360
             KCanvasItem {line} at (165,139) size 210x1 [stroke={[type=SOLID] [color=#888888]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00L210.00,0.00"]
             KCanvasContainer {g} at (4,-54) size 211x161 [transform={m=((0.03,0.00)(0.00,0.03)) t=(0.00,0.00)}]
               KCanvasItem {line} at (4,-54) size 1x161 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,-3500.00L0.00,2000.00"]
-              KCanvasItem {path} at (8,-39) size 35x44 [fill={[type=SOLID] [color=#000000]}] [data="M1250.00,-30.00C1188.67,-30.00,1135.33,48.67,1090.00,206.00C1072.67,266.00,1051.00,371.00,1025.00,521.00C957.00,511.67,868.00,495.00,758.00,471.00L492.00,416.00C458.67,328.67,401.67,201.00,321.00,33.00C299.67,-4.33,270.67,-23.00,234.00,-23.00C207.33,-23.00,183.67,-13.33,163.00,6.00C149.22,18.89,138.56,42.89,131.00,78.00C131.00,110.00,181.33,231.67,282.00,443.00C270.67,460.33,265.00,480.33,265.00,503.00C265.00,557.00,297.67,591.67,363.00,607.00C439.00,749.67,535.00,913.67,651.00,1099.00C809.00,1351.67,907.33,1478.00,946.00,1478.00C998.67,1478.00,1034.67,1441.33,1054.00,1368.00L1117.00,1032.00L1266.00,337.00L1323.00,179.00C1342.33,125.00,1352.00,89.00,1352.00,71.00C1352.00,42.33,1341.67,18.33,1321.00,-1.00C1307.22,-13.89,1283.56,-23.56,1250.00,-30.00M897.00,1113.00L611.00,652.00C691.67,672.67,814.00,697.67,978.00,727.00L897.00,1113.00"]
+              KCanvasItem {path} at (8,-39) size 35x44 [fill={[type=SOLID] [color=#000000]}] [data="M1250.00,-30.00C1188.67,-30.00,1135.33,48.67,1090.00,206.00C1072.67,266.00,1051.00,371.00,1025.00,521.00C957.00,511.67,868.00,495.00,758.00,471.00L492.00,416.00C458.67,328.67,401.67,201.00,321.00,33.00C299.67,-4.33,270.67,-23.00,234.00,-23.00C207.33,-23.00,183.67,-13.33,163.00,6.00C142.33,25.33,131.67,49.33,131.00,78.00C131.00,110.00,181.33,231.67,282.00,443.00C270.67,460.33,265.00,480.33,265.00,503.00C265.00,557.00,297.67,591.67,363.00,607.00C439.00,749.67,535.00,913.67,651.00,1099.00C809.00,1351.67,907.33,1478.00,946.00,1478.00C998.67,1478.00,1034.67,1441.33,1054.00,1368.00L1117.00,1032.00L1266.00,337.00L1323.00,179.00C1342.33,125.00,1352.00,89.00,1352.00,71.00C1352.00,42.33,1341.67,18.33,1321.00,-1.00C1300.33,-20.33,1276.67,-30.00,1250.00,-30.00M897.00,1113.00L611.00,652.00C691.67,672.67,814.00,697.67,978.00,727.00L897.00,1113.00"]
               KCanvasItem {line} at (47,-54) size 1x161 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M1498.00,-3500.00L1498.00,2000.00"]
-              KCanvasItem {path} at (1502,-26) size 30x47 [transform={m=((1.00,0.00)(0.00,1.00)) t=(1498.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1011.00,892.00L665.00,144.00C579.67,-38.00,514.33,-190.33,469.00,-313.00L403.00,-507.00C385.67,-555.00,355.67,-579.00,313.00,-579.00C285.00,-579.00,261.00,-570.00,241.00,-552.00C227.67,-540.00,217.33,-517.00,210.00,-483.00C210.00,-416.33,282.00,-223.33,426.00,96.00L68.00,785.00L23.00,858.00C5.00,888.67,-4.00,914.33,-4.00,935.00C-4.00,962.33,6.33,986.33,27.00,1007.00C40.78,1020.78,64.44,1031.11,98.00,1038.00C128.67,1038.00,152.33,1026.33,169.00,1003.00C282.33,845.67,404.00,621.67,534.00,331.00L682.00,676.00C735.33,795.33,786.67,898.00,836.00,984.00C857.33,1021.33,885.33,1040.00,920.00,1040.00C947.33,1040.00,971.33,1030.33,992.00,1011.00C1005.78,998.11,1016.44,975.11,1024.00,942.00C1024.00,927.33,1019.67,910.67,1011.00,892.00"]
+              KCanvasItem {path} at (1502,-26) size 30x47 [transform={m=((1.00,0.00)(0.00,1.00)) t=(1498.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1011.00,892.00L665.00,144.00C579.67,-38.00,514.33,-190.33,469.00,-313.00L403.00,-507.00C385.67,-555.00,355.67,-579.00,313.00,-579.00C285.00,-579.00,261.00,-570.00,241.00,-552.00C221.00,-534.00,210.67,-511.00,210.00,-483.00C210.00,-416.33,282.00,-223.33,426.00,96.00L68.00,785.00L23.00,858.00C5.00,888.67,-4.00,914.33,-4.00,935.00C-4.00,962.33,6.33,986.33,27.00,1007.00C47.67,1027.67,71.33,1038.00,98.00,1038.00C128.67,1038.00,152.33,1026.33,169.00,1003.00C282.33,845.67,404.00,621.67,534.00,331.00L682.00,676.00C735.33,795.33,786.67,898.00,836.00,984.00C857.33,1021.33,885.33,1040.00,920.00,1040.00C947.33,1040.00,971.33,1030.33,992.00,1011.00C1012.67,991.67,1023.33,968.67,1024.00,942.00C1024.00,927.33,1019.67,910.67,1011.00,892.00"]
               KCanvasItem {line} at (79,-54) size 1x161 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M2564.00,-3500.00L2564.00,2000.00"]
-              KCanvasItem {path} at (2572,-50) size 41x56 [transform={m=((1.00,0.00)(0.00,1.00)) t=(2564.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M802.00,-61.00C614.00,-61.00,454.67,-4.67,324.00,108.00C185.33,228.00,116.00,382.67,116.00,572.00C116.00,802.67,184.33,1012.33,321.00,1201.00C473.67,1410.33,664.00,1515.00,892.00,1515.00C1111.33,1515.00,1274.33,1465.67,1381.00,1367.00C1492.33,1264.33,1548.00,1102.33,1548.00,881.00C1548.00,650.33,1485.33,442.33,1360.00,257.00C1216.00,45.00,1030.00,-61.00,802.00,-61.00M892.00,1310.00C728.67,1310.00,590.33,1228.67,477.00,1066.00C372.33,916.67,320.00,752.00,320.00,572.00C320.00,443.33,367.67,338.67,463.00,258.00C554.33,182.00,667.33,144.00,802.00,144.00C964.00,144.00,1097.67,225.67,1203.00,389.00C1297.00,535.00,1344.00,699.00,1344.00,881.00C1344.00,1040.33,1308.33,1152.33,1237.00,1217.00C1169.00,1279.00,1054.00,1310.00,892.00,1310.00M682.00,1848.00C769.33,1848.00,813.00,1813.00,813.00,1743.00C813.00,1723.00,798.33,1703.67,769.00,1685.00C742.33,1668.33,717.33,1660.00,694.00,1660.00C612.00,1660.00,571.00,1694.33,571.00,1763.00C571.00,1782.33,583.33,1801.33,608.00,1820.00C624.44,1832.44,649.11,1841.78,682.00,1848.00M1221.00,1856.00C1243.67,1856.00,1266.67,1845.67,1290.00,1825.00C1305.56,1811.22,1317.22,1790.56,1325.00,1763.00C1325.00,1701.67,1277.33,1671.00,1182.00,1671.00C1154.67,1671.00,1130.33,1678.00,1109.00,1692.00C1085.00,1708.00,1073.00,1729.00,1073.00,1755.00C1073.00,1801.00,1088.00,1830.67,1118.00,1844.00C1134.67,1852.00,1169.00,1856.00,1221.00,1856.00"]
+              KCanvasItem {path} at (2572,-50) size 41x56 [transform={m=((1.00,0.00)(0.00,1.00)) t=(2564.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M802.00,-61.00C614.00,-61.00,454.67,-4.67,324.00,108.00C185.33,228.00,116.00,382.67,116.00,572.00C116.00,802.67,184.33,1012.33,321.00,1201.00C473.67,1410.33,664.00,1515.00,892.00,1515.00C1111.33,1515.00,1274.33,1465.67,1381.00,1367.00C1492.33,1264.33,1548.00,1102.33,1548.00,881.00C1548.00,650.33,1485.33,442.33,1360.00,257.00C1216.00,45.00,1030.00,-61.00,802.00,-61.00M892.00,1310.00C728.67,1310.00,590.33,1228.67,477.00,1066.00C372.33,916.67,320.00,752.00,320.00,572.00C320.00,443.33,367.67,338.67,463.00,258.00C554.33,182.00,667.33,144.00,802.00,144.00C964.00,144.00,1097.67,225.67,1203.00,389.00C1297.00,535.00,1344.00,699.00,1344.00,881.00C1344.00,1040.33,1308.33,1152.33,1237.00,1217.00C1169.00,1279.00,1054.00,1310.00,892.00,1310.00M682.00,1848.00C769.33,1848.00,813.00,1813.00,813.00,1743.00C813.00,1723.00,798.33,1703.67,769.00,1685.00C742.33,1668.33,717.33,1660.00,694.00,1660.00C612.00,1660.00,571.00,1694.33,571.00,1763.00C571.00,1782.33,583.33,1801.33,608.00,1820.00C632.67,1838.67,657.33,1848.00,682.00,1848.00M1221.00,1856.00C1243.67,1856.00,1266.67,1845.67,1290.00,1825.00C1313.33,1804.33,1325.00,1783.67,1325.00,1763.00C1325.00,1701.67,1277.33,1671.00,1182.00,1671.00C1154.67,1671.00,1130.33,1678.00,1109.00,1692.00C1085.00,1708.00,1073.00,1729.00,1073.00,1755.00C1073.00,1801.00,1088.00,1830.67,1118.00,1844.00C1134.67,1852.00,1169.00,1856.00,1221.00,1856.00"]
               KCanvasItem {line} at (127,-54) size 1x161 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M4199.00,-3500.00L4199.00,2000.00"]
-              KCanvasItem {path} at (4207,-43) size 48x51 [transform={m=((1.00,0.00)(0.00,1.00)) t=(4199.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1306.00,412.00C1235.33,412.00,1174.33,422.33,1123.00,443.00C1088.78,456.78,1047.44,487.44,999.00,535.00C963.00,499.67,928.00,473.00,894.00,455.00C871.33,443.00,837.67,434.00,793.00,428.00C719.00,428.00,649.33,458.00,584.00,518.00C540.44,558.00,507.44,624.33,485.00,717.00C485.00,840.33,533.33,953.00,630.00,1055.00C694.44,1123.00,804.78,1174.00,961.00,1208.00C989.00,1208.00,1012.33,1197.67,1031.00,1177.00C1043.44,1163.22,1052.78,1138.22,1059.00,1102.00C1059.00,1062.00,1025.67,1032.33,959.00,1013.00C870.33,987.67,807.67,958.67,771.00,926.00C717.00,878.67,690.00,809.00,690.00,717.00C690.00,697.67,699.00,679.00,717.00,661.00C737.67,641.00,763.33,631.67,794.00,633.00C852.00,635.67,905.67,689.67,955.00,795.00C999.67,887.00,1039.33,933.00,1074.00,933.00C1102.00,933.00,1124.67,922.67,1142.00,902.00C1153.56,888.22,1162.22,862.89,1168.00,826.00C1168.00,812.67,1166.00,792.67,1162.00,766.00C1159.33,748.22,1157.00,728.22,1155.00,706.00C1155.00,662.67,1173.67,635.33,1211.00,624.00C1225.67,619.33,1257.33,617.00,1306.00,617.00C1397.33,617.00,1461.33,639.33,1498.00,684.00C1531.33,724.00,1548.00,790.33,1548.00,883.00C1548.00,1046.33,1482.33,1179.67,1351.00,1283.00C1231.00,1377.67,1087.67,1425.00,921.00,1425.00C727.00,1425.00,575.00,1351.67,465.00,1205.00C365.67,1074.33,316.00,910.00,316.00,712.00C316.00,529.33,374.33,375.33,491.00,250.00C612.33,119.33,768.33,54.00,959.00,54.00C1013.00,54.00,1074.00,64.33,1142.00,85.00L1317.00,150.00C1346.33,160.67,1365.33,166.00,1374.00,166.00C1401.33,166.00,1425.00,155.33,1445.00,134.00C1458.33,119.78,1468.33,94.44,1475.00,58.00C1475.00,-5.33,1404.00,-56.67,1262.00,-96.00C1154.67,-125.33,1054.33,-140.00,961.00,-140.00C867.00,-140.00,771.00,-122.00,673.00,-86.00C607.67,-62.00,523.33,-13.33,420.00,60.00C213.33,238.67,110.00,456.00,110.00,712.00C110.00,968.00,180.67,1182.00,322.00,1354.00C472.00,1538.00,671.67,1630.00,921.00,1630.00C1146.33,1630.00,1339.33,1562.33,1500.00,1427.00C1668.67,1283.67,1753.00,1102.33,1753.00,883.00C1753.00,733.00,1716.33,617.67,1643.00,537.00C1566.33,453.67,1454.00,412.00,1306.00,412.00"]
+              KCanvasItem {path} at (4207,-43) size 48x51 [transform={m=((1.00,0.00)(0.00,1.00)) t=(4199.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1306.00,412.00C1235.33,412.00,1174.33,422.33,1123.00,443.00C1071.67,463.67,1030.33,494.33,999.00,535.00C963.00,499.67,928.00,473.00,894.00,455.00C860.00,437.00,826.33,428.00,793.00,428.00C719.00,428.00,649.33,458.00,584.00,518.00C518.67,578.00,485.67,644.33,485.00,717.00C485.00,840.33,533.33,953.00,630.00,1055.00C726.67,1157.00,837.00,1208.00,961.00,1208.00C989.00,1208.00,1012.33,1197.67,1031.00,1177.00C1049.67,1156.33,1059.00,1131.33,1059.00,1102.00C1059.00,1062.00,1025.67,1032.33,959.00,1013.00C870.33,987.67,807.67,958.67,771.00,926.00C717.00,878.67,690.00,809.00,690.00,717.00C690.00,697.67,699.00,679.00,717.00,661.00C737.67,641.00,763.33,631.67,794.00,633.00C852.00,635.67,905.67,689.67,955.00,795.00C999.67,887.00,1039.33,933.00,1074.00,933.00C1102.00,933.00,1124.67,922.67,1142.00,902.00C1159.33,881.33,1168.00,856.00,1168.00,826.00C1168.00,812.67,1166.00,792.67,1162.00,766.00C1158.00,739.33,1155.67,719.33,1155.00,706.00C1155.00,662.67,1173.67,635.33,1211.00,624.00C1225.67,619.33,1257.33,617.00,1306.00,617.00C1397.33,617.00,1461.33,639.33,1498.00,684.00C1531.33,724.00,1548.00,790.33,1548.00,883.00C1548.00,1046.33,1482.33,1179.67,1351.00,1283.00C1231.00,1377.67,1087.67,1425.00,921.00,1425.00C727.00,1425.00,575.00,1351.67,465.00,1205.00C365.67,1074.33,316.00,910.00,316.00,712.00C316.00,529.33,374.33,375.33,491.00,250.00C612.33,119.33,768.33,54.00,959.00,54.00C1013.00,54.00,1074.00,64.33,1142.00,85.00L1317.00,150.00C1346.33,160.67,1365.33,166.00,1374.00,166.00C1401.33,166.00,1425.00,155.33,1445.00,134.00C1465.00,112.67,1475.00,87.33,1475.00,58.00C1475.00,-5.33,1404.00,-56.67,1262.00,-96.00C1154.67,-125.33,1054.33,-140.00,961.00,-140.00C867.00,-140.00,771.00,-122.00,673.00,-86.00C575.00,-50.00,490.67,-1.33,420.00,60.00C213.33,238.67,110.00,456.00,110.00,712.00C110.00,968.00,180.67,1182.00,322.00,1354.00C472.00,1538.00,671.67,1630.00,921.00,1630.00C1146.33,1630.00,1339.33,1562.33,1500.00,1427.00C1668.67,1283.67,1753.00,1102.33,1753.00,883.00C1753.00,733.00,1716.33,617.67,1643.00,537.00C1566.33,453.67,1454.00,412.00,1306.00,412.00"]
               KCanvasItem {line} at (182,-54) size 1x161 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M6106.00,-3500.00L6106.00,2000.00"]
-              KCanvasItem {path} at (6113,-27) size 25x44 [transform={m=((1.00,0.00)(0.00,1.00)) t=(6106.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M770.00,-196.00C770.00,-278.67,750.00,-340.67,710.00,-382.00C683.33,-409.56,622.67,-430.56,528.00,-445.00C471.33,-445.00,417.67,-434.33,367.00,-413.00C303.00,-385.00,271.00,-346.67,271.00,-298.00C271.00,-262.00,293.67,-244.00,339.00,-244.00C363.00,-244.00,390.00,-252.00,420.00,-268.00C440.00,-278.67,472.33,-287.00,517.00,-293.00C549.67,-292.33,574.00,-284.33,590.00,-269.00C600.67,-258.78,608.67,-236.11,614.00,-201.00C614.00,-169.00,601.67,-140.33,577.00,-115.00C560.56,-98.11,522.56,-75.78,463.00,-48.00C357.00,-24.00,272.00,26.67,208.00,104.00C139.33,186.00,105.00,286.00,105.00,404.00C105.00,539.33,150.00,679.00,240.00,823.00C340.00,983.00,452.67,1063.00,578.00,1063.00C643.33,1063.00,716.33,1047.67,797.00,1017.00C899.00,977.67,950.00,929.67,950.00,873.00C950.00,847.67,941.67,825.33,925.00,806.00C913.89,793.11,893.22,783.11,863.00,776.00C843.67,776.00,827.00,781.67,813.00,793.00C803.67,800.56,789.67,812.22,771.00,828.00C731.67,859.33,667.33,875.00,578.00,875.00C510.00,875.00,442.67,814.33,376.00,693.00C315.33,581.67,285.00,485.33,285.00,404.00C285.00,316.00,315.00,246.67,375.00,196.00C431.00,148.67,503.00,125.00,591.00,125.00C631.00,125.00,673.67,135.67,719.00,157.00L835.00,219.00C855.00,229.67,869.33,235.00,878.00,235.00C902.67,235.00,924.00,225.33,942.00,206.00C954.00,193.11,963.00,170.44,969.00,138.00C969.00,69.33,883.67,10.00,713.00,-40.00C732.33,-65.33,746.67,-91.00,756.00,-117.00C762.22,-134.33,766.89,-160.67,770.00,-196.00"]
+              KCanvasItem {path} at (6113,-27) size 25x44 [transform={m=((1.00,0.00)(0.00,1.00)) t=(6106.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M770.00,-196.00C770.00,-278.67,750.00,-340.67,710.00,-382.00C670.00,-423.33,609.33,-444.33,528.00,-445.00C471.33,-445.00,417.67,-434.33,367.00,-413.00C303.00,-385.00,271.00,-346.67,271.00,-298.00C271.00,-262.00,293.67,-244.00,339.00,-244.00C363.00,-244.00,390.00,-252.00,420.00,-268.00C450.00,-284.00,482.33,-292.33,517.00,-293.00C549.67,-292.33,574.00,-284.33,590.00,-269.00C606.00,-253.67,614.00,-231.00,614.00,-201.00C614.00,-169.00,601.67,-140.33,577.00,-115.00C552.33,-89.67,514.33,-67.33,463.00,-48.00C357.00,-24.00,272.00,26.67,208.00,104.00C139.33,186.00,105.00,286.00,105.00,404.00C105.00,539.33,150.00,679.00,240.00,823.00C340.00,983.00,452.67,1063.00,578.00,1063.00C643.33,1063.00,716.33,1047.67,797.00,1017.00C899.00,977.67,950.00,929.67,950.00,873.00C950.00,847.67,941.67,825.33,925.00,806.00C908.33,786.67,887.67,776.67,863.00,776.00C843.67,776.00,827.00,781.67,813.00,793.00C799.00,804.33,785.00,816.00,771.00,828.00C731.67,859.33,667.33,875.00,578.00,875.00C510.00,875.00,442.67,814.33,376.00,693.00C315.33,581.67,285.00,485.33,285.00,404.00C285.00,316.00,315.00,246.67,375.00,196.00C431.00,148.67,503.00,125.00,591.00,125.00C631.00,125.00,673.67,135.67,719.00,157.00L835.00,219.00C855.00,229.67,869.33,235.00,878.00,235.00C902.67,235.00,924.00,225.33,942.00,206.00C960.00,186.67,969.00,164.00,969.00,138.00C969.00,69.33,883.67,10.00,713.00,-40.00C732.33,-65.33,746.67,-91.00,756.00,-117.00C765.33,-143.00,770.00,-169.33,770.00,-196.00"]
               KCanvasItem {line} at (213,-54) size 1x161 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M7158.00,-3500.00L7158.00,2000.00"]
         KCanvasContainer {g} at (165,220) size 210x1 [transform={m=((1.00,0.00)(0.00,1.00)) t=(165.00,220.00)}]
           KCanvasItem {line} at (165,220) size 210x1 [stroke={[type=SOLID] [color=#888888]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00L210.00,0.00"]
index 78f90e6c4eaec4a2551a84ff07e33e780619512b..fd284a3e235a51cc78f9c6fed16fa30d93a35e24 100644 (file)
@@ -1 +1 @@
-ab913dd08b01a524b2a128cf4e443c7e
\ No newline at end of file
+eb159630f1778a9a33ed8132001d7934
\ No newline at end of file
index 0c52055b82b80eb901268e227f84fa13b954ba49..c9d24287fc218daadda235a2fb2242c7c1887356 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/fonts-elem-02-t-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/fonts-elem-02-t-expected.png differ
index f19a22210d0da84a32106e0d93003e1646e7f453..89a9f3c74e94acbaabb1da96c71768ba3b07c834 100644 (file)
@@ -5,18 +5,18 @@ layer at (0,0) size 480x360
         KCanvasItem {rect} at (165,80) size 220x165 [fill={[type=SOLID] [color=#000000]}] [data="M165.00,80.00L385.00,80.00L385.00,245.00L165.00,245.00"]
         KCanvasContainer {g} at (168,85) size 203x71 [transform={m=((1.00,0.00)(-0.00,-1.00)) t=(165.00,140.00)}]
           KCanvasContainer {g} at (8,-50) size 203x71 [transform={m=((0.03,0.00)(0.00,0.03)) t=(0.00,0.00)}]
-            KCanvasItem {path} at (8,-39) size 35x44 [fill={[type=SOLID] [color=#FFFFFF]}] [data="M1250.00,-30.00C1188.67,-30.00,1135.33,48.67,1090.00,206.00C1072.67,266.00,1051.00,371.00,1025.00,521.00C957.00,511.67,868.00,495.00,758.00,471.00L492.00,416.00C458.67,328.67,401.67,201.00,321.00,33.00C299.67,-4.33,270.67,-23.00,234.00,-23.00C207.33,-23.00,183.67,-13.33,163.00,6.00C149.22,18.89,138.56,42.89,131.00,78.00C131.00,110.00,181.33,231.67,282.00,443.00C270.67,460.33,265.00,480.33,265.00,503.00C265.00,557.00,297.67,591.67,363.00,607.00C439.00,749.67,535.00,913.67,651.00,1099.00C809.00,1351.67,907.33,1478.00,946.00,1478.00C998.67,1478.00,1034.67,1441.33,1054.00,1368.00L1117.00,1032.00L1266.00,337.00L1323.00,179.00C1342.33,125.00,1352.00,89.00,1352.00,71.00C1352.00,42.33,1341.67,18.33,1321.00,-1.00C1307.22,-13.89,1283.56,-23.56,1250.00,-30.00M897.00,1113.00L611.00,652.00C691.67,672.67,814.00,697.67,978.00,727.00L897.00,1113.00"]
-            KCanvasItem {path} at (1502,-26) size 30x47 [transform={m=((1.00,0.00)(0.00,1.00)) t=(1498.00,0.00)}] [fill={[type=SOLID] [color=#FFFFFF]}] [data="M1011.00,892.00L665.00,144.00C579.67,-38.00,514.33,-190.33,469.00,-313.00L403.00,-507.00C385.67,-555.00,355.67,-579.00,313.00,-579.00C285.00,-579.00,261.00,-570.00,241.00,-552.00C227.67,-540.00,217.33,-517.00,210.00,-483.00C210.00,-416.33,282.00,-223.33,426.00,96.00L68.00,785.00L23.00,858.00C5.00,888.67,-4.00,914.33,-4.00,935.00C-4.00,962.33,6.33,986.33,27.00,1007.00C40.78,1020.78,64.44,1031.11,98.00,1038.00C128.67,1038.00,152.33,1026.33,169.00,1003.00C282.33,845.67,404.00,621.67,534.00,331.00L682.00,676.00C735.33,795.33,786.67,898.00,836.00,984.00C857.33,1021.33,885.33,1040.00,920.00,1040.00C947.33,1040.00,971.33,1030.33,992.00,1011.00C1005.78,998.11,1016.44,975.11,1024.00,942.00C1024.00,927.33,1019.67,910.67,1011.00,892.00"]
-            KCanvasItem {path} at (2572,-50) size 41x56 [transform={m=((1.00,0.00)(0.00,1.00)) t=(2564.00,0.00)}] [fill={[type=SOLID] [color=#FFFFFF]}] [data="M802.00,-61.00C614.00,-61.00,454.67,-4.67,324.00,108.00C185.33,228.00,116.00,382.67,116.00,572.00C116.00,802.67,184.33,1012.33,321.00,1201.00C473.67,1410.33,664.00,1515.00,892.00,1515.00C1111.33,1515.00,1274.33,1465.67,1381.00,1367.00C1492.33,1264.33,1548.00,1102.33,1548.00,881.00C1548.00,650.33,1485.33,442.33,1360.00,257.00C1216.00,45.00,1030.00,-61.00,802.00,-61.00M892.00,1310.00C728.67,1310.00,590.33,1228.67,477.00,1066.00C372.33,916.67,320.00,752.00,320.00,572.00C320.00,443.33,367.67,338.67,463.00,258.00C554.33,182.00,667.33,144.00,802.00,144.00C964.00,144.00,1097.67,225.67,1203.00,389.00C1297.00,535.00,1344.00,699.00,1344.00,881.00C1344.00,1040.33,1308.33,1152.33,1237.00,1217.00C1169.00,1279.00,1054.00,1310.00,892.00,1310.00M682.00,1848.00C769.33,1848.00,813.00,1813.00,813.00,1743.00C813.00,1723.00,798.33,1703.67,769.00,1685.00C742.33,1668.33,717.33,1660.00,694.00,1660.00C612.00,1660.00,571.00,1694.33,571.00,1763.00C571.00,1782.33,583.33,1801.33,608.00,1820.00C624.44,1832.44,649.11,1841.78,682.00,1848.00M1221.00,1856.00C1243.67,1856.00,1266.67,1845.67,1290.00,1825.00C1305.56,1811.22,1317.22,1790.56,1325.00,1763.00C1325.00,1701.67,1277.33,1671.00,1182.00,1671.00C1154.67,1671.00,1130.33,1678.00,1109.00,1692.00C1085.00,1708.00,1073.00,1729.00,1073.00,1755.00C1073.00,1801.00,1088.00,1830.67,1118.00,1844.00C1134.67,1852.00,1169.00,1856.00,1221.00,1856.00"]
-            KCanvasItem {path} at (4207,-43) size 48x51 [transform={m=((1.00,0.00)(0.00,1.00)) t=(4199.00,0.00)}] [fill={[type=SOLID] [color=#FFFFFF]}] [data="M1306.00,412.00C1235.33,412.00,1174.33,422.33,1123.00,443.00C1088.78,456.78,1047.44,487.44,999.00,535.00C963.00,499.67,928.00,473.00,894.00,455.00C871.33,443.00,837.67,434.00,793.00,428.00C719.00,428.00,649.33,458.00,584.00,518.00C540.44,558.00,507.44,624.33,485.00,717.00C485.00,840.33,533.33,953.00,630.00,1055.00C694.44,1123.00,804.78,1174.00,961.00,1208.00C989.00,1208.00,1012.33,1197.67,1031.00,1177.00C1043.44,1163.22,1052.78,1138.22,1059.00,1102.00C1059.00,1062.00,1025.67,1032.33,959.00,1013.00C870.33,987.67,807.67,958.67,771.00,926.00C717.00,878.67,690.00,809.00,690.00,717.00C690.00,697.67,699.00,679.00,717.00,661.00C737.67,641.00,763.33,631.67,794.00,633.00C852.00,635.67,905.67,689.67,955.00,795.00C999.67,887.00,1039.33,933.00,1074.00,933.00C1102.00,933.00,1124.67,922.67,1142.00,902.00C1153.56,888.22,1162.22,862.89,1168.00,826.00C1168.00,812.67,1166.00,792.67,1162.00,766.00C1159.33,748.22,1157.00,728.22,1155.00,706.00C1155.00,662.67,1173.67,635.33,1211.00,624.00C1225.67,619.33,1257.33,617.00,1306.00,617.00C1397.33,617.00,1461.33,639.33,1498.00,684.00C1531.33,724.00,1548.00,790.33,1548.00,883.00C1548.00,1046.33,1482.33,1179.67,1351.00,1283.00C1231.00,1377.67,1087.67,1425.00,921.00,1425.00C727.00,1425.00,575.00,1351.67,465.00,1205.00C365.67,1074.33,316.00,910.00,316.00,712.00C316.00,529.33,374.33,375.33,491.00,250.00C612.33,119.33,768.33,54.00,959.00,54.00C1013.00,54.00,1074.00,64.33,1142.00,85.00L1317.00,150.00C1346.33,160.67,1365.33,166.00,1374.00,166.00C1401.33,166.00,1425.00,155.33,1445.00,134.00C1458.33,119.78,1468.33,94.44,1475.00,58.00C1475.00,-5.33,1404.00,-56.67,1262.00,-96.00C1154.67,-125.33,1054.33,-140.00,961.00,-140.00C867.00,-140.00,771.00,-122.00,673.00,-86.00C607.67,-62.00,523.33,-13.33,420.00,60.00C213.33,238.67,110.00,456.00,110.00,712.00C110.00,968.00,180.67,1182.00,322.00,1354.00C472.00,1538.00,671.67,1630.00,921.00,1630.00C1146.33,1630.00,1339.33,1562.33,1500.00,1427.00C1668.67,1283.67,1753.00,1102.33,1753.00,883.00C1753.00,733.00,1716.33,617.67,1643.00,537.00C1566.33,453.67,1454.00,412.00,1306.00,412.00"]
-            KCanvasItem {path} at (6113,-27) size 25x44 [transform={m=((1.00,0.00)(0.00,1.00)) t=(6106.00,0.00)}] [fill={[type=SOLID] [color=#FFFFFF]}] [data="M770.00,-196.00C770.00,-278.67,750.00,-340.67,710.00,-382.00C683.33,-409.56,622.67,-430.56,528.00,-445.00C471.33,-445.00,417.67,-434.33,367.00,-413.00C303.00,-385.00,271.00,-346.67,271.00,-298.00C271.00,-262.00,293.67,-244.00,339.00,-244.00C363.00,-244.00,390.00,-252.00,420.00,-268.00C440.00,-278.67,472.33,-287.00,517.00,-293.00C549.67,-292.33,574.00,-284.33,590.00,-269.00C600.67,-258.78,608.67,-236.11,614.00,-201.00C614.00,-169.00,601.67,-140.33,577.00,-115.00C560.56,-98.11,522.56,-75.78,463.00,-48.00C357.00,-24.00,272.00,26.67,208.00,104.00C139.33,186.00,105.00,286.00,105.00,404.00C105.00,539.33,150.00,679.00,240.00,823.00C340.00,983.00,452.67,1063.00,578.00,1063.00C643.33,1063.00,716.33,1047.67,797.00,1017.00C899.00,977.67,950.00,929.67,950.00,873.00C950.00,847.67,941.67,825.33,925.00,806.00C913.89,793.11,893.22,783.11,863.00,776.00C843.67,776.00,827.00,781.67,813.00,793.00C803.67,800.56,789.67,812.22,771.00,828.00C731.67,859.33,667.33,875.00,578.00,875.00C510.00,875.00,442.67,814.33,376.00,693.00C315.33,581.67,285.00,485.33,285.00,404.00C285.00,316.00,315.00,246.67,375.00,196.00C431.00,148.67,503.00,125.00,591.00,125.00C631.00,125.00,673.67,135.67,719.00,157.00L835.00,219.00C855.00,229.67,869.33,235.00,878.00,235.00C902.67,235.00,924.00,225.33,942.00,206.00C954.00,193.11,963.00,170.44,969.00,138.00C969.00,69.33,883.67,10.00,713.00,-40.00C732.33,-65.33,746.67,-91.00,756.00,-117.00C762.22,-134.33,766.89,-160.67,770.00,-196.00"]
+            KCanvasItem {path} at (8,-39) size 35x44 [fill={[type=SOLID] [color=#FFFFFF]}] [data="M1250.00,-30.00C1188.67,-30.00,1135.33,48.67,1090.00,206.00C1072.67,266.00,1051.00,371.00,1025.00,521.00C957.00,511.67,868.00,495.00,758.00,471.00L492.00,416.00C458.67,328.67,401.67,201.00,321.00,33.00C299.67,-4.33,270.67,-23.00,234.00,-23.00C207.33,-23.00,183.67,-13.33,163.00,6.00C142.33,25.33,131.67,49.33,131.00,78.00C131.00,110.00,181.33,231.67,282.00,443.00C270.67,460.33,265.00,480.33,265.00,503.00C265.00,557.00,297.67,591.67,363.00,607.00C439.00,749.67,535.00,913.67,651.00,1099.00C809.00,1351.67,907.33,1478.00,946.00,1478.00C998.67,1478.00,1034.67,1441.33,1054.00,1368.00L1117.00,1032.00L1266.00,337.00L1323.00,179.00C1342.33,125.00,1352.00,89.00,1352.00,71.00C1352.00,42.33,1341.67,18.33,1321.00,-1.00C1300.33,-20.33,1276.67,-30.00,1250.00,-30.00M897.00,1113.00L611.00,652.00C691.67,672.67,814.00,697.67,978.00,727.00L897.00,1113.00"]
+            KCanvasItem {path} at (1502,-26) size 30x47 [transform={m=((1.00,0.00)(0.00,1.00)) t=(1498.00,0.00)}] [fill={[type=SOLID] [color=#FFFFFF]}] [data="M1011.00,892.00L665.00,144.00C579.67,-38.00,514.33,-190.33,469.00,-313.00L403.00,-507.00C385.67,-555.00,355.67,-579.00,313.00,-579.00C285.00,-579.00,261.00,-570.00,241.00,-552.00C221.00,-534.00,210.67,-511.00,210.00,-483.00C210.00,-416.33,282.00,-223.33,426.00,96.00L68.00,785.00L23.00,858.00C5.00,888.67,-4.00,914.33,-4.00,935.00C-4.00,962.33,6.33,986.33,27.00,1007.00C47.67,1027.67,71.33,1038.00,98.00,1038.00C128.67,1038.00,152.33,1026.33,169.00,1003.00C282.33,845.67,404.00,621.67,534.00,331.00L682.00,676.00C735.33,795.33,786.67,898.00,836.00,984.00C857.33,1021.33,885.33,1040.00,920.00,1040.00C947.33,1040.00,971.33,1030.33,992.00,1011.00C1012.67,991.67,1023.33,968.67,1024.00,942.00C1024.00,927.33,1019.67,910.67,1011.00,892.00"]
+            KCanvasItem {path} at (2572,-50) size 41x56 [transform={m=((1.00,0.00)(0.00,1.00)) t=(2564.00,0.00)}] [fill={[type=SOLID] [color=#FFFFFF]}] [data="M802.00,-61.00C614.00,-61.00,454.67,-4.67,324.00,108.00C185.33,228.00,116.00,382.67,116.00,572.00C116.00,802.67,184.33,1012.33,321.00,1201.00C473.67,1410.33,664.00,1515.00,892.00,1515.00C1111.33,1515.00,1274.33,1465.67,1381.00,1367.00C1492.33,1264.33,1548.00,1102.33,1548.00,881.00C1548.00,650.33,1485.33,442.33,1360.00,257.00C1216.00,45.00,1030.00,-61.00,802.00,-61.00M892.00,1310.00C728.67,1310.00,590.33,1228.67,477.00,1066.00C372.33,916.67,320.00,752.00,320.00,572.00C320.00,443.33,367.67,338.67,463.00,258.00C554.33,182.00,667.33,144.00,802.00,144.00C964.00,144.00,1097.67,225.67,1203.00,389.00C1297.00,535.00,1344.00,699.00,1344.00,881.00C1344.00,1040.33,1308.33,1152.33,1237.00,1217.00C1169.00,1279.00,1054.00,1310.00,892.00,1310.00M682.00,1848.00C769.33,1848.00,813.00,1813.00,813.00,1743.00C813.00,1723.00,798.33,1703.67,769.00,1685.00C742.33,1668.33,717.33,1660.00,694.00,1660.00C612.00,1660.00,571.00,1694.33,571.00,1763.00C571.00,1782.33,583.33,1801.33,608.00,1820.00C632.67,1838.67,657.33,1848.00,682.00,1848.00M1221.00,1856.00C1243.67,1856.00,1266.67,1845.67,1290.00,1825.00C1313.33,1804.33,1325.00,1783.67,1325.00,1763.00C1325.00,1701.67,1277.33,1671.00,1182.00,1671.00C1154.67,1671.00,1130.33,1678.00,1109.00,1692.00C1085.00,1708.00,1073.00,1729.00,1073.00,1755.00C1073.00,1801.00,1088.00,1830.67,1118.00,1844.00C1134.67,1852.00,1169.00,1856.00,1221.00,1856.00"]
+            KCanvasItem {path} at (4207,-43) size 48x51 [transform={m=((1.00,0.00)(0.00,1.00)) t=(4199.00,0.00)}] [fill={[type=SOLID] [color=#FFFFFF]}] [data="M1306.00,412.00C1235.33,412.00,1174.33,422.33,1123.00,443.00C1071.67,463.67,1030.33,494.33,999.00,535.00C963.00,499.67,928.00,473.00,894.00,455.00C860.00,437.00,826.33,428.00,793.00,428.00C719.00,428.00,649.33,458.00,584.00,518.00C518.67,578.00,485.67,644.33,485.00,717.00C485.00,840.33,533.33,953.00,630.00,1055.00C726.67,1157.00,837.00,1208.00,961.00,1208.00C989.00,1208.00,1012.33,1197.67,1031.00,1177.00C1049.67,1156.33,1059.00,1131.33,1059.00,1102.00C1059.00,1062.00,1025.67,1032.33,959.00,1013.00C870.33,987.67,807.67,958.67,771.00,926.00C717.00,878.67,690.00,809.00,690.00,717.00C690.00,697.67,699.00,679.00,717.00,661.00C737.67,641.00,763.33,631.67,794.00,633.00C852.00,635.67,905.67,689.67,955.00,795.00C999.67,887.00,1039.33,933.00,1074.00,933.00C1102.00,933.00,1124.67,922.67,1142.00,902.00C1159.33,881.33,1168.00,856.00,1168.00,826.00C1168.00,812.67,1166.00,792.67,1162.00,766.00C1158.00,739.33,1155.67,719.33,1155.00,706.00C1155.00,662.67,1173.67,635.33,1211.00,624.00C1225.67,619.33,1257.33,617.00,1306.00,617.00C1397.33,617.00,1461.33,639.33,1498.00,684.00C1531.33,724.00,1548.00,790.33,1548.00,883.00C1548.00,1046.33,1482.33,1179.67,1351.00,1283.00C1231.00,1377.67,1087.67,1425.00,921.00,1425.00C727.00,1425.00,575.00,1351.67,465.00,1205.00C365.67,1074.33,316.00,910.00,316.00,712.00C316.00,529.33,374.33,375.33,491.00,250.00C612.33,119.33,768.33,54.00,959.00,54.00C1013.00,54.00,1074.00,64.33,1142.00,85.00L1317.00,150.00C1346.33,160.67,1365.33,166.00,1374.00,166.00C1401.33,166.00,1425.00,155.33,1445.00,134.00C1465.00,112.67,1475.00,87.33,1475.00,58.00C1475.00,-5.33,1404.00,-56.67,1262.00,-96.00C1154.67,-125.33,1054.33,-140.00,961.00,-140.00C867.00,-140.00,771.00,-122.00,673.00,-86.00C575.00,-50.00,490.67,-1.33,420.00,60.00C213.33,238.67,110.00,456.00,110.00,712.00C110.00,968.00,180.67,1182.00,322.00,1354.00C472.00,1538.00,671.67,1630.00,921.00,1630.00C1146.33,1630.00,1339.33,1562.33,1500.00,1427.00C1668.67,1283.67,1753.00,1102.33,1753.00,883.00C1753.00,733.00,1716.33,617.67,1643.00,537.00C1566.33,453.67,1454.00,412.00,1306.00,412.00"]
+            KCanvasItem {path} at (6113,-27) size 25x44 [transform={m=((1.00,0.00)(0.00,1.00)) t=(6106.00,0.00)}] [fill={[type=SOLID] [color=#FFFFFF]}] [data="M770.00,-196.00C770.00,-278.67,750.00,-340.67,710.00,-382.00C670.00,-423.33,609.33,-444.33,528.00,-445.00C471.33,-445.00,417.67,-434.33,367.00,-413.00C303.00,-385.00,271.00,-346.67,271.00,-298.00C271.00,-262.00,293.67,-244.00,339.00,-244.00C363.00,-244.00,390.00,-252.00,420.00,-268.00C450.00,-284.00,482.33,-292.33,517.00,-293.00C549.67,-292.33,574.00,-284.33,590.00,-269.00C606.00,-253.67,614.00,-231.00,614.00,-201.00C614.00,-169.00,601.67,-140.33,577.00,-115.00C552.33,-89.67,514.33,-67.33,463.00,-48.00C357.00,-24.00,272.00,26.67,208.00,104.00C139.33,186.00,105.00,286.00,105.00,404.00C105.00,539.33,150.00,679.00,240.00,823.00C340.00,983.00,452.67,1063.00,578.00,1063.00C643.33,1063.00,716.33,1047.67,797.00,1017.00C899.00,977.67,950.00,929.67,950.00,873.00C950.00,847.67,941.67,825.33,925.00,806.00C908.33,786.67,887.67,776.67,863.00,776.00C843.67,776.00,827.00,781.67,813.00,793.00C799.00,804.33,785.00,816.00,771.00,828.00C731.67,859.33,667.33,875.00,578.00,875.00C510.00,875.00,442.67,814.33,376.00,693.00C315.33,581.67,285.00,485.33,285.00,404.00C285.00,316.00,315.00,246.67,375.00,196.00C431.00,148.67,503.00,125.00,591.00,125.00C631.00,125.00,673.67,135.67,719.00,157.00L835.00,219.00C855.00,229.67,869.33,235.00,878.00,235.00C902.67,235.00,924.00,225.33,942.00,206.00C960.00,186.67,969.00,164.00,969.00,138.00C969.00,69.33,883.67,10.00,713.00,-40.00C732.33,-65.33,746.67,-91.00,756.00,-117.00C765.33,-143.00,770.00,-169.33,770.00,-196.00"]
         KCanvasContainer {g} at (165,140) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(165.00,140.00)}]
         KCanvasContainer {g} at (165,210) size 0x0 [transform={m=((1.00,0.00)(0.00,1.00)) t=(165.00,210.00)}]
         KCanvasContainer {g} at (168,155) size 203x71 [transform={m=((1.00,0.00)(-0.00,-1.00)) t=(165.00,210.00)}]
           KCanvasContainer {g} at (8,-48) size 203x71 [transform={m=((0.03,0.00)(0.00,0.03)) t=(0.00,0.00)}]
-            KCanvasItem {path} at (8,-37) size 35x44 [fill={[type=SOLID] [color=#000000]}] [data="M1250.00,-30.00C1188.67,-30.00,1135.33,48.67,1090.00,206.00C1072.67,266.00,1051.00,371.00,1025.00,521.00C957.00,511.67,868.00,495.00,758.00,471.00L492.00,416.00C458.67,328.67,401.67,201.00,321.00,33.00C299.67,-4.33,270.67,-23.00,234.00,-23.00C207.33,-23.00,183.67,-13.33,163.00,6.00C149.22,18.89,138.56,42.89,131.00,78.00C131.00,110.00,181.33,231.67,282.00,443.00C270.67,460.33,265.00,480.33,265.00,503.00C265.00,557.00,297.67,591.67,363.00,607.00C439.00,749.67,535.00,913.67,651.00,1099.00C809.00,1351.67,907.33,1478.00,946.00,1478.00C998.67,1478.00,1034.67,1441.33,1054.00,1368.00L1117.00,1032.00L1266.00,337.00L1323.00,179.00C1342.33,125.00,1352.00,89.00,1352.00,71.00C1352.00,42.33,1341.67,18.33,1321.00,-1.00C1307.22,-13.89,1283.56,-23.56,1250.00,-30.00M897.00,1113.00L611.00,652.00C691.67,672.67,814.00,697.67,978.00,727.00L897.00,1113.00"]
-            KCanvasItem {path} at (1502,-24) size 30x47 [transform={m=((1.00,0.00)(0.00,1.00)) t=(1498.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1011.00,892.00L665.00,144.00C579.67,-38.00,514.33,-190.33,469.00,-313.00L403.00,-507.00C385.67,-555.00,355.67,-579.00,313.00,-579.00C285.00,-579.00,261.00,-570.00,241.00,-552.00C227.67,-540.00,217.33,-517.00,210.00,-483.00C210.00,-416.33,282.00,-223.33,426.00,96.00L68.00,785.00L23.00,858.00C5.00,888.67,-4.00,914.33,-4.00,935.00C-4.00,962.33,6.33,986.33,27.00,1007.00C40.78,1020.78,64.44,1031.11,98.00,1038.00C128.67,1038.00,152.33,1026.33,169.00,1003.00C282.33,845.67,404.00,621.67,534.00,331.00L682.00,676.00C735.33,795.33,786.67,898.00,836.00,984.00C857.33,1021.33,885.33,1040.00,920.00,1040.00C947.33,1040.00,971.33,1030.33,992.00,1011.00C1005.78,998.11,1016.44,975.11,1024.00,942.00C1024.00,927.33,1019.67,910.67,1011.00,892.00"]
-            KCanvasItem {path} at (2572,-48) size 41x56 [transform={m=((1.00,0.00)(0.00,1.00)) t=(2564.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M802.00,-61.00C614.00,-61.00,454.67,-4.67,324.00,108.00C185.33,228.00,116.00,382.67,116.00,572.00C116.00,802.67,184.33,1012.33,321.00,1201.00C473.67,1410.33,664.00,1515.00,892.00,1515.00C1111.33,1515.00,1274.33,1465.67,1381.00,1367.00C1492.33,1264.33,1548.00,1102.33,1548.00,881.00C1548.00,650.33,1485.33,442.33,1360.00,257.00C1216.00,45.00,1030.00,-61.00,802.00,-61.00M892.00,1310.00C728.67,1310.00,590.33,1228.67,477.00,1066.00C372.33,916.67,320.00,752.00,320.00,572.00C320.00,443.33,367.67,338.67,463.00,258.00C554.33,182.00,667.33,144.00,802.00,144.00C964.00,144.00,1097.67,225.67,1203.00,389.00C1297.00,535.00,1344.00,699.00,1344.00,881.00C1344.00,1040.33,1308.33,1152.33,1237.00,1217.00C1169.00,1279.00,1054.00,1310.00,892.00,1310.00M682.00,1848.00C769.33,1848.00,813.00,1813.00,813.00,1743.00C813.00,1723.00,798.33,1703.67,769.00,1685.00C742.33,1668.33,717.33,1660.00,694.00,1660.00C612.00,1660.00,571.00,1694.33,571.00,1763.00C571.00,1782.33,583.33,1801.33,608.00,1820.00C624.44,1832.44,649.11,1841.78,682.00,1848.00M1221.00,1856.00C1243.67,1856.00,1266.67,1845.67,1290.00,1825.00C1305.56,1811.22,1317.22,1790.56,1325.00,1763.00C1325.00,1701.67,1277.33,1671.00,1182.00,1671.00C1154.67,1671.00,1130.33,1678.00,1109.00,1692.00C1085.00,1708.00,1073.00,1729.00,1073.00,1755.00C1073.00,1801.00,1088.00,1830.67,1118.00,1844.00C1134.67,1852.00,1169.00,1856.00,1221.00,1856.00"]
-            KCanvasItem {path} at (4207,-41) size 48x51 [transform={m=((1.00,0.00)(0.00,1.00)) t=(4199.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1306.00,412.00C1235.33,412.00,1174.33,422.33,1123.00,443.00C1088.78,456.78,1047.44,487.44,999.00,535.00C963.00,499.67,928.00,473.00,894.00,455.00C871.33,443.00,837.67,434.00,793.00,428.00C719.00,428.00,649.33,458.00,584.00,518.00C540.44,558.00,507.44,624.33,485.00,717.00C485.00,840.33,533.33,953.00,630.00,1055.00C694.44,1123.00,804.78,1174.00,961.00,1208.00C989.00,1208.00,1012.33,1197.67,1031.00,1177.00C1043.44,1163.22,1052.78,1138.22,1059.00,1102.00C1059.00,1062.00,1025.67,1032.33,959.00,1013.00C870.33,987.67,807.67,958.67,771.00,926.00C717.00,878.67,690.00,809.00,690.00,717.00C690.00,697.67,699.00,679.00,717.00,661.00C737.67,641.00,763.33,631.67,794.00,633.00C852.00,635.67,905.67,689.67,955.00,795.00C999.67,887.00,1039.33,933.00,1074.00,933.00C1102.00,933.00,1124.67,922.67,1142.00,902.00C1153.56,888.22,1162.22,862.89,1168.00,826.00C1168.00,812.67,1166.00,792.67,1162.00,766.00C1159.33,748.22,1157.00,728.22,1155.00,706.00C1155.00,662.67,1173.67,635.33,1211.00,624.00C1225.67,619.33,1257.33,617.00,1306.00,617.00C1397.33,617.00,1461.33,639.33,1498.00,684.00C1531.33,724.00,1548.00,790.33,1548.00,883.00C1548.00,1046.33,1482.33,1179.67,1351.00,1283.00C1231.00,1377.67,1087.67,1425.00,921.00,1425.00C727.00,1425.00,575.00,1351.67,465.00,1205.00C365.67,1074.33,316.00,910.00,316.00,712.00C316.00,529.33,374.33,375.33,491.00,250.00C612.33,119.33,768.33,54.00,959.00,54.00C1013.00,54.00,1074.00,64.33,1142.00,85.00L1317.00,150.00C1346.33,160.67,1365.33,166.00,1374.00,166.00C1401.33,166.00,1425.00,155.33,1445.00,134.00C1458.33,119.78,1468.33,94.44,1475.00,58.00C1475.00,-5.33,1404.00,-56.67,1262.00,-96.00C1154.67,-125.33,1054.33,-140.00,961.00,-140.00C867.00,-140.00,771.00,-122.00,673.00,-86.00C607.67,-62.00,523.33,-13.33,420.00,60.00C213.33,238.67,110.00,456.00,110.00,712.00C110.00,968.00,180.67,1182.00,322.00,1354.00C472.00,1538.00,671.67,1630.00,921.00,1630.00C1146.33,1630.00,1339.33,1562.33,1500.00,1427.00C1668.67,1283.67,1753.00,1102.33,1753.00,883.00C1753.00,733.00,1716.33,617.67,1643.00,537.00C1566.33,453.67,1454.00,412.00,1306.00,412.00"]
-            KCanvasItem {path} at (6113,-24) size 25x44 [transform={m=((1.00,0.00)(0.00,1.00)) t=(6106.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M770.00,-196.00C770.00,-278.67,750.00,-340.67,710.00,-382.00C683.33,-409.56,622.67,-430.56,528.00,-445.00C471.33,-445.00,417.67,-434.33,367.00,-413.00C303.00,-385.00,271.00,-346.67,271.00,-298.00C271.00,-262.00,293.67,-244.00,339.00,-244.00C363.00,-244.00,390.00,-252.00,420.00,-268.00C440.00,-278.67,472.33,-287.00,517.00,-293.00C549.67,-292.33,574.00,-284.33,590.00,-269.00C600.67,-258.78,608.67,-236.11,614.00,-201.00C614.00,-169.00,601.67,-140.33,577.00,-115.00C560.56,-98.11,522.56,-75.78,463.00,-48.00C357.00,-24.00,272.00,26.67,208.00,104.00C139.33,186.00,105.00,286.00,105.00,404.00C105.00,539.33,150.00,679.00,240.00,823.00C340.00,983.00,452.67,1063.00,578.00,1063.00C643.33,1063.00,716.33,1047.67,797.00,1017.00C899.00,977.67,950.00,929.67,950.00,873.00C950.00,847.67,941.67,825.33,925.00,806.00C913.89,793.11,893.22,783.11,863.00,776.00C843.67,776.00,827.00,781.67,813.00,793.00C803.67,800.56,789.67,812.22,771.00,828.00C731.67,859.33,667.33,875.00,578.00,875.00C510.00,875.00,442.67,814.33,376.00,693.00C315.33,581.67,285.00,485.33,285.00,404.00C285.00,316.00,315.00,246.67,375.00,196.00C431.00,148.67,503.00,125.00,591.00,125.00C631.00,125.00,673.67,135.67,719.00,157.00L835.00,219.00C855.00,229.67,869.33,235.00,878.00,235.00C902.67,235.00,924.00,225.33,942.00,206.00C954.00,193.11,963.00,170.44,969.00,138.00C969.00,69.33,883.67,10.00,713.00,-40.00C732.33,-65.33,746.67,-91.00,756.00,-117.00C762.22,-134.33,766.89,-160.67,770.00,-196.00"]
+            KCanvasItem {path} at (8,-37) size 35x44 [fill={[type=SOLID] [color=#000000]}] [data="M1250.00,-30.00C1188.67,-30.00,1135.33,48.67,1090.00,206.00C1072.67,266.00,1051.00,371.00,1025.00,521.00C957.00,511.67,868.00,495.00,758.00,471.00L492.00,416.00C458.67,328.67,401.67,201.00,321.00,33.00C299.67,-4.33,270.67,-23.00,234.00,-23.00C207.33,-23.00,183.67,-13.33,163.00,6.00C142.33,25.33,131.67,49.33,131.00,78.00C131.00,110.00,181.33,231.67,282.00,443.00C270.67,460.33,265.00,480.33,265.00,503.00C265.00,557.00,297.67,591.67,363.00,607.00C439.00,749.67,535.00,913.67,651.00,1099.00C809.00,1351.67,907.33,1478.00,946.00,1478.00C998.67,1478.00,1034.67,1441.33,1054.00,1368.00L1117.00,1032.00L1266.00,337.00L1323.00,179.00C1342.33,125.00,1352.00,89.00,1352.00,71.00C1352.00,42.33,1341.67,18.33,1321.00,-1.00C1300.33,-20.33,1276.67,-30.00,1250.00,-30.00M897.00,1113.00L611.00,652.00C691.67,672.67,814.00,697.67,978.00,727.00L897.00,1113.00"]
+            KCanvasItem {path} at (1502,-24) size 30x47 [transform={m=((1.00,0.00)(0.00,1.00)) t=(1498.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1011.00,892.00L665.00,144.00C579.67,-38.00,514.33,-190.33,469.00,-313.00L403.00,-507.00C385.67,-555.00,355.67,-579.00,313.00,-579.00C285.00,-579.00,261.00,-570.00,241.00,-552.00C221.00,-534.00,210.67,-511.00,210.00,-483.00C210.00,-416.33,282.00,-223.33,426.00,96.00L68.00,785.00L23.00,858.00C5.00,888.67,-4.00,914.33,-4.00,935.00C-4.00,962.33,6.33,986.33,27.00,1007.00C47.67,1027.67,71.33,1038.00,98.00,1038.00C128.67,1038.00,152.33,1026.33,169.00,1003.00C282.33,845.67,404.00,621.67,534.00,331.00L682.00,676.00C735.33,795.33,786.67,898.00,836.00,984.00C857.33,1021.33,885.33,1040.00,920.00,1040.00C947.33,1040.00,971.33,1030.33,992.00,1011.00C1012.67,991.67,1023.33,968.67,1024.00,942.00C1024.00,927.33,1019.67,910.67,1011.00,892.00"]
+            KCanvasItem {path} at (2572,-48) size 41x56 [transform={m=((1.00,0.00)(0.00,1.00)) t=(2564.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M802.00,-61.00C614.00,-61.00,454.67,-4.67,324.00,108.00C185.33,228.00,116.00,382.67,116.00,572.00C116.00,802.67,184.33,1012.33,321.00,1201.00C473.67,1410.33,664.00,1515.00,892.00,1515.00C1111.33,1515.00,1274.33,1465.67,1381.00,1367.00C1492.33,1264.33,1548.00,1102.33,1548.00,881.00C1548.00,650.33,1485.33,442.33,1360.00,257.00C1216.00,45.00,1030.00,-61.00,802.00,-61.00M892.00,1310.00C728.67,1310.00,590.33,1228.67,477.00,1066.00C372.33,916.67,320.00,752.00,320.00,572.00C320.00,443.33,367.67,338.67,463.00,258.00C554.33,182.00,667.33,144.00,802.00,144.00C964.00,144.00,1097.67,225.67,1203.00,389.00C1297.00,535.00,1344.00,699.00,1344.00,881.00C1344.00,1040.33,1308.33,1152.33,1237.00,1217.00C1169.00,1279.00,1054.00,1310.00,892.00,1310.00M682.00,1848.00C769.33,1848.00,813.00,1813.00,813.00,1743.00C813.00,1723.00,798.33,1703.67,769.00,1685.00C742.33,1668.33,717.33,1660.00,694.00,1660.00C612.00,1660.00,571.00,1694.33,571.00,1763.00C571.00,1782.33,583.33,1801.33,608.00,1820.00C632.67,1838.67,657.33,1848.00,682.00,1848.00M1221.00,1856.00C1243.67,1856.00,1266.67,1845.67,1290.00,1825.00C1313.33,1804.33,1325.00,1783.67,1325.00,1763.00C1325.00,1701.67,1277.33,1671.00,1182.00,1671.00C1154.67,1671.00,1130.33,1678.00,1109.00,1692.00C1085.00,1708.00,1073.00,1729.00,1073.00,1755.00C1073.00,1801.00,1088.00,1830.67,1118.00,1844.00C1134.67,1852.00,1169.00,1856.00,1221.00,1856.00"]
+            KCanvasItem {path} at (4207,-41) size 48x51 [transform={m=((1.00,0.00)(0.00,1.00)) t=(4199.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1306.00,412.00C1235.33,412.00,1174.33,422.33,1123.00,443.00C1071.67,463.67,1030.33,494.33,999.00,535.00C963.00,499.67,928.00,473.00,894.00,455.00C860.00,437.00,826.33,428.00,793.00,428.00C719.00,428.00,649.33,458.00,584.00,518.00C518.67,578.00,485.67,644.33,485.00,717.00C485.00,840.33,533.33,953.00,630.00,1055.00C726.67,1157.00,837.00,1208.00,961.00,1208.00C989.00,1208.00,1012.33,1197.67,1031.00,1177.00C1049.67,1156.33,1059.00,1131.33,1059.00,1102.00C1059.00,1062.00,1025.67,1032.33,959.00,1013.00C870.33,987.67,807.67,958.67,771.00,926.00C717.00,878.67,690.00,809.00,690.00,717.00C690.00,697.67,699.00,679.00,717.00,661.00C737.67,641.00,763.33,631.67,794.00,633.00C852.00,635.67,905.67,689.67,955.00,795.00C999.67,887.00,1039.33,933.00,1074.00,933.00C1102.00,933.00,1124.67,922.67,1142.00,902.00C1159.33,881.33,1168.00,856.00,1168.00,826.00C1168.00,812.67,1166.00,792.67,1162.00,766.00C1158.00,739.33,1155.67,719.33,1155.00,706.00C1155.00,662.67,1173.67,635.33,1211.00,624.00C1225.67,619.33,1257.33,617.00,1306.00,617.00C1397.33,617.00,1461.33,639.33,1498.00,684.00C1531.33,724.00,1548.00,790.33,1548.00,883.00C1548.00,1046.33,1482.33,1179.67,1351.00,1283.00C1231.00,1377.67,1087.67,1425.00,921.00,1425.00C727.00,1425.00,575.00,1351.67,465.00,1205.00C365.67,1074.33,316.00,910.00,316.00,712.00C316.00,529.33,374.33,375.33,491.00,250.00C612.33,119.33,768.33,54.00,959.00,54.00C1013.00,54.00,1074.00,64.33,1142.00,85.00L1317.00,150.00C1346.33,160.67,1365.33,166.00,1374.00,166.00C1401.33,166.00,1425.00,155.33,1445.00,134.00C1465.00,112.67,1475.00,87.33,1475.00,58.00C1475.00,-5.33,1404.00,-56.67,1262.00,-96.00C1154.67,-125.33,1054.33,-140.00,961.00,-140.00C867.00,-140.00,771.00,-122.00,673.00,-86.00C575.00,-50.00,490.67,-1.33,420.00,60.00C213.33,238.67,110.00,456.00,110.00,712.00C110.00,968.00,180.67,1182.00,322.00,1354.00C472.00,1538.00,671.67,1630.00,921.00,1630.00C1146.33,1630.00,1339.33,1562.33,1500.00,1427.00C1668.67,1283.67,1753.00,1102.33,1753.00,883.00C1753.00,733.00,1716.33,617.67,1643.00,537.00C1566.33,453.67,1454.00,412.00,1306.00,412.00"]
+            KCanvasItem {path} at (6113,-24) size 25x44 [transform={m=((1.00,0.00)(0.00,1.00)) t=(6106.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M770.00,-196.00C770.00,-278.67,750.00,-340.67,710.00,-382.00C670.00,-423.33,609.33,-444.33,528.00,-445.00C471.33,-445.00,417.67,-434.33,367.00,-413.00C303.00,-385.00,271.00,-346.67,271.00,-298.00C271.00,-262.00,293.67,-244.00,339.00,-244.00C363.00,-244.00,390.00,-252.00,420.00,-268.00C450.00,-284.00,482.33,-292.33,517.00,-293.00C549.67,-292.33,574.00,-284.33,590.00,-269.00C606.00,-253.67,614.00,-231.00,614.00,-201.00C614.00,-169.00,601.67,-140.33,577.00,-115.00C552.33,-89.67,514.33,-67.33,463.00,-48.00C357.00,-24.00,272.00,26.67,208.00,104.00C139.33,186.00,105.00,286.00,105.00,404.00C105.00,539.33,150.00,679.00,240.00,823.00C340.00,983.00,452.67,1063.00,578.00,1063.00C643.33,1063.00,716.33,1047.67,797.00,1017.00C899.00,977.67,950.00,929.67,950.00,873.00C950.00,847.67,941.67,825.33,925.00,806.00C908.33,786.67,887.67,776.67,863.00,776.00C843.67,776.00,827.00,781.67,813.00,793.00C799.00,804.33,785.00,816.00,771.00,828.00C731.67,859.33,667.33,875.00,578.00,875.00C510.00,875.00,442.67,814.33,376.00,693.00C315.33,581.67,285.00,485.33,285.00,404.00C285.00,316.00,315.00,246.67,375.00,196.00C431.00,148.67,503.00,125.00,591.00,125.00C631.00,125.00,673.67,135.67,719.00,157.00L835.00,219.00C855.00,229.67,869.33,235.00,878.00,235.00C902.67,235.00,924.00,225.33,942.00,206.00C960.00,186.67,969.00,164.00,969.00,138.00C969.00,69.33,883.67,10.00,713.00,-40.00C732.33,-65.33,746.67,-91.00,756.00,-117.00C765.33,-143.00,770.00,-169.33,770.00,-196.00"]
       KCanvasItem {rect} at (0,0) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
index 8c3ddddb67f35330e0baed8f7bd997d0d8a49063..0f8c4c9e465a2771e5adceb0d3283ee52ac67a3c 100644 (file)
@@ -1 +1 @@
-ee7d72e92abf5ec5bb6f2017829dd6ce
\ No newline at end of file
+4778d907fc08436b580c2bace7152682
\ No newline at end of file
index 5e7928004f261cbcf9cfe82db9eca0da0a3ba518..58437864747e230a9c9753257cc41325b53ea972 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/fonts-elem-03-b-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/fonts-elem-03-b-expected.png differ
index 29861ccd620daaeae3869fb826d0a06b9bf08be2..ff74bd53b210ed2360eafc3ab8a10f33a0fce2fb 100644 (file)
@@ -7,15 +7,15 @@ layer at (0,0) size 480x360
             KCanvasItem {line} at (165,139) size 210x1 [stroke={[type=SOLID] [color=#888888]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00L210.00,0.00"]
             KCanvasContainer {g} at (4,-54) size 211x161 [transform={m=((0.03,0.00)(0.00,0.03)) t=(0.00,0.00)}]
               KCanvasItem {line} at (4,-54) size 1x161 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,-3500.00L0.00,2000.00"]
-              KCanvasItem {path} at (8,-39) size 35x44 [fill={[type=SOLID] [color=#000000]}] [data="M1250.00,-30.00C1188.67,-30.00,1135.33,48.67,1090.00,206.00C1072.67,266.00,1051.00,371.00,1025.00,521.00C957.00,511.67,868.00,495.00,758.00,471.00L492.00,416.00C458.67,328.67,401.67,201.00,321.00,33.00C299.67,-4.33,270.67,-23.00,234.00,-23.00C207.33,-23.00,183.67,-13.33,163.00,6.00C149.22,18.89,138.56,42.89,131.00,78.00C131.00,110.00,181.33,231.67,282.00,443.00C270.67,460.33,265.00,480.33,265.00,503.00C265.00,557.00,297.67,591.67,363.00,607.00C439.00,749.67,535.00,913.67,651.00,1099.00C809.00,1351.67,907.33,1478.00,946.00,1478.00C998.67,1478.00,1034.67,1441.33,1054.00,1368.00L1117.00,1032.00L1266.00,337.00L1323.00,179.00C1342.33,125.00,1352.00,89.00,1352.00,71.00C1352.00,42.33,1341.67,18.33,1321.00,-1.00C1307.22,-13.89,1283.56,-23.56,1250.00,-30.00M897.00,1113.00L611.00,652.00C691.67,672.67,814.00,697.67,978.00,727.00L897.00,1113.00"]
+              KCanvasItem {path} at (8,-39) size 35x44 [fill={[type=SOLID] [color=#000000]}] [data="M1250.00,-30.00C1188.67,-30.00,1135.33,48.67,1090.00,206.00C1072.67,266.00,1051.00,371.00,1025.00,521.00C957.00,511.67,868.00,495.00,758.00,471.00L492.00,416.00C458.67,328.67,401.67,201.00,321.00,33.00C299.67,-4.33,270.67,-23.00,234.00,-23.00C207.33,-23.00,183.67,-13.33,163.00,6.00C142.33,25.33,131.67,49.33,131.00,78.00C131.00,110.00,181.33,231.67,282.00,443.00C270.67,460.33,265.00,480.33,265.00,503.00C265.00,557.00,297.67,591.67,363.00,607.00C439.00,749.67,535.00,913.67,651.00,1099.00C809.00,1351.67,907.33,1478.00,946.00,1478.00C998.67,1478.00,1034.67,1441.33,1054.00,1368.00L1117.00,1032.00L1266.00,337.00L1323.00,179.00C1342.33,125.00,1352.00,89.00,1352.00,71.00C1352.00,42.33,1341.67,18.33,1321.00,-1.00C1300.33,-20.33,1276.67,-30.00,1250.00,-30.00M897.00,1113.00L611.00,652.00C691.67,672.67,814.00,697.67,978.00,727.00L897.00,1113.00"]
               KCanvasItem {line} at (47,-54) size 1x161 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M1498.00,-3500.00L1498.00,2000.00"]
-              KCanvasItem {path} at (1502,-26) size 30x47 [transform={m=((1.00,0.00)(0.00,1.00)) t=(1498.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1011.00,892.00L665.00,144.00C579.67,-38.00,514.33,-190.33,469.00,-313.00L403.00,-507.00C385.67,-555.00,355.67,-579.00,313.00,-579.00C285.00,-579.00,261.00,-570.00,241.00,-552.00C227.67,-540.00,217.33,-517.00,210.00,-483.00C210.00,-416.33,282.00,-223.33,426.00,96.00L68.00,785.00L23.00,858.00C5.00,888.67,-4.00,914.33,-4.00,935.00C-4.00,962.33,6.33,986.33,27.00,1007.00C40.78,1020.78,64.44,1031.11,98.00,1038.00C128.67,1038.00,152.33,1026.33,169.00,1003.00C282.33,845.67,404.00,621.67,534.00,331.00L682.00,676.00C735.33,795.33,786.67,898.00,836.00,984.00C857.33,1021.33,885.33,1040.00,920.00,1040.00C947.33,1040.00,971.33,1030.33,992.00,1011.00C1005.78,998.11,1016.44,975.11,1024.00,942.00C1024.00,927.33,1019.67,910.67,1011.00,892.00"]
+              KCanvasItem {path} at (1502,-26) size 30x47 [transform={m=((1.00,0.00)(0.00,1.00)) t=(1498.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1011.00,892.00L665.00,144.00C579.67,-38.00,514.33,-190.33,469.00,-313.00L403.00,-507.00C385.67,-555.00,355.67,-579.00,313.00,-579.00C285.00,-579.00,261.00,-570.00,241.00,-552.00C221.00,-534.00,210.67,-511.00,210.00,-483.00C210.00,-416.33,282.00,-223.33,426.00,96.00L68.00,785.00L23.00,858.00C5.00,888.67,-4.00,914.33,-4.00,935.00C-4.00,962.33,6.33,986.33,27.00,1007.00C47.67,1027.67,71.33,1038.00,98.00,1038.00C128.67,1038.00,152.33,1026.33,169.00,1003.00C282.33,845.67,404.00,621.67,534.00,331.00L682.00,676.00C735.33,795.33,786.67,898.00,836.00,984.00C857.33,1021.33,885.33,1040.00,920.00,1040.00C947.33,1040.00,971.33,1030.33,992.00,1011.00C1012.67,991.67,1023.33,968.67,1024.00,942.00C1024.00,927.33,1019.67,910.67,1011.00,892.00"]
               KCanvasItem {line} at (79,-54) size 1x161 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M2564.00,-3500.00L2564.00,2000.00"]
-              KCanvasItem {path} at (2572,-50) size 41x56 [transform={m=((1.00,0.00)(0.00,1.00)) t=(2564.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M802.00,-61.00C614.00,-61.00,454.67,-4.67,324.00,108.00C185.33,228.00,116.00,382.67,116.00,572.00C116.00,802.67,184.33,1012.33,321.00,1201.00C473.67,1410.33,664.00,1515.00,892.00,1515.00C1111.33,1515.00,1274.33,1465.67,1381.00,1367.00C1492.33,1264.33,1548.00,1102.33,1548.00,881.00C1548.00,650.33,1485.33,442.33,1360.00,257.00C1216.00,45.00,1030.00,-61.00,802.00,-61.00M892.00,1310.00C728.67,1310.00,590.33,1228.67,477.00,1066.00C372.33,916.67,320.00,752.00,320.00,572.00C320.00,443.33,367.67,338.67,463.00,258.00C554.33,182.00,667.33,144.00,802.00,144.00C964.00,144.00,1097.67,225.67,1203.00,389.00C1297.00,535.00,1344.00,699.00,1344.00,881.00C1344.00,1040.33,1308.33,1152.33,1237.00,1217.00C1169.00,1279.00,1054.00,1310.00,892.00,1310.00M682.00,1848.00C769.33,1848.00,813.00,1813.00,813.00,1743.00C813.00,1723.00,798.33,1703.67,769.00,1685.00C742.33,1668.33,717.33,1660.00,694.00,1660.00C612.00,1660.00,571.00,1694.33,571.00,1763.00C571.00,1782.33,583.33,1801.33,608.00,1820.00C624.44,1832.44,649.11,1841.78,682.00,1848.00M1221.00,1856.00C1243.67,1856.00,1266.67,1845.67,1290.00,1825.00C1305.56,1811.22,1317.22,1790.56,1325.00,1763.00C1325.00,1701.67,1277.33,1671.00,1182.00,1671.00C1154.67,1671.00,1130.33,1678.00,1109.00,1692.00C1085.00,1708.00,1073.00,1729.00,1073.00,1755.00C1073.00,1801.00,1088.00,1830.67,1118.00,1844.00C1134.67,1852.00,1169.00,1856.00,1221.00,1856.00"]
+              KCanvasItem {path} at (2572,-50) size 41x56 [transform={m=((1.00,0.00)(0.00,1.00)) t=(2564.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M802.00,-61.00C614.00,-61.00,454.67,-4.67,324.00,108.00C185.33,228.00,116.00,382.67,116.00,572.00C116.00,802.67,184.33,1012.33,321.00,1201.00C473.67,1410.33,664.00,1515.00,892.00,1515.00C1111.33,1515.00,1274.33,1465.67,1381.00,1367.00C1492.33,1264.33,1548.00,1102.33,1548.00,881.00C1548.00,650.33,1485.33,442.33,1360.00,257.00C1216.00,45.00,1030.00,-61.00,802.00,-61.00M892.00,1310.00C728.67,1310.00,590.33,1228.67,477.00,1066.00C372.33,916.67,320.00,752.00,320.00,572.00C320.00,443.33,367.67,338.67,463.00,258.00C554.33,182.00,667.33,144.00,802.00,144.00C964.00,144.00,1097.67,225.67,1203.00,389.00C1297.00,535.00,1344.00,699.00,1344.00,881.00C1344.00,1040.33,1308.33,1152.33,1237.00,1217.00C1169.00,1279.00,1054.00,1310.00,892.00,1310.00M682.00,1848.00C769.33,1848.00,813.00,1813.00,813.00,1743.00C813.00,1723.00,798.33,1703.67,769.00,1685.00C742.33,1668.33,717.33,1660.00,694.00,1660.00C612.00,1660.00,571.00,1694.33,571.00,1763.00C571.00,1782.33,583.33,1801.33,608.00,1820.00C632.67,1838.67,657.33,1848.00,682.00,1848.00M1221.00,1856.00C1243.67,1856.00,1266.67,1845.67,1290.00,1825.00C1313.33,1804.33,1325.00,1783.67,1325.00,1763.00C1325.00,1701.67,1277.33,1671.00,1182.00,1671.00C1154.67,1671.00,1130.33,1678.00,1109.00,1692.00C1085.00,1708.00,1073.00,1729.00,1073.00,1755.00C1073.00,1801.00,1088.00,1830.67,1118.00,1844.00C1134.67,1852.00,1169.00,1856.00,1221.00,1856.00"]
               KCanvasItem {line} at (127,-54) size 1x161 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M4199.00,-3500.00L4199.00,2000.00"]
-              KCanvasItem {path} at (4207,-43) size 48x51 [transform={m=((1.00,0.00)(0.00,1.00)) t=(4199.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1306.00,412.00C1235.33,412.00,1174.33,422.33,1123.00,443.00C1088.78,456.78,1047.44,487.44,999.00,535.00C963.00,499.67,928.00,473.00,894.00,455.00C871.33,443.00,837.67,434.00,793.00,428.00C719.00,428.00,649.33,458.00,584.00,518.00C540.44,558.00,507.44,624.33,485.00,717.00C485.00,840.33,533.33,953.00,630.00,1055.00C694.44,1123.00,804.78,1174.00,961.00,1208.00C989.00,1208.00,1012.33,1197.67,1031.00,1177.00C1043.44,1163.22,1052.78,1138.22,1059.00,1102.00C1059.00,1062.00,1025.67,1032.33,959.00,1013.00C870.33,987.67,807.67,958.67,771.00,926.00C717.00,878.67,690.00,809.00,690.00,717.00C690.00,697.67,699.00,679.00,717.00,661.00C737.67,641.00,763.33,631.67,794.00,633.00C852.00,635.67,905.67,689.67,955.00,795.00C999.67,887.00,1039.33,933.00,1074.00,933.00C1102.00,933.00,1124.67,922.67,1142.00,902.00C1153.56,888.22,1162.22,862.89,1168.00,826.00C1168.00,812.67,1166.00,792.67,1162.00,766.00C1159.33,748.22,1157.00,728.22,1155.00,706.00C1155.00,662.67,1173.67,635.33,1211.00,624.00C1225.67,619.33,1257.33,617.00,1306.00,617.00C1397.33,617.00,1461.33,639.33,1498.00,684.00C1531.33,724.00,1548.00,790.33,1548.00,883.00C1548.00,1046.33,1482.33,1179.67,1351.00,1283.00C1231.00,1377.67,1087.67,1425.00,921.00,1425.00C727.00,1425.00,575.00,1351.67,465.00,1205.00C365.67,1074.33,316.00,910.00,316.00,712.00C316.00,529.33,374.33,375.33,491.00,250.00C612.33,119.33,768.33,54.00,959.00,54.00C1013.00,54.00,1074.00,64.33,1142.00,85.00L1317.00,150.00C1346.33,160.67,1365.33,166.00,1374.00,166.00C1401.33,166.00,1425.00,155.33,1445.00,134.00C1458.33,119.78,1468.33,94.44,1475.00,58.00C1475.00,-5.33,1404.00,-56.67,1262.00,-96.00C1154.67,-125.33,1054.33,-140.00,961.00,-140.00C867.00,-140.00,771.00,-122.00,673.00,-86.00C607.67,-62.00,523.33,-13.33,420.00,60.00C213.33,238.67,110.00,456.00,110.00,712.00C110.00,968.00,180.67,1182.00,322.00,1354.00C472.00,1538.00,671.67,1630.00,921.00,1630.00C1146.33,1630.00,1339.33,1562.33,1500.00,1427.00C1668.67,1283.67,1753.00,1102.33,1753.00,883.00C1753.00,733.00,1716.33,617.67,1643.00,537.00C1566.33,453.67,1454.00,412.00,1306.00,412.00"]
+              KCanvasItem {path} at (4207,-43) size 48x51 [transform={m=((1.00,0.00)(0.00,1.00)) t=(4199.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1306.00,412.00C1235.33,412.00,1174.33,422.33,1123.00,443.00C1071.67,463.67,1030.33,494.33,999.00,535.00C963.00,499.67,928.00,473.00,894.00,455.00C860.00,437.00,826.33,428.00,793.00,428.00C719.00,428.00,649.33,458.00,584.00,518.00C518.67,578.00,485.67,644.33,485.00,717.00C485.00,840.33,533.33,953.00,630.00,1055.00C726.67,1157.00,837.00,1208.00,961.00,1208.00C989.00,1208.00,1012.33,1197.67,1031.00,1177.00C1049.67,1156.33,1059.00,1131.33,1059.00,1102.00C1059.00,1062.00,1025.67,1032.33,959.00,1013.00C870.33,987.67,807.67,958.67,771.00,926.00C717.00,878.67,690.00,809.00,690.00,717.00C690.00,697.67,699.00,679.00,717.00,661.00C737.67,641.00,763.33,631.67,794.00,633.00C852.00,635.67,905.67,689.67,955.00,795.00C999.67,887.00,1039.33,933.00,1074.00,933.00C1102.00,933.00,1124.67,922.67,1142.00,902.00C1159.33,881.33,1168.00,856.00,1168.00,826.00C1168.00,812.67,1166.00,792.67,1162.00,766.00C1158.00,739.33,1155.67,719.33,1155.00,706.00C1155.00,662.67,1173.67,635.33,1211.00,624.00C1225.67,619.33,1257.33,617.00,1306.00,617.00C1397.33,617.00,1461.33,639.33,1498.00,684.00C1531.33,724.00,1548.00,790.33,1548.00,883.00C1548.00,1046.33,1482.33,1179.67,1351.00,1283.00C1231.00,1377.67,1087.67,1425.00,921.00,1425.00C727.00,1425.00,575.00,1351.67,465.00,1205.00C365.67,1074.33,316.00,910.00,316.00,712.00C316.00,529.33,374.33,375.33,491.00,250.00C612.33,119.33,768.33,54.00,959.00,54.00C1013.00,54.00,1074.00,64.33,1142.00,85.00L1317.00,150.00C1346.33,160.67,1365.33,166.00,1374.00,166.00C1401.33,166.00,1425.00,155.33,1445.00,134.00C1465.00,112.67,1475.00,87.33,1475.00,58.00C1475.00,-5.33,1404.00,-56.67,1262.00,-96.00C1154.67,-125.33,1054.33,-140.00,961.00,-140.00C867.00,-140.00,771.00,-122.00,673.00,-86.00C575.00,-50.00,490.67,-1.33,420.00,60.00C213.33,238.67,110.00,456.00,110.00,712.00C110.00,968.00,180.67,1182.00,322.00,1354.00C472.00,1538.00,671.67,1630.00,921.00,1630.00C1146.33,1630.00,1339.33,1562.33,1500.00,1427.00C1668.67,1283.67,1753.00,1102.33,1753.00,883.00C1753.00,733.00,1716.33,617.67,1643.00,537.00C1566.33,453.67,1454.00,412.00,1306.00,412.00"]
               KCanvasItem {line} at (182,-54) size 1x161 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M6106.00,-3500.00L6106.00,2000.00"]
-              KCanvasItem {path} at (6113,-27) size 25x44 [transform={m=((1.00,0.00)(0.00,1.00)) t=(6106.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M770.00,-196.00C770.00,-278.67,750.00,-340.67,710.00,-382.00C683.33,-409.56,622.67,-430.56,528.00,-445.00C471.33,-445.00,417.67,-434.33,367.00,-413.00C303.00,-385.00,271.00,-346.67,271.00,-298.00C271.00,-262.00,293.67,-244.00,339.00,-244.00C363.00,-244.00,390.00,-252.00,420.00,-268.00C440.00,-278.67,472.33,-287.00,517.00,-293.00C549.67,-292.33,574.00,-284.33,590.00,-269.00C600.67,-258.78,608.67,-236.11,614.00,-201.00C614.00,-169.00,601.67,-140.33,577.00,-115.00C560.56,-98.11,522.56,-75.78,463.00,-48.00C357.00,-24.00,272.00,26.67,208.00,104.00C139.33,186.00,105.00,286.00,105.00,404.00C105.00,539.33,150.00,679.00,240.00,823.00C340.00,983.00,452.67,1063.00,578.00,1063.00C643.33,1063.00,716.33,1047.67,797.00,1017.00C899.00,977.67,950.00,929.67,950.00,873.00C950.00,847.67,941.67,825.33,925.00,806.00C913.89,793.11,893.22,783.11,863.00,776.00C843.67,776.00,827.00,781.67,813.00,793.00C803.67,800.56,789.67,812.22,771.00,828.00C731.67,859.33,667.33,875.00,578.00,875.00C510.00,875.00,442.67,814.33,376.00,693.00C315.33,581.67,285.00,485.33,285.00,404.00C285.00,316.00,315.00,246.67,375.00,196.00C431.00,148.67,503.00,125.00,591.00,125.00C631.00,125.00,673.67,135.67,719.00,157.00L835.00,219.00C855.00,229.67,869.33,235.00,878.00,235.00C902.67,235.00,924.00,225.33,942.00,206.00C954.00,193.11,963.00,170.44,969.00,138.00C969.00,69.33,883.67,10.00,713.00,-40.00C732.33,-65.33,746.67,-91.00,756.00,-117.00C762.22,-134.33,766.89,-160.67,770.00,-196.00"]
+              KCanvasItem {path} at (6113,-27) size 25x44 [transform={m=((1.00,0.00)(0.00,1.00)) t=(6106.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M770.00,-196.00C770.00,-278.67,750.00,-340.67,710.00,-382.00C670.00,-423.33,609.33,-444.33,528.00,-445.00C471.33,-445.00,417.67,-434.33,367.00,-413.00C303.00,-385.00,271.00,-346.67,271.00,-298.00C271.00,-262.00,293.67,-244.00,339.00,-244.00C363.00,-244.00,390.00,-252.00,420.00,-268.00C450.00,-284.00,482.33,-292.33,517.00,-293.00C549.67,-292.33,574.00,-284.33,590.00,-269.00C606.00,-253.67,614.00,-231.00,614.00,-201.00C614.00,-169.00,601.67,-140.33,577.00,-115.00C552.33,-89.67,514.33,-67.33,463.00,-48.00C357.00,-24.00,272.00,26.67,208.00,104.00C139.33,186.00,105.00,286.00,105.00,404.00C105.00,539.33,150.00,679.00,240.00,823.00C340.00,983.00,452.67,1063.00,578.00,1063.00C643.33,1063.00,716.33,1047.67,797.00,1017.00C899.00,977.67,950.00,929.67,950.00,873.00C950.00,847.67,941.67,825.33,925.00,806.00C908.33,786.67,887.67,776.67,863.00,776.00C843.67,776.00,827.00,781.67,813.00,793.00C799.00,804.33,785.00,816.00,771.00,828.00C731.67,859.33,667.33,875.00,578.00,875.00C510.00,875.00,442.67,814.33,376.00,693.00C315.33,581.67,285.00,485.33,285.00,404.00C285.00,316.00,315.00,246.67,375.00,196.00C431.00,148.67,503.00,125.00,591.00,125.00C631.00,125.00,673.67,135.67,719.00,157.00L835.00,219.00C855.00,229.67,869.33,235.00,878.00,235.00C902.67,235.00,924.00,225.33,942.00,206.00C960.00,186.67,969.00,164.00,969.00,138.00C969.00,69.33,883.67,10.00,713.00,-40.00C732.33,-65.33,746.67,-91.00,756.00,-117.00C765.33,-143.00,770.00,-169.33,770.00,-196.00"]
               KCanvasItem {line} at (213,-54) size 1x161 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M7158.00,-3500.00L7158.00,2000.00"]
         KCanvasContainer {g} at (165,220) size 210x1 [transform={m=((1.00,0.00)(0.00,1.00)) t=(165.00,220.00)}]
           KCanvasItem {line} at (165,220) size 210x1 [stroke={[type=SOLID] [color=#888888]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00L210.00,0.00"]
index 8c3ddddb67f35330e0baed8f7bd997d0d8a49063..0f8c4c9e465a2771e5adceb0d3283ee52ac67a3c 100644 (file)
@@ -1 +1 @@
-ee7d72e92abf5ec5bb6f2017829dd6ce
\ No newline at end of file
+4778d907fc08436b580c2bace7152682
\ No newline at end of file
index 5e7928004f261cbcf9cfe82db9eca0da0a3ba518..58437864747e230a9c9753257cc41325b53ea972 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/fonts-elem-04-b-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/fonts-elem-04-b-expected.png differ
index 29861ccd620daaeae3869fb826d0a06b9bf08be2..ff74bd53b210ed2360eafc3ab8a10f33a0fce2fb 100644 (file)
@@ -7,15 +7,15 @@ layer at (0,0) size 480x360
             KCanvasItem {line} at (165,139) size 210x1 [stroke={[type=SOLID] [color=#888888]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00L210.00,0.00"]
             KCanvasContainer {g} at (4,-54) size 211x161 [transform={m=((0.03,0.00)(0.00,0.03)) t=(0.00,0.00)}]
               KCanvasItem {line} at (4,-54) size 1x161 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,-3500.00L0.00,2000.00"]
-              KCanvasItem {path} at (8,-39) size 35x44 [fill={[type=SOLID] [color=#000000]}] [data="M1250.00,-30.00C1188.67,-30.00,1135.33,48.67,1090.00,206.00C1072.67,266.00,1051.00,371.00,1025.00,521.00C957.00,511.67,868.00,495.00,758.00,471.00L492.00,416.00C458.67,328.67,401.67,201.00,321.00,33.00C299.67,-4.33,270.67,-23.00,234.00,-23.00C207.33,-23.00,183.67,-13.33,163.00,6.00C149.22,18.89,138.56,42.89,131.00,78.00C131.00,110.00,181.33,231.67,282.00,443.00C270.67,460.33,265.00,480.33,265.00,503.00C265.00,557.00,297.67,591.67,363.00,607.00C439.00,749.67,535.00,913.67,651.00,1099.00C809.00,1351.67,907.33,1478.00,946.00,1478.00C998.67,1478.00,1034.67,1441.33,1054.00,1368.00L1117.00,1032.00L1266.00,337.00L1323.00,179.00C1342.33,125.00,1352.00,89.00,1352.00,71.00C1352.00,42.33,1341.67,18.33,1321.00,-1.00C1307.22,-13.89,1283.56,-23.56,1250.00,-30.00M897.00,1113.00L611.00,652.00C691.67,672.67,814.00,697.67,978.00,727.00L897.00,1113.00"]
+              KCanvasItem {path} at (8,-39) size 35x44 [fill={[type=SOLID] [color=#000000]}] [data="M1250.00,-30.00C1188.67,-30.00,1135.33,48.67,1090.00,206.00C1072.67,266.00,1051.00,371.00,1025.00,521.00C957.00,511.67,868.00,495.00,758.00,471.00L492.00,416.00C458.67,328.67,401.67,201.00,321.00,33.00C299.67,-4.33,270.67,-23.00,234.00,-23.00C207.33,-23.00,183.67,-13.33,163.00,6.00C142.33,25.33,131.67,49.33,131.00,78.00C131.00,110.00,181.33,231.67,282.00,443.00C270.67,460.33,265.00,480.33,265.00,503.00C265.00,557.00,297.67,591.67,363.00,607.00C439.00,749.67,535.00,913.67,651.00,1099.00C809.00,1351.67,907.33,1478.00,946.00,1478.00C998.67,1478.00,1034.67,1441.33,1054.00,1368.00L1117.00,1032.00L1266.00,337.00L1323.00,179.00C1342.33,125.00,1352.00,89.00,1352.00,71.00C1352.00,42.33,1341.67,18.33,1321.00,-1.00C1300.33,-20.33,1276.67,-30.00,1250.00,-30.00M897.00,1113.00L611.00,652.00C691.67,672.67,814.00,697.67,978.00,727.00L897.00,1113.00"]
               KCanvasItem {line} at (47,-54) size 1x161 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M1498.00,-3500.00L1498.00,2000.00"]
-              KCanvasItem {path} at (1502,-26) size 30x47 [transform={m=((1.00,0.00)(0.00,1.00)) t=(1498.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1011.00,892.00L665.00,144.00C579.67,-38.00,514.33,-190.33,469.00,-313.00L403.00,-507.00C385.67,-555.00,355.67,-579.00,313.00,-579.00C285.00,-579.00,261.00,-570.00,241.00,-552.00C227.67,-540.00,217.33,-517.00,210.00,-483.00C210.00,-416.33,282.00,-223.33,426.00,96.00L68.00,785.00L23.00,858.00C5.00,888.67,-4.00,914.33,-4.00,935.00C-4.00,962.33,6.33,986.33,27.00,1007.00C40.78,1020.78,64.44,1031.11,98.00,1038.00C128.67,1038.00,152.33,1026.33,169.00,1003.00C282.33,845.67,404.00,621.67,534.00,331.00L682.00,676.00C735.33,795.33,786.67,898.00,836.00,984.00C857.33,1021.33,885.33,1040.00,920.00,1040.00C947.33,1040.00,971.33,1030.33,992.00,1011.00C1005.78,998.11,1016.44,975.11,1024.00,942.00C1024.00,927.33,1019.67,910.67,1011.00,892.00"]
+              KCanvasItem {path} at (1502,-26) size 30x47 [transform={m=((1.00,0.00)(0.00,1.00)) t=(1498.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1011.00,892.00L665.00,144.00C579.67,-38.00,514.33,-190.33,469.00,-313.00L403.00,-507.00C385.67,-555.00,355.67,-579.00,313.00,-579.00C285.00,-579.00,261.00,-570.00,241.00,-552.00C221.00,-534.00,210.67,-511.00,210.00,-483.00C210.00,-416.33,282.00,-223.33,426.00,96.00L68.00,785.00L23.00,858.00C5.00,888.67,-4.00,914.33,-4.00,935.00C-4.00,962.33,6.33,986.33,27.00,1007.00C47.67,1027.67,71.33,1038.00,98.00,1038.00C128.67,1038.00,152.33,1026.33,169.00,1003.00C282.33,845.67,404.00,621.67,534.00,331.00L682.00,676.00C735.33,795.33,786.67,898.00,836.00,984.00C857.33,1021.33,885.33,1040.00,920.00,1040.00C947.33,1040.00,971.33,1030.33,992.00,1011.00C1012.67,991.67,1023.33,968.67,1024.00,942.00C1024.00,927.33,1019.67,910.67,1011.00,892.00"]
               KCanvasItem {line} at (79,-54) size 1x161 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M2564.00,-3500.00L2564.00,2000.00"]
-              KCanvasItem {path} at (2572,-50) size 41x56 [transform={m=((1.00,0.00)(0.00,1.00)) t=(2564.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M802.00,-61.00C614.00,-61.00,454.67,-4.67,324.00,108.00C185.33,228.00,116.00,382.67,116.00,572.00C116.00,802.67,184.33,1012.33,321.00,1201.00C473.67,1410.33,664.00,1515.00,892.00,1515.00C1111.33,1515.00,1274.33,1465.67,1381.00,1367.00C1492.33,1264.33,1548.00,1102.33,1548.00,881.00C1548.00,650.33,1485.33,442.33,1360.00,257.00C1216.00,45.00,1030.00,-61.00,802.00,-61.00M892.00,1310.00C728.67,1310.00,590.33,1228.67,477.00,1066.00C372.33,916.67,320.00,752.00,320.00,572.00C320.00,443.33,367.67,338.67,463.00,258.00C554.33,182.00,667.33,144.00,802.00,144.00C964.00,144.00,1097.67,225.67,1203.00,389.00C1297.00,535.00,1344.00,699.00,1344.00,881.00C1344.00,1040.33,1308.33,1152.33,1237.00,1217.00C1169.00,1279.00,1054.00,1310.00,892.00,1310.00M682.00,1848.00C769.33,1848.00,813.00,1813.00,813.00,1743.00C813.00,1723.00,798.33,1703.67,769.00,1685.00C742.33,1668.33,717.33,1660.00,694.00,1660.00C612.00,1660.00,571.00,1694.33,571.00,1763.00C571.00,1782.33,583.33,1801.33,608.00,1820.00C624.44,1832.44,649.11,1841.78,682.00,1848.00M1221.00,1856.00C1243.67,1856.00,1266.67,1845.67,1290.00,1825.00C1305.56,1811.22,1317.22,1790.56,1325.00,1763.00C1325.00,1701.67,1277.33,1671.00,1182.00,1671.00C1154.67,1671.00,1130.33,1678.00,1109.00,1692.00C1085.00,1708.00,1073.00,1729.00,1073.00,1755.00C1073.00,1801.00,1088.00,1830.67,1118.00,1844.00C1134.67,1852.00,1169.00,1856.00,1221.00,1856.00"]
+              KCanvasItem {path} at (2572,-50) size 41x56 [transform={m=((1.00,0.00)(0.00,1.00)) t=(2564.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M802.00,-61.00C614.00,-61.00,454.67,-4.67,324.00,108.00C185.33,228.00,116.00,382.67,116.00,572.00C116.00,802.67,184.33,1012.33,321.00,1201.00C473.67,1410.33,664.00,1515.00,892.00,1515.00C1111.33,1515.00,1274.33,1465.67,1381.00,1367.00C1492.33,1264.33,1548.00,1102.33,1548.00,881.00C1548.00,650.33,1485.33,442.33,1360.00,257.00C1216.00,45.00,1030.00,-61.00,802.00,-61.00M892.00,1310.00C728.67,1310.00,590.33,1228.67,477.00,1066.00C372.33,916.67,320.00,752.00,320.00,572.00C320.00,443.33,367.67,338.67,463.00,258.00C554.33,182.00,667.33,144.00,802.00,144.00C964.00,144.00,1097.67,225.67,1203.00,389.00C1297.00,535.00,1344.00,699.00,1344.00,881.00C1344.00,1040.33,1308.33,1152.33,1237.00,1217.00C1169.00,1279.00,1054.00,1310.00,892.00,1310.00M682.00,1848.00C769.33,1848.00,813.00,1813.00,813.00,1743.00C813.00,1723.00,798.33,1703.67,769.00,1685.00C742.33,1668.33,717.33,1660.00,694.00,1660.00C612.00,1660.00,571.00,1694.33,571.00,1763.00C571.00,1782.33,583.33,1801.33,608.00,1820.00C632.67,1838.67,657.33,1848.00,682.00,1848.00M1221.00,1856.00C1243.67,1856.00,1266.67,1845.67,1290.00,1825.00C1313.33,1804.33,1325.00,1783.67,1325.00,1763.00C1325.00,1701.67,1277.33,1671.00,1182.00,1671.00C1154.67,1671.00,1130.33,1678.00,1109.00,1692.00C1085.00,1708.00,1073.00,1729.00,1073.00,1755.00C1073.00,1801.00,1088.00,1830.67,1118.00,1844.00C1134.67,1852.00,1169.00,1856.00,1221.00,1856.00"]
               KCanvasItem {line} at (127,-54) size 1x161 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M4199.00,-3500.00L4199.00,2000.00"]
-              KCanvasItem {path} at (4207,-43) size 48x51 [transform={m=((1.00,0.00)(0.00,1.00)) t=(4199.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1306.00,412.00C1235.33,412.00,1174.33,422.33,1123.00,443.00C1088.78,456.78,1047.44,487.44,999.00,535.00C963.00,499.67,928.00,473.00,894.00,455.00C871.33,443.00,837.67,434.00,793.00,428.00C719.00,428.00,649.33,458.00,584.00,518.00C540.44,558.00,507.44,624.33,485.00,717.00C485.00,840.33,533.33,953.00,630.00,1055.00C694.44,1123.00,804.78,1174.00,961.00,1208.00C989.00,1208.00,1012.33,1197.67,1031.00,1177.00C1043.44,1163.22,1052.78,1138.22,1059.00,1102.00C1059.00,1062.00,1025.67,1032.33,959.00,1013.00C870.33,987.67,807.67,958.67,771.00,926.00C717.00,878.67,690.00,809.00,690.00,717.00C690.00,697.67,699.00,679.00,717.00,661.00C737.67,641.00,763.33,631.67,794.00,633.00C852.00,635.67,905.67,689.67,955.00,795.00C999.67,887.00,1039.33,933.00,1074.00,933.00C1102.00,933.00,1124.67,922.67,1142.00,902.00C1153.56,888.22,1162.22,862.89,1168.00,826.00C1168.00,812.67,1166.00,792.67,1162.00,766.00C1159.33,748.22,1157.00,728.22,1155.00,706.00C1155.00,662.67,1173.67,635.33,1211.00,624.00C1225.67,619.33,1257.33,617.00,1306.00,617.00C1397.33,617.00,1461.33,639.33,1498.00,684.00C1531.33,724.00,1548.00,790.33,1548.00,883.00C1548.00,1046.33,1482.33,1179.67,1351.00,1283.00C1231.00,1377.67,1087.67,1425.00,921.00,1425.00C727.00,1425.00,575.00,1351.67,465.00,1205.00C365.67,1074.33,316.00,910.00,316.00,712.00C316.00,529.33,374.33,375.33,491.00,250.00C612.33,119.33,768.33,54.00,959.00,54.00C1013.00,54.00,1074.00,64.33,1142.00,85.00L1317.00,150.00C1346.33,160.67,1365.33,166.00,1374.00,166.00C1401.33,166.00,1425.00,155.33,1445.00,134.00C1458.33,119.78,1468.33,94.44,1475.00,58.00C1475.00,-5.33,1404.00,-56.67,1262.00,-96.00C1154.67,-125.33,1054.33,-140.00,961.00,-140.00C867.00,-140.00,771.00,-122.00,673.00,-86.00C607.67,-62.00,523.33,-13.33,420.00,60.00C213.33,238.67,110.00,456.00,110.00,712.00C110.00,968.00,180.67,1182.00,322.00,1354.00C472.00,1538.00,671.67,1630.00,921.00,1630.00C1146.33,1630.00,1339.33,1562.33,1500.00,1427.00C1668.67,1283.67,1753.00,1102.33,1753.00,883.00C1753.00,733.00,1716.33,617.67,1643.00,537.00C1566.33,453.67,1454.00,412.00,1306.00,412.00"]
+              KCanvasItem {path} at (4207,-43) size 48x51 [transform={m=((1.00,0.00)(0.00,1.00)) t=(4199.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M1306.00,412.00C1235.33,412.00,1174.33,422.33,1123.00,443.00C1071.67,463.67,1030.33,494.33,999.00,535.00C963.00,499.67,928.00,473.00,894.00,455.00C860.00,437.00,826.33,428.00,793.00,428.00C719.00,428.00,649.33,458.00,584.00,518.00C518.67,578.00,485.67,644.33,485.00,717.00C485.00,840.33,533.33,953.00,630.00,1055.00C726.67,1157.00,837.00,1208.00,961.00,1208.00C989.00,1208.00,1012.33,1197.67,1031.00,1177.00C1049.67,1156.33,1059.00,1131.33,1059.00,1102.00C1059.00,1062.00,1025.67,1032.33,959.00,1013.00C870.33,987.67,807.67,958.67,771.00,926.00C717.00,878.67,690.00,809.00,690.00,717.00C690.00,697.67,699.00,679.00,717.00,661.00C737.67,641.00,763.33,631.67,794.00,633.00C852.00,635.67,905.67,689.67,955.00,795.00C999.67,887.00,1039.33,933.00,1074.00,933.00C1102.00,933.00,1124.67,922.67,1142.00,902.00C1159.33,881.33,1168.00,856.00,1168.00,826.00C1168.00,812.67,1166.00,792.67,1162.00,766.00C1158.00,739.33,1155.67,719.33,1155.00,706.00C1155.00,662.67,1173.67,635.33,1211.00,624.00C1225.67,619.33,1257.33,617.00,1306.00,617.00C1397.33,617.00,1461.33,639.33,1498.00,684.00C1531.33,724.00,1548.00,790.33,1548.00,883.00C1548.00,1046.33,1482.33,1179.67,1351.00,1283.00C1231.00,1377.67,1087.67,1425.00,921.00,1425.00C727.00,1425.00,575.00,1351.67,465.00,1205.00C365.67,1074.33,316.00,910.00,316.00,712.00C316.00,529.33,374.33,375.33,491.00,250.00C612.33,119.33,768.33,54.00,959.00,54.00C1013.00,54.00,1074.00,64.33,1142.00,85.00L1317.00,150.00C1346.33,160.67,1365.33,166.00,1374.00,166.00C1401.33,166.00,1425.00,155.33,1445.00,134.00C1465.00,112.67,1475.00,87.33,1475.00,58.00C1475.00,-5.33,1404.00,-56.67,1262.00,-96.00C1154.67,-125.33,1054.33,-140.00,961.00,-140.00C867.00,-140.00,771.00,-122.00,673.00,-86.00C575.00,-50.00,490.67,-1.33,420.00,60.00C213.33,238.67,110.00,456.00,110.00,712.00C110.00,968.00,180.67,1182.00,322.00,1354.00C472.00,1538.00,671.67,1630.00,921.00,1630.00C1146.33,1630.00,1339.33,1562.33,1500.00,1427.00C1668.67,1283.67,1753.00,1102.33,1753.00,883.00C1753.00,733.00,1716.33,617.67,1643.00,537.00C1566.33,453.67,1454.00,412.00,1306.00,412.00"]
               KCanvasItem {line} at (182,-54) size 1x161 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M6106.00,-3500.00L6106.00,2000.00"]
-              KCanvasItem {path} at (6113,-27) size 25x44 [transform={m=((1.00,0.00)(0.00,1.00)) t=(6106.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M770.00,-196.00C770.00,-278.67,750.00,-340.67,710.00,-382.00C683.33,-409.56,622.67,-430.56,528.00,-445.00C471.33,-445.00,417.67,-434.33,367.00,-413.00C303.00,-385.00,271.00,-346.67,271.00,-298.00C271.00,-262.00,293.67,-244.00,339.00,-244.00C363.00,-244.00,390.00,-252.00,420.00,-268.00C440.00,-278.67,472.33,-287.00,517.00,-293.00C549.67,-292.33,574.00,-284.33,590.00,-269.00C600.67,-258.78,608.67,-236.11,614.00,-201.00C614.00,-169.00,601.67,-140.33,577.00,-115.00C560.56,-98.11,522.56,-75.78,463.00,-48.00C357.00,-24.00,272.00,26.67,208.00,104.00C139.33,186.00,105.00,286.00,105.00,404.00C105.00,539.33,150.00,679.00,240.00,823.00C340.00,983.00,452.67,1063.00,578.00,1063.00C643.33,1063.00,716.33,1047.67,797.00,1017.00C899.00,977.67,950.00,929.67,950.00,873.00C950.00,847.67,941.67,825.33,925.00,806.00C913.89,793.11,893.22,783.11,863.00,776.00C843.67,776.00,827.00,781.67,813.00,793.00C803.67,800.56,789.67,812.22,771.00,828.00C731.67,859.33,667.33,875.00,578.00,875.00C510.00,875.00,442.67,814.33,376.00,693.00C315.33,581.67,285.00,485.33,285.00,404.00C285.00,316.00,315.00,246.67,375.00,196.00C431.00,148.67,503.00,125.00,591.00,125.00C631.00,125.00,673.67,135.67,719.00,157.00L835.00,219.00C855.00,229.67,869.33,235.00,878.00,235.00C902.67,235.00,924.00,225.33,942.00,206.00C954.00,193.11,963.00,170.44,969.00,138.00C969.00,69.33,883.67,10.00,713.00,-40.00C732.33,-65.33,746.67,-91.00,756.00,-117.00C762.22,-134.33,766.89,-160.67,770.00,-196.00"]
+              KCanvasItem {path} at (6113,-27) size 25x44 [transform={m=((1.00,0.00)(0.00,1.00)) t=(6106.00,0.00)}] [fill={[type=SOLID] [color=#000000]}] [data="M770.00,-196.00C770.00,-278.67,750.00,-340.67,710.00,-382.00C670.00,-423.33,609.33,-444.33,528.00,-445.00C471.33,-445.00,417.67,-434.33,367.00,-413.00C303.00,-385.00,271.00,-346.67,271.00,-298.00C271.00,-262.00,293.67,-244.00,339.00,-244.00C363.00,-244.00,390.00,-252.00,420.00,-268.00C450.00,-284.00,482.33,-292.33,517.00,-293.00C549.67,-292.33,574.00,-284.33,590.00,-269.00C606.00,-253.67,614.00,-231.00,614.00,-201.00C614.00,-169.00,601.67,-140.33,577.00,-115.00C552.33,-89.67,514.33,-67.33,463.00,-48.00C357.00,-24.00,272.00,26.67,208.00,104.00C139.33,186.00,105.00,286.00,105.00,404.00C105.00,539.33,150.00,679.00,240.00,823.00C340.00,983.00,452.67,1063.00,578.00,1063.00C643.33,1063.00,716.33,1047.67,797.00,1017.00C899.00,977.67,950.00,929.67,950.00,873.00C950.00,847.67,941.67,825.33,925.00,806.00C908.33,786.67,887.67,776.67,863.00,776.00C843.67,776.00,827.00,781.67,813.00,793.00C799.00,804.33,785.00,816.00,771.00,828.00C731.67,859.33,667.33,875.00,578.00,875.00C510.00,875.00,442.67,814.33,376.00,693.00C315.33,581.67,285.00,485.33,285.00,404.00C285.00,316.00,315.00,246.67,375.00,196.00C431.00,148.67,503.00,125.00,591.00,125.00C631.00,125.00,673.67,135.67,719.00,157.00L835.00,219.00C855.00,229.67,869.33,235.00,878.00,235.00C902.67,235.00,924.00,225.33,942.00,206.00C960.00,186.67,969.00,164.00,969.00,138.00C969.00,69.33,883.67,10.00,713.00,-40.00C732.33,-65.33,746.67,-91.00,756.00,-117.00C765.33,-143.00,770.00,-169.33,770.00,-196.00"]
               KCanvasItem {line} at (213,-54) size 1x161 [stroke={[type=SOLID] [color=#888888] [stroke width=50.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M7158.00,-3500.00L7158.00,2000.00"]
         KCanvasContainer {g} at (165,220) size 210x1 [transform={m=((1.00,0.00)(0.00,1.00)) t=(165.00,220.00)}]
           KCanvasItem {line} at (165,220) size 210x1 [stroke={[type=SOLID] [color=#888888]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00L210.00,0.00"]
index eebcf2b1f6748f363d1ada24de5d71b578d8215f..de582d0803dd2886602d6623b9907accae0502b3 100644 (file)
@@ -1 +1 @@
-8328d76ed759b5491f2c20df8246a398
\ No newline at end of file
+df20c0bc625d242ddac2f9b297b60c85
\ No newline at end of file
index f1adb861e2586b73209a9d053bf7beeb3f158be5..9514080819be1f4120de19c1419a40a3b1f7a4d5 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/paths-data-02-t-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/paths-data-02-t-expected.png differ
index b739169c22847e1719387ed57bbdb99866e45d45..bd4ae9a8e30065b075df340d163d517b9b26b6f6 100644 (file)
@@ -15,7 +15,7 @@ layer at (0,0) size 480x360
         KCanvasItem {path} at (223,2) size 81x101 [stroke={[type=SOLID] [color=#00FFFF]}] [data="M224.00,103.00C230.67,26.33,257.33,3.00,304.00,33.00"]
         KCanvasItem {rect} at (222,101) size 4x4 [fill={[type=SOLID] [color=#0000FF]}] [data="M222.00,101.00L226.00,101.00L226.00,105.00L222.00,105.00"]
         KCanvasItem {rect} at (302,31) size 4x4 [fill={[type=SOLID] [color=#0000FF]}] [data="M302.00,31.00L306.00,31.00L306.00,35.00L302.00,35.00"]
-        KCanvasItem {path} at (153,97) size 177x137 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#00C000]}] [data="M208.00,168.00C241.33,234.67,274.67,234.67,308.00,168.00C330.22,123.56,313.56,106.89,258.00,118.00C171.33,98.00,154.67,114.67,208.00,168.00"]
+        KCanvasItem {path} at (153,84) size 188x151 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#00C000]}] [data="M208.00,168.00C241.33,234.67,274.67,234.67,308.00,168.00C341.33,101.33,324.67,84.67,258.00,118.00C171.33,98.00,154.67,114.67,208.00,168.00"]
         KCanvasItem {rect} at (206,166) size 4x4 [fill={[type=SOLID] [color=#0000FF]}] [data="M206.00,166.00L210.00,166.00L210.00,170.00L206.00,170.00"]
         KCanvasItem {rect} at (306,166) size 4x4 [fill={[type=SOLID] [color=#0000FF]}] [data="M306.00,166.00L310.00,166.00L310.00,170.00L306.00,170.00"]
         KCanvasItem {rect} at (256,116) size 4x4 [fill={[type=SOLID] [color=#0000FF]}] [data="M256.00,116.00L260.00,116.00L260.00,120.00L256.00,120.00"]
index d145c558d6a7c01b244267a0eb924099c2eec997..a61ba7d4739143f525b382d98bde16a099c69678 100644 (file)
@@ -12,4 +12,3 @@
 <p>You should see an SVG image above this!</p>
 </body>
 </html>
-\ No newline at end of file
index 7fcfc7851c97a4e26f52533f4f908965dfe16005..ea0f780cd478b106a7f3e75fa7327feb63311d78 100644 (file)
@@ -1,3 +1,20 @@
+2005-11-30  Rob Buis  <rwlbuis@xs4all.nl>
+
+        Reviewed by eseidel.
+
+        Fixes 5 test cases:
+        - paths-data-02-t.svg (most noticeable)
+        - fonts-elem-01-t.svg
+        - fonts-elem-02-t.svg
+        - fonts-elem-03-t.svg
+        - fonts-elem-04-t.svg
+
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=5881
+        Quadratic bezier path render error
+
+        * ksvg2/svg/svgpathparser.cpp:
+        (SVGPathParser::parseSVG):
+
 2005-11-29  Mitz Pettel  <opendarwin.org@mitzpettel.com>
 
         Reviewed by darin.
index 14aecb4ebf98fad863a606589c90cca02f39912f..26cb1b0bf6b6f0b03cb91ad41637a34ca7dcc9a3 100644 (file)
@@ -326,8 +326,8 @@ SVGPathParser::parseSVG( const QString &s, bool process )
 
                         svgCurveToCubic( px1, py1, px2, py2, px3, py3 );
 
-                        contrlx = relative ? curx + x1 : (tox + 2 * x1) * (1.0 / 3.0);
-                        contrly = relative ? cury + y1 : (toy + 2 * y1) * (1.0 / 3.0);
+                        contrlx = relative ? curx + x1 : x1;
+                        contrly = relative ? cury + y1 : y1;
                         curx = relative ? curx + tox : tox;
                         cury = relative ? cury + toy : toy;
                     }