typst · LaurenzV · Feb 12, 2024 · Feb 12, 2024
diff --git a/NOTICE b/NOTICE
diff --git a/tests/fonts/Amiri-Regular.ttf b/tests/fonts/Amiri-Regular.ttf
diff --git a/tests/fonts/MPLUS1p-Regular.ttf b/tests/fonts/MPLUS1p-Regular.ttf
diff --git a/tests/fonts/NotoEmoji-Regular.ttf b/tests/fonts/NotoEmoji-Regular.ttf
diff --git a/tests/fonts/NotoMono-Regular.ttf b/tests/fonts/NotoMono-Regular.ttf
diff --git a/tests/fonts/NotoSans-Black.ttf b/tests/fonts/NotoSans-Black.ttf
diff --git a/tests/fonts/NotoSans-Light.ttf b/tests/fonts/NotoSans-Light.ttf
diff --git a/tests/fonts/NotoSans-Thin.ttf b/tests/fonts/NotoSans-Thin.ttf
diff --git a/tests/fonts/NotoSansDevanagari-Regular.ttf b/tests/fonts/NotoSansDevanagari-Regular.ttf
diff --git a/tests/fonts/NotoSerif-Regular.ttf b/tests/fonts/NotoSerif-Regular.ttf
diff --git a/tests/fonts/SedgwickAveDisplay-Regular.ttf b/tests/fonts/SedgwickAveDisplay-Regular.ttf
diff --git a/tests/fonts/SourceSansPro-Regular.ttf b/tests/fonts/SourceSansPro-Regular.ttf
diff --git a/tests/fonts/Yellowtail-Regular.ttf b/tests/fonts/Yellowtail-Regular.ttf
diff --git a/tests/ref/resvg/LICENSE b/tests/ref/resvg/LICENSE
diff --git a/tests/ref/resvg/text/alignment-baseline/hanging-on-vertical.png b/tests/ref/resvg/text/alignment-baseline/hanging-on-vertical.png
diff --git a/tests/ref/resvg/text/direction/rtl-with-vertical-writing-mode.png b/tests/ref/resvg/text/direction/rtl-with-vertical-writing-mode.png
diff --git a/tests/ref/resvg/text/direction/rtl.png b/tests/ref/resvg/text/direction/rtl.png
diff --git a/tests/ref/resvg/text/dominant-baseline/hanging.png b/tests/ref/resvg/text/dominant-baseline/hanging.png
diff --git a/tests/ref/resvg/text/dominant-baseline/use-script.png b/tests/ref/resvg/text/dominant-baseline/use-script.png
diff --git a/tests/ref/resvg/text/font-family/bold-sans-serif.png b/tests/ref/resvg/text/font-family/bold-sans-serif.png
diff --git a/tests/ref/resvg/text/font-family/cursive.png b/tests/ref/resvg/text/font-family/cursive.png
diff --git a/tests/ref/resvg/text/font-family/fallback-1.png b/tests/ref/resvg/text/font-family/fallback-1.png
diff --git a/tests/ref/resvg/text/font-family/fantasy.png b/tests/ref/resvg/text/font-family/fantasy.png
diff --git a/tests/ref/resvg/text/font-family/font-list.png b/tests/ref/resvg/text/font-family/font-list.png
diff --git a/tests/ref/resvg/text/font-family/monospace.png b/tests/ref/resvg/text/font-family/monospace.png
diff --git a/tests/ref/resvg/text/font-family/sans-serif.png b/tests/ref/resvg/text/font-family/sans-serif.png
diff --git a/tests/ref/resvg/text/font-family/serif.png b/tests/ref/resvg/text/font-family/serif.png
diff --git a/tests/ref/resvg/text/font-family/source-sans-pro.png b/tests/ref/resvg/text/font-family/source-sans-pro.png
diff --git a/tests/ref/resvg/text/font-kerning/arabic-script.png b/tests/ref/resvg/text/font-kerning/arabic-script.png
diff --git a/tests/ref/resvg/text/font/simple-case.png b/tests/ref/resvg/text/font/simple-case.png
diff --git a/tests/ref/resvg/text/letter-spacing/non-ASCII-character.png b/tests/ref/resvg/text/letter-spacing/non-ASCII-character.png
diff --git a/tests/ref/resvg/text/letter-spacing/on-Arabic.png b/tests/ref/resvg/text/letter-spacing/on-Arabic.png
diff --git a/tests/ref/resvg/text/text-anchor/on-tspan-with-arabic.png b/tests/ref/resvg/text/text-anchor/on-tspan-with-arabic.png
diff --git a/tests/ref/resvg/text/text/bidi-reordering.png b/tests/ref/resvg/text/text/bidi-reordering.png
diff --git a/tests/ref/resvg/text/text/fill-rule=evenodd.png b/tests/ref/resvg/text/text/fill-rule=evenodd.png
diff --git a/tests/ref/resvg/text/text/rotate-on-Arabic.png b/tests/ref/resvg/text/text/rotate-on-Arabic.png
diff --git a/tests/ref/resvg/text/text/x-and-y-with-multiple-values-and-arabic-text.png b/tests/ref/resvg/text/text/x-and-y-with-multiple-values-and-arabic-text.png
diff --git a/tests/ref/resvg/text/text/xml-lang=ja.png b/tests/ref/resvg/text/text/xml-lang=ja.png
diff --git a/tests/ref/resvg/text/textLength/arabic-with-lengthAdjust.png b/tests/ref/resvg/text/textLength/arabic-with-lengthAdjust.png
diff --git a/tests/ref/resvg/text/textLength/arabic.png b/tests/ref/resvg/text/textLength/arabic.png
diff --git a/tests/ref/resvg/text/textPath/complex.png b/tests/ref/resvg/text/textPath/complex.png
diff --git a/tests/ref/resvg/text/textPath/writing-mode=tb.png b/tests/ref/resvg/text/textPath/writing-mode=tb.png
diff --git a/tests/ref/resvg/text/tspan/bidi-reordering.png b/tests/ref/resvg/text/tspan/bidi-reordering.png
diff --git a/tests/ref/resvg/text/unicode-bidi/bidi-override.png b/tests/ref/resvg/text/unicode-bidi/bidi-override.png
diff --git a/tests/ref/resvg/text/writing-mode/arabic-with-rl.png b/tests/ref/resvg/text/writing-mode/arabic-with-rl.png
diff --git a/tests/ref/resvg/text/writing-mode/japanese-with-tb.png b/tests/ref/resvg/text/writing-mode/japanese-with-tb.png
diff --git a/tests/ref/resvg/text/writing-mode/mixed-languages-with-tb-and-underline.png b/tests/ref/resvg/text/writing-mode/mixed-languages-with-tb-and-underline.png
diff --git a/tests/ref/resvg/text/writing-mode/mixed-languages-with-tb.png b/tests/ref/resvg/text/writing-mode/mixed-languages-with-tb.png
diff --git a/tests/ref/resvg/text/writing-mode/tb-and-punctuation.png b/tests/ref/resvg/text/writing-mode/tb-and-punctuation.png
diff --git a/tests/ref/resvg/text/writing-mode/tb-with-rotate-and-underline.png b/tests/ref/resvg/text/writing-mode/tb-with-rotate-and-underline.png
diff --git a/tests/ref/resvg/text/writing-mode/tb-with-rotate.png b/tests/ref/resvg/text/writing-mode/tb-with-rotate.png
diff --git a/tests/scripts/gen-tests.py b/tests/scripts/gen-tests.py
@@ -79,47 +79,9 @@
     "svg/resvg/paint-servers/radialGradient/attributes-via-xlink-href-from-linearGradient.svg": NO_REFLECT,
     "svg/resvg/paint-servers/radialGradient/spreadMethod=reflect.svg": NO_REFLECT,
     "svg/resvg/paint-servers/radialGradient/spreadMethod=repeat.svg": NO_REPEAT,
