diff mbox

[RFC,v5,01/13] Implement alternative month names (bug 10871).

Message ID 71566309.1457446.1482455926739@poczta.nazwa.pl
State New
Headers show

Commit Message

Rafal Luzynski Dec. 23, 2016, 1:18 a.m. UTC 
Some languages (Slavic, Baltic, etc.) require a genitive case of the
month name when formatting a full date (with the day number) while
they require a nominative case when referring to the month standalone.
This requirement cannot be fulfilled without providing two forms for
each month name.  This new feature is optional so the languages which
do not need it or do not yet provide the updated locales simply do not
use it and their behaviour is unchanged.

This patch defines the new constants ALTMON_1 .. ALTMON_12 which allow
for defining the alternative month forms where required.

[BZ #10871]
* locale/C-time.c: define all alternative month names as empty strings.
* locale/categories.def: alt_mon and wide-alt_mon added.
* locale/langinfo.h: ALTMON_1 .. ALTMON_12 and similar contants defined.
* locale/loadlocale.c: correct size of _nl_value_type_LC_<category> arrays.
* locale/programs/ld-time.c: alternative month names support added.
* locale/programs/locfile-kw.gperf: alt_mon defined.
* locale/programs/locfile-kw.h: regenerated for alt_mon.
* locale/programs/locfile-token.h: alt_mon defined.
---
 locale/C-time.c                  |  28 +++++++++-
 locale/categories.def            |   2 +
 locale/langinfo.h                |  52 ++++++++++++++++++-
 locale/loadlocale.c              |   3 +-
 locale/programs/ld-time.c        |  13 +++++
 locale/programs/locfile-kw.gperf |   1 +
 locale/programs/locfile-kw.h     | 108 ++++++++++++++++++++-------------------
 locale/programs/locfile-token.h  |   1 +
 8 files changed, 150 insertions(+), 58 deletions(-)

Comments

Joseph Myers Dec. 30, 2016, 1 p.m. UTC | #1 
On Fri, 23 Dec 2016, Rafal Luzynski wrote:

> This patch defines the new constants ALTMON_1 .. ALTMON_12 which allow
> for defining the alternative month forms where required.

I don't see anything here to address the namespace issue (that no existing 
version of POSIX permits those names to be visible in langinfo.h, so only 
implementation-namespace names for those symbols may be visible unless 
__USE_GNU, much as with the existing __USE_GNU conditionals in that 
header).
Rafal Luzynski Dec. 30, 2016, 10:07 p.m. UTC | #2 
30.12.2016 14:00 Joseph Myers <joseph@codesourcery.com> wrote:
>
>
> On Fri, 23 Dec 2016, Rafal Luzynski wrote:
>
> > This patch defines the new constants ALTMON_1 .. ALTMON_12 which allow
> > for defining the alternative month forms where required.
>
> I don't see anything here to address the namespace issue (that no existing
> version of POSIX permits those names to be visible in langinfo.h, so only
> implementation-namespace names for those symbols may be visible unless
> __USE_GNU, much as with the existing __USE_GNU conditionals in that
> header).

I think you refer to this post: [1].  I thought we could treat this
future POSIX change [2] as if it had been existing now.  But if not,
especially if it can be reworked in future once the change is accepted
as part of POSIX, then I'm OK with this requirement.

Regards,

Rafal


[1] https://sourceware.org/ml/libc-alpha/2016-10/msg00303.html
[2] http://austingroupbugs.net/view.php?id=258
Zack Weinberg Dec. 30, 2016, 10:22 p.m. UTC | #3 
On Fri, Dec 30, 2016 at 2:07 PM, Rafal Luzynski
<digitalfreak@lingonborough.com> wrote:
> 30.12.2016 14:00 Joseph Myers <joseph@codesourcery.com> wrote:
>>
>>
>> On Fri, 23 Dec 2016, Rafal Luzynski wrote:
>>
>> > This patch defines the new constants ALTMON_1 .. ALTMON_12 which allow
>> > for defining the alternative month forms where required.
>>
>> I don't see anything here to address the namespace issue (that no existing
>> version of POSIX permits those names to be visible in langinfo.h, so only
>> implementation-namespace names for those symbols may be visible unless
>> __USE_GNU, much as with the existing __USE_GNU conditionals in that
>> header).
>
> I think you refer to this post: [1].  I thought we could treat this
> future POSIX change [2] as if it had been existing now.  But if not,
> especially if it can be reworked in future once the change is accepted
> as part of POSIX, then I'm OK with this requirement.

