Skip to content

Commit

Permalink
ICU-22360 revert portions of #2159 which included @ in ALetter for wo…
Browse files Browse the repository at this point in the history 
…rdbreak, update tests
  • Loading branch information
@pedberg-icu
pedberg-icu committed May 7, 2023
1 parent 530ca98 commit 5618203
Show file tree
Hide file tree
Showing 15 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion icu4c/source/data/brkitr/rules/word.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ $Regional_Indicator = [\p{Word_Break = Regional_Indicator}];
$Format = [\p{Word_Break = Format}];
$Katakana = [\p{Word_Break = Katakana}];
$Hebrew_Letter = [\p{Word_Break = Hebrew_Letter}];
$ALetter = [\p{Word_Break = ALetter} @];
$ALetter = [\p{Word_Break = ALetter}];
$Single_Quote = [\p{Word_Break = Single_Quote}];
$Double_Quote = [\p{Word_Break = Double_Quote}];
$MidNumLet = [\p{Word_Break = MidNumLet}];
Expand Down
2 changes: 1 addition & 1 deletion icu4c/source/data/brkitr/rules/word_POSIX.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ $Regional_Indicator = [\p{Word_Break = Regional_Indicator}];
$Format = [\p{Word_Break = Format}];
$Katakana = [\p{Word_Break = Katakana}];
$Hebrew_Letter = [\p{Word_Break = Hebrew_Letter}];
$ALetter = [\p{Word_Break = ALetter} @];
$ALetter = [\p{Word_Break = ALetter}];
$Single_Quote = [\p{Word_Break = Single_Quote}];
$Double_Quote = [\p{Word_Break = Double_Quote}];
$MidNumLet = [\p{Word_Break = MidNumLet} - [.]];
Expand Down
2 changes: 1 addition & 1 deletion icu4c/source/data/brkitr/rules/word_fi_sv.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ $Regional_Indicator = [\p{Word_Break = Regional_Indicator}];
$Format = [\p{Word_Break = Format}];
$Katakana = [\p{Word_Break = Katakana}];
$Hebrew_Letter = [\p{Word_Break = Hebrew_Letter}];
$ALetter = [\p{Word_Break = ALetter} @];
$ALetter = [\p{Word_Break = ALetter}];
$Single_Quote = [\p{Word_Break = Single_Quote}];
$Double_Quote = [\p{Word_Break = Double_Quote}];
$MidNumLet = [\p{Word_Break = MidNumLet}];
Expand Down
2 changes: 1 addition & 1 deletion icu4c/source/test/intltest/rbbitst.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1937,7 +1937,7 @@ RBBIWordMonkey::RBBIWordMonkey()
fKatakanaSet = new UnicodeSet(u"[\\p{Word_Break = Katakana}]", status);
fRegionalIndicatorSet = new UnicodeSet(u"[\\p{Word_Break = Regional_Indicator}]", status);
fHebrew_LetterSet = new UnicodeSet(u"[\\p{Word_Break = Hebrew_Letter}]", status);
fALetterSet = new UnicodeSet(u"[\\p{Word_Break = ALetter} @]", status);
fALetterSet = new UnicodeSet(u"[\\p{Word_Break = ALetter}]", status);
fSingle_QuoteSet = new UnicodeSet(u"[\\p{Word_Break = Single_Quote}]", status);
fDouble_QuoteSet = new UnicodeSet(u"[\\p{Word_Break = Double_Quote}]", status);
fMidNumLetSet = new UnicodeSet(u"[\\p{Word_Break = MidNumLet}]", status);
Expand Down
2 changes: 1 addition & 1 deletion icu4c/source/test/testdata/break_rules/word.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Regional_Indicator = [\p{Word_Break = Regional_Indicator}];
Format = [\p{Word_Break = Format}];
Katakana = [\p{Word_Break = Katakana}];
Hebrew_Letter = [\p{Word_Break = Hebrew_Letter}];
ALetter = [\p{Word_Break = ALetter} @];
ALetter = [\p{Word_Break = ALetter}];
Single_Quote = [\p{Word_Break = Single_Quote}];
Double_Quote = [\p{Word_Break = Double_Quote}];
MidNumLet = [\p{Word_Break = MidNumLet}];
Expand Down
8 changes: 4 additions & 4 deletions icu4c/source/test/testdata/rbbitst.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1586,29 +1586,29 @@ Bangkok)•</data>
<data>•Can't<200> •have<200> •breaks<200> •in<200> •xx<200>:•yy<200> •or<200> •struct.field<200> \
•for<200> •CS<200>-•types<200>.•</data>
<data>•\uFF92\uFF76\uFF9E<400> •</data>
<data>•xx@yy<200>.•</data>
<data>•xx<200>@•yy<200>.•</data>

<locale en_US_POSIX>
<word>
<data>•Can't<200> •have<200> •breaks<200> •in<200> •xx<200>:•yy<200> •or<200> •struct<200>.•field<200> \
•for<200> •CS<200>-•types<200>.•</data>
<data>•\u06c9<200>\uc799\ufffa•</data>
<data>•\uFF92\uFF76\uFF9E<400> •</data>
<data>•xx@yy<200>.•</data>
<data>•xx<200>@•yy<200>.•</data>

