mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-09 14:50:05 +00:00
Update sv_SE to treate 'W' as a distinct character (Bug 25036)
The 13th edition of Svenska Akademiens ordlista lists 'W' as a distinct letter that sorts after 'V'. We adjust the sv_SE locale (and tests) to match this updated and "reformed" language change. This harmonizes us with CLDR 1.5.0 (2007) for sv_SE sorting of the letter 'W'. No regressions on x86_64, and locale sorting tests all pass. Co-authored-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
parent
395be7c218
commit
ebde2baeb5
@ -61,22 +61,25 @@ LC_COLLATE
|
|||||||
copy "iso14651_t1"
|
copy "iso14651_t1"
|
||||||
|
|
||||||
% CLDR collation rules for Swedish:
|
% CLDR collation rules for Swedish:
|
||||||
% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/sv.xml)
|
% (https://github.com/unicode-org/cldr/blob/master/common/collation/sv.xml)
|
||||||
%
|
%
|
||||||
% <collation type="standard">
|
% We use the new "reformed" rules from the 13th edition of Svenska Akademiens
|
||||||
|
% ordlista where 'W' is considered a distinct character sorting after 'V'.
|
||||||
|
% This matches CLDR 1.5.0 released in 2007.
|
||||||
|
%
|
||||||
|
% <defaultCollation>reformed</defaultCollation>
|
||||||
|
% <collation type="reformed">
|
||||||
% <cr><![CDATA[
|
% <cr><![CDATA[
|
||||||
% &D<<đ<<<Đ<<ð<<<Ð
|
% &D<<đ<<<Đ<<ð<<<Ð
|
||||||
% &t<<<þ/h
|
% &t<<<þ/h
|
||||||
% &T<<<Þ/H
|
% &T<<<Þ/H
|
||||||
% &v<<<V<<w<<<W
|
|
||||||
% &Y<<ü<<<Ü<<ű<<<Ű
|
% &Y<<ü<<<Ü<<ű<<<Ű
|
||||||
% &[before 1]ǀ<å<<<Å<ä<<<Ä<<æ<<<Æ<<ę<<<Ę<ö<<<Ö<<ø<<<Ø<<ő<<<Ő<<œ<<<Œ<<ô<<<Ô
|
% &[before 1]ǀ<å<<<Å<ä<<<Ä<<æ<<<Æ<<ę<<<Ę<ö<<<Ö<<ø<<<Ø<<ő<<<Ő<<œ<<<Œ<<ô<<<Ô
|
||||||
% ]]></cr>
|
% ]]></cr>
|
||||||
% </collation>
|
% </collation>
|
||||||
%
|
%
|
||||||
% And CLDR also lists the following
|
% And CLDR also lists the following index characters:
|
||||||
% index characters:
|
% (https://github.com/unicode-org/cldr/blob/master/common/main/sv.xml)
|
||||||
% (see: https://unicode.org/cldr/trac/browser/trunk/common/main/sv.xml)
|
|
||||||
%
|
%
|
||||||
% <exemplarCharacters type="index">[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Å Ä Ö]</exemplarCharacters>
|
% <exemplarCharacters type="index">[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Å Ä Ö]</exemplarCharacters>
|
||||||
%
|
%
|
||||||
@ -103,17 +106,6 @@ reorder-after <AFTER-Z>
|
|||||||
<U00DE> "<S0074><S0068>";"<BASE><BASE>";"<COMPATCAP><COMPATCAP>";IGNORE % Þ
|
<U00DE> "<S0074><S0068>";"<BASE><BASE>";"<COMPATCAP><COMPATCAP>";IGNORE % Þ
|
||||||
<U00FE> "<S0074><S0068>";"<BASE><BASE>";"<COMPAT><COMPAT>";IGNORE % þ
|
<U00FE> "<S0074><S0068>";"<BASE><BASE>";"<COMPAT><COMPAT>";IGNORE % þ
|
||||||
|
|
||||||
% The letter w is normally not present in the Swedish alphabet. It
|
|
||||||
% exists in some names in Swedish and foreign words, but is accounted
|
|
||||||
% for as a variant of 'v'. Words and names with 'w' are in Swedish
|
|
||||||
% ordered alphabetically among the words and names with 'v'. If two
|
|
||||||
% words or names are only to be distinguished by 'v' or % 'w', 'v' is
|
|
||||||
% placed before 'w'.
|
|
||||||
|
|
||||||
% &v<<<V<<w<<<W
|
|
||||||
<U0057> <S0076>;"<BASE><VRNT1>";"<CAP><MIN>";IGNORE % W
|
|
||||||
<U0077> <S0076>;"<BASE><VRNT1>";"<MIN><MIN>";IGNORE % w
|
|
||||||
|
|
||||||
% &Y<<ü<<<Ü<<ű<<<Ű
|
% &Y<<ü<<<Ü<<ű<<<Ű
|
||||||
<U00DC> <S0079>;"<BASE><TREMA>";"<CAP><MIN>";IGNORE % Ü
|
<U00DC> <S0079>;"<BASE><TREMA>";"<CAP><MIN>";IGNORE % Ü
|
||||||
<U00FC> <S0079>;"<BASE><TREMA>";"<MIN><MIN>";IGNORE % ü
|
<U00FC> <S0079>;"<BASE><TREMA>";"<MIN><MIN>";IGNORE % ü
|
||||||
|
@ -42,10 +42,10 @@ u
|
|||||||
U
|
U
|
||||||
v
|
v
|
||||||
V
|
V
|
||||||
w
|
|
||||||
W
|
|
||||||
va
|
va
|
||||||
Va
|
Va
|
||||||
|
w
|
||||||
|
W
|
||||||
x
|
x
|
||||||
X
|
X
|
||||||
y
|
y
|
||||||
|
@ -65,10 +65,10 @@ U
|
|||||||
Ů
|
Ů
|
||||||
v
|
v
|
||||||
V
|
V
|
||||||
w
|
|
||||||
W
|
|
||||||
va
|
va
|
||||||
Va
|
Va
|
||||||
|
w
|
||||||
|
W
|
||||||
x
|
x
|
||||||
X
|
X
|
||||||
y
|
y
|
||||||
|
Loading…
Reference in New Issue
Block a user