diff options
-rw-r--r-- | svgio/CppunitTest_svgio.mk | 5 | ||||
-rw-r--r-- | svgio/qa/cppunit/SvgImportTest.cxx | 8 | ||||
-rw-r--r-- | svgio/qa/cppunit/data/FontsizeRelative.svg | 4 | ||||
-rw-r--r-- | svgio/qa/cppunit/data/em_units.svg | 4 | ||||
-rw-r--r-- | svgio/qa/cppunit/data/masking-path-07-b.svg | 8 | ||||
-rw-r--r-- | svgio/qa/cppunit/data/tdf103888.svg | 2 | ||||
-rw-r--r-- | svgio/qa/cppunit/data/tdf123926.svg | 2 | ||||
-rw-r--r-- | svgio/qa/cppunit/data/tdf156167.svg | 2 | ||||
-rw-r--r-- | svgio/qa/cppunit/data/tdf156168.svg | 2 | ||||
-rw-r--r-- | svgio/qa/cppunit/data/tdf97542_1.svg | 2 | ||||
-rw-r--r-- | svgio/qa/cppunit/data/tdf97542_2.svg | 2 | ||||
-rw-r--r-- | svgio/qa/cppunit/data/tdf99994.svg | 2 | ||||
-rw-r--r-- | svgio/qa/cppunit/data/tspan-fill-opacity.svg | 2 |
13 files changed, 25 insertions, 20 deletions
diff --git a/svgio/CppunitTest_svgio.mk b/svgio/CppunitTest_svgio.mk index 1bd6c3b0b5d0..9309f5dcb9b8 100644 --- a/svgio/CppunitTest_svgio.mk +++ b/svgio/CppunitTest_svgio.mk @@ -70,4 +70,9 @@ $(eval $(call gb_CppunitTest_use_components,svgio,\ $(eval $(call gb_CppunitTest_use_configuration,svgio)) +# assert if font/glyph fallback occurs +$(eval $(call gb_CppunitTest_set_non_application_font_use,svgio,abort)) + +$(eval $(call gb_CppunitTest_use_more_fonts,svgio)) + # vim: set noet sw=4 ts=4: diff --git a/svgio/qa/cppunit/SvgImportTest.cxx b/svgio/qa/cppunit/SvgImportTest.cxx index fcd76f12bd1f..91bb2efe53c3 100644 --- a/svgio/qa/cppunit/SvgImportTest.cxx +++ b/svgio/qa/cppunit/SvgImportTest.cxx @@ -377,12 +377,12 @@ CPPUNIT_TEST_FIXTURE(Test, testFontsizeRelative) assertXPath(pDocument, "/primitive2D/transform/textsimpleportion[1]", "fontcolor", "#000000"); assertXPath(pDocument, "/primitive2D/transform/textsimpleportion[1]", "text", "Sample"); assertXPath(pDocument, "/primitive2D/transform/textsimpleportion[1]", "height", "50"); - assertXPath(pDocument, "/primitive2D/transform/textsimpleportion[1]", "familyname", "serif"); + assertXPath(pDocument, "/primitive2D/transform/textsimpleportion[1]", "familyname", "DejaVu Serif"); assertXPath(pDocument, "/primitive2D/transform/textsimpleportion[2]", "fontcolor", "#000000"); assertXPath(pDocument, "/primitive2D/transform/textsimpleportion[2]", "text", "Sample"); assertXPath(pDocument, "/primitive2D/transform/textsimpleportion[2]", "height", "50"); - assertXPath(pDocument, "/primitive2D/transform/textsimpleportion[2]", "familyname", "serif"); + assertXPath(pDocument, "/primitive2D/transform/textsimpleportion[2]", "familyname", "DejaVu Serif"); } CPPUNIT_TEST_FIXTURE(Test, testTdf145896) @@ -932,7 +932,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf97542_1) assertXPath(pDocument, "/primitive2D/transform/objectinfo/textsimpleportion", "fontcolor", "#ffff00"); assertXPath(pDocument, "/primitive2D/transform/objectinfo/textsimpleportion", "text", "Text"); assertXPath(pDocument, "/primitive2D/transform/objectinfo/textsimpleportion", "height", "48"); - assertXPath(pDocument, "/primitive2D/transform/objectinfo/textsimpleportion", "familyname", "serif"); + assertXPath(pDocument, "/primitive2D/transform/objectinfo/textsimpleportion", "familyname", "DejaVu Serif"); } CPPUNIT_TEST_FIXTURE(Test, testTdf97542_2) @@ -1382,7 +1382,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf99994) assertXPath(pDocument, "/primitive2D/transform/textsimpleportion[1]", "fontcolor", "#0000ff"); assertXPath(pDocument, "/primitive2D/transform/textsimpleportion[1]", "height", "16"); assertXPath(pDocument, "/primitive2D/transform/textsimpleportion[1]", "text", "test"); - assertXPath(pDocument, "/primitive2D/transform/textsimpleportion[1]", "familyname", "Sans"); + assertXPath(pDocument, "/primitive2D/transform/textsimpleportion[1]", "familyname", "DejaVu Sans"); } CPPUNIT_TEST_FIXTURE(Test, testTdf99115) diff --git a/svgio/qa/cppunit/data/FontsizeRelative.svg b/svgio/qa/cppunit/data/FontsizeRelative.svg index b957b90a3a11..4b74aa692b38 100644 --- a/svgio/qa/cppunit/data/FontsizeRelative.svg +++ b/svgio/qa/cppunit/data/FontsizeRelative.svg @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <svg height="600" width="400" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> -<g font-size="5px" font-family="serif"> +<g font-size="5px" font-family="DejaVu Serif"> <text x="10" y="150" font-size="10em" font-family="inherit">Sample</text> - <text x="200" y="150" font-size="10em" font-family="serif">Sample</text> + <text x="200" y="150" font-size="10em" font-family="DejaVu Serif">Sample</text> </g> </svg> diff --git a/svgio/qa/cppunit/data/em_units.svg b/svgio/qa/cppunit/data/em_units.svg index 1ad4d3e3a769..6a7947cb3c09 100644 --- a/svgio/qa/cppunit/data/em_units.svg +++ b/svgio/qa/cppunit/data/em_units.svg @@ -1,8 +1,8 @@ <svg xmlns="http://www.w3.org/2000/svg" width="10cm" height="10cm"> <style> - text {font-family: sans-serif; font-size: 36pt;} - new {font-family: sans-serif; font-size: 1em;} + text {font-family: 'DejaVu Sans'; font-size: 36pt;} + new {font-family: 'DejaVu Sans'; font-size: 1em;} </style> <line x1="5cm" y1="5cm" x2="8cm" y2="5cm" stroke="black" /> diff --git a/svgio/qa/cppunit/data/masking-path-07-b.svg b/svgio/qa/cppunit/data/masking-path-07-b.svg index 63f73d821f53..eca3660bab5e 100644 --- a/svgio/qa/cppunit/data/masking-path-07-b.svg +++ b/svgio/qa/cppunit/data/masking-path-07-b.svg @@ -53,13 +53,13 @@ </d:SVGTestCase> <title id="test-title">$RCSfile: masking-path-07-b.svg,v $</title> <defs> - <font-face font-family="SVGFreeSansASCII" unicode-range="U+0-7F"> + <font-face font-family="DejaVu Sans" unicode-range="U+0-7F"> <font-face-src> <font-face-uri xlink:href="../resources/SVGFreeSans.svg#ascii"/> </font-face-src> </font-face> </defs> - <g id="test-body-content" font-family="SVGFreeSansASCII,sans-serif" font-size="18"> + <g id="test-body-content" font-family="DejaVu Sans" font-size="18"> <defs> <clipPath id="clipCircle1"> @@ -134,14 +134,14 @@ </g> </g> </g> - <g font-family="SVGFreeSansASCII,sans-serif" font-size="32"> + <g font-family="DejaVu Sans" font-size="32"> <text id="revision" x="10" y="340" stroke="none" fill="black">$Revision: 1.11 $</text> </g> <rect id="test-frame" x="1" y="1" width="478" height="358" fill="none" stroke="#000000"/> <!-- comment out this watermark once the test is approved --><!-- <g id="draft-watermark"> <rect x="1" y="1" width="478" height="20" fill="red" stroke="black" stroke-width="1"/> - <text font-family="SVGFreeSansASCII,sans-serif" font-weight="bold" font-size="20" x="240" + <text font-family="DejaVu Sans" font-weight="bold" font-size="20" x="240" text-anchor="middle" y="18" stroke-width="0.5" stroke="black" fill="white">DRAFT</text> </g>--> </svg> diff --git a/svgio/qa/cppunit/data/tdf103888.svg b/svgio/qa/cppunit/data/tdf103888.svg index 1663fa395e40..157bb12571f7 100644 --- a/svgio/qa/cppunit/data/tdf103888.svg +++ b/svgio/qa/cppunit/data/tdf103888.svg @@ -5,7 +5,7 @@ height="15mm"
viewBox="0 0 250 50">
<text
- style="font-size:30px;font-family:sans-serif;fill:#000000;stroke:none"
+ style="font-size:30px;font-family:'DejaVu Sans';fill:#000000;stroke:none"
x="20"
y="30">Her<tspan style="font-weight:bold">vor</tspan>hebung</text>
</svg>
diff --git a/svgio/qa/cppunit/data/tdf123926.svg b/svgio/qa/cppunit/data/tdf123926.svg index 1a5c2758aab4..085b736b53c3 100644 --- a/svgio/qa/cppunit/data/tdf123926.svg +++ b/svgio/qa/cppunit/data/tdf123926.svg @@ -1,6 +1,6 @@ <?xml version="1.0" standalone="no"?> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" class="highcharts-root" style="font-family:"Lucida Grande", "Lucida Sans Unicode", Arial, Helvetica, sans-serif;font-size:12px;" width="600" height="400" viewBox="0 0 600 400"> +<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" class="highcharts-root" style="font-family:"DejaVu Sans"font-size:12px;" width="600" height="400" viewBox="0 0 600 400"> <defs> <clipPath id="highcharts-qkip48v-39"> <rect x="0" y="0" width="505" height="283" fill="none"/> diff --git a/svgio/qa/cppunit/data/tdf156167.svg b/svgio/qa/cppunit/data/tdf156167.svg index 5ab1254013c4..034f86563d26 100644 --- a/svgio/qa/cppunit/data/tdf156167.svg +++ b/svgio/qa/cppunit/data/tdf156167.svg @@ -1,7 +1,7 @@ <svg id="svg-root" width="100%" height="100%" viewBox="0 0 480 360" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> - <g id="test-body-content" font-family="SVGFreeSansASCII,sans-serif" font-size="18"> + <g id="test-body-content" font-family="DejaVu Sans" font-size="18"> <g fill="orange"> <circle id="a" FiLl="red" cx="140" cy="100" r="50"/> diff --git a/svgio/qa/cppunit/data/tdf156168.svg b/svgio/qa/cppunit/data/tdf156168.svg index 2cdbd35afd09..352de2be315e 100644 --- a/svgio/qa/cppunit/data/tdf156168.svg +++ b/svgio/qa/cppunit/data/tdf156168.svg @@ -4,7 +4,7 @@ width="100%" height="100%" viewBox="0 0 200 500" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - style="font-family: 'Times New Roman', serif; + style="font-family: 'DejaVu Serif'; font-size:large" > <title>stroke enabled</title> diff --git a/svgio/qa/cppunit/data/tdf97542_1.svg b/svgio/qa/cppunit/data/tdf97542_1.svg index 328bd971ac8e..7ade92dd94ac 100644 --- a/svgio/qa/cppunit/data/tdf97542_1.svg +++ b/svgio/qa/cppunit/data/tdf97542_1.svg @@ -10,6 +10,6 @@ <g fill="url(#svg_2)" > <title>Layer 1</title> <rect id="svg_1" height="50" width="200" y="0" x="0"/> - <text x="50" y="40" id="svg_12" font-size="48" font-family="serif" fill="#ffff00">Text</text> + <text x="50" y="40" id="svg_12" font-size="48" font-family="DejaVu Serif" fill="#ffff00">Text</text> </g> </svg> diff --git a/svgio/qa/cppunit/data/tdf97542_2.svg b/svgio/qa/cppunit/data/tdf97542_2.svg index 03cee9683e0b..4a4c7e12764c 100644 --- a/svgio/qa/cppunit/data/tdf97542_2.svg +++ b/svgio/qa/cppunit/data/tdf97542_2.svg @@ -10,6 +10,6 @@ <g fill="#ffff00"> <title>Layer 1</title> <rect id="svg_1" height="50" width="200" y="0" x="0" /> - <text x="50" y="40" id="svg_12" font-size="48" font-family="serif" fill="url(#svg_2)">Text</text> + <text x="50" y="40" id="svg_12" font-size="48" font-family="DejaVu Serif" fill="url(#svg_2)">Text</text> </g> </svg> diff --git a/svgio/qa/cppunit/data/tdf99994.svg b/svgio/qa/cppunit/data/tdf99994.svg index b4dec353e159..b948338c14ee 100644 --- a/svgio/qa/cppunit/data/tdf99994.svg +++ b/svgio/qa/cppunit/data/tdf99994.svg @@ -2,7 +2,7 @@ <style type="text/css" id="style1"> *{fill:blue;} </style> -<text id="text1" style="font-family:Sans;"> +<text id="text1" style="font-family:DejaVu Sans;"> <tspan id="tspan1">test</tspan> </text> </svg> diff --git a/svgio/qa/cppunit/data/tspan-fill-opacity.svg b/svgio/qa/cppunit/data/tspan-fill-opacity.svg index ef6d5352a8d2..0fe6a1cd8d5c 100644 --- a/svgio/qa/cppunit/data/tspan-fill-opacity.svg +++ b/svgio/qa/cppunit/data/tspan-fill-opacity.svg @@ -9,7 +9,7 @@ <g class="TextShape"> <rect stroke="none" fill="none" x="9825" y="6550" width="4076" height="955"/> <text> - <tspan x="9825" y="7939" font-family="Arial Narrow, sans-serif" font-size="800px" fill-opacity="0.30" fill="rgb(255,0,0)" stroke="none">hello</tspan> + <tspan x="9825" y="7939" font-family="DejaVu Sans" font-size="800px" fill-opacity="0.30" fill="rgb(255,0,0)" stroke="none">hello</tspan> </text> </g> </svg> |