We don't like to jump the gun on these things.  Note that that
proposal has been "approved" since 2010 but still hasn't been
officially published - there's no good way to predict how much longer
it will take.

Please put the constants under __USE_GNU for now.  They can be changed
to __USE_XOPENwhatever in a patch release after we know what goes in
"whatever".

zw
Rafal Luzynski Dec. 31, 2016, 12:32 a.m. UTC | #4 
30.12.2016 23:22 Zack Weinberg <zackw@panix.com> wrote:
>
>
> On Fri, Dec 30, 2016 at 2:07 PM, Rafal Luzynski
> <digitalfreak@lingonborough.com> wrote:
> > 30.12.2016 14:00 Joseph Myers <joseph@codesourcery.com> wrote:
> >>
> >>
> >> On Fri, 23 Dec 2016, Rafal Luzynski wrote:
> >>
> >> > This patch defines the new constants ALTMON_1 .. ALTMON_12 which allow
> >> > for defining the alternative month forms where required.
> >>
> >> I don't see anything here to address the namespace issue (that no existing
> >> version of POSIX permits those names to be visible in langinfo.h, so only
> >> implementation-namespace names for those symbols may be visible unless
> >> __USE_GNU, much as with the existing __USE_GNU conditionals in that
> >> header).
> >
> > I think you refer to this post: [1]. I thought we could treat this
> > future POSIX change [2] as if it had been existing now. But if not,
> > especially if it can be reworked in future once the change is accepted
> > as part of POSIX, then I'm OK with this requirement.
>
> We don't like to jump the gun on these things. Note that that
> proposal has been "approved" since 2010 but still hasn't been
> officially published - there's no good way to predict how much longer
> it will take.
>
> Please put the constants under __USE_GNU for now. They can be changed
> to __USE_XOPENwhatever in a patch release after we know what goes in
> "whatever".
>
> zw

OK, understood, I will follow that.

Now I'm thinking about another thing: I still wonder if abbreviated
months names (ABMON and %b) should also have their alternative
(nominative/genitive) form.  Finally I've found that CLDR provides
the abbreviated forms which differ in some languages using Cyrillic
alphabet, I mean Belorussian, Russian, Ukrainian, and probably more.
In these languages "May" is - no wonder - "май" ("may"), and the
genitive form is - also no wonder - "мая" ("maya").  Since the
full month name has only 3 letters there is no need to abbreviate
it, the abbreviated form equals the full form and includes the
declension suffix.  So far I'm not aware of any implementation of
strftime() supporting this so if that's ever implemented it will
be purely GNU-only extension.

What do you think?

Also, from another post: if localedef utility has to generate
the missing alt_mon section as a copy of mon section then it makes
my huge half-megabyte patch no longer necessary.  I really like
this idea!

Regards,

Rafal
Zack Weinberg Dec. 31, 2016, 5:19 p.m. UTC | #5 
On Fri, Dec 30, 2016 at 4:32 PM, Rafal Luzynski
<digitalfreak@lingonborough.com> wrote:
>
> Now I'm thinking about another thing: I still wonder if abbreviated
> months names (ABMON and %b) should also have their alternative
> (nominative/genitive) form.

Yes, yes they should.  To be honest I had assumed your patch already
did that.  (The май/мая example is sufficient evidence that it's
needed.)

> So far I'm not aware of any implementation of
> strftime() supporting this so if that's ever implemented it will
> be purely GNU-only extension.

That's OK.  It'll probably get picked up by others once demonstrated
to be needed.

zw
Rafal Luzynski Jan. 3, 2017, 1:47 a.m. UTC | #6 
31.12.2016 18:19 Zack Weinberg <zackw@panix.com> wrote:
>
>
> On Fri, Dec 30, 2016 at 4:32 PM, Rafal Luzynski
> <digitalfreak@lingonborough.com> wrote:
> >
> > Now I'm thinking about another thing: I still wonder if abbreviated
> > months names (ABMON and %b) should also have their alternative
> > (nominative/genitive) form.
>
> Yes, yes they should. To be honest I had assumed your patch already
> did that. (The май/мая example is sufficient evidence that it's
> needed.)

No, my patches so far have not done it.  I was misled by my native
language where the same phenomenon exists but abbreviations cut
the declension suffixes so all abbreviations look the same, no matter
if they are nominative or genitive or anything else.  Also nobody
complained that it's missing.  Also I doubted if it would ever be
useful until I started processing all locales from CLDR and noticed
in Belorussian first and in other languages later.  Also the reason
below:

