1 Be less strict about keywords ordering in LC_COLLATE section, to
2 ease definition of new scripts.
4 Submitted upstream: BZ690
6 # DP: Dpatch author: Denis Barbier
7 # DP: Patch author: Denis Barbier
8 # DP: Upstream status: BZ690
12 locale/programs/ld-collate.c | 32 ++++++++++++++++++--------------
13 1 file changed, 18 insertions(+), 14 deletions(-)
15 --- a/locale/programs/ld-collate.c
16 +++ b/locale/programs/ld-collate.c
17 @@ -2752,14 +2752,23 @@
21 - /* Allow copying other locales. */
22 + /* Ignore the rest of the line if we don't need the input of
26 + lr_ignore_rest (ldfile, 0);
30 now = lr_token (ldfile, charmap, result, NULL, verbose);
31 if (now->tok != tok_string)
34 - if (! ignore_content)
35 - load_locale (LC_COLLATE, now->val.str.startmb, repertoire_name,
37 + if (state == 1 || state == 3 || state == 5)
40 + load_locale (LC_COLLATE, now->val.str.startmb, repertoire_name,
43 lr_ignore_rest (ldfile, 1);
52 arg = lr_token (ldfile, charmap, result, NULL, verbose);
53 if (arg->tok != tok_number)
60 + if (state == 1 || state == 3 || state == 5)
63 arg = lr_token (ldfile, charmap, result, repertoire, verbose);
68 - if (state != 0 && state != 2)
69 + if (state == 1 || state == 3 || state == 5)
72 arg = lr_token (ldfile, charmap, result, repertoire, verbose);
77 - if (state != 0 && state != 2)
78 + if (state == 1 || state == 3 || state == 5)
81 arg = lr_token (ldfile, charmap, result, repertoire, verbose);
87 + if (state == 1 || state == 3 || state == 5)
90 arg = lr_token (ldfile, charmap, result, repertoire, verbose);
95 - if (state != 0 && state != 1 && state != 2)
96 + if (state == 3 || state == 5)
100 @@ -3487,8 +3493,6 @@
101 %s: missing `reorder-end' keyword"), "LC_COLLATE"));
104 - else if (state != 2 && state != 4)
108 /* Get the name of the sections we are adding after. */