From 20a61ca447a952c54b18ecae273aa8639e6650d4 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Sat, 4 Jun 2022 08:35:22 -0600
Subject: [PATCH] [myanmar] Fold D category into GB

Trying to free a byte the buffer vars, for caching of lookups.

Part of https://github.com/harfbuzz/harfbuzz/issues/3633
---
 src/hb-ot-shaper-myanmar-machine.hh | 4 ++--
 src/hb-ot-shaper-myanmar-machine.rl | 4 ++--
 src/hb-ot-shaper-myanmar.hh         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/hb-ot-shaper-myanmar-machine.hh b/src/hb-ot-shaper-myanmar-machine.hh
index 41d4ecbac..5429a7bce 100644
--- a/src/hb-ot-shaper-myanmar-machine.hh
+++ b/src/hb-ot-shaper-myanmar-machine.hh
@@ -44,14 +44,14 @@ enum myanmar_syllable_type_t {
 #define myanmar_syllable_machine_ex_As 18u
 #define myanmar_syllable_machine_ex_C 1u
 #define myanmar_syllable_machine_ex_CS 19u
-#define myanmar_syllable_machine_ex_D 32u
+#define myanmar_syllable_machine_ex_D 11u
 #define myanmar_syllable_machine_ex_D0 20u
 #define myanmar_syllable_machine_ex_DB 3u
 #define myanmar_syllable_machine_ex_GB 11u
 #define myanmar_syllable_machine_ex_H 4u
 #define myanmar_syllable_machine_ex_IV 2u
 #define myanmar_syllable_machine_ex_MH 21u
-#define myanmar_syllable_machine_ex_ML 33u
+#define myanmar_syllable_machine_ex_ML 32u
 #define myanmar_syllable_machine_ex_MR 22u
 #define myanmar_syllable_machine_ex_MW 23u
 #define myanmar_syllable_machine_ex_MY 24u
diff --git a/src/hb-ot-shaper-myanmar-machine.rl b/src/hb-ot-shaper-myanmar-machine.rl
index 3d9dc70c8..dc11736e4 100644
--- a/src/hb-ot-shaper-myanmar-machine.rl
+++ b/src/hb-ot-shaper-myanmar-machine.rl
@@ -48,14 +48,14 @@ enum myanmar_syllable_type_t {
 export A    = 10;
 export As   = 18;
 export C    = 1;
-export D    = 32;
+export D    = 11;
 export D0   = 20;
 export DB   = 3;
 export GB   = 11;
 export H    = 4;
 export IV   = 2;
 export MH   = 21;
-export ML   = 33;
+export ML   = 32;
 export MR   = 22;
 export MW   = 23;
 export MY   = 24;
diff --git a/src/hb-ot-shaper-myanmar.hh b/src/hb-ot-shaper-myanmar.hh
index 5b22eb528..212e290a3 100644
--- a/src/hb-ot-shaper-myanmar.hh
+++ b/src/hb-ot-shaper-myanmar.hh
@@ -55,8 +55,8 @@ enum myanmar_category_t {
   //OT_VPst = 29,
   OT_VS   = 30, /* Variation selectors */
   OT_P    = 31, /* Punctuation */
-  OT_D    = 32, /* Digits except zero */
-  OT_ML   = 33, /* Various consonant medial types */
+  OT_D    = OT_GB, /* Digits except zero */
+  OT_ML   = 32, /* Various consonant medial types */
 };
 
 using myanmar_position_t = indic_position_t;