Update.

	* locale/programs/locfile.c: Interpret I18NPATH value as base of
	path, extended with "/locales/".

diff --git a/ChangeLog b/ChangeLog
index e6af1a812d882e7b9eb71561fa2843c03a204472..dbcf4b1a2333a36ab4a3c7fd609308b8ba587df3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,9 @@
        * locale/programs/locfile.h: Likewise.
        * locale/programs/stringtrans.c: Likewise.
 
+       * locale/programs/locfile.c: Interpret I18NPATH value as base of
+       path, extended with "/locales/".
+
 1998-04-18  Philip Blundell  <Philip.Blundell@pobox.com>
 
        * sysdeps/arm/memset.S: Fix off by one error.

diff --git a/locale/programs/charmap.c b/locale/programs/charmap.c
index 7114a237a004cb75433134fd76ef96e59bd1e16f..e11df1cf29a83f8f34f4b0c810318b5a13593109 100644 (file)
--- a/locale/programs/charmap.c
+++ b/locale/programs/charmap.c
@@ -211,8 +211,6 @@ parse_charmap (const char *filename)
   memset (result, '\0', sizeof (struct charset_t));
   /* The default DEFAULT_WIDTH is 1.  */
   result->width_default = 1;
-  /* Let the user overwrite the repertoire map we use.  */
-  result->repertoiremap = repertoiremap;
 
 #define obstack_chunk_alloc malloc
 #define obstack_chunk_free free
@@ -269,17 +267,6 @@ parse_charmap (const char *filename)
 
              lr_ignore_rest (cmfile, 1);
 
-             /* Read the repertoire map now.  */
-             if (result->repertoiremap == NULL)
-               /* This is fatal.  */
-               error (4, 0, _("no repertoire map specified: cannot proceed"));
-
-             result->repertoire = repertoire_read (result->repertoiremap);
-             if (result->repertoire == NULL)
-               /* This is also fatal.  */
-               error (4, errno, _("cannot read repertoire map `%s'"),
-                      result->repertoiremap);
-
              state = 2;
              continue;
            }
@@ -288,7 +275,7 @@ parse_charmap (const char *filename)
              && nowtok != tok_mb_cur_min && nowtok != tok_escape_char
              && nowtok != tok_comment_char && nowtok != tok_g0esc
              && nowtok != tok_g1esc && nowtok != tok_g2esc
