summaryrefslogtreecommitdiff
path: root/Build/source/libs/harfbuzz/harfbuzz-src/src
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2020-08-29 01:14:01 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2020-08-29 01:14:01 +0000
commit321c25d3a3c414017d482023194e55b9ed68dca2 (patch)
tree889698d787042e18a0faae1a0d267cdcace257fd /Build/source/libs/harfbuzz/harfbuzz-src/src
parent5d95e697bcda1ef56c93adfe95b558541ca56faa (diff)
harfbuzz 2.7.2
git-svn-id: svn://tug.org/texlive/trunk@56205 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/harfbuzz/harfbuzz-src/src')
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/gen-arabic-joining-list.py2
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-arabic-fallback.hh4
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-arabic-joining-list.hh1
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-use.cc2
4 files changed, 5 insertions, 4 deletions
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/gen-arabic-joining-list.py b/Build/source/libs/harfbuzz/harfbuzz-src/src/gen-arabic-joining-list.py
index 78c44c35db8..8162a4a3e26 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/gen-arabic-joining-list.py
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/gen-arabic-joining-list.py
@@ -54,6 +54,8 @@ def read_joining_uu (f):
fields = [x.strip () for x in line.split (';')]
if len (fields) == 1:
continue
+ if fields[2] in {'T', 'U'}:
+ continue
values.add (int (fields[0], 16))
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-arabic-fallback.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-arabic-fallback.hh
index 262ab8a1fab..244e967b12d 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-arabic-fallback.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-arabic-fallback.hh
@@ -92,7 +92,7 @@ arabic_fallback_synthesize_lookup_single (const hb_ot_shape_plan_t *plan HB_UNUS
hb_array (substitutes, num_glyphs));
c.end_serialize ();
- return ret ? c.copy<OT::SubstLookup> () : nullptr;
+ return ret && !c.in_error () ? c.copy<OT::SubstLookup> () : nullptr;
}
static OT::SubstLookup *
@@ -170,7 +170,7 @@ arabic_fallback_synthesize_lookup_ligature (const hb_ot_shape_plan_t *plan HB_UN
c.end_serialize ();
/* TODO sanitize the results? */
- return ret ? c.copy<OT::SubstLookup> () : nullptr;
+ return ret && !c.in_error () ? c.copy<OT::SubstLookup> () : nullptr;
}
static OT::SubstLookup *
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-arabic-joining-list.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-arabic-joining-list.hh
index 1403103336d..c022d4bb06b 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-arabic-joining-list.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-arabic-joining-list.hh
@@ -25,7 +25,6 @@ has_arabic_joining (hb_script_t script)
case HB_SCRIPT_ARABIC:
case HB_SCRIPT_CHORASMIAN:
case HB_SCRIPT_HANIFI_ROHINGYA:
- case HB_SCRIPT_KAITHI:
case HB_SCRIPT_MANDAIC:
case HB_SCRIPT_MANICHAEAN:
case HB_SCRIPT_MONGOLIAN:
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-use.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-use.cc
index 981df2d5970..a1e25bdd806 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-use.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-shape-complex-use.cc
@@ -36,7 +36,7 @@
#include "hb-ot-shape-complex-vowel-constraints.hh"
/* buffer var allocations */
-#define use_category() complex_var_u8_0()
+#define use_category() complex_var_u8_1()
/*