AuroraMiddleware/harfbuzz
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[use] Minor clean-up of unused categories

Browse Source
This commit is contained in:
Behdad Esfahbod 2020-10-16 23:49:31 -06:00 committed by David Corbett
parent 0792690b73
commit cde2cf84c0
4 changed files with 18 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/hb-ot-shape-complex-use-machine.hh
View File

@ -308,7 +308,7 @@ static const int use_syllable_machine_en_main = 2;
#line 163 "hb-ot-shape-complex-use-machine.rl" #line 156 "hb-ot-shape-complex-use-machine.rl"
#define found_syllable(syllable_type) \ #define found_syllable(syllable_type) \
@ -359,7 +359,7 @@ find_syllables_use (hb_buffer_t *buffer)
act = 0; act = 0;
} }
#line 207 "hb-ot-shape-complex-use-machine.rl" #line 200 "hb-ot-shape-complex-use-machine.rl"
unsigned int syllable_serial = 1; unsigned int syllable_serial = 1;
@ -401,59 +401,59 @@ _eof_trans:
{te = p+1;} {te = p+1;}
break; break;
case 5: case 5:
#line 150 "hb-ot-shape-complex-use-machine.rl" #line 143 "hb-ot-shape-complex-use-machine.rl"
{te = p+1;{ found_syllable (independent_cluster); }} {te = p+1;{ found_syllable (independent_cluster); }}
break; break;
case 9: case 9:
#line 153 "hb-ot-shape-complex-use-machine.rl" #line 146 "hb-ot-shape-complex-use-machine.rl"
{te = p+1;{ found_syllable (standard_cluster); }} {te = p+1;{ found_syllable (standard_cluster); }}
break; break;
case 7: case 7:
#line 158 "hb-ot-shape-complex-use-machine.rl" #line 151 "hb-ot-shape-complex-use-machine.rl"
{te = p+1;{ found_syllable (broken_cluster); }} {te = p+1;{ found_syllable (broken_cluster); }}
break; break;
case 6: case 6:
#line 159 "hb-ot-shape-complex-use-machine.rl" #line 152 "hb-ot-shape-complex-use-machine.rl"
{te = p+1;{ found_syllable (non_cluster); }} {te = p+1;{ found_syllable (non_cluster); }}
break; break;
case 10: case 10:
#line 151 "hb-ot-shape-complex-use-machine.rl" #line 144 "hb-ot-shape-complex-use-machine.rl"
{te = p;p--;{ found_syllable (virama_terminated_cluster); }} {te = p;p--;{ found_syllable (virama_terminated_cluster); }}
break; break;
case 11: case 11:
#line 152 "hb-ot-shape-complex-use-machine.rl" #line 145 "hb-ot-shape-complex-use-machine.rl"
{te = p;p--;{ found_syllable (sakot_terminated_cluster); }} {te = p;p--;{ found_syllable (sakot_terminated_cluster); }}
break; break;
case 8: case 8:
#line 153 "hb-ot-shape-complex-use-machine.rl" #line 146 "hb-ot-shape-complex-use-machine.rl"
{te = p;p--;{ found_syllable (standard_cluster); }} {te = p;p--;{ found_syllable (standard_cluster); }}
break; break;
case 13: case 13:
#line 154 "hb-ot-shape-complex-use-machine.rl" #line 147 "hb-ot-shape-complex-use-machine.rl"
{te = p;p--;{ found_syllable (number_joiner_terminated_cluster); }} {te = p;p--;{ found_syllable (number_joiner_terminated_cluster); }}
break; break;
case 12: case 12:
#line 155 "hb-ot-shape-complex-use-machine.rl" #line 148 "hb-ot-shape-complex-use-machine.rl"
{te = p;p--;{ found_syllable (numeral_cluster); }} {te = p;p--;{ found_syllable (numeral_cluster); }}
break; break;
case 14: case 14:
#line 156 "hb-ot-shape-complex-use-machine.rl" #line 149 "hb-ot-shape-complex-use-machine.rl"
{te = p;p--;{ found_syllable (symbol_cluster); }} {te = p;p--;{ found_syllable (symbol_cluster); }}
break; break;
case 17: case 17:
#line 157 "hb-ot-shape-complex-use-machine.rl" #line 150 "hb-ot-shape-complex-use-machine.rl"
{te = p;p--;{ found_syllable (hieroglyph_cluster); }} {te = p;p--;{ found_syllable (hieroglyph_cluster); }}
break; break;
case 15: case 15:
#line 158 "hb-ot-shape-complex-use-machine.rl" #line 151 "hb-ot-shape-complex-use-machine.rl"
{te = p;p--;{ found_syllable (broken_cluster); }} {te = p;p--;{ found_syllable (broken_cluster); }}
break; break;
case 16: case 16:
#line 159 "hb-ot-shape-complex-use-machine.rl" #line 152 "hb-ot-shape-complex-use-machine.rl"
{te = p;p--;{ found_syllable (non_cluster); }} {te = p;p--;{ found_syllable (non_cluster); }}
break; break;
case 1: case 1:
#line 158 "hb-ot-shape-complex-use-machine.rl" #line 151 "hb-ot-shape-complex-use-machine.rl"
{{p = ((te))-1;}{ found_syllable (broken_cluster); }} {{p = ((te))-1;}{ found_syllable (broken_cluster); }}
break; break;
#line 460 "hb-ot-shape-complex-use-machine.hh" #line 460 "hb-ot-shape-complex-use-machine.hh"
@ -481,7 +481,7 @@ _again:
} }
#line 212 "hb-ot-shape-complex-use-machine.rl" #line 205 "hb-ot-shape-complex-use-machine.rl"
} }

