Merge branch 'matthiasc/for-main' into 'main'

Add another font rendering test See merge request GNOME/gtk!6752
2024-01-14 01:16:57 +00:00
parent 1fd9e1e916 b78d2a7f75
commit 4ea748a676
5 changed files with 18 additions and 1 deletions
--- a/testsuite/gsk/compare/text-glyph-lsb.node
+++ b/testsuite/gsk/compare/text-glyph-lsb.node
@@ -0,0 +1,4 @@
+text {
+  font: "text-mixed-color 30";
+  glyphs: 1 40, 1 40, 8 40, 1 40;
+}
--- a/testsuite/gsk/compare/text-glyph-lsb.png
+++ b/testsuite/gsk/compare/text-glyph-lsb.png
--- a/testsuite/gsk/fonts/text-mixed-color.ttf
+++ b/testsuite/gsk/fonts/text-mixed-color.ttf
--- a/testsuite/gsk/fonts/text-mixed-color.ttx
+++ b/testsuite/gsk/fonts/text-mixed-color.ttx
@@ -11,6 +11,7 @@
    <GlyphID id="5" name="E"/>
    <GlyphID id="6" name="F"/>
    <GlyphID id="7" name="G"/>
+    <GlyphID id="8" name="H"/>
  </GlyphOrder>

  <head>
@@ -82,12 +83,13 @@
    <mtx name="E" width="1024" lsb="0"/>
    <mtx name="F" width="1024" lsb="0"/>
    <mtx name="G" width="1024" lsb="0"/>
+    <mtx name="H" width="1024" lsb="256" rsb="256"/>
  </hmtx>

  <loca>
  </loca>

-  <glyf> <!-- Will result in empty table -->
+  <glyf>
    <TTGlyph name=".notdef"/>
    <TTGlyph name="A">
      <contour>
@@ -158,6 +160,15 @@
      </contour>
      <instructions><assembly></assembly></instructions>
    </TTGlyph>
+    <TTGlyph name="H">
+      <contour>
+        <pt x="256" y="0" on="1"/>
+        <pt x="768" y="0" on="1"/>
+        <pt x="768" y="2048" on="1"/>
+        <pt x="256" y="2048" on="1"/>
+      </contour>
+      <instructions><assembly></assembly></instructions>
+    </TTGlyph>
  </glyf>

  <COLR>
@@ -200,6 +211,7 @@
      <map code="0x45" name="E"/>
      <map code="0x46" name="F"/>
      <map code="0x47" name="G"/>
+      <map code="0x48" name="H"/>
    </cmap_format_4>
  </cmap>

--- a/testsuite/gsk/meson.build
+++ b/testsuite/gsk/meson.build
@@ -136,6 +136,7 @@ compare_render_tests = [
  'stroke-fractional-translate-nogl',
  'stroke-opacity',
  'stroke-with-3d-contents-nogl-nocairo',
+  'text-glyph-lsb',
  'text-mixed-color-nocairo',
  'text-mixed-color-colrv1',
  'texture-coords',