>
> > So far I'm not aware of any implementation of
> > strftime() supporting this so if that's ever implemented it will
> > be purely GNU-only extension.
>
> That's OK. It'll probably get picked up by others once demonstrated
> to be needed.

Sounds OK for me. I will have to add:

- _NL_ABALTMON_1..12, _NL_WABALTMON_1..12 parameters of nl_langinfo();
- add ab_alt_mon (abalt_mon? abaltmon?) section to the locale database
  definition - can anybody please advise me which name would be the best
  for this section?
- add %Ob support to strftime() family;
- make sure %Ob is supported by strptime() family.

I'm sorry for not finalizing it before the freeze.  My time resources
are limited.  However, anyone is welcome to rework my patches.

Regards,

Rafal
diff mbox

Patch

diff --git a/locale/C-time.c b/locale/C-time.c
index 2f95307..42052f7 100644
--- a/locale/C-time.c
+++ b/locale/C-time.c
@@ -30,7 +30,7 @@  const struct __locale_data _nl_C_LC_TIME attribute_hidden =
   { NULL, },			/* no cached data */
   UNDELETABLE,
   0,
-  111,
+  135,
   {
     { .string = "Sun" },
     { .string = "Mon" },
@@ -142,6 +142,30 @@  const struct __locale_data _nl_C_LC_TIME attribute_hidden =
     { .string = "" },
     { .string = "%a %b %e %H:%M:%S %Z %Y" },
     { .wstr = (const uint32_t *) L"%a %b %e %H:%M:%S %Z %Y" },
-    { .string = _nl_C_codeset }
+    { .string = _nl_C_codeset },
+    { .string = "" },
+    { .string = "" },
+    { .string = "" },
+    { .string = "" },
+    { .string = "" },
+    { .string = "" },
+    { .string = "" },
+    { .string = "" },
+    { .string = "" },
+    { .string = "" },
+    { .string = "" },
+    { .string = "" },
+    { .wstr = (const uint32_t *) L"" },
+    { .wstr = (const uint32_t *) L"" },
+    { .wstr = (const uint32_t *) L"" },
+    { .wstr = (const uint32_t *) L"" },
+    { .wstr = (const uint32_t *) L"" },
+    { .wstr = (const uint32_t *) L"" },
+    { .wstr = (const uint32_t *) L"" },
+    { .wstr = (const uint32_t *) L"" },
+    { .wstr = (const uint32_t *) L"" },
+    { .wstr = (const uint32_t *) L"" },
+    { .wstr = (const uint32_t *) L"" },
+    { .wstr = (const uint32_t *) L"" }
   }
 };
diff --git a/locale/categories.def b/locale/categories.def
index d8a3ab8..a45c82a 100644
--- a/locale/categories.def
+++ b/locale/categories.def
@@ -249,6 +249,8 @@  DEFINE_CATEGORY
   DEFINE_ELEMENT (_DATE_FMT,                "date_fmt",            opt, string)
   DEFINE_ELEMENT (_NL_W_DATE_FMT,           "wide-date_fmt",       opt,
wstring)
   DEFINE_ELEMENT (_NL_TIME_CODESET,	    "time-codeset",	   std, string)
+  DEFINE_ELEMENT (ALTMON_1,       "alt_mon",       std, stringarray, 12, 12)
+  DEFINE_ELEMENT (_NL_WALTMON_1,  "wide-alt_mon",  std, wstringarray, 12, 12)
   ), NO_POSTLOAD)
 
 
diff --git a/locale/langinfo.h b/locale/langinfo.h
index 04347eb..769225e 100644
--- a/locale/langinfo.h
+++ b/locale/langinfo.h
@@ -101,7 +101,9 @@  enum
 #define ABMON_12		ABMON_12
 
   /* Long month names.  */
-  MON_1,			/* January */
+  /* For languages which need both a nominative and a genitive case,
+     this is the genitive.  */
+  MON_1,			/* January (or "of January") */
 #define MON_1			MON_1
   MON_2,
 #define MON_2			MON_2
@@ -190,7 +192,9 @@  enum
   _NL_WABMON_12,
 
   /* Long month names.  */
-  _NL_WMON_1,		/* January */
+  /* For languages which need both a nominative and a genitive case,
+     this is the genitive.  */
+  _NL_WMON_1,		/* January (or "of January") */
   _NL_WMON_2,
   _NL_WMON_3,
   _NL_WMON_4,
@@ -231,6 +235,50 @@  enum
 
   _NL_TIME_CODESET,
 
