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

[syllabic] Use a buffer scratch-flag for has-broken-syllable

This commit is contained in:
Behdad Esfahbod 2022-06-10 07:48:39 -06:00
parent 6997d10bc0
commit 148283d0e0
10 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/hb-buffer.hh
View File

@ -70,6 +70,7 @@ enum hb_buffer_scratch_flags_t {
HB_BUFFER_SCRATCH_FLAG_HAS_GPOS_ATTACHMENT = 0x00000008u, HB_BUFFER_SCRATCH_FLAG_HAS_GPOS_ATTACHMENT = 0x00000008u,
HB_BUFFER_SCRATCH_FLAG_HAS_CGJ = 0x00000010u, HB_BUFFER_SCRATCH_FLAG_HAS_CGJ = 0x00000010u,
HB_BUFFER_SCRATCH_FLAG_HAS_GLYPH_FLAGS = 0x00000020u, HB_BUFFER_SCRATCH_FLAG_HAS_GLYPH_FLAGS = 0x00000020u,
HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE = 0x00000040u,
/* Reserved for shapers' internal use. */ /* Reserved for shapers' internal use. */
HB_BUFFER_SCRATCH_FLAG_SHAPER0 = 0x01000000u, HB_BUFFER_SCRATCH_FLAG_SHAPER0 = 0x01000000u,

6
src/hb-ot-shaper-indic-machine.hh
View File

@ -498,7 +498,7 @@ _eof_trans:
break; break;
case 15: case 15:
#line 98 "hb-ot-shaper-indic-machine.rl" #line 98 "hb-ot-shaper-indic-machine.rl"
{te = p;p--;{ found_syllable (indic_broken_cluster); }} {te = p;p--;{ found_syllable (indic_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }}
break; break;
case 16: case 16:
#line 99 "hb-ot-shaper-indic-machine.rl" #line 99 "hb-ot-shaper-indic-machine.rl"
@ -522,7 +522,7 @@ _eof_trans:
break; break;
case 4: case 4:
#line 98 "hb-ot-shaper-indic-machine.rl" #line 98 "hb-ot-shaper-indic-machine.rl"
{{p = ((te))-1;}{ found_syllable (indic_broken_cluster); }} {{p = ((te))-1;}{ found_syllable (indic_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }}
break; break;
case 6: case 6:
#line 1 "NONE" #line 1 "NONE"
@ -531,7 +531,7 @@ _eof_trans:
{{p = ((te))-1;} found_syllable (indic_consonant_syllable); } {{p = ((te))-1;} found_syllable (indic_consonant_syllable); }
break; break;
case 5: case 5:
{{p = ((te))-1;} found_syllable (indic_broken_cluster); } {{p = ((te))-1;} found_syllable (indic_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }
break; break;
case 6: case 6:
{{p = ((te))-1;} found_syllable (indic_non_indic_cluster); } {{p = ((te))-1;} found_syllable (indic_non_indic_cluster); }

2
src/hb-ot-shaper-indic-machine.rl
View File

@ -95,7 +95,7 @@ main := |*
vowel_syllable => { found_syllable (indic_vowel_syllable); }; vowel_syllable => { found_syllable (indic_vowel_syllable); };
standalone_cluster => { found_syllable (indic_standalone_cluster); }; standalone_cluster => { found_syllable (indic_standalone_cluster); };
symbol_cluster => { found_syllable (indic_symbol_cluster); }; symbol_cluster => { found_syllable (indic_symbol_cluster); };
broken_cluster => { found_syllable (indic_broken_cluster); }; broken_cluster => { found_syllable (indic_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; };
other => { found_syllable (indic_non_indic_cluster); }; other => { found_syllable (indic_non_indic_cluster); };
*|; *|;

6
src/hb-ot-shaper-khmer-machine.hh
View File

@ -324,7 +324,7 @@ _eof_trans:
break; break;
case 12: case 12:
#line 81 "hb-ot-shaper-khmer-machine.rl" #line 81 "hb-ot-shaper-khmer-machine.rl"
{te = p;p--;{ found_syllable (khmer_broken_cluster); }} {te = p;p--;{ found_syllable (khmer_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }}
break; break;
case 11: case 11:
#line 82 "hb-ot-shaper-khmer-machine.rl" #line 82 "hb-ot-shaper-khmer-machine.rl"
@ -336,13 +336,13 @@ _eof_trans:
break; break;
case 5: case 5:
#line 81 "hb-ot-shaper-khmer-machine.rl" #line 81 "hb-ot-shaper-khmer-machine.rl"
{{p = ((te))-1;}{ found_syllable (khmer_broken_cluster); }} {{p = ((te))-1;}{ found_syllable (khmer_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }}
break; break;
case 3: case 3:
#line 1 "NONE" #line 1 "NONE"
{ switch( act ) { { switch( act ) {
case 2: case 2:
{{p = ((te))-1;} found_syllable (khmer_broken_cluster); } {{p = ((te))-1;} found_syllable (khmer_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }
break; break;
case 3: case 3:
{{p = ((te))-1;} found_syllable (khmer_non_khmer_cluster); } {{p = ((te))-1;} found_syllable (khmer_non_khmer_cluster); }

2
src/hb-ot-shaper-khmer-machine.rl
View File

@ -78,7 +78,7 @@ other = any;
main := |* main := |*
consonant_syllable => { found_syllable (khmer_consonant_syllable); }; consonant_syllable => { found_syllable (khmer_consonant_syllable); };
broken_cluster => { found_syllable (khmer_broken_cluster); }; broken_cluster => { found_syllable (khmer_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; };
other => { found_syllable (khmer_non_khmer_cluster); }; other => { found_syllable (khmer_non_khmer_cluster); };
*|; *|;

4
src/hb-ot-shaper-myanmar-machine.hh
View File

@ -435,7 +435,7 @@ _eof_trans:
break; break;
case 8: case 8:
#line 97 "hb-ot-shaper-myanmar-machine.rl" #line 97 "hb-ot-shaper-myanmar-machine.rl"
{te = p+1;{ found_syllable (myanmar_broken_cluster); }} {te = p+1;{ found_syllable (myanmar_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }}
break; break;
case 3: case 3:
#line 98 "hb-ot-shaper-myanmar-machine.rl" #line 98 "hb-ot-shaper-myanmar-machine.rl"
@ -447,7 +447,7 @@ _eof_trans:
break; break;
case 7: case 7:
#line 97 "hb-ot-shaper-myanmar-machine.rl" #line 97 "hb-ot-shaper-myanmar-machine.rl"
{te = p;p--;{ found_syllable (myanmar_broken_cluster); }} {te = p;p--;{ found_syllable (myanmar_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }}
break; break;
case 9: case 9:
#line 98 "hb-ot-shaper-myanmar-machine.rl" #line 98 "hb-ot-shaper-myanmar-machine.rl"

2
src/hb-ot-shaper-myanmar-machine.rl
View File

@ -94,7 +94,7 @@ main := |*
consonant_syllable => { found_syllable (myanmar_consonant_syllable); }; consonant_syllable => { found_syllable (myanmar_consonant_syllable); };
j => { found_syllable (myanmar_non_myanmar_cluster); }; j => { found_syllable (myanmar_non_myanmar_cluster); };
punctuation_cluster => { found_syllable (myanmar_punctuation_cluster); }; punctuation_cluster => { found_syllable (myanmar_punctuation_cluster); };
broken_cluster => { found_syllable (myanmar_broken_cluster); }; broken_cluster => { found_syllable (myanmar_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; };
other => { found_syllable (myanmar_non_myanmar_cluster); }; other => { found_syllable (myanmar_non_myanmar_cluster); };
*|; *|;

15
src/hb-ot-shaper-syllabic.cc
View File

@ -39,22 +39,9 @@ hb_syllabic_insert_dotted_circles (hb_font_t *font,
{ {
if (unlikely (buffer->flags & HB_BUFFER_FLAG_DO_NOT_INSERT_DOTTED_CIRCLE)) if (unlikely (buffer->flags & HB_BUFFER_FLAG_DO_NOT_INSERT_DOTTED_CIRCLE))
return; return;
if (likely (!(buffer->scratch_flags & HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE)))
/* Note: This loop is extra overhead, but should not be measurable.
* TODO Use a buffer scratch flag to remove the loop. */
bool has_broken_syllables = false;
unsigned int count = buffer->len;
hb_glyph_info_t *info = buffer->info;
for (unsigned int i = 0; i < count; i++)
if ((info[i].syllable() & 0x0F) == broken_syllable_type)
{
has_broken_syllables = true;
break;
}
if (likely (!has_broken_syllables))
return; return;
hb_codepoint_t dottedcircle_glyph; hb_codepoint_t dottedcircle_glyph;
if (!font->get_nominal_glyph (0x25CCu, &dottedcircle_glyph)) if (!font->get_nominal_glyph (0x25CCu, &dottedcircle_glyph))
return; return;

4
src/hb-ot-shaper-use-machine.hh
View File

@ -753,7 +753,7 @@ _eof_trans:
break; break;
case 4: case 4:
#line 176 "hb-ot-shaper-use-machine.rl" #line 176 "hb-ot-shaper-use-machine.rl"
{te = p+1;{ found_syllable (use_broken_cluster); }} {te = p+1;{ found_syllable (use_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }}
break; break;
case 3: case 3:
#line 177 "hb-ot-shaper-use-machine.rl" #line 177 "hb-ot-shaper-use-machine.rl"
@ -785,7 +785,7 @@ _eof_trans:
break; break;
case 15: case 15:
#line 176 "hb-ot-shaper-use-machine.rl" #line 176 "hb-ot-shaper-use-machine.rl"
{te = p;p--;{ found_syllable (use_broken_cluster); }} {te = p;p--;{ found_syllable (use_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }}
break; break;
case 16: case 16:
#line 177 "hb-ot-shaper-use-machine.rl" #line 177 "hb-ot-shaper-use-machine.rl"

2
src/hb-ot-shaper-use-machine.rl
View File

@ -173,7 +173,7 @@ main := |*
numeral_cluster => { found_syllable (use_numeral_cluster); }; numeral_cluster => { found_syllable (use_numeral_cluster); };
symbol_cluster => { found_syllable (use_symbol_cluster); }; symbol_cluster => { found_syllable (use_symbol_cluster); };
hieroglyph_cluster => { found_syllable (use_hieroglyph_cluster); }; hieroglyph_cluster => { found_syllable (use_hieroglyph_cluster); };
broken_cluster => { found_syllable (use_broken_cluster); }; broken_cluster => { found_syllable (use_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; };
other => { found_syllable (use_non_cluster); }; other => { found_syllable (use_non_cluster); };
*|; *|;