Attachment #10654 for bug #10580

Lines 6-12 cvrčić Link Here

(-)a/localedata/hr_HR.UTF-8.in (+27 lines)
6	ćutjeti	6	ćutjeti
7	Dalekovidan	7	Dalekovidan
8	disharmoničan	8	disharmoničan
		9	dza
		10	ĎŽ
		11	dž
		12	ǆ
		13	dŽ
		14	Dž
		15	ǅ
		16	DŽ
		17	Ǆ
		18	dža
		19	džepni
		20	ǆepni
		21	dŽepni
		22	Džepni
9	ǅepni	23	ǅepni
		24	DŽepni
		25	Ǆepni
10	Džersej	26	Džersej
11	DŽezistički	27	DŽezistički
12	džip	28	džip
Lines 18-31 Edicija Link Here
18	Lakovjeran	34	Lakovjeran
19	limunčić	35	limunčić
20	lJekovito	36	lJekovito
		37	ljenivac
		38	ǉenivac
		39	Ljenivac
21	ǈenivac	40	ǈenivac
		41	LJenivac
		42	Ǉenivac
22	Ljepljiv	43	Ljepljiv
23	ljeskov	44	ljeskov
24	ǉetni	45	ǉetni
25	LJutiti	46	LJutiti
26	Mačić	47	Mačić
27	natočiti	48	natočiti
		49	njedra
		50	ǌedra
28	nJedra	51	nJedra
		52	Njedra
		53	ǋedra
		54	NJedra
		55	Ǌedra
29	NJegovateljica	56	NJegovateljica
30	ǋemački	57	ǋemački
31	ǌihalo	58	ǌihalo




LC_COLLATE
copy "iso14651_t1"

% CLDR collation rules for Croatian
% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/hr.xml):
%  &C<č<<<Č<ć<<<Ć
%  &D<dž<<<ǆ<<<Dž<<<ǅ<<<DŽ<<<Ǆ<đ<<<Đ
%  &L<lj<<<ǉ<<<Lj<<<ǈ<<<LJ<<<Ǉ
%  &N<nj<<<ǌ<<<Nj<<<ǋ<<<NJ<<<Ǌ
%  &S<š<<<Š
%  &Z<ž<<<Ž
%
% The following rules implement the same order for glibc:

% Digraphs dŽ, lJ and nJ (1st char lower, 2nd char upper)
% are clearly errors and you'd be hard pressed to

collating-element <n-J> from "<U006E><U004A>"
collating-element <n-j> from "<U006E><U006A>"


% <U01C6> {}, <U01C9> {} and <U01CC> {}
% make č, ć, ǆ, đ, ǉ, ǌ, š and ž distinct letters
collating-symbol <ccaron>
collating-symbol <cacute>
collating-symbol <d-z-sh>

collating-symbol <scaron>
collating-symbol <zcaron>

% order them as:
% a b c č ć d ǆ đ e f g h i j k l ǉ m n ǌ o p r s š t u v z ž

reorder-after <c>
<ccaron>
<cacute>
reorder-after <d>
<d-z-sh>
<doblique>
reorder-after <l>

reorder-after <z>
<zcaron>

<U010D> <ccaron>;<ACA>;<MIN>;IGNORE % č
<U010C> <ccaron>;<ACA>;<CAP>;IGNORE % Č
<U0107> <cacute>;<CAR>;<MIN>;IGNORE % ć
<U0106> <cacute>;<CAR>;<CAP>;IGNORE % Ć

<d-z<> "<d-z-sh>";"<BAS><CAR>";"<MIN><MIN><BAS>";IGNORE % dž
<U01C6> "<d-z-sh>";"<BAS><CAR>";"<MIN><MIN><LIG>";IGNORE % ǆ
<d-Z<> "<d-z-sh>";"<BAS><CAR>";"<MIN><CAP><BAS>";IGNORE % dŽ
<D-z<> "<d-z-sh>";"<BAS><CAR>";"<CAP><MIN><BAS>";IGNORE % Dž
<U01C5> "<d-z-sh>";"<BAS><CAR>";"<CAP><MIN><LIG>";IGNORE % ǅ
<D-Z<> "<d-z-sh>";"<BAS><CAR>";"<CAP><CAP><BAS>";IGNORE % DŽ
<U01C4> "<d-z-sh>";"<BAS><CAR>";"<CAP><CAP><LIG>";IGNORE % Ǆ
<U0111> <doblique>;<OBL>;<MIN>;IGNORE % đ
<U0110> <doblique>;<OBL>;<CAP>;IGNORE % Đ