+  /* Alternative (nominative, standalone only) month names.  */
+  /* Languages which do not need nominative and genitive month names
+     can ignore this feature.  */
+  ALTMON_1,			/* January */
+#define ALTMON_1		ALTMON_1
+  ALTMON_2,
+#define ALTMON_2		ALTMON_2
+  ALTMON_3,
+#define ALTMON_3		ALTMON_3
+  ALTMON_4,
+#define ALTMON_4		ALTMON_4
+  ALTMON_5,
+#define ALTMON_5		ALTMON_5
+  ALTMON_6,
+#define ALTMON_6		ALTMON_6
+  ALTMON_7,
+#define ALTMON_7		ALTMON_7
+  ALTMON_8,
+#define ALTMON_8		ALTMON_8
+  ALTMON_9,
+#define ALTMON_9		ALTMON_9
+  ALTMON_10,
+#define ALTMON_10		ALTMON_10
+  ALTMON_11,
+#define ALTMON_11		ALTMON_11
+  ALTMON_12,
+#define ALTMON_12		ALTMON_12
+
+  /* Alternative (nominative, standalone only) month names.  */
+  /* Languages which do not need nominative and genitive month names
+     can ignore this feature.  */
+  _NL_WALTMON_1,			/* January */
+  _NL_WALTMON_2,
+  _NL_WALTMON_3,
+  _NL_WALTMON_4,
+  _NL_WALTMON_5,
+  _NL_WALTMON_6,
+  _NL_WALTMON_7,
+  _NL_WALTMON_8,
+  _NL_WALTMON_9,
+  _NL_WALTMON_10,
+  _NL_WALTMON_11,
+  _NL_WALTMON_12,
+
   _NL_NUM_LC_TIME,	/* Number of indices in LC_TIME category.  */
 
   /* LC_COLLATE category: text sorting.
diff --git a/locale/loadlocale.c b/locale/loadlocale.c
index 2b589ee..2f2025c 100644
--- a/locale/loadlocale.c
+++ b/locale/loadlocale.c
@@ -45,7 +45,8 @@  static const size_t _nl_category_num_items[] =
 #define NO_PAREN(arg, rest...) arg, ##rest
 
 #define DEFINE_CATEGORY(category, category_name, items, a) \
-static const enum value_type _nl_value_type_##category[] = { NO_PAREN items };
+static const enum value_type _nl_value_type_##category     \
+  [_NL_ITEM_INDEX (_NL_NUM_##category)] = { NO_PAREN items };
 #define DEFINE_ELEMENT(element, element_name, optstd, type, rest...) \
   [_NL_ITEM_INDEX (element)] = type,
 #include "categories.def"
diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c
index 87531bc..8ff43a3 100644
--- a/locale/programs/ld-time.c
+++ b/locale/programs/ld-time.c
@@ -91,6 +91,9 @@  struct locale_time_t
   const char *date_fmt;
   const uint32_t *wdate_fmt;
   int alt_digits_defined;
+  const char *alt_mon[12];
+  const uint32_t *walt_mon[12];
+  int alt_mon_defined;
   unsigned char week_ndays;
   uint32_t week_1stday;
   unsigned char week_1stweek;
@@ -652,6 +655,15 @@  time_output (struct localedef_t *locale, const struct
charmap_t *charmap,
   add_locale_string (&file, time->date_fmt);
   add_locale_wstring (&file, time->wdate_fmt);
   add_locale_string (&file, charmap->code_set_name);
+
+  /* The alt'mons.  */
+  for (n = 0; n < 12; ++n)
+    add_locale_string (&file, time->alt_mon[n] ?: "");
+
+  /* The wide character alt'mons.  */
+  for (n = 0; n < 12; ++n)
+    add_locale_wstring (&file, time->walt_mon[n] ?: empty_wstr);
+
   write_locale_data (output_path, LC_TIME, "LC_TIME", &file);
 }
 
