Skip to content

[pull] main from unicode-org:main #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Apr 9, 2026
Merged

[pull] main from unicode-org:main #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b914389
ICU-23358 Make RBNF lenient parsing of ignorables more consistent bet…
grhoten Apr 8, 2026
8be6575
ICU-23348 Fix thread safety issues with parsing and formatting in Rul…
grhoten Apr 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions icu4c/source/data/rbnf/be.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
be{
RBNFRules{
SpelloutRules{
"%%lenient-parse:"
"&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';"
"%spellout-numbering-year:"
"x.x: =0.0=;"
"0: =%spellout-numbering=;"
Expand Down
2 changes: 0 additions & 2 deletions icu4c/source/data/rbnf/bg.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ bg{
"0: =%digits-ordinal-masculine=;"
}
SpelloutRules{
"%%lenient-parse:"
"&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';"
"%spellout-numbering-year:"
"x.x: =0.0=;"
"0: =%spellout-numbering=;"
Expand Down
2 changes: 0 additions & 2 deletions icu4c/source/data/rbnf/ca.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ ca{
"0: =#,##0=es;"
}
SpelloutRules{
"%%lenient-parse:"
"&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';"
"%spellout-numbering-year:"
"x.x: =0.0=;"
"0: =%spellout-numbering=;"
Expand Down
2 changes: 0 additions & 2 deletions icu4c/source/data/rbnf/cy.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
cy{
RBNFRules{
SpelloutRules{
"%%lenient-parse:"
"& ' ' , ',' ;"
"%spellout-numbering-year:"
"x.x: =0.0=;"
"0: =%spellout-numbering=;"
Expand Down
2 changes: 0 additions & 2 deletions icu4c/source/data/rbnf/da.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
da{
RBNFRules{
SpelloutRules{
"%%lenient-parse:"
"&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';"
"%spellout-numbering-year:"
"-x: minus >>;"
"x.x: =0.0=;"
Expand Down
2 changes: 1 addition & 1 deletion icu4c/source/data/rbnf/de.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ de{
RBNFRules{
SpelloutRules{
"%%lenient-parse:"
"&ue=\u00FC&ae=\u00E4&oe=\u00F6&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';"
"&ue=\u00FC&ae=\u00E4&oe=\u00F6;"
"%spellout-numbering-year:"
"-x: minus >>;"
"x.x: =0.0=;"
Expand Down
4 changes: 0 additions & 4 deletions icu4c/source/data/rbnf/en.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,13 @@ en{
"3600/60: <#,##0<:>>>;"
"%duration:"
"0: =%in-numerals=;"
"%%lenient-parse:"
"& ':' = '.' = ' ' = '-';"
}
OrdinalRules{
"%digits-ordinal:"
"-x: \u2212>>;"
"0: =#,##0=$(ordinal,one{st}two{nd}few{rd}other{th})$;"
}
SpelloutRules{
"%%lenient-parse:"
"&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';"
"%%2d-year:"
"0: hundred;"
"1: oh-=%spellout-numbering=;"
Expand Down
2 changes: 0 additions & 2 deletions icu4c/source/data/rbnf/es.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ es{
"0: =%digits-ordinal-masculine=;"
}
SpelloutRules{
"%%lenient-parse:"
"&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';"
"%spellout-numbering-year:"
"x.x: =0.0=;"
"0: =%spellout-numbering=;"
Expand Down
2 changes: 0 additions & 2 deletions icu4c/source/data/rbnf/fo.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
fo{
RBNFRules{
SpelloutRules{
"%%lenient-parse:"
"&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';"
"%spellout-numbering-year:"
"-x: m\u00EDnus >>;"
"x.x: =0.0=;"
Expand Down
2 changes: 0 additions & 2 deletions icu4c/source/data/rbnf/fr.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ fr{
"0: =%digits-ordinal-masculine=;"
}
SpelloutRules{
"%%lenient-parse:"
"&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';"
"%spellout-numbering-year:"
"-x: moins >>;"
"x.x: =0.0=;"
Expand Down
2 changes: 0 additions & 2 deletions icu4c/source/data/rbnf/fr_BE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
fr_BE{
RBNFRules{
SpelloutRules{
"%%lenient-parse:"
"&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';"
"%spellout-numbering-year:"
"-x: moins >>;"
"x.x: =0.0=;"
Expand Down
2 changes: 0 additions & 2 deletions icu4c/source/data/rbnf/fr_CH.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
fr_CH{
RBNFRules{
SpelloutRules{
"%%lenient-parse:"
"&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';"
"%spellout-numbering-year:"
"-x: moins >>;"
"x.x: =0.0=;"
Expand Down
4 changes: 0 additions & 4 deletions icu4c/source/data/rbnf/ga.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,13 @@ ga{
"3600/60: <#,##0<:>>>;"
"%duration:"
"0: =%in-numerals=;"
"%%lenient-parse:"
"& ':' = '.' = ' ' = '-';"
}
OrdinalRules{
"%digits-ordinal:"
"-x: \u2212>>;"
"0: =#,##0=\u00FA;"
}
SpelloutRules{
"%%lenient-parse:"
"& ' ' , ',' ;"
"%spellout-numbering-year:"
"-x: m\u00EDneas >>;"
"x.x: =0.0=;"
Expand Down
2 changes: 0 additions & 2 deletions icu4c/source/data/rbnf/is.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
is{
RBNFRules{
SpelloutRules{
"%%lenient-parse:"
"&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';"
"%spellout-numbering-year:"
"-x: m\u00EDnus >>;"
"x.x: =0.0=;"
Expand Down
109 changes: 55 additions & 54 deletions icu4c/source/data/rbnf/it.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,13 @@ it{
"0: =%digits-ordinal-masculine=;"
}
SpelloutRules{
"%%lenient-parse:"
"&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';"
"%spellout-numbering-year:"
"x.x: =0.0=;"
"0: =%spellout-numbering=;"
"%spellout-numbering:"
"-x: meno >>;"
"x.x: << virgola >>;"
"Inf: infinito;"
"0: zero;"
"1: uno;"
"2: due;"
Expand Down Expand Up @@ -88,6 +87,7 @@ it{
"%spellout-cardinal-masculine:"
"-x: meno >>;"
"x.x: << virgola >>;"
"Inf: infinito;"
"0: zero;"
"1: un;"
"2: =%spellout-numbering=;"
Expand Down Expand Up @@ -143,6 +143,7 @@ it{
"%spellout-cardinal-feminine:"
"-x: meno >>;"
"x.x: << virgola >>;"
"Inf: infinita;"
"0: zero;"
"1: una;"
"2: =%spellout-numbering=;"
Expand Down Expand Up @@ -179,16 +180,16 @@ it{
"90: novant>%%ordinal-esimo-with-a>;"
"100: cent>%%ordinal-esimo-with-o>;"
"200: <%spellout-cardinal-masculine<\u00ADcent>%%ordinal-esimo-with-o>;"
"1000: mille\u00AD>%%ordinal-esimo>;"
"2000: <%spellout-cardinal-masculine<[\u00ADmila\u00AD>%%ordinal-esimo>|\u00ADmillesimo];"
"1000000: milione\u00AD>%%ordinal-esimo>;"
"2000000: <%spellout-cardinal-masculine<milione\u00AD>%%ordinal-esimo>;"
"1000000000: miliard\u00AD>%%ordinal-esimo-with-o>;"
"2000000000: <%spellout-cardinal-masculine<miliard\u00AD>%%ordinal-esimo-with-o>;"
"1000000000000: bilione\u00AD>%%ordinal-esimo>;"
"2000000000000: <%spellout-cardinal-masculine<bilion\u00AD>%%ordinal-esimo>;"
"1000000000000000: biliard\u00AD>%%ordinal-esimo-with-o>;"
"2000000000000000: <%spellout-cardinal-masculine<biliard\u00AD>%%ordinal-esimo-with-o>;"
"1000: mille>%%ordinal-esimo>;"
"2000: <%spellout-cardinal-masculine<[\u00ADmila>%%ordinal-esimo>|\u00ADmillesimo];"
"1000000: milione>%%ordinal-esimo>;"
"2000000: <%spellout-cardinal-masculine<\u00ADmilione>%%ordinal-esimo>;"
"1000000000: miliard>%%ordinal-esimo-with-o>;"
"2000000000: <%spellout-cardinal-masculine<\u00ADmiliard>%%ordinal-esimo-with-o>;"
"1000000000000: bilione>%%ordinal-esimo>;"
"2000000000000: <%spellout-cardinal-masculine<\u00ADbilion>%%ordinal-esimo>;"
"1000000000000000: biliard>%%ordinal-esimo-with-o>;"
"2000000000000000: <%spellout-cardinal-masculine<\u00ADbiliard>%%ordinal-esimo-with-o>;"
"1000000000000000000: =#,##0=;"
"%%ordinal-esimo:"
"0: simo;"
Expand All @@ -201,7 +202,7 @@ it{
"7: \u00ADsettesimo;"
"8: \u00ADottesimo;"
"9: \u00ADnovesimo;"
"10: =%spellout-ordinal-masculine=;"
"10: \u00AD=%spellout-ordinal-masculine=;"
"%%ordinal-esimo-with-i:"
"0: esimo;"
"1: \u00ADunesimo;"
Expand All @@ -213,7 +214,7 @@ it{
"7: i\u00ADsettesimo;"
"8: \u00ADottesimo;"
"9: i\u00ADnovesimo;"
"10: =%spellout-ordinal-masculine=;"
"10: \u00AD=%spellout-ordinal-masculine=;"
"%%ordinal-esimo-with-a:"
"0: esimo;"
"1: \u00ADunesimo;"
Expand All @@ -225,7 +226,7 @@ it{
"7: a\u00ADsettesimo;"
"8: \u00ADottesimo;"
"9: a\u00ADnovesimo;"
"10: =%spellout-ordinal-masculine=;"
"10: \u00AD=%spellout-ordinal-masculine=;"
"%%ordinal-esimo-with-o:"
"0: esimo;"
"1: \u00ADunesimo;"
Expand Down Expand Up @@ -271,16 +272,16 @@ it{
"90: novant>%%ordinal-esima-with-a>;"
"100: cent>%%ordinal-esima-with-o>;"
"200: <%spellout-cardinal-masculine<\u00ADcent>%%ordinal-esima-with-o>;"
"1000: mille\u00AD>%%ordinal-esima>;"
"2000: <%spellout-cardinal-masculine<[\u00ADmila\u00AD>%%ordinal-esima>|\u00ADmillesima]>;"
"1000000: milione\u00AD>%%ordinal-esima>;"
"2000000: <%spellout-cardinal-masculine<milione\u00AD>%%ordinal-esima>;"
"1000000000: miliard\u00AD>%%ordinal-esima-with-o>;"
"2000000000: <%spellout-cardinal-masculine<miliard\u00AD>%%ordinal-esima-with-o>;"
"1000000000000: bilione\u00AD>%%ordinal-esima>;"
"2000000000000: <%spellout-cardinal-masculine<bilion\u00AD>%%ordinal-esima>;"
"1000000000000000: biliard\u00AD>%%ordinal-esima-with-o>;"
"2000000000000000: <%spellout-cardinal-masculine<biliard\u00AD>%%ordinal-esima-with-o>;"
"1000: mille>%%ordinal-esima>;"
"2000: <%spellout-cardinal-masculine<[\u00ADmila>%%ordinal-esima>|\u00ADmillesima];"
"1000000: milione>%%ordinal-esima>;"
"2000000: <%spellout-cardinal-masculine<\u00ADmilione>%%ordinal-esima>;"
"1000000000: miliard>%%ordinal-esima-with-o>;"
"2000000000: <%spellout-cardinal-masculine<\u00ADmiliard>%%ordinal-esima-with-o>;"
"1000000000000: bilione>%%ordinal-esima>;"
"2000000000000: <%spellout-cardinal-masculine<\u00ADbilion>%%ordinal-esima>;"
"1000000000000000: biliard>%%ordinal-esima-with-o>;"
"2000000000000000: <%spellout-cardinal-masculine<\u00ADbiliard>%%ordinal-esima-with-o>;"
"1000000000000000000: =#,##0=;"
"%%ordinal-esima:"
"0: sima;"
Expand All @@ -293,7 +294,7 @@ it{
"7: \u00ADsettesima;"
"8: \u00ADottesima;"
"9: \u00ADnovesima;"
"10: =%spellout-ordinal-feminine=;"
"10: \u00AD=%spellout-ordinal-feminine=;"
"%%ordinal-esima-with-i:"
"0: esima;"
"1: \u00ADunesima;"
Expand All @@ -305,7 +306,7 @@ it{
"7: i\u00ADsettesima;"
"8: \u00ADottesima;"
"9: i\u00ADnovesima;"
"10: =%spellout-ordinal-feminine=;"
"10: \u00AD=%spellout-ordinal-feminine=;"
"%%ordinal-esima-with-a:"
"0: esima;"
"1: \u00ADunesima;"
Expand All @@ -317,7 +318,7 @@ it{
"7: a\u00ADsettesima;"
"8: \u00ADottesima;"
"9: a\u00ADnovesima;"
"10: =%spellout-ordinal-feminine=;"
"10: \u00AD=%spellout-ordinal-feminine=;"
"%%ordinal-esima-with-o:"
"0: esima;"
"1: \u00ADunesima;"
Expand Down Expand Up @@ -363,16 +364,16 @@ it{
"90: novant>%%ordinal-esimi-with-a>;"
"100: cent>%%ordinal-esimi-with-o>;"
"200: <%spellout-cardinal-masculine<\u00ADcent>%%ordinal-esimi-with-o>;"
"1000: mille\u00AD>%%ordinal-esimi>;"
"2000: <%spellout-cardinal-masculine<[\u00ADmila\u00AD>%%ordinal-esimi>|\u00ADmillesimi]>;"
"1000000: milione\u00AD>%%ordinal-esimi>;"
"2000000: <%spellout-cardinal-masculine<milione\u00AD>%%ordinal-esimi>;"
"1000000000: miliard\u00AD>%%ordinal-esimi-with-o>;"
"2000000000: <%spellout-cardinal-masculine<miliard\u00AD>%%ordinal-esimi-with-o>;"
"1000000000000: bilione\u00AD>%%ordinal-esimi>;"
"2000000000000: <%spellout-cardinal-masculine<bilion\u00AD>%%ordinal-esimi>;"
"1000000000000000: biliard\u00AD>%%ordinal-esimi-with-o>;"
"2000000000000000: <%spellout-cardinal-masculine<biliard\u00AD>%%ordinal-esimi-with-o>;"
"1000: mille>%%ordinal-esimi>;"
"2000: <%spellout-cardinal-masculine<[\u00ADmila>%%ordinal-esimi>|\u00ADmillesimi];"
"1000000: milione>%%ordinal-esimi>;"
"2000000: <%spellout-cardinal-masculine<\u00ADmilione>%%ordinal-esimi>;"
"1000000000: miliard>%%ordinal-esimi-with-o>;"
"2000000000: <%spellout-cardinal-masculine<\u00ADmiliard>%%ordinal-esimi-with-o>;"
"1000000000000: bilione>%%ordinal-esimi>;"
"2000000000000: <%spellout-cardinal-masculine<\u00ADbilion>%%ordinal-esimi>;"
"1000000000000000: biliard>%%ordinal-esimi-with-o>;"
"2000000000000000: <%spellout-cardinal-masculine<\u00ADbiliard>%%ordinal-esimi-with-o>;"
"1000000000000000000: =#,##0=;"
"%%ordinal-esimi:"
"0: simi;"
Expand All @@ -385,7 +386,7 @@ it{
"7: \u00ADsettesimi;"
"8: \u00ADottesimi;"
"9: \u00ADnovesimi;"
"10: =%spellout-ordinal-masculine-plural=;"
"10: \u00AD=%spellout-ordinal-masculine-plural=;"
"%%ordinal-esimi-with-i:"
"0: esimi;"
"1: \u00ADunesimi;"
Expand All @@ -397,7 +398,7 @@ it{
"7: i\u00ADsettesimi;"
"8: \u00ADottesimi;"
"9: i\u00ADnovesimi;"
"10: =%spellout-ordinal-masculine-plural=;"
"10: \u00AD=%spellout-ordinal-masculine-plural=;"
"%%ordinal-esimi-with-a:"
"0: esimi;"
"1: \u00ADunesimi;"
Expand All @@ -409,7 +410,7 @@ it{
"7: a\u00ADsettesimi;"
"8: \u00ADottesimi;"
"9: a\u00ADnovesimi;"
"10: =%spellout-ordinal-masculine-plural=;"
"10: \u00AD=%spellout-ordinal-masculine-plural=;"
"%%ordinal-esimi-with-o:"
"0: esimi;"
"1: \u00ADunesimi;"
Expand Down Expand Up @@ -455,16 +456,16 @@ it{
"90: novant>%%ordinal-esime-with-a>;"
"100: cent>%%ordinal-esime-with-o>;"
"200: <%spellout-cardinal-masculine<\u00ADcent>%%ordinal-esime-with-o>;"
"1000: mille\u00AD>%%ordinal-esime>;"
"2000: <%spellout-cardinal-masculine<[\u00ADmila\u00AD>%%ordinal-esime>|\u00ADmillesime]>;"
"1000000: milione\u00AD>%%ordinal-esime>;"
"2000000: <%spellout-cardinal-masculine<milione\u00AD>%%ordinal-esime>;"
"1000000000: miliard\u00AD>%%ordinal-esime-with-o>;"
"2000000000: <%spellout-cardinal-masculine<miliard\u00AD>%%ordinal-esime-with-o>;"
"1000000000000: bilione\u00AD>%%ordinal-esime>;"
"2000000000000: <%spellout-cardinal-masculine<bilion\u00AD>%%ordinal-esime>;"
"1000000000000000: biliard\u00AD>%%ordinal-esime-with-o>;"
"2000000000000000: <%spellout-cardinal-masculine<biliard\u00AD>%%ordinal-esime-with-o>;"
"1000: mille>%%ordinal-esime>;"
"2000: <%spellout-cardinal-masculine<[\u00ADmila>%%ordinal-esime>|\u00ADmillesime];"
"1000000: milione>%%ordinal-esime>;"
"2000000: <%spellout-cardinal-masculine<\u00ADmilione>%%ordinal-esime>;"
"1000000000: miliard>%%ordinal-esime-with-o>;"
"2000000000: <%spellout-cardinal-masculine<\u00ADmiliard>%%ordinal-esime-with-o>;"
"1000000000000: bilione>%%ordinal-esime>;"
"2000000000000: <%spellout-cardinal-masculine<\u00ADbilion>%%ordinal-esime>;"
"1000000000000000: biliard>%%ordinal-esime-with-o>;"
"2000000000000000: <%spellout-cardinal-masculine<\u00ADbiliard>%%ordinal-esime-with-o>;"
"1000000000000000000: =#,##0=;"
"%%ordinal-esime:"
"0: sime;"
Expand All @@ -477,7 +478,7 @@ it{
"7: \u00ADsettesime;"
"8: \u00ADottesime;"
"9: \u00ADnovesime;"
"10: =%spellout-ordinal-feminine-plural=;"
"10: \u00AD=%spellout-ordinal-feminine-plural=;"
"%%ordinal-esime-with-i:"
"0: esime;"
"1: \u00ADunesime;"
Expand All @@ -489,7 +490,7 @@ it{
"7: i\u00ADsettesime;"
"8: \u00ADottesime;"
"9: i\u00ADnovesime;"
"10: =%spellout-ordinal-feminine-plural=;"
"10: \u00AD=%spellout-ordinal-feminine-plural=;"
"%%ordinal-esime-with-a:"
"0: esime;"
"1: \u00ADunesime;"
Expand All @@ -501,7 +502,7 @@ it{
"7: a\u00ADsettesime;"
"8: \u00ADottesime;"
"9: a\u00ADnovesime;"
"10: =%spellout-ordinal-feminine-plural=;"
"10: \u00AD=%spellout-ordinal-feminine-plural=;"
"%%ordinal-esime-with-o:"
"0: esime;"
"1: \u00ADunesime;"
Expand Down
Loading