<l-j> "<l-j-sh>";"<BAS><BAS>";"<MIN><MIN><BAS>";IGNORE % lj
<U01C9> "<l-j-sh>";"<BAS><BAS>";"<MIN><MIN><LIG>";IGNORE % ǉ
<l-J> "<l-j-sh>";"<BAS><BAS>";"<MIN><CAP><BAS>";IGNORE % lJ
<L-j> "<l-j-sh>";"<BAS><BAS>";"<CAP><MIN><BAS>";IGNORE % Lj
<U01C8> "<l-j-sh>";"<BAS><BAS>";"<CAP><MIN><LIG>";IGNORE % ǈ
<L-J> "<l-j-sh>";"<BAS><BAS>";"<CAP><CAP><BAS>";IGNORE % LJ
<U01C7> "<l-j-sh>";"<BAS><BAS>";"<CAP><CAP><LIG>";IGNORE % Ǉ

<n-j> "<n-j-sh>";"<BAS><BAS>";"<MIN><MIN><BAS>";IGNORE % nj
<U01CC> "<n-j-sh>";"<BAS><BAS>";"<MIN><MIN><LIG>";IGNORE % ǌ
<n-J> "<n-j-sh>";"<BAS><BAS>";"<MIN><CAP><BAS>";IGNORE % nJ
<N-j> "<n-j-sh>";"<BAS><BAS>";"<CAP><MIN><BAS>";IGNORE % Nj
<U01CB> "<n-j-sh>";"<BAS><BAS>";"<CAP><MIN><LIG>";IGNORE % ǋ
<N-J> "<n-j-sh>";"<BAS><BAS>";"<CAP><CAP><BAS>";IGNORE % NJ
<U01CA> "<n-j-sh>";"<BAS><BAS>";"<CAP><CAP><LIG>";IGNORE % Ǌ

<U0161> <scaron>;<ACA>;<MIN>;IGNORE % š
<U0160> <scaron>;<ACA>;<CAP>;IGNORE % Š

<U017E> <zcaron>;<ACA>;<MIN>;IGNORE % ž
<U017D> <zcaron>;<ACA>;<CAP>;IGNORE % Ž
<N-j> "<n><j>";"<BAS><BAS>";"<CAP><MIN>";IGNORE

% s š
reorder-after <U0073>
<U0161> <scaron>;<ACA>;<MIN>;IGNORE
reorder-after <U0053>
<U0160> <scaron>;<ACA>;<CAP>;IGNORE

% z ž
reorder-after <U007A>
<U017E> <zcaron>;<ACA>;<MIN>;IGNORE
reorder-after <U005A>
<U017D> <zcaron>;<ACA>;<CAP>;IGNORE

reorder-end

END LC_COLLATE

LC_MESSAGES
- 

Return to bug 10580

Lines 67-74 END LC_CTYPE Link Here

(-)a/localedata/locales/hr_HR (-60 / +47 lines)
67	LC_COLLATE	67	LC_COLLATE
68	copy "iso14651_t1"	68	copy "iso14651_t1"
69		69
70	% define collating elements which should be considered	70	% CLDR collation rules for Croatian
71	% as if they are digraphs while collating	71	% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/hr.xml):
		72	% &C<č<<<Č<ć<<<Ć
		73	% &D<dž<<<ǆ<<<Dž<<<ǅ<<<DŽ<<<Ǆ<đ<<<Đ
		74	% &L<lj<<<ǉ<<<Lj<<<ǈ<<<LJ<<<Ǉ
		75	% &N<nj<<<ǌ<<<Nj<<<ǋ<<<NJ<<<Ǌ
		76	% &S<š<<<Š
		77	% &Z<ž<<<Ž
		78	%
		79	% The following rules implement the same order for glibc:
