From 3dd90163bb9ecb7d8b6c7a2f7d6bc746571a7ea9 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 24 Mar 1998 17:03:23 +0000
Subject: Update.

	* elf/dl-close.c (_dl_close): Replace questionable memcpy by loop.

1998-03-24  Thorsten Kukuk  <kukuk@vt.uni-paderborn.de>

	* libc.map: Add more rpc auth functions/variables.

	* nscd/nscd.c: Add -g option to argp options.

1998-03-24  Ulrich Drepper  <drepper@cygnus.com>

	* configure.in: Be prepared for gcc 2.9.10 and up.
	* configure.in: Add missing disabling of quote characters in
	compiler version check.  Reported by HJ Lu.

1998-03-24  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* malloc/mtrace.c: Include elf/ldsodefs.h instead of link.h.

1998-03-24  Ulrich Drepper  <drepper@cygnus.com>

	* intl/locale.alias: Fix spelling of romanian.
---
 ChangeLog                    |  22 ++
 configure                    |   2 +-
 configure.in                 |   4 +-
 elf/dl-close.c               |   7 +-
 libc.map                     |  10 +-
 localedata/ChangeLog         |  56 ++++
 localedata/locales/cs_CZ     |  36 +--
 localedata/locales/da_DK     |  62 ++---
 localedata/locales/en_AU     |   4 +-
 localedata/locales/en_CA     |  62 ++---
 localedata/locales/en_DK     |  62 ++---
 localedata/locales/en_DK.com | 638 +++++++++++++++++++++----------------------
 localedata/locales/en_GB     |   4 +-
 localedata/locales/en_NZ     |   4 +-
 localedata/locales/en_US     |   4 +-
 localedata/locales/es_AR     |  62 ++---
 localedata/locales/es_BO     |  62 ++---
 localedata/locales/es_CL     |  62 ++---
 localedata/locales/es_CO     |  62 ++---
 localedata/locales/es_DO     |  62 ++---
 localedata/locales/es_EC     |  62 ++---
 localedata/locales/es_ES     |  62 ++---
 localedata/locales/es_GT     |  62 ++---
 localedata/locales/es_HN     |  62 ++---
 localedata/locales/es_MX     |  62 ++---
 localedata/locales/es_PA     |  62 ++---
 localedata/locales/es_PE     |  62 ++---
 localedata/locales/es_PY     |  62 ++---
 localedata/locales/es_SV     |  62 ++---
 localedata/locales/es_US     |  62 ++---
 localedata/locales/es_UY     |  62 ++---
 localedata/locales/es_VE     |  62 ++---
 localedata/locales/et_EE     |  68 ++---
 localedata/locales/eu_ES     |   4 +-
 localedata/locales/fi_FI     |  62 ++---
 localedata/locales/fo_FO     |   4 +-
 localedata/locales/fr_BE     |   6 +-
 localedata/locales/fr_CA     |   6 +-
 localedata/locales/fr_CH     |   6 +-
 localedata/locales/fr_FR     |   6 +-
 localedata/locales/fr_LU     |   6 +-
 localedata/locales/ga_IE     |   4 +-
 localedata/locales/gr_GR     |   4 +-
 localedata/locales/he_IL     |   4 +-
 localedata/locales/hr_HR     |  62 ++---
 localedata/locales/hu_HU     |  62 ++---
 localedata/locales/is_IS     |  62 ++---
 localedata/locales/it_IT     |   4 +-
 localedata/locales/iw_IL     |   4 +-
 localedata/locales/ja_JP     |  16 +-
 localedata/locales/kl_GL     |   4 +-
 localedata/locales/lt_LT     |  62 ++---
 localedata/locales/lv_LV     |  60 ++--
 localedata/locales/no_NO     |  62 ++---
 localedata/locales/pl_PL     |  62 ++---
 localedata/locales/pt_PT     |   4 +-
 localedata/locales/ro_RO     |  62 ++---
 localedata/locales/ru_RU     |   4 +-
 localedata/locales/sl_SI     |  62 ++---
 localedata/locales/sv_SE     |  62 ++---
 localedata/locales/tr_TR     |   4 +-
 localedata/locales/zh_CN     |   4 +-
 malloc/mtrace.c              |   4 +-
 nscd/nscd.c                  |   1 +
 64 files changed, 1483 insertions(+), 1395 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1bacb0fa89..14ce1ebd98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,27 @@
 1998-03-24  Ulrich Drepper  <drepper@cygnus.com>
 
+	* elf/dl-close.c (_dl_close): Replace questionable memcpy by loop.
+
+1998-03-24  Thorsten Kukuk  <kukuk@vt.uni-paderborn.de>
+
+	* libc.map: Add more rpc auth functions/variables.
+
+	* nscd/nscd.c: Add -g option to argp options.
+
+1998-03-24  Ulrich Drepper  <drepper@cygnus.com>
+
+	* configure.in: Be prepared for gcc 2.9.10 and up.
+	* configure.in: Add missing disabling of quote characters in
+	compiler version check.  Reported by HJ Lu.
+
+1998-03-24  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* malloc/mtrace.c: Include elf/ldsodefs.h instead of link.h.
+
+1998-03-24  Ulrich Drepper  <drepper@cygnus.com>
+
+	* intl/locale.alias: Fix spelling of romanian.
+
 	* sunrpc/Makefile (headers): Add rpc/rpc_des.h.
 	(distribute): Remove des.h.
 	* include/des.h: New file.
diff --git a/configure b/configure
index a689644a65..6154b14221 100755
--- a/configure
+++ b/configure
@@ -1685,7 +1685,7 @@ fi
 echo $ac_n "checking compiler version""... $ac_c" 1>&6
 echo "configure:1687: checking compiler version" >&5
 case `${CC-cc} -v 2>&1` in
-  *egcs-2.91.* | *egcs-1.0.2-9* | *egcs-1.1* | *2.8.1-9* | *2.9.0-9 )
+  *egcs-2.91.* | *egcs-1.0.[2-9]* | *egcs-1.1* | *2.8.[1-9]* | *2.9.[0-9] )
     cc_is_recent="ok"
     ;;
   *)
diff --git a/configure.in b/configure.in
index 1b85727856..2a80a8b0aa 100644
--- a/configure.in
+++ b/configure.in
@@ -470,14 +470,16 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 # check for recent compiler
 AC_MSG_CHECKING(compiler version)
+changequote(,)dnl
 case `${CC-cc} -v 2>&1` in
-  *egcs-2.91.* | *egcs-1.0.[2-9]* | *egcs-1.1* | *2.8.[1-9]* | *2.9.[0-9] )
+  *egcs-2.91.* | *egcs-1.0.[2-9]* | *egcs-1.1* | *2.8.[1-9]* | *2.9.[0-9]*)
     cc_is_recent="ok"
     ;;
   *)
     cc_is_recent="too old"
     ;;
 esac
