Update.

1999-03-31  Ulrich Drepper  <drepper@cygnus.com>

	* iconvdata/Makefile (distribute): Remove cp1258.h.
	(gen-8bit-gap-modules): Add cp1258.
	* iconvdata/cp1258.h: Removed.

5 files changed, 359 insertions, 309 deletions

diff --git a/ChangeLog b/ChangeLog
index c25373ac2c..dd24bbf90a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-03-31  Ulrich Drepper  <drepper@cygnus.com>
+
+	* iconvdata/Makefile (distribute): Remove cp1258.h.
+	(gen-8bit-gap-modules): Add cp1258.
+	* iconvdata/cp1258.h: Removed.
+
 1999-03-30  Ulrich Drepper  <drepper@cygnus.com>
 
 	* timezone/tst-timezone.c (tests): Add more cases.
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index bca623e637..fd0159bdea 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -86,7 +86,7 @@ distribute := gconv-modules extra-module.mk gap.awk gaptab.awk		    \
 	      ansi_x3.110.c asmo_449.c baltic.c big5.c cp737.c cp737.h	    \
 	      cp775.c cp775.h cp874.c cp874.h cns11643.c cns11643.h	    \
 	      cns11643l1.c cns11643l1.h cp1250.c cp1251.c cp1252.c cp1253.c \
-	      cp1254.c cp1255.c cp1256.c cp1257.c cp1258.c cp1258.h	    \
+	      cp1254.c cp1255.c cp1256.c cp1257.c cp1258.c		    \
 	      csn_369103.c cwi.c dec-mcs.c ebcdic-at-de.c ebcdic-at-de-a.c  \
 	      ebcdic-ca-fr.c ebcdic-dk-no.c ebcdic-dk-no-a.c ebcdic-es.c    \
 	      ebcdic-es-a.c ebcdic-es-s.c ebcdic-fr.c ebcdic-fi-se.c	    \
@@ -151,7 +151,7 @@ gen-8bit-gap-modules := koi8-r latin-greek latin-greek-1 ibm256 ibm273	   \
 			inis-cyrillic iso_2033 iso_5427 iso_5427-ext	   \
 			iso_5428 iso_10367-box mac-is nats-dano nats-sefi  \
 			iso8859-13 iso8859-14 iso8859-15 mac-uk sami-ws2   \
-			iso-ir-197
+			iso-ir-197 cp1258
 
 gen-special-modules := iso8859-7jp
 
