[HarfBuzz] harfbuzz: Branch 'master' - 4 commits
Behdad Esfahbod
behdad at kemper.freedesktop.org
Wed Feb 10 11:28:37 UTC 2016
src/hb-ot-shape-complex-default.cc | 2 +-
src/hb-ot-shape-complex-thai.cc | 2 +-
src/hb-ot-shape-complex-tibetan.cc | 2 +-
test/shaping/fonts/sha1sum/0dd3a51c3ea50997cb1f72515d1060408f8b4b59.ttf |binary
test/shaping/fonts/sha1sum/45855bc8d46332b39c4ab9e2ee1a26b1f896da6b.ttf |binary
test/shaping/fonts/sha1sum/7a37dc4d5bf018456aea291cee06daf004c0221c.ttf |binary
test/shaping/fonts/sha1sum/8099955657a54e9ee38a6ba1d6f950ce58e3cc25.ttf |binary
test/shaping/fonts/sha1sum/828114d00931885bc25abf7cdb878b2914a2e743.ttf |binary
test/shaping/fonts/sha1sum/894e96a367f00c196d82e6243673a1d4414f4f6a.ttf |binary
test/shaping/fonts/sha1sum/MANIFEST | 8 ++++++++
test/shaping/fonts/sha1sum/bb0c53752e85c3d28973ebc913287b8987d3dfe8.ttf |binary
test/shaping/fonts/sha1sum/fcdcffbdf1c4c97c05308d7600e4c283eb47dbca.ttf |binary
test/shaping/hb_test_tools.py | 2 +-
test/shaping/tests/zero-width-marks.tests | 8 ++++++++
14 files changed, 20 insertions(+), 4 deletions(-)
New commits:
commit cc4a78bf22c4a735b84c89b04be3bb531f42135e
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Feb 10 18:24:08 2016 +0700
[tests] Add tests for Latin mark zeroing
diff --git a/test/shaping/fonts/sha1sum/0dd3a51c3ea50997cb1f72515d1060408f8b4b59.ttf b/test/shaping/fonts/sha1sum/0dd3a51c3ea50997cb1f72515d1060408f8b4b59.ttf
new file mode 100644
index 0000000..9378909
Binary files /dev/null and b/test/shaping/fonts/sha1sum/0dd3a51c3ea50997cb1f72515d1060408f8b4b59.ttf differ
diff --git a/test/shaping/fonts/sha1sum/828114d00931885bc25abf7cdb878b2914a2e743.ttf b/test/shaping/fonts/sha1sum/828114d00931885bc25abf7cdb878b2914a2e743.ttf
new file mode 100644
index 0000000..af6e6da
Binary files /dev/null and b/test/shaping/fonts/sha1sum/828114d00931885bc25abf7cdb878b2914a2e743.ttf differ
diff --git a/test/shaping/fonts/sha1sum/894e96a367f00c196d82e6243673a1d4414f4f6a.ttf b/test/shaping/fonts/sha1sum/894e96a367f00c196d82e6243673a1d4414f4f6a.ttf
new file mode 100644
index 0000000..d233314
Binary files /dev/null and b/test/shaping/fonts/sha1sum/894e96a367f00c196d82e6243673a1d4414f4f6a.ttf differ
diff --git a/test/shaping/fonts/sha1sum/MANIFEST b/test/shaping/fonts/sha1sum/MANIFEST
index e32a6a1..e8ba4c2 100644
--- a/test/shaping/fonts/sha1sum/MANIFEST
+++ b/test/shaping/fonts/sha1sum/MANIFEST
@@ -1,5 +1,6 @@
0509e80afb379d16560e9e47bdd7d888bebdebc6.ttf
051d92f8bc6ff724511b296c27623f824de256e9.ttf
+0dd3a51c3ea50997cb1f72515d1060408f8b4b59.ttf
191826b9643e3f124d865d617ae609db6a2ce203.ttf
1a6f1687b7a221f9f2c834b0b360d3c8463b6daf.ttf
1c04a16f32a39c26c851b7fc014d2e8d298ba2b8.ttf
@@ -27,7 +28,9 @@
8099955657a54e9ee38a6ba1d6f950ce58e3cc25.ttf
813c2f8e5512187fd982417a7fb4286728e6f4a8.ttf
8240789f6d12d4cfc4b5e8e6f246c3701bcf861f.ttf
+828114d00931885bc25abf7cdb878b2914a2e743.ttf
8454d22037f892e76614e1645d066689a0200e61.ttf
+894e96a367f00c196d82e6243673a1d4414f4f6a.ttf
8a9fea2a7384f2116e5b84a9b31f83be7850ce21.ttf
a919b33197965846f21074b24e30250d67277bce.ttf
b9e2aaa0d75fcef6971ec3a96d806ba4a6b31fe2.ttf
@@ -42,3 +45,4 @@ ef86fe710cfea877bbe0dbb6946a1f88d0661031.ttf
f499fbc23865022234775c43503bba2e63978fe1.ttf
fab39d60d758cb586db5a504f218442cd1395725.ttf
fbb6c84c9e1fe0c39e152fbe845e51fd81f6748e.ttf
+fcdcffbdf1c4c97c05308d7600e4c283eb47dbca.ttf
diff --git a/test/shaping/fonts/sha1sum/fcdcffbdf1c4c97c05308d7600e4c283eb47dbca.ttf b/test/shaping/fonts/sha1sum/fcdcffbdf1c4c97c05308d7600e4c283eb47dbca.ttf
new file mode 100644
index 0000000..c4e0253
Binary files /dev/null and b/test/shaping/fonts/sha1sum/fcdcffbdf1c4c97c05308d7600e4c283eb47dbca.ttf differ
diff --git a/test/shaping/tests/zero-width-marks.tests b/test/shaping/tests/zero-width-marks.tests
index cd5e2f5..1cda3db 100644
--- a/test/shaping/tests/zero-width-marks.tests
+++ b/test/shaping/tests/zero-width-marks.tests
@@ -4,3 +4,7 @@ fonts/sha1sum/45855bc8d46332b39c4ab9e2ee1a26b1f896da6b.ttf::U+0E01,U+0E34,U+0E01
fonts/sha1sum/7a37dc4d5bf018456aea291cee06daf004c0221c.ttf::U+0E01,U+0E34,U+0E01:[gid1=0+1264|gid2=0 at 20,0+1000|gid1=2+1264]
fonts/sha1sum/8099955657a54e9ee38a6ba1d6f950ce58e3cc25.ttf::U+0E01,U+0E34,U+0E01:[gid1=0+1264|gid2=0+0|gid1=2+1264]
fonts/sha1sum/bb0c53752e85c3d28973ebc913287b8987d3dfe8.ttf::U+0E01,U+0E34,U+0E01:[gid1=0+1264|gid2=0+0|gid1=2+1264]
+fonts/sha1sum/828114d00931885bc25abf7cdb878b2914a2e743.ttf::U+0058,U+0303,U+0078,U+0303,U+006A,U+006A,U+006A,U+0303,U+006A,U+0303,U+006A,U+006A:[gid1=0+1200|gid6=0 at -1029,340+0|gid3=2+1083|gid6=2 at -992,0+0|gid2=4+528|gid2=5+528|gid5=6+528|gid6=6 at -693,0+0|gid5=8+528|gid6=8 at -693,0+0|gid2=10+528|gid2=11+528]
+fonts/sha1sum/894e96a367f00c196d82e6243673a1d4414f4f6a.ttf::U+0058,U+0303,U+0078,U+0303,U+006A,U+006A,U+006A,U+0303,U+006A,U+0303,U+006A,U+006A:[gid1=0+1200|gid6=0 at -1029,340+1200|gid3=2+1083|gid6=2 at -992,0+1200|gid2=4+528|gid2=5+528|gid5=6+528|gid6=6 at -693,0+1200|gid5=8+528|gid6=8 at -693,0+1200|gid2=10+528|gid2=11+528]
+fonts/sha1sum/fcdcffbdf1c4c97c05308d7600e4c283eb47dbca.ttf::U+0058,U+0303,U+0078,U+0303,U+006A,U+006A,U+006A,U+0303,U+006A,U+0303,U+006A,U+006A:[gid1=0+1200|gid6=0+0|gid3=2+1083|gid6=2+0|gid2=4+528|gid2=5+528|gid5=6+528|gid6=6+0|gid5=8+528|gid6=8+0|gid2=10+528|gid2=11+528]
+fonts/sha1sum/0dd3a51c3ea50997cb1f72515d1060408f8b4b59.ttf::U+0058,U+0303,U+0078,U+0303,U+006A,U+006A,U+006A,U+0303,U+006A,U+0303,U+006A,U+006A:[gid1=0+1200|gid6=0 at -1029,340+0|gid3=2+1083|gid6=2 at -992,0+0|gid2=4+528|gid2=5+528|gid5=6+528|gid6=6 at -693,0+0|gid5=8+528|gid6=8 at -693,0+0|gid2=10+528|gid2=11+528]
commit 55ff34b9c157a839d026465af8f30424ce7f891b
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Feb 10 18:20:02 2016 +0700
[tests] Add tests for Thai mark zeroing
diff --git a/test/shaping/fonts/sha1sum/45855bc8d46332b39c4ab9e2ee1a26b1f896da6b.ttf b/test/shaping/fonts/sha1sum/45855bc8d46332b39c4ab9e2ee1a26b1f896da6b.ttf
new file mode 100644
index 0000000..6ef470c
Binary files /dev/null and b/test/shaping/fonts/sha1sum/45855bc8d46332b39c4ab9e2ee1a26b1f896da6b.ttf differ
diff --git a/test/shaping/fonts/sha1sum/7a37dc4d5bf018456aea291cee06daf004c0221c.ttf b/test/shaping/fonts/sha1sum/7a37dc4d5bf018456aea291cee06daf004c0221c.ttf
new file mode 100644
index 0000000..a5787a8
Binary files /dev/null and b/test/shaping/fonts/sha1sum/7a37dc4d5bf018456aea291cee06daf004c0221c.ttf differ
diff --git a/test/shaping/fonts/sha1sum/8099955657a54e9ee38a6ba1d6f950ce58e3cc25.ttf b/test/shaping/fonts/sha1sum/8099955657a54e9ee38a6ba1d6f950ce58e3cc25.ttf
new file mode 100644
index 0000000..6bb13bd
Binary files /dev/null and b/test/shaping/fonts/sha1sum/8099955657a54e9ee38a6ba1d6f950ce58e3cc25.ttf differ
diff --git a/test/shaping/fonts/sha1sum/MANIFEST b/test/shaping/fonts/sha1sum/MANIFEST
index 47b0638..e32a6a1 100644
--- a/test/shaping/fonts/sha1sum/MANIFEST
+++ b/test/shaping/fonts/sha1sum/MANIFEST
@@ -13,6 +13,7 @@
375d6ae32a3cbe52fbf81a4e5777e3377675d5a3.ttf
43979b90b2dd929723cf4fe1715990bcb9c9a56b.ttf
43ef465752be9af900745f72fe29cb853a1401a5.ttf
+45855bc8d46332b39c4ab9e2ee1a26b1f896da6b.ttf
49c9f7485c1392fa09a1b801bc2ffea79275f22e.ttf
4cce528e99f600ed9c25a2b69e32eb94a03b4ae8.ttf
5028afb650b1bb718ed2131e872fbcce57828fff.ttf
@@ -21,13 +22,16 @@
641bd9db850193064d17575053ae2bf8ec149ddc.ttf
6466d38c62e73a39202435a4f73bf5d6acbb73c0.ttf
757ebd573617a24aa9dfbf0b885c54875c6fe06b.ttf
+7a37dc4d5bf018456aea291cee06daf004c0221c.ttf
7e14e7883ed152baa158b80e207b66114c823a8b.ttf
+8099955657a54e9ee38a6ba1d6f950ce58e3cc25.ttf
813c2f8e5512187fd982417a7fb4286728e6f4a8.ttf
8240789f6d12d4cfc4b5e8e6f246c3701bcf861f.ttf
8454d22037f892e76614e1645d066689a0200e61.ttf
8a9fea2a7384f2116e5b84a9b31f83be7850ce21.ttf
a919b33197965846f21074b24e30250d67277bce.ttf
b9e2aaa0d75fcef6971ec3a96d806ba4a6b31fe2.ttf
+bb0c53752e85c3d28973ebc913287b8987d3dfe8.ttf
bb29ce50df2bdba2d10726427c6b7609bf460e04.ttf
bb9473d2403488714043bcfb946c9f78b86ad627.ttf
c4e48b0886ef460f532fb49f00047ec92c432ec0.ttf
diff --git a/test/shaping/fonts/sha1sum/bb0c53752e85c3d28973ebc913287b8987d3dfe8.ttf b/test/shaping/fonts/sha1sum/bb0c53752e85c3d28973ebc913287b8987d3dfe8.ttf
new file mode 100644
index 0000000..3b7c470
Binary files /dev/null and b/test/shaping/fonts/sha1sum/bb0c53752e85c3d28973ebc913287b8987d3dfe8.ttf differ
diff --git a/test/shaping/tests/zero-width-marks.tests b/test/shaping/tests/zero-width-marks.tests
index ead3ff4..cd5e2f5 100644
--- a/test/shaping/tests/zero-width-marks.tests
+++ b/test/shaping/tests/zero-width-marks.tests
@@ -1,2 +1,6 @@
fonts/sha1sum/bb9473d2403488714043bcfb946c9f78b86ad627.ttf::U+1030:[circledash=0+636|u1030.med=0 at -162,0+0]
fonts/sha1sum/8454d22037f892e76614e1645d066689a0200e61.ttf::U+05E0,U+05B8,U+0591,U+05DA,U+05B0:[uni05DA05B0=3+991|uni2009=0+200|uni0591=0 at 75,0+0|uni05B8=0 at 495,0+0|uni05E0=0+683]
+fonts/sha1sum/45855bc8d46332b39c4ab9e2ee1a26b1f896da6b.ttf::U+0E01,U+0E34,U+0E01:[gid1=0+1264|gid2=0 at 20,0+0|gid1=2+1264]
+fonts/sha1sum/7a37dc4d5bf018456aea291cee06daf004c0221c.ttf::U+0E01,U+0E34,U+0E01:[gid1=0+1264|gid2=0 at 20,0+1000|gid1=2+1264]
+fonts/sha1sum/8099955657a54e9ee38a6ba1d6f950ce58e3cc25.ttf::U+0E01,U+0E34,U+0E01:[gid1=0+1264|gid2=0+0|gid1=2+1264]
+fonts/sha1sum/bb0c53752e85c3d28973ebc913287b8987d3dfe8.ttf::U+0E01,U+0E34,U+0E01:[gid1=0+1264|gid2=0+0|gid1=2+1264]
commit b3582a8ee82942a931130a83b2867b239f8ca71a
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Feb 10 18:10:15 2016 +0700
Change default mark advance zeroing behavior from Unicode to GDEF
See thread at:
https://lists.freedesktop.org/archives/harfbuzz/2016-February/005462.html
diff --git a/src/hb-ot-shape-complex-default.cc b/src/hb-ot-shape-complex-default.cc
index 5cf0a18..be60e56 100644
--- a/src/hb-ot-shape-complex-default.cc
+++ b/src/hb-ot-shape-complex-default.cc
@@ -40,6 +40,6 @@ const hb_ot_complex_shaper_t _hb_ot_complex_shaper_default =
NULL, /* decompose */
NULL, /* compose */
NULL, /* setup_masks */
- HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_UNICODE_LATE,
+ HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_GDEF_LATE,
true, /* fallback_position */
};
diff --git a/src/hb-ot-shape-complex-thai.cc b/src/hb-ot-shape-complex-thai.cc
index bd7c5e1..58392b6 100644
--- a/src/hb-ot-shape-complex-thai.cc
+++ b/src/hb-ot-shape-complex-thai.cc
@@ -377,6 +377,6 @@ const hb_ot_complex_shaper_t _hb_ot_complex_shaper_thai =
NULL, /* decompose */
NULL, /* compose */
NULL, /* setup_masks */
- HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_UNICODE_LATE,
+ HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_GDEF_LATE,
false,/* fallback_position */
};
diff --git a/src/hb-ot-shape-complex-tibetan.cc b/src/hb-ot-shape-complex-tibetan.cc
index 03bcfee..a77b531 100644
--- a/src/hb-ot-shape-complex-tibetan.cc
+++ b/src/hb-ot-shape-complex-tibetan.cc
@@ -57,6 +57,6 @@ const hb_ot_complex_shaper_t _hb_ot_complex_shaper_tibetan =
NULL, /* decompose */
NULL, /* compose */
NULL, /* setup_masks */
- HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_UNICODE_LATE,
+ HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_GDEF_LATE,
true, /* fallback_position */
};
commit 43bb2b8fb00705c3334730a58ade7984181018b2
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Wed Feb 10 14:11:43 2016 +0700
Minor
diff --git a/test/shaping/hb_test_tools.py b/test/shaping/hb_test_tools.py
index ba4a8bb..747699b 100644
--- a/test/shaping/hb_test_tools.py
+++ b/test/shaping/hb_test_tools.py
@@ -414,7 +414,7 @@ class Unicode:
@staticmethod
def parse (s):
s = re.sub (r"0[xX]", " ", s)
- s = re.sub (r"[<+>,;&#\\xXuUnNiI\n ]", " ", s)
+ s = re.sub (r"[<+>{},;&#\\xXuUnNiI\n ]", " ", s)
return [int (x, 16) for x in s.split ()]
@staticmethod
More information about the HarfBuzz
mailing list