+changequote([,])dnl
 AC_MSG_RESULT($cc_is_recent)
 if test "$cc_is_recent" != "ok"; then
   AC_MSG_WARN([
diff --git a/elf/dl-close.c b/elf/dl-close.c
index ad84f94338..566e345165 100644
--- a/elf/dl-close.c
+++ b/elf/dl-close.c
@@ -95,8 +95,11 @@ _dl_close (struct link_map *map)
 	      do
 		--tail;
 	      while (*tail != imap);
-	      memcpy (tail, tail + 1,
-		      (char *) _dl_global_scope_end - (char *) tail);
+	      while (tail <= _dl_global_scope_end)
+		{
+		  tail[0] = tail[1];
+		  ++tail;
+		}
 	      --_dl_global_scope_end;
 	    }
 
diff --git a/libc.map b/libc.map
index b04544821d..3dbd234ee9 100644
--- a/libc.map
+++ b/libc.map
@@ -459,6 +459,10 @@ GLIBC_2.1 {
     # Changed getline function in libio.
     _IO_getline_info;
 
+    # Special Pointer to avoid keyserv deadlock
+    __key_decryptsession_pk_LOCAL; __key_encryptsession_pk_LOCAL;
+    __key_gendes_LOCAL;
+
     # chown interface change.
     chown;
 
@@ -494,9 +498,9 @@ GLIBC_2.1 {
     fopen; fclose; fdopen;
 
     # g*
-    gai_strerror; getcontext; getdate; getdate_r; getnameinfo; getpt; grantpt;
-    getitimer; getrusage; getrlimit64; gettimeofday;
-    getutxent; getutxid; getutxline;
+    gai_strerror; getcontext; getdate; getdate_r; getitimer; getname;
+    getnameinfo; getpt; getrlimit64; getrusage; gettimeofday;
+    getutxent; getutxid; getutxline; grantpt;
 
     # New special glibc functions.
     gnu_get_libc_release; gnu_get_libc_version;
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 54fe5d6277..8fb04ef3a2 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -13,6 +13,62 @@
 
 	* locales/nl_NL: Fix yesexpr/noexpr.
 	* locales/pt_BR: Likewise.
+	* locales/cs_CZ: Likewise.
+	* locales/da_DK: Likewise.
+	* locales/en_AU: Likewise.
+	* locales/en_CA: Likewise.
+	* locales/en_DK: Likewise.
+	* locales/en_DK.com: Likewise.
+	* locales/en_GB: 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_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/ja_JP: Likewise.
+	* locales/kl_GL: Likewise.
+	* locales/lt_LT: Likewise.
+	* locales/lv_LV: Likewise.
+	* locales/no_NO: Likewise.
+	* locales/pl_PL: Likewise.
+	* locales/pt_PT: Likewise.
+	* locales/ro_RO: Likewise.
+	* locales/ru_RU: Likewise.
+	* locales/sl_SI: Likewise.
+	* locales/sv_SE: Likewise.
+	* locales/tr_TR: Likewise.
+	* locales/zh_CN: Likewise.
 
 1998-03-14  Ulrich Drepper  <drepper@cygnus.com>
 
diff --git a/localedata/locales/cs_CZ b/localedata/locales/cs_CZ
index 05000d7669..734fde972d 100644
--- a/localedata/locales/cs_CZ
+++ b/localedata/locales/cs_CZ
@@ -2,7 +2,7 @@ escape_char /
 comment_char %
 %
 % Czech Language Locale for Czech
-% Source: 
+% Source:
 % Address: 	U školy 292		Without diactitical chars:	U skoly 292
 %		783 72 Velký Týnec					782 72 Velky Tynec
 % Contact: Vladimir Michl
@@ -41,41 +41,41 @@ comment_char %
 % jsou vynechány všechny speciální znaky, které nejsou písmena, nebo číslice
 % (kromě nerozdělitelné mezery).
 % K těmto znakům se přihlíží pouze při jinak zcela shodných výrazech.
-% V cs_CZ je spojení písmen c a h následujících po sobě je vždy považováno 
+% V cs_CZ je spojení písmen c a h následujících po sobě je vždy považováno
 % jako písmeno ch.
 % V cs_CZ-ch je spojení písmen c a h považováno jako dvě písmena c a h, tj.
 % písmeno ch je zařazeno pod písmeno c.
 % 3.2:
-% Mezera se řadí před první písmeno abecedy, ale každý znak mezery je 
+% Mezera se řadí před první písmeno abecedy, ale každý znak mezery je
 % uvažován samostatně.
 % 3.6:
 % Není dodržen celý:
 % 3.7:
 % Pokud jsou výrazy stejné při primárním řazení (podle std. čes. abecedy)
-% a zároveň stejné i při sekundárním řazení (porovnávání diakritických 
+% a zároveň stejné i při sekundárním řazení (porovnávání diakritických
 % znamének), pak mají velká písmena přednost před malými.
 % 3.8:
 % Tento bod je dodržen pouze pro několik písmen (německé ostré Beta (ss))
-% Zde předpokládám splnění podmínek bodu 3.9 (tj. při větším výskytu 
-% písmen z cicích abeced je povoleno je nerozepisovat a řadit až za lat. 
+% Zde předpokládám splnění podmínek bodu 3.9 (tj. při větším výskytu
+% písmen z cicích abeced je povoleno je nerozepisovat a řadit až za lat.
 % abecedu a číslice)
 % 3.10:
 % Čísla nejsou řazena podle číselné hodnoty, ale podle jednotlivých číslic
 % 3.12:
-% Pokud jsou výrazy shodné v prvních třech průchodech, pak jsou 
-% porovnávány pozice jednotlivých nepísmených a nečíselných značek. Jako 
+% Pokud jsou výrazy shodné v prvních třech průchodech, pak jsou
+% porovnávány pozice jednotlivých nepísmených a nečíselných značek. Jako
 % první bude zařazeno heslo, u kterého je tato značka blíže začátku slova.
 % Pokud jsou i potom stejné, pak je se teprve porovnávají hodnoty značek.
 % 3.13:
 % Tento bod jsem se snažil dodržet, bohužel seřadit znaménka je dost náročné
-% a navíc je zde záleží na implementaci, kam budou znaménka zařazena, 
+% a navíc je zde záleží na implementaci, kam budou znaménka zařazena,
 % pokud se vyskytne jako výraz pouze nepísmený či nečíselný znak(y).
 
 % zpracování:
 %%    localedef -c -i <tento-soubor> -f "ISO_8859-2:1987" 'cs_CZ.ISO-8859-2'
 %% pokud se podaří odstranit chyby, lze -c vynechat.
 
-%% pro úspěšné přeložení je třeba mít kolekci lokalizací WG15collection. Tuto rozbalit do adresáře 
+%% pro úspěšné přeložení je třeba mít kolekci lokalizací WG15collection. Tuto rozbalit do adresáře
 %% /usr/share/i18n
 %% Lokalizace se pak budou tvořit v adresáři /usr/share/locale
 
@@ -103,7 +103,7 @@ LC_COLLATE
 %     members of equivalence classes
 %  3. A distinction is made with regards
 %     to case as noted below.
-%  4. Special characters are ignored 
+%  4. Special characters are ignored
 %     when comparing letters, but then
 %     they are considered
 %  5. The alphabets are sorted in order
@@ -131,10 +131,10 @@ collating-symbol <SMALL>
 % and Spanish <C><h> being treated
 % as one letter.
 
-% The <a8> ...... <z8> collating 
+% The <a8> ...... <z8> collating
 % symbols have defined weights as
 % the last character in a group of
-% Latin letters. They are used 
+% Latin letters. They are used
 % to specify deltas by locales using
 % a locale as the default ordering
 % and by "replace-after" statements
@@ -360,7 +360,7 @@ order_start forward;forward;forward;position;forward
 <1H>	IGNORE;IGNORE;IGNORE;<1H>;<1H>
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Zde jsou všechna latinská písmena s diakritikou 
+% Zde jsou všechna latinská písmena s diakritikou
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 <A>	<A>;<NONE>;<CAPITAL>;IGNORE;IGNORE
@@ -2264,10 +2264,10 @@ END LC_CTYPE
 %% ekvivalenty yes/no
 %% -------------------------
 
-LC_MESSAGES 
+LC_MESSAGES
 
-yesexpr		"<<(><a><A><y><Y><)/>><.><*>"
-noexpr  	"<<(><n><N><)/>><.><*>"
+yesexpr		"<'/>><<(><a><A><y><Y><)/>><.><*>"
+noexpr  	"<'/>><<(><n><N><)/>><.><*>"
 yesstr		"<a><n><o>"
 nostr		"<n><e>"
 
@@ -2342,7 +2342,7 @@ mon		"<l><e><d><e><n>";/
 		"<p><r><o><s><i><n><e><c>"
 
 % Obávám se, že čeština žádné zkratky pro měsíce nezná :-)
-% No nevím zda je to dobře vyskloňováno, ale 
+% No nevím zda je to dobře vyskloňováno, ale
 %  na razítkách občas bývá třeba 1. červce ...
 
 abmon		"<l><e><d><e><n>";/
diff --git a/localedata/locales/da_DK b/localedata/locales/da_DK
index 728ab65655..ce375c04e3 100644
--- a/localedata/locales/da_DK
+++ b/localedata/locales/da_DK
@@ -45,7 +45,7 @@ collating-element <a-a> from "<a><a>"
 %     members of equivalence classes
 %  3. A distinction is made with regards
 %     to case as noted below.
-%  4. Special characters are ignored 
+%  4. Special characters are ignored
 %     when comparing letters, but then
 %     they are considered
 %  5. The alphabets are sorted in order
@@ -73,10 +73,10 @@ collating-symbol <SMALL>
 % and Spanish <C><h> being treated
 % as one letter.
 
-% The <a8> ...... <z8> collating 
+% The <a8> ...... <z8> collating
 % symbols have defined weights as
 % the last character in a group of
-% Latin letters. They are used 
+% Latin letters. They are used
 % to specify deltas by locales using
 % a locale as the default ordering
 % and by "replace-after" statements
@@ -992,7 +992,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <a->	<A>;<MACRON>;<SMALL>;IGNORE
 <A7>	<A>;<MACRON+DOT>;<CAPITAL>;IGNORE
 <a7>	<A>;<MACRON+DOT>;<SMALL>;IGNORE
-<a8>	
+<a8>
 <B>	<B>;<NONE>;<CAPITAL>;IGNORE
 <b>	<B>;<NONE>;<SMALL>;IGNORE
 <B.>	<B>;<DOT>;<CAPITAL>;IGNORE
@@ -1001,7 +1001,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <b-.>	<B>;<DOT-BELOW>;<SMALL>;IGNORE
 <B_>	<B>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <b_>	<B>;<LINE-BELOW>;<SMALL>;IGNORE
-<b8>	
+<b8>
 <C>	<C>;<NONE>;<CAPITAL>;IGNORE
 <c>	<C>;<NONE>;<SMALL>;IGNORE
 <C'>	<C>;<ACUTE>;<CAPITAL>;IGNORE
@@ -1018,7 +1018,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <c,>	<C>;<CEDILLA>;<SMALL>;IGNORE
 <C,'>	<C>;<CEDILLA+ACUTE>;<CAPITAL>;IGNORE
 <c,'>	<C>;<CEDILLA+ACUTE>;<SMALL>;IGNORE
-<c8>	
+<c8>
 <D>	<D>;<NONE>;<CAPITAL>;IGNORE
 <d>	<D>;<NONE>;<SMALL>;IGNORE
 <D<>	<D>;<CARON>;<CAPITAL>;IGNORE
@@ -1035,7 +1035,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <d-/>>	<D>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
 <D_>	<D>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <d_>	<D>;<LINE-BELOW>;<SMALL>;IGNORE
-<d8>	
+<d8>
 <D->	<D>;<D->;<CAPITAL>;IGNORE
 <d->	<D>;<D->;<SMALL>;IGNORE
 <E>	<E>;<NONE>;<CAPITAL>;IGNORE
@@ -1088,14 +1088,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <e-!>	<E>;<MACRON+GRAVE>;<SMALL>;IGNORE
 <E-/>>	<E>;<MACRON+CIRCUMFLEX>;<CAPITAL>;IGNORE
 <e-/>>	<E>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
-<e8>	
+<e8>
 <F>	<F>;<NONE>;<CAPITAL>;IGNORE
 <f>	<F>;<NONE>;<SMALL>;IGNORE
 <F2>	<F>;<HOOK>;<CAPITAL>;IGNORE
 <f2>	<F>;<HOOK>;<SMALL>;IGNORE
 <F.>	<F>;<DOT>;<CAPITAL>;IGNORE
 <f.>	<F>;<DOT>;<SMALL>;IGNORE
-<f8>	
+<f8>
 <ff>	"<F><F>";"<NONE><NONE>";"<ff><ff>";IGNORE
 <fi>	"<F><I>";"<NONE><NONE>";"<fi><fi>";IGNORE
 <fl>	"<F><L>";"<NONE><NONE>";"<fl><fl>";IGNORE
@@ -1120,7 +1120,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <g,>	<G>;<CEDILLA>;<SMALL>;IGNORE
 <G->	<G>;<MACRON>;<CAPITAL>;IGNORE
 <g->	<G>;<MACRON>;<SMALL>;IGNORE
-<g8>	
+<g8>
 <H>	<H>;<NONE>;<CAPITAL>;IGNORE
 <h>	<H>;<NONE>;<SMALL>;IGNORE
 <H-(>	<H>;<BREVE-BELOW>;<CAPITAL>;IGNORE
@@ -1137,7 +1137,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <h//>	<H>;<STROKE>;<SMALL>;IGNORE
 <H,>	<H>;<CEDILLA>;<CAPITAL>;IGNORE
 <h,>	<H>;<CEDILLA>;<SMALL>;IGNORE
-<h8>	
+<h8>
 <I>	<I>;<NONE>;<CAPITAL>;IGNORE
 <i>	<I>;<NONE>;<SMALL>;IGNORE
 <I'>	<I>;<ACUTE>;<CAPITAL>;IGNORE
@@ -1172,14 +1172,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <i;>	<I>;<OGONEK>;<SMALL>;IGNORE
 <I->	<I>;<MACRON>;<CAPITAL>;IGNORE
 <i->	<I>;<MACRON>;<SMALL>;IGNORE
-<i8>	
+<i8>
 <IJ>	"<I><J>";"<IJ><IJ>";"<CAPITAL><CAPITAL>";IGNORE
 <ij>	"<I><J>";"<IJ><IJ>";"<SMALL><SMALL>";IGNORE
 <J>	<J>;<NONE>;<CAPITAL>;IGNORE
 <j>	<J>;<NONE>;<SMALL>;IGNORE
 <J/>>	<J>;<CIRCUMFLEX>;<CAPITAL>;IGNORE
 <j/>>	<J>;<CIRCUMFLEX>;<SMALL>;IGNORE
-<j8>	
+<j8>
 <K>	<K>;<NONE>;<CAPITAL>;IGNORE
 <k>	<K>;<NONE>;<SMALL>;IGNORE
 <K'>	<K>;<ACUTE>;<CAPITAL>;IGNORE
@@ -1194,7 +1194,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <k,>	<K>;<CEDILLA>;<SMALL>;IGNORE
 <K_>	<K>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <k_>	<K>;<LINE-BELOW>;<SMALL>;IGNORE
-<k8>	
+<k8>
 <L>	<L>;<NONE>;<CAPITAL>;IGNORE
 <l>	<L>;<NONE>;<SMALL>;IGNORE
 <L'>	<L>;<ACUTE>;<CAPITAL>;IGNORE
@@ -1215,7 +1215,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <l-/>>	<L>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
 <L_>	<L>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <l_>	<L>;<LINE-BELOW>;<SMALL>;IGNORE
-<l8>	
+<l8>
 <M>	<M>;<NONE>;<CAPITAL>;IGNORE
 <m>	<M>;<NONE>;<SMALL>;IGNORE
 <M'>	<M>;<ACUTE>;<CAPITAL>;IGNORE
@@ -1224,7 +1224,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <m.>	<M>;<DOT>;<SMALL>;IGNORE
 <M-.>	<M>;<DOT-BELOW>;<CAPITAL>;IGNORE
 <m-.>	<M>;<DOT-BELOW>;<SMALL>;IGNORE
-<m8>	
+<m8>
 <N>	<N>;<NONE>;<CAPITAL>;IGNORE
 <n>	<N>;<NONE>;<SMALL>;IGNORE
 <N'>	<N>;<ACUTE>;<CAPITAL>;IGNORE
@@ -1244,7 +1244,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <N_>	<N>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <n_>	<N>;<LINE-BELOW>;<SMALL>;IGNORE
 <'n>	<N>;<PRECEDED-BY-APOSTROPHE>;<SMALL>;IGNORE
-<n8>	
+<n8>
 <NG>	"<N><G>";"<NG><NG>";"<CAPITAL><CAPITAL>";IGNORE
 <ng>	"<N><G>";"<NG><NG>";"<SMALL><SMALL>";IGNORE
 <O>	<O>;<NONE>;<CAPITAL>;IGNORE
@@ -1306,7 +1306,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <o9?>	<O>;<HORN+TILDE>;<SMALL>;IGNORE
 <O9-.>	<O>;<HORN+DOT-BELOW>;<CAPITAL>;IGNORE
 <o9-.>	<O>;<HORN+DOT-BELOW>;<SMALL>;IGNORE
-<o8>	
+<o8>
 <OE>	"<O><E>";"<OE><OE>";"<CAPITAL><CAPITAL>";IGNORE
 <oe>	"<O><E>";"<OE><OE>";"<SMALL><SMALL>";IGNORE
 <P>	<P>;<NONE>;<CAPITAL>;IGNORE
@@ -1315,10 +1315,10 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <p'>	<P>;<ACUTE>;<SMALL>;IGNORE
 <P.>	<P>;<DOT>;<CAPITAL>;IGNORE
 <p.>	<P>;<DOT>;<SMALL>;IGNORE
-<p8>	
+<p8>
 <Q>	<Q>;<NONE>;<CAPITAL>;IGNORE
 <q>	<Q>;<NONE>;<SMALL>;IGNORE
-<q8>	
+<q8>
 <kk>	<Q>;<SPECIAL>;<SMALL>;IGNORE
 <R>	<R>;<NONE>;<CAPITAL>;IGNORE
 <r>	<R>;<NONE>;<SMALL>;IGNORE
@@ -1340,7 +1340,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <r--.>	<R>;<MACRON+DOT-BELOW>;<SMALL>;IGNORE
 <R_>	<R>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <r_>	<R>;<LINE-BELOW>;<SMALL>;IGNORE
-<r8>	
+<r8>
 <S>	<S>;<NONE>;<CAPITAL>;IGNORE
 <s>	<S>;<NONE>;<SMALL>;IGNORE
 <st>	"<S><T>";"<NONE><NONE>";"<st><st>";IGNORE
@@ -1362,7 +1362,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <s.-.>	<S>;<DOT+DOT-BELOW>;<SMALL>;IGNORE
 <S,>	<S>;<CEDILLA>;<CAPITAL>;IGNORE
 <s,>	<S>;<CEDILLA>;<SMALL>;IGNORE
-<s8>	
+<s8>
 <s1>	<S>;<s1>;<SMALL>;IGNORE
 <ss>	"<S><S>";"<NONE><NONE>";"<SMALL><ss>";IGNORE
 <T>	<T>;<NONE>;<CAPITAL>;IGNORE
@@ -1381,7 +1381,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <t-/>>	<T>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
 <T_>	<T>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <t_>	<T>;<LINE-BELOW>;<SMALL>;IGNORE
-<t8>	
+<t8>
 <TH>	"<T><H>";"<TH><TH>";"<CAPITAL><CAPITAL>";IGNORE
 <th>	"<T><H>";"<TH><TH>";"<SMALL><SMALL>";IGNORE
 <U>	<U>;<NONE>;<CAPITAL>;IGNORE
@@ -1442,14 +1442,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <u9?>	<U>;<HORN+TILDE>;<SMALL>;IGNORE
 <U9-.>	<U>;<HORN+DOT-BELOW>;<CAPITAL>;IGNORE
 <u9-.>	<U>;<HORN+DOT-BELOW>;<SMALL>;IGNORE
-<u8>	
+<u8>
 <V>	<V>;<NONE>;<CAPITAL>;IGNORE
 <v>	<V>;<NONE>;<SMALL>;IGNORE
 <V?>	<V>;<TILDE>;<CAPITAL>;IGNORE
 <v?>	<V>;<TILDE>;<SMALL>;IGNORE
 <V-.>	<V>;<DOT-BELOW>;<CAPITAL>;IGNORE
 <v-.>	<V>;<DOT-BELOW>;<SMALL>;IGNORE
-<v8>	
+<v8>
 <W>	<W>;<NONE>;<CAPITAL>;IGNORE
 <w>	<W>;<NONE>;<SMALL>;IGNORE
 <W'>	<W>;<ACUTE>;<CAPITAL>;IGNORE
@@ -1464,14 +1464,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <w.>	<W>;<DOT>;<SMALL>;IGNORE
 <W-.>	<W>;<DOT-BELOW>;<CAPITAL>;IGNORE
 <w-.>	<W>;<DOT-BELOW>;<SMALL>;IGNORE
-<w8>	
+<w8>
 <X>	<X>;<NONE>;<CAPITAL>;IGNORE
 <x>	<X>;<NONE>;<SMALL>;IGNORE
 <X:>	<X>;<DIAERESIS>;<CAPITAL>;IGNORE
 <x:>	<X>;<DIAERESIS>;<SMALL>;IGNORE
 <X.>	<X>;<DOT>;<CAPITAL>;IGNORE
 <x.>	<X>;<DOT>;<SMALL>;IGNORE
-<x8>	
+<x8>
 <Y>	<Y>;<NONE>;<CAPITAL>;IGNORE
 <y>	<Y>;<NONE>;<SMALL>;IGNORE
 <Y'>	<Y>;<ACUTE>;<CAPITAL>;IGNORE
@@ -1490,7 +1490,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <y.>	<Y>;<DOT>;<SMALL>;IGNORE
 <Y-.>	<Y>;<DOT-BELOW>;<CAPITAL>;IGNORE
 <y-.>	<Y>;<DOT-BELOW>;<SMALL>;IGNORE
-<y8>	
+<y8>
 % <U:> and <U"> are treated as <Y> in Danish
 <U:>	<Y>;<U:>;<CAPITAL>;IGNORE
 <u:>	<Y>;<U:>;<SMALL>;IGNORE
@@ -1512,7 +1512,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <z//>	<Z>;<STROKE>;<SMALL>;IGNORE
 <Z_>	<Z>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <z_>	<Z>;<LINE-BELOW>;<SMALL>;IGNORE
-<z8>	
+<z8>
 % <AE> is a separate letter in Danish
 <AE>	<AE>;<NONE>;<CAPITAL>;IGNORE
 <ae>	<AE>;<NONE>;<SMALL>;IGNORE
@@ -2172,6 +2172,6 @@ t_fmt_ampm  ""
 END LC_TIME
 
 LC_MESSAGES
-yesexpr     "<<(><1><J><j><Y><y><)/>><.><*>"
-noexpr      "<<(><0><N><n><)/>><.><*>"
+yesexpr     "<'/>><<(><1><J><j><Y><y><)/>><.><*>"
+noexpr      "<'/>><<(><0><N><n><)/>><.><*>"
 END LC_MESSAGES
diff --git a/localedata/locales/en_AU b/localedata/locales/en_AU
index 14a8ef63a7..1e84be529e 100644
--- a/localedata/locales/en_AU
+++ b/localedata/locales/en_AU
@@ -89,6 +89,6 @@ t_fmt_ampm  ""
 END LC_TIME
 
 LC_MESSAGES
-yesexpr     "<<(><y><Y><)/>><.><*>"
-noexpr      "<<(><n><N><)/>><.><*>"
+yesexpr     "<'/>><<(><y><Y><)/>><.><*>"
+noexpr      "<'/>><<(><n><N><)/>><.><*>"
 END LC_MESSAGES
diff --git a/localedata/locales/en_CA b/localedata/locales/en_CA
index 4c3376091f..d0e28c9ed0 100644
--- a/localedata/locales/en_CA
+++ b/localedata/locales/en_CA
@@ -35,7 +35,7 @@ LC_COLLATE
 %     members of equivalence classes
 %  3. A distinction is made with regards
 %     to case as noted below.
-%  4. Special characters are ignored 
+%  4. Special characters are ignored
 %     when comparing letters, but then
 %     they are considered
 %  5. The alphabets are sorted in order
@@ -63,10 +63,10 @@ collating-symbol <SMALL>
 % and Spanish <C><h> being treated
 % as one letter.
 
-% The <a8> ...... <z8> collating 
+% The <a8> ...... <z8> collating
 % symbols have defined weights as
 % the last character in a group of
-% Latin letters. They are used 
+% Latin letters. They are used
 % to specify deltas by locales using
 % a locale as the default ordering
 % and by "replace-after" statements
@@ -988,7 +988,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <a->	<A>;<MACRON>;<SMALL>;IGNORE
 <A7>	<A>;<MACRON+DOT>;<CAPITAL>;IGNORE
 <a7>	<A>;<MACRON+DOT>;<SMALL>;IGNORE
-<a8>	
+<a8>
 <AE>	"<A><E>";"<AE><AE>";"<CAPITAL><CAPITAL>";IGNORE
 <ae>	"<A><E>";"<AE><AE>";"<SMALL><SMALL>";IGNORE
 <AE'>	"<A><E>";"<AE'><AE'>";"<CAPITAL><CAPITAL>";IGNORE
@@ -1003,7 +1003,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <b-.>	<B>;<DOT-BELOW>;<SMALL>;IGNORE
 <B_>	<B>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <b_>	<B>;<LINE-BELOW>;<SMALL>;IGNORE
-<b8>	
+<b8>
 <C>	<C>;<NONE>;<CAPITAL>;IGNORE
 <c>	<C>;<NONE>;<SMALL>;IGNORE
 <C'>	<C>;<ACUTE>;<CAPITAL>;IGNORE
@@ -1020,7 +1020,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <c,>	<C>;<CEDILLA>;<SMALL>;IGNORE
 <C,'>	<C>;<CEDILLA+ACUTE>;<CAPITAL>;IGNORE
 <c,'>	<C>;<CEDILLA+ACUTE>;<SMALL>;IGNORE
-<c8>	
+<c8>
 <D>	<D>;<NONE>;<CAPITAL>;IGNORE
 <d>	<D>;<NONE>;<SMALL>;IGNORE
 <D<>	<D>;<CARON>;<CAPITAL>;IGNORE
@@ -1037,7 +1037,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <d-/>>	<D>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
 <D_>	<D>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <d_>	<D>;<LINE-BELOW>;<SMALL>;IGNORE
-<d8>	
+<d8>
 <E>	<E>;<NONE>;<CAPITAL>;IGNORE
 <e>	<E>;<NONE>;<SMALL>;IGNORE
 <E'>	<E>;<ACUTE>;<CAPITAL>;IGNORE
@@ -1088,14 +1088,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <e-!>	<E>;<MACRON+GRAVE>;<SMALL>;IGNORE
 <E-/>>	<E>;<MACRON+CIRCUMFLEX>;<CAPITAL>;IGNORE
 <e-/>>	<E>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
-<e8>	
+<e8>
 <F>	<F>;<NONE>;<CAPITAL>;IGNORE
 <f>	<F>;<NONE>;<SMALL>;IGNORE
 <F2>	<F>;<HOOK>;<CAPITAL>;IGNORE
 <f2>	<F>;<HOOK>;<SMALL>;IGNORE
 <F.>	<F>;<DOT>;<CAPITAL>;IGNORE
 <f.>	<F>;<DOT>;<SMALL>;IGNORE
-<f8>	
+<f8>
 <ff>	"<F><F>";"<NONE><NONE>";"<ff><ff>";IGNORE
 <fi>	"<F><I>";"<NONE><NONE>";"<fi><fi>";IGNORE
 <fl>	"<F><L>";"<NONE><NONE>";"<fl><fl>";IGNORE
@@ -1120,7 +1120,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <g,>	<G>;<CEDILLA>;<SMALL>;IGNORE
 <G->	<G>;<MACRON>;<CAPITAL>;IGNORE
 <g->	<G>;<MACRON>;<SMALL>;IGNORE
-<g8>	
+<g8>
 <H>	<H>;<NONE>;<CAPITAL>;IGNORE
 <h>	<H>;<NONE>;<SMALL>;IGNORE
 <H-(>	<H>;<BREVE-BELOW>;<CAPITAL>;IGNORE
@@ -1137,7 +1137,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <h//>	<H>;<STROKE>;<SMALL>;IGNORE
 <H,>	<H>;<CEDILLA>;<CAPITAL>;IGNORE
 <h,>	<H>;<CEDILLA>;<SMALL>;IGNORE
-<h8>	
+<h8>
 <I>	<I>;<NONE>;<CAPITAL>;IGNORE
 <i>	<I>;<NONE>;<SMALL>;IGNORE
 <I'>	<I>;<ACUTE>;<CAPITAL>;IGNORE
@@ -1172,14 +1172,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <i;>	<I>;<OGONEK>;<SMALL>;IGNORE
 <I->	<I>;<MACRON>;<CAPITAL>;IGNORE
 <i->	<I>;<MACRON>;<SMALL>;IGNORE
-<i8>	
+<i8>
 <IJ>	"<I><J>";"<IJ><IJ>";"<CAPITAL><CAPITAL>";IGNORE
 <ij>	"<I><J>";"<IJ><IJ>";"<SMALL><SMALL>";IGNORE
 <J>	<J>;<NONE>;<CAPITAL>;IGNORE
 <j>	<J>;<NONE>;<SMALL>;IGNORE
 <J/>>	<J>;<CIRCUMFLEX>;<CAPITAL>;IGNORE
 <j/>>	<J>;<CIRCUMFLEX>;<SMALL>;IGNORE
-<j8>	
+<j8>
 <K>	<K>;<NONE>;<CAPITAL>;IGNORE
 <k>	<K>;<NONE>;<SMALL>;IGNORE
 <K'>	<K>;<ACUTE>;<CAPITAL>;IGNORE
@@ -1194,7 +1194,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <k,>	<K>;<CEDILLA>;<SMALL>;IGNORE
 <K_>	<K>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <k_>	<K>;<LINE-BELOW>;<SMALL>;IGNORE
-<k8>	
+<k8>
 <kk>	<K>;<kk>;<SMALL>;IGNORE
 <L>	<L>;<NONE>;<CAPITAL>;IGNORE
 <l>	<L>;<NONE>;<SMALL>;IGNORE
@@ -1216,7 +1216,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <l-/>>	<L>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
 <L_>	<L>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <l_>	<L>;<LINE-BELOW>;<SMALL>;IGNORE
-<l8>	
+<l8>
 <M>	<M>;<NONE>;<CAPITAL>;IGNORE
 <m>	<M>;<NONE>;<SMALL>;IGNORE
 <M'>	<M>;<ACUTE>;<CAPITAL>;IGNORE
@@ -1225,7 +1225,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <m.>	<M>;<DOT>;<SMALL>;IGNORE
 <M-.>	<M>;<DOT-BELOW>;<CAPITAL>;IGNORE
 <m-.>	<M>;<DOT-BELOW>;<SMALL>;IGNORE
-<m8>	
+<m8>
 <N>	<N>;<NONE>;<CAPITAL>;IGNORE
 <n>	<N>;<NONE>;<SMALL>;IGNORE
 <N'>	<N>;<ACUTE>;<CAPITAL>;IGNORE
@@ -1245,7 +1245,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <N_>	<N>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <n_>	<N>;<LINE-BELOW>;<SMALL>;IGNORE
 <'n>	<N>;<PRECEDED-BY-APOSTROPHE>;<SMALL>;IGNORE
-<n8>	
+<n8>
 <NG>	"<N><G>";"<NG><NG>";"<CAPITAL><CAPITAL>";IGNORE
 <ng>	"<N><G>";"<NG><NG>";"<SMALL><SMALL>";IGNORE
 <O>	<O>;<NONE>;<CAPITAL>;IGNORE
@@ -1315,7 +1315,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <o9?>	<O>;<HORN+TILDE>;<SMALL>;IGNORE
 <O9-.>	<O>;<HORN+DOT-BELOW>;<CAPITAL>;IGNORE
 <o9-.>	<O>;<HORN+DOT-BELOW>;<SMALL>;IGNORE
-<o8>	
+<o8>
 <OE>	"<O><E>";"<OE><OE>";"<CAPITAL><CAPITAL>";IGNORE
 <oe>	"<O><E>";"<OE><OE>";"<SMALL><SMALL>";IGNORE
 <P>	<P>;<NONE>;<CAPITAL>;IGNORE
@@ -1324,10 +1324,10 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <p'>	<P>;<ACUTE>;<SMALL>;IGNORE
 <P.>	<P>;<DOT>;<CAPITAL>;IGNORE
 <p.>	<P>;<DOT>;<SMALL>;IGNORE
-<p8>	
+<p8>
 <Q>	<Q>;<NONE>;<CAPITAL>;IGNORE
 <q>	<Q>;<NONE>;<SMALL>;IGNORE
-<q8>	
+<q8>
 <R>	<R>;<NONE>;<CAPITAL>;IGNORE
 <r>	<R>;<NONE>;<SMALL>;IGNORE
 <R'>	<R>;<ACUTE>;<CAPITAL>;IGNORE
@@ -1348,7 +1348,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <r--.>	<R>;<MACRON+DOT-BELOW>;<SMALL>;IGNORE
 <R_>	<R>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <r_>	<R>;<LINE-BELOW>;<SMALL>;IGNORE
-<r8>	
+<r8>
 <S>	<S>;<NONE>;<CAPITAL>;IGNORE
 <s>	<S>;<NONE>;<SMALL>;IGNORE
 <st>	"<S><T>";"<NONE><NONE>";"<st><st>";IGNORE
@@ -1370,7 +1370,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <s.-.>	<S>;<DOT+DOT-BELOW>;<SMALL>;IGNORE
 <S,>	<S>;<CEDILLA>;<CAPITAL>;IGNORE
 <s,>	<S>;<CEDILLA>;<SMALL>;IGNORE
-<s8>	
+<s8>
 <s1>	<S>;<s1>;<SMALL>;IGNORE
 <ss>	"<S><S>";"<NONE><NONE>";"<SMALL><ss>";IGNORE
 <T>	<T>;<NONE>;<CAPITAL>;IGNORE
@@ -1389,7 +1389,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <t-/>>	<T>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
 <T_>	<T>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <t_>	<T>;<LINE-BELOW>;<SMALL>;IGNORE
-<t8>	
+<t8>
 <TH>	"<T><H>";"<TH><TH>";"<CAPITAL><CAPITAL>";IGNORE
 <th>	"<T><H>";"<TH><TH>";"<SMALL><SMALL>";IGNORE
 <U>	<U>;<NONE>;<CAPITAL>;IGNORE
@@ -1454,14 +1454,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <u9?>	<U>;<HORN+TILDE>;<SMALL>;IGNORE
 <U9-.>	<U>;<HORN+DOT-BELOW>;<CAPITAL>;IGNORE
 <u9-.>	<U>;<HORN+DOT-BELOW>;<SMALL>;IGNORE
-<u8>	
+<u8>
 <V>	<V>;<NONE>;<CAPITAL>;IGNORE
 <v>	<V>;<NONE>;<SMALL>;IGNORE
 <V?>	<V>;<TILDE>;<CAPITAL>;IGNORE
 <v?>	<V>;<TILDE>;<SMALL>;IGNORE
 <V-.>	<V>;<DOT-BELOW>;<CAPITAL>;IGNORE
 <v-.>	<V>;<DOT-BELOW>;<SMALL>;IGNORE
-<v8>	
+<v8>
 <W>	<W>;<NONE>;<CAPITAL>;IGNORE
 <w>	<W>;<NONE>;<SMALL>;IGNORE
 <W'>	<W>;<ACUTE>;<CAPITAL>;IGNORE
@@ -1476,14 +1476,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <w.>	<W>;<DOT>;<SMALL>;IGNORE
 <W-.>	<W>;<DOT-BELOW>;<CAPITAL>;IGNORE
 <w-.>	<W>;<DOT-BELOW>;<SMALL>;IGNORE
-<w8>	
+<w8>
 <X>	<X>;<NONE>;<CAPITAL>;IGNORE
 <x>	<X>;<NONE>;<SMALL>;IGNORE
 <X:>	<X>;<DIAERESIS>;<CAPITAL>;IGNORE
 <x:>	<X>;<DIAERESIS>;<SMALL>;IGNORE
 <X.>	<X>;<DOT>;<CAPITAL>;IGNORE
 <x.>	<X>;<DOT>;<SMALL>;IGNORE
-<x8>	
+<x8>
 <Y>	<Y>;<NONE>;<CAPITAL>;IGNORE
 <y>	<Y>;<NONE>;<SMALL>;IGNORE
 <Y'>	<Y>;<ACUTE>;<CAPITAL>;IGNORE
@@ -1502,7 +1502,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <y.>	<Y>;<DOT>;<SMALL>;IGNORE
 <Y-.>	<Y>;<DOT-BELOW>;<CAPITAL>;IGNORE
 <y-.>	<Y>;<DOT-BELOW>;<SMALL>;IGNORE
-<y8>	
+<y8>
 <Z>	<Z>;<NONE>;<CAPITAL>;IGNORE
 <z>	<Z>;<NONE>;<SMALL>;IGNORE
 <Z'>	<Z>;<ACUTE>;<CAPITAL>;IGNORE
@@ -1519,7 +1519,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <z//>	<Z>;<STROKE>;<SMALL>;IGNORE
 <Z_>	<Z>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <z_>	<Z>;<LINE-BELOW>;<SMALL>;IGNORE
-<z8>	
+<z8>
 <A*>	<A*>;<CAPITAL>;<GREEK>;IGNORE
 <A%>	<A*>;<CAPITAL>;<TONOS>;IGNORE
 <a*>	<A*>;<SMALL>;<GREEK>;IGNORE
@@ -2152,6 +2152,6 @@ t_fmt_ampm  "<%><I><:><%><M><:><%><S><SP><%><p>"
 END LC_TIME
 
 LC_MESSAGES
-yesexpr     "<<(><y><Y><o><O><)/>><.><*>"
-noexpr      "<<(><n><N><)/>><.><*>"
+yesexpr     "<'/>><<(><y><Y><o><O><)/>><.><*>"
+noexpr      "<'/>><<(><n><N><)/>><.><*>"
 END LC_MESSAGES
diff --git a/localedata/locales/en_DK b/localedata/locales/en_DK
index c0809d1c8b..57bd34def1 100644
--- a/localedata/locales/en_DK
+++ b/localedata/locales/en_DK
@@ -38,7 +38,7 @@ LC_COLLATE
 %     members of equivalence classes
 %  3. A distinction is made with regards
 %     to case as noted below.
-%  4. Special characters are ignored 
+%  4. Special characters are ignored
 %     when comparing letters, but then
 %     they are considered
 %  5. The alphabets are sorted in order
@@ -66,10 +66,10 @@ collating-symbol <SMALL>
 % and Spanish <C><h> being treated
 % as one letter.
 
-% The <a8> ...... <z8> collating 
+% The <a8> ...... <z8> collating
 % symbols have defined weights as
 % the last character in a group of
-% Latin letters. They are used 
+% Latin letters. They are used
 % to specify deltas by locales using
 % a locale as the default ordering
 % and by "reorder-after" statements
@@ -1023,7 +1023,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <a->	<A>;<MACRON>;<SMALL>;IGNORE
 <A7>	<A>;<MACRON+DOT>;<CAPITAL>;IGNORE
 <a7>	<A>;<MACRON+DOT>;<SMALL>;IGNORE
-<a8>	
+<a8>
 <AE>	"<A><E>";"<AE><AE>";"<CAPITAL><CAPITAL>";IGNORE
 <ae>	"<A><E>";"<AE><AE>";"<SMALL><SMALL>";IGNORE
 <AE'>	"<A><E>";"<AE'><AE'>";"<CAPITAL><CAPITAL>";IGNORE
@@ -1038,7 +1038,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <b-.>	<B>;<DOT-BELOW>;<SMALL>;IGNORE
 <B_>	<B>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <b_>	<B>;<LINE-BELOW>;<SMALL>;IGNORE
-<b8>	
+<b8>
 <C>	<C>;<NONE>;<CAPITAL>;IGNORE
 <c>	<C>;<NONE>;<SMALL>;IGNORE
 <C'>	<C>;<ACUTE>;<CAPITAL>;IGNORE
@@ -1055,7 +1055,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <c,>	<C>;<CEDILLA>;<SMALL>;IGNORE
 <C,'>	<C>;<CEDILLA+ACUTE>;<CAPITAL>;IGNORE
 <c,'>	<C>;<CEDILLA+ACUTE>;<SMALL>;IGNORE
-<c8>	
+<c8>
 <D>	<D>;<NONE>;<CAPITAL>;IGNORE
 <d>	<D>;<NONE>;<SMALL>;IGNORE
 <D<>	<D>;<CARON>;<CAPITAL>;IGNORE
@@ -1072,7 +1072,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <d-/>>	<D>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
 <D_>	<D>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <d_>	<D>;<LINE-BELOW>;<SMALL>;IGNORE
-<d8>	
+<d8>
 <D->	<D>;<D->;<CAPITAL>;IGNORE
 <d->	<D>;<D->;<SMALL>;IGNORE
 <E>	<E>;<NONE>;<CAPITAL>;IGNORE
@@ -1125,14 +1125,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <e-!>	<E>;<MACRON+GRAVE>;<SMALL>;IGNORE
 <E-/>>	<E>;<MACRON+CIRCUMFLEX>;<CAPITAL>;IGNORE
 <e-/>>	<E>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
-<e8>	
+<e8>
 <F>	<F>;<NONE>;<CAPITAL>;IGNORE
 <f>	<F>;<NONE>;<SMALL>;IGNORE
 <F2>	<F>;<HOOK>;<CAPITAL>;IGNORE
 <f2>	<F>;<HOOK>;<SMALL>;IGNORE
 <F.>	<F>;<DOT>;<CAPITAL>;IGNORE
 <f.>	<F>;<DOT>;<SMALL>;IGNORE
-<f8>	
+<f8>
 <ff>	"<F><F>";"<NONE><NONE>";"<ff><ff>";IGNORE
 <fi>	"<F><I>";"<NONE><NONE>";"<fi><fi>";IGNORE
 <fl>	"<F><L>";"<NONE><NONE>";"<fl><fl>";IGNORE
@@ -1159,7 +1159,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <g,>	<G>;<CEDILLA>;<SMALL>;IGNORE
 <G->	<G>;<MACRON>;<CAPITAL>;IGNORE
 <g->	<G>;<MACRON>;<SMALL>;IGNORE
-<g8>	
+<g8>
 <H>	<H>;<NONE>;<CAPITAL>;IGNORE
 <h>	<H>;<NONE>;<SMALL>;IGNORE
 <H-(>	<H>;<BREVE-BELOW>;<CAPITAL>;IGNORE
@@ -1176,7 +1176,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <h//>	<H>;<STROKE>;<SMALL>;IGNORE
 <H,>	<H>;<CEDILLA>;<CAPITAL>;IGNORE
 <h,>	<H>;<CEDILLA>;<SMALL>;IGNORE
-<h8>	
+<h8>
 <I>	<I>;<NONE>;<CAPITAL>;IGNORE
 <i>	<I>;<NONE>;<SMALL>;IGNORE
 <I'>	<I>;<ACUTE>;<CAPITAL>;IGNORE
@@ -1211,14 +1211,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <i;>	<I>;<OGONEK>;<SMALL>;IGNORE
 <I->	<I>;<MACRON>;<CAPITAL>;IGNORE
 <i->	<I>;<MACRON>;<SMALL>;IGNORE
-<i8>	
+<i8>
 <IJ>	"<I><J>";"<IJ><IJ>";"<CAPITAL><CAPITAL>";IGNORE
 <ij>	"<I><J>";"<IJ><IJ>";"<SMALL><SMALL>";IGNORE
 <J>	<J>;<NONE>;<CAPITAL>;IGNORE
 <j>	<J>;<NONE>;<SMALL>;IGNORE
 <J/>>	<J>;<CIRCUMFLEX>;<CAPITAL>;IGNORE
 <j/>>	<J>;<CIRCUMFLEX>;<SMALL>;IGNORE
-<j8>	
+<j8>
 <K>	<K>;<NONE>;<CAPITAL>;IGNORE
 <k>	<K>;<NONE>;<SMALL>;IGNORE
 <K'>	<K>;<ACUTE>;<CAPITAL>;IGNORE
@@ -1233,7 +1233,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <k,>	<K>;<CEDILLA>;<SMALL>;IGNORE
 <K_>	<K>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <k_>	<K>;<LINE-BELOW>;<SMALL>;IGNORE
-<k8>	
+<k8>
 <kk>	<K>;<kk>;<SMALL>;IGNORE
 <L>	<L>;<NONE>;<CAPITAL>;IGNORE
 <l>	<L>;<NONE>;<SMALL>;IGNORE
@@ -1255,7 +1255,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <l-/>>	<L>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
 <L_>	<L>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <l_>	<L>;<LINE-BELOW>;<SMALL>;IGNORE
-<l8>	
+<l8>
 <St>	<LONG>;<SPECIAL>;<SMALL>;IGNORE
 <M>	<M>;<NONE>;<CAPITAL>;IGNORE
 <m>	<M>;<NONE>;<SMALL>;IGNORE
@@ -1265,7 +1265,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <m.>	<M>;<DOT>;<SMALL>;IGNORE
 <M-.>	<M>;<DOT-BELOW>;<CAPITAL>;IGNORE
 <m-.>	<M>;<DOT-BELOW>;<SMALL>;IGNORE
-<m8>	
+<m8>
 <N>	<N>;<NONE>;<CAPITAL>;IGNORE
 <n>	<N>;<NONE>;<SMALL>;IGNORE
 <N'>	<N>;<ACUTE>;<CAPITAL>;IGNORE
@@ -1285,7 +1285,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <N_>	<N>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <n_>	<N>;<LINE-BELOW>;<SMALL>;IGNORE
 <'n>	<N>;<PRECEDED-BY-APOSTROPHE>;<SMALL>;IGNORE
-<n8>	
+<n8>
 <NG>	<N>;<NG>;<CAPITAL>;IGNORE
 <ng>	<N>;<NG>;<SMALL>;IGNORE
 <O>	<O>;<NONE>;<CAPITAL>;IGNORE
@@ -1355,7 +1355,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <o9?>	<O>;<HORN+TILDE>;<SMALL>;IGNORE
 <O9-.>	<O>;<HORN+DOT-BELOW>;<CAPITAL>;IGNORE
 <o9-.>	<O>;<HORN+DOT-BELOW>;<SMALL>;IGNORE
-<o8>	
+<o8>
 <OE>	"<O><E>";"<OE><OE>";"<CAPITAL><CAPITAL>";IGNORE
 <oe>	"<O><E>";"<OE><OE>";"<SMALL><SMALL>";IGNORE
 <P>	<P>;<NONE>;<CAPITAL>;IGNORE
@@ -1364,10 +1364,10 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <p'>	<P>;<ACUTE>;<SMALL>;IGNORE
 <P.>	<P>;<DOT>;<CAPITAL>;IGNORE
 <p.>	<P>;<DOT>;<SMALL>;IGNORE
-<p8>	
+<p8>
 <Q>	<Q>;<NONE>;<CAPITAL>;IGNORE
 <q>	<Q>;<NONE>;<SMALL>;IGNORE
-<q8>	
+<q8>
 <R>	<R>;<NONE>;<CAPITAL>;IGNORE
 <r>	<R>;<NONE>;<SMALL>;IGNORE
 <R'>	<R>;<ACUTE>;<CAPITAL>;IGNORE
@@ -1388,7 +1388,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <r--.>	<R>;<MACRON+DOT-BELOW>;<SMALL>;IGNORE
 <R_>	<R>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <r_>	<R>;<LINE-BELOW>;<SMALL>;IGNORE
-<r8>	
+<r8>
 <S>	<S>;<NONE>;<CAPITAL>;IGNORE
 <s>	<S>;<NONE>;<SMALL>;IGNORE
 <st>	"<S><T>";"<NONE><NONE>";"<st><st>";IGNORE
@@ -1410,7 +1410,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <s.-.>	<S>;<DOT+DOT-BELOW>;<SMALL>;IGNORE
 <S,>	<S>;<CEDILLA>;<CAPITAL>;IGNORE
 <s,>	<S>;<CEDILLA>;<SMALL>;IGNORE
-<s8>	
+<s8>
 <s1>	<S>;<s1>;<SMALL>;IGNORE
 <ss>	"<S><S>";"<NONE><NONE>";"<SMALL><ss>";IGNORE
 <T>	<T>;<NONE>;<CAPITAL>;IGNORE
@@ -1429,7 +1429,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <t-/>>	<T>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE
 <T_>	<T>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <t_>	<T>;<LINE-BELOW>;<SMALL>;IGNORE
-<t8>	
+<t8>
 <TH>	"<T><H>";"<TH><TH>";"<CAPITAL><CAPITAL>";IGNORE
 <th>	"<T><H>";"<TH><TH>";"<SMALL><SMALL>";IGNORE
 <U>	<U>;<NONE>;<CAPITAL>;IGNORE
@@ -1494,14 +1494,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <u9?>	<U>;<HORN+TILDE>;<SMALL>;IGNORE
 <U9-.>	<U>;<HORN+DOT-BELOW>;<CAPITAL>;IGNORE
 <u9-.>	<U>;<HORN+DOT-BELOW>;<SMALL>;IGNORE
-<u8>	
+<u8>
 <V>	<V>;<NONE>;<CAPITAL>;IGNORE
 <v>	<V>;<NONE>;<SMALL>;IGNORE
 <V?>	<V>;<TILDE>;<CAPITAL>;IGNORE
 <v?>	<V>;<TILDE>;<SMALL>;IGNORE
 <V-.>	<V>;<DOT-BELOW>;<CAPITAL>;IGNORE
 <v-.>	<V>;<DOT-BELOW>;<SMALL>;IGNORE
-<v8>	
+<v8>
 <W>	<W>;<NONE>;<CAPITAL>;IGNORE
 <w>	<W>;<NONE>;<SMALL>;IGNORE
 <W'>	<W>;<ACUTE>;<CAPITAL>;IGNORE
@@ -1516,14 +1516,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <w.>	<W>;<DOT>;<SMALL>;IGNORE
 <W-.>	<W>;<DOT-BELOW>;<CAPITAL>;IGNORE
 <w-.>	<W>;<DOT-BELOW>;<SMALL>;IGNORE
-<w8>	
+<w8>
 <X>	<X>;<NONE>;<CAPITAL>;IGNORE
 <x>	<X>;<NONE>;<SMALL>;IGNORE
 <X:>	<X>;<DIAERESIS>;<CAPITAL>;IGNORE
 <x:>	<X>;<DIAERESIS>;<SMALL>;IGNORE
 <X.>	<X>;<DOT>;<CAPITAL>;IGNORE
 <x.>	<X>;<DOT>;<SMALL>;IGNORE
-<x8>	
+<x8>
 <Y>	<Y>;<NONE>;<CAPITAL>;IGNORE
 <y>	<Y>;<NONE>;<SMALL>;IGNORE
 <Y'>	<Y>;<ACUTE>;<CAPITAL>;IGNORE
@@ -1542,7 +1542,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <y.>	<Y>;<DOT>;<SMALL>;IGNORE
 <Y-.>	<Y>;<DOT-BELOW>;<CAPITAL>;IGNORE
 <y-.>	<Y>;<DOT-BELOW>;<SMALL>;IGNORE
-<y8>	
+<y8>
 <Z>	<Z>;<NONE>;<CAPITAL>;IGNORE
 <z>	<Z>;<NONE>;<SMALL>;IGNORE
 <Z'>	<Z>;<ACUTE>;<CAPITAL>;IGNORE
@@ -1559,7 +1559,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <z//>	<Z>;<STROKE>;<SMALL>;IGNORE
 <Z_>	<Z>;<LINE-BELOW>;<CAPITAL>;IGNORE
 <z_>	<Z>;<LINE-BELOW>;<SMALL>;IGNORE
-<z8>	
+<z8>
 <A*>	<A*>;<CAPITAL>;<GREEK>;IGNORE
 <A%>	<A*>;<CAPITAL>;<TONOS>;IGNORE
 <a*>	<A*>;<SMALL>;<GREEK>;IGNORE
@@ -3123,6 +3123,6 @@ t_fmt_ampm  ""
 END LC_TIME
 
 LC_MESSAGES
-yesexpr  "<<(><1><J><j><s><S><y><Y><o><O><)/>><.><*>"
-noexpr   "<<(><0><n><N><)/>><.><*>"
+yesexpr  "<'/>><<(><1><J><j><s><S><y><Y><o><O><)/>><.><*>"
+noexpr   "<'/>><<(><0><n><N><)/>><.><*>"
 END LC_MESSAGES
diff --git a/localedata/locales/en_DK.com b/localedata/locales/en_DK.com
index 5250068698..104c51fcd3 100644
--- a/localedata/locales/en_DK.com
+++ b/localedata/locales/en_DK.com
@@ -24,245 +24,245 @@ comment_char %
 % Distribution and use is free, also for
 % commercial purposes.
 
-LC_COLLATE	
-	
-% Base collation scheme: 1994-03-22	
-	
-% Ordering algorithm:	
-%  1. Spaces and hyphen (but not soft	
-%     hyphen) before punctuation	
-%     characters, punctuation characters	
-%     before numbers,	
-%     numbers before letters.	
-%  2. Letters with diacritical marks are	
-%     members of equivalence classes	
-%  3. A distinction is made with regards	
-%     to case as noted below.	
-%  4. Special characters are ignored 	
-%     when comparing letters, but then	
-%     they are considered	
-%  5. The alphabets are sorted in order	
-%     of first appearance in ISO 10646:	
-%     Latin, Greek, Cyrillic, etc.	
-%	
-% According to Greek specifications,	
-% the steps 2. and 3. above are reversed	
-% for the Greek script	
-	
-% collating symbols	
-	
-% The collating symbol naming is	
-% mostly taken from ISO 10646-1,	
-% for example the case and accent	
-% names are from this standard.	
-	
-collating-symbol <CAPITAL>	
-collating-symbol <CAPITAL-SMALL>	
-collating-symbol <SMALL-CAPITAL>	
-collating-symbol <SMALL>	
-	
-% <CAPITAL-SMALL> and <SMALL-CAPITAL>	
-% are for cases like Danish <A><a>	
-% and Spanish <C><h> being treated	
-% as one letter.	
-	
-% The <a8> ...... <z8> collating 	
-% symbols have defined weights as	
-% the last character in a group of	
-% Latin letters. They are used 	
-% to specify deltas by locales using	
-% a locale as the default ordering	
-% and by "replace-after" statements	
-% specifying the changed placement	
-% in an ordering of a character.	
-	
-collating-symbol <a8>	
-collating-symbol <b8>	
-collating-symbol <c8>	
-collating-symbol <d8>	
-collating-symbol <e8>	
-collating-symbol <f8>	
-collating-symbol <g8>	
-collating-symbol <h8>	
-collating-symbol <i8>	
-collating-symbol <j8>	
-collating-symbol <k8>	
-collating-symbol <l8>	
-collating-symbol <m8>	
-collating-symbol <n8>	
-collating-symbol <o8>	
-collating-symbol <p8>	
-collating-symbol <q8>	
-collating-symbol <r8>	
-collating-symbol <s8>	
-collating-symbol <t8>	
-collating-symbol <u8>	
-collating-symbol <v8>	
-collating-symbol <w8>	
-collating-symbol <x8>	
-collating-symbol <y8>	
-collating-symbol <z8>	
-	
-collating-symbol <NONE>	
-collating-symbol <ACUTE>	
-collating-symbol <ACUTE+DOT>	
-collating-symbol <GRAVE>	
-collating-symbol <DOUBLE-GRAVE>	
-collating-symbol <BREVE>	
-collating-symbol <BREVE+ACUTE>	
-collating-symbol <BREVE+GRAVE>	
-collating-symbol <BREVE+MACRON>	
-collating-symbol <BREVE+HOOK>	
-collating-symbol <BREVE+TILDE>	
-collating-symbol <BREVE+DOT-BELOW>	
-collating-symbol <BREVE-BELOW>	
-collating-symbol <INVERTED-BREVE>	
-collating-symbol <CIRCUMFLEX>	
-collating-symbol <CIRCUMFLEX+ACUTE>	
-collating-symbol <CIRCUMFLEX+GRAVE>	
-collating-symbol <CIRCUMFLEX+HOOK>	
-collating-symbol <CIRCUMFLEX+TILDE>	
-collating-symbol <CIRCUMFLEX+DOT-BELOW>	
-collating-symbol <CARON>	
-collating-symbol <CARON+DIAERESIS>	
-collating-symbol <CARON+DOT>	
-collating-symbol <RING>	
-collating-symbol <RING+ACUTE>	
-collating-symbol <RING-BELOW>	
-collating-symbol <DIAERESIS>	
-collating-symbol <DIAERESIS+MACRON>	
-collating-symbol <DIAERESIS+ACUTE>	
-collating-symbol <DIAERESIS+GRAVE>	
-collating-symbol <DIAERESIS+CARON>	
-collating-symbol <DOUBLE-ACUTE>	
-collating-symbol <HOOK>	
-collating-symbol <TILDE>	
-collating-symbol <TILDE+ACUTE>	
-collating-symbol <TILDE+DIAERESIS>	
-collating-symbol <TILDE-BELOW>	
-collating-symbol <DOT>	
-collating-symbol <DOT-BELOW>	
-collating-symbol <DOT+DOT-BELOW>	
-collating-symbol <STROKE>	
-collating-symbol <STROKE+ACUTE>	
-collating-symbol <CEDILLA>	
-collating-symbol <CEDILLA+ACUTE>	
-collating-symbol <CEDILLA+GRAVE>	
-collating-symbol <CEDILLA+BREVE>	
-collating-symbol <OGONEK>	
-collating-symbol <OGONEK+MACRON>	
-collating-symbol <MACRON>	
-collating-symbol <MACRON+ACUTE>	
-collating-symbol <MACRON+GRAVE>	
-collating-symbol <MACRON+DIAERESIS>	
-collating-symbol <MACRON+DIAERESIS-BELOW>	
-collating-symbol <MACRON+DOT>	
-collating-symbol <MACRON+DOT-BELOW>	
-collating-symbol <MACRON+CIRCUMFLEX>	
-collating-symbol <LINE-BELOW>	
-collating-symbol <HORN>	
-collating-symbol <HORN+ACUTE>	
-collating-symbol <HORN+GRAVE>	
-collating-symbol <HORN+HOOK>	
-collating-symbol <HORN+TILDE>	
-collating-symbol <HORN+DOT-BELOW>	
-collating-symbol <PRECEDED-BY-APOSTROPHE>	
-collating-symbol <GREEK>	
-collating-symbol <TONOS>	
-collating-symbol <DIALYTICA>	
-collating-symbol <DIALYTICA+TONOS>	
-collating-symbol <CYRILLIC>	
-collating-symbol <HIRAGANA>	
-collating-symbol <KATAKANA>	
-collating-symbol <SPECIAL>	
-	
-% letter;accent;case;specials	
-	
+LC_COLLATE
+
+% Base collation scheme: 1994-03-22
+
+% Ordering algorithm:
+%  1. Spaces and hyphen (but not soft
+%     hyphen) before punctuation
+%     characters, punctuation characters
+%     before numbers,
+%     numbers before letters.
+%  2. Letters with diacritical marks are
+%     members of equivalence classes
+%  3. A distinction is made with regards
+%     to case as noted below.
+%  4. Special characters are ignored
+%     when comparing letters, but then
+%     they are considered
+%  5. The alphabets are sorted in order
+%     of first appearance in ISO 10646:
+%     Latin, Greek, Cyrillic, etc.
+%
+% According to Greek specifications,
+% the steps 2. and 3. above are reversed
+% for the Greek script
+
+% collating symbols
+
+% The collating symbol naming is
+% mostly taken from ISO 10646-1,
+% for example the case and accent
+% names are from this standard.
+
+collating-symbol <CAPITAL>
+collating-symbol <CAPITAL-SMALL>
+collating-symbol <SMALL-CAPITAL>
+collating-symbol <SMALL>
+
+% <CAPITAL-SMALL> and <SMALL-CAPITAL>
+% are for cases like Danish <A><a>
+% and Spanish <C><h> being treated
+% as one letter.
+
+% The <a8> ...... <z8> collating
+% symbols have defined weights as
+% the last character in a group of
+% Latin letters. They are used
+% to specify deltas by locales using
+% a locale as the default ordering
+% and by "replace-after" statements
+% specifying the changed placement
+% in an ordering of a character.
+
+collating-symbol <a8>
+collating-symbol <b8>
+collating-symbol <c8>
+collating-symbol <d8>
+collating-symbol <e8>
+collating-symbol <f8>
+collating-symbol <g8>
+collating-symbol <h8>
+collating-symbol <i8>
+collating-symbol <j8>
+collating-symbol <k8>
+collating-symbol <l8>
+collating-symbol <m8>
+collating-symbol <n8>
+collating-symbol <o8>
+collating-symbol <p8>
+collating-symbol <q8>
+collating-symbol <r8>
+collating-symbol <s8>
+collating-symbol <t8>
+collating-symbol <u8>
+collating-symbol <v8>
+collating-symbol <w8>
+collating-symbol <x8>
+collating-symbol <y8>
+collating-symbol <z8>
+
+collating-symbol <NONE>
+collating-symbol <ACUTE>
+collating-symbol <ACUTE+DOT>
+collating-symbol <GRAVE>
+collating-symbol <DOUBLE-GRAVE>
+collating-symbol <BREVE>
+collating-symbol <BREVE+ACUTE>
+collating-symbol <BREVE+GRAVE>
+collating-symbol <BREVE+MACRON>
+collating-symbol <BREVE+HOOK>
+collating-symbol <BREVE+TILDE>
+collating-symbol <BREVE+DOT-BELOW>
+collating-symbol <BREVE-BELOW>
+collating-symbol <INVERTED-BREVE>
+collating-symbol <CIRCUMFLEX>
+collating-symbol <CIRCUMFLEX+ACUTE>
+collating-symbol <CIRCUMFLEX+GRAVE>
+collating-symbol <CIRCUMFLEX+HOOK>
+collating-symbol <CIRCUMFLEX+TILDE>
+collating-symbol <CIRCUMFLEX+DOT-BELOW>
+collating-symbol <CARON>
+collating-symbol <CARON+DIAERESIS>
+collating-symbol <CARON+DOT>
+collating-symbol <RING>
+collating-symbol <RING+ACUTE>
+collating-symbol <RING-BELOW>
+collating-symbol <DIAERESIS>
+collating-symbol <DIAERESIS+MACRON>
+collating-symbol <DIAERESIS+ACUTE>
+collating-symbol <DIAERESIS+GRAVE>
+collating-symbol <DIAERESIS+CARON>
+collating-symbol <DOUBLE-ACUTE>
+collating-symbol <HOOK>
+collating-symbol <TILDE>
+collating-symbol <TILDE+ACUTE>
+collating-symbol <TILDE+DIAERESIS>
+collating-symbol <TILDE-BELOW>
+collating-symbol <DOT>
+collating-symbol <DOT-BELOW>
+collating-symbol <DOT+DOT-BELOW>
+collating-symbol <STROKE>
+collating-symbol <STROKE+ACUTE>
+collating-symbol <CEDILLA>
+collating-symbol <CEDILLA+ACUTE>
+collating-symbol <CEDILLA+GRAVE>
+collating-symbol <CEDILLA+BREVE>
+collating-symbol <OGONEK>
+collating-symbol <OGONEK+MACRON>
+collating-symbol <MACRON>
+collating-symbol <MACRON+ACUTE>
+collating-symbol <MACRON+GRAVE>
+collating-symbol <MACRON+DIAERESIS>
+collating-symbol <MACRON+DIAERESIS-BELOW>
+collating-symbol <MACRON+DOT>
+collating-symbol <MACRON+DOT-BELOW>
+collating-symbol <MACRON+CIRCUMFLEX>
+collating-symbol <LINE-BELOW>
+collating-symbol <HORN>
+collating-symbol <HORN+ACUTE>
+collating-symbol <HORN+GRAVE>
+collating-symbol <HORN+HOOK>
+collating-symbol <HORN+TILDE>
+collating-symbol <HORN+DOT-BELOW>
+collating-symbol <PRECEDED-BY-APOSTROPHE>
+collating-symbol <GREEK>
+collating-symbol <TONOS>
+collating-symbol <DIALYTICA>
+collating-symbol <DIALYTICA+TONOS>
+collating-symbol <CYRILLIC>
+collating-symbol <HIRAGANA>
+collating-symbol <KATAKANA>
+collating-symbol <SPECIAL>
+
+% letter;accent;case;specials
+
 order_start forward;backward/
-            ;forward;position	
-	
-% <CAPITAL> or <SMALL> letters first:	
-	
-<CAPITAL>	
-<CAPITAL-SMALL>	
-<SMALL-CAPITAL>	
-<SMALL>	
-	
-% Accents:	
-	
-<NONE>	
-<ACUTE>	
-<ACUTE+DOT>	
-<GRAVE>	
-<DOUBLE-GRAVE>	
-<BREVE>	
-<BREVE+ACUTE>	
-<BREVE+GRAVE>	
-<BREVE+MACRON>	
-<BREVE+HOOK>	
-<BREVE+TILDE>	
-<BREVE+DOT-BELOW>	
-<BREVE-BELOW>	
-<INVERTED-BREVE>	
-<CIRCUMFLEX>	
-<CIRCUMFLEX+ACUTE>	
-<CIRCUMFLEX+GRAVE>	
-<CIRCUMFLEX+HOOK>	
-<CIRCUMFLEX+TILDE>	
-<CIRCUMFLEX+DOT-BELOW>	
-<CARON>	
-<CARON+DIAERESIS>	
-<CARON+DOT>	
-<RING>	
-<RING+ACUTE>	
-<RING-BELOW>	
-<DIAERESIS>	
-<DIAERESIS+MACRON>	
-<DIAERESIS+ACUTE>	
-<DIAERESIS+GRAVE>	
-<DIAERESIS+CARON>	
-<DOUBLE-ACUTE>	
-<HOOK>	
-<TILDE>	
-<TILDE+ACUTE>	
-<TILDE+DIAERESIS>	
-<TILDE-BELOW>	
-<DOT>	
-<DOT-BELOW>	
-<DOT+DOT-BELOW>	
-<STROKE>	
-<STROKE+ACUTE>	
-<CEDILLA>	
-<CEDILLA+ACUTE>	
-<CEDILLA+GRAVE>	
-<CEDILLA+BREVE>	
-<OGONEK>	
-<OGONEK+MACRON>	
-<MACRON>	
-<MACRON+ACUTE>	
-<MACRON+GRAVE>	
-<MACRON+DIAERESIS>	
-<MACRON+DIAERESIS-BELOW>	
-<MACRON+DOT>	
-<MACRON+DOT-BELOW>	
-<MACRON+CIRCUMFLEX>	
-<LINE-BELOW>	
-<HORN>	
-<HORN+ACUTE>	
-<HORN+GRAVE>	
-<HORN+HOOK>	
-<HORN+TILDE>	
-<HORN+DOT-BELOW>	
-<PRECEDED-BY-APOSTROPHE>	
-<GREEK>	
-<TONOS>	
-<DIALYTICA>	
-<DIALYTICA+TONOS>	
-<CYRILLIC>	
-<HIRAGANA>	
-<KATAKANA>	
-<SPECIAL>	
-	
+            ;forward;position
+
+% <CAPITAL> or <SMALL> letters first:
+
+<CAPITAL>
+<CAPITAL-SMALL>
+<SMALL-CAPITAL>
+<SMALL>
+
+% Accents:
+
+<NONE>
+<ACUTE>
+<ACUTE+DOT>
+<GRAVE>
+<DOUBLE-GRAVE>
+<BREVE>
+<BREVE+ACUTE>
+<BREVE+GRAVE>
+<BREVE+MACRON>
+<BREVE+HOOK>
+<BREVE+TILDE>
+<BREVE+DOT-BELOW>
+<BREVE-BELOW>
+<INVERTED-BREVE>
+<CIRCUMFLEX>
+<CIRCUMFLEX+ACUTE>
+<CIRCUMFLEX+GRAVE>
+<CIRCUMFLEX+HOOK>
+<CIRCUMFLEX+TILDE>
+<CIRCUMFLEX+DOT-BELOW>
+<CARON>
+<CARON+DIAERESIS>
+<CARON+DOT>
+<RING>
+<RING+ACUTE>
+<RING-BELOW>
+<DIAERESIS>
+<DIAERESIS+MACRON>
+<DIAERESIS+ACUTE>
+<DIAERESIS+GRAVE>
+<DIAERESIS+CARON>
+<DOUBLE-ACUTE>
+<HOOK>
+<TILDE>
+<TILDE+ACUTE>
+<TILDE+DIAERESIS>
+<TILDE-BELOW>
+<DOT>
+<DOT-BELOW>
+<DOT+DOT-BELOW>
+<STROKE>
+<STROKE+ACUTE>
+<CEDILLA>
+<CEDILLA+ACUTE>
+<CEDILLA+GRAVE>
+<CEDILLA+BREVE>
+<OGONEK>
+<OGONEK+MACRON>
+<MACRON>
+<MACRON+ACUTE>
+<MACRON+GRAVE>
+<MACRON+DIAERESIS>
+<MACRON+DIAERESIS-BELOW>
+<MACRON+DOT>
+<MACRON+DOT-BELOW>
+<MACRON+CIRCUMFLEX>
+<LINE-BELOW>
+<HORN>
+<HORN+ACUTE>
+<HORN+GRAVE>
+<HORN+HOOK>
+<HORN+TILDE>
+<HORN+DOT-BELOW>
+<PRECEDED-BY-APOSTROPHE>
+<GREEK>
+<TONOS>
+<DIALYTICA>
+<DIALYTICA+TONOS>
+<CYRILLIC>
+<HIRAGANA>
+<KATAKANA>
+<SPECIAL>
+
 <NS>	<NS>;<NS>;<NS>;IGNORE	<U00a0>	NO-BREAK SPACE
 <SP>	IGNORE;IGNORE;IGNORE;<SP>	<U0020>	SPACE
 <HT>	IGNORE;IGNORE;IGNORE;<HT>	<U0009>	CHARACTER TABULATION (HT)
@@ -321,7 +321,7 @@ order_start forward;backward/
 <&>	IGNORE;IGNORE;IGNORE;<&>	<U0026>	AMPERSAND
 <Nb>	IGNORE;IGNORE;IGNORE;<Nb>	<U0023>	NUMBER SIGN
 <%>	IGNORE;IGNORE;IGNORE;<%>	<U0025>	PERCENT SIGN
-<-S>	IGNORE;IGNORE;IGNORE;<-S>	<U207b>	SUPERSCRIPT MINUS 
+<-S>	IGNORE;IGNORE;IGNORE;<-S>	<U207b>	SUPERSCRIPT MINUS
 <+>	IGNORE;IGNORE;IGNORE;<+>	<U002b>	PLUS SIGN
 <+S>	IGNORE;IGNORE;IGNORE;<+S>	<U207a>	SUPERSCRIPT PLUS SIGN
 <+->	IGNORE;IGNORE;IGNORE;<+->	<U00b1>	PLUS-MINUS SIGN
@@ -358,10 +358,10 @@ order_start forward;backward/
 <?:>	IGNORE;IGNORE;IGNORE;<?:>	<U1fc1>	GREEK DIALYTIKA AND PERISPOMENI
 <,!>	IGNORE;IGNORE;IGNORE;<,!>	<U1fcd>	GREEK PSILI AND VARIA
 <,'>	IGNORE;IGNORE;IGNORE;<,'>	<U1fce>	GREEK PSILI AND OXIA
-<?,>	IGNORE;IGNORE;IGNORE;<?,>	<U1fcf>	GREEK PSILI AND PERISPOMENI 
+<?,>	IGNORE;IGNORE;IGNORE;<?,>	<U1fcf>	GREEK PSILI AND PERISPOMENI
 <;!>	IGNORE;IGNORE;IGNORE;<;!>	<U1fdd>	GREEK DASIA AND VARIA
 <;'>	IGNORE;IGNORE;IGNORE;<;'>	<U1fde>	GREEK DASIA AND OXIA
-<?;>	IGNORE;IGNORE;IGNORE;<?;>	<U1fdf>	GREEK DASIA AND PERISPOMENI 
+<?;>	IGNORE;IGNORE;IGNORE;<?;>	<U1fdf>	GREEK DASIA AND PERISPOMENI
 <!:>	IGNORE;IGNORE;IGNORE;<!:>	<U1fed>	GREEK DIALYTIKA AND VARIA
 <!*>	IGNORE;IGNORE;IGNORE;<!*>	<U1fef>	GREEK VARIA
 <;;>	IGNORE;IGNORE;IGNORE;<;;>	<U1ffe>	GREEK DASIA
@@ -403,18 +403,18 @@ order_start forward;backward/
 <!*2>	IGNORE;IGNORE;IGNORE;<!*2>	<U203c>	DOUBLE EXCLAMATION MARK
 <'->	IGNORE;IGNORE;IGNORE;<'->	<U203e>	OVERLINE
 <=S>	IGNORE;IGNORE;IGNORE;<=S>	<U207c>	SUPERSCRIPT EQUALS SIGN
-<0s>	IGNORE;IGNORE;IGNORE;<0s>	<U2080>	SUBSCRIPT ZERO 
-<1s>	IGNORE;IGNORE;IGNORE;<1s>	<U2081>	SUBSCRIPT ONE 
-<2s>	IGNORE;IGNORE;IGNORE;<2s>	<U2082>	SUBSCRIPT TWO 
-<3s>	IGNORE;IGNORE;IGNORE;<3s>	<U2083>	SUBSCRIPT THREE 
-<4s>	IGNORE;IGNORE;IGNORE;<4s>	<U2084>	SUBSCRIPT FOUR 
-<5s>	IGNORE;IGNORE;IGNORE;<5s>	<U2085>	SUBSCRIPT FIVE 
-<6s>	IGNORE;IGNORE;IGNORE;<6s>	<U2086>	SUBSCRIPT SIX 
-<7s>	IGNORE;IGNORE;IGNORE;<7s>	<U2087>	SUBSCRIPT SEVEN 
-<8s>	IGNORE;IGNORE;IGNORE;<8s>	<U2088>	SUBSCRIPT EIGHT 
-<9s>	IGNORE;IGNORE;IGNORE;<9s>	<U2089>	SUBSCRIPT NINE 
+<0s>	IGNORE;IGNORE;IGNORE;<0s>	<U2080>	SUBSCRIPT ZERO
+<1s>	IGNORE;IGNORE;IGNORE;<1s>	<U2081>	SUBSCRIPT ONE
+<2s>	IGNORE;IGNORE;IGNORE;<2s>	<U2082>	SUBSCRIPT TWO
+<3s>	IGNORE;IGNORE;IGNORE;<3s>	<U2083>	SUBSCRIPT THREE
+<4s>	IGNORE;IGNORE;IGNORE;<4s>	<U2084>	SUBSCRIPT FOUR
+<5s>	IGNORE;IGNORE;IGNORE;<5s>	<U2085>	SUBSCRIPT FIVE
+<6s>	IGNORE;IGNORE;IGNORE;<6s>	<U2086>	SUBSCRIPT SIX
+<7s>	IGNORE;IGNORE;IGNORE;<7s>	<U2087>	SUBSCRIPT SEVEN
+<8s>	IGNORE;IGNORE;IGNORE;<8s>	<U2088>	SUBSCRIPT EIGHT
+<9s>	IGNORE;IGNORE;IGNORE;<9s>	<U2089>	SUBSCRIPT NINE
 <+s>	IGNORE;IGNORE;IGNORE;<+s>	<U208a>	SUBSCRIPT PLUS SIGN
-<-s>	IGNORE;IGNORE;IGNORE;<-s>	<U208b>	SUBSCRIPT MINUS 
+<-s>	IGNORE;IGNORE;IGNORE;<-s>	<U208b>	SUBSCRIPT MINUS
 <=s>	IGNORE;IGNORE;IGNORE;<=s>	<U208c>	SUBSCRIPT EQUALS SIGN
 <(s>	IGNORE;IGNORE;IGNORE;<(s>	<U208d>	SUBSCRIPT LEFT PARENTHESIS
 <)s>	IGNORE;IGNORE;IGNORE;<)s>	<U208e>	SUBSCRIPT RIGHT PARENTHESIS
@@ -521,7 +521,7 @@ order_start forward;backward/
 <.:>	IGNORE;IGNORE;IGNORE;<.:>	<U2234>	THEREFORE
 <:.>	IGNORE;IGNORE;IGNORE;<:.>	<U2235>	BECAUSE
 <:R>	IGNORE;IGNORE;IGNORE;<:R>	<U2236>	RATIO
-<::>	IGNORE;IGNORE;IGNORE;<::>	<U2237>	PROPORTION 
+<::>	IGNORE;IGNORE;IGNORE;<::>	<U2237>	PROPORTION
 <?1>	IGNORE;IGNORE;IGNORE;<?1>	<U223c>	TILDE OPERATOR
 <CG>	IGNORE;IGNORE;IGNORE;<CG>	<U223e>	INVERTED LAZY S
 <?->	IGNORE;IGNORE;IGNORE;<?->	<U2243>	ASYMPTOTICALLY EQUAL TO
@@ -561,7 +561,7 @@ order_start forward;backward/
 <1j>	IGNORE;IGNORE;IGNORE;<1j>	<U2446>	OCR BRANCH BANK IDENTIFICATION
 <2j>	IGNORE;IGNORE;IGNORE;<2j>	<U2447>	OCR AMOUNT OF CHECK
 <3j>	IGNORE;IGNORE;IGNORE;<3j>	<U2448>	OCR DASH
-<4j>	IGNORE;IGNORE;IGNORE;<4j>	<U2449>	OCR CUSTOMER ACCOUNT NUMBER 
+<4j>	IGNORE;IGNORE;IGNORE;<4j>	<U2449>	OCR CUSTOMER ACCOUNT NUMBER
 <1-o>	IGNORE;IGNORE;IGNORE;<1-o>	<U2460>	CIRCLED DIGIT ONE
 <2-o>	IGNORE;IGNORE;IGNORE;<2-o>	<U2461>	CIRCLED DIGIT TWO
 <3-o>	IGNORE;IGNORE;IGNORE;<3-o>	<U2462>	CIRCLED DIGIT THREE
@@ -667,7 +667,7 @@ order_start forward;backward/
 <UdL>	IGNORE;IGNORE;IGNORE;<UdL>	<U2529>	BOX DRAWINGS DOWN LIGHT AND LEFT UP HEAVY
 <uDL>	IGNORE;IGNORE;IGNORE;<uDL>	<U252a>	BOX DRAWINGS UP LIGHT AND LEFT DOWN HEAVY
 <VL>	IGNORE;IGNORE;IGNORE;<VL>	<U252b>	BOX DRAWINGS HEAVY VERTICAL AND LEFT
-<dh>	IGNORE;IGNORE;IGNORE;<dh>	<U252c>	BOX DRAWINGS LIGHT DOWN AND HORIZONTAL 
+<dh>	IGNORE;IGNORE;IGNORE;<dh>	<U252c>	BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
 <dLr>	IGNORE;IGNORE;IGNORE;<dLr>	<U252d>	BOX DRAWINGS LEFT HEAVY AND RIGHT DOWN LIGHT
 <dlR>	IGNORE;IGNORE;IGNORE;<dlR>	<U252e>	BOX DRAWINGS RIGHT HEAVY AND LEFT DOWN LIGHT
 <dH>	IGNORE;IGNORE;IGNORE;<dH>	<U252f>	BOX DRAWINGS DOWN LIGHT AND HORIZONTAL HEAVY
@@ -727,7 +727,7 @@ order_start forward;backward/
 <Tr>	IGNORE;IGNORE;IGNORE;<Tr>	<U25b7>	WHITE RIGHT-POINTING TRIANGLE
 <PR>	IGNORE;IGNORE;IGNORE;<PR>	<U25ba>	BLACK RIGHT-POINTING POINTER
 <Dt>	IGNORE;IGNORE;IGNORE;<Dt>	<U25bc>	BLACK DOWN-POINTING TRIANGLE
-<dT>	IGNORE;IGNORE;IGNORE;<dT>	<U25bd>	WHITE DOWN-POINTING TRIANGLE 
+<dT>	IGNORE;IGNORE;IGNORE;<dT>	<U25bd>	WHITE DOWN-POINTING TRIANGLE
 <Tl>	IGNORE;IGNORE;IGNORE;<Tl>	<U25c1>	WHITE LEFT-POINTING TRIANGLE
 <PL>	IGNORE;IGNORE;IGNORE;<PL>	<U25c4>	BLACK LEFT-POINTING POINTER
 <Db>	IGNORE;IGNORE;IGNORE;<Db>	<U25c6>	BLACK DIAMOND
@@ -899,14 +899,14 @@ order_start forward;backward/
 <"p>	IGNORE;IGNORE;IGNORE;<"p>	<ISO-IR-55_25>   	GREEK NON-SPACING PSILI PNEUMATA  (not a real character)
 <"d>	IGNORE;IGNORE;IGNORE;<"d>	<ISO-IR-55_26>   	GREEK NON-SPACING DASIA PNEUMATA  (not a real character)
 <"i>	IGNORE;IGNORE;IGNORE;<"i>	<ISO-IR-55_27>   	GREEK NON-SPACING IOTA BELOW  (not a real character)
-<+_>	IGNORE;IGNORE;IGNORE;<+_>	<ISO-IR-87_2138>   	IDEOGRAPHIC DITTO MARK 
-<Tel>	IGNORE;IGNORE;IGNORE;<Tel>	<ISO-IR-149_2265>   	TEL COMPATIBILITY SIGN 
-<UA>	IGNORE;IGNORE;IGNORE;<UA>	<ISO-IR-8-1_40>   	Unit space A 
-<UB>	IGNORE;IGNORE;IGNORE;<UB>	<ISO-IR-8-1_60>   	Unit space B 
-UNDEFINED	IGNORE;IGNORE;IGNORE	
-	
+<+_>	IGNORE;IGNORE;IGNORE;<+_>	<ISO-IR-87_2138>   	IDEOGRAPHIC DITTO MARK
+<Tel>	IGNORE;IGNORE;IGNORE;<Tel>	<ISO-IR-149_2265>   	TEL COMPATIBILITY SIGN
+<UA>	IGNORE;IGNORE;IGNORE;<UA>	<ISO-IR-8-1_40>   	Unit space A
+<UB>	IGNORE;IGNORE;IGNORE;<UB>	<ISO-IR-8-1_60>   	Unit space B
+UNDEFINED	IGNORE;IGNORE;IGNORE
+
 <0>	<0>;<0>;IGNORE;IGNORE	<U0030>	DIGIT ZERO
-<0S>	<0>;<0S>;IGNORE;IGNORE	<U2070>	SUPERSCRIPT ZERO 
+<0S>	<0>;<0S>;IGNORE;IGNORE	<U2070>	SUPERSCRIPT ZERO
 <18>	<0>;<18>;IGNORE;IGNORE	<U215b>	VULGAR FRACTION ONE EIGHTH
 <14>	<0>;<14>;IGNORE;IGNORE	<U00bc>	VULGAR FRACTION ONE QUARTER
 <38>	<0>;<38>;IGNORE;IGNORE	<U215c>	VULGAR FRACTION THREE EIGHTHS
@@ -926,12 +926,12 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <1S>	<1>;<1S>;IGNORE;IGNORE	<U00b9>	SUPERSCRIPT ONE
 <2S>	<2>;<2S>;IGNORE;IGNORE	<U00b2>	SUPERSCRIPT TWO
 <3S>	<3>;<3S>;IGNORE;IGNORE	<U00b3>	SUPERSCRIPT THREE
-<4S>	<4>;<4S>;IGNORE;IGNORE	<U2074>	SUPERSCRIPT FOUR 
-<5S>	<5>;<5S>;IGNORE;IGNORE	<U2075>	SUPERSCRIPT FIVE 
-<6S>	<6>;<6S>;IGNORE;IGNORE	<U2076>	SUPERSCRIPT SIX 
-<7S>	<7>;<7S>;IGNORE;IGNORE	<U2077>	SUPERSCRIPT SEVEN 
-<8S>	<8>;<8S>;IGNORE;IGNORE	<U2078>	SUPERSCRIPT EIGHT 
-<9S>	<9>;<9S>;IGNORE;IGNORE	<U2079>	SUPERSCRIPT NINE 
+<4S>	<4>;<4S>;IGNORE;IGNORE	<U2074>	SUPERSCRIPT FOUR
+<5S>	<5>;<5S>;IGNORE;IGNORE	<U2075>	SUPERSCRIPT FIVE
+<6S>	<6>;<6S>;IGNORE;IGNORE	<U2076>	SUPERSCRIPT SIX
+<7S>	<7>;<7S>;IGNORE;IGNORE	<U2077>	SUPERSCRIPT SEVEN
+<8S>	<8>;<8S>;IGNORE;IGNORE	<U2078>	SUPERSCRIPT EIGHT
+<9S>	<9>;<9S>;IGNORE;IGNORE	<U2079>	SUPERSCRIPT NINE
 <A>	<A>;<NONE>;<CAPITAL>;IGNORE	<U0041>	LATIN CAPITAL LETTER A
 <a>	<A>;<NONE>;<SMALL>;IGNORE	<U0061>	LATIN SMALL LETTER A
 <-a>	<A>;<NONE>;<-a>;IGNORE	<U00aa>	FEMININE ORDINAL INDICATOR
@@ -991,7 +991,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <a->	<A>;<MACRON>;<SMALL>;IGNORE	<U0101>	LATIN SMALL LETTER A WITH MACRON
 <A7>	<A>;<MACRON+DOT>;<CAPITAL>;IGNORE	<U01e0>	LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
 <a7>	<A>;<MACRON+DOT>;<SMALL>;IGNORE	<U01e1>	LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON
-<a8>		
+<a8>
 <AE>	"<A><E>";"<AE><AE>";"<CAPITAL><CAPITAL>";IGNORE	<U00c6>	LATIN CAPITAL LETTER AE
 <ae>	"<A><E>";"<AE><AE>";"<SMALL><SMALL>";IGNORE	<U00e6>	LATIN SMALL LETTER AE
 <AE'>	"<A><E>";"<AE'><AE'>";"<CAPITAL><CAPITAL>";IGNORE	<U01fc>	LATIN CAPITAL LETTER AE WITH ACUTE
@@ -1006,7 +1006,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <b-.>	<B>;<DOT-BELOW>;<SMALL>;IGNORE	<U1e05>	LATIN SMALL LETTER B WITH DOT BELOW
 <B_>	<B>;<LINE-BELOW>;<CAPITAL>;IGNORE	<U1e06>	LATIN CAPITAL LETTER B WITH LINE BELOW
 <b_>	<B>;<LINE-BELOW>;<SMALL>;IGNORE	<U1e07>	LATIN SMALL LETTER B WITH LINE BELOW
-<b8>		
+<b8>
 <C>	<C>;<NONE>;<CAPITAL>;IGNORE	<U0043>	LATIN CAPITAL LETTER C
 <c>	<C>;<NONE>;<SMALL>;IGNORE	<U0063>	LATIN SMALL LETTER C
 <C'>	<C>;<ACUTE>;<CAPITAL>;IGNORE	<U0106>	LATIN CAPITAL LETTER C WITH ACUTE
@@ -1023,7 +1023,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <c,>	<C>;<CEDILLA>;<SMALL>;IGNORE	<U00e7>	LATIN SMALL LETTER C WITH CEDILLA
 <C,'>	<C>;<CEDILLA+ACUTE>;<CAPITAL>;IGNORE	<U1e08>	LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
 <c,'>	<C>;<CEDILLA+ACUTE>;<SMALL>;IGNORE	<U1e09>	LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
-<c8>		
+<c8>
 <D>	<D>;<NONE>;<CAPITAL>;IGNORE	<U0044>	LATIN CAPITAL LETTER D
 <d>	<D>;<NONE>;<SMALL>;IGNORE	<U0064>	LATIN SMALL LETTER D
 <D<>	<D>;<CARON>;<CAPITAL>;IGNORE	<U010e>	LATIN CAPITAL LETTER D WITH CARON
@@ -1040,7 +1040,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <d-/>>	<D>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE	<U1e13>	LATIN SMALL LETTER D WITH CIRCUMFLEX BELOW
 <D_>	<D>;<LINE-BELOW>;<CAPITAL>;IGNORE	<U1e0e>	LATIN CAPITAL LETTER D WITH LINE BELOW
 <d_>	<D>;<LINE-BELOW>;<SMALL>;IGNORE	<U1e0f>	LATIN SMALL LETTER D WITH LINE BELOW
-<d8>		
+<d8>
 <E>	<E>;<NONE>;<CAPITAL>;IGNORE	<U0045>	LATIN CAPITAL LETTER E
 <e>	<E>;<NONE>;<SMALL>;IGNORE	<U0065>	LATIN SMALL LETTER E
 <E'>	<E>;<ACUTE>;<CAPITAL>;IGNORE	<U00c9>	LATIN CAPITAL LETTER E WITH ACUTE
@@ -1091,14 +1091,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <e-!>	<E>;<MACRON+GRAVE>;<SMALL>;IGNORE	<U1e15>	LATIN SMALL LETTER E WITH MACRON AND GRAVE
 <E-/>>	<E>;<MACRON+CIRCUMFLEX>;<CAPITAL>;IGNORE	<U1e18>	LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW
 <e-/>>	<E>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE	<U1e19>	LATIN SMALL LETTER E WITH CIRCUMFLEX BELOW
-<e8>		
+<e8>
 <F>	<F>;<NONE>;<CAPITAL>;IGNORE	<U0046>	LATIN CAPITAL LETTER F
 <f>	<F>;<NONE>;<SMALL>;IGNORE	<U0066>	LATIN SMALL LETTER F
 <F2>	<F>;<HOOK>;<CAPITAL>;IGNORE	<U0191>	LATIN CAPITAL LETTER F WITH HOOK
 <f2>	<F>;<HOOK>;<SMALL>;IGNORE	<U0192>	LATIN SMALL LETTER F WITH HOOK
 <F.>	<F>;<DOT>;<CAPITAL>;IGNORE	<U1e1e>	LATIN CAPITAL LETTER F WITH DOT ABOVE
 <f.>	<F>;<DOT>;<SMALL>;IGNORE	<U1e1f>	LATIN SMALL LETTER F WITH DOT ABOVE
-<f8>		
+<f8>
 <ff>	"<F><F>";"<NONE><NONE>";"<ff><ff>";IGNORE	<Ufb00>	LATIN SMALL LIGATURE FF
 <fi>	"<F><I>";"<NONE><NONE>";"<fi><fi>";IGNORE	<Ufb01>	LATIN SMALL LIGATURE FI
 <fl>	"<F><L>";"<NONE><NONE>";"<fl><fl>";IGNORE	<Ufb02>	LATIN SMALL LIGATURE FL
@@ -1123,7 +1123,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <g,>	<G>;<CEDILLA>;<SMALL>;IGNORE	<U0123>	LATIN SMALL LETTER G WITH CEDILLA
 <G->	<G>;<MACRON>;<CAPITAL>;IGNORE	<U1e20>	LATIN CAPITAL LETTER G WITH MACRON
 <g->	<G>;<MACRON>;<SMALL>;IGNORE	<U1e21>	LATIN SMALL LETTER G WITH MACRON
-<g8>		
+<g8>
 <H>	<H>;<NONE>;<CAPITAL>;IGNORE	<U0048>	LATIN CAPITAL LETTER H
 <h>	<H>;<NONE>;<SMALL>;IGNORE	<U0068>	LATIN SMALL LETTER H
 <H-(>	<H>;<BREVE-BELOW>;<CAPITAL>;IGNORE	<U1e2a>	LATIN CAPITAL LETTER H WITH BREVE BELOW
@@ -1140,7 +1140,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <h//>	<H>;<STROKE>;<SMALL>;IGNORE	<U0127>	LATIN SMALL LETTER H WITH STROKE
 <H,>	<H>;<CEDILLA>;<CAPITAL>;IGNORE	<U1e28>	LATIN CAPITAL LETTER H WITH CEDILLA
 <h,>	<H>;<CEDILLA>;<SMALL>;IGNORE	<U1e29>	LATIN SMALL LETTER H WITH CEDILLA
-<h8>		
+<h8>
 <I>	<I>;<NONE>;<CAPITAL>;IGNORE	<U0049>	LATIN CAPITAL LETTER I
 <i>	<I>;<NONE>;<SMALL>;IGNORE	<U0069>	LATIN SMALL LETTER I
 <I'>	<I>;<ACUTE>;<CAPITAL>;IGNORE	<U00cd>	LATIN CAPITAL LETTER I WITH ACUTE
@@ -1175,14 +1175,14 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <i;>	<I>;<OGONEK>;<SMALL>;IGNORE	<U012f>	LATIN SMALL LETTER I WITH OGONEK
 <I->	<I>;<MACRON>;<CAPITAL>;IGNORE	<U012a>	LATIN CAPITAL LETTER I WITH MACRON
 <i->	<I>;<MACRON>;<SMALL>;IGNORE	<U012b>	LATIN SMALL LETTER I WITH MACRON
-<i8>		
+<i8>
 <IJ>	"<I><J>";"<IJ><IJ>";"<CAPITAL><CAPITAL>";IGNORE	<U0132>	LATIN CAPITAL LIGATURE IJ
 <ij>	"<I><J>";"<IJ><IJ>";"<SMALL><SMALL>";IGNORE	<U0133>	LATIN SMALL LIGATURE IJ
 <J>	<J>;<NONE>;<CAPITAL>;IGNORE	<U004a>	LATIN CAPITAL LETTER J
 <j>	<J>;<NONE>;<SMALL>;IGNORE	<U006a>	LATIN SMALL LETTER J
 <J/>>	<J>;<CIRCUMFLEX>;<CAPITAL>;IGNORE	<U0134>	LATIN CAPITAL LETTER J WITH CIRCUMFLEX
 <j/>>	<J>;<CIRCUMFLEX>;<SMALL>;IGNORE	<U0135>	LATIN SMALL LETTER J WITH CIRCUMFLEX
-<j8>		
+<j8>
 <K>	<K>;<NONE>;<CAPITAL>;IGNORE	<U004b>	LATIN CAPITAL LETTER K
 <k>	<K>;<NONE>;<SMALL>;IGNORE	<U006b>	LATIN SMALL LETTER K
 <K'>	<K>;<ACUTE>;<CAPITAL>;IGNORE	<U1e30>	LATIN CAPITAL LETTER K WITH ACUTE
@@ -1197,7 +1197,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <k,>	<K>;<CEDILLA>;<SMALL>;IGNORE	<U0137>	LATIN SMALL LETTER K WITH CEDILLA
 <K_>	<K>;<LINE-BELOW>;<CAPITAL>;IGNORE	<U1e34>	LATIN CAPITAL LETTER K WITH LINE BELOW
 <k_>	<K>;<LINE-BELOW>;<SMALL>;IGNORE	<U1e35>	LATIN SMALL LETTER K WITH LINE BELOW
-<k8>		
+<k8>
 <kk>	<K>;<kk>;<SMALL>;IGNORE	<U0138>	LATIN SMALL LETTER KRA (Greenlandic)
 <L>	<L>;<NONE>;<CAPITAL>;IGNORE	<U004c>	LATIN CAPITAL LETTER L
 <l>	<L>;<NONE>;<SMALL>;IGNORE	<U006c>	LATIN SMALL LETTER L
@@ -1219,7 +1219,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <l-/>>	<L>;<MACRON+CIRCUMFLEX>;<SMALL>;IGNORE	<U1e3d>	LATIN SMALL LETTER L WITH CIRCUMFLEX BELOW
 <L_>	<L>;<LINE-BELOW>;<CAPITAL>;IGNORE	<U1e3a>	LATIN CAPITAL LETTER L WITH LINE BELOW
 <l_>	<L>;<LINE-BELOW>;<SMALL>;IGNORE	<U1e3b>	LATIN SMALL LETTER L WITH LINE BELOW
-<l8>		
+<l8>
 <M>	<M>;<NONE>;<CAPITAL>;IGNORE	<U004d>	LATIN CAPITAL LETTER M
 <m>	<M>;<NONE>;<SMALL>;IGNORE	<U006d>	LATIN SMALL LETTER M
 <M'>	<M>;<ACUTE>;<CAPITAL>;IGNORE	<U1e3e>	LATIN CAPITAL LETTER M WITH ACUTE
@@ -1228,7 +1228,7 @@ UNDEFINED	IGNORE;IGNORE;IGNORE
 <m.>	<M>;<DOT>;<SMALL>;IGNORE	<U1e41>	LATIN SMALL LETTER M WITH DOT ABOVE
 <M-.>	<M>;<DOT-BELOW>;<CAPITAL>;IGNORE	<U1e42>	LATIN CAPITAL LETTER M WITH DOT BELOW
 <m-.>	<M>;<DOT-BELOW>;<SMALL>;IGNORE	<U