Update.

2001-12-09  Ulrich Drepper  <drepper@redhat.com>

	Implement transliteration of characters in strings of the locale
	definitions.
	* locale/programs/linereader.c: Adjust for additional parameter to
	lr_token.
	(get_string): If character <Uxxxx> is not found try to transliterate
	it.
	* locale/programs/ld-ctype.c: Adjust for additional parameter to
	lr_token.  Add const to charmap parameter of all functions.
	(find_translit, find_translit2): New functions.
	* locale/programs/charmap.c: Adjust for additional parameter to
	lr_token.
	* locale/programs/repertoire.c: Likewise.
	* locale/programs/linereader.h: Likewise.
	* locale/programs/ld-address.c: Likewise.  Add const to charmap
	parameter of all functions.
	* locale/programs/ld-collate.c: Likewise.
	* locale/programs/ld-identification.c: Likewise.
	* locale/programs/ld-measurement.c: Likewise.
	* locale/programs/ld-messages.c: Likewise.
	* locale/programs/ld-monetary.c: Likewise.
	* locale/programs/ld-name.c: Likewise.
	* locale/programs/ld-numeric.c: Likewise.
	* locale/programs/ld-paper.c: Likewise.
	* locale/programs/ld-paper.c: Likewise.
	* locale/programs/ld-telephone.c: Likewise.
	* locale/programs/ld-time.c: Likewise.
	* locale/programs/locfile.c: Likewise.
	* locale/programs/localedef.c: Likewise.
	* locale/programs/localedef.h: Likewise.
	* locale/programs/locfile.h: Likewise.  Add declaration for
	find_translit.
	* locale/programs/simple-hash.c: Add const to first parameter of
	find_entry, iterate_table, and lookup.
	* locale/programs/simple-hash.h: Likewise.
	* locale/localeinfo.h: Don't define __LC_LAST here.  Include <locale.h>
	instead.
	* include/locale.h: Define __LC_LAST.
	* iconv/Makefile (CFLAGS-linereader.c): Define to -DNO_TRANSLITERATION.

2 files changed, 62 insertions, 0 deletions

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 18f9b412de..8ebfeb0d21 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,7 @@
+2001-12-09  Ulrich Drepper  <drepper@redhat.com>
+
+	* charmaps/TCVN5712-1: Add combined characters.
+
 2001-12-05  Ulrich Drepper  <drepper@redhat.com>
 
 	* locales/bg_BG: Rewrite.
diff --git a/localedata/charmaps/TCVN5712-1 b/localedata/charmaps/TCVN5712-1
index 824a76408c..be7fa14a7b 100644
--- a/localedata/charmaps/TCVN5712-1
+++ b/localedata/charmaps/TCVN5712-1
@@ -1,6 +1,8 @@
 <code_set_name> TCVN5712-1
 <comment_char> %
 <escape_char> /
+<mb_cur_min> 1
+<mb_cur_max> 2
 
 % alias TCVN
 % alias TCVN-5712
@@ -262,4 +264,60 @@ CHARMAP
 <U00FD>     /xfd         LATIN SMALL LETTER Y WITH ACUTE
 <U1EF5>     /xfe         LATIN SMALL LETTER Y WITH DOT BELOW
 <U1ED0>     /xff         LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
