X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/0f5d89e82340278ed3d7d50029f37cab2c41a57e..HEAD:/icuSources/data/brkitr/rules/word_POSIX.txt diff --git a/icuSources/data/brkitr/rules/word_POSIX.txt b/icuSources/data/brkitr/rules/word_POSIX.txt index 79126931..73ddc8dc 100644 --- a/icuSources/data/brkitr/rules/word_POSIX.txt +++ b/icuSources/data/brkitr/rules/word_POSIX.txt @@ -8,9 +8,7 @@ # # ICU Word Break Rules, POSIX locale. # See Unicode Standard Annex #29. -# These rules are based on UAX #29 Revision 29 for Unicode Version 9.0 -# with additions for Emoji Sequences from https://goo.gl/cluFCn -# Plus additional characters introduces with Emoji 5, http://www.unicode.org/reports/tr51/proposed.html +# These rules are based on UAX #29 Revision 34 for Unicode Version 12.0 # # Note: Updates to word.txt will usually need to be merged into # word_POSIX.txt also. @@ -29,10 +27,12 @@ # Character Class Definitions. # +$Han = [:Han:]; + $CR = [\p{Word_Break = CR}]; $LF = [\p{Word_Break = LF}]; -$Newline = [\p{Word_Break = Newline} ]; -$Extend = [\p{Word_Break = Extend}]; +$Newline = [\p{Word_Break = Newline}]; +$Extend = [\p{Word_Break = Extend}-$Han]; $ZWJ = [\p{Word_Break = ZWJ}]; $Regional_Indicator = [\p{Word_Break = Regional_Indicator}]; $Format = [\p{Word_Break = Format}]; @@ -47,10 +47,10 @@ $MidNum = [\p{Word_Break = MidNum} [.]]; $Numeric = [\p{Word_Break = Numeric}]; $ExtendNumLet = [\p{Word_Break = ExtendNumLet}]; $WSegSpace = [\p{Word_Break = WSegSpace}]; -$Extended_Pict = [:ExtPict:]; +$Extended_Pict = [\p{Extended_Pictographic}]; -$Han = [:Han:]; $Hiragana = [:Hiragana:]; +$Ideographic = [\p{Ideographic}]; # Dictionary character set, for triggering language-based break engines. Currently @@ -65,38 +65,20 @@ $KanaKanji = [$Han $Hiragana $Katakana]; $dictionaryCJK = [$KanaKanji $HangulSyllable]; $dictionary = [$ComplexContext $dictionaryCJK]; +# TODO: check if handling of katakana in dictionary makes rules incorrect/void + # leave CJK scripts out of ALetterPlus $ALetterPlus = [$ALetter-$dictionaryCJK [$ComplexContext-$Extend-$Control]]; -# -# Rules 4 Ignore Format and Extend characters, -# except when they appear at the beginning of a region of text. -# -# TODO: check if handling of katakana in dictionary makes rules incorrect/void -$KatakanaEx = $Katakana ($Extend | $Format | $ZWJ)*; -$Hebrew_LetterEx = $Hebrew_Letter ($Extend | $Format | $ZWJ)*; -$ALetterEx = $ALetterPlus ($Extend | $Format | $ZWJ)*; -$Single_QuoteEx = $Single_Quote ($Extend | $Format | $ZWJ)*; -$Double_QuoteEx = $Double_Quote ($Extend | $Format | $ZWJ)*; -$MidNumLetEx = $MidNumLet ($Extend | $Format | $ZWJ)*; -$MidLetterEx = $MidLetter ($Extend | $Format | $ZWJ)*; -$MidNumEx = $MidNum ($Extend | $Format | $ZWJ)*; -$NumericEx = $Numeric ($Extend | $Format | $ZWJ)*; -$ExtendNumLetEx = $ExtendNumLet ($Extend | $Format | $ZWJ)*; -$Regional_IndicatorEx = $Regional_Indicator ($Extend | $Format | $ZWJ)*; - -$Ideographic = [\p{Ideographic}]; -$HiraganaEx = $Hiragana ($Extend | $Format | $ZWJ)*; -$IdeographicEx = $Ideographic ($Extend | $Format | $ZWJ)*; - ## ------------------------------------------------- # Rule 3 - CR x LF # $CR $LF; -# Rule 3c ZWJ x (Extended_Pict | EmojiNRK). Precedes WB4, so no intervening Extend chars allowed. +# Rule 3c Do not break within emoji zwj sequences. +# ZWJ × \p{Extended_Pictographic}. Precedes WB4, so no intervening Extend chars allowed. # $ZWJ $Extended_Pict; @@ -105,78 +87,81 @@ $ZWJ $Extended_Pict; $WSegSpace $WSegSpace; # Rule 4 - ignore Format and Extend characters, except when they appear at the beginning -# of a region of Text. The rule here comes into play when the start of text -# begins with a group of Format chars, or with a "word" consisting of a single -# char that is not in any of the listed word break categories followed by -# format char(s), or is not a CJK dictionary character. -[^$CR $LF $Newline]? ($Extend | $Format | $ZWJ)+; - -$NumericEx {100}; -$ALetterEx {200}; -$HangulSyllable {200}; -$Hebrew_LetterEx{200}; -$KatakanaEx {400}; # note: these status values override those from rule 5 -$HiraganaEx {400}; # by virtue of being numerically larger. -$IdeographicEx {400}; # +# of a region of Text. + +$ExFm = [$Extend $Format $ZWJ]; -$Extended_Pict ($Extend | $Format | $ZWJ)*; +^$ExFm+; # This rule fires only when there are format or extend characters at the + # start of text, or immediately following another boundary. It groups them, in + # the event there are more than one. + +[^$CR $LF $Newline $ExFm] $ExFm*; # This rule rule attaches trailing format/extends to words, + # with no special rule status value. + +$Numeric $ExFm* {100}; # This group of rules also attach trailing format/extends, but +$ALetterPlus $ExFm* {200}; # with rule status set based on the word's final base character. +$HangulSyllable {200}; +$Hebrew_Letter $ExFm* {200}; +$Katakana $ExFm* {400}; # note: these status values override those from rule 5 +$Hiragana $ExFm* {400}; # by virtue of being numerically larger. +$Ideographic $ExFm* {400}; # # # rule 5 # Do not break between most letters. # -($ALetterEx | $Hebrew_LetterEx) ($ALetterEx | $Hebrew_LetterEx) {200}; +($ALetterPlus | $Hebrew_Letter) $ExFm* ($ALetterPlus | $Hebrew_Letter); # rule 6 and 7 -($ALetterEx | $Hebrew_LetterEx) ($MidLetterEx | $MidNumLetEx | $Single_QuoteEx) ($ALetterEx | $Hebrew_LetterEx) {200}; +($ALetterPlus | $Hebrew_Letter) $ExFm* ($MidLetter | $MidNumLet | $Single_Quote) $ExFm* ($ALetterPlus | $Hebrew_Letter) {200}; # rule 7a -$Hebrew_LetterEx $Single_QuoteEx {200}; +$Hebrew_Letter $ExFm* $Single_Quote {200}; # rule 7b and 7c -$Hebrew_LetterEx $Double_QuoteEx $Hebrew_LetterEx {200}; +$Hebrew_Letter $ExFm* $Double_Quote $ExFm* $Hebrew_Letter; # rule 8 -$NumericEx $NumericEx {100}; +$Numeric $ExFm* $Numeric; # rule 9 -($ALetterEx | $Hebrew_LetterEx) $NumericEx {200}; +($ALetterPlus | $Hebrew_Letter) $ExFm* $Numeric; # rule 10 -$NumericEx ($ALetterEx | $Hebrew_LetterEx) {200}; +$Numeric $ExFm* ($ALetterPlus | $Hebrew_Letter); # rule 11 and 12 -$NumericEx ($MidNumEx | $MidNumLetEx | $Single_QuoteEx) $NumericEx {100}; +$Numeric $ExFm* ($MidNum | $MidNumLet | $Single_Quote) $ExFm* $Numeric; # rule 13 # to be consistent with $KanaKanji $KanaKanhi, changed # from 300 to 400. # See also TestRuleStatus in intltest/rbbiapts.cpp -$KatakanaEx $KatakanaEx {400}; +$Katakana $ExFm* $Katakana {400}; # rule 13a/b -$ALetterEx $ExtendNumLetEx {200}; # (13a) -$Hebrew_LetterEx $ExtendNumLetEx {200}; # (13a) -$NumericEx $ExtendNumLetEx {100}; # (13a) -$KatakanaEx $ExtendNumLetEx {400}; # (13a) -$ExtendNumLetEx $ExtendNumLetEx {200}; # (13a) +$ALetterPlus $ExFm* $ExtendNumLet {200}; # (13a) +$Hebrew_Letter $ExFm* $ExtendNumLet {200}; # (13a) +$Numeric $ExFm* $ExtendNumLet {100}; # (13a) +$Katakana $ExFm* $ExtendNumLet {400}; # (13a) +$ExtendNumLet $ExFm* $ExtendNumLet {200}; # (13a) -$ExtendNumLetEx $ALetterEx {200}; # (13b) -$ExtendNumLetEx $Hebrew_Letter {200}; # (13b) -$ExtendNumLetEx $NumericEx {100}; # (13b) -$ExtendNumLetEx $KatakanaEx {400}; # (13b) +$ExtendNumLet $ExFm* $ALetterPlus {200}; # (13b) +$ExtendNumLet $ExFm* $Hebrew_Letter {200}; # (13b) +$ExtendNumLet $ExFm* $Numeric {100}; # (13b) +$ExtendNumLet $ExFm* $Katakana {400}; # (13b) # rules 15 - 17 # Pairs of Regional Indicators stay together. -# With rule chaining disabled by ^, this rule will match exactly two of them. +# With incoming rule chaining disabled by ^, this rule will match exactly two of them. # No other rule begins with a Regional_Indicator, so chaining cannot extend the match. # -^$Regional_IndicatorEx $Regional_IndicatorEx; +^$Regional_Indicator $ExFm* $Regional_Indicator; # special handling for CJK characters: chain for later dictionary segmentation $HangulSyllable $HangulSyllable {200};