<locale fi>
<word>
<data>•Can't<200> •have<200> •breaks<200> •in<200> •xx:yy<200> •or<200> •struct.field<200> \
•for<200> •CS<200>-•types<200>.•</data>
<data>•\uFF92\uFF76\uFF9E<400> •</data>
<data>•xx@yy<200>.•</data>
<data>•xx<200>@•yy<200>.•</data>

<locale sv>
<word>
<data>•Can't<200> •have<200> •breaks<200> •in<200> •xx:yy<200> •or<200> •struct.field<200> \
•for<200> •CS<200>-•types<200>.•</data>
<data>•\uFF92\uFF76\uFF9E<400> •</data>
<data>•xx@yy<200>.•</data>
<data>•xx<200>@•yy<200>.•</data>


# UBreakIteratorType UBRK_CHARACTER, Locale "th"
Expand Down
4 changes: 2 additions & 2 deletions icu4j/main/shared/data/icudata.jar
View file
Git LFS file not shown
2 changes: 1 addition & 1 deletion icu4j/main/shared/data/icutzdata.jar
View file
Git LFS file not shown
2 changes: 1 addition & 1 deletion icu4j/main/shared/data/testdata.jar
View file
Git LFS file not shown
2 changes: 1 addition & 1 deletion icu4j/main/tests/core/src/com/ibm/icu/dev/test/rbbi/RBBITestMonkey.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ static class RBBIWordMonkey extends RBBIMonkeyKind {
fRegionalIndicatorSet = new UnicodeSet("[\\p{Word_Break = Regional_Indicator}]");
fKatakanaSet = new UnicodeSet("[\\p{Word_Break = Katakana}]");
fHebrew_LetterSet = new UnicodeSet("[\\p{Word_Break = Hebrew_Letter}]");
fALetterSet = new UnicodeSet("[\\p{Word_Break = ALetter} @]");
fALetterSet = new UnicodeSet("[\\p{Word_Break = ALetter}]");
fSingle_QuoteSet = new UnicodeSet("[\\p{Word_Break = Single_Quote}]");
fDouble_QuoteSet = new UnicodeSet("[\\p{Word_Break = Double_Quote}]");
fMidNumLetSet = new UnicodeSet("[\\p{Word_Break = MidNumLet}]");
Expand Down
2 changes: 1 addition & 1 deletion icu4j/main/tests/core/src/com/ibm/icu/dev/test/rbbi/break_rules/word.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Regional_Indicator = [\p{Word_Break = Regional_Indicator}];
Format = [\p{Word_Break = Format}];
Katakana = [\p{Word_Break = Katakana}];
Hebrew_Letter = [\p{Word_Break = Hebrew_Letter}];
ALetter = [\p{Word_Break = ALetter} @];
ALetter = [\p{Word_Break = ALetter}];
Single_Quote = [\p{Word_Break = Single_Quote}];
Double_Quote = [\p{Word_Break = Double_Quote}];
MidNumLet = [\p{Word_Break = MidNumLet}];
Expand Down
8 changes: 4 additions & 4 deletions icu4j/main/tests/core/src/com/ibm/icu/dev/test/rbbi/rbbitst.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1586,29 +1586,29 @@ Bangkok)•</data>
<data>•Can't<200> •have<200> •breaks<200> •in<200> •xx<200>:•yy<200> •or<200> •struct.field<200> \
•for<200> •CS<200>-•types<200>.•</data>
<data>•\uFF92\uFF76\uFF9E<400> •</data>
<data>•xx@yy<200>.•</data>
<data>•xx<200>@•yy<200>.•</data>

<locale en_US_POSIX>
<word>
<data>•Can't<200> •have<200> •breaks<200> •in<200> •xx<200>:•yy<200> •or<200> •struct<200>.•field<200> \
•for<200> •CS<200>-•types<200>.•</data>
<data>•\u06c9<200>\uc799\ufffa•</data>
<data>•\uFF92\uFF76\uFF9E<400> •</data>
<data>•xx@yy<200>.•</data>
<data>•xx<200>@•yy<200>.•</data>

<locale fi>
<word>
<data>•Can't<200> •have<200> •breaks<200> •in<200> •xx:yy<200> •or<200> •struct.field<200> \
•for<200> •CS<200>-•types<200>.•</data>
<data>•\uFF92\uFF76\uFF9E<400> •</data>
<data>•xx@yy<200>.•</data>
<data>•xx<200>@•yy<200>.•</data>

<locale sv>
<word>
<data>•Can't<200> •have<200> •breaks<200> •in<200> •xx:yy<200> •or<200> •struct.field<200> \
•for<200> •CS<200>-•types<200>.•</data>
<data>•\uFF92\uFF76\uFF9E<400> •</data>
<data>•xx@yy<200>.•</data>
<data>•xx<200>@•yy<200>.•</data>


# UBreakIteratorType UBRK_CHARACTER, Locale "th"
Expand Down
Binary file modified ...d/maven-icu4j-datafiles/src/main/resources/com/ibm/icu/impl/data/icudt73b/brkitr/word.brk
View file
Binary file not shown.
Binary file modified ...n-icu4j-datafiles/src/main/resources/com/ibm/icu/impl/data/icudt73b/brkitr/word_POSIX.brk
View file
Binary file not shown.
Binary file modified ...n-icu4j-datafiles/src/main/resources/com/ibm/icu/impl/data/icudt73b/brkitr/word_fi_sv.brk
View file
Binary file not shown.

0 comments on commit 5618203

Please # to comment.