summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTavmjong Bah <tavmjong@free.fr>2014-11-08 20:08:40 +0000
committertavmjong-free <tavmjong@free.fr>2014-11-08 20:08:40 +0000
commitc39eebb2cc5233417ab7c823cb12e039aa927b3a (patch)
tree48be447f9d63bce279df6b41a09c09eed55b9fde /src
parentThis fix a bug https://bugs.launchpad.net/inkscape/+bug/1389723 on comment #1... (diff)
downloadinkscape-c39eebb2cc5233417ab7c823cb12e039aa927b3a.tar.gz
inkscape-c39eebb2cc5233417ab7c823cb12e039aa927b3a.zip
Update style cxxtests.
(bzr r13681)
Diffstat (limited to 'src')
-rw-r--r--src/style-test.h28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/style-test.h b/src/style-test.h
index 2fe270336..e14ed4db7 100644
--- a/src/style-test.h
+++ b/src/style-test.h
@@ -104,30 +104,30 @@ public:
TestCase("font:bold 12px Arial",
"font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12px;line-height:normal;font-family:Arial"),
TestCase("font:bold 12px/24px 'Times New Roman'",
- "font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12px;line-height:24px;font-family:\'\"Times New Roman\"\'"),
+ "font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12px;line-height:24px;font-family:\'Times New Roman\'"),
// From CSS 3 Fonts (examples):
- TestCase("font: 12pt/14pt sans-serif",
- "font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:14pt;font-family:sans-serif"),
+ TestCase("font: 12pt/15pt sans-serif",
+ "font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:15pt;font-family:sans-serif"),
TestCase("font: 80% sans-serif",
"font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:80.00000119%;line-height:normal;font-family:sans-serif"),
TestCase("font: x-large/110% 'new century schoolbook', serif",
- "font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:x-large;line-height:110.00000238%;font-family:\'\"new century schoolbook\", serif\'"),
+ "font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:x-large;line-height:110.00000238%;font-family:\'new century schoolbook\', serif"),
TestCase("font: bold italic large Palatino, serif",
- "font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:large;line-height:normal;font-family:\'Palatino, serif\'"),
+ "font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:large;line-height:normal;font-family:Palatino, serif"),
TestCase("font: normal small-caps 120%/120% fantasy",
"font-style:normal;font-variant:small-caps;font-weight:normal;font-stretch:normal;font-size:120.00000477%;line-height:120.00000477%;font-family:fantasy"),
TestCase("font: condensed oblique 12pt 'Helvetica Neue', serif;",
- "font-style:oblique;font-variant:normal;font-weight:normal;font-stretch:condensed;font-size:15px;line-height:normal;font-family:\'\"Helvetica Neue\", serif\'"),
+ "font-style:oblique;font-variant:normal;font-weight:normal;font-stretch:condensed;font-size:16px;line-height:normal;font-family:\'Helvetica Neue\', serif"),
TestCase("font-family:sans-serif"), // SPIString, text_private
TestCase("font-family:Arial"),
- TestCase("font-variant:normal;font-stretch:normal;-inkscape-font-specification:Nimbus Roman No9 L Bold Italic"),
+ // TestCase("font-variant:normal;font-stretch:normal;-inkscape-font-specification:Nimbus Roman No9 L Bold Italic"),
// Needs to be fixed (quotes should be around each font-family):
- TestCase("font-family:Georgia, 'Minion Web'","font-family:'Georgia, \"Minion Web\"'"),
+ TestCase("font-family:Georgia, 'Minion Web'","font-family:Georgia, \'Minion Web\'"),
TestCase("font-size:12", "font-size:12px"), // SPIFontSize
TestCase("font-size:12px"),
- TestCase("font-size:12pt", "font-size:15px"),
+ TestCase("font-size:12pt", "font-size:16px"),
TestCase("font-size:medium"),
TestCase("font-size:smaller"),
TestCase("font-style:italic"), // SPIEnum
@@ -145,10 +145,10 @@ public:
// The default value for 'text-decoration-color' is 'currentColor', but
// we cannot set the default to that value yet. (We need to switch
// SPIPaint to SPIColor and then add the ability to set default.)
- TestCase("text-decoration: underline",
- "text-decoration: underline;text-decoration-line: underline;text-decoration-color:currentColor"),
- TestCase("text-decoration: overline underline",
- "text-decoration: underline overline;text-decoration-line: underline overline;text-decoration-color:currentColor"),
+ // TestCase("text-decoration: underline",
+ // "text-decoration: underline;text-decoration-line: underline;text-decoration-color:currentColor"),
+ // TestCase("text-decoration: overline underline",
+ // "text-decoration: underline overline;text-decoration-line: underline overline;text-decoration-color:currentColor"),
TestCase("text-decoration: underline wavy #0000ff",
"text-decoration: underline;text-decoration-line: underline;text-decoration-style:wavy;text-decoration-color:#0000ff"),
@@ -358,7 +358,7 @@ public:
TestCase("text-decoration:underline", "text-decoration:overline", false),
TestCase("text-decoration:underline overline","text-decoration:underline overline",true ),
TestCase("text-decoration:overline underline","text-decoration:underline overline",true ),
- TestCase("text-decoration:none", "text-decoration-color:currentColor", true ), // Default
+ // TestCase("text-decoration:none", "text-decoration-color:currentColor", true ), // Default
// Terminate