diff options
| author | Dov Grobgeld <dov.grobgeld@gmail.com> | 2017-11-06 22:48:36 +0200 |
|---|---|---|
| committer | Dov Grobgeld <dov.grobgeld@gmail.com> | 2017-11-06 22:48:36 +0200 |
| commit | 7be4e8f87c77d0ff4bdbd1638768e8772d89f7b2 (patch) | |
| tree | 3089da23794d5c8a9cc213702a86e37422c081ae | |
| parent | 48061bdbe79fdb216e86fdc41b126f21bbe95ee4 (diff) | |
| parent | 309aae84931eb682ef21ce850b6fba834f664215 (diff) | |
| download | fribidi-7be4e8f87c77d0ff4bdbd1638768e8772d89f7b2.tar.gz | |
Merge remote-tracking branch 'fribidi/unicode-10' into unicode-10
| -rw-r--r-- | lib/fribidi-bidi.c | 12 | ||||
| -rw-r--r-- | lib/fribidi-brackets.c | 7 |
2 files changed, 11 insertions, 8 deletions
diff --git a/lib/fribidi-bidi.c b/lib/fribidi-bidi.c index e000323..1814cb5 100644 --- a/lib/fribidi-bidi.c +++ b/lib/fribidi-bidi.c @@ -858,8 +858,8 @@ fribidi_get_par_embedding_levels ( FriBidiRun *ppp_prev, *ppp_next; int iso_level; - ppp_prev = get_adjacent_run(pp, FALSE, FALSE); - ppp_next = get_adjacent_run(pp, TRUE, FALSE); + ppp_prev = get_adjacent_run(pp, false, false); + ppp_next = get_adjacent_run(pp, true, false); this_type = RL_TYPE (pp); iso_level = RL_ISOLATE_LEVEL(pp); @@ -944,8 +944,8 @@ fribidi_get_par_embedding_levels ( this_type = RL_TYPE (pp); iso_level = RL_ISOLATE_LEVEL(pp); - ppp_prev = get_adjacent_run(pp, FALSE, FALSE); - ppp_next = get_adjacent_run(pp, TRUE, FALSE); + ppp_prev = get_adjacent_run(pp, false, false); + ppp_next = get_adjacent_run(pp, true, false); if (RL_LEVEL(ppp_prev) == RL_LEVEL(pp)) prev_type = RL_TYPE(ppp_prev); @@ -1205,8 +1205,8 @@ fribidi_get_par_embedding_levels ( FriBidiCharType prev_type, this_type, next_type; FriBidiRun *ppp_prev, *ppp_next; - ppp_prev = get_adjacent_run(pp, FALSE, FALSE); - ppp_next = get_adjacent_run(pp, TRUE, FALSE); + ppp_prev = get_adjacent_run(pp, false, false); + ppp_next = get_adjacent_run(pp, true, false); /* "European and Arabic numbers are treated as though they were R" FRIBIDI_CHANGE_NUMBER_TO_RTL does this. */ diff --git a/lib/fribidi-brackets.c b/lib/fribidi-brackets.c index 8d53743..4ce35ca 100644 --- a/lib/fribidi-brackets.c +++ b/lib/fribidi-brackets.c @@ -57,9 +57,9 @@ fribidi_get_bracket ( bracket_id = 0 if the character is not a bracket. */ char_type = FRIBIDI_GET_BRACKET_TYPE (ch); - fribidi_boolean is_open = 0; + fribidi_boolean is_open = false; - if (char_type == 0) + if (char_type == 0) bracket_type.bracket_id = 0; else { @@ -87,7 +87,10 @@ fribidi_get_bracket_types ( { /* Optimization that bracket must be of types ON */ if (types[i] == FRIBIDI_TYPE_ON) + { + const FriBidiBracketType NoBracket = FRIBIDI_NO_BRACKET; *btypes = NoBracket; + } else *btypes = fribidi_get_bracket (*str); |