-
-    # The following test cases don't work yet because we are not including
-    # all necessary fonts.
-    "svg/resvg/text/alignment-baseline/hanging-on-vertical.svg": NO_FONT,
-    "svg/resvg/text/direction/rtl.svg": NO_FONT,
-    "svg/resvg/text/direction/rtl-with-vertical-writing-mode.svg": NO_FONT,
-    "svg/resvg/text/dominant-baseline/hanging.svg": NO_FONT,
-    "svg/resvg/text/dominant-baseline/use-script.svg": NO_FONT,
-    "svg/resvg/text/font/simple-case.svg": NO_FONT,
-    "svg/resvg/text/font-family/bold-sans-serif.svg": NO_FONT,
-    "svg/resvg/text/font-family/cursive.svg": NO_FONT,
-    "svg/resvg/text/font-family/fallback-1.svg": NO_FONT,
-    "svg/resvg/text/font-family/fantasy.svg": NO_FONT,
-    "svg/resvg/text/font-family/monospace.svg": NO_FONT,
-    "svg/resvg/text/font-family/sans-serif.svg": NO_FONT,
-    "svg/resvg/text/font-family/serif.svg": NO_FONT,
-    "svg/resvg/text/font-family/source-sans-pro.svg": NO_FONT,
-    "svg/resvg/text/font-kerning/arabic-script.svg": NO_FONT,
-    "svg/resvg/text/letter-spacing/non-ASCII-character.svg": NO_FONT,
-    "svg/resvg/text/letter-spacing/on-Arabic.svg": NO_FONT,
-    "svg/resvg/text/text/bidi-reordering.svg": NO_FONT,
-    "svg/resvg/text/text/fill-rule=evenodd.svg": NO_FONT,
-    "svg/resvg/text/text/rotate-on-Arabic.svg": NO_FONT,
-    "svg/resvg/text/text/x-and-y-with-multiple-values-and-arabic-text.svg": NO_FONT,
-    "svg/resvg/text/text/xml-lang=ja.svg": NO_FONT,
-    "svg/resvg/text/text-anchor/on-tspan-with-arabic.svg": NO_FONT,
-    "svg/resvg/text/textLength/arabic.svg": NO_FONT,
-    "svg/resvg/text/textLength/arabic-with-lengthAdjust.svg": NO_FONT,
-    "svg/resvg/text/textPath/complex.svg": NO_FONT,
-    "svg/resvg/text/textPath/writing-mode=tb.svg": NO_FONT,
-    "svg/resvg/text/tspan/bidi-reordering.svg": NO_FONT,
-    "svg/resvg/text/unicode-bidi/bidi-override.svg": NO_FONT,
-    "svg/resvg/text/writing-mode/arabic-with-rl.svg": NO_FONT,
-    "svg/resvg/text/writing-mode/japanese-with-tb.svg": NO_FONT,
-    "svg/resvg/text/writing-mode/mixed-languages-with-tb.svg": NO_FONT,
-    "svg/resvg/text/writing-mode/mixed-languages-with-tb-and-underline.svg": NO_FONT,
-    "svg/resvg/text/writing-mode/tb-and-punctuation.svg": NO_FONT,
-    "svg/resvg/text/writing-mode/tb-with-rotate.svg": NO_FONT,
-    "svg/resvg/text/writing-mode/tb-with-rotate-and-underline.svg": NO_FONT,
 }
 
+
 def main():
     parser = argparse.ArgumentParser(
         prog="gen-tests", description="Generate the test files for svg2pdf"

diff --git a/tests/src/lib.rs b/tests/src/lib.rs
@@ -19,6 +19,13 @@ use svg2pdf::Options;
 static FONTDB: Lazy<std::sync::Mutex<fontdb::Database>> = Lazy::new(|| {
     let mut fontdb = fontdb::Database::new();
     fontdb.load_fonts_dir("fonts");
+
+    fontdb.set_serif_family("Noto Serif");
+    fontdb.set_sans_serif_family("Noto Sans");
+    fontdb.set_cursive_family("Yellowtail");
+    fontdb.set_fantasy_family("Sedgwick Ave Display");
+    fontdb.set_monospace_family("Noto Mono");
+
     std::sync::Mutex::new(fontdb)
 });
 

diff --git a/tests/src/test.rs b/tests/src/test.rs