Merging upstream version 4:24.2.4.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 41 insertions, 0 deletions

diff --git a/svgio/qa/cppunit/data/contextFill.svg b/svgio/qa/cppunit/data/contextFill.svg
new file mode 100644
index 0000000000..399d3c16b0
--- /dev/null
+++ b/svgio/qa/cppunit/data/contextFill.svg
@@ -0,0 +1,8 @@
+<svg width="100" height="100" xmlns="http://www.w3.org/2000/svg">
+<defs>
+    <marker id="triangle" viewBox="0 0 10 10" refX="5" refY="5" markerWidth="6" markerHeight="6" orient="auto">
+	<path d="M 0 0 L 10 5 L 0 10 z" fill="context-fill" />
+    </marker>
+</defs>
+<line x1="10" y1="10" x2="90" y2="90" fill="red" stroke="red" marker-end="url(#triangle)" />
+</svg>
diff --git a/svgio/qa/cppunit/data/contextStroke.svg b/svgio/qa/cppunit/data/contextStroke.svg
new file mode 100644
index 0000000000..5a9b27d69c
--- /dev/null
+++ b/svgio/qa/cppunit/data/contextStroke.svg
@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+  <style>
+    path {
+      fill: none;
+      stroke-width: 4px;
+      marker: url(#diamond);
+    }
+  </style>
+  <path d="M 10,50 v -20 h 40 v -20" stroke="red"/>
+
+  <marker id="diamond" markerWidth="12" markerHeight="12" refX="6" refY="6" markerUnits="userSpaceOnUse">
+    <circle cx="6" cy="6" r="3" fill="white" stroke="context-stroke" stroke-width="2"/>
+  </marker>
+</svg>
diff --git a/svgio/qa/cppunit/data/dy_in_ems.svg b/svgio/qa/cppunit/data/dy_in_ems.svg
new file mode 100644
index 0000000000..316239edf7
--- /dev/null
+++ b/svgio/qa/cppunit/data/dy_in_ems.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<svg xmlns="http://www.w3.org/2000/svg" width="1in" height="1in" viewBox="0 0 100% 100%">
+
+	<text x="5" y="20" style="font-size:16px;font-family:Liberation Sans">foo
+		<tspan x="5" dy="1.5em" style="font-size:0.5em">bar</tspan></text>
+</svg>
\ No newline at end of file
diff --git a/svgio/qa/cppunit/data/dy_in_exs.svg b/svgio/qa/cppunit/data/dy_in_exs.svg
new file mode 100644
index 0000000000..816a64a458
--- /dev/null
+++ b/svgio/qa/cppunit/data/dy_in_exs.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<svg xmlns="http://www.w3.org/2000/svg" width="1in" height="1in" viewBox="0 0 100% 100%">
+
+	<text x="5" y="20" style="font-size:16px;font-family:Liberation Sans">foo
+		<tspan x="5" dy="3ex" style="font-size:1ex">bar</tspan></text>
+</svg>
\ No newline at end of file
diff --git a/svgio/qa/cppunit/data/tdf160773.svg b/svgio/qa/cppunit/data/tdf160773.svg
new file mode 100644
index 0000000000..812c082486
--- /dev/null
+++ b/svgio/qa/cppunit/data/tdf160773.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" ?>
+<svg width="600px" height="600px" viewBox="0 0 1 1" xmlns="http://www.w3.org/2000/svg">
+	<text x="0" y="0.5" font-size="0.2px" dominant-baseline="middle" >Red</text>
+	<rect x="0.05" y="0.05" fill="#f00" width="0.36" height="0.242" />
+</svg>