From 05978c95229a0db6f55b6c2b14374e637aed3c4e Mon Sep 17 00:00:00 2001 From: Laurenz Stampfl <47084093+LaurenzV@users.noreply.github.com> Date: Mon, 17 Jun 2024 19:07:39 +0200 Subject: [PATCH] Fix link to arabic table --- scripts/gen-arabic-table.py | 2 +- src/hb/ot_shaper_arabic_table.rs | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/scripts/gen-arabic-table.py b/scripts/gen-arabic-table.py index 65293724..798febce 100644 --- a/scripts/gen-arabic-table.py +++ b/scripts/gen-arabic-table.py @@ -13,7 +13,7 @@ for dep in DEPENDENCIES: if not os.path.exists(dep): - urllib.request.urlretrieve("https://unicode.org/Public/16.0.0/ucd/" + dep, dep) + urllib.request.urlretrieve("https://unicode.org/Public/15.0.0/ucd/" + dep, dep) files = [open(x, encoding="utf-8") for x in DEPENDENCIES] diff --git a/src/hb/ot_shaper_arabic_table.rs b/src/hb/ot_shaper_arabic_table.rs index e84fc394..7b757260 100644 --- a/src/hb/ot_shaper_arabic_table.rs +++ b/src/hb/ot_shaper_arabic_table.rs @@ -99,10 +99,6 @@ pub const JOINING_TABLE: &[hb_arabic_joining_type_t] = &[ /* 10D00 */ L,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D, /* 10D20 */ D,D,R,D, - /* Arabic Extended-C */ - - /* 10EC0 */ R,D,D, - /* Sogdian */ /* 10F20 */ D,D,D,R,D,D,D,D,D,D,D,D,D,D,D,D, @@ -139,10 +135,9 @@ const JOINING_OFFSET_0XA840: usize = 998; const JOINING_OFFSET_0X10AC0: usize = 1050; const JOINING_OFFSET_0X10B80: usize = 1098; const JOINING_OFFSET_0X10D00: usize = 1146; -const JOINING_OFFSET_0X10EC2: usize = 1182; -const JOINING_OFFSET_0X10F30: usize = 1185; -const JOINING_OFFSET_0X110BD: usize = 1341; -const JOINING_OFFSET_0X1E900: usize = 1358; +const JOINING_OFFSET_0X10F30: usize = 1182; +const JOINING_OFFSET_0X110BD: usize = 1338; +const JOINING_OFFSET_0X1E900: usize = 1355; pub fn joining_type(u: char) -> hb_arabic_joining_type_t { let u = u as u32; @@ -177,9 +172,6 @@ pub fn joining_type(u: char) -> hb_arabic_joining_type_t { if (0x10D00..=0x10D23).contains(&u) { return JOINING_TABLE[u as usize - 0x10D00 + JOINING_OFFSET_0X10D00]; } - if (0x10EC2..=0x10EC4).contains(&u) { - return JOINING_TABLE[u as usize - 0x10EC2 + JOINING_OFFSET_0X10EC2]; - } if (0x10F30..=0x10FCB).contains(&u) { return JOINING_TABLE[u as usize - 0x10F30 + JOINING_OFFSET_0X10F30]; }