diff --git a/iconvdata/cp1258.h b/iconvdata/cp1258.h
deleted file mode 100644
index 42de6a452a..0000000000
--- a/iconvdata/cp1258.h
+++ /dev/null
@@ -1,306 +0,0 @@
-static const uint32_t to_ucs4[256] = {
-  [0x01] = 0x0001,
-  [0x02] = 0x0002,
-  [0x03] = 0x0003,
-  [0x04] = 0x0004,
-  [0x05] = 0x0005,
-  [0x06] = 0x0006,
-  [0x07] = 0x0007,
-  [0x08] = 0x0008,
-  [0x09] = 0x0009,
-  [0x0A] = 0x000A,
-  [0x0B] = 0x000B,
-  [0x0C] = 0x000C,
-  [0x0D] = 0x000D,
-  [0x0E] = 0x000E,
-  [0x0F] = 0x000F,
-  [0x10] = 0x0010,
-  [0x11] = 0x0011,
-  [0x12] = 0x0012,
-  [0x13] = 0x0013,
-  [0x14] = 0x0014,
-  [0x15] = 0x0015,
-  [0x16] = 0x0016,
-  [0x17] = 0x0017,
-  [0x18] = 0x0018,
-  [0x19] = 0x0019,
-  [0x1A] = 0x001A,
-  [0x1B] = 0x001B,
-  [0x1C] = 0x001C,
-  [0x1D] = 0x001D,
-  [0x1E] = 0x001E,
-  [0x1F] = 0x001F,
-  [0x20] = 0x0020,
-  [0x21] = 0x0021,
-  [0x22] = 0x0022,
-  [0x23] = 0x0023,
-  [0x24] = 0x0024,
-  [0x25] = 0x0025,
-  [0x26] = 0x0026,
-  [0x27] = 0x0027,
-  [0x28] = 0x0028,
-  [0x29] = 0x0029,
-  [0x2A] = 0x002A,
-  [0x2B] = 0x002B,
-  [0x2C] = 0x002C,
-  [0x2D] = 0x002D,
-  [0x2E] = 0x002E,
-  [0x2F] = 0x002F,
-  [0x30] = 0x0030,
-  [0x31] = 0x0031,
-  [0x32] = 0x0032,
-  [0x33] = 0x0033,
-  [0x34] = 0x0034,
-  [0x35] = 0x0035,
-  [0x36] = 0x0036,
-  [0x37] = 0x0037,
-  [0x38] = 0x0038,
-  [0x39] = 0x0039,
-  [0x3A] = 0x003A,
-  [0x3B] = 0x003B,
-  [0x3C] = 0x003C,
-  [0x3D] = 0x003D,
-  [0x3E] = 0x003E,
-  [0x3F] = 0x003F,
-  [0x40] = 0x0040,
-  [0x41] = 0x0041,
-  [0x42] = 0x0042,
-  [0x43] = 0x0043,
-  [0x44] = 0x0044,
-  [0x45] = 0x0045,
-  [0x46] = 0x0046,
-  [0x47] = 0x0047,
-  [0x48] = 0x0048,
-  [0x49] = 0x0049,
-  [0x4A] = 0x004A,
-  [0x4B] = 0x004B,
-  [0x4C] = 0x004C,
-  [0x4D] = 0x004D,
-  [0x4E] = 0x004E,
-  [0x4F] = 0x004F,
-  [0x50] = 0x0050,
-  [0x51] = 0x0051,
-  [0x52] = 0x0052,
-  [0x53] = 0x0053,
-  [0x54] = 0x0054,
-  [0x55] = 0x0055,
-  [0x56] = 0x0056,
-  [0x57] = 0x0057,
-  [0x58] = 0x0058,
-  [0x59] = 0x0059,
-  [0x5A] = 0x005A,
-  [0x5B] = 0x005B,
-  [0x5C] = 0x005C,
-  [0x5D] = 0x005D,
-  [0x5E] = 0x005E,
-  [0x5F] = 0x005F,
-  [0x60] = 0x0060,
-  [0x61] = 0x0061,
-  [0x62] = 0x0062,
-  [0x63] = 0x0063,
-  [0x64] = 0x0064,
-  [0x65] = 0x0065,
-  [0x66] = 0x0066,
-  [0x67] = 0x0067,
-  [0x68] = 0x0068,
-  [0x69] = 0x0069,
-  [0x6A] = 0x006A,
-  [0x6B] = 0x006B,
-  [0x6C] = 0x006C,
-  [0x6D] = 0x006D,
-  [0x6E] = 0x006E,
-  [0x6F] = 0x006F,
-  [0x70] = 0x0070,
-  [0x71] = 0x0071,
-  [0x72] = 0x0072,
-  [0x73] = 0x0073,
-  [0x74] = 0x0074,
-  [0x75] = 0x0075,
-  [0x76] = 0x0076,
-  [0x77] = 0x0077,
-  [0x78] = 0x0078,
-  [0x79] = 0x0079,
-  [0x7A] = 0x007A,
-  [0x7B] = 0x007B,
-  [0x7C] = 0x007C,
-  [0x7D] = 0x007D,
-  [0x7E] = 0x007E,
-  [0x7F] = 0x007F,
-  [0x82] = 0x201A,
-  [0x83] = 0x0192,
-  [0x84] = 0x201E,
-  [0x85] = 0x2026,
-  [0x86] = 0x2020,
-  [0x87] = 0x2021,
-  [0x88] = 0x02C6,
-  [0x89] = 0x2030,
-  [0x8B] = 0x2039,
-  [0x8C] = 0x0152,
-  [0x91] = 0x2018,
-  [0x92] = 0x2019,
-  [0x93] = 0x201C,
-  [0x94] = 0x201D,
-  [0x95] = 0x2022,
-  [0x96] = 0x2013,
-  [0x97] = 0x2014,
-  [0x98] = 0x02DC,
-  [0x99] = 0x2122,
-  [0x9B] = 0x203A,
-  [0x9C] = 0x0153,
-  [0x9F] = 0x0178,
-  [0xA0] = 0x00A0,
-  [0xA1] = 0x00A1,
-  [0xA2] = 0x00A2,
-  [0xA3] = 0x00A3,
-  [0xA4] = 0x00A4,
-  [0xA5] = 0x00A5,
-  [0xA6] = 0x00A6,
-  [0xA7] = 0x00A7,
-  [0xA8] = 0x00A8,
-  [0xA9] = 0x00A9,
-  [0xAA] = 0x00AA,
-  [0xAB] = 0x00AB,
-  [0xAC] = 0x00AC,
-  [0xAD] = 0x00AD,
-  [0xAE] = 0x00AE,
-  [0xAF] = 0x00AF,
-  [0xB0] = 0x00B0,
-  [0xB1] = 0x00B1,
-  [0xB2] = 0x00B2,
-  [0xB3] = 0x00B3,
-  [0xB4] = 0x00B4,
-  [0xB5] = 0x00B5,
-  [0xB6] = 0x00B6,
-  [0xB7] = 0x00B7,
-  [0xB8] = 0x00B8,
-  [0xB9] = 0x00B9,
-  [0xBA] = 0x00BA,
-  [0xBB] = 0x00BB,
-  [0xBC] = 0x00BC,
-  [0xBD] = 0x00BD,
-  [0xBE] = 0x00BE,
-  [0xBF] = 0x00BF,
-  [0xC0] = 0x00C0,
-  [0xC1] = 0x00C1,
-  [0xC2] = 0x00C2,
-  [0xC3] = 0x0102,
-  [0xC4] = 0x00C4,
-  [0xC5] = 0x00C5,
-  [0xC6] = 0x00C6,
-  [0xC7] = 0x00C7,
-  [0xC8] = 0x00C8,
-  [0xC9] = 0x00C9,
-  [0xCA] = 0x00CA,
-  [0xCB] = 0x00CB,
-  [0xCC] = 0x0340,
-  [0xCD] = 0x00CD,
-  [0xCE] = 0x00CE,
-  [0xCF] = 0x00CF,
-  [0xD0] = 0x0110,
-  [0xD1] = 0x00D1,
-  [0xD2] = 0x0309,
-  [0xD3] = 0x00D3,
-  [0xD4] = 0x00D4,
-  [0xD5] = 0x01A0,
-  [0xD6] = 0x00D6,
-  [0xD7] = 0x00D7,
-  [0xD8] = 0x00D8,
-  [0xD9] = 0x00D9,
-  [0xDA] = 0x00DA,
-  [0xDB] = 0x00DB,
-  [0xDC] = 0x00DC,
-  [0xDD] = 0x01AF,
-  [0xDE] = 0x0303,
-  [0xDF] = 0x00DF,
-  [0xE0] = 0x00E0,
-  [0xE1] = 0x00E1,
-  [0xE2] = 0x00E2,
-  [0xE3] = 0x0103,
-  [0xE4] = 0x00E4,
-  [0xE5] = 0x00E5,
-  [0xE6] = 0x00E6,
-  [0xE7] = 0x00E7,
-  [0xE8] = 0x00E8,
-  [0xE9] = 0x00E9,
-  [0xEA] = 0x00EA,
-  [0xEB] = 0x00EB,
-  [0xEC] = 0x0341,
-  [0xED] = 0x00ED,
-  [0xEE] = 0x00EE,
-  [0xEF] = 0x00EF,
-  [0xF0] = 0x0111,
-  [0xF1] = 0x00F1,
-  [0xF2] = 0x0323,
-  [0xF3] = 0x00F3,
-  [0xF4] = 0x00F4,
-  [0xF5] = 0x01A1,
-  [0xF6] = 0x00F6,
-  [0xF7] = 0x00F7,
-  [0xF8] = 0x00F8,
-  [0xF9] = 0x00F9,
-  [0xFA] = 0x00FA,
-  [0xFB] = 0x00FB,
-  [0xFC] = 0x00FC,
-  [0xFD] = 0x01B0,
-  [0xFE] = 0x20AB,
-  [0xFF] = 0x00FF,
-};
-static const struct gap from_idx[] = {
-  { start: 0x0000, end: 0x007f, idx:     0 },
-  { start: 0x00a0, end: 0x0103, idx:   -32 },
-  { start: 0x0110, end: 0x0111, idx:   -44 },
-  { start: 0x0152, end: 0x0153, idx:  -108 },
-  { start: 0x0178, end: 0x0178, idx:  -144 },
-  { start: 0x0192, end: 0x0192, idx:  -169 },
-  { start: 0x01a0, end: 0x01a1, idx:  -182 },
-  { start: 0x01af, end: 0x01b0, idx:  -195 },
-  { start: 0x02c6, end: 0x02c6, idx:  -472 },
-  { start: 0x02dc, end: 0x02dc, idx:  -493 },
-  { start: 0x0303, end: 0x0309, idx:  -531 },
-  { start: 0x0323, end: 0x0323, idx:  -556 },
-  { start: 0x0340, end: 0x0341, idx:  -584 },
-  { start: 0x2013, end: 0x2026, idx: -7961 },
-  { start: 0x2030, end: 0x2030, idx: -7970 },
-  { start: 0x2039, end: 0x203a, idx: -7978 },
-  { start: 0x20ab, end: 0x20ab, idx: -8090 },
-  { start: 0x2122, end: 0x2122, idx: -8208 },
-  { start: 0xffff, end: 0xffff, idx:     0 }
-};
-static const char from_ucs4[] = {
-
-  '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
-  '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
-  '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
-  '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
-  '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
-  '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
-  '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
-  '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
-  '\x40', '\x41', '\x42', '\x43', '\x44', '\x45', '\x46', '\x47',
-  '\x48', '\x49', '\x4a', '\x4b', '\x4c', '\x4d', '\x4e', '\x4f',
-  '\x50', '\x51', '\x52', '\x53', '\x54', '\x55', '\x56', '\x57',
-  '\x58', '\x59', '\x5a', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
-  '\x60', '\x61', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67',
-  '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e', '\x6f',
-  '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77',
-  '\x78', '\x79', '\x7a', '\x7b', '\x7c', '\x7d', '\x7e', '\x7f',
-  '\xa0', '\xa1', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6', '\xa7',
-  '\xa8', '\xa9', '\xaa', '\xab', '\xac', '\xad', '\xae', '\xaf',
-  '\xb0', '\xb1', '\xb2', '\xb3', '\xb4', '\xb5', '\xb6', '\xb7',
-  '\xb8', '\xb9', '\xba', '\xbb', '\xbc', '\xbd', '\xbe', '\xbf',
-  '\xc0', '\xc1', '\xc2', '\x00', '\xc4', '\xc5', '\xc6', '\xc7',
-  '\xc8', '\xc9', '\xca', '\xcb', '\x00', '\xcd', '\xce', '\xcf',
-  '\x00', '\xd1', '\x00', '\xd3', '\xd4', '\x00', '\xd6', '\xd7',
-  '\xd8', '\xd9', '\xda', '\xdb', '\xdc', '\x00', '\x00', '\xdf',
-  '\xe0', '\xe1', '\xe2', '\x00', '\xe4', '\xe5', '\xe6', '\xe7',
-  '\xe8', '\xe9', '\xea', '\xeb', '\x00', '\xed', '\xee', '\xef',
-  '\x00', '\xf1', '\x00', '\xf3', '\xf4', '\x00', '\xf6', '\xf7',
-  '\xf8', '\xf9', '\xfa', '\xfb', '\xfc', '\x00', '\x00', '\xff',
-  '\x00', '\x00', '\xc3', '\xe3', '\xd0', '\xf0', '\x8c', '\x9c',
-  '\x9f', '\x83', '\xd5', '\xf5', '\xdd', '\xfd', '\x88', '\x98',
-  '\xde', '\x00', '\x00', '\x00', '\x00', '\x00', '\xd2', '\xf2',
-  '\xcc', '\xec', '\x96', '\x97', '\x00', '\x00', '\x00', '\x91',
-  '\x92', '\x82', '\x00', '\x93', '\x94', '\x84', '\x00', '\x86',
-  '\x87', '\x95', '\x00', '\x00', '\x00', '\x85', '\x89', '\x8b',
-  '\x9b', '\xfe', '\x99',
-};
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 19d7631295..f6bc1739e1 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,5 +1,7 @@
 1999-03-31  Ulrich Drepper  <drepper@cygnus.com>
 
