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

[indic-generator] Move INDIC_COMBINE_CATEGORIES here

This commit is contained in:
Behdad Esfahbod 2022-06-10 06:20:10 -06:00
parent b030dd9e88
commit 165ef55e57
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gen-indic-table.py
View File

@ -553,6 +553,8 @@ for s in what_short:
print () print ()
print ('#pragma GCC diagnostic pop') print ('#pragma GCC diagnostic pop')
print () print ()
print ("#define INDIC_COMBINE_CATEGORIES(S,M) ((S) | ((M) << 8))")
print ()
print ("#define _(S,M) INDIC_COMBINE_CATEGORIES (%s_##S, %s_##M)" % tuple(what_short)) print ("#define _(S,M) INDIC_COMBINE_CATEGORIES (%s_##S, %s_##M)" % tuple(what_short))
print () print ()
print () print ()
@ -648,6 +650,7 @@ print (" return _(X,X);")
print ("}") print ("}")
print () print ()
print ("#undef _") print ("#undef _")
print ("#undef INDIC_COMBINE_CATEGORIES")
for i in range (2): for i in range (2):
print () print ()
vv = sorted (values[i].keys ()) vv = sorted (values[i].keys ())

3
src/hb-ot-shaper-indic-table.cc
View File

@ -74,6 +74,8 @@
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#define INDIC_COMBINE_CATEGORIES(S,M) ((S) | ((M) << 8))
#define _(S,M) INDIC_COMBINE_CATEGORIES (_OT_##S, _POS_##M) #define _(S,M) INDIC_COMBINE_CATEGORIES (_OT_##S, _POS_##M)
@ -482,6 +484,7 @@ hb_indic_get_categories (hb_codepoint_t u)
} }
#undef _ #undef _
#undef INDIC_COMBINE_CATEGORIES
#undef _OT_A #undef _OT_A
#undef _OT_As #undef _OT_As

2
src/hb-ot-shaper-indic.hh
View File

@ -133,8 +133,6 @@ enum ot_position_t {
}; };
#define INDIC_COMBINE_CATEGORIES(S,M) ((S) | ((M) << 8))
HB_INTERNAL uint16_t HB_INTERNAL uint16_t
hb_indic_get_categories (hb_codepoint_t u); hb_indic_get_categories (hb_codepoint_t u);