+<U0106>     /x43/xb3     LATIN CAPITAL LETTER C WITH ACUTE
+<U0107>     /x63/xb3     LATIN SMALL LETTER C WITH ACUTE
+<U00D1>     /x4e/xb2     LATIN CAPITAL LETTER N WITH TILDE
+<U00F1>     /x6e/xb2     LATIN SMALL LETTER N WITH TILDE
+<U0139>     /x4c/xb3     LATIN CAPITAL LETTER L WITH ACUTE
+<U013A>     /x6c/xb3     LATIN SMALL LETTER L WITH ACUTE
+<U0143>     /x4e/xb3     LATIN CAPITAL LETTER N WITH ACUTE
+<U0144>     /x6e/xb3     LATIN SMALL LETTER N WITH ACUTE
+<U0154>     /x52/xb3     LATIN CAPITAL LETTER R WITH ACUTE
+<U0155>     /x72/xb3     LATIN SMALL LETTER R WITH ACUTE
+<U015A>     /x53/xb3     LATIN CAPITAL LETTER S WITH ACUTE
+<U015B>     /x73/xb3     LATIN SMALL LETTER S WITH ACUTE
+<U0179>     /x5a/xb3     LATIN CAPITAL LETTER Z WITH ACUTE
+<U017A>     /x7a/xb3     LATIN SMALL LETTER Z WITH ACUTE
+<U01F4>     /x47/xb3     LATIN CAPITAL LETTER G WITH ACUTE
+<U01F5>     /x67/xb3     LATIN SMALL LETTER G WITH ACUTE
+<U01F8>     /x4e/xb0     LATIN CAPITAL LETTER N WITH GRAVE
+<U01F9>     /x6e/xb0     LATIN SMALL LETTER N WITH GRAVE
+<U1E04>     /x42/xb4     LATIN CAPITAL LETTER B WITH DOT BELOW
+<U1E05>     /x62/xb4     LATIN SMALL LETTER B WITH DOT BELOW
+<U1E0C>     /x44/xb4     LATIN CAPITAL LETTER D WITH DOT BELOW
+<U1E0D>     /x64/xb4     LATIN SMALL LETTER D WITH DOT BELOW
+<U1E24>     /x48/xb4     LATIN CAPITAL LETTER H WITH DOT BELOW
+<U1E25>     /x68/xb4     LATIN SMALL LETTER H WITH DOT BELOW
+<U1E30>     /x4b/xb3     LATIN CAPITAL LETTER K WITH ACUTE
+<U1E31>     /x6b/xb3     LATIN SMALL LETTER K WITH ACUTE
+<U1E32>     /x4b/xb4     LATIN CAPITAL LETTER K WITH DOT BELOW
+<U1E33>     /x6b/xb4     LATIN SMALL LETTER K WITH DOT BELOW
+<U1E36>     /x4c/xb4     LATIN CAPITAL LETTER L WITH DOT BELOW
+<U1E37>     /x6c/xb4     LATIN SMALL LETTER L WITH DOT BELOW
+<U1E3E>     /x4d/xb3     LATIN CAPITAL LETTER M WITH ACUTE
+<U1E3F>     /x6d/xb3     LATIN SMALL LETTER M WITH ACUTE
+<U1E42>     /x4d/xb4     LATIN CAPITAL LETTER M WITH DOT BELOW
+<U1E43>     /x6d/xb4     LATIN SMALL LETTER M WITH DOT BELOW
+<U1E46>     /x4e/xb4     LATIN CAPITAL LETTER N WITH DOT BELOW
+<U1E47>     /x6e/xb4     LATIN SMALL LETTER N WITH DOT BELOW
+<U1E54>     /x50/xb3     LATIN CAPITAL LETTER P WITH ACUTE
+<U1E55>     /x70/xb3     LATIN SMALL LETTER P WITH ACUTE
+<U1E5A>     /x52/xb4     LATIN CAPITAL LETTER R WITH DOT BELOW
+<U1E5B>     /x72/xb4     LATIN SMALL LETTER R WITH DOT BELOW
+<U1E62>     /x53/xb4     LATIN CAPITAL LETTER S WITH DOT BELOW
+<U1E63>     /x73/xb4     LATIN SMALL LETTER S WITH DOT BELOW
+<U1E6C>     /x54/xb4     LATIN CAPITAL LETTER T WITH DOT BELOW
+<U1E6D>     /x74/xb4     LATIN SMALL LETTER T WITH DOT BELOW
+<U1E7C>     /x56/xb2     LATIN CAPITAL LETTER V WITH TILDE
+<U1E7D>     /x76/xb2     LATIN SMALL LETTER V WITH TILDE
+<U1E7E>     /x56/xb4     LATIN CAPITAL LETTER V WITH DOT BELOW
+<U1E7F>     /x76/xb4     LATIN SMALL LETTER V WITH DOT BELOW
+<U1E80>     /x57/xb0     LATIN CAPITAL LETTER W WITH GRAVE
+<U1E81>     /x77/xb0     LATIN SMALL LETTER W WITH GRAVE
+<U1E82>     /x57/xb3     LATIN CAPITAL LETTER W WITH ACUTE
+<U1E83>     /x77/xb3     LATIN SMALL LETTER W WITH ACUTE
+<U1E88>     /x57/xb4     LATIN CAPITAL LETTER W WITH DOT BELOW
+<U1E89>     /x77/xb4     LATIN SMALL LETTER W WITH DOT BELOW
+<U1E92>     /x5a/xb4     LATIN CAPITAL LETTER Z WITH DOT BELOW
+<U1E93>     /x7a/xb4     LATIN SMALL LETTER Z WITH DOT BELOW
 END CHARMAP