Add changes to complex shaping

harfbuzz · Aug 18, 2023 · 5efcdcb · 5efcdcb
1 parent 247e240
commit 5efcdcb
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/src/complex/mod.rs b/src/complex/mod.rs
@@ -274,6 +274,7 @@ pub fn complex_categorize(
 
         // Unicode-6.1 additions
         | script::CHAKMA
+        | script::MIAO
         | script::SHARADA
         | script::TAKRI
 
@@ -292,6 +293,7 @@ pub fn complex_categorize(
 
         // Unicode-8.0 additions
         | script::AHOM
+        | script::MULTANI
 
         // Unicode-9.0 additions
         // | script::ADLAM
@@ -309,10 +311,15 @@ pub fn complex_categorize(
         | script::GUNJALA_GONDI
         // | script::HANIFI_ROHINGYA
         | script::MAKASAR
+        | script::MEDEFAIDRIN
+        | script::OLD_SOGDIAN
         // | script::SOGDIAN
 
         // Unicode-12.0 additions
+        | script::ELYMAIC
         | script::NANDINAGARI
+        | script::NYIAKENG_PUACHUE_HMONG
+        | script::WANCHO
 
         // Unicode-13.0 additions
         | script::CHORASMIAN

diff --git a/src/complex/universal.rs b/src/complex/universal.rs
@@ -261,6 +261,7 @@ fn setup_topographical_masks(plan: &ShapePlan, buffer: &mut Buffer) {
         let syllable = buffer.info[start].syllable() & 0x0F;
         if syllable == SyllableType::IndependentCluster as u8 ||
             syllable == SyllableType::SymbolCluster as u8 ||
+            syllable == SyllableType::HieroglyphCluster as u8 ||
             syllable == SyllableType::NonCluster as u8
         {
             last_form = None;
@@ -402,7 +403,6 @@ const fn category_flag64(c: Category) -> u64 {
 }
 
 const BASE_FLAGS: u64 =
-    category_flag64(category::FM) |
     category_flag64(category::FABV) |
     category_flag64(category::FBLW) |
     category_flag64(category::FPST) |

diff --git a/src/complex/universal_machine.rs b/src/complex/universal_machine.rs
@@ -132,6 +132,7 @@ pub enum SyllableType {
     NumberJoinerTerminatedCluster,
     NumeralCluster,
     SymbolCluster,
+    HieroglyphCluster,
     BrokenCluster,
     NonCluster,
 }

diff --git a/src/complex/vowel_constraints.rs b/src/complex/vowel_constraints.rs
@@ -297,7 +297,7 @@ pub fn preprocess_text_vowel_constraints(buffer: &mut Buffer) {
                         matched = 0x0DD8 == buffer.cur(1).glyph_id;
                     }
                     0x0D91 => match buffer.cur(1).glyph_id {
-                        0x0DCA | 0x0DD9 | 0x0DDA | 0x0DDC | 0x0DDD => {
+                        0x0DCA | 0x0DD9 | 0x0DDA | 0x0DDC | 0x0DDD | 0x0DDE => {
                             matched = true;
                         }
                         _ => {}

diff --git a/src/tag.rs b/src/tag.rs
@@ -175,6 +175,10 @@ fn tags_from_language(
                 break;
             }
 
+            if LANGUAGES[idx + i].tag.is_null() {
+                break;
+            }
+
             if tags.is_full() {
                 break;
             }