Merge branch 'master' into powerpencil

13 files changed, 171 insertions, 0 deletions

diff --git a/testfiles/rendering_tests/CMakeLists.txt b/testfiles/rendering_tests/CMakeLists.txt
index 3f838628a..8db01d97a 100644
--- a/testfiles/rendering_tests/CMakeLists.txt
+++ b/testfiles/rendering_tests/CMakeLists.txt
@@ -2,6 +2,10 @@
 #add your test here (do not put the .svg extension)
 set(RENDERING_TESTS 
     test-empty
+    test-glyph-y-pos
+    test-rtl-vertical
+    selector-important-002
+    selector-important-003
 )
 
 
diff --git a/testfiles/rendering_tests/expected_rendering/selector-important-002-large.png b/testfiles/rendering_tests/expected_rendering/selector-important-002-large.png
new file mode 100644
index 000000000..e92eef0a4
--- /dev/null
+++ b/testfiles/rendering_tests/expected_rendering/selector-important-002-large.png
diff --git a/testfiles/rendering_tests/expected_rendering/selector-important-002.png b/testfiles/rendering_tests/expected_rendering/selector-important-002.png
new file mode 100644
index 000000000..b0af9bd12
--- /dev/null
+++ b/testfiles/rendering_tests/expected_rendering/selector-important-002.png
diff --git a/testfiles/rendering_tests/expected_rendering/selector-important-003-large.png b/testfiles/rendering_tests/expected_rendering/selector-important-003-large.png
new file mode 100644
index 000000000..91cb3afa9
--- /dev/null
+++ b/testfiles/rendering_tests/expected_rendering/selector-important-003-large.png
diff --git a/testfiles/rendering_tests/expected_rendering/selector-important-003.png b/testfiles/rendering_tests/expected_rendering/selector-important-003.png
new file mode 100644
index 000000000..dfe3dbc5a
--- /dev/null
+++ b/testfiles/rendering_tests/expected_rendering/selector-important-003.png
diff --git a/testfiles/rendering_tests/expected_rendering/test-glyph-y-pos-large.png b/testfiles/rendering_tests/expected_rendering/test-glyph-y-pos-large.png
new file mode 100644
index 000000000..e60f4772d
--- /dev/null
+++ b/testfiles/rendering_tests/expected_rendering/test-glyph-y-pos-large.png
diff --git a/testfiles/rendering_tests/expected_rendering/test-glyph-y-pos.png b/testfiles/rendering_tests/expected_rendering/test-glyph-y-pos.png
new file mode 100644
index 000000000..85a3050a8
--- /dev/null
+++ b/testfiles/rendering_tests/expected_rendering/test-glyph-y-pos.png
diff --git a/testfiles/rendering_tests/expected_rendering/test-rtl-vertical-large.png b/testfiles/rendering_tests/expected_rendering/test-rtl-vertical-large.png
new file mode 100644
index 000000000..84abe78ff
--- /dev/null
+++ b/testfiles/rendering_tests/expected_rendering/test-rtl-vertical-large.png
diff --git a/testfiles/rendering_tests/expected_rendering/test-rtl-vertical.png b/testfiles/rendering_tests/expected_rendering/test-rtl-vertical.png
new file mode 100644
index 000000000..ea8836f51
--- /dev/null
+++ b/testfiles/rendering_tests/expected_rendering/test-rtl-vertical.png
diff --git a/testfiles/rendering_tests/selector-important-002.svg b/testfiles/rendering_tests/selector-important-002.svg
new file mode 100644
index 000000000..e5a66b68e
--- /dev/null
+++ b/testfiles/rendering_tests/selector-important-002.svg
@@ -0,0 +1,58 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     width="480" height="360"
+     style="fill:orange !important">
+
+  <title>Style "!important" — 002</title>
+
+  <style type="text/css">
+
+    <!-- Later rule overrides same specificity previous rule. -->
+    #groupA use      { fill: red  !important;   }
+    #groupA use      { fill: blue !important;   }
+
+    #groupB .classB  { fill: red  !important;  }
+    #groupB .classB  { fill: blue !important;  }
+
+    #groupC #MyRectC { fill: red  !important;  }
+    #groupC #MyRectC { fill: blue !important;  }
+
+    #groupD          { fill: blue !important;  }
+    #classD          { fill: red  !important;  }
+
+    #groupE use      { fill: blue !important;  }
+    #groupE          { fill: red  !important;  }
+  </style>
+
+  <defs>
+    <rect id="MyRect" width="40" height="40"/>
+  </defs>
+
+  <!--
+  <text id="title" x="240" y="50" style="fill:black; font-size:24px; text-anchor:middle;">Style "!important" — 002</text>
+  <a href="https://svgwg.org/svg2-draft/stylling.html">
+    <text id="source" x="240" y="70" style="fill:black; font-size:12px; text-anchor:middle;">https://svgwg.org/svg2-draft/styling.html</text>
+  </a>
+  -->
+
+  <g id="groupA">
+    <use id="MyRectA"  class="classA"  x="20"  y="100" xlink:href="#MyRect" />
+  </g>
+
+  <g id="groupB">
+    <use id="MyRectB"  class="classB"  x="120" y="100" xlink:href="#MyRect" />
+  </g>
+
+  <g id="groupC">
+    <use id="MyRectC"  class="classC"  x="220" y="100" xlink:href="#MyRect" />
+  </g>
+
+  <g id="groupD">
+    <use id="MyRectD"  class="classD"  x="320" y="100" xlink:href="#MyRect" />
+  </g>
+
+  <g id="groupE">
+    <use id="MyRectE"  class="classE"  x="420" y="100" xlink:href="#MyRect" />
+  </g>
+
+</svg>
diff --git a/testfiles/rendering_tests/selector-important-003.svg b/testfiles/rendering_tests/selector-important-003.svg
new file mode 100644
index 000000000..831319f5c
--- /dev/null
+++ b/testfiles/rendering_tests/selector-important-003.svg
@@ -0,0 +1,57 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     width="480" height="360">
+
+  <title>Style "!important" — 003</title>
+
+  <style type="text/css">
+
+    /* !important is not inherited. */
+    g #groupA        { fill: red !important; }
+    use              { fill: blue; }
+
+    /* Attributes cannot have !important. */
+    #MyRectB         { fill: blue; }
+
+    /* Inline can have !important. */
+    #MyRectC         { fill: red !important; }
+
+    /* Bad property shouldn't set !important. */
+    #MyRectD         { fill: XXX !important; }
+
+    /* Bad inline property shouldn't set !important. */
+    #MyRectE         { fill: blue; }
+  </style>
+
+  <defs>
+    <rect id="MyRect" width="40" height="40"/>
+  </defs>
+
+  <!--
+  <text id="title" x="240" y="50" style="fill:black; font-size:24px; text-anchor:middle;">Style "!important" — 003</text>
+  <a href="https://svgwg.org/svg2-draft/stylling.html">
+    <text id="source" x="240" y="70" style="fill:black; font-size:12px; text-anchor:middle;">https://svgwg.org/svg2-draft/styling.html</text>
+  </a>
+  -->
+
+  <g id="groupA">
+    <use id="MyRectA"  class="classA"  x="20"  y="100" xlink:href="#MyRect" />
+  </g>
+
+  <g id="groupB">
+    <use id="MyRectB"  class="classB"  x="120" y="100" xlink:href="#MyRect" fill="red !important"/>
+  </g>
+
+  <g id="groupC">
+    <use id="MyRectC"  class="classC"  x="220" y="100" xlink:href="#MyRect" style="fill: blue !important"/>
+  </g>
+
+  <g id="groupD">
+    <use id="MyRectD"  class="classD"  x="320" y="100" xlink:href="#MyRect" style="fill: blue"/>
+  </g>
+
+  <g id="groupE">
+    <use id="MyRectE"  class="classE"  x="420" y="100" xlink:href="#MyRect" style="fill: XXX !important"/>
+  </g>
+
+</svg>
diff --git a/testfiles/rendering_tests/test-glyph-y-pos.svg b/testfiles/rendering_tests/test-glyph-y-pos.svg
new file mode 100644
index 000000000..28200c79b
--- /dev/null
+++ b/testfiles/rendering_tests/test-glyph-y-pos.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<svg width="600" height="600"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   viewBox="0 0 600 600">
+  <style type="text/css">
+    text {
+      font-family: DejaVu Sans;
+      font-size: 36px;
+    }
+    .title {
+      text-anchor: middle;
+    }
+  </style>
+
+  <g>
+    <text x="50"  y="200">G̃g̃X̃x̃</text>
+    <text x="300" y="200" style="writing-mode:vertical-lr;">G̃g̃X̃x̃</text>
+    <text x="500" y="200" style="writing-mode:vertical-lr;text-orientation:upright">G̃g̃X̃x̃</text>
+  </g>
+
+  <text class="title" x="50%" y="120">Composed Glyphs</text>
+
+</svg>
diff --git a/testfiles/rendering_tests/test-rtl-vertical.svg b/testfiles/rendering_tests/test-rtl-vertical.svg
new file mode 100644
index 000000000..a959c1880
--- /dev/null
+++ b/testfiles/rendering_tests/test-rtl-vertical.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<svg width="600" height="600"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   viewBox="0 0 600 600">
+  <style type="text/css">
+    text {
+      font-family: DejaVu Sans;
+      font-size: 36px;
+    }
+    .title {
+      text-anchor: middle;
+    }
+  </style>
+
+  <g>
+    <text x="50"  y="200">أبجد</text>
+    <text x="300" y="200" style="writing-mode:vertical-lr;">بجد</text>
+    <text x="500" y="200" style="writing-mode:vertical-lr;text-orientation:upright">أبجد</text>
+  </g>
+
+  <text class="title" x="50%" y="120">RTL text in vertical mode</text>
+
+</svg>