if (nowtok == tok_copy)
{
- state = 2;
now = lr_token (ldfile, charmap, result, NULL, verbose);
if (now->tok != tok_string)
{
was_ellipsis = tok_none;
}
}
- else if (state != 2 && state != 3)
+ else if (state == 0 && copy_locale == NULL)
+ goto err_label;
+ else if (state != 0 && state != 2 && state != 3)
goto err_label;
state = 3;
/* Next we assume `LC_COLLATE'. */
if (!ignore_content)
{
- if (state == 0)
+ if (state == 0 && copy_locale == NULL)
/* We must either see a copy statement or have
ordering values. */
lr_error (ldfile,
+2007-10-01 Ulrich Drepper <drepper@redhat.com>
+
+ * locales/am_ET (LC_COLLATE): Define new script after copy.
+
2007-09-30 Ulrich Drepper <drepper@redhat.com>
* locales/cs_SR: Removed.
LC_COLLATE
%
-% The ETHIOPIC script declaration must come first.
-%
-script <ETHIOPIC>
-%
% Copy the template from ISO/IEC 14651
%
copy "iso14651_t1"
%
+% The ETHIOPIC script declaration must come first.
+%
+script <ETHIOPIC>
+%
% Correcting Unicode's linguistic ordering to the traditional.
%
collating-symbol <HOY>