7
src/hb-ot-shape-complex-use-machine.rl
View File

@ -48,10 +48,6 @@ B = 1; # BASE
IND = 3; # BASE_IND IND = 3; # BASE_IND
N = 4; # BASE_NUM N = 4; # BASE_NUM
GB = 5; # BASE_OTHER GB = 5; # BASE_OTHER
#F = 7; # CONS_FINAL
#FM = 8; # CONS_FINAL_MOD
#M = 9; # CONS_MED
#CM = 10; # CONS_MOD
SUB = 11; # CONS_SUB SUB = 11; # CONS_SUB
H = 12; # HALANT H = 12; # HALANT
@ -60,9 +56,6 @@ ZWNJ = 14; # Zero width non-joiner
Rsv = 17; # Reserved characters Rsv = 17; # Reserved characters
R = 18; # REPHA R = 18; # REPHA
S = 19; # SYM S = 19; # SYM
#SM = 20; # SYM_MOD
#V = 36; # VOWEL
#VM = 40; # VOWEL_MOD
CS = 43; # CONS_WITH_STACKER CS = 43; # CONS_WITH_STACKER
HVM = 44; # HALANT_OR_VOWEL_MODIFIER HVM = 44; # HALANT_OR_VOWEL_MODIFIER
Sk = 48; # SAKOT Sk = 48; # SAKOT

3
src/hb-ot-shape-complex-use.cc
View File

@ -387,8 +387,7 @@ reorder_syllable_use (hb_buffer_t *buffer, unsigned int start, unsigned int end)
hb_glyph_info_t *info = buffer->info; hb_glyph_info_t *info = buffer->info;
#define POST_BASE_FLAGS64 (FLAG64 (USE_FM) | \ #define POST_BASE_FLAGS64 (FLAG64 (USE_FAbv) | \
FLAG64 (USE_FAbv) | \
FLAG64 (USE_FBlw) | \ FLAG64 (USE_FBlw) | \
FLAG64 (USE_FPst) | \ FLAG64 (USE_FPst) | \
FLAG64 (USE_MAbv) | \ FLAG64 (USE_MAbv) | \

7
src/hb-ot-shape-complex-use.hh
View File

@ -49,10 +49,6 @@ enum use_category_t {
USE_IND = 3, /* BASE_IND */ USE_IND = 3, /* BASE_IND */
USE_N = 4, /* BASE_NUM */ USE_N = 4, /* BASE_NUM */
USE_GB = 5, /* BASE_OTHER */ USE_GB = 5, /* BASE_OTHER */
// USE_F = 7, /* CONS_FINAL */
USE_FM = 8, /* CONS_FINAL_MOD */
// USE_M = 9, /* CONS_MED */
// USE_CM = 10, /* CONS_MOD */
USE_SUB = 11, /* CONS_SUB */ USE_SUB = 11, /* CONS_SUB */
USE_H = 12, /* HALANT */ USE_H = 12, /* HALANT */
@ -61,9 +57,6 @@ enum use_category_t {
USE_Rsv = 17, /* Reserved characters */ USE_Rsv = 17, /* Reserved characters */
USE_R = 18, /* REPHA */ USE_R = 18, /* REPHA */
USE_S = 19, /* SYM */ USE_S = 19, /* SYM */
// USE_SM = 20, /* SYM_MOD */
// USE_V = 36, /* VOWEL */
// USE_VM = 40, /* VOWEL_MOD */
USE_CS = 43, /* CONS_WITH_STACKER */ USE_CS = 43, /* CONS_WITH_STACKER */
/* https://github.com/harfbuzz/harfbuzz/issues/1102 */ /* https://github.com/harfbuzz/harfbuzz/issues/1102 */