+	* charmaps/CP1258: New file.
+
 	* charmaps/CP1257: Add some marks.
 	* charmaps/CP1256: Update from Unicode page.
 	* charmaps/CP1255: Lots of punctuation character changes.
@@ -39,7 +41,7 @@
 	(test-input-data): New variable.
 	(distribute): Use it.
 	(do-collate-test): Use it.
-	* hr_HR.in: New file.
+	* locales/hr_HR.in: New file.
 
 1998-12-16  Ulrich Drepper  <drepper@cygnus.com>
 
diff --git a/localedata/charmaps/CP1258 b/localedata/charmaps/CP1258
new file mode 100644
index 0000000000..251c1e2cff
--- /dev/null
+++ b/localedata/charmaps/CP1258
@@ -0,0 +1,348 @@
+<code_set_name> CP1258
+<comment_char> %
+<escape_char> /
+% automatically generated from the charDB
+
+CHARMAP
+<NU>                   /x00     <U0000> NULL
+<NUL>                  /x00     <U0000> NULL
+<SH>                   /x01     <U0001> START OF HEADING
+<SOH>                  /x01     <U0001> START OF HEADING
+<STX>                  /x02     <U0002> START OF TEXT
+<SX>                   /x02     <U0002> START OF TEXT
+<ETX>                  /x03     <U0003> END OF TEXT
+<EX>                   /x03     <U0003> END OF TEXT
+<EOT>                  /x04     <U0004> END OF TRANSMISSION
+<ET>                   /x04     <U0004> END OF TRANSMISSION
+<ENQ>                  /x05     <U0005> ENQUIRY
+<EQ>                   /x05     <U0005> ENQUIRY
+<ACK>                  /x06     <U0006> ACKNOWLEDGE
+<AK>                   /x06     <U0006> ACKNOWLEDGE
+<BEL>                  /x07     <U0007> BELL
+<BL>                   /x07     <U0007> BELL
+<alert>                /x07     <U0007> BELL
+<BS>                   /x08     <U0008> BACKSPACE
+<backspace>            /x08     <U0008> BACKSPACE
+<HT>                   /x09     <U0009> HORIZONTAL TABULATION
+<tab>                  /x09     <U0009> HORIZONTAL TABULATION
+<LF>                   /x0A     <U000A> LINE FEED
+<newline>              /x0A     <U000A> LINE FEED
+<VT>                   /x0B     <U000B> VERTICAL TABULATION
+<vertical-tab>         /x0B     <U000B> VERTICAL TABULATION
+<FF>                   /x0C     <U000C> FORM FEED
+<form-feed>            /x0C     <U000C> FORM FEED
+<CR>                   /x0D     <U000D> CARRIAGE RETURN
+<carriage-return>      /x0D     <U000D> CARRIAGE RETURN
+<SO>                   /x0E     <U000E> SHIFT OUT
+<SI>                   /x0F     <U000F> SHIFT IN
+<DL>                   /x10     <U0010> DATA LINK ESCAPE
+<DLE>                  /x10     <U0010> DATA LINK ESCAPE
+<D1>                   /x11     <U0011> DEVICE CONTROL ONE
+<DC1>                  /x11     <U0011> DEVICE CONTROL ONE
+<D2>                   /x12     <U0012> DEVICE CONTROL TWO
+<DC2>                  /x12     <U0012> DEVICE CONTROL TWO
+<D3>                   /x13     <U0013> DEVICE CONTROL THREE
+<DC3>                  /x13     <U0013> DEVICE CONTROL THREE
+<D4>                   /x14     <U0014> DEVICE CONTROL FOUR
+<DC4>                  /x14     <U0014> DEVICE CONTROL FOUR
+<NAK>                  /x15     <U0015> NEGATIVE ACKNOWLEDGE
+<NK>                   /x15     <U0015> NEGATIVE ACKNOWLEDGE
+<SY>                   /x16     <U0016> SYNCHRONOUS IDLE
+<SYN>                  /x16     <U0016> SYNCHRONOUS IDLE
+<EB>                   /x17     <U0017> END OF TRANSMISSION BLOCK
+<ETB>                  /x17     <U0017> END OF TRANSMISSION BLOCK
+<CAN>                  /x18     <U0018> CANCEL
+<CN>                   /x18     <U0018> CANCEL
+<EM>                   /x19     <U0019> END OF MEDIUM
+<SB>                   /x1A     <U001A> SUBSTITUTE
+<SUB>                  /x1A     <U001A> SUBSTITUTE
+<EC>                   /x1B     <U001B> ESCAPE
+<ESC>                  /x1B     <U001B> ESCAPE
+<FS>                   /x1C     <U001C> FILE SEPARATOR
+<IS4>                  /x1C     <U001C> FILE SEPARATOR
+<GS>                   /x1D     <U001D> GROUP SEPARATOR
+<IS3>                  /x1D     <U001D> GROUP SEPARATOR
+<intro>                /x1D     <U001D> GROUP SEPARATOR
+<IS2>                  /x1E     <U001E> RECORD SEPARATOR
+<RS>                   /x1E     <U001E> RECORD SEPARATOR
+<IS1>                  /x1F     <U001F> UNIT SEPARATOR
+<US>                   /x1F     <U001F> UNIT SEPARATOR
+<space>                /x20     <U0020> SPACE
+<SP>                   /x20     <U0020> SPACE
+<!>                    /x21     <U0021> EXCLAMATION MARK
+<exclamation-mark>     /x21     <U0021> EXCLAMATION MARK
+<">                    /x22     <U0022> QUOTATION MARK
+<quotation-mark>       /x22     <U0022> QUOTATION MARK
+<Nb>                   /x23     <U0023> NUMBER SIGN
+<number-sign>          /x23     <U0023> NUMBER SIGN
+<H->                   /x23     <U0023> NUMBER SIGN
+<!S>                   /x24     <U0024> DOLLAR SIGN
+<DO>                   /x24     <U0024> DOLLAR SIGN
+<dollar-sign>          /x24     <U0024> DOLLAR SIGN
+<%>                    /x25     <U0025> PERCENT SIGN
+<percent-sign>         /x25     <U0025> PERCENT SIGN
+<percent-sign/>>       /x25     <U0025> PERCENT SIGN
+<&>                    /x26     <U0026> AMPERSAND
+<ampersand>            /x26     <U0026> AMPERSAND
+<'>                    /x27     <U0027> APOSTROPHE
+<apostrophe>           /x27     <U0027> APOSTROPHE
+<(>                    /x28     <U0028> LEFT PARENTHESIS
+<left-parenthesis>     /x28     <U0028> LEFT PARENTHESIS
+<)>                    /x29     <U0029> RIGHT PARENTHESIS
+<right-parenthesis>    /x29     <U0029> RIGHT PARENTHESIS
+<*>                    /x2A     <U002A> ASTERISK
+<asterisk>             /x2A     <U002A> ASTERISK
+<+>                    /x2B     <U002B> PLUS SIGN
+<plus-sign>            /x2B     <U002B> PLUS SIGN
+<,>                    /x2C     <U002C> COMMA
+<comma>                /x2C     <U002C> COMMA
+<->                    /x2D     <U002D> HYPHEN-MINUS
+<hyphen>               /x2D     <U002D> HYPHEN-MINUS
+<hyphen-minus>         /x2D     <U002D> HYPHEN-MINUS
+<.>                    /x2E     <U002E> FULL STOP
+<full-stop>            /x2E     <U002E> FULL STOP
+<period>               /x2E     <U002E> FULL STOP
+<//>                   /x2F     <U002F> SOLIDUS
+<slash>                /x2F     <U002F> SOLIDUS
+<solidus>              /x2F     <U002F> SOLIDUS
+<0>                    /x30     <U0030> DIGIT ZERO
+<zero>                 /x30     <U0030> DIGIT ZERO
+<1>                    /x31     <U0031> DIGIT ONE
+<one>                  /x31     <U0031> DIGIT ONE
+<2>                    /x32     <U0032> DIGIT TWO
+<two>                  /x32     <U0032> DIGIT TWO
+<3>                    /x33     <U0033> DIGIT THREE
+<three>                /x33     <U0033> DIGIT THREE
+<4>                    /x34     <U0034> DIGIT FOUR
+<four>                 /x34     <U0034> DIGIT FOUR
+<5>                    /x35     <U0035> DIGIT FIVE
+<five>                 /x35     <U0035> DIGIT FIVE
+<6>                    /x36     <U0036> DIGIT SIX
+<six>                  /x36     <U0036> DIGIT SIX
+<7>                    /x37     <U0037> DIGIT SEVEN
+<seven>                /x37     <U0037> DIGIT SEVEN
+<8>                    /x38     <U0038> DIGIT EIGHT
+<eight>                /x38     <U0038> DIGIT EIGHT
+<9>                    /x39     <U0039> DIGIT NINE
+<nine>                 /x39     <U0039> DIGIT NINE
+<:>                    /x3A     <U003A> COLON
+<colon>                /x3A     <U003A> COLON
+<;>                    /x3B     <U003B> SEMICOLON
+<semicolon>            /x3B     <U003B> SEMICOLON
+<<>                    /x3C     <U003C> LESS-THAN SIGN
+<less-than-sign>       /x3C     <U003C> LESS-THAN SIGN
+<=>                    /x3D     <U003D> EQUALS SIGN
+<equals-sign>          /x3D     <U003D> EQUALS SIGN
+</>>                   /x3E     <U003E> GREATER-THAN SIGN
+<greater-than-sign>    /x3E     <U003E> GREATER-THAN SIGN
+<?>                    /x3F     <U003F> QUESTION MARK
+<question-mark>        /x3F     <U003F> QUESTION MARK
+<At>                   /x40     <U0040> COMMERCIAL AT
+<commercial-at>        /x40     <U0040> COMMERCIAL AT
+<@>                    /x40     <U0040> COMMERCIAL AT
+<Oa>                   /x40     <U0040> COMMERCIAL AT
+<A>                    /x41     <U0041> LATIN CAPITAL LETTER A
+<B>                    /x42     <U0042> LATIN CAPITAL LETTER B
+<C>                    /x43     <U0043> LATIN CAPITAL LETTER C
+<D>                    /x44     <U0044> LATIN CAPITAL LETTER D
+<E>                    /x45     <U0045> LATIN CAPITAL LETTER E
+<F>                    /x46     <U0046> LATIN CAPITAL LETTER F
+<G>                    /x47     <U0047> LATIN CAPITAL LETTER G
+<H>                    /x48     <U0048> LATIN CAPITAL LETTER H
+<I>                    /x49     <U0049> LATIN CAPITAL LETTER I
+<J>                    /x4A     <U004A> LATIN CAPITAL LETTER J
+<K>                    /x4B     <U004B> LATIN CAPITAL LETTER K
+<L>                    /x4C     <U004C> LATIN CAPITAL LETTER L
+<M>                    /x4D     <U004D> LATIN CAPITAL LETTER M
+<N>                    /x4E     <U004E> LATIN CAPITAL LETTER N
+<O>                    /x4F     <U004F> LATIN CAPITAL LETTER O
+<P>                    /x50     <U0050> LATIN CAPITAL LETTER P
+<Q>                    /x51     <U0051> LATIN CAPITAL LETTER Q
+<R>                    /x52     <U0052> LATIN CAPITAL LETTER R
+<S>                    /x53     <U0053> LATIN CAPITAL LETTER S
+<T>                    /x54     <U0054> LATIN CAPITAL LETTER T
+<U>                    /x55     <U0055> LATIN CAPITAL LETTER U
+<V>                    /x56     <U0056> LATIN CAPITAL LETTER V
+<W>                    /x57     <U0057> LATIN CAPITAL LETTER W
+<X>                    /x58     <U0058> LATIN CAPITAL LETTER X
+<Y>                    /x59     <U0059> LATIN CAPITAL LETTER Y
+<Z>                    /x5A     <U005A> LATIN CAPITAL LETTER Z
+<<(>                   /x5B     <U005B> LEFT SQUARE BRACKET
+<left-square-bracket>  /x5B     <U005B> LEFT SQUARE BRACKET
+<////>                 /x5C     <U005C> REVERSE SOLIDUS
+<backslash>            /x5C     <U005C> REVERSE SOLIDUS
+<reverse-solidus>      /x5C     <U005C> REVERSE SOLIDUS
+<)/>>                  /x5D     <U005D> RIGHT SQUARE BRACKET
+<right-square-bracket> /x5D     <U005D> RIGHT SQUARE BRACKET
+<'/>>                  /x5E     <U005E> CIRCUMFLEX ACCENT
+<circumflex>           /x5E     <U005E> CIRCUMFLEX ACCENT
+<circumflex-accent>    /x5E     <U005E> CIRCUMFLEX ACCENT
+<_>                    /x5F     <U005F> LOW LINE
+<low-line>             /x5F     <U005F> LOW LINE
+<underscore>           /x5F     <U005F> LOW LINE
+<'!>                   /x60     <U0060> GRAVE ACCENT
+<grave-accent>         /x60     <U0060> GRAVE ACCENT
+<a>                    /x61     <U0061> LATIN SMALL LETTER A
+<b>                    /x62     <U0062> LATIN SMALL LETTER B
+<c>                    /x63     <U0063> LATIN SMALL LETTER C
+<d>                    /x64     <U0064> LATIN SMALL LETTER D
+<e>                    /x65     <U0065> LATIN SMALL LETTER E
+<f>                    /x66     <U0066> LATIN SMALL LETTER F
+<g>                    /x67     <U0067> LATIN SMALL LETTER G
+<h>                    /x68     <U0068> LATIN SMALL LETTER H
+<i>                    /x69     <U0069> LATIN SMALL LETTER I
+<j>                    /x6A     <U006A> LATIN SMALL LETTER J
+<k>                    /x6B     <U006B> LATIN SMALL LETTER K
+<l>                    /x6C     <U006C> LATIN SMALL LETTER L
+<m>                    /x6D     <U006D> LATIN SMALL LETTER M
+<n>                    /x6E     <U006E> LATIN SMALL LETTER N
+<o>                    /x6F     <U006F> LATIN SMALL LETTER O
+<p>                    /x70     <U0070> LATIN SMALL LETTER P
+<q>                    /x71     <U0071> LATIN SMALL LETTER Q
+<r>                    /x72     <U0072> LATIN SMALL LETTER R
+<s>                    /x73     <U0073> LATIN SMALL LETTER S
+<t>                    /x74     <U0074> LATIN SMALL LETTER T
+<u>                    /x75     <U0075> LATIN SMALL LETTER U
+<v>                    /x76     <U0076> LATIN SMALL LETTER V
+<w>                    /x77     <U0077> LATIN SMALL LETTER W
+<x>                    /x78     <U0078> LATIN SMALL LETTER X
+<y>                    /x79     <U0079> LATIN SMALL LETTER Y
+<z>                    /x7A     <U007A> LATIN SMALL LETTER Z
+<(!>                   /x7B     <U007B> LEFT CURLY BRACKET
+<left-brace>           /x7B     <U007B> LEFT CURLY BRACKET
+<left-curly-bracket>   /x7B     <U007B> LEFT CURLY BRACKET
+<!!>                   /x7C     <U007C> VERTICAL LINE
+<vertical-line>        /x7C     <U007C> VERTICAL LINE
+<!)>                   /x7D     <U007D> RIGHT CURLY BRACKET
+<right-brace>          /x7D     <U007D> RIGHT CURLY BRACKET
+<right-curly-bracket>  /x7D     <U007D> RIGHT CURLY BRACKET
+<'?>                   /x7E     <U007E> TILDE
+<tilde>                /x7E     <U007E> TILDE
+<DEL>                  /x7F     <U007F> DELETE
+<DT>                   /x7F     <U007F> DELETE
+<Eu>                   /x80     <U20AC> EURO SIGN
+<.9>                   /x82     <U201A> SINGLE LOW-9 QUOTATION MARK
+<f2>                   /x83     <U0192> LATIN SMALL LETTER F WITH HOOK
+<:9>                   /x84     <U201E> DOUBLE LOW-9 QUOTATION MARK
+<.3>                   /x85     <U2026> HORIZONTAL ELLIPSIS
+<//->                  /x86     <U2020> DAGGER
+<//=>                  /x87     <U2021> DOUBLE DAGGER
+<1/>>                  /x88     <U02C6> MODIFIER LETTER CIRCUMFLEX ACCENT
+<%0>                   /x89     <U2030> PER MILLE SIGN
+<<1>                   /x8B     <U2039> SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+<OE>                   /x8C     <U0152> LATIN CAPITAL LIGATURE OE
+<'6>                   /x91     <U2018> LEFT SINGLE QUOTATION MARK
+<'9>                   /x92     <U2019> RIGHT SINGLE QUOTATION MARK
+<"6>                   /x93     <U201C> LEFT DOUBLE QUOTATION MARK
+<"9>                   /x94     <U201D> RIGHT DOUBLE QUOTATION MARK
+<sb>                   /x95     <U2022> BULLET
+<-N>                   /x96     <U2013> EN DASH
+<-M>                   /x97     <U2014> EM DASH
+<1?>                   /x98     <U02DC> SMALL TILDE
+<TM>                   /x99     <U2122> TRADE MARK SIGN
+</>1>                  /x9B     <U203A> SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+<oe>                   /x9C     <U0153> LATIN SMALL LIGATURE OE
+<Y:>                   /x9F     <U0178> LATIN CAPITAL LETTER Y WITH DIAERESIS
+<NS>                   /xA0     <U00A0> NO-BREAK SPACE
+<!I>                   /xA1     <U00A1> INVERTED EXCLAMATION MARK
+<Ct>                   /xA2     <U00A2> CENT SIGN
+<!C>                   /xA2     <U00A2> CENT SIGN
+<L->                   /xA3     <U00A3> POUND SIGN
+<Pd>                   /xA3     <U00A3> POUND SIGN
+<Cu>                   /xA4     <U00A4> CURRENCY SIGN
+<Xo>                   /xA4     <U00A4> CURRENCY SIGN
+<Y->                   /xA5     <U00A5> YEN SIGN
+<Ye>                   /xA5     <U00A5> YEN SIGN
+<BB>                   /xA6     <U00A6> BROKEN BAR
+<!B>                   /xA6     <U00A6> BROKEN BAR
+<SE>                   /xA7     <U00A7> SECTION SIGN
+<':>                   /xA8     <U00A8> DIAERESIS
+<Co>                   /xA9     <U00A9> COPYRIGHT SIGN
+<-a>                   /xAA     <U00AA> FEMININE ORDINAL INDICATOR
+<<<>                   /xAB     <U00AB> LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+<NO>                   /xAC     <U00AC> NOT SIGN
+<7!>                   /xAC     <U00AC> NOT SIGN
+<-->                   /xAD     <U00AD> SOFT HYPHEN
+<Rg>                   /xAE     <U00AE> REGISTERED SIGN
+<'m>                   /xAF     <U00AF> MACRON
+<DG>                   /xB0     <U00B0> DEGREE SIGN
+<+->                   /xB1     <U00B1> PLUS-MINUS SIGN
+<2S>                   /xB2     <U00B2> SUPERSCRIPT TWO
+<3S>                   /xB3     <U00B3> SUPERSCRIPT THREE
+<''>                   /xB4     <U00B4> ACUTE ACCENT
+<My>                   /xB5     <U00B5> MICRO SIGN
+<PI>                   /xB6     <U00B6> PILCROW SIGN
+<9I>                   /xB6     <U00B6> PILCROW SIGN
+<.M>                   /xB7     <U00B7> MIDDLE DOT
+<',>                   /xB8     <U00B8> CEDILLA
+<1S>                   /xB9     <U00B9> SUPERSCRIPT ONE
+<-o>                   /xBA     <U00BA> MASCULINE ORDINAL INDICATOR
+</>/>>                 /xBB     <U00BB> RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+<14>                   /xBC     <U00BC> VULGAR FRACTION ONE QUARTER
+<12>                   /xBD     <U00BD> VULGAR FRACTION ONE HALF
+<34>                   /xBE     <U00BE> VULGAR FRACTION THREE QUARTERS
+<?I>                   /xBF     <U00BF> INVERTED QUESTION MARK
+<A!>                   /xC0     <U00C0> LATIN CAPITAL LETTER A WITH GRAVE
+<A'>                   /xC1     <U00C1> LATIN CAPITAL LETTER A WITH ACUTE
+<A/>>                  /xC2     <U00C2> LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+<A(>                   /xC3     <U0102> LATIN CAPITAL LETTER A WITH BREVE
+<A:>                   /xC4     <U00C4> LATIN CAPITAL LETTER A WITH DIAERESIS
+<AA>                   /xC5     <U00C5> LATIN CAPITAL LETTER A WITH RING ABOVE
+<AE>                   /xC6     <U00C6> LATIN CAPITAL LETTER AE
+<C,>                   /xC7     <U00C7> LATIN CAPITAL LETTER C WITH CEDILLA
+<E!>                   /xC8     <U00C8> LATIN CAPITAL LETTER E WITH GRAVE
+<E'>                   /xC9     <U00C9> LATIN CAPITAL LETTER E WITH ACUTE
+<E/>>                  /xCA     <U00CA> LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+<E:>                   /xCB     <U00CB> LATIN CAPITAL LETTER E WITH DIAERESIS
+<'C!>                  /xCC     <U0300> COMBINING GRAVE ACCENT
+<I'>                   /xCD     <U00CD> LATIN CAPITAL LETTER I WITH ACUTE
+<I/>>                  /xCE     <U00CE> LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+<I:>                   /xCF     <U00CF> LATIN CAPITAL LETTER I WITH DIAERESIS
+<D//>                  /xD0     <U0110> LATIN CAPITAL LETTER D WITH STROKE
+<N?>                   /xD1     <U00D1> LATIN CAPITAL LETTER N WITH TILDE
+<'C2>                  /xD2     <U0309> COMBINING HOOK ABOVE
+<O'>                   /xD3     <U00D3> LATIN CAPITAL LETTER O WITH ACUTE
+<O/>>                  /xD4     <U00D4> LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+<O9>                   /xD5     <U01A0> LATIN CAPITAL LETTER O WITH HORN
+<O:>                   /xD6     <U00D6> LATIN CAPITAL LETTER O WITH DIAERESIS
+<*X>                   /xD7     <U00D7> MULTIPLICATION SIGN
+<O//>                  /xD8     <U00D8> LATIN CAPITAL LETTER O WITH STROKE
+<U!>                   /xD9     <U00D9> LATIN CAPITAL LETTER U WITH GRAVE
+<U'>                   /xDA     <U00DA> LATIN CAPITAL LETTER U WITH ACUTE
+<U/>>                  /xDB     <U00DB> LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+<U:>                   /xDC     <U00DC> LATIN CAPITAL LETTER U WITH DIAERESIS
+<U9>                   /xDD     <U01AF> LATIN CAPITAL LETTER U WITH HORN
+<-C?>                  /xDE     <U0303> COMBINING TILDE
+<ss>                   /xDF     <U00DF> LATIN SMALL LETTER SHARP S
+<a!>                   /xE0     <U00E0> LATIN SMALL LETTER A WITH GRAVE
+<a'>                   /xE1     <U00E1> LATIN SMALL LETTER A WITH ACUTE
+<a/>>                  /xE2     <U00E2> LATIN SMALL LETTER A WITH CIRCUMFLEX
+<a(>                   /xE3     <U0103> LATIN SMALL LETTER A WITH BREVE
+<a:>                   /xE4     <U00E4> LATIN SMALL LETTER A WITH DIAERESIS
+<aa>                   /xE5     <U00E5> LATIN SMALL LETTER A WITH RING ABOVE
+<ae>                   /xE6     <U00E6> LATIN SMALL LETTER AE
+<c,>                   /xE7     <U00E7> LATIN SMALL LETTER C WITH CEDILLA
+<e!>                   /xE8     <U00E8> LATIN SMALL LETTER E WITH GRAVE
+<e'>                   /xE9     <U00E9> LATIN SMALL LETTER E WITH ACUTE
+<e/>>                  /xEA     <U00EA> LATIN SMALL LETTER E WITH CIRCUMFLEX
+<e:>                   /xEB     <U00EB> LATIN SMALL LETTER E WITH DIAERESIS
+<i'>                   /xED     <U00ED> LATIN SMALL LETTER I WITH ACUTE
+<i/>>                  /xEE     <U00EE> LATIN SMALL LETTER I WITH CIRCUMFLEX
+<i:>                   /xEF     <U00EF> LATIN SMALL LETTER I WITH DIAERESIS
+<d//>                  /xF0     <U0111> LATIN SMALL LETTER D WITH STROKE
+<n?>                   /xF1     <U00F1> LATIN SMALL LETTER N WITH TILDE
+<-C.>                  /xF2     <U0323> COMBINING DOT BELOW
+<o'>                   /xF3     <U00F3> LATIN SMALL LETTER O WITH ACUTE
+<o/>>                  /xF4     <U00F4> LATIN SMALL LETTER O WITH CIRCUMFLEX
+<o9>                   /xF5     <U01A1> LATIN SMALL LETTER O WITH HORN
+<o:>                   /xF6     <U00F6> LATIN SMALL LETTER O WITH DIAERESIS
+<-:>                   /xF7     <U00F7> DIVISION SIGN
+<o//>                  /xF8     <U00F8> LATIN SMALL LETTER O WITH STROKE
+<u!>                   /xF9     <U00F9> LATIN SMALL LETTER U WITH GRAVE
+<u'>                   /xFA     <U00FA> LATIN SMALL LETTER U WITH ACUTE
+<u/>>                  /xFB     <U00FB> LATIN SMALL LETTER U WITH CIRCUMFLEX
+<u:>                   /xFC     <U00FC> LATIN SMALL LETTER U WITH DIAERESIS
+<u9>                   /xFD     <U01B0> LATIN SMALL LETTER U WITH HORN
+<DNG>                  /xFE     <U20AB> DONG SIGN
+<y:>                   /xFF     <U00FF> LATIN SMALL LETTER Y WITH DIAERESIS
+END CHARMAP