-             && nowtok != tok_g3esc && nowtok != tok_repertoiremap)
+             && nowtok != tok_g3esc)
            {
              lr_error (cmfile, _("syntax error in prolog: %s"),
                        _("illegal definition"));
@@ -320,18 +307,6 @@ parse_charmap (const char *filename)
              lr_ignore_rest (cmfile, 1);
              continue;
 
-           case tok_repertoiremap:
-             if (arg->tok != tok_ident)
-               goto badarg;
-
-             if (result->repertoiremap == NULL)
-               result->repertoiremap = obstack_copy0 (&result->mem_pool,
-                                                      arg->val.str.start,
-                                                      arg->val.str.len);
-
-             lr_ignore_rest (cmfile, 1);
-             continue;
-
            case tok_mb_cur_max:
            case tok_mb_cur_min:
              if (arg->tok != tok_number)

diff --git a/locale/programs/charset.h b/locale/programs/charset.h
index db93f16306b9f076496b5207abf7632eff327d87..8f066b115bb2f756cddaeac687e74711270bd25b 100644 (file)
--- a/locale/programs/charset.h
+++ b/locale/programs/charset.h
@@ -37,9 +37,6 @@ struct width_rule
 
 struct charset_t
 {
-  const char *repertoiremap;
-  struct repertoire_t *repertoire;
-
   const char *code_set_name;
   int mb_cur_min;
   int mb_cur_max;

diff --git a/locale/programs/locfile.c b/locale/programs/locfile.c
index ad7e9d5fb40d9a57ef5f4b3c58a26d17198a9d3c..5a3fc25e3dea37fb52ec172850ce20f46bb2da51 100644 (file)
--- a/locale/programs/locfile.c
+++ b/locale/programs/locfile.c
@@ -58,6 +58,7 @@ char *xstrdup (const char *__str);
 struct localedef_t *
 locfile_read (const char *filename, struct charset_t *charset)
 {
+  struct repertoire_t *repertoire = NULL;
   struct linereader *ldfile;
   struct localedef_t *result;
   int state;
@@ -80,7 +81,8 @@ locfile_read (const char *filename, struct charset_t *charset)
          char *i18npath = __secure_getenv ("I18NPATH");
          if (i18npath != NULL && *i18npath != '\0')
            {
-             char path[strlen (filename) + 1 + strlen (i18npath) + 1];
+             char path[strlen (filename) + 1 + strlen (i18npath)
+                       + sizeof ("/locales/") - 1];
              char *next;
              i18npath = strdupa (i18npath);
 
@@ -88,7 +90,7 @@ locfile_read (const char *filename, struct charset_t *charset)
              while (ldfile == NULL
                     && (next = strsep (&i18npath, ":")) != NULL)
                {
-                 stpcpy (stpcpy (stpcpy (path, next), "/"), filename);
+                 stpcpy (stpcpy (stpcpy (path, next), "/locales/"), filename);
 
                  ldfile = lr_open (path, locfile_hash);
                }
@@ -249,27 +251,132 @@ argument to `%s' must be a single character"),
                ldfile->comment_char = *arg->val.str.start;
              break;
 
+           case tok_repertoiremap:
+             /* We need an argument.  */
+             arg = lr_token (ldfile, charset);
+
+             if (arg->tok != tok_ident)
+               {
+                 SYNTAX_ERROR (_("bad argument"));
+                 continue;
+               }
+
+             if (repertoiremap == NULL)
+               {
+                 repertoiremap = memcpy (xmalloc (arg->val.str.len + 1),
+                                         arg->val.str.start,
+                                         arg->val.str.len);
+                 ((char *) repertoiremap)[arg->val.str.len] = '\0';
+               }
+
+             lr_ignore_rest (ldfile, 1);
+             continue;
+
            case tok_lc_ctype:
+             if (repertoire == NULL)
+               {
+                 /* Read the repertoire map now.  */
+                 if (repertoiremap == NULL)
+                   /* This is fatal.  */
+                   error (4, 0,
+                          _("no repertoire map specified: cannot proceed"));
+
+                 repertoire = repertoire_read (repertoiremap);
+                 if (repertoire == NULL)
+                   /* This is also fatal.  */
+                   error (4, errno, _("cannot read repertoire map `%s'"),
+                          repertoiremap);
+               }
              state = 2;
              break;
 
            case tok_lc_collate:
+             if (repertoire == NULL)
+               {
+                 /* Read the repertoire map now.  */
+                 if (repertoiremap == NULL)
+                   /* This is fatal.  */
+                   error (4, 0,
+                          _("no repertoire map specified: cannot proceed"));
+
+                 repertoire = repertoire_read (repertoiremap);
+                 if (repertoire == NULL)
+                   /* This is also fatal.  */
+                   error (4, errno, _("cannot read repertoire map `%s'"),
+                          repertoiremap);
+               }
              state = 10;
              break;
 
            case tok_lc_monetary:
+             if (repertoire == NULL)
+               {
+                 /* Read the repertoire map now.  */
+                 if (repertoiremap == NULL)
+                   /* This is fatal.  */
+                   error (4, 0,
+                          _("no repertoire map specified: cannot proceed"));
+
+                 repertoire = repertoire_read (repertoiremap);
+                 if (repertoire == NULL)
+                   /* This is also fatal.  */
+                   error (4, errno, _("cannot read repertoire map `%s'"),
+                          repertoiremap);
+               }
              state = 20;
              break;
 
            case tok_lc_numeric:
+             if (repertoire == NULL)
+               {
+                 /* Read the repertoire map now.  */
+                 if (repertoiremap == NULL)
+                   /* This is fatal.  */
+                   error (4, 0,
+                          _("no repertoire map specified: cannot proceed"));
+
+                 repertoire = repertoire_read (repertoiremap);
+                 if (repertoire == NULL)
+                   /* This is also fatal.  */
+                   error (4, errno, _("cannot read repertoire map `%s'"),
+                          repertoiremap);
+               }
              state = 30;
              break;
 
            case tok_lc_time:
+             if (repertoire == NULL)
+               {
+                 /* Read the repertoire map now.  */
+                 if (repertoiremap == NULL)
+                   /* This is fatal.  */
+                   error (4, 0,
+                          _("no repertoire map specified: cannot proceed"));
+
+                 repertoire = repertoire_read (repertoiremap);
+                 if (repertoire == NULL)
+                   /* This is also fatal.  */
+                   error (4, errno, _("cannot read repertoire map `%s'"),
+                          repertoiremap);
+               }
              state = 40;
              break;
 
            case tok_lc_messages:
+             if (repertoire == NULL)
+               {
+                 /* Read the repertoire map now.  */
+                 if (repertoiremap == NULL)
+                   /* This is fatal.  */
+                   error (4, 0,
+                          _("no repertoire map specified: cannot proceed"));
+
+                 repertoire = repertoire_read (repertoiremap);
+                 if (repertoire == NULL)
+                   /* This is also fatal.  */
+                   error (4, errno, _("cannot read repertoire map `%s'"),
+                          repertoiremap);
+               }
              state = 50;
              break;
 

diff --git a/locale/programs/repertoire.c b/locale/programs/repertoire.c
index 1f219ec81f6ef7519c0829b12b407ea51951e408..e7040a0e2c583371e8d0692966bb3b2e8e77a52d 100644 (file)
--- a/locale/programs/repertoire.c
+++ b/locale/programs/repertoire.c
@@ -38,68 +38,63 @@ extern void *xmalloc (size_t __n);
 
 
 /* Simple keyword hashing for the repertoiremap.  */
-static struct repertoire_t *parse_repertoiremap (const char *filename);
 static const struct keyword_t *repertoiremap_hash (const char *str, int len);
 
 
 struct repertoire_t *
 repertoire_read (const char *filename)
 {
-  const char *pathnfile;
-  struct repertoire_t *result = NULL;
-
-  if (euidaccess (filename, R_OK) >= 0)
-    pathnfile = filename;
-  else if (filename[0] != '/')
-    {
-      char *cp = xmalloc (strlen (filename) + sizeof CHARMAP_PATH + 1);
-      stpcpy (stpcpy (stpcpy (cp, CHARMAP_PATH), "/"), filename);
-
-      pathnfile = (const char *) cp;
-    }
-  else
-    pathnfile = NULL;
-
-  if (pathnfile != NULL)
-    {
-      result = parse_repertoiremap (pathnfile);
-
-      if (result == NULL && !be_quiet)
-       error (0, errno, _("repertoire map file `%s' not found"), filename);
-    }
-
-  return result;
-}
-
-
-static struct repertoire_t *
-parse_repertoiremap (const char *filename)
-{
-  struct linereader *cmfile;
+  struct linereader *repfile;
   struct repertoire_t *result;
   int state;
   char *from_name = NULL;
   char *to_name = NULL;
 
   /* Determine path.  */
-  cmfile = lr_open (filename, repertoiremap_hash);
-  if (cmfile == NULL)
+  repfile = lr_open (filename, repertoiremap_hash);
+  if (repfile == NULL)
     {
       if (strchr (filename, '/') == NULL)
        {
-         /* Look in the systems charmap directory.  */
-         char *buf = xmalloc (strlen (filename) + 1
-                              + sizeof (REPERTOIREMAP_PATH));
+         char *i18npath = __secure_getenv ("I18NPATH");
+         if (i18npath != NULL && *i18npath != '\0')
+           {
+             char path[strlen (filename) + 1 + strlen (i18npath)
+                       + sizeof ("/repertoiremaps/") - 1];
+             char *next;
+             i18npath = strdupa (i18npath);
 
-         stpcpy (stpcpy (stpcpy (buf, REPERTOIREMAP_PATH), "/"), filename);
-         cmfile = lr_open (buf, repertoiremap_hash);
 
-         if (cmfile == NULL)
-           free (buf);
+             while (repfile == NULL
+                    && (next = strsep (&i18npath, ":")) != NULL)
+               {
+                 stpcpy (stpcpy (stpcpy (path, next), "/repertoiremaps/"),
+                         filename);
+
+                 repfile = lr_open (path, repertoiremap_hash);
+               }
+           }
+
+         if (repfile == NULL)
+           {
+             /* Look in the systems charmap directory.  */
+             char *buf = xmalloc (strlen (filename) + 1
+                                  + sizeof (REPERTOIREMAP_PATH));
+
+             stpcpy (stpcpy (stpcpy (buf, REPERTOIREMAP_PATH), "/"),
+                     filename);
+             repfile = lr_open (buf, repertoiremap_hash);
+
+             if (repfile == NULL)
+               free (buf);
+           }
        }
 
-      if (cmfile == NULL)
-       return NULL;
+      if (repfile == NULL)
+       {
+         error (0, errno, _("repertoire map file `%s' not found"), filename);
+         return NULL;
+       }
     }
 
   /* Allocate room for result.  */
@@ -122,7 +117,7 @@ parse_repertoiremap (const char *filename)
   while (1)
     {
       /* What's on?  */
-      struct token *now = lr_token (cmfile, NULL);
+      struct token *now = lr_token (repfile, NULL);
       enum token_t nowtok = now->tok;
       struct token *arg;
 
@@ -141,40 +136,40 @@ parse_repertoiremap (const char *filename)
          if (nowtok == tok_escape_char || nowtok == tok_comment_char)
            {
              /* We know that we need an argument.  */
-             arg = lr_token (cmfile, NULL);
+             arg = lr_token (repfile, NULL);
 
              if (arg->tok != tok_ident)
                {
-                 lr_error (cmfile, _("syntax error in prolog: %s"),
+                 lr_error (repfile, _("syntax error in prolog: %s"),
                            _("bad argument"));
 
-                 lr_ignore_rest (cmfile, 0);
+                 lr_ignore_rest (repfile, 0);
                  continue;
                }
 
              if (arg->val.str.len != 1)
                {
-                 lr_error (cmfile, _("\
+                 lr_error (repfile, _("\
 argument to <%s> must be a single character"),
                            nowtok == tok_escape_char ? "escape_char"
                                                      : "comment_char");
 
-                 lr_ignore_rest (cmfile, 0);
+                 lr_ignore_rest (repfile, 0);
                  continue;
                }
 
              if (nowtok == tok_escape_char)
-               cmfile->escape_char = *arg->val.str.start;
+               repfile->escape_char = *arg->val.str.start;
              else
-               cmfile->comment_char = *arg->val.str.start;
+               repfile->comment_char = *arg->val.str.start;
 
-             lr_ignore_rest (cmfile, 1);
+             lr_ignore_rest (repfile, 1);
              continue;
            }
 
          if (nowtok == tok_charids)
            {
-             lr_ignore_rest (cmfile, 1);
+             lr_ignore_rest (repfile, 1);
 
              state = 2;
              continue;
@@ -199,11 +194,11 @@ argument to <%s> must be a single character"),
 
          if (nowtok != tok_bsymbol)
            {
-             lr_error (cmfile,
+             lr_error (repfile,
                        _("syntax error in repertoire map definition: %s"),
                        _("no symbolic name given"));
 
-             lr_ignore_rest (cmfile, 0);
+             lr_ignore_rest (repfile, 0);
              continue;
            }
 
@@ -238,20 +233,20 @@ argument to <%s> must be a single character"),
          errno = 0;
          if (nowtok != tok_ucs2 && nowtok != tok_ucs4)
            {
-             lr_error (cmfile,
+             lr_error (repfile,
                        _("syntax error in repertoire map definition: %s"),
                        _("no <Uxxxx> or <Uxxxxxxxx> value given"));
 
-             lr_ignore_rest (cmfile, 0);
+             lr_ignore_rest (repfile, 0);
              continue;
            }
 
          /* We've found a new valid definition.  */
-         charset_new_char (cmfile, &result->char_table, 4,
+         charset_new_char (repfile, &result->char_table, 4,
                            now->val.charcode.val, from_name, to_name);
 
          /* Ignore the rest of the line.  */
-         lr_ignore_rest (cmfile, 0);
+         lr_ignore_rest (repfile, 0);
 
          from_name = NULL;
          to_name = NULL;
@@ -261,29 +256,29 @@ argument to <%s> must be a single character"),
        case 4:
          if (nowtok != tok_bsymbol)
            {
-             lr_error (cmfile,
+             lr_error (repfile,
                        _("syntax error in repertoire map definition: %s"),
                        _("no symbolic name given for end of range"));
 
-             lr_ignore_rest (cmfile, 0);
+             lr_ignore_rest (repfile, 0);
              state = 2;
              continue;
            }
 
          /* Copy the to-name in a safe place.  */
          to_name = (char *) obstack_copy0 (&result->mem_pool,
-                                           cmfile->token.val.str.start,
-                                           cmfile->token.val.str.len);
+                                           repfile->token.val.str.start,
+                                           repfile->token.val.str.len);
 
          state = 5;
          continue;
 
        case 90:
          if (nowtok != tok_charids)
-           lr_error (cmfile, _("\
+           lr_error (repfile, _("\
 `%1$s' definition does not end with `END %1$s'"), "CHARIDS");
 
-         lr_ignore_rest (cmfile, nowtok == tok_charids);
+         lr_ignore_rest (repfile, nowtok == tok_charids);
          break;
        }
 
@@ -291,9 +286,9 @@ argument to <%s> must be a single character"),
     }
 
   if (state != 2 && state != 90 && !be_quiet)
-    error (0, 0, _("%s: premature end of file"), cmfile->fname);
+    error (0, 0, _("%s: premature end of file"), repfile->fname);
 
-  lr_close (cmfile);
+  lr_close (repfile);
 
   return result;
 }
@@ -304,8 +299,8 @@ repertoiremap_hash (const char *str, int len)
 {
   static const struct keyword_t wordlist[0] =
   {
-    {"escape_char",      tok_escape_char,     1},
-    {"comment_char",     tok_comment_char,    1},
+    {"escape_char",      tok_escape_char,     0},
+    {"comment_char",     tok_comment_char,    0},
     {"CHARIDS",          tok_charids,         0},
     {"END",              tok_end,             0},
   };

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 8ec112fb74be2198643ecc0bcbf18cf9447ab2d6..964d96614ccb200e0d1b44c2136ca12b8c446fb4 100644 (file)
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,9 +1,82 @@
 1998-04-30  Ulrich Drepper  <drepper@cygnus.com>
 
        * Makefile: Install repertoire maps.
-       * localedata/mnemonic.ds: Moved into repertoiremaps subdir.
-       * localedata/repertoiremaps/charids.894: New file.
-       * localedata/repertoiremaps/mnemonic.ds: New file.
+       * mnemonic.ds: Moved into repertoiremaps subdir.
+       * repertoiremaps/charids.894: New file.
+       * repertoiremaps/mnemonic.ds: New file.
+
+       * sort-test.sh: Adapt for most recent changes in localedef.
+       * tst-fmon.sh: Likewise.
+       * tst-locale.sh: Likewise.
+
+       * locales/POSIX: Add repertoiremap definition.
+       * locales/cs_CZ: Likewise.
+       * locales/da_DK: Likewise.
+       * locales/de_AT: Likewise.
+       * locales/de_BE: Likewise.
+       * locales/de_CH: Likewise.
+       * locales/de_DE: Likewise.
+       * locales/de_LU: Likewise.
+       * locales/en_AU: Likewise.
+       * locales/en_CA: Likewise.
+       * locales/en_CA,2.5: Likewise.
+       * locales/en_DK: Likewise.
+       * locales/en_DK.com: Likewise.
+       * locales/en_GB: Likewise.
+       * locales/en_IE: Likewise.
+       * locales/en_NZ: Likewise.
+       * locales/en_US: Likewise.
+       * locales/es_AR: Likewise.
+       * locales/es_BO: Likewise.
+       * locales/es_CL: Likewise.
+       * locales/es_CO: Likewise.
+       * locales/es_DO: Likewise.
+       * locales/es_EC: Likewise.
+       * locales/es_ES: Likewise.
+       * locales/es_GT: Likewise.
+       * locales/es_HN: Likewise.
+       * locales/es_MX: Likewise.
+       * locales/es_PA: Likewise.
+       * locales/es_PE: Likewise.
+       * locales/es_PY: Likewise.
+       * locales/es_SV: Likewise.
+       * locales/es_US: Likewise.
+       * locales/es_UY: Likewise.
+       * locales/es_VE: Likewise.
+       * locales/et_EE: Likewise.
+       * locales/eu_ES: Likewise.
+       * locales/fi_FI: Likewise.
+       * locales/fo_FO: Likewise.
+       * locales/fr_BE: Likewise.
+       * locales/fr_CA: Likewise.
+       * locales/fr_CA,2.13: Likewise.
+       * locales/fr_CH: Likewise.
+       * locales/fr_FR: Likewise.
+       * locales/fr_LU: Likewise.
+       * locales/ga_IE: Likewise.
+       * locales/gr_GR: Likewise.
+       * locales/he_IL: Likewise.
+       * locales/hr_HR: Likewise.
+       * locales/hu_HU: Likewise.
+       * locales/is_IS: Likewise.
+       * locales/it_IT: Likewise.
+       * locales/iw_IL: Likewise.
+       * locales/kl_GL: Likewise.
+       * locales/lt_LT: Likewise.
+       * locales/lv_LV: Likewise.
+       * locales/nl_BE: Likewise.
+       * locales/nl_NL: Likewise.
+       * locales/no_NO: Likewise.
+       * locales/pl_PL: Likewise.
+       * locales/pt_BR: Likewise.
+       * locales/pt_PT: Likewise.
+       * locales/ro_RO: Likewise.
+       * locales/ru_RU: Likewise.
+       * locales/sl_SI: Likewise.
+       * locales/sv_FI: Likewise.
+       * locales/sv_SE: Likewise.
+       * locales/tr_TR: Likewise.
+       * locales/zh_CN: Likewise.
 
 1998-04-29  Ulrich Drepper  <drepper@cygnus.com>
 

diff --git a/localedata/locales/POSIX b/localedata/locales/POSIX
index 21b09e69d26739c80bdcddab680188e2f2b4cd28..a60ccd8927dbd6bd522e98f1dcfa4f3d68224bd7 100644 (file)
--- a/localedata/locales/POSIX
+++ b/localedata/locales/POSIX
@@ -21,6 +21,8 @@
 # Distribution and use is free, also for
 # commercial purposes.
 
+repertoire_map mnemonic.ds
+
 LC_CTYPE
 # The following is the POSIX Locale LC_CTYPE.
 # "alpha" is by default "upper" and "lower"
@@ -78,132 +80,132 @@ LC_COLLATE
 # This is the POSIX Locale definition for the LC_COLLATE category.
 # The order is the same as in the ASCII code set.
 order_start forward
-<NUL>  
-<SOH>  
-<STX>  
-<ETX>  
-<EOT>  
-<ENQ>  
-<ACK>  
-<alert>        
-<backspace>    
-<tab>  
-<newline>      
-<vertical-tab> 
-<form-feed>    
-<carriage-return>      
+<NUL>
+<SOH>
+<STX>
+<ETX>
+<EOT>
+<ENQ>
+<ACK>
+<alert>
+<backspace>
+<tab>
+<newline>
+<vertical-tab>
+<form-feed>
+<carriage-return>
 <SI>
 <SO>
-<DLE>  
-<DC1>  
-<DC2>  
-<DC3>  
-<DC4>  
-<NAK>  
-<SYN>  
-<ETB>  
-<CAN>  
+<DLE>
+<DC1>
+<DC2>
+<DC3>
+<DC4>
+<NAK>
+<SYN>
+<ETB>
+<CAN>
 <EM>
-<SUB>  
-<ESC>  
-<IS4>  
-<IS3>  
-<IS2>  
-<IS1>  
-<space>        
-<exclamation-mark>     
-<quotation-mark>       
-<number-sign>  
-<dollar-sign>  
-<percent-sign> 
-<ampersand>    
-<apostrophe>   
-<left-parenthesis>     
-<right-parenthesis>    
-<asterisk>     
-<plus-sign>    
-<comma>        
-<hyphen>       
-<period>       
-<slash>        
-<zero> 
-<one>  
-<two>  
-<three>        
-<four> 
-<five> 
-<seven>        
-<eight>        
-<nine> 
-<colon>        
-<semicolon>    
-<less-than-sign>       
-<equals-sign>  
-<greater-than-sign>    
-<question-mark>        
-<commercial-at>        
-<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>    
-<left-square-bracket>  
-<backslash>    
-<right-square-bracket> 
-<circumflex>   
-<underscore>   
-<grave-accent> 
-<a>    
-<b>    
-<c>    
-<d>    
-<e>    
-<f>    
-<g>    
-<h>    
-<i>    
-<j>    
-<k>    
-<l>    
-<m>    
-<n>    
-<o>    
-<p>    
-<q>    
-<r>    
-<s>    
-<t>    
-<u>    
-<v>    
-<w>    
-<y>    
-<z>    
-<left-curly-bracket>   
-<vertical-line>        
-<right-curly-bracket>  
-<tilde>        
-<DEL>  
+<SUB>
+<ESC>
+<IS4>
+<IS3>
+<IS2>
+<IS1>
+<space>
+<exclamation-mark>
+<quotation-mark>
+<number-sign>
+<dollar-sign>
+<percent-sign>
+<ampersand>
+<apostrophe>
+<left-parenthesis>
+<right-parenthesis>
+<asterisk>
+<plus-sign>
+<comma>
+<hyphen>
+<period>
+<slash>
+<zero>
+<one>
+<two>
+<three>
+<four>
+<five>
+<seven>
+<eight>
+<nine>
+<colon>
+<semicolon>
+<less-than-sign>
+<equals-sign>
+<greater-than-sign>
+<question-mark>
+<commercial-at>
+<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>
+<left-square-bracket>
+<backslash>
+<right-square-bracket>
+<circumflex>
+<underscore>
+<grave-accent>
+<a>
+<b>
+<c>
+<d>
+<e>
+<f>
+<g>
+<h>
+<i>
+<j>
+<k>
+<l>
+<m>
+<n>
+<o>
+<p>
+<q>
+<r>
+<s>
+<t>
+<u>
+<v>
+<w>
+<y>
+<z>
+<left-curly-bracket>
+<vertical-line>
+<right-curly-bracket>
+<tilde>
+<DEL>
 order_end
 #
 END LC_COLLATE

diff --git a/localedata/locales/cs_CZ b/localedata/locales/cs_CZ
index 734fde972d964e928b15c3a1343b040074624d8a..1a1abc4a05f8165a1995cfc2ddce81dfd809bb92 100644 (file)
--- a/localedata/locales/cs_CZ
+++ b/localedata/locales/cs_CZ
@@ -1,5 +1,6 @@
 escape_char /
 comment_char %
+repertoiremap mnemonic.ds
 %
 % Czech Language Locale for Czech
 % Source:

diff --git a/localedata/locales/da_DK b/localedata/locales/da_DK
index ce375c04e393be966e1a884778939158c7340bb4..0b2d665579f181f4ef13c6dee54db1e5fdadefeb 100644 (file)
--- a/localedata/locales/da_DK
+++ b/localedata/locales/da_DK
@@ -1,5 +1,6 @@
 escape_char /
 comment_char %
+repertoiremap mnemonic.ds
 
 % Danish language locale for Denmark
 % Source: Danish Standards Association
@@ -15,7 +16,7 @@ comment_char %
 % Date: 1996-10-15
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/de_AT b/localedata/locales/de_AT
index a4642179d40bed172fb4c24536ec8f2dd51f4456..14b2fcf3cce7b11cadba968e807b505a5755d002 100644 (file)
--- a/localedata/locales/de_AT
+++ b/localedata/locales/de_AT
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 
 % German Language Locale for Austria
 % Source: O:sterreiches Normungsinstitut
@@ -13,7 +14,7 @@ escape_char  /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/de_BE b/localedata/locales/de_BE
index 953b04b825027318fc1bc719903106e59859df4d..d5b460f8318e296c1a0d845825fa1b8efe981595 100644 (file)
--- a/localedata/locales/de_BE
+++ b/localedata/locales/de_BE
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % German Language Locale for Belgium
 % Source: RAP
@@ -14,7 +15,7 @@ escape_char  /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/de_CH b/localedata/locales/de_CH
index 3f4f6753241be8c5ddf0e046e9c0fb9fef68821f..40011ecba9bd0d604022b8e1b14892c053980581 100644 (file)
--- a/localedata/locales/de_CH
+++ b/localedata/locales/de_CH
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % German Language Locale for Switzerland
 % Source: RAP
@@ -14,7 +15,7 @@ escape_char  /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/de_DE b/localedata/locales/de_DE
index 615a35e022a370309dd0e14930352d347933fce3..8516f1e69db633aa203ef92671857d7269202bd0 100644 (file)
--- a/localedata/locales/de_DE
+++ b/localedata/locales/de_DE
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % German Language Locale for Germany
 % Source: RAP
@@ -14,7 +15,7 @@ escape_char  /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/de_LU b/localedata/locales/de_LU
index 6ba48df1d8ffa1fa1a240040144062d2ceebf4c2..d79df2ad93543cfbe7a4c9a6ed7ede5756a1ce39 100644 (file)
--- a/localedata/locales/de_LU
+++ b/localedata/locales/de_LU
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % German Language Locale for Luxemburg
 % Source: RAP
@@ -14,7 +15,7 @@ escape_char  /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/en_AU b/localedata/locales/en_AU
index 1e84be529eccdb54231262b5fd44af58a81b6517..0986ed38f4ad0c371d71fe2ebdebe682352d54d8 100644 (file)
--- a/localedata/locales/en_AU
+++ b/localedata/locales/en_AU
@@ -1,5 +1,6 @@
 escape_char  /
 comment_char  %
+repertoiremap mnemonic.ds
 
 % English language locale for Australia
 % Source: RAP
@@ -14,7 +15,7 @@ comment_char  %
 % Revision: 4.3
 % Date: 1997-11-05
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/en_CA b/localedata/locales/en_CA
index d0e28c9ed0f1b7ce6b4c559b4de8ec7f7bfe8c62..7b0cad089ad0fc6d7c6f3bf6e7863cbcbe00a042 100644 (file)
--- a/localedata/locales/en_CA
+++ b/localedata/locales/en_CA
@@ -1,5 +1,6 @@
 escape_char  /
 comment_char  %
+repertoiremap mnemonic.ds
 
 % English language locale for Canada
 % sorting according to CAN/CSA-Z243.4.1-1992
@@ -16,7 +17,7 @@ comment_char  %
 % Date: 1996-10-15
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/en_CA,2.5 b/localedata/locales/en_CA,2.5
index b2accb0913310ee3639b016f775a9968f60e5aa6..ee12945c5feb42a35dfcb34a2022453e6682d7c4 100644 (file)
--- a/localedata/locales/en_CA,2.5
+++ b/localedata/locales/en_CA,2.5
@@ -1,4 +1,5 @@
 escape_char /
+repertoiremap charids.894
 ###############################################################################
 # English language locale for Canada / Locale de langue anglaise pour le Canada
 #
@@ -21,35 +22,35 @@ escape_char /
 #
 # Copyright (C) GIA, Canada 1994,1995
 #
-# Distribution and usage are free, including for commercial purposes.  In all 
-# instances, the source must be cited and the present notice reproduced. If   
-# required, only a minimal and reasonable charge is permitted for this        
-# distribution. This charge, if applicable, should be limited to the cost of  
-# the medium used for distribution. In all cases, no other cost shall be      
-# associated with the use.                                                    
+# Distribution and usage are free, including for commercial purposes.  In all
+# instances, the source must be cited and the present notice reproduced. If
+# required, only a minimal and reasonable charge is permitted for this
+# distribution. This charge, if applicable, should be limited to the cost of
+# the medium used for distribution. In all cases, no other cost shall be
+# associated with the use.
 #
 # This LOCALE is an integral part of CAN/CSA Z243.230 standard.
 # Its use is not sufficient to guarantee conformance to this standard.
 # Please refer to the text of the CAN/CSA Z243.230 standard to know its exact
 # conformance requirements.
 # This standard can be obtained from:
-#         Canadian Standards Association/Standards Sales                       
-#         178, Rexdale Blvd., Rexdale (Toronto), ON  M9W 1R3                   
+#         Canadian Standards Association/Standards Sales
+#         178, Rexdale Blvd., Rexdale (Toronto), ON  M9W 1R3
 #         Canada                Tel.: +1 416 747 4044      Fax: +1 416 747 2475
-#                                                                               
-# Distribution et usage gratuits, y compris <a!> des fins commerciales.  On   
-# se doit de citer la source, de reproduire le pr<e'>sent avertissement et de 
-# n'exiger, s'il y a lieu, qu'un co<u>>t minime et raisonnable se limitant au 
+#
+# Distribution et usage gratuits, y compris <a!> des fins commerciales.  On
+# se doit de citer la source, de reproduire le pr<e'>sent avertissement et de
+# n'exiger, s'il y a lieu, qu'un co<u>>t minime et raisonnable se limitant au
 # co<u>>t du support utilis<e'> pour la distribution. Dans tous les cas, il ne
-# doit y avoir aucun co<u>>t associ<e'> <a!> l'usage.                         
+# doit y avoir aucun co<u>>t associ<e'> <a!> l'usage.
 #
-# Cette LOCALE est une partie int<e'>grante de la norme CAN/CSA Z243.230. 
-# L'utilisation de la pr<e'>sente LOCALE ne suffit pas pour assurer la 
+# Cette LOCALE est une partie int<e'>grante de la norme CAN/CSA Z243.230.
+# L'utilisation de la pr<e'>sente LOCALE ne suffit pas pour assurer la
 # conformit<e'> <a!> cette norme. Veuillez vous r<e'>f<e'>rer au texte de la
 # norme CAN/CSA Z243.230 pour en conna<i/>>tre les exigences de conformit<e'>.
 # Cette norme peut <e/>>tre obtenue aupr<e!>s de:
-#         Association canadienne de normalisation/Vente des normes             
-#         178, boul. Rexdale, Rexdale (Toronto), ON  M9W 1R3                   
+#         Association canadienne de normalisation/Vente des normes
+#         178, boul. Rexdale, Rexdale (Toronto), ON  M9W 1R3
 #         Canada             T<e'>l.: +1 416 747 4044      Fax: +1 416 747 2475
 #
 ###############################################################################
@@ -163,15 +164,15 @@ order_start forward;backward;forward;forward,position
 <ACA>                 #                            0180
 <GRA>                 #                            0190
 <BRE>                 #                            0192  diacr. NAPLPS/6937
-<CIR>                 #                            0200     
+<CIR>                 #                            0200
 <CAR>                 #                            0202  diacr. NAPLPS/6937
-<RNE>                 #                            0210     
-<REU>                 #                            0220     
+<RNE>                 #                            0210
+<REU>                 #                            0220
 <DAC>                 #                            0225  diacr. NAPLPS/6937
-<TIL>                 #                            0230     
+<TIL>                 #                            0230
 <PCT>                 #                            0235  diacr. NAPLPS/6937
-<OBL>                 #                            0240     
-<CDI>                 #                            0250     
+<OBL>                 #                            0240
+<CDI>                 #                            0250
 <OGO>                 #                            0252  diacr. NAPLPS/6937
 <MAC>                 #                            0255  diacr. NAPLPS/6937
 #
@@ -382,7 +383,7 @@ order_start forward;backward;forward;forward,position
 <n,>            <n110>;<CDI>;<MIN>;IGNORE                              #0146
 <ng>            <n110><g103>;<LIG><LIG>;<MIN><MIN>;IGNORE              #014B
 <o>             <o111>;<BAS>;<MIN>;IGNORE         #o                    006F
-<-o>            <o111>;<PCL>;<EMI>;IGNORE                         #§    00BA    
+<-o>            <o111>;<PCL>;<EMI>;IGNORE                         #§    00BA
 <o'>            <o111>;<ACA>;<MIN>;IGNORE                         #¢    00F3
 <o!>            <o111>;<GRA>;<MIN>;IGNORE                         #\95    00F2
 <o/>>           <o111>;<CIR>;<MIN>;IGNORE                 #\93            00F4

diff --git a/localedata/locales/en_DK b/localedata/locales/en_DK
index 57bd34def1aa9bd5345e335ab17ba68b48005cf1..c0ee514e89b7d02252308cec8598386275d0e2f8 100644 (file)
--- a/localedata/locales/en_DK
+++ b/localedata/locales/en_DK
@@ -1,5 +1,6 @@
 escape_char /
 comment_char %
+repertoiremap mnemonic.ds
 
 % English language locale for Denmark
 %
@@ -19,7 +20,7 @@ comment_char %
 % Date: 1996-09-18
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO_8859-1:1987
 % Distribution and use is free, also for
 % commercial purposes.

diff --git a/localedata/locales/en_DK.com b/localedata/locales/en_DK.com
index 104c51fcd30bbfd9432b722225416880fbe4a79b..e1aba0b747824acaa34ceccd3dee486019804fa3 100644 (file)
--- a/localedata/locales/en_DK.com
+++ b/localedata/locales/en_DK.com
@@ -1,5 +1,6 @@
 escape_char /
 comment_char %
+repertoiremap mnemonic.ds
 
 % English language locale for Denmark
 %

diff --git a/localedata/locales/en_GB b/localedata/locales/en_GB
index c349ee0c228326396e379c244fa9b699bf2fbe9c..97b5979ed5ac58194f49e0adf35d1b1026ec7120 100644 (file)
--- a/localedata/locales/en_GB
+++ b/localedata/locales/en_GB
@@ -1,5 +1,6 @@
 escape_char  /
 comment_char  %
+repertoiremap mnemonic.ds
 
 % English language locale for Britain
 % Source: RAP
@@ -14,7 +15,7 @@ comment_char  %
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/en_IE b/localedata/locales/en_IE
index 9f4670f31c4040de44ce92a9e8d2b4194a3d28ef..6e3c7f8902abf9146127bd86fd8d7642b60195ba 100644 (file)
--- a/localedata/locales/en_IE
+++ b/localedata/locales/en_IE
@@ -1,5 +1,6 @@
 escape_char  /
 comment_char  %
+repertoiremap mnemonic.ds
 
 % English language locale for Ireland
 % Source: RAP
@@ -14,7 +15,7 @@ comment_char  %
 % Revision: 4.4
 % Date: 1997-11-05
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/en_NZ b/localedata/locales/en_NZ
index e116c805e4ec80b038eef2bdaa6406006b06f5c7..d34e01b9c9087bce11ed8046e7adf9046cf54a8b 100644 (file)
--- a/localedata/locales/en_NZ
+++ b/localedata/locales/en_NZ
@@ -1,5 +1,6 @@
 escape_char  /
 comment_char  %
+repertoiremap mnemonic.ds
 
 % English language locale for New Zealand
 % Source: RAP
@@ -14,7 +15,7 @@ comment_char  %
 % Revision: 4.3
 % Date: 1997-11-05
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/en_US b/localedata/locales/en_US
index ebd171982dbb48802b9b278c4ebf37c450671ad0..c95365cf59eba0fd0ec1f7cc2795410ff5b69f0b 100644 (file)
--- a/localedata/locales/en_US
+++ b/localedata/locales/en_US
@@ -1,5 +1,6 @@
 escape_char  /
 comment_char  %
+repertoiremap mnemonic.ds
 
 % English language locale for USA
 % Source: RAP
@@ -14,7 +15,7 @@ comment_char  %
 % Revision: 4.4
 % Date: 1997-11-05
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/es_AR b/localedata/locales/es_AR
index a4eab6425b62ca9f33f593c28d552e55ffae492e..e9020ef1d68d2939368cbba7bc436d37048ea9e2 100644 (file)
--- a/localedata/locales/es_AR
+++ b/localedata/locales/es_AR
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Spanish language locale for Argentina
 % Source: RAP
@@ -15,7 +16,7 @@ escape_char  /
 % Date: 1997-11-05
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/es_BO b/localedata/locales/es_BO
index 1cd75898459ece16f0bcf700ab4b6d977b1acd80..72288385cd0fda880d3d5bcdc01e095fbbef76b6 100644 (file)
--- a/localedata/locales/es_BO
+++ b/localedata/locales/es_BO
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Spanish language locale for Bolivia
 % Source: RAP
@@ -15,7 +16,7 @@ escape_char  /
 % Date: 1997-11-05
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/es_CL b/localedata/locales/es_CL
index 96f0ec28309308c4f68584de2d1094775a92f644..e675717195cd27304f39a5877f118e9b37261ae1 100644 (file)
--- a/localedata/locales/es_CL
+++ b/localedata/locales/es_CL
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Spanish language locale for Chile
 % Source: RAP
@@ -15,7 +16,7 @@ escape_char  /
 % Date: 1997-11-05
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/es_CO b/localedata/locales/es_CO
index 8723870043fda8cf1f1668899c999f93c6ab0d68..a8533a71f4d93fd6ba36b047379cdda14bc26b37 100644 (file)
--- a/localedata/locales/es_CO
+++ b/localedata/locales/es_CO
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Spanish language locale for Colombia
 % Source: RAP
@@ -15,7 +16,7 @@ escape_char  /
 % Date: 1997-11-05
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/es_DO b/localedata/locales/es_DO
index 719a50e6777074416897e7306a4c2a40fdb8608f..dec757c3d091bcca07420f547cf347f19bac1486 100644 (file)
--- a/localedata/locales/es_DO
+++ b/localedata/locales/es_DO
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Spanish language locale for Dominican Republic
 % Source: RAP
@@ -15,7 +16,7 @@ escape_char  /
 % Date: 1997-11-05
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/es_EC b/localedata/locales/es_EC
index 4df56ad9e8c11bbbb62e3aa09bf23855e2881659..8270287c2f95263fb97ca04b26eddc5eb300b113 100644 (file)
--- a/localedata/locales/es_EC
+++ b/localedata/locales/es_EC
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Spanish Language Locale for Equador
 % Source: RAP
@@ -15,7 +16,7 @@ escape_char  /
 % Date: 1997-03-18
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/es_ES b/localedata/locales/es_ES
index ba2bc8e005aad754e336dec0423f7dd647c9b9e4..46d9e8fb5ac34b851b41ebb3efa203e1da999561 100644 (file)
--- a/localedata/locales/es_ES
+++ b/localedata/locales/es_ES
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Spanish Language Locale for Spain
 % Source: RAP
@@ -15,7 +16,7 @@ escape_char  /
 % Date: 1997-03-18
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/es_GT b/localedata/locales/es_GT
index fabde6d1d789c30cd8b7e1011b4133b937f0f5e2..71a0eb63c6865bccca0a9ead3452f35b64622242 100644 (file)
--- a/localedata/locales/es_GT
+++ b/localedata/locales/es_GT
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Spanish language locale for Guatemala
 % Source: RAP
@@ -15,7 +16,7 @@ escape_char  /
 % Date: 1997-11-05
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/es_HN b/localedata/locales/es_HN
index 7b562bdb908f4fe3c0660fe60533a409f5f8f861..86d11e2c97485725e04fecd0c5dc3c178ab24632 100644 (file)
--- a/localedata/locales/es_HN
+++ b/localedata/locales/es_HN
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Spanish language locale for Honduras
 % Source: RAP

diff --git a/localedata/locales/es_MX b/localedata/locales/es_MX
index 02868617d4fbf4b1424dab3940ebcf7a8d74d6aa..523e8228371a27bbb2787a316438987db766f3b3 100644 (file)
--- a/localedata/locales/es_MX
+++ b/localedata/locales/es_MX
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Spanish language locale for Mexico
 % Source: RAP
@@ -15,7 +16,7 @@ escape_char  /
 % Date: 1997-11-05
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/es_PA b/localedata/locales/es_PA
index 63e8d5d48bb87cd9feee45a95e4512afcf3e7d96..0b11b5ea34eafdc7df3864720c234642d2a36948 100644 (file)
--- a/localedata/locales/es_PA
+++ b/localedata/locales/es_PA
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Spanish language locale for Panama
 % Source: RAP
@@ -15,7 +16,7 @@ escape_char  /
 % Date: 1997-11-05
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/es_PE b/localedata/locales/es_PE
index 10d7d37047d54dbf821744f80e375bb738f107cf..ce9bf77e85f74c4678e0130b515f46fb0ec5b768 100644 (file)
--- a/localedata/locales/es_PE
+++ b/localedata/locales/es_PE
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Spanish language locale for Peru
 % Source: RAP
@@ -15,7 +16,7 @@ escape_char  /
 % Date: 1997-11-05
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/es_PY b/localedata/locales/es_PY
index 816f6d7233d26dc60debe6f76c5c83e1d3e32978..44bb29e3f096885f1d959c339d0382ce28bba8b1 100644 (file)
--- a/localedata/locales/es_PY
+++ b/localedata/locales/es_PY
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Spanish language locale for Paraguay
 % Source: RAP
@@ -15,7 +16,7 @@ escape_char  /
 % Date: 1997-11-05
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/es_SV b/localedata/locales/es_SV
index ff3ab39c91788da6330700a840101398ecc8d16e..4e8b34eaeadac40b49ac9d015d8e52d73e82595d 100644 (file)
--- a/localedata/locales/es_SV
+++ b/localedata/locales/es_SV
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Spanish language locale for El Salvador
 % Source: RAP
@@ -15,7 +16,7 @@ escape_char  /
 % Date: 1997-11-05
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/es_US b/localedata/locales/es_US
index 2dc16517e656286f6e7456686eb3fe00cd199147..8123a7741211e6d90c3652d4c9caafd98a082e4f 100644 (file)
--- a/localedata/locales/es_US
+++ b/localedata/locales/es_US
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Spanish Language Locale for U.S.A.
 % Source: RAP
@@ -15,7 +16,7 @@ escape_char  /
 % Date: 1997-03-18
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/es_UY b/localedata/locales/es_UY
index e65a973f80f8a513f63da391a64fe00a9f071bdd..f673d8267e973282318d0cdf62c3fbb4c968e4af 100644 (file)
--- a/localedata/locales/es_UY
+++ b/localedata/locales/es_UY
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Spanish language locale for Uruguay
 % Source: RAP
@@ -15,7 +16,7 @@ escape_char  /
 % Date: 1997-11-05
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/es_VE b/localedata/locales/es_VE
index 168483f116e9c95c7a5f6346fdeb6d971785c110..ede6b1cc7d55e10e6a8e6fd20516b11e18024c66 100644 (file)
--- a/localedata/locales/es_VE
+++ b/localedata/locales/es_VE
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Spanish language locale for Venezuela
 % Source: RAP
@@ -15,7 +16,7 @@ escape_char  /
 % Date: 1997-11-05
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/et_EE b/localedata/locales/et_EE
index a4dbe0b78beef65c7322618d727fd6457fd31936..bbc7d4d796ae2175ce801973016739f530ce5f47 100644 (file)
--- a/localedata/locales/et_EE
+++ b/localedata/locales/et_EE
@@ -1,5 +1,6 @@
 escape_char  /
 comment_char %
+repertoiremap mnemonic.ds
 
 % Estonian language locale for Estonia
 % according to EVS 8:1993
@@ -16,7 +17,7 @@ comment_char %
 % Date: 1996-10-15
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/eu_ES b/localedata/locales/eu_ES
index 8835b0e4dada27b31ae217ec211982209f1ce2e4..03c8c1041e0f60fd571769e356b8d0886b31efbb 100644 (file)
--- a/localedata/locales/eu_ES
+++ b/localedata/locales/eu_ES
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Basque Language Locale for Spain
 % Source: RAP
@@ -15,7 +16,7 @@ escape_char  /
 % Date: 1996-10-15
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/fi_FI b/localedata/locales/fi_FI
index 0d0a97aa292aaf7155ebb01fe50edf287951cee4..b35e6c83259b77697b607ee76152736ea1cba1d2 100644 (file)
--- a/localedata/locales/fi_FI
+++ b/localedata/locales/fi_FI
@@ -1,5 +1,6 @@
 escape_char    /
 comment_char    %
+repertoiremap mnemonic.ds
 
 % Finnish language locale for Finland
 % sorting according to SFS 4600 (1986-06-09)

diff --git a/localedata/locales/fo_FO b/localedata/locales/fo_FO
index b9a474cf58780505f6ad9fee2b688af1fab06b50..a0fde5c868f31124c1061f7469f652c25e25e2da 100644 (file)
--- a/localedata/locales/fo_FO
+++ b/localedata/locales/fo_FO
@@ -1,5 +1,6 @@
 escape_char /
 comment_char %
+repertoiremap mnemonic.ds
 
 % Faroese language locale for Faroe Islands
 % Source: Danish Standards Association
@@ -14,7 +15,7 @@ comment_char %
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/fr_BE b/localedata/locales/fr_BE
index b7752f6cc2c020224787359df76c48cafe6d8624..6d8f2a76552c870b17924abe9abe8be58481d1c6 100644 (file)
--- a/localedata/locales/fr_BE
+++ b/localedata/locales/fr_BE
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % French Language Locale for Belgium
 % Source: RAP
@@ -14,7 +15,7 @@ escape_char  /
 % Revision: 4.4
 % Date: 1997-03-18
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/fr_CA b/localedata/locales/fr_CA
index 60f3745774dacfeb6af59cf642db46db264f2c63..5143916122f36152d6314f532a0c4c6bd9107dc8 100644 (file)
--- a/localedata/locales/fr_CA
+++ b/localedata/locales/fr_CA
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % French Language Locale for Canada
 % Source: RAP
@@ -14,7 +15,7 @@ escape_char  /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/fr_CA,2.13 b/localedata/locales/fr_CA,2.13
index bd3f77c645f5c578c976b261b0bb105ca7dafe0f..25d5fa9b2ad303b2cd3c7d9131591f8ef291163e 100644 (file)
--- a/localedata/locales/fr_CA,2.13
+++ b/localedata/locales/fr_CA,2.13
@@ -1,4 +1,5 @@
 escape_char /
+repertoiremap charids.894
 ###########################################################################
 ####
 # Locale de langue fran<c,>aise pour le Canada / French lang. locale for Canada

diff --git a/localedata/locales/fr_CH b/localedata/locales/fr_CH
index c0e32dc4f7c03dc56f1a8c3e4ffb87dd226379dc..51db22df18e8237094bfc03341c9cf7a8ba3e9dc 100644 (file)
--- a/localedata/locales/fr_CH
+++ b/localedata/locales/fr_CH
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % French Language Locale for Switzerland
 % Source: RAP
@@ -14,7 +15,7 @@ escape_char  /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/fr_FR b/localedata/locales/fr_FR
index bf60b8fddb10edea02d1ed23aa0ee2519512caa3..d5a9dc64e405f414d0c5cfd479c801d9a92b7bdc 100644 (file)
--- a/localedata/locales/fr_FR
+++ b/localedata/locales/fr_FR
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % French Language Locale for France
 % Source: RAP
@@ -14,7 +15,7 @@ escape_char  /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/fr_LU b/localedata/locales/fr_LU
index 364db9813ef34904242c4d8dad0e5f8565203da0..fd0c7f63b860c14a152c960c633368e3330ed15a 100644 (file)
--- a/localedata/locales/fr_LU
+++ b/localedata/locales/fr_LU
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % French Language Locale for Luxemburg
 % Source: RAP
@@ -14,7 +15,7 @@ escape_char  /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/ga_IE b/localedata/locales/ga_IE
index 9ef73ff4242156b177f246da687a049b8593d2db..933e395f9b52e83b907a98889c5690cb9fde8ff1 100644 (file)
--- a/localedata/locales/ga_IE
+++ b/localedata/locales/ga_IE
@@ -1,5 +1,6 @@
 escape_char  /
 comment_char  %
+repertoiremap mnemonic.ds
 % Irish language locale for Ireland
 % Source: NSAI
 % Address: Glasnevin, Dublin 9, Ireland
@@ -12,7 +13,7 @@ comment_char  %
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/gr_GR b/localedata/locales/gr_GR
index 088a57e2fa8ab1191b38adbb5f668582828d695f..559594eafd0d83f60f856bb123d6ed2c20941e08 100644 (file)
--- a/localedata/locales/gr_GR
+++ b/localedata/locales/gr_GR
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Greek Language Locale for Greece
 % Source: RAP
@@ -14,7 +15,7 @@ escape_char  /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-7
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/he_IL b/localedata/locales/he_IL
index 02f4a3f8e642325d749543af96c2bb79371790c6..e62846d89d83f5f8f29a86e2f650097c3e942542 100644 (file)
--- a/localedata/locales/he_IL
+++ b/localedata/locales/he_IL
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Hebrew Language Locale for Israel
 % Source: RAP
@@ -14,7 +15,7 @@ escape_char  /
 % Revision: 4.4
 % Date: 1997-03-18
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-8
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/hr_HR b/localedata/locales/hr_HR
index 35a91f044c0135bbf6a43d09c74d8d19332a4a55..cf9101fa8e0c7f469ea07c47797ce039be9f6fc9 100644 (file)
--- a/localedata/locales/hr_HR
+++ b/localedata/locales/hr_HR
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Croatian Language Locale for Croatia
 % Source: USM/MZT
@@ -15,7 +16,7 @@ escape_char  /
 % Date: 1997-04-17
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-2
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/hu_HU b/localedata/locales/hu_HU
index 12829112aee275ec19d2e4aee8e6c6f1d0c2b1bd..17dc52ea08bbdc9a7a2e02480eddd3ff228b4efc 100644 (file)
--- a/localedata/locales/hu_HU
+++ b/localedata/locales/hu_HU
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Hungarian Language Locale for Hungary
 % Source: RAP
@@ -15,7 +16,7 @@ escape_char  /
 % Date: 1996-10-15
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-2
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/is_IS b/localedata/locales/is_IS
index 217c0f6ab69353d635d39c3c9634d2fc60062db5..d5658fbddecc5b2c833f8b4b87bcf398b4ba0faf 100644 (file)
--- a/localedata/locales/is_IS
+++ b/localedata/locales/is_IS
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 
 % Icelandic Language Locale for Iceland
 % Source: Stadlarad I'slands

diff --git a/localedata/locales/it_IT b/localedata/locales/it_IT
index 058269bc8855da984175ad52967730fd8578c15a..aa154db6f4fa6da438dac715371f96dfa7eff488 100644 (file)
--- a/localedata/locales/it_IT
+++ b/localedata/locales/it_IT
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Italian Language Locale for Italy
 % Source: RAP
@@ -14,7 +15,7 @@ escape_char  /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/iw_IL b/localedata/locales/iw_IL
index 02f4a3f8e642325d749543af96c2bb79371790c6..e62846d89d83f5f8f29a86e2f650097c3e942542 100644 (file)
--- a/localedata/locales/iw_IL
+++ b/localedata/locales/iw_IL
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Hebrew Language Locale for Israel
 % Source: RAP
@@ -14,7 +15,7 @@ escape_char  /
 % Revision: 4.4
 % Date: 1997-03-18
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-8
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/kl_GL b/localedata/locales/kl_GL
index 7510411d42eb43ea41e9c22eb35776a9ec0a5bb2..157f8d6c7bc6eb7262e8d9144c07faf2e91351f1 100644 (file)
--- a/localedata/locales/kl_GL
+++ b/localedata/locales/kl_GL
@@ -1,5 +1,6 @@
 escape_char /
 comment_char %
+repertoiremap mnemonic.ds
 
 % Greenlandic language locale for Greenland
 % Source: Danish Standards Association
@@ -14,7 +15,7 @@ comment_char %
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/lt_LT b/localedata/locales/lt_LT
index cac28b18f550017d93bd2b4004697a3a8c9daba0..c4e472077b3bce2b0f15e741b1820b83133986a4 100644 (file)
--- a/localedata/locales/lt_LT
+++ b/localedata/locales/lt_LT
@@ -1,5 +1,6 @@
 escape_char /
 comment_char %
+repertoiremap mnemonic.ds
 
 % Lithuanian language locale for Lithuania
 % Created on January 30, 1992
@@ -25,7 +26,7 @@ comment_char %
 % Date: 1995-08-28
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: BALTIC
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/lv_LV b/localedata/locales/lv_LV
index 7853f9cbe52cc32fd97e92a539db0da82e3cedf8..02fff689ac5a8cfa6e7307767dfd6446f77d4b84 100644 (file)
--- a/localedata/locales/lv_LV
+++ b/localedata/locales/lv_LV
@@ -1,5 +1,6 @@
 escape_char /
 comment_char %
+repertoiremap mnemonic.ds
 
 % Latvian language locale for Latvia
 % Source: Latvian Standard LVS 24-93
@@ -15,7 +16,7 @@ comment_char %
 % Date: 1995-08-28
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: BALTIC
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/nl_BE b/localedata/locales/nl_BE
index 2901d081cb21eb351b4292911b6b21020c90beaf..2efe3d63283e7e323bd2c5ce782515b01abf0f43 100644 (file)
--- a/localedata/locales/nl_BE
+++ b/localedata/locales/nl_BE
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Dutch Language Locale for Belgium
 % Source: RAP
@@ -14,7 +15,7 @@ escape_char  /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/nl_NL b/localedata/locales/nl_NL
index 2a467d8b4ed399d5ca9938e3a35f7b63915f8b1c..a5e143bfa63a667b4b47d59ab152c38ac0e52ca1 100644 (file)
--- a/localedata/locales/nl_NL
+++ b/localedata/locales/nl_NL
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Dutch Language Locale for the Netherlands
 % Source: RAP
@@ -14,7 +15,7 @@ escape_char  /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/no_NO b/localedata/locales/no_NO
index 67f797d2588f68a83a735656e90340a9f4984c1a..364ee4878fca08b7a1031ed1d8180f7f1042eae2 100644 (file)
--- a/localedata/locales/no_NO
+++ b/localedata/locales/no_NO
@@ -1,5 +1,6 @@
 escape_char    /
 comment_char    %
+repertoiremap mnemonic.ds
 
 % Norwegian language locale for Norway
 % Source: Norsk Standardiseringsforbund
@@ -15,7 +16,7 @@ comment_char    %
 % Date: 1996-10-15
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/pl_PL b/localedata/locales/pl_PL
index 9b1bdcba8056fa0ab17898c08c8ecae8a807ad55..64e0bb6cfae470fc3d12dd8381cbb1d9d10c03fa 100644 (file)
--- a/localedata/locales/pl_PL
+++ b/localedata/locales/pl_PL
@@ -1,5 +1,6 @@
 comment_char %
 escape_char /
+repertoiremap mnemonic.ds
 %
 % Polish Language Locale for Poland
 % Source: RAP
@@ -15,7 +16,7 @@ escape_char /
 % Date: 1997-03-18
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-2
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/pt_BR b/localedata/locales/pt_BR
index 5bbd989ac9c224d5a931deeb777488f687e96791..ca0f8c80af3322f8deeca4258afe808050ce290e 100644 (file)
--- a/localedata/locales/pt_BR
+++ b/localedata/locales/pt_BR
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Portuguese Language Locale for Brasil
 % Source: RAP
@@ -14,7 +15,7 @@ escape_char  /
 % Revision: 4.4
 % Date: 1997-03-19
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/pt_PT b/localedata/locales/pt_PT
index f9e67305a5c22514d47fe3dec5612ff12233fcc7..e404c92015a6dde41dcd191b5ac7a885acdcb5ba 100644 (file)
--- a/localedata/locales/pt_PT
+++ b/localedata/locales/pt_PT
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Portuguese Language Locale for Portugal
 % Source: RAP
@@ -14,7 +15,7 @@ escape_char  /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/ro_RO b/localedata/locales/ro_RO
index 59e297a9e7316a57639c44605b624ef1e36f3199..8b3ec88864d20b9d17537021aab0ffd88f24fde5 100644 (file)
--- a/localedata/locales/ro_RO
+++ b/localedata/locales/ro_RO
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Romanian Language Locale for Romania
 % Source: RAP
@@ -15,7 +16,7 @@ escape_char  /
 % Date: 1996-10-15
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-2
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/ru_RU b/localedata/locales/ru_RU
index 18c9faaa8c1e7a9377413b4594bb78f9c4f2cbe0..f0f6fa8ef54ce2b3033e0240e90c599207d28fda 100644 (file)
--- a/localedata/locales/ru_RU
+++ b/localedata/locales/ru_RU
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Russian Language Locale for Russia
 % Source: RAP
@@ -15,7 +16,7 @@ escape_char  /
 % Date: 1996-10-15
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-5
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/sl_SI b/localedata/locales/sl_SI
index 9d19a5847c40fb6846e41e324ef455f67a5ba6f3..f3da1f97b468c98ee934628f20b3f583a14fe966 100644 (file)
--- a/localedata/locales/sl_SI
+++ b/localedata/locales/sl_SI
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Slovenian language locale for Slovenia
 % Source: USM/MZT
@@ -15,7 +16,7 @@ escape_char  /
 % Date: 1997-11-05
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-2
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/sv_FI b/localedata/locales/sv_FI
index fceca6eaa03c2976c31709d05bd8e6e92ded6d05..82d77d04ae59ff379a26b77dfd7ade2a0d87e653 100644 (file)
--- a/localedata/locales/sv_FI
+++ b/localedata/locales/sv_FI
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Swedish Language Locale for Finland
 % Source: RAP
@@ -14,7 +15,7 @@ escape_char  /
 % Revision: 4.3
 % Date: 1996-10-15
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/sv_SE b/localedata/locales/sv_SE
index 405802b89514a0065dd7fa2fcd92b9b97cbbce96..2826d759e5f8ce5858441b3dbb3e0f3f86f381e4 100644 (file)
--- a/localedata/locales/sv_SE
+++ b/localedata/locales/sv_SE
@@ -1,5 +1,6 @@
 escape_char    /
 comment_char    %
+repertoiremap mnemonic.ds
 
 % Swedish language locale for Sweden
 % Source: RAP
@@ -15,7 +16,7 @@ comment_char    %
 % Date: 1997-03-18
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-1
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/tr_TR b/localedata/locales/tr_TR
index d0a3c3ea4c1c11489ddafdf2cdb0074f2cc0852f..d5b9d86ff292514a526c2dce7e01b577ca2f0032 100644 (file)
--- a/localedata/locales/tr_TR
+++ b/localedata/locales/tr_TR
@@ -1,5 +1,6 @@
 comment_char %
 escape_char  /
+repertoiremap mnemonic.ds
 %
 % Turkish Language Locale for Turkey
 % Source: RAP
@@ -15,7 +16,7 @@ escape_char  /
 % Date: 1997-03-18
 % Application: general
 % Users: general
-% Repertoiremap: mnemonic,ds
+% Repertoiremap: mnemonic.ds
 % Charset: ISO-8859-9
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/locales/zh_CN b/localedata/locales/zh_CN
index 01afd136fa12cecbd22796c1226d20b234a75164..b7d5439b916a0db919168becf74980639cf3f04e 100644 (file)
--- a/localedata/locales/zh_CN
+++ b/localedata/locales/zh_CN
@@ -14,7 +14,6 @@ escape_char  /
 % Revision: 4.3
 % Date: 1997-11-09
 % Users: general
-% Repertoiremap: mnemonic,ds
 % Charset: GB_2312-80
 % Distribution and use is free, also
 % for commercial purposes.

diff --git a/localedata/repertoiremaps/charids.894 b/localedata/repertoiremaps/charids.894
index 868a4782ed41a03edc16afec0b750ab4bde213c6..74d5facddfeba000750d033902b364084b570aee 100644 (file)
--- a/localedata/repertoiremaps/charids.894
+++ b/localedata/repertoiremaps/charids.894
@@ -1,7 +1,7 @@
-<escape_char> /
+escape_char /
 # Charids refering to ISO 10646/Correspondance des caract<e!>res avec ISO 10646
 # Version: 1994-08-25
-#<comment_char> #
+#comment_char #
 CHARIDS
 <NUL>   <U0000>  # NULL / NUL
 <SOH>   <U0001>  # START OF HEADING / D<E'>BUT D'ENT<E/>>TE

diff --git a/localedata/repertoiremaps/mnemonic.ds b/localedata/repertoiremaps/mnemonic.ds
index fb70c3b7849f6076ec48294c99eaa5ad05236fb7..6d0fd69b9b2a69fec208f503ba8997e85ae5704b 100644 (file)
--- a/localedata/repertoiremaps/mnemonic.ds
+++ b/localedata/repertoiremaps/mnemonic.ds
@@ -1,4 +1,4 @@
-<escape_char> /
+escape_char /
 <NUL>  <U0000> NULL (NUL)
 <SOH>  <U0001> START OF HEADING (SOH)
 <STX>  <U0002> START OF TEXT (STX)

diff --git a/localedata/sort-test.sh b/localedata/sort-test.sh
index affbb26312fb8ae4c597df7f52e4295a22c66a50..322d40cb2cec9e5e085a19a3cfe5e29b8b6b2a86 100644 (file)
--- a/localedata/sort-test.sh
+++ b/localedata/sort-test.sh
@@ -11,7 +11,7 @@ for l in $lang; do
   cns=`echo $l | sed 's/\(.*\)[.][^.]*/\1/'`
   cn=locales/$cns
   fn=charmaps/`echo $l | sed 's/.*[.]\([^.]*\)/\1/'`
-  I18NPATH=./locales ${common_objpfx}elf/ld.so --library-path $common_objpfx \
+  I18NPATH=. ${common_objpfx}elf/ld.so --library-path $common_objpfx \
    ${common_objpfx}locale/localedef --quiet -i $cn -f $fn \
    ${common_objpfx}localedata/$cns
 done

diff --git a/localedata/tst-fmon.sh b/localedata/tst-fmon.sh
index 4192a405d6e6f950c7f275ac62fa84f69178a0c3..a98a3bfce05e573b8fc1eab80fd14fbba0ccebe1 100755 (executable)
--- a/localedata/tst-fmon.sh
+++ b/localedata/tst-fmon.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Testing the implementation of strfmon(3).
-# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Jochen Hein <jochen.hein@delphi.central.de>, 1997.
 #
@@ -32,7 +32,7 @@ for l in $lang; do
     cns=`echo $l | sed 's/\(.*\)[.][^.]*/\1/'`
     cn=locales/$cns
     fn=charmaps/`echo $l | sed 's/.*[.]\([^.]*\)/\1/'`
-    I18NPATH=./locales \
+    I18NPATH=. \
     ${common_objpfx}elf/ld.so --library-path $common_objpfx \
     ${common_objpfx}locale/localedef \
     --quiet -i $cn -f $fn ${common_objpfx}localedata/$cns

diff --git a/localedata/tst-locale.sh b/localedata/tst-locale.sh
index e52749de6d9eb8b53582ca27afdb8670c997bb77..db94acb64fda6bfd517fed5214c2a2d2091be22a 100755 (executable)
--- a/localedata/tst-locale.sh
+++ b/localedata/tst-locale.sh
@@ -26,10 +26,11 @@ test_locale ()
     charmap=$1
     input=$2
     out=$3
-    I18NPATH=./locales \
+    rep=$4
+    I18NPATH=. \
     ${common_objpfx}elf/ld.so --library-path $common_objpfx \
     ${common_objpfx}locale/localedef --quiet -c -f $charmap -i $input \
-    ${common_objpfx}localedata/$out
+      --repertoire-map $rep ${common_objpfx}localedata/$out
 
     if [ $? -ne 0 ]; then
        echo "Charmap: \"${charmap}\" Inputfile: \"${input}\"" \
@@ -40,13 +41,13 @@ test_locale ()
 
 # I take this out for now since it is a known problem
 # (see [PR libc/229] and [PR libc/454]. --drepper
-# test_locale IBM437 de_DE de_DE.437
-test_locale tests/test1.cm tests/test1.def test1
-test_locale tests/test2.cm tests/test2.def test2
-test_locale tests/test3.cm tests/test3.def test3
-test_locale tests/test4.cm tests/test4.def test4
+# test_locale IBM437 de_DE de_DE.437 mnemonic.ds
+test_locale tests/test1.cm tests/test1.def test1 mnemonic.ds
+test_locale tests/test2.cm tests/test2.def test2 mnemonic.ds
+test_locale tests/test3.cm tests/test3.def test3 mnemonic.ds
+test_locale tests/test4.cm tests/test4.def test4 mnemonic.ds
 # I know that multi-byte charsets do not yet work. --drepper
-# test_locale tests/test5.cm tests/test5.def test5
+# test_locale tests/test5.cm tests/test5.def test5 mnemonic.ds
 
 exit 0