@@ -795,6 +807,7 @@  time_read (struct linereader *ldfile, struct localedef_t
*result,
 	  STRARR_ELEM (mon, 12, 12);
 	  STRARR_ELEM (am_pm, 2, 2);
 	  STRARR_ELEM (alt_digits, 0, 100);
+	  STRARR_ELEM (alt_mon, 12, 12);
 
 	case tok_era:
 	  /* Ignore the rest of the line if we don't need the input of
diff --git a/locale/programs/locfile-kw.gperf b/locale/programs/locfile-kw.gperf
index 5fea696..bf533a1 100644
--- a/locale/programs/locfile-kw.gperf
+++ b/locale/programs/locfile-kw.gperf
@@ -148,6 +148,7 @@  first_workday,          tok_first_workday,          0
 cal_direction,          tok_cal_direction,          0
 timezone,               tok_timezone,               0
 date_fmt,               tok_date_fmt,               0
+alt_mon,                tok_alt_mon,                0
 LC_MESSAGES,            tok_lc_messages,            0
 yesexpr,                tok_yesexpr,                0
 noexpr,                 tok_noexpr,                 0
diff --git a/locale/programs/locfile-kw.h b/locale/programs/locfile-kw.h
index 16b87d4..7a87093 100644
--- a/locale/programs/locfile-kw.h
+++ b/locale/programs/locfile-kw.h
@@ -54,7 +54,7 @@ 
 #line 24 "locfile-kw.gperf"
 struct keyword_t ;
 
-#define TOTAL_KEYWORDS 176
+#define TOTAL_KEYWORDS 177
 #define MIN_WORD_LENGTH 3
 #define MAX_WORD_LENGTH 22
 #define MIN_HASH_VALUE 3
@@ -147,22 +147,22 @@  locfile_hash (register const char *str, register unsigned
int len)
 #line 30 "locfile-kw.gperf"
       {"LC_CTYPE",               tok_lc_ctype,               0},
       {""},
-#line 166 "locfile-kw.gperf"
+#line 167 "locfile-kw.gperf"
       {"LC_ADDRESS",             tok_lc_address,             0},
-#line 151 "locfile-kw.gperf"
+#line 152 "locfile-kw.gperf"
       {"LC_MESSAGES",            tok_lc_messages,            0},
-#line 159 "locfile-kw.gperf"
+#line 160 "locfile-kw.gperf"
       {"LC_NAME",                tok_lc_name,                0},
-#line 156 "locfile-kw.gperf"
+#line 157 "locfile-kw.gperf"
       {"LC_PAPER",               tok_lc_paper,               0},
-#line 184 "locfile-kw.gperf"
+#line 185 "locfile-kw.gperf"
       {"LC_MEASUREMENT",         tok_lc_measurement,         0},
 #line 56 "locfile-kw.gperf"
       {"LC_COLLATE",             tok_lc_collate,             0},
       {""},
-#line 186 "locfile-kw.gperf"
+#line 187 "locfile-kw.gperf"
       {"LC_IDENTIFICATION",      tok_lc_identification,      0},
-#line 199 "locfile-kw.gperf"
+#line 200 "locfile-kw.gperf"
       {"revision",               tok_revision,               0},
 #line 69 "locfile-kw.gperf"
       {"UNDEFINED",              tok_undefined,              0},
@@ -170,19 +170,19 @@  locfile_hash (register const char *str, register unsigned
int len)
       {"LC_NUMERIC",             tok_lc_numeric,             0},
 #line 82 "locfile-kw.gperf"
       {"LC_MONETARY",            tok_lc_monetary,            0},
-#line 179 "locfile-kw.gperf"
+#line 180 "locfile-kw.gperf"
       {"LC_TELEPHONE",           tok_lc_telephone,           0},
       {""}, {""}, {""},
 #line 75 "locfile-kw.gperf"
       {"define",                 tok_define,                 0},
-#line 152 "locfile-kw.gperf"
+#line 153 "locfile-kw.gperf"
       {"yesexpr",                tok_yesexpr,                0},
 #line 141 "locfile-kw.gperf"
       {"era_year",               tok_era_year,               0},
       {""},
 #line 54 "locfile-kw.gperf"
       {"translit_ignore",        tok_translit_ignore,        0},
-#line 154 "locfile-kw.gperf"
+#line 155 "locfile-kw.gperf"
       {"yesstr",                 tok_yesstr,                 0},
       {""},
 #line 89 "locfile-kw.gperf"
@@ -190,7 +190,7 @@  locfile_hash (register const char *str, register unsigned
int len)
       {""},
 #line 137 "locfile-kw.gperf"
       {"t_fmt",                  tok_t_fmt,                  0},
-#line 157 "locfile-kw.gperf"
+#line 158 "locfile-kw.gperf"
       {"height",                 tok_height,                 0},
       {""}, {""},
 #line 52 "locfile-kw.gperf"
@@ -213,7 +213,7 @@  locfile_hash (register const char *str, register unsigned
int len)
       {""},
 #line 142 "locfile-kw.gperf"
       {"era_d_fmt",              tok_era_d_fmt,              0},
-#line 187 "locfile-kw.gperf"
+#line 188 "locfile-kw.gperf"
       {"title",                  tok_title,                  0},
       {""}, {""},
 #line 149 "locfile-kw.gperf"
@@ -243,7 +243,7 @@  locfile_hash (register const char *str, register unsigned
int len)
       {"duo_n_cs_precedes",      tok_duo_n_cs_precedes,      0},
 #line 127 "locfile-kw.gperf"
       {"thousands_sep",          tok_thousands_sep,          0},
-#line 195 "locfile-kw.gperf"
+#line 196 "locfile-kw.gperf"
       {"territory",              tok_territory,              0},
 #line 36 "locfile-kw.gperf"
       {"digit",                  tok_digit,                  0},
@@ -258,7 +258,7 @@  locfile_hash (register const char *str, register unsigned
int len)
       {""},
 #line 78 "locfile-kw.gperf"
       {"else",                   tok_else,                   0},
-#line 182 "locfile-kw.gperf"
+#line 183 "locfile-kw.gperf"
       {"int_select",             tok_int_select,             0},
       {""}, {""}, {""},
 #line 132 "locfile-kw.gperf"
@@ -266,11 +266,11 @@  locfile_hash (register const char *str, register unsigned
int len)
 #line 33 "locfile-kw.gperf"
       {"upper",                  tok_upper,                  0},
       {""}, {""},
-#line 192 "locfile-kw.gperf"
+#line 193 "locfile-kw.gperf"
       {"tel",                    tok_tel,                    0},
 #line 93 "locfile-kw.gperf"
       {"p_sep_by_space",         tok_p_sep_by_space,         0},
-#line 158 "locfile-kw.gperf"
+#line 159 "locfile-kw.gperf"
       {"width",                  tok_width,                  0},
       {""},
 #line 98 "locfile-kw.gperf"
@@ -301,7 +301,7 @@  locfile_hash (register const char *str, register unsigned
int len)
       {""}, {""}, {""}, {""}, {""},
 #line 58 "locfile-kw.gperf"
       {"section-symbol",         tok_section_symbol,         0},
-#line 183 "locfile-kw.gperf"
+#line 184 "locfile-kw.gperf"
       {"int_prefix",             tok_int_prefix,             0},
       {""}, {""}, {""}, {""},
 #line 42 "locfile-kw.gperf"
@@ -318,7 +318,7 @@  locfile_hash (register const char *str, register unsigned
int len)
       {"duo_p_sep_by_space",     tok_duo_p_sep_by_space,     0},
 #line 118 "locfile-kw.gperf"
       {"duo_int_p_sign_posn",    tok_duo_int_p_sign_posn,    0},
-#line 155 "locfile-kw.gperf"
+#line 156 "locfile-kw.gperf"
       {"nostr",                  tok_nostr,                  0},
       {""}, {""},
 #line 140 "locfile-kw.gperf"
@@ -327,26 +327,26 @@  locfile_hash (register const char *str, register unsigned
int len)
 #line 84 "locfile-kw.gperf"
       {"currency_symbol",        tok_currency_symbol,        0},
       {""},
-#line 165 "locfile-kw.gperf"
+#line 166 "locfile-kw.gperf"
       {"name_ms",                tok_name_ms,                0},
-#line 163 "locfile-kw.gperf"
-      {"name_mrs",               tok_name_mrs,               0},
 #line 164 "locfile-kw.gperf"
+      {"name_mrs",               tok_name_mrs,               0},
+#line 165 "locfile-kw.gperf"
       {"name_miss",              tok_name_miss,              0},
 #line 83 "locfile-kw.gperf"
       {"int_curr_symbol",        tok_int_curr_symbol,        0},
-#line 188 "locfile-kw.gperf"
+#line 189 "locfile-kw.gperf"
       {"source",                 tok_source,                 0},
-#line 162 "locfile-kw.gperf"
+#line 163 "locfile-kw.gperf"
       {"name_mr",                tok_name_mr,                0},
-#line 161 "locfile-kw.gperf"
+#line 162 "locfile-kw.gperf"
       {"name_gen",               tok_name_gen,               0},
-#line 200 "locfile-kw.gperf"
+#line 201 "locfile-kw.gperf"
       {"date",                   tok_date,                   0},
       {""}, {""},
-#line 189 "locfile-kw.gperf"
+#line 190 "locfile-kw.gperf"
       {"address",                tok_address,                0},
-#line 160 "locfile-kw.gperf"
+#line 161 "locfile-kw.gperf"
       {"name_fmt",               tok_name_fmt,               0},
 #line 32 "locfile-kw.gperf"
       {"copy",                   tok_copy,                   0},
@@ -365,16 +365,16 @@  locfile_hash (register const char *str, register unsigned
int len)
 #line 117 "locfile-kw.gperf"
       {"duo_n_sign_posn",        tok_duo_n_sign_posn,        0},
       {""},
-#line 168 "locfile-kw.gperf"
+#line 169 "locfile-kw.gperf"
       {"country_name",           tok_country_name,           0},
 #line 71 "locfile-kw.gperf"
       {"reorder-after",          tok_reorder_after,          0},
       {""}, {""},
-#line 153 "locfile-kw.gperf"
+#line 154 "locfile-kw.gperf"
       {"noexpr",                 tok_noexpr,                 0},
 #line 50 "locfile-kw.gperf"
       {"tolower",                tok_tolower,                0},
-#line 196 "locfile-kw.gperf"
+#line 197 "locfile-kw.gperf"
       {"audience",               tok_audience,               0},
       {""}, {""}, {""},
 #line 49 "locfile-kw.gperf"
@@ -395,7 +395,7 @@  locfile_hash (register const char *str, register unsigned
int len)
       {""},
 #line 102 "locfile-kw.gperf"
       {"int_p_sign_posn",        tok_int_p_sign_posn,        0},
-#line 173 "locfile-kw.gperf"
+#line 174 "locfile-kw.gperf"
       {"country_car",            tok_country_car,            0},
       {""}, {""},
 #line 104 "locfile-kw.gperf"
@@ -406,9 +406,9 @@  locfile_hash (register const char *str, register unsigned
int len)
       {""}, {""},
 #line 116 "locfile-kw.gperf"
       {"duo_p_sign_posn",        tok_duo_p_sign_posn,        0},
-#line 185 "locfile-kw.gperf"
+#line 186 "locfile-kw.gperf"
       {"measurement",            tok_measurement,            0},
-#line 174 "locfile-kw.gperf"
+#line 175 "locfile-kw.gperf"
       {"country_isbn",           tok_country_isbn,           0},
 #line 37 "locfile-kw.gperf"
       {"outdigit",               tok_outdigit,               0},
@@ -418,9 +418,9 @@  locfile_hash (register const char *str, register unsigned
int len)
       {""}, {""}, {""},
 #line 34 "locfile-kw.gperf"
       {"lower",                  tok_lower,                  0},
-#line 181 "locfile-kw.gperf"
+#line 182 "locfile-kw.gperf"
       {"tel_dom_fmt",            tok_tel_dom_fmt,            0},
-#line 169 "locfile-kw.gperf"
+#line 170 "locfile-kw.gperf"
       {"country_post",           tok_country_post,           0},
 #line 148 "locfile-kw.gperf"
       {"cal_direction",          tok_cal_direction,          0},
@@ -430,7 +430,7 @@  locfile_hash (register const char *str, register unsigned
int len)
 #line 91 "locfile-kw.gperf"
       {"frac_digits",            tok_frac_digits,            0},
       {""}, {""},
-#line 175 "locfile-kw.gperf"
+#line 176 "locfile-kw.gperf"
       {"lang_name",              tok_lang_name,              0},
 #line 90 "locfile-kw.gperf"
       {"int_frac_digits",        tok_int_frac_digits,        0},
@@ -445,7 +445,7 @@  locfile_hash (register const char *str, register unsigned
int len)
       {""}, {""}, {""}, {""},
 #line 107 "locfile-kw.gperf"
       {"duo_frac_digits",        tok_duo_frac_digits,        0},
-#line 180 "locfile-kw.gperf"
+#line 181 "locfile-kw.gperf"
       {"tel_int_fmt",            tok_tel_int_fmt,            0},
 #line 123 "locfile-kw.gperf"
       {"duo_valid_to",           tok_duo_valid_to,           0},
@@ -455,7 +455,7 @@  locfile_hash (register const char *str, register unsigned
int len)
 #line 130 "locfile-kw.gperf"
       {"abday",                  tok_abday,                  0},
       {""},
-#line 198 "locfile-kw.gperf"
+#line 199 "locfile-kw.gperf"
       {"abbreviation",           tok_abbreviation,           0},
 #line 147 "locfile-kw.gperf"
       {"first_workday",          tok_first_workday,          0},
@@ -472,12 +472,12 @@  locfile_hash (register const char *str, register unsigned
int len)
 #line 45 "locfile-kw.gperf"
       {"blank",                  tok_blank,                  0},
       {""}, {""},
-#line 194 "locfile-kw.gperf"
+#line 195 "locfile-kw.gperf"
       {"language",               tok_language,               0},
 #line 120 "locfile-kw.gperf"
       {"uno_valid_from",         tok_uno_valid_from,         0},
       {""},
-#line 197 "locfile-kw.gperf"
+#line 198 "locfile-kw.gperf"
       {"application",            tok_application,            0},
       {""},
 #line 80 "locfile-kw.gperf"
@@ -498,7 +498,7 @@  locfile_hash (register const char *str, register unsigned
int len)
 #line 96 "locfile-kw.gperf"
       {"p_sign_posn",            tok_p_sign_posn,            0},
       {""},
-#line 201 "locfile-kw.gperf"
+#line 202 "locfile-kw.gperf"
       {"category",               tok_category,               0},
       {""}, {""}, {""}, {""},
 #line 134 "locfile-kw.gperf"
@@ -510,29 +510,29 @@  locfile_hash (register const char *str, register unsigned
int len)
 #line 63 "locfile-kw.gperf"
       {"order_start",            tok_order_start,            0},
       {""}, {""}, {""}, {""}, {""},
-#line 176 "locfile-kw.gperf"
+#line 177 "locfile-kw.gperf"
       {"lang_ab",                tok_lang_ab,                0},
-#line 178 "locfile-kw.gperf"
+#line 179 "locfile-kw.gperf"
       {"lang_lib",               tok_lang_lib,               0},
       {""}, {""}, {""},
-#line 190 "locfile-kw.gperf"
+#line 191 "locfile-kw.gperf"
       {"contact",                tok_contact,                0},
       {""}, {""}, {""},
-#line 171 "locfile-kw.gperf"
+#line 172 "locfile-kw.gperf"
       {"country_ab3",            tok_country_ab3,            0},
       {""}, {""}, {""},
-#line 191 "locfile-kw.gperf"
+#line 192 "locfile-kw.gperf"
       {"email",                  tok_email,                  0},
-#line 170 "locfile-kw.gperf"
+#line 171 "locfile-kw.gperf"
       {"country_ab2",            tok_country_ab2,            0},
       {""}, {""}, {""},
 #line 55 "locfile-kw.gperf"
       {"default_missing",        tok_default_missing,        0},
       {""}, {""},
-#line 193 "locfile-kw.gperf"
+#line 194 "locfile-kw.gperf"
       {"fax",                    tok_fax,                    0},
       {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 172 "locfile-kw.gperf"
+#line 173 "locfile-kw.gperf"
       {"country_num",            tok_country_num,            0},
       {""}, {""}, {""}, {""}, {""}, {""},
 #line 51 "locfile-kw.gperf"
@@ -548,7 +548,9 @@  locfile_hash (register const char *str, register unsigned
int len)
       {"endif",                  tok_endif,                  0},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 151 "locfile-kw.gperf"
+      {"alt_mon",                tok_alt_mon,                0},
       {""}, {""}, {""}, {""}, {""}, {""}, {""},
 #line 76 "locfile-kw.gperf"
       {"undef",                  tok_undef,                  0},
@@ -569,7 +571,7 @@  locfile_hash (register const char *str, register unsigned
int len)
 #line 85 "locfile-kw.gperf"
       {"mon_decimal_point",      tok_mon_decimal_point,      0},
       {""}, {""},
-#line 167 "locfile-kw.gperf"
+#line 168 "locfile-kw.gperf"
       {"postal_fmt",             tok_postal_fmt,             0},
       {""}, {""}, {""}, {""}, {""},
 #line 60 "locfile-kw.gperf"
@@ -588,7 +590,7 @@  locfile_hash (register const char *str, register unsigned
int len)
 #line 87 "locfile-kw.gperf"
       {"mon_grouping",           tok_mon_grouping,           0},
       {""},
-#line 177 "locfile-kw.gperf"
+#line 178 "locfile-kw.gperf"
       {"lang_term",              tok_lang_term,              0},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
diff --git a/locale/programs/locfile-token.h b/locale/programs/locfile-token.h
index d6e7a8b..1a0afb2 100644
--- a/locale/programs/locfile-token.h
+++ b/locale/programs/locfile-token.h
@@ -186,6 +186,7 @@  enum token_t
   tok_cal_direction,
   tok_timezone,
   tok_date_fmt,
+  tok_alt_mon,
   tok_lc_messages,
   tok_yesexpr,
   tok_noexpr,