72		80
73	% Digraphs dŽ, lJ and nJ (1st char lower, 2nd char upper)	81	% Digraphs dŽ, lJ and nJ (1st char lower, 2nd char upper)
74	% are clearly errors and you'd be hard pressed to	82	% are clearly errors and you'd be hard pressed to
Lines 91-99 collating-element <N-j> from "<U004E><U006A>" Link Here
91	collating-element <n-J> from "<U006E><U004A>"	99	collating-element <n-J> from "<U006E><U004A>"
92	collating-element <n-j> from "<U006E><U006A>"	100	collating-element <n-j> from "<U006E><U006A>"
93		101
94
95	% <U01C6> {}, <U01C9> {} and <U01CC> {}
96	% make č, ć, ǆ, đ, ǉ, ǌ, š and ž distinct letters
97	collating-symbol <ccaron>	102	collating-symbol <ccaron>
98	collating-symbol <cacute>	103	collating-symbol <cacute>
99	collating-symbol <d-z-sh>	104	collating-symbol <d-z-sh>
Lines 103-115 collating-symbol <n-j-sh> Link Here
103	collating-symbol <scaron>	108	collating-symbol <scaron>
104	collating-symbol <zcaron>	109	collating-symbol <zcaron>
105		110
106	% order them as:
107	% a b c č ć d ǆ đ e f g h i j k l ǉ m n ǌ o p r s š t u v z ž
108
109	reorder-after <c>	111	reorder-after <c>
110	<ccaron>	112	<ccaron>
111	<cacute>	113	<cacute>
112	<d>	114	reorder-after <d>
113	<d-z-sh>	115	<d-z-sh>
114	<doblique>	116	<doblique>
115	reorder-after <l>	117	reorder-after <l>
Lines 121-178 reorder-after <s> Link Here
121	reorder-after <z>	123	reorder-after <z>
122	<zcaron>	124	<zcaron>
123		125
124	% c č ć	126	<U010D> <ccaron>;<ACA>;<MIN>;IGNORE % č
125	reorder-after <U0063>	127	<U010C> <ccaron>;<ACA>;<CAP>;IGNORE % Č
126	<U010D> <ccaron>;<ACA>;<MIN>;IGNORE	128	<U0107> <cacute>;<CAR>;<MIN>;IGNORE % ć
127	<U0107> <cacute>;<CAR>;<MIN>;IGNORE	129	<U0106> <cacute>;<CAR>;<CAP>;IGNORE % Ć
128	reorder-after <U0043>	130
129	<U010C> <ccaron>;<ACA>;<CAP>;IGNORE	131	<d-z<> "<d-z-sh>";"<BAS><CAR>";"<MIN><MIN><BAS>";IGNORE % dž
130	<U0106> <cacute>;<CAR>;<CAP>;IGNORE	132	<U01C6> "<d-z-sh>";"<BAS><CAR>";"<MIN><MIN><LIG>";IGNORE % ǆ
131		133	<d-Z<> "<d-z-sh>";"<BAS><CAR>";"<MIN><CAP><BAS>";IGNORE % dŽ
132	% d, ǆ and đ	134	<D-z<> "<d-z-sh>";"<BAS><CAR>";"<CAP><MIN><BAS>";IGNORE % Dž
133	% give <d-z> collating elements collating value of ǆ	135	<U01C5> "<d-z-sh>";"<BAS><CAR>";"<CAP><MIN><LIG>";IGNORE % ǅ
134	reorder-after <U01C6>	136	<D-Z<> "<d-z-sh>";"<BAS><CAR>";"<CAP><CAP><BAS>";IGNORE % DŽ
135	<d-z<> "<d><z>";"<BAS><CAR>";"<MIN><MIN>";IGNORE	137	<U01C4> "<d-z-sh>";"<BAS><CAR>";"<CAP><CAP><LIG>";IGNORE % Ǆ
136	<d-Z<> "<d><z>";"<BAS><CAR>";"<MIN><CAP>";IGNORE	138	<U0111> <doblique>;<OBL>;<MIN>;IGNORE % đ
137	<U0111> <doblique>;<OBL>;<MIN>;IGNORE	139	<U0110> <doblique>;<OBL>;<CAP>;IGNORE % Đ
138	reorder-after <U01C4>	140
139	<D-Z<> "<d><z>";"<BAS><CAR>";"<CAP><CAP>";IGNORE	141	<l-j> "<l-j-sh>";"<BAS><BAS>";"<MIN><MIN><BAS>";IGNORE % lj
140	reorder-after <U01C5>	142	<U01C9> "<l-j-sh>";"<BAS><BAS>";"<MIN><MIN><LIG>";IGNORE % ǉ
141	<D-z<> "<d><z>";"<BAS><CAR>";"<CAP><MIN>";IGNORE	143	<l-J> "<l-j-sh>";"<BAS><BAS>";"<MIN><CAP><BAS>";IGNORE % lJ
142	<U0110> <doblique>;<OBL>;<CAP>;IGNORE	144	<L-j> "<l-j-sh>";"<BAS><BAS>";"<CAP><MIN><BAS>";IGNORE % Lj
143		145	<U01C8> "<l-j-sh>";"<BAS><BAS>";"<CAP><MIN><LIG>";IGNORE % ǈ
144	% give <l-j> collating elements collating value of ǉ	146	<L-J> "<l-j-sh>";"<BAS><BAS>";"<CAP><CAP><BAS>";IGNORE % LJ
145	reorder-after <U01C9>	147	<U01C7> "<l-j-sh>";"<BAS><BAS>";"<CAP><CAP><LIG>";IGNORE % Ǉ
146	<l-j> "<l><j>";"<BAS><BAS>";"<MIN><MIN>";IGNORE	148
147	<l-J> "<l><j>";"<BAS><BAS>";"<MIN><CAP>";IGNORE	149	<n-j> "<n-j-sh>";"<BAS><BAS>";"<MIN><MIN><BAS>";IGNORE % nj
148	reorder-after <U01C7>	150	<U01CC> "<n-j-sh>";"<BAS><BAS>";"<MIN><MIN><LIG>";IGNORE % ǌ
149	<L-J> "<l><j>";"<BAS><BAS>";"<CAP><CAP>";IGNORE	151	<n-J> "<n-j-sh>";"<BAS><BAS>";"<MIN><CAP><BAS>";IGNORE % nJ
150	reorder-after <U01C8>	152	<N-j> "<n-j-sh>";"<BAS><BAS>";"<CAP><MIN><BAS>";IGNORE % Nj
151	<L-j> "<l><j>";"<BAS><BAS>";"<CAP><MIN>";IGNORE	153	<U01CB> "<n-j-sh>";"<BAS><BAS>";"<CAP><MIN><LIG>";IGNORE % ǋ
152		154	<N-J> "<n-j-sh>";"<BAS><BAS>";"<CAP><CAP><BAS>";IGNORE % NJ
153	% give <n-j> collating elements collating value of ǌ	155	<U01CA> "<n-j-sh>";"<BAS><BAS>";"<CAP><CAP><LIG>";IGNORE % Ǌ
154	reorder-after <U01CC>	156
155	<n-j> "<n><j>";"<BAS><BAS>";"<MIN><MIN>";IGNORE	157	<U0161> <scaron>;<ACA>;<MIN>;IGNORE % š
156	<n-J> "<n><j>";"<BAS><BAS>";"<MIN><CAP>";IGNORE	158	<U0160> <scaron>;<ACA>;<CAP>;IGNORE % Š
157	reorder-after <U01CA>	159
158	<N-J> "<n><j>";"<BAS><BAS>";"<CAP><CAP>";IGNORE	160	<U017E> <zcaron>;<ACA>;<MIN>;IGNORE % ž
159	reorder-after <U01CB>	161	<U017D> <zcaron>;<ACA>;<CAP>;IGNORE % Ž
160	<N-j> "<n><j>";"<BAS><BAS>";"<CAP><MIN>";IGNORE
161
162	% s š
163	reorder-after <U0073>
164	<U0161> <scaron>;<ACA>;<MIN>;IGNORE
165	reorder-after <U0053>
166	<U0160> <scaron>;<ACA>;<CAP>;IGNORE
167
168	% z ž
169	reorder-after <U007A>
170	<U017E> <zcaron>;<ACA>;<MIN>;IGNORE
171	reorder-after <U005A>
172	<U017D> <zcaron>;<ACA>;<CAP>;IGNORE
173		162
174	reorder-end	163	reorder-end
175
176	END LC_COLLATE	164	END LC_COLLATE
177		165
178	LC_MESSAGES	166	LC_MESSAGES
179	-