diff --git a/COPYING b/COPYING
index 12a594c4f..2960a360e 100644
--- a/COPYING
+++ b/COPYING
@@ -81,6 +81,19 @@ so their full licence terms should be included here in COPYING:
   (not later), or GNU General Public License Version 2 or later.
   ELinks uses these under GPL and does not include the text of the MPL.
 
+* Unicode/8859_1.cp, Unicode/8859_2.cp, Unicode/8859_3.cp,
+  Unicode/8859_4.cp, Unicode/8859_5.cp, Unicode/8859_6.cp,
+  Unicode/8859_7.cp, Unicode/8859_8.cp, Unicode/8859_9.cp,
+  Unicode/8859_10.cp, Unicode/8859_13.cp, Unicode/8859_14.cp,
+  Unicode/8859_15.cp, Unicode/8859_16.cp, Unicode/koi8_r.cp,
+  Unicode/cp437.cp, Unicode/cp737.cp, Unicode/cp850.cp,
+  Unicode/cp852.cp, Unicode/cp866.cp, Unicode/cp1250.cp,
+  Unicode/cp1251.cp, Unicode/cp1252.cp, Unicode/cp1256.cp,
+  Unicode/cp1257.cp, Unicode/macroman.cp, Unicode/mac_lat2.cp:
+  See "UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE"
+  below.  These files were downloaded from directories under
+  <http://www.unicode.org/Public/> and then modified for ELinks.
+
 -----------------------------------------------------------------------
 
 		    GNU GENERAL PUBLIC LICENSE
@@ -468,3 +481,56 @@ In both src/osdep/getifaddrs.c and src/osdep/getifaddrs.h:
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+
+-----------------------------------------------------------------------
+
+UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
+
+Unicode Data Files include all data files under the directories
+http://www.unicode.org/Public/, http://www.unicode.org/reports/, and
+http://www.unicode.org/cldr/data/ . Unicode Software includes any source
+code published in the Unicode Standard or under the directories
+http://www.unicode.org/Public/, http://www.unicode.org/reports/, and
+http://www.unicode.org/cldr/data/.
+
+NOTICE TO USER: Carefully read the following legal agreement. BY
+DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA
+FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY
+ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF THIS
+AGREEMENT. IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY,
+DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright © 1991-2008 Unicode, Inc. All rights reserved. Distributed
+under the Terms of Use in http://www.unicode.org/copyright.html.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of the Unicode data files and any associated documentation (the
+"Data Files") or Unicode software and any associated documentation (the
+"Software") to deal in the Data Files or Software without restriction,
+including without limitation the rights to use, copy, modify, merge,
+publish, distribute, and/or sell copies of the Data Files or Software,
+and to permit persons to whom the Data Files or Software are furnished to
+do so, provided that (a) the above copyright notice(s) and this
+permission notice appear with all copies of the Data Files or Software,
+(b) both the above copyright notice(s) and this permission notice appear
+in associated documentation, and (c) there is clear notice in each
+modified Data File or in the Software as well as in the documentation
+associated with the Data File(s) or Software that the data or software
+has been modified.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
+INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
+OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in these Data Files or Software without prior written
+authorization of the copyright holder.
diff --git a/NEWS b/NEWS
index 9e8a8f20b..255d1dbeb 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ includes the changes listed under ``ELinks 0.11.5.GIT'' below.
 
 * Perl scripts can use modules that dynamically load C libraries, like
   XML::LibXML::SAX does.
+* enhancement: Updated ISO 8859-7, ISO 8859-16, KOI8-R, and MacRoman.
 
 ELinks 0.12pre2:
 ----------------
diff --git a/Unicode/8859_1.cp b/Unicode/8859_1.cp
index 1c10cbe3d..d91bbbd2b 100644
--- a/Unicode/8859_1.cp
+++ b/Unicode/8859_1.cp
@@ -1,193 +1,317 @@
 ISO 8859-1
 "ISO-8859-1", "iso8859-1", "8859-1", "iso-ir-100", "latin1", "l1", "il1", "819", "cp819", "ISO_8859-1", "IBM819", "csISOLatin1", "ISO_8859-1:1987", "ISO8859_1"
-0x20	0x0020	#SPACE
-0x21	0x0021	#EXCLAMATION MARK
-0x22	0x0022	#QUOTATION MARK
-0x23	0x0023	#NUMBER SIGN
-0x24	0x0024	#DOLLAR SIGN
-0x25	0x0025	#PERCENT SIGN
-0x26	0x0026	#AMPERSAND
-0x27	0x0027	#APOSTROPHE
-0x28	0x0028	#LEFT PARENTHESIS
-0x29	0x0029	#RIGHT PARENTHESIS
-0x2A	0x002A	#ASTERISK
-0x2B	0x002B	#PLUS SIGN
-0x2C	0x002C	#COMMA
-0x2D	0x002D	#HYPHEN-MINUS
-0x2E	0x002E	#FULL STOP
-0x2F	0x002F	#SOLIDUS
-0x30	0x0030	#DIGIT ZERO
-0x31	0x0031	#DIGIT ONE
-0x32	0x0032	#DIGIT TWO
-0x33	0x0033	#DIGIT THREE
-0x34	0x0034	#DIGIT FOUR
-0x35	0x0035	#DIGIT FIVE
-0x36	0x0036	#DIGIT SIX
-0x37	0x0037	#DIGIT SEVEN
-0x38	0x0038	#DIGIT EIGHT
-0x39	0x0039	#DIGIT NINE
-0x3A	0x003A	#COLON
-0x3B	0x003B	#SEMICOLON
-0x3C	0x003C	#LESS-THAN SIGN
-0x3D	0x003D	#EQUALS SIGN
-0x3E	0x003E	#GREATER-THAN SIGN
-0x3F	0x003F	#QUESTION MARK
-0x40	0x0040	#COMMERCIAL AT
-0x41	0x0041	#LATIN CAPITAL LETTER A
-0x42	0x0042	#LATIN CAPITAL LETTER B
-0x43	0x0043	#LATIN CAPITAL LETTER C
-0x44	0x0044	#LATIN CAPITAL LETTER D
-0x45	0x0045	#LATIN CAPITAL LETTER E
-0x46	0x0046	#LATIN CAPITAL LETTER F
-0x47	0x0047	#LATIN CAPITAL LETTER G
-0x48	0x0048	#LATIN CAPITAL LETTER H
-0x49	0x0049	#LATIN CAPITAL LETTER I
-0x4A	0x004A	#LATIN CAPITAL LETTER J
-0x4B	0x004B	#LATIN CAPITAL LETTER K
-0x4C	0x004C	#LATIN CAPITAL LETTER L
-0x4D	0x004D	#LATIN CAPITAL LETTER M
-0x4E	0x004E	#LATIN CAPITAL LETTER N
-0x4F	0x004F	#LATIN CAPITAL LETTER O
-0x50	0x0050	#LATIN CAPITAL LETTER P
-0x51	0x0051	#LATIN CAPITAL LETTER Q
-0x52	0x0052	#LATIN CAPITAL LETTER R
-0x53	0x0053	#LATIN CAPITAL LETTER S
-0x54	0x0054	#LATIN CAPITAL LETTER T
-0x55	0x0055	#LATIN CAPITAL LETTER U
-0x56	0x0056	#LATIN CAPITAL LETTER V
-0x57	0x0057	#LATIN CAPITAL LETTER W
-0x58	0x0058	#LATIN CAPITAL LETTER X
-0x59	0x0059	#LATIN CAPITAL LETTER Y
-0x5A	0x005A	#LATIN CAPITAL LETTER Z
-0x5B	0x005B	#LEFT SQUARE BRACKET
-0x5C	0x005C	#REVERSE SOLIDUS
-0x5D	0x005D	#RIGHT SQUARE BRACKET
-0x5E	0x005E	#CIRCUMFLEX ACCENT
-0x5F	0x005F	#LOW LINE
-0x60	0x0060	#GRAVE ACCENT
-0x61	0x0061	#LATIN SMALL LETTER A
-0x62	0x0062	#LATIN SMALL LETTER B
-0x63	0x0063	#LATIN SMALL LETTER C
-0x64	0x0064	#LATIN SMALL LETTER D
-0x65	0x0065	#LATIN SMALL LETTER E
-0x66	0x0066	#LATIN SMALL LETTER F
-0x67	0x0067	#LATIN SMALL LETTER G
-0x68	0x0068	#LATIN SMALL LETTER H
-0x69	0x0069	#LATIN SMALL LETTER I
-0x6A	0x006A	#LATIN SMALL LETTER J
-0x6B	0x006B	#LATIN SMALL LETTER K
-0x6C	0x006C	#LATIN SMALL LETTER L
-0x6D	0x006D	#LATIN SMALL LETTER M
-0x6E	0x006E	#LATIN SMALL LETTER N
-0x6F	0x006F	#LATIN SMALL LETTER O
-0x70	0x0070	#LATIN SMALL LETTER P
-0x71	0x0071	#LATIN SMALL LETTER Q
-0x72	0x0072	#LATIN SMALL LETTER R
-0x73	0x0073	#LATIN SMALL LETTER S
-0x74	0x0074	#LATIN SMALL LETTER T
-0x75	0x0075	#LATIN SMALL LETTER U
-0x76	0x0076	#LATIN SMALL LETTER V
-0x77	0x0077	#LATIN SMALL LETTER W
-0x78	0x0078	#LATIN SMALL LETTER X
-0x79	0x0079	#LATIN SMALL LETTER Y
-0x7A	0x007A	#LATIN SMALL LETTER Z
-0x7B	0x007B	#LEFT CURLY BRACKET
-0x7C	0x007C	#VERTICAL LINE
-0x7D	0x007D	#RIGHT CURLY BRACKET
-0x7E	0x007E	#TILDE
-0xA0	0x00A0	#NO-BREAK SPACE
-0xA1	0x00A1	#INVERTED EXCLAMATION MARK
-0xA2	0x00A2	#CENT SIGN
-0xA3	0x00A3	#POUND SIGN
-0xA4	0x00A4	#CURRENCY SIGN
-0xA5	0x00A5	#YEN SIGN
-0xA6	0x00A6	#BROKEN BAR
-0xA7	0x00A7	#SECTION SIGN
-0xA8	0x00A8	#DIAERESIS
-0xA9	0x00A9	#COPYRIGHT SIGN
-0xAA	0x00AA	#FEMININE ORDINAL INDICATOR
-0xAB	0x00AB	#LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xAC	0x00AC	#NOT SIGN
-0xAD	0x00AD	#SOFT HYPHEN
-0xAE	0x00AE	#REGISTERED SIGN
-0xAF	0x00AF	#MACRON
-0xB0	0x00B0	#DEGREE SIGN
-0xB1	0x00B1	#PLUS-MINUS SIGN
-0xB2	0x00B2	#SUPERSCRIPT TWO
-0xB3	0x00B3	#SUPERSCRIPT THREE
-0xB4	0x00B4	#ACUTE ACCENT
-0xB5	0x00B5	#MICRO SIGN
-0xB6	0x00B6	#PILCROW SIGN
-0xB7	0x00B7	#MIDDLE DOT
-0xB8	0x00B8	#CEDILLA
-0xB9	0x00B9	#SUPERSCRIPT ONE
-0xBA	0x00BA	#MASCULINE ORDINAL INDICATOR
-0xBB	0x00BB	#RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xBC	0x00BC	#VULGAR FRACTION ONE QUARTER
-0xBD	0x00BD	#VULGAR FRACTION ONE HALF
-0xBE	0x00BE	#VULGAR FRACTION THREE QUARTERS
-0xBF	0x00BF	#INVERTED QUESTION MARK
-0xC0	0x00C0	#LATIN CAPITAL LETTER A WITH GRAVE
-0xC1	0x00C1	#LATIN CAPITAL LETTER A WITH ACUTE
-0xC2	0x00C2	#LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-0xC3	0x00C3	#LATIN CAPITAL LETTER A WITH TILDE
-0xC4	0x00C4	#LATIN CAPITAL LETTER A WITH DIAERESIS
-0xC5	0x00C5	#LATIN CAPITAL LETTER A WITH RING ABOVE
-0xC6	0x00C6	#LATIN CAPITAL LETTER AE
-0xC7	0x00C7	#LATIN CAPITAL LETTER C WITH CEDILLA
-0xC8	0x00C8	#LATIN CAPITAL LETTER E WITH GRAVE
-0xC9	0x00C9	#LATIN CAPITAL LETTER E WITH ACUTE
-0xCA	0x00CA	#LATIN CAPITAL LETTER E WITH CIRCUMFLEX
-0xCB	0x00CB	#LATIN CAPITAL LETTER E WITH DIAERESIS
-0xCC	0x00CC	#LATIN CAPITAL LETTER I WITH GRAVE
-0xCD	0x00CD	#LATIN CAPITAL LETTER I WITH ACUTE
-0xCE	0x00CE	#LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-0xCF	0x00CF	#LATIN CAPITAL LETTER I WITH DIAERESIS
-0xD0	0x00D0	#LATIN CAPITAL LETTER ETH
-0xD1	0x00D1	#LATIN CAPITAL LETTER N WITH TILDE
-0xD2	0x00D2	#LATIN CAPITAL LETTER O WITH GRAVE
-0xD3	0x00D3	#LATIN CAPITAL LETTER O WITH ACUTE
-0xD4	0x00D4	#LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-0xD5	0x00D5	#LATIN CAPITAL LETTER O WITH TILDE
-0xD6	0x00D6	#LATIN CAPITAL LETTER O WITH DIAERESIS
-0xD7	0x00D7	#MULTIPLICATION SIGN
-0xD8	0x00D8	#LATIN CAPITAL LETTER O WITH STROKE
-0xD9	0x00D9	#LATIN CAPITAL LETTER U WITH GRAVE
-0xDA	0x00DA	#LATIN CAPITAL LETTER U WITH ACUTE
-0xDB	0x00DB	#LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-0xDC	0x00DC	#LATIN CAPITAL LETTER U WITH DIAERESIS
-0xDD	0x00DD	#LATIN CAPITAL LETTER Y WITH ACUTE
-0xDE	0x00DE	#LATIN CAPITAL LETTER THORN
-0xDF	0x00DF	#LATIN SMALL LETTER SHARP S
-0xE0	0x00E0	#LATIN SMALL LETTER A WITH GRAVE
-0xE1	0x00E1	#LATIN SMALL LETTER A WITH ACUTE
-0xE2	0x00E2	#LATIN SMALL LETTER A WITH CIRCUMFLEX
-0xE3	0x00E3	#LATIN SMALL LETTER A WITH TILDE
-0xE4	0x00E4	#LATIN SMALL LETTER A WITH DIAERESIS
-0xE5	0x00E5	#LATIN SMALL LETTER A WITH RING ABOVE
-0xE6	0x00E6	#LATIN SMALL LETTER AE
-0xE7	0x00E7	#LATIN SMALL LETTER C WITH CEDILLA
-0xE8	0x00E8	#LATIN SMALL LETTER E WITH GRAVE
-0xE9	0x00E9	#LATIN SMALL LETTER E WITH ACUTE
-0xEA	0x00EA	#LATIN SMALL LETTER E WITH CIRCUMFLEX
-0xEB	0x00EB	#LATIN SMALL LETTER E WITH DIAERESIS
-0xEC	0x00EC	#LATIN SMALL LETTER I WITH GRAVE
-0xED	0x00ED	#LATIN SMALL LETTER I WITH ACUTE
-0xEE	0x00EE	#LATIN SMALL LETTER I WITH CIRCUMFLEX
-0xEF	0x00EF	#LATIN SMALL LETTER I WITH DIAERESIS
-0xF0	0x00F0	#LATIN SMALL LETTER ETH
-0xF1	0x00F1	#LATIN SMALL LETTER N WITH TILDE
-0xF2	0x00F2	#LATIN SMALL LETTER O WITH GRAVE
-0xF3	0x00F3	#LATIN SMALL LETTER O WITH ACUTE
-0xF4	0x00F4	#LATIN SMALL LETTER O WITH CIRCUMFLEX
-0xF5	0x00F5	#LATIN SMALL LETTER O WITH TILDE
-0xF6	0x00F6	#LATIN SMALL LETTER O WITH DIAERESIS
-0xF7	0x00F7	#DIVISION SIGN
-0xF8	0x00F8	#LATIN SMALL LETTER O WITH STROKE
-0xF9	0x00F9	#LATIN SMALL LETTER U WITH GRAVE
-0xFA	0x00FA	#LATIN SMALL LETTER U WITH ACUTE
-0xFB	0x00FB	#LATIN SMALL LETTER U WITH CIRCUMFLEX
-0xFC	0x00FC	#LATIN SMALL LETTER U WITH DIAERESIS
-0xFD	0x00FD	#LATIN SMALL LETTER Y WITH ACUTE
-0xFE	0x00FE	#LATIN SMALL LETTER THORN
-0xFF	0x00FF	#LATIN SMALL LETTER Y WITH DIAERESIS
+
+# ----------------------------------------------------------------------
+# The following data was downloaded from
+# http://www.unicode.org/Public/MAPPINGS/ISO8859/DatedVersions/8859-1-1998.TXT
+# on 2008-10-05, so it is a Unicode Data File covered by the Unicode
+# copyright and permission notice in the COPYING file of ELinks,
+# regardless of any terms shown below.
+#
+# This file differs from the original in the following ways:
+# - Added this comment, blank lines around it, and charset names above it.
+# ----------------------------------------------------------------------
+
+#
+#	Name:             ISO/IEC 8859-1:1998 to Unicode
+#	Unicode version:  3.0
+#	Table version:    1.0
+#	Table format:     Format A
+#	Date:             1999 July 27
+#	Authors:          Ken Whistler <kenw@sybase.com>
+#
+#	Copyright (c) 1991-1999 Unicode, Inc.  All Rights reserved.
+#
+#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#	No claims are made as to fitness for any particular purpose.  No
+#	warranties of any kind are expressed or implied.  The recipient
+#	agrees to determine applicability of information provided.  If this
+#	file has been provided on optical media by Unicode, Inc., the sole
+#	remedy for any claim will be exchange of defective media within 90
+#	days of receipt.
+#
+#	Unicode, Inc. hereby grants the right to freely use the information
+#	supplied in this file in the creation of products supporting the
+#	Unicode Standard, and to make copies of this file in any form for
+#	internal or external distribution as long as this notice remains
+#	attached.
+#
+#	General notes:
+#
+#	This table contains the data the Unicode Consortium has on how
+#       ISO/IEC 8859-1:1998 characters map into Unicode.
+#
+#	Format:  Three tab-separated columns
+#		 Column #1 is the ISO/IEC 8859-1 code (in hex as 0xXX)
+#		 Column #2 is the Unicode (in hex as 0xXXXX)
+#		 Column #3 the Unicode name (follows a comment sign, '#')
+#
+#	The entries are in ISO/IEC 8859-1 order.
+#
+#	Version history
+#	1.0 version updates 0.1 version by adding mappings for all
+#	control characters.
+#
+#	Updated versions of this file may be found in:
+#		<ftp://ftp.unicode.org/Public/MAPPINGS/>
+#
+#	Any comments or problems, contact <errata@unicode.org>
+#	Please note that <errata@unicode.org> is an archival address;
+#	notices will be checked, but do not expect an immediate response.
+#
+0x00	0x0000	#	NULL
+0x01	0x0001	#	START OF HEADING
+0x02	0x0002	#	START OF TEXT
+0x03	0x0003	#	END OF TEXT
+0x04	0x0004	#	END OF TRANSMISSION
+0x05	0x0005	#	ENQUIRY
+0x06	0x0006	#	ACKNOWLEDGE
+0x07	0x0007	#	BELL
+0x08	0x0008	#	BACKSPACE
+0x09	0x0009	#	HORIZONTAL TABULATION
+0x0A	0x000A	#	LINE FEED
+0x0B	0x000B	#	VERTICAL TABULATION
+0x0C	0x000C	#	FORM FEED
+0x0D	0x000D	#	CARRIAGE RETURN
+0x0E	0x000E	#	SHIFT OUT
+0x0F	0x000F	#	SHIFT IN
+0x10	0x0010	#	DATA LINK ESCAPE
+0x11	0x0011	#	DEVICE CONTROL ONE
+0x12	0x0012	#	DEVICE CONTROL TWO
+0x13	0x0013	#	DEVICE CONTROL THREE
+0x14	0x0014	#	DEVICE CONTROL FOUR
+0x15	0x0015	#	NEGATIVE ACKNOWLEDGE
+0x16	0x0016	#	SYNCHRONOUS IDLE
+0x17	0x0017	#	END OF TRANSMISSION BLOCK
+0x18	0x0018	#	CANCEL
+0x19	0x0019	#	END OF MEDIUM
+0x1A	0x001A	#	SUBSTITUTE
+0x1B	0x001B	#	ESCAPE
+0x1C	0x001C	#	FILE SEPARATOR
+0x1D	0x001D	#	GROUP SEPARATOR
+0x1E	0x001E	#	RECORD SEPARATOR
+0x1F	0x001F	#	UNIT SEPARATOR
+0x20	0x0020	#	SPACE
+0x21	0x0021	#	EXCLAMATION MARK
+0x22	0x0022	#	QUOTATION MARK
+0x23	0x0023	#	NUMBER SIGN
+0x24	0x0024	#	DOLLAR SIGN
+0x25	0x0025	#	PERCENT SIGN
+0x26	0x0026	#	AMPERSAND
+0x27	0x0027	#	APOSTROPHE
+0x28	0x0028	#	LEFT PARENTHESIS
+0x29	0x0029	#	RIGHT PARENTHESIS
+0x2A	0x002A	#	ASTERISK
+0x2B	0x002B	#	PLUS SIGN
+0x2C	0x002C	#	COMMA
+0x2D	0x002D	#	HYPHEN-MINUS
+0x2E	0x002E	#	FULL STOP
+0x2F	0x002F	#	SOLIDUS
+0x30	0x0030	#	DIGIT ZERO
+0x31	0x0031	#	DIGIT ONE
+0x32	0x0032	#	DIGIT TWO
+0x33	0x0033	#	DIGIT THREE
+0x34	0x0034	#	DIGIT FOUR
+0x35	0x0035	#	DIGIT FIVE
+0x36	0x0036	#	DIGIT SIX
+0x37	0x0037	#	DIGIT SEVEN
+0x38	0x0038	#	DIGIT EIGHT
+0x39	0x0039	#	DIGIT NINE
+0x3A	0x003A	#	COLON
+0x3B	0x003B	#	SEMICOLON
+0x3C	0x003C	#	LESS-THAN SIGN
+0x3D	0x003D	#	EQUALS SIGN
+0x3E	0x003E	#	GREATER-THAN SIGN
+0x3F	0x003F	#	QUESTION MARK
+0x40	0x0040	#	COMMERCIAL AT
+0x41	0x0041	#	LATIN CAPITAL LETTER A
+0x42	0x0042	#	LATIN CAPITAL LETTER B
+0x43	0x0043	#	LATIN CAPITAL LETTER C
+0x44	0x0044	#	LATIN CAPITAL LETTER D
+0x45	0x0045	#	LATIN CAPITAL LETTER E
+0x46	0x0046	#	LATIN CAPITAL LETTER F
+0x47	0x0047	#	LATIN CAPITAL LETTER G
+0x48	0x0048	#	LATIN CAPITAL LETTER H
+0x49	0x0049	#	LATIN CAPITAL LETTER I
+0x4A	0x004A	#	LATIN CAPITAL LETTER J
+0x4B	0x004B	#	LATIN CAPITAL LETTER K
+0x4C	0x004C	#	LATIN CAPITAL LETTER L
+0x4D	0x004D	#	LATIN CAPITAL LETTER M
+0x4E	0x004E	#	LATIN CAPITAL LETTER N
+0x4F	0x004F	#	LATIN CAPITAL LETTER O
+0x50	0x0050	#	LATIN CAPITAL LETTER P
+0x51	0x0051	#	LATIN CAPITAL LETTER Q
+0x52	0x0052	#	LATIN CAPITAL LETTER R
+0x53	0x0053	#	LATIN CAPITAL LETTER S
+0x54	0x0054	#	LATIN CAPITAL LETTER T
+0x55	0x0055	#	LATIN CAPITAL LETTER U
+0x56	0x0056	#	LATIN CAPITAL LETTER V
+0x57	0x0057	#	LATIN CAPITAL LETTER W
+0x58	0x0058	#	LATIN CAPITAL LETTER X
+0x59	0x0059	#	LATIN CAPITAL LETTER Y
+0x5A	0x005A	#	LATIN CAPITAL LETTER Z
+0x5B	0x005B	#	LEFT SQUARE BRACKET
+0x5C	0x005C	#	REVERSE SOLIDUS
+0x5D	0x005D	#	RIGHT SQUARE BRACKET
+0x5E	0x005E	#	CIRCUMFLEX ACCENT
+0x5F	0x005F	#	LOW LINE
+0x60	0x0060	#	GRAVE ACCENT
+0x61	0x0061	#	LATIN SMALL LETTER A
+0x62	0x0062	#	LATIN SMALL LETTER B
+0x63	0x0063	#	LATIN SMALL LETTER C
+0x64	0x0064	#	LATIN SMALL LETTER D
+0x65	0x0065	#	LATIN SMALL LETTER E
+0x66	0x0066	#	LATIN SMALL LETTER F
+0x67	0x0067	#	LATIN SMALL LETTER G
+0x68	0x0068	#	LATIN SMALL LETTER H
+0x69	0x0069	#	LATIN SMALL LETTER I
+0x6A	0x006A	#	LATIN SMALL LETTER J
+0x6B	0x006B	#	LATIN SMALL LETTER K
+0x6C	0x006C	#	LATIN SMALL LETTER L
+0x6D	0x006D	#	LATIN SMALL LETTER M
+0x6E	0x006E	#	LATIN SMALL LETTER N
+0x6F	0x006F	#	LATIN SMALL LETTER O
+0x70	0x0070	#	LATIN SMALL LETTER P
+0x71	0x0071	#	LATIN SMALL LETTER Q
+0x72	0x0072	#	LATIN SMALL LETTER R
+0x73	0x0073	#	LATIN SMALL LETTER S
+0x74	0x0074	#	LATIN SMALL LETTER T
+0x75	0x0075	#	LATIN SMALL LETTER U
+0x76	0x0076	#	LATIN SMALL LETTER V
+0x77	0x0077	#	LATIN SMALL LETTER W
+0x78	0x0078	#	LATIN SMALL LETTER X
+0x79	0x0079	#	LATIN SMALL LETTER Y
+0x7A	0x007A	#	LATIN SMALL LETTER Z
+0x7B	0x007B	#	LEFT CURLY BRACKET
+0x7C	0x007C	#	VERTICAL LINE
+0x7D	0x007D	#	RIGHT CURLY BRACKET
+0x7E	0x007E	#	TILDE
+0x7F	0x007F	#	DELETE
+0x80	0x0080	#	<control>
+0x81	0x0081	#	<control>
+0x82	0x0082	#	<control>
+0x83	0x0083	#	<control>
+0x84	0x0084	#	<control>
+0x85	0x0085	#	<control>
+0x86	0x0086	#	<control>
+0x87	0x0087	#	<control>
+0x88	0x0088	#	<control>
+0x89	0x0089	#	<control>
+0x8A	0x008A	#	<control>
+0x8B	0x008B	#	<control>
+0x8C	0x008C	#	<control>
+0x8D	0x008D	#	<control>
+0x8E	0x008E	#	<control>
+0x8F	0x008F	#	<control>
+0x90	0x0090	#	<control>
+0x91	0x0091	#	<control>
+0x92	0x0092	#	<control>
+0x93	0x0093	#	<control>
+0x94	0x0094	#	<control>
+0x95	0x0095	#	<control>
+0x96	0x0096	#	<control>
+0x97	0x0097	#	<control>
+0x98	0x0098	#	<control>
+0x99	0x0099	#	<control>
+0x9A	0x009A	#	<control>
+0x9B	0x009B	#	<control>
+0x9C	0x009C	#	<control>
+0x9D	0x009D	#	<control>
+0x9E	0x009E	#	<control>
+0x9F	0x009F	#	<control>
+0xA0	0x00A0	#	NO-BREAK SPACE
+0xA1	0x00A1	#	INVERTED EXCLAMATION MARK
+0xA2	0x00A2	#	CENT SIGN
+0xA3	0x00A3	#	POUND SIGN
+0xA4	0x00A4	#	CURRENCY SIGN
+0xA5	0x00A5	#	YEN SIGN
+0xA6	0x00A6	#	BROKEN BAR
+0xA7	0x00A7	#	SECTION SIGN
+0xA8	0x00A8	#	DIAERESIS
+0xA9	0x00A9	#	COPYRIGHT SIGN
+0xAA	0x00AA	#	FEMININE ORDINAL INDICATOR
+0xAB	0x00AB	#	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+0xAC	0x00AC	#	NOT SIGN
+0xAD	0x00AD	#	SOFT HYPHEN
+0xAE	0x00AE	#	REGISTERED SIGN
+0xAF	0x00AF	#	MACRON
+0xB0	0x00B0	#	DEGREE SIGN
+0xB1	0x00B1	#	PLUS-MINUS SIGN
+0xB2	0x00B2	#	SUPERSCRIPT TWO
+0xB3	0x00B3	#	SUPERSCRIPT THREE
+0xB4	0x00B4	#	ACUTE ACCENT
+0xB5	0x00B5	#	MICRO SIGN
+0xB6	0x00B6	#	PILCROW SIGN
+0xB7	0x00B7	#	MIDDLE DOT
+0xB8	0x00B8	#	CEDILLA
+0xB9	0x00B9	#	SUPERSCRIPT ONE
+0xBA	0x00BA	#	MASCULINE ORDINAL INDICATOR
+0xBB	0x00BB	#	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+0xBC	0x00BC	#	VULGAR FRACTION ONE QUARTER
+0xBD	0x00BD	#	VULGAR FRACTION ONE HALF
+0xBE	0x00BE	#	VULGAR FRACTION THREE QUARTERS
+0xBF	0x00BF	#	INVERTED QUESTION MARK
+0xC0	0x00C0	#	LATIN CAPITAL LETTER A WITH GRAVE
+0xC1	0x00C1	#	LATIN CAPITAL LETTER A WITH ACUTE
+0xC2	0x00C2	#	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+0xC3	0x00C3	#	LATIN CAPITAL LETTER A WITH TILDE
+0xC4	0x00C4	#	LATIN CAPITAL LETTER A WITH DIAERESIS
+0xC5	0x00C5	#	LATIN CAPITAL LETTER A WITH RING ABOVE
+0xC6	0x00C6	#	LATIN CAPITAL LETTER AE
+0xC7	0x00C7	#	LATIN CAPITAL LETTER C WITH CEDILLA
+0xC8	0x00C8	#	LATIN CAPITAL LETTER E WITH GRAVE
+0xC9	0x00C9	#	LATIN CAPITAL LETTER E WITH ACUTE
+0xCA	0x00CA	#	LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+0xCB	0x00CB	#	LATIN CAPITAL LETTER E WITH DIAERESIS
+0xCC	0x00CC	#	LATIN CAPITAL LETTER I WITH GRAVE
+0xCD	0x00CD	#	LATIN CAPITAL LETTER I WITH ACUTE
+0xCE	0x00CE	#	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+0xCF	0x00CF	#	LATIN CAPITAL LETTER I WITH DIAERESIS
+0xD0	0x00D0	#	LATIN CAPITAL LETTER ETH (Icelandic)
+0xD1	0x00D1	#	LATIN CAPITAL LETTER N WITH TILDE
+0xD2	0x00D2	#	LATIN CAPITAL LETTER O WITH GRAVE
+0xD3	0x00D3	#	LATIN CAPITAL LETTER O WITH ACUTE
+0xD4	0x00D4	#	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+0xD5	0x00D5	#	LATIN CAPITAL LETTER O WITH TILDE
+0xD6	0x00D6	#	LATIN CAPITAL LETTER O WITH DIAERESIS
+0xD7	0x00D7	#	MULTIPLICATION SIGN
+0xD8	0x00D8	#	LATIN CAPITAL LETTER O WITH STROKE
+0xD9	0x00D9	#	LATIN CAPITAL LETTER U WITH GRAVE
+0xDA	0x00DA	#	LATIN CAPITAL LETTER U WITH ACUTE
+0xDB	0x00DB	#	LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+0xDC	0x00DC	#	LATIN CAPITAL LETTER U WITH DIAERESIS
+0xDD	0x00DD	#	LATIN CAPITAL LETTER Y WITH ACUTE
+0xDE	0x00DE	#	LATIN CAPITAL LETTER THORN (Icelandic)
+0xDF	0x00DF	#	LATIN SMALL LETTER SHARP S (German)
+0xE0	0x00E0	#	LATIN SMALL LETTER A WITH GRAVE
+0xE1	0x00E1	#	LATIN SMALL LETTER A WITH ACUTE
+0xE2	0x00E2	#	LATIN SMALL LETTER A WITH CIRCUMFLEX
+0xE3	0x00E3	#	LATIN SMALL LETTER A WITH TILDE
+0xE4	0x00E4	#	LATIN SMALL LETTER A WITH DIAERESIS
+0xE5	0x00E5	#	LATIN SMALL LETTER A WITH RING ABOVE
+0xE6	0x00E6	#	LATIN SMALL LETTER AE
+0xE7	0x00E7	#	LATIN SMALL LETTER C WITH CEDILLA
+0xE8	0x00E8	#	LATIN SMALL LETTER E WITH GRAVE
+0xE9	0x00E9	#	LATIN SMALL LETTER E WITH ACUTE
+0xEA	0x00EA	#	LATIN SMALL LETTER E WITH CIRCUMFLEX
+0xEB	0x00EB	#	LATIN SMALL LETTER E WITH DIAERESIS
+0xEC	0x00EC	#	LATIN SMALL LETTER I WITH GRAVE
+0xED	0x00ED	#	LATIN SMALL LETTER I WITH ACUTE
+0xEE	0x00EE	#	LATIN SMALL LETTER I WITH CIRCUMFLEX
+0xEF	0x00EF	#	LATIN SMALL LETTER I WITH DIAERESIS
+0xF0	0x00F0	#	LATIN SMALL LETTER ETH (Icelandic)
+0xF1	0x00F1	#	LATIN SMALL LETTER N WITH TILDE
+0xF2	0x00F2	#	LATIN SMALL LETTER O WITH GRAVE
+0xF3	0x00F3	#	LATIN SMALL LETTER O WITH ACUTE
+0xF4	0x00F4	#	LATIN SMALL LETTER O WITH CIRCUMFLEX
+0xF5	0x00F5	#	LATIN SMALL LETTER O WITH TILDE
+0xF6	0x00F6	#	LATIN SMALL LETTER O WITH DIAERESIS
+0xF7	0x00F7	#	DIVISION SIGN
+0xF8	0x00F8	#	LATIN SMALL LETTER O WITH STROKE
+0xF9	0x00F9	#	LATIN SMALL LETTER U WITH GRAVE
+0xFA	0x00FA	#	LATIN SMALL LETTER U WITH ACUTE
+0xFB	0x00FB	#	LATIN SMALL LETTER U WITH CIRCUMFLEX
+0xFC	0x00FC	#	LATIN SMALL LETTER U WITH DIAERESIS
+0xFD	0x00FD	#	LATIN SMALL LETTER Y WITH ACUTE
+0xFE	0x00FE	#	LATIN SMALL LETTER THORN (Icelandic)
+0xFF	0x00FF	#	LATIN SMALL LETTER Y WITH DIAERESIS
diff --git a/Unicode/8859_10.cp b/Unicode/8859_10.cp
index 103d38c3f..9b2277a52 100644
--- a/Unicode/8859_10.cp
+++ b/Unicode/8859_10.cp
@@ -1,5 +1,17 @@
 ISO 8859-10
 "ISO-8859-10", "8859-10", "ISO_8859-10:1992", "ISO-IR-157", "LATIN6", "L6", "csISOLatin6", "ISO8859-10"
+
+# ----------------------------------------------------------------------
+# The following data was downloaded from
+# http://www.unicode.org/Public/MAPPINGS/ISO8859/DatedVersions/8859-10-1998.TXT
+# on 2008-10-05, so it is a Unicode Data File covered by the Unicode
+# copyright and permission notice in the COPYING file of ELinks,
+# regardless of any terms shown below.
+#
+# This file differs from the original in the following ways:
+# - Added this comment, blank lines around it, and charset names above it.
+# ----------------------------------------------------------------------
+
 #
 #	Name:             ISO/IEC 8859-10:1998 to Unicode
 #	Unicode version:  3.0
diff --git a/Unicode/8859_13.cp b/Unicode/8859_13.cp
index e93e9c810..a14f95a13 100644
--- a/Unicode/8859_13.cp
+++ b/Unicode/8859_13.cp
@@ -1,134 +1,313 @@
 ISO 8859-13
 "ISO-8859-13", "iso8859-13", "8859-13", "iso-ir-179", "latin7", "l7", "il7", "ISO_8859-13"
 
-0x20-0x7e       idem
+# ----------------------------------------------------------------------
+# The following data was downloaded from
+# http://www.unicode.org/Public/MAPPINGS/ISO8859/DatedVersions/8859-13-1998.TXT
+# on 2008-10-05, so it is a Unicode Data File covered by the Unicode
+# copyright and permission notice in the COPYING file of ELinks,
+# regardless of any terms shown below.
 #
-0x80	0x0080	#PADDING CHARACTER (PAD)
-0x81	0x0081	#HIGH OCTET PRESET (HOP)
-0x82	0x0082	#BREAK PERMITTED HERE (BPH)
-0x83	0x0083	#NO BREAK HERE (NBH)
-0x84	0x0084	#INDEX (IND)
-0x85	0x0085	#NEXT LINE (NEL)
-0x86	0x0086	#START OF SELECTED AREA (SSA)
-0x87	0x0087	#END OF SELECTED AREA (ESA)
-0x88	0x0088	#CHARACTER TABULATION SET (HTS)
-0x89	0x0089	#CHARACTER TABULATION WITH JUSTIFICATION (HTJ)
-0x8A	0x008A	#LINE TABULATION SET (VTS)
-0x8B	0x008B	#PARTIAL LINE FORWARD (PLD)
-0x8C	0x008C	#PARTIAL LINE BACKWARD (PLU)
-0x8D	0x008D	#REVERSE LINE FEED (RI)
-0x8E	0x008E	#SINGLE-SHIFT TWO (SS2)
-0x8F	0x008F	#SINGLE-SHIFT THREE (SS3)
-0x90	0x0090	#DEVICE CONTROL STRING (DCS)
-0x91	0x0091	#PRIVATE USE ONE (PU1)
-0x92	0x0092	#PRIVATE USE TWO (PU2)
-0x93	0x0093	#SET TRANSMIT STATE (STS)
-0x94	0x0094	#CANCEL CHARACTER (CCH)
-0x95	0x0095	#MESSAGE WAITING (MW)
-0x96	0x0096	#START OF GUARDED AREA (SPA)
-0x97	0x0097	#END OF GUARDED AREA (EPA)
-0x98	0x0098	#START OF STRING (SOS)
-0x99	0x0099	#SINGLE GRAPHIC CHARACTER INTRODUCER (SGCI)
-0x9A	0x009A	#SINGLE CHARACTER INTRODUCER (SCI)
-0x9B	0x009B	#CONTROL SEQUENCE INTRODUCER (CSI)
-0x9C	0x009C	#STRING TERMINATOR (ST)
-0x9D	0x009D	#OPERATING SYSTEM COMMAND (OSC)
-0x9E	0x009E	#PRIVACY MESSAGE (PM)
-0x9F	0x009F	#APPLICATION PROGRAM COMMAND (APC)
-0xA0	0x00A0	#NO-BREAK SPACE
-0xA1	0x201D	#RIGHT DOUBLE QUOTATION MARK
-0xA2	0x00A2	#CENT SIGN
-0xA3	0x00A3	#POUND SIGN
-0xA4	0x00A4	#CURRENCY SIGN
-0xA5	0x201E	#DOUBLE LOW-9 QUOTATION MARK
-0xA6	0x00A6	#BROKEN BAR
-0xA7	0x00A7	#SECTION SIGN
-0xA8	0x00D8	#LATIN CAPITAL LETTER O WITH STROKE
-0xA9	0x00A9	#COPYRIGHT SIGN
-0xAA	0x0156	#LATIN CAPITAL LETTER R WITH CEDILLA
-0xAB	0x00AB	#LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xAC	0x00AC	#NOT SIGN
-0xAD	0x00AD	#SOFT HYPHEN
-0xAE	0x00AE	#REGISTERED SIGN
-0xAF	0x00C6	#LATIN CAPITAL LETTER AE
-0xB0	0x00B0	#DEGREE SIGN
-0xB1	0x00B1	#PLUS-MINUS SIGN
-0xB2	0x00B2	#SUPERSCRIPT TWO
-0xB3	0x00B3	#SUPERSCRIPT THREE
-0xB4	0x201C	#LEFT DOUBLE QUOTATION MARK
-0xB5	0x00B5	#MICRO SIGN
-0xB6	0x00B6	#PILCROW SIGN
-0xB7	0x00B7	#MIDDLE DOT
-0xB8	0x00F8	#LATIN SMALL LETTER O WITH STROKE
-0xB9	0x00B9	#SUPERSCRIPT ONE
-0xBA	0x0157	#LATIN SMALL LETTER R WITH CEDILLA
-0xBB	0x00BB	#RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xBC	0x00BC	#VULGAR FRACTION ONE QUARTER
-0xBD	0x00BD	#VULGAR FRACTION ONE HALF
-0xBE	0x00BE	#VULGAR FRACTION THREE QUARTERS
-0xBF	0x00E6	#LATIN SMALL LETTER AE
-0xC0	0x0104	#LATIN CAPITAL LETTER A WITH OGONEK
-0xC1	0x012E	#LATIN CAPITAL LETTER I WITH OGONEK
-0xC2	0x0100	#LATIN CAPITAL LETTER A WITH MACRON
-0xC3	0x0106	#LATIN CAPITAL LETTER C WITH ACUTE
-0xC4	0x00C4	#LATIN CAPITAL LETTER A WITH DIAERESIS
-0xC5	0x00C5	#LATIN CAPITAL LETTER A WITH RING ABOVE
-0xC6	0x0118	#LATIN CAPITAL LETTER E WITH OGONEK
-0xC7	0x0112	#LATIN CAPITAL LETTER E WITH MACRON
-0xC8	0x010C	#LATIN CAPITAL LETTER C WITH CARON
-0xC9	0x00C9	#LATIN CAPITAL LETTER E WITH ACUTE
-0xCA	0x0179	#LATIN CAPITAL LETTER Z WITH ACUTE
-0xCB	0x0116	#LATIN CAPITAL LETTER E WITH DOT ABOVE
-0xCC	0x0122	#LATIN CAPITAL LETTER G WITH CEDILLA
-0xCD	0x0136	#LATIN CAPITAL LETTER K WITH CEDILLA
-0xCE	0x012A	#LATIN CAPITAL LETTER I WITH MACRON
-0xCF	0x013B	#LATIN CAPITAL LETTER L WITH CEDILLA
-0xD0	0x0160	#LATIN CAPITAL LETTER S WITH CARON
-0xD1	0x0143	#LATIN CAPITAL LETTER N WITH ACUTE
-0xD2	0x0145	#LATIN CAPITAL LETTER N WITH CEDILLA
-0xD3	0x00D3	#LATIN CAPITAL LETTER O WITH ACUTE
-0xD4	0x014C	#LATIN CAPITAL LETTER O WITH MACRON
-0xD5	0x00D5	#LATIN CAPITAL LETTER O WITH TILDE
-0xD6	0x00D6	#LATIN CAPITAL LETTER O WITH DIAERESIS
-0xD7	0x00D7	#MULTIPLICATION SIGN
-0xD8	0x0172	#LATIN CAPITAL LETTER U WITH OGONEK
-0xD9	0x0141	#LATIN CAPITAL LETTER L WITH STROKE
-0xDA	0x015A	#LATIN CAPITAL LETTER S WITH ACUTE
-0xDB	0x016A	#LATIN CAPITAL LETTER U WITH MACRON
-0xDC	0x00DC	#LATIN CAPITAL LETTER U WITH DIAERESIS
-0xDD	0x017B	#LATIN CAPITAL LETTER Z WITH DOT ABOVE
-0xDE	0x017D	#LATIN CAPITAL LETTER Z WITH CARON
-0xDF	0x00DF	#LATIN SMALL LETTER SHARP S
-0xE0	0x0105	#LATIN SMALL LETTER A WITH OGONEK
-0xE1	0x012F	#LATIN SMALL LETTER I WITH OGONEK
-0xE2	0x0101	#LATIN SMALL LETTER A WITH MACRON
-0xE3	0x0107	#LATIN SMALL LETTER C WITH ACUTE
-0xE4	0x00E4	#LATIN SMALL LETTER A WITH DIAERESIS
-0xE5	0x00E5	#LATIN SMALL LETTER A WITH RING ABOVE
-0xE6	0x0119	#LATIN SMALL LETTER E WITH OGONEK
-0xE7	0x0113	#LATIN SMALL LETTER E WITH MACRON
-0xE8	0x010D	#LATIN SMALL LETTER C WITH CARON
-0xE9	0x00E9	#LATIN SMALL LETTER E WITH ACUTE
-0xEA	0x017A	#LATIN SMALL LETTER Z WITH ACUTE
-0xEB	0x0117	#LATIN SMALL LETTER E WITH DOT ABOVE
-0xEC	0x0123	#LATIN SMALL LETTER G WITH CEDILLA
-0xED	0x0137	#LATIN SMALL LETTER K WITH CEDILLA
-0xEE	0x012B	#LATIN SMALL LETTER I WITH MACRON
-0xEF	0x013C	#LATIN SMALL LETTER L WITH CEDILLA
-0xF0	0x0161	#LATIN SMALL LETTER S WITH CARON
-0xF1	0x0144	#LATIN SMALL LETTER N WITH ACUTE
-0xF2	0x0146	#LATIN SMALL LETTER N WITH CEDILLA
-0xF3	0x00F3	#LATIN SMALL LETTER O WITH ACUTE
-0xF4	0x014D	#LATIN SMALL LETTER O WITH MACRON
-0xF5	0x00F5	#LATIN SMALL LETTER O WITH TILDE
-0xF6	0x00F6	#LATIN SMALL LETTER O WITH DIAERESIS
-0xF7	0x00F7	#DIVISION SIGN
-0xF8	0x0173	#LATIN SMALL LETTER U WITH OGONEK
-0xF9	0x0142	#LATIN SMALL LETTER L WITH STROKE
-0xFA	0x015B	#LATIN SMALL LETTER S WITH ACUTE
-0xFB	0x016B	#LATIN SMALL LETTER U WITH MACRON
-0xFC	0x00FC	#LATIN SMALL LETTER U WITH DIAERESIS
-0xFD	0x017C	#LATIN SMALL LETTER Z WITH DOT ABOVE
-0xFE	0x017E	#LATIN SMALL LETTER Z WITH CARON
-0xFF	0x2019	#RIGHT SINGLE QUOTATION MARK
+# This file differs from the original in the following ways:
+# - Added this comment, blank lines around it, and charset names above it.
+# ----------------------------------------------------------------------
 
+#
+#	Name:             ISO/IEC 8859-13:1998  to Unicode
+#	Unicode version:  3.0
+#	Table version:    1.0
+#	Table format:     Format A
+#	Date:             1999 July 27
+#	Authors:          Ken Whistler <kenw@sybase.com>
+#
+#	Copyright (c) 1998 - 1999 Unicode, Inc.  All Rights reserved.
+#
+#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#	No claims are made as to fitness for any particular purpose.  No
+#	warranties of any kind are expressed or implied.  The recipient
+#	agrees to determine applicability of information provided.  If this
+#	file has been provided on optical media by Unicode, Inc., the sole
+#	remedy for any claim will be exchange of defective media within 90
+#	days of receipt.
+#
+#	Unicode, Inc. hereby grants the right to freely use the information
+#	supplied in this file in the creation of products supporting the
+#	Unicode Standard, and to make copies of this file in any form for
+#	internal or external distribution as long as this notice remains
+#	attached.
+#
+#	General notes:
+#
+#	This table contains the data the Unicode Consortium has on how
+#       ISO/IEC 8859-13:1998 characters map into Unicode.
+#
+#	Format:  Three tab-separated columns
+#		 Column #1 is the ISO/IEC 8859-13 code (in hex as 0xXX)
+#		 Column #2 is the Unicode (in hex as 0xXXXX)
+#		 Column #3 the Unicode name (follows a comment sign, '#')
+#
+#	The entries are in ISO/IEC 8859-13 order.
+#
+#	Updated versions of this file may be found in:
+#		<ftp://ftp.unicode.org/Public/MAPPINGS/>
+#
+#	Any comments or problems, contact <errata@unicode.org>
+#	Please note that <errata@unicode.org> is an archival address;
+#	notices will be checked, but do not expect an immediate response.
+#
+0x00	0x0000	#	NULL
+0x01	0x0001	#	START OF HEADING
+0x02	0x0002	#	START OF TEXT
+0x03	0x0003	#	END OF TEXT
+0x04	0x0004	#	END OF TRANSMISSION
+0x05	0x0005	#	ENQUIRY
+0x06	0x0006	#	ACKNOWLEDGE
+0x07	0x0007	#	BELL
+0x08	0x0008	#	BACKSPACE
+0x09	0x0009	#	HORIZONTAL TABULATION
+0x0A	0x000A	#	LINE FEED
+0x0B	0x000B	#	VERTICAL TABULATION
+0x0C	0x000C	#	FORM FEED
+0x0D	0x000D	#	CARRIAGE RETURN
+0x0E	0x000E	#	SHIFT OUT
+0x0F	0x000F	#	SHIFT IN
+0x10	0x0010	#	DATA LINK ESCAPE
+0x11	0x0011	#	DEVICE CONTROL ONE
+0x12	0x0012	#	DEVICE CONTROL TWO
+0x13	0x0013	#	DEVICE CONTROL THREE
+0x14	0x0014	#	DEVICE CONTROL FOUR
+0x15	0x0015	#	NEGATIVE ACKNOWLEDGE
+0x16	0x0016	#	SYNCHRONOUS IDLE
+0x17	0x0017	#	END OF TRANSMISSION BLOCK
+0x18	0x0018	#	CANCEL
+0x19	0x0019	#	END OF MEDIUM
+0x1A	0x001A	#	SUBSTITUTE
+0x1B	0x001B	#	ESCAPE
+0x1C	0x001C	#	FILE SEPARATOR
+0x1D	0x001D	#	GROUP SEPARATOR
+0x1E	0x001E	#	RECORD SEPARATOR
+0x1F	0x001F	#	UNIT SEPARATOR
+0x20	0x0020	#	SPACE
+0x21	0x0021	#	EXCLAMATION MARK
+0x22	0x0022	#	QUOTATION MARK
+0x23	0x0023	#	NUMBER SIGN
+0x24	0x0024	#	DOLLAR SIGN
+0x25	0x0025	#	PERCENT SIGN
+0x26	0x0026	#	AMPERSAND
+0x27	0x0027	#	APOSTROPHE
+0x28	0x0028	#	LEFT PARENTHESIS
+0x29	0x0029	#	RIGHT PARENTHESIS
+0x2A	0x002A	#	ASTERISK
+0x2B	0x002B	#	PLUS SIGN
+0x2C	0x002C	#	COMMA
+0x2D	0x002D	#	HYPHEN-MINUS
+0x2E	0x002E	#	FULL STOP
+0x2F	0x002F	#	SOLIDUS
+0x30	0x0030	#	DIGIT ZERO
+0x31	0x0031	#	DIGIT ONE
+0x32	0x0032	#	DIGIT TWO
+0x33	0x0033	#	DIGIT THREE
+0x34	0x0034	#	DIGIT FOUR
+0x35	0x0035	#	DIGIT FIVE
+0x36	0x0036	#	DIGIT SIX
+0x37	0x0037	#	DIGIT SEVEN
+0x38	0x0038	#	DIGIT EIGHT
+0x39	0x0039	#	DIGIT NINE
+0x3A	0x003A	#	COLON
+0x3B	0x003B	#	SEMICOLON
+0x3C	0x003C	#	LESS-THAN SIGN
+0x3D	0x003D	#	EQUALS SIGN
+0x3E	0x003E	#	GREATER-THAN SIGN
+0x3F	0x003F	#	QUESTION MARK
+0x40	0x0040	#	COMMERCIAL AT
+0x41	0x0041	#	LATIN CAPITAL LETTER A
+0x42	0x0042	#	LATIN CAPITAL LETTER B
+0x43	0x0043	#	LATIN CAPITAL LETTER C
+0x44	0x0044	#	LATIN CAPITAL LETTER D
+0x45	0x0045	#	LATIN CAPITAL LETTER E
+0x46	0x0046	#	LATIN CAPITAL LETTER F
+0x47	0x0047	#	LATIN CAPITAL LETTER G
+0x48	0x0048	#	LATIN CAPITAL LETTER H
+0x49	0x0049	#	LATIN CAPITAL LETTER I
+0x4A	0x004A	#	LATIN CAPITAL LETTER J
+0x4B	0x004B	#	LATIN CAPITAL LETTER K
+0x4C	0x004C	#	LATIN CAPITAL LETTER L
+0x4D	0x004D	#	LATIN CAPITAL LETTER M
+0x4E	0x004E	#	LATIN CAPITAL LETTER N
+0x4F	0x004F	#	LATIN CAPITAL LETTER O
+0x50	0x0050	#	LATIN CAPITAL LETTER P
+0x51	0x0051	#	LATIN CAPITAL LETTER Q
+0x52	0x0052	#	LATIN CAPITAL LETTER R
+0x53	0x0053	#	LATIN CAPITAL LETTER S
+0x54	0x0054	#	LATIN CAPITAL LETTER T
+0x55	0x0055	#	LATIN CAPITAL LETTER U
+0x56	0x0056	#	LATIN CAPITAL LETTER V
+0x57	0x0057	#	LATIN CAPITAL LETTER W
+0x58	0x0058	#	LATIN CAPITAL LETTER X
+0x59	0x0059	#	LATIN CAPITAL LETTER Y
+0x5A	0x005A	#	LATIN CAPITAL LETTER Z
+0x5B	0x005B	#	LEFT SQUARE BRACKET
+0x5C	0x005C	#	REVERSE SOLIDUS
+0x5D	0x005D	#	RIGHT SQUARE BRACKET
+0x5E	0x005E	#	CIRCUMFLEX ACCENT
+0x5F	0x005F	#	LOW LINE
+0x60	0x0060	#	GRAVE ACCENT
+0x61	0x0061	#	LATIN SMALL LETTER A
+0x62	0x0062	#	LATIN SMALL LETTER B
+0x63	0x0063	#	LATIN SMALL LETTER C
+0x64	0x0064	#	LATIN SMALL LETTER D
+0x65	0x0065	#	LATIN SMALL LETTER E
+0x66	0x0066	#	LATIN SMALL LETTER F
+0x67	0x0067	#	LATIN SMALL LETTER G
+0x68	0x0068	#	LATIN SMALL LETTER H
+0x69	0x0069	#	LATIN SMALL LETTER I
+0x6A	0x006A	#	LATIN SMALL LETTER J
+0x6B	0x006B	#	LATIN SMALL LETTER K
+0x6C	0x006C	#	LATIN SMALL LETTER L
+0x6D	0x006D	#	LATIN SMALL LETTER M
+0x6E	0x006E	#	LATIN SMALL LETTER N
+0x6F	0x006F	#	LATIN SMALL LETTER O
+0x70	0x0070	#	LATIN SMALL LETTER P
+0x71	0x0071	#	LATIN SMALL LETTER Q
+0x72	0x0072	#	LATIN SMALL LETTER R
+0x73	0x0073	#	LATIN SMALL LETTER S
+0x74	0x0074	#	LATIN SMALL LETTER T
+0x75	0x0075	#	LATIN SMALL LETTER U
+0x76	0x0076	#	LATIN SMALL LETTER V
+0x77	0x0077	#	LATIN SMALL LETTER W
+0x78	0x0078	#	LATIN SMALL LETTER X
+0x79	0x0079	#	LATIN SMALL LETTER Y
+0x7A	0x007A	#	LATIN SMALL LETTER Z
+0x7B	0x007B	#	LEFT CURLY BRACKET
+0x7C	0x007C	#	VERTICAL LINE
+0x7D	0x007D	#	RIGHT CURLY BRACKET
+0x7E	0x007E	#	TILDE
+0x7F	0x007F	#	DELETE
+0x80	0x0080	#	<control>
+0x81	0x0081	#	<control>
+0x82	0x0082	#	<control>
+0x83	0x0083	#	<control>
+0x84	0x0084	#	<control>
+0x85	0x0085	#	<control>
+0x86	0x0086	#	<control>
+0x87	0x0087	#	<control>
+0x88	0x0088	#	<control>
+0x89	0x0089	#	<control>
+0x8A	0x008A	#	<control>
+0x8B	0x008B	#	<control>
+0x8C	0x008C	#	<control>
+0x8D	0x008D	#	<control>
+0x8E	0x008E	#	<control>
+0x8F	0x008F	#	<control>
+0x90	0x0090	#	<control>
+0x91	0x0091	#	<control>
+0x92	0x0092	#	<control>
+0x93	0x0093	#	<control>
+0x94	0x0094	#	<control>
+0x95	0x0095	#	<control>
+0x96	0x0096	#	<control>
+0x97	0x0097	#	<control>
+0x98	0x0098	#	<control>
+0x99	0x0099	#	<control>
+0x9A	0x009A	#	<control>
+0x9B	0x009B	#	<control>
+0x9C	0x009C	#	<control>
+0x9D	0x009D	#	<control>
+0x9E	0x009E	#	<control>
+0x9F	0x009F	#	<control>
+0xA0	0x00A0	#	NO-BREAK SPACE
+0xA1	0x201D	#	RIGHT DOUBLE QUOTATION MARK
+0xA2	0x00A2	#	CENT SIGN
+0xA3	0x00A3	#	POUND SIGN
+0xA4	0x00A4	#	CURRENCY SIGN
+0xA5	0x201E	#	DOUBLE LOW-9 QUOTATION MARK
+0xA6	0x00A6	#	BROKEN BAR
+0xA7	0x00A7	#	SECTION SIGN
+0xA8	0x00D8	#	LATIN CAPITAL LETTER O WITH STROKE
+0xA9	0x00A9	#	COPYRIGHT SIGN
+0xAA	0x0156	#	LATIN CAPITAL LETTER R WITH CEDILLA
+0xAB	0x00AB	#	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+0xAC	0x00AC	#	NOT SIGN
+0xAD	0x00AD	#	SOFT HYPHEN
+0xAE	0x00AE	#	REGISTERED SIGN
+0xAF	0x00C6	#	LATIN CAPITAL LETTER AE
+0xB0	0x00B0	#	DEGREE SIGN
+0xB1	0x00B1	#	PLUS-MINUS SIGN
+0xB2	0x00B2	#	SUPERSCRIPT TWO
+0xB3	0x00B3	#	SUPERSCRIPT THREE
+0xB4	0x201C	#	LEFT DOUBLE QUOTATION MARK
+0xB5	0x00B5	#	MICRO SIGN
+0xB6	0x00B6	#	PILCROW SIGN
+0xB7	0x00B7	#	MIDDLE DOT
+0xB8	0x00F8	#	LATIN SMALL LETTER O WITH STROKE
+0xB9	0x00B9	#	SUPERSCRIPT ONE
+0xBA	0x0157	#	LATIN SMALL LETTER R WITH CEDILLA
+0xBB	0x00BB	#	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+0xBC	0x00BC	#	VULGAR FRACTION ONE QUARTER
+0xBD	0x00BD	#	VULGAR FRACTION ONE HALF
+0xBE	0x00BE	#	VULGAR FRACTION THREE QUARTERS
+0xBF	0x00E6	#	LATIN SMALL LETTER AE
+0xC0	0x0104	#	LATIN CAPITAL LETTER A WITH OGONEK
+0xC1	0x012E	#	LATIN CAPITAL LETTER I WITH OGONEK
+0xC2	0x0100	#	LATIN CAPITAL LETTER A WITH MACRON
+0xC3	0x0106	#	LATIN CAPITAL LETTER C WITH ACUTE
+0xC4	0x00C4	#	LATIN CAPITAL LETTER A WITH DIAERESIS
+0xC5	0x00C5	#	LATIN CAPITAL LETTER A WITH RING ABOVE
+0xC6	0x0118	#	LATIN CAPITAL LETTER E WITH OGONEK
+0xC7	0x0112	#	LATIN CAPITAL LETTER E WITH MACRON
+0xC8	0x010C	#	LATIN CAPITAL LETTER C WITH CARON
+0xC9	0x00C9	#	LATIN CAPITAL LETTER E WITH ACUTE
+0xCA	0x0179	#	LATIN CAPITAL LETTER Z WITH ACUTE
+0xCB	0x0116	#	LATIN CAPITAL LETTER E WITH DOT ABOVE
+0xCC	0x0122	#	LATIN CAPITAL LETTER G WITH CEDILLA
+0xCD	0x0136	#	LATIN CAPITAL LETTER K WITH CEDILLA
+0xCE	0x012A	#	LATIN CAPITAL LETTER I WITH MACRON
+0xCF	0x013B	#	LATIN CAPITAL LETTER L WITH CEDILLA
+0xD0	0x0160	#	LATIN CAPITAL LETTER S WITH CARON
+0xD1	0x0143	#	LATIN CAPITAL LETTER N WITH ACUTE
+0xD2	0x0145	#	LATIN CAPITAL LETTER N WITH CEDILLA
+0xD3	0x00D3	#	LATIN CAPITAL LETTER O WITH ACUTE
+0xD4	0x014C	#	LATIN CAPITAL LETTER O WITH MACRON
+0xD5	0x00D5	#	LATIN CAPITAL LETTER O WITH TILDE
+0xD6	0x00D6	#	LATIN CAPITAL LETTER O WITH DIAERESIS
+0xD7	0x00D7	#	MULTIPLICATION SIGN
+0xD8	0x0172	#	LATIN CAPITAL LETTER U WITH OGONEK
+0xD9	0x0141	#	LATIN CAPITAL LETTER L WITH STROKE
+0xDA	0x015A	#	LATIN CAPITAL LETTER S WITH ACUTE
+0xDB	0x016A	#	LATIN CAPITAL LETTER U WITH MACRON
+0xDC	0x00DC	#	LATIN CAPITAL LETTER U WITH DIAERESIS
+0xDD	0x017B	#	LATIN CAPITAL LETTER Z WITH DOT ABOVE
+0xDE	0x017D	#	LATIN CAPITAL LETTER Z WITH CARON
+0xDF	0x00DF	#	LATIN SMALL LETTER SHARP S (German)
+0xE0	0x0105	#	LATIN SMALL LETTER A WITH OGONEK
+0xE1	0x012F	#	LATIN SMALL LETTER I WITH OGONEK
+0xE2	0x0101	#	LATIN SMALL LETTER A WITH MACRON
+0xE3	0x0107	#	LATIN SMALL LETTER C WITH ACUTE
+0xE4	0x00E4	#	LATIN SMALL LETTER A WITH DIAERESIS
+0xE5	0x00E5	#	LATIN SMALL LETTER A WITH RING ABOVE
+0xE6	0x0119	#	LATIN SMALL LETTER E WITH OGONEK
+0xE7	0x0113	#	LATIN SMALL LETTER E WITH MACRON
+0xE8	0x010D	#	LATIN SMALL LETTER C WITH CARON
+0xE9	0x00E9	#	LATIN SMALL LETTER E WITH ACUTE
+0xEA	0x017A	#	LATIN SMALL LETTER Z WITH ACUTE
+0xEB	0x0117	#	LATIN SMALL LETTER E WITH DOT ABOVE
+0xEC	0x0123	#	LATIN SMALL LETTER G WITH CEDILLA
+0xED	0x0137	#	LATIN SMALL LETTER K WITH CEDILLA
+0xEE	0x012B	#	LATIN SMALL LETTER I WITH MACRON
+0xEF	0x013C	#	LATIN SMALL LETTER L WITH CEDILLA
+0xF0	0x0161	#	LATIN SMALL LETTER S WITH CARON
+0xF1	0x0144	#	LATIN SMALL LETTER N WITH ACUTE
+0xF2	0x0146	#	LATIN SMALL LETTER N WITH CEDILLA
+0xF3	0x00F3	#	LATIN SMALL LETTER O WITH ACUTE
+0xF4	0x014D	#	LATIN SMALL LETTER O WITH MACRON
+0xF5	0x00F5	#	LATIN SMALL LETTER O WITH TILDE
+0xF6	0x00F6	#	LATIN SMALL LETTER O WITH DIAERESIS
+0xF7	0x00F7	#	DIVISION SIGN
+0xF8	0x0173	#	LATIN SMALL LETTER U WITH OGONEK
+0xF9	0x0142	#	LATIN SMALL LETTER L WITH STROKE
+0xFA	0x015B	#	LATIN SMALL LETTER S WITH ACUTE
+0xFB	0x016B	#	LATIN SMALL LETTER U WITH MACRON
+0xFC	0x00FC	#	LATIN SMALL LETTER U WITH DIAERESIS
+0xFD	0x017C	#	LATIN SMALL LETTER Z WITH DOT ABOVE
+0xFE	0x017E	#	LATIN SMALL LETTER Z WITH CARON
+0xFF	0x2019	#	RIGHT SINGLE QUOTATION MARK
diff --git a/Unicode/8859_14.cp b/Unicode/8859_14.cp
index 6ca434baa..7358c478e 100644
--- a/Unicode/8859_14.cp
+++ b/Unicode/8859_14.cp
@@ -1,12 +1,24 @@
 ISO 8859-14
 "ISO-8859-14", "8859-14", "ISO_8859-14", "ISO_8859-14:1998", "ISO-IR-199", "LATIN8", "L8"
+
+# ----------------------------------------------------------------------
+# The following data was downloaded from
+# http://www.unicode.org/Public/MAPPINGS/ISO8859/DatedVersions/8859-14-1998.TXT
+# on 2008-10-05, so it is a Unicode Data File covered by the Unicode
+# copyright and permission notice in the COPYING file of ELinks,
+# regardless of any terms shown below.
+#
+# This file differs from the original in the following ways:
+# - Added this comment, blank lines around it, and charset names above it.
+# ----------------------------------------------------------------------
+
 #
 #	Name:             ISO/IEC 8859-14:1998 to Unicode
 #	Unicode version:  3.0
 #	Table version:    1.0
 #	Table format:     Format A
 #	Date:             1999 July 27
-#	Authors:          Markus Kuhn <mkuhn@acm.org>
+#	Authors:          Markus Kuhn <http://www.cl.cam.ac.uk/~mgk25/>
 #			  Ken Whistler <kenw@sybase.com>
 #
 #	Copyright (c) 1998 - 1999 Unicode, Inc.  All Rights reserved.
diff --git a/Unicode/8859_15.cp b/Unicode/8859_15.cp
index ec1b3c88e..6df8e94e0 100644
--- a/Unicode/8859_15.cp
+++ b/Unicode/8859_15.cp
@@ -1,193 +1,317 @@
 ISO 8859-15
 "ISO-8859-15", "iso8859-15", "8859-15", "latin9", "l9", "il9", "latin0", "l0", "il0", "ISO_8859-15", "ISO_8859-15:1998", "ISO-IR-203"
-0x20	0x0020	#SPACE
-0x21	0x0021	#EXCLAMATION MARK
-0x22	0x0022	#QUOTATION MARK
-0x23	0x0023	#NUMBER SIGN
-0x24	0x0024	#DOLLAR SIGN
-0x25	0x0025	#PERCENT SIGN
-0x26	0x0026	#AMPERSAND
-0x27	0x0027	#APOSTROPHE
-0x28	0x0028	#LEFT PARENTHESIS
-0x29	0x0029	#RIGHT PARENTHESIS
-0x2A	0x002A	#ASTERISK
-0x2B	0x002B	#PLUS SIGN
-0x2C	0x002C	#COMMA
-0x2D	0x002D	#HYPHEN-MINUS
-0x2E	0x002E	#FULL STOP
-0x2F	0x002F	#SOLIDUS
-0x30	0x0030	#DIGIT ZERO
-0x31	0x0031	#DIGIT ONE
-0x32	0x0032	#DIGIT TWO
-0x33	0x0033	#DIGIT THREE
-0x34	0x0034	#DIGIT FOUR
-0x35	0x0035	#DIGIT FIVE
-0x36	0x0036	#DIGIT SIX
-0x37	0x0037	#DIGIT SEVEN
-0x38	0x0038	#DIGIT EIGHT
-0x39	0x0039	#DIGIT NINE
-0x3A	0x003A	#COLON
-0x3B	0x003B	#SEMICOLON
-0x3C	0x003C	#LESS-THAN SIGN
-0x3D	0x003D	#EQUALS SIGN
-0x3E	0x003E	#GREATER-THAN SIGN
-0x3F	0x003F	#QUESTION MARK
-0x40	0x0040	#COMMERCIAL AT
-0x41	0x0041	#LATIN CAPITAL LETTER A
-0x42	0x0042	#LATIN CAPITAL LETTER B
-0x43	0x0043	#LATIN CAPITAL LETTER C
-0x44	0x0044	#LATIN CAPITAL LETTER D
-0x45	0x0045	#LATIN CAPITAL LETTER E
-0x46	0x0046	#LATIN CAPITAL LETTER F
-0x47	0x0047	#LATIN CAPITAL LETTER G
-0x48	0x0048	#LATIN CAPITAL LETTER H
-0x49	0x0049	#LATIN CAPITAL LETTER I
-0x4A	0x004A	#LATIN CAPITAL LETTER J
-0x4B	0x004B	#LATIN CAPITAL LETTER K
-0x4C	0x004C	#LATIN CAPITAL LETTER L
-0x4D	0x004D	#LATIN CAPITAL LETTER M
-0x4E	0x004E	#LATIN CAPITAL LETTER N
-0x4F	0x004F	#LATIN CAPITAL LETTER O
-0x50	0x0050	#LATIN CAPITAL LETTER P
-0x51	0x0051	#LATIN CAPITAL LETTER Q
-0x52	0x0052	#LATIN CAPITAL LETTER R
-0x53	0x0053	#LATIN CAPITAL LETTER S
-0x54	0x0054	#LATIN CAPITAL LETTER T
-0x55	0x0055	#LATIN CAPITAL LETTER U
-0x56	0x0056	#LATIN CAPITAL LETTER V
-0x57	0x0057	#LATIN CAPITAL LETTER W
-0x58	0x0058	#LATIN CAPITAL LETTER X
-0x59	0x0059	#LATIN CAPITAL LETTER Y
-0x5A	0x005A	#LATIN CAPITAL LETTER Z
-0x5B	0x005B	#LEFT SQUARE BRACKET
-0x5C	0x005C	#REVERSE SOLIDUS
-0x5D	0x005D	#RIGHT SQUARE BRACKET
-0x5E	0x005E	#CIRCUMFLEX ACCENT
-0x5F	0x005F	#LOW LINE
-0x60	0x0060	#GRAVE ACCENT
-0x61	0x0061	#LATIN SMALL LETTER A
-0x62	0x0062	#LATIN SMALL LETTER B
-0x63	0x0063	#LATIN SMALL LETTER C
-0x64	0x0064	#LATIN SMALL LETTER D
-0x65	0x0065	#LATIN SMALL LETTER E
-0x66	0x0066	#LATIN SMALL LETTER F
-0x67	0x0067	#LATIN SMALL LETTER G
-0x68	0x0068	#LATIN SMALL LETTER H
-0x69	0x0069	#LATIN SMALL LETTER I
-0x6A	0x006A	#LATIN SMALL LETTER J
-0x6B	0x006B	#LATIN SMALL LETTER K
-0x6C	0x006C	#LATIN SMALL LETTER L
-0x6D	0x006D	#LATIN SMALL LETTER M
-0x6E	0x006E	#LATIN SMALL LETTER N
-0x6F	0x006F	#LATIN SMALL LETTER O
-0x70	0x0070	#LATIN SMALL LETTER P
-0x71	0x0071	#LATIN SMALL LETTER Q
-0x72	0x0072	#LATIN SMALL LETTER R
-0x73	0x0073	#LATIN SMALL LETTER S
-0x74	0x0074	#LATIN SMALL LETTER T
-0x75	0x0075	#LATIN SMALL LETTER U
-0x76	0x0076	#LATIN SMALL LETTER V
-0x77	0x0077	#LATIN SMALL LETTER W
-0x78	0x0078	#LATIN SMALL LETTER X
-0x79	0x0079	#LATIN SMALL LETTER Y
-0x7A	0x007A	#LATIN SMALL LETTER Z
-0x7B	0x007B	#LEFT CURLY BRACKET
-0x7C	0x007C	#VERTICAL LINE
-0x7D	0x007D	#RIGHT CURLY BRACKET
-0x7E	0x007E	#TILDE
-0xA0	0x00A0	#NO-BREAK SPACE
-0xA1	0x00A1	#INVERTED EXCLAMATION MARK
-0xA2	0x00A2	#CENT SIGN
-0xA3	0x00A3	#POUND SIGN
-0xA4	0x20AC	#EURO
-0xA5	0x00A5	#YEN SIGN
-0xA6	0x0160	#LATIN CAPITAL LETTER S WITH CARON
-0xA7	0x00A7	#SECTION SIGN
-0xA8	0x0161	#LATIN SMALL LETTER S WITH CARON
-0xA9	0x00A9	#COPYRIGHT SIGN
-0xAA	0x00AA	#FEMININE ORDINAL INDICATOR
-0xAB	0x00AB	#LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xAC	0x00AC	#NOT SIGN
-0xAD	0x00AD	#SOFT HYPHEN
-0xAE	0x00AE	#REGISTERED SIGN
-0xAF	0x00AF	#MACRON
-0xB0	0x00B0	#DEGREE SIGN
-0xB1	0x00B1	#PLUS-MINUS SIGN
-0xB2	0x00B2	#SUPERSCRIPT TWO
-0xB3	0x00B3	#SUPERSCRIPT THREE
-0xB4	0x017D	#LATIN CAPITAL LETTER Z WITH CARON
-0xB5	0x00B5	#MICRO SIGN
-0xB6	0x00B6	#PILCROW SIGN
-0xB7	0x00B7	#MIDDLE DOT
-0xB8	0x017E	#LATIN SMALL LETTER Z WITH CARON
-0xB9	0x00B9	#SUPERSCRIPT ONE
-0xBA	0x00BA	#MASCULINE ORDINAL INDICATOR
-0xBB	0x00BB	#RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xBC	0x0152	#LATIN CAPITAL LIGATURE OE
-0xBD	0x0153	#LATIN SMALL LIGATURE OE
-0xBE	0x0178	#LATIN CAPITAL LETTER Y WITH DIAERESIS
-0xBF	0x00BF	#INVERTED QUESTION MARK
-0xC0	0x00C0	#LATIN CAPITAL LETTER A WITH GRAVE
-0xC1	0x00C1	#LATIN CAPITAL LETTER A WITH ACUTE
-0xC2	0x00C2	#LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-0xC3	0x00C3	#LATIN CAPITAL LETTER A WITH TILDE
-0xC4	0x00C4	#LATIN CAPITAL LETTER A WITH DIAERESIS
-0xC5	0x00C5	#LATIN CAPITAL LETTER A WITH RING ABOVE
-0xC6	0x00C6	#LATIN CAPITAL LETTER AE
-0xC7	0x00C7	#LATIN CAPITAL LETTER C WITH CEDILLA
-0xC8	0x00C8	#LATIN CAPITAL LETTER E WITH GRAVE
-0xC9	0x00C9	#LATIN CAPITAL LETTER E WITH ACUTE
-0xCA	0x00CA	#LATIN CAPITAL LETTER E WITH CIRCUMFLEX
-0xCB	0x00CB	#LATIN CAPITAL LETTER E WITH DIAERESIS
-0xCC	0x00CC	#LATIN CAPITAL LETTER I WITH GRAVE
-0xCD	0x00CD	#LATIN CAPITAL LETTER I WITH ACUTE
-0xCE	0x00CE	#LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-0xCF	0x00CF	#LATIN CAPITAL LETTER I WITH DIAERESIS
-0xD0	0x00D0	#LATIN CAPITAL LETTER ETH
-0xD1	0x00D1	#LATIN CAPITAL LETTER N WITH TILDE
-0xD2	0x00D2	#LATIN CAPITAL LETTER O WITH GRAVE
-0xD3	0x00D3	#LATIN CAPITAL LETTER O WITH ACUTE
-0xD4	0x00D4	#LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-0xD5	0x00D5	#LATIN CAPITAL LETTER O WITH TILDE
-0xD6	0x00D6	#LATIN CAPITAL LETTER O WITH DIAERESIS
-0xD7	0x00D7	#MULTIPLICATION SIGN
-0xD8	0x00D8	#LATIN CAPITAL LETTER O WITH STROKE
-0xD9	0x00D9	#LATIN CAPITAL LETTER U WITH GRAVE
-0xDA	0x00DA	#LATIN CAPITAL LETTER U WITH ACUTE
-0xDB	0x00DB	#LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-0xDC	0x00DC	#LATIN CAPITAL LETTER U WITH DIAERESIS
-0xDD	0x00DD	#LATIN CAPITAL LETTER Y WITH ACUTE
-0xDE	0x00DE	#LATIN CAPITAL LETTER THORN
-0xDF	0x00DF	#LATIN SMALL LETTER SHARP S
-0xE0	0x00E0	#LATIN SMALL LETTER A WITH GRAVE
-0xE1	0x00E1	#LATIN SMALL LETTER A WITH ACUTE
-0xE2	0x00E2	#LATIN SMALL LETTER A WITH CIRCUMFLEX
-0xE3	0x00E3	#LATIN SMALL LETTER A WITH TILDE
-0xE4	0x00E4	#LATIN SMALL LETTER A WITH DIAERESIS
-0xE5	0x00E5	#LATIN SMALL LETTER A WITH RING ABOVE
-0xE6	0x00E6	#LATIN SMALL LETTER AE
-0xE7	0x00E7	#LATIN SMALL LETTER C WITH CEDILLA
-0xE8	0x00E8	#LATIN SMALL LETTER E WITH GRAVE
-0xE9	0x00E9	#LATIN SMALL LETTER E WITH ACUTE
-0xEA	0x00EA	#LATIN SMALL LETTER E WITH CIRCUMFLEX
-0xEB	0x00EB	#LATIN SMALL LETTER E WITH DIAERESIS
-0xEC	0x00EC	#LATIN SMALL LETTER I WITH GRAVE
-0xED	0x00ED	#LATIN SMALL LETTER I WITH ACUTE
-0xEE	0x00EE	#LATIN SMALL LETTER I WITH CIRCUMFLEX
-0xEF	0x00EF	#LATIN SMALL LETTER I WITH DIAERESIS
-0xF0	0x00F0	#LATIN SMALL LETTER ETH
-0xF1	0x00F1	#LATIN SMALL LETTER N WITH TILDE
-0xF2	0x00F2	#LATIN SMALL LETTER O WITH GRAVE
-0xF3	0x00F3	#LATIN SMALL LETTER O WITH ACUTE
-0xF4	0x00F4	#LATIN SMALL LETTER O WITH CIRCUMFLEX
-0xF5	0x00F5	#LATIN SMALL LETTER O WITH TILDE
-0xF6	0x00F6	#LATIN SMALL LETTER O WITH DIAERESIS
-0xF7	0x00F7	#DIVISION SIGN
-0xF8	0x00F8	#LATIN SMALL LETTER O WITH STROKE
-0xF9	0x00F9	#LATIN SMALL LETTER U WITH GRAVE
-0xFA	0x00FA	#LATIN SMALL LETTER U WITH ACUTE
-0xFB	0x00FB	#LATIN SMALL LETTER U WITH CIRCUMFLEX
-0xFC	0x00FC	#LATIN SMALL LETTER U WITH DIAERESIS
-0xFD	0x00FD	#LATIN SMALL LETTER Y WITH ACUTE
-0xFE	0x00FE	#LATIN SMALL LETTER THORN
-0xFF	0x00FF	#LATIN SMALL LETTER Y WITH DIAERESIS
+
+# ----------------------------------------------------------------------
+# The following data was downloaded from
+# http://www.unicode.org/Public/MAPPINGS/ISO8859/DatedVersions/8859-15-1999.TXT
+# on 2008-10-05, so it is a Unicode Data File covered by the Unicode
+# copyright and permission notice in the COPYING file of ELinks,
+# regardless of any terms shown below.
+#
+# This file differs from the original in the following ways:
+# - Added this comment, blank lines around it, and charset names above it.
+# ----------------------------------------------------------------------
+
+#
+#	Name:             ISO/IEC 8859-15:1999 to Unicode
+#	Unicode version:  3.0
+#	Table version:    1.0
+#	Table format:     Format A
+#	Date:             1999 July 27
+#	Authors:          Markus Kuhn <http://www.cl.cam.ac.uk/~mgk25/>
+#			  Ken Whistler <kenw@sybase.com>
+#
+#	Copyright (c) 1998 - 1999 Unicode, Inc.  All Rights reserved.
+#
+#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#	No claims are made as to fitness for any particular purpose.  No
+#	warranties of any kind are expressed or implied.  The recipient
+#	agrees to determine applicability of information provided.  If this
+#	file has been provided on optical media by Unicode, Inc., the sole
+#	remedy for any claim will be exchange of defective media within 90
+#	days of receipt.
+#
+#	Unicode, Inc. hereby grants the right to freely use the information
+#	supplied in this file in the creation of products supporting the
+#	Unicode Standard, and to make copies of this file in any form for
+#	internal or external distribution as long as this notice remains
+#	attached.
+#
+#	General notes:
+#
+#	This table contains the data the Unicode Consortium has on how
+#       ISO/IEC 8859-15:1999 characters map into Unicode.
+#
+#	Format:  Three tab-separated columns
+#		 Column #1 is the ISO/IEC 8859-15 code (in hex as 0xXX)
+#		 Column #2 is the Unicode (in hex as 0xXXXX)
+#		 Column #3 the Unicode name (follows a comment sign, '#')
+#
+#	The entries are in ISO/IEC 8859-15 order.
+#
+#	Version history
+#
+#	Updated versions of this file may be found in:
+#		<ftp://ftp.unicode.org/Public/MAPPINGS/>
+#
+#	Any comments or problems, contact <errata@unicode.org>
+#	Please note that <errata@unicode.org> is an archival address;
+#	notices will be checked, but do not expect an immediate response.
+#
+0x00	0x0000	#	NULL
+0x01	0x0001	#	START OF HEADING
+0x02	0x0002	#	START OF TEXT
+0x03	0x0003	#	END OF TEXT
+0x04	0x0004	#	END OF TRANSMISSION
+0x05	0x0005	#	ENQUIRY
+0x06	0x0006	#	ACKNOWLEDGE
+0x07	0x0007	#	BELL
+0x08	0x0008	#	BACKSPACE
+0x09	0x0009	#	HORIZONTAL TABULATION
+0x0A	0x000A	#	LINE FEED
+0x0B	0x000B	#	VERTICAL TABULATION
+0x0C	0x000C	#	FORM FEED
+0x0D	0x000D	#	CARRIAGE RETURN
+0x0E	0x000E	#	SHIFT OUT
+0x0F	0x000F	#	SHIFT IN
+0x10	0x0010	#	DATA LINK ESCAPE
+0x11	0x0011	#	DEVICE CONTROL ONE
+0x12	0x0012	#	DEVICE CONTROL TWO
+0x13	0x0013	#	DEVICE CONTROL THREE
+0x14	0x0014	#	DEVICE CONTROL FOUR
+0x15	0x0015	#	NEGATIVE ACKNOWLEDGE
+0x16	0x0016	#	SYNCHRONOUS IDLE
+0x17	0x0017	#	END OF TRANSMISSION BLOCK
+0x18	0x0018	#	CANCEL
+0x19	0x0019	#	END OF MEDIUM
+0x1A	0x001A	#	SUBSTITUTE
+0x1B	0x001B	#	ESCAPE
+0x1C	0x001C	#	FILE SEPARATOR
+0x1D	0x001D	#	GROUP SEPARATOR
+0x1E	0x001E	#	RECORD SEPARATOR
+0x1F	0x001F	#	UNIT SEPARATOR
+0x20	0x0020	#	SPACE
+0x21	0x0021	#	EXCLAMATION MARK
+0x22	0x0022	#	QUOTATION MARK
+0x23	0x0023	#	NUMBER SIGN
+0x24	0x0024	#	DOLLAR SIGN
+0x25	0x0025	#	PERCENT SIGN
+0x26	0x0026	#	AMPERSAND
+0x27	0x0027	#	APOSTROPHE
+0x28	0x0028	#	LEFT PARENTHESIS
+0x29	0x0029	#	RIGHT PARENTHESIS
+0x2A	0x002A	#	ASTERISK
+0x2B	0x002B	#	PLUS SIGN
+0x2C	0x002C	#	COMMA
+0x2D	0x002D	#	HYPHEN-MINUS
+0x2E	0x002E	#	FULL STOP
+0x2F	0x002F	#	SOLIDUS
+0x30	0x0030	#	DIGIT ZERO
+0x31	0x0031	#	DIGIT ONE
+0x32	0x0032	#	DIGIT TWO
+0x33	0x0033	#	DIGIT THREE
+0x34	0x0034	#	DIGIT FOUR
+0x35	0x0035	#	DIGIT FIVE
+0x36	0x0036	#	DIGIT SIX
+0x37	0x0037	#	DIGIT SEVEN
+0x38	0x0038	#	DIGIT EIGHT
+0x39	0x0039	#	DIGIT NINE
+0x3A	0x003A	#	COLON
+0x3B	0x003B	#	SEMICOLON
+0x3C	0x003C	#	LESS-THAN SIGN
+0x3D	0x003D	#	EQUALS SIGN
+0x3E	0x003E	#	GREATER-THAN SIGN
+0x3F	0x003F	#	QUESTION MARK
+0x40	0x0040	#	COMMERCIAL AT
+0x41	0x0041	#	LATIN CAPITAL LETTER A
+0x42	0x0042	#	LATIN CAPITAL LETTER B
+0x43	0x0043	#	LATIN CAPITAL LETTER C
+0x44	0x0044	#	LATIN CAPITAL LETTER D
+0x45	0x0045	#	LATIN CAPITAL LETTER E
+0x46	0x0046	#	LATIN CAPITAL LETTER F
+0x47	0x0047	#	LATIN CAPITAL LETTER G
+0x48	0x0048	#	LATIN CAPITAL LETTER H
+0x49	0x0049	#	LATIN CAPITAL LETTER I
+0x4A	0x004A	#	LATIN CAPITAL LETTER J
+0x4B	0x004B	#	LATIN CAPITAL LETTER K
+0x4C	0x004C	#	LATIN CAPITAL LETTER L
+0x4D	0x004D	#	LATIN CAPITAL LETTER M
+0x4E	0x004E	#	LATIN CAPITAL LETTER N
+0x4F	0x004F	#	LATIN CAPITAL LETTER O
+0x50	0x0050	#	LATIN CAPITAL LETTER P
+0x51	0x0051	#	LATIN CAPITAL LETTER Q
+0x52	0x0052	#	LATIN CAPITAL LETTER R
+0x53	0x0053	#	LATIN CAPITAL LETTER S
+0x54	0x0054	#	LATIN CAPITAL LETTER T
+0x55	0x0055	#	LATIN CAPITAL LETTER U
+0x56	0x0056	#	LATIN CAPITAL LETTER V
+0x57	0x0057	#	LATIN CAPITAL LETTER W
+0x58	0x0058	#	LATIN CAPITAL LETTER X
+0x59	0x0059	#	LATIN CAPITAL LETTER Y
+0x5A	0x005A	#	LATIN CAPITAL LETTER Z
+0x5B	0x005B	#	LEFT SQUARE BRACKET
+0x5C	0x005C	#	REVERSE SOLIDUS
+0x5D	0x005D	#	RIGHT SQUARE BRACKET
+0x5E	0x005E	#	CIRCUMFLEX ACCENT
+0x5F	0x005F	#	LOW LINE
+0x60	0x0060	#	GRAVE ACCENT
+0x61	0x0061	#	LATIN SMALL LETTER A
+0x62	0x0062	#	LATIN SMALL LETTER B
+0x63	0x0063	#	LATIN SMALL LETTER C
+0x64	0x0064	#	LATIN SMALL LETTER D
+0x65	0x0065	#	LATIN SMALL LETTER E
+0x66	0x0066	#	LATIN SMALL LETTER F
+0x67	0x0067	#	LATIN SMALL LETTER G
+0x68	0x0068	#	LATIN SMALL LETTER H
+0x69	0x0069	#	LATIN SMALL LETTER I
+0x6A	0x006A	#	LATIN SMALL LETTER J
+0x6B	0x006B	#	LATIN SMALL LETTER K
+0x6C	0x006C	#	LATIN SMALL LETTER L
+0x6D	0x006D	#	LATIN SMALL LETTER M
+0x6E	0x006E	#	LATIN SMALL LETTER N
+0x6F	0x006F	#	LATIN SMALL LETTER O
+0x70	0x0070	#	LATIN SMALL LETTER P
+0x71	0x0071	#	LATIN SMALL LETTER Q
+0x72	0x0072	#	LATIN SMALL LETTER R
+0x73	0x0073	#	LATIN SMALL LETTER S
+0x74	0x0074	#	LATIN SMALL LETTER T
+0x75	0x0075	#	LATIN SMALL LETTER U
+0x76	0x0076	#	LATIN SMALL LETTER V
+0x77	0x0077	#	LATIN SMALL LETTER W
+0x78	0x0078	#	LATIN SMALL LETTER X
+0x79	0x0079	#	LATIN SMALL LETTER Y
+0x7A	0x007A	#	LATIN SMALL LETTER Z
+0x7B	0x007B	#	LEFT CURLY BRACKET
+0x7C	0x007C	#	VERTICAL LINE
+0x7D	0x007D	#	RIGHT CURLY BRACKET
+0x7E	0x007E	#	TILDE
+0x7F	0x007F	#	DELETE
+0x80	0x0080	#	<control>
+0x81	0x0081	#	<control>
+0x82	0x0082	#	<control>
+0x83	0x0083	#	<control>
+0x84	0x0084	#	<control>
+0x85	0x0085	#	<control>
+0x86	0x0086	#	<control>
+0x87	0x0087	#	<control>
+0x88	0x0088	#	<control>
+0x89	0x0089	#	<control>
+0x8A	0x008A	#	<control>
+0x8B	0x008B	#	<control>
+0x8C	0x008C	#	<control>
+0x8D	0x008D	#	<control>
+0x8E	0x008E	#	<control>
+0x8F	0x008F	#	<control>
+0x90	0x0090	#	<control>
+0x91	0x0091	#	<control>
+0x92	0x0092	#	<control>
+0x93	0x0093	#	<control>
+0x94	0x0094	#	<control>
+0x95	0x0095	#	<control>
+0x96	0x0096	#	<control>
+0x97	0x0097	#	<control>
+0x98	0x0098	#	<control>
+0x99	0x0099	#	<control>
+0x9A	0x009A	#	<control>
+0x9B	0x009B	#	<control>
+0x9C	0x009C	#	<control>
+0x9D	0x009D	#	<control>
+0x9E	0x009E	#	<control>
+0x9F	0x009F	#	<control>
+0xA0	0x00A0	#	NO-BREAK SPACE
+0xA1	0x00A1	#	INVERTED EXCLAMATION MARK
+0xA2	0x00A2	#	CENT SIGN
+0xA3	0x00A3	#	POUND SIGN
+0xA4	0x20AC	#	EURO SIGN
+0xA5	0x00A5	#	YEN SIGN
+0xA6	0x0160	#	LATIN CAPITAL LETTER S WITH CARON
+0xA7	0x00A7	#	SECTION SIGN
+0xA8	0x0161	#	LATIN SMALL LETTER S WITH CARON
+0xA9	0x00A9	#	COPYRIGHT SIGN
+0xAA	0x00AA	#	FEMININE ORDINAL INDICATOR
+0xAB	0x00AB	#	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+0xAC	0x00AC	#	NOT SIGN
+0xAD	0x00AD	#	SOFT HYPHEN
+0xAE	0x00AE	#	REGISTERED SIGN
+0xAF	0x00AF	#	MACRON
+0xB0	0x00B0	#	DEGREE SIGN
+0xB1	0x00B1	#	PLUS-MINUS SIGN
+0xB2	0x00B2	#	SUPERSCRIPT TWO
+0xB3	0x00B3	#	SUPERSCRIPT THREE
+0xB4	0x017D	#	LATIN CAPITAL LETTER Z WITH CARON
+0xB5	0x00B5	#	MICRO SIGN
+0xB6	0x00B6	#	PILCROW SIGN
+0xB7	0x00B7	#	MIDDLE DOT
+0xB8	0x017E	#	LATIN SMALL LETTER Z WITH CARON
+0xB9	0x00B9	#	SUPERSCRIPT ONE
+0xBA	0x00BA	#	MASCULINE ORDINAL INDICATOR
+0xBB	0x00BB	#	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+0xBC	0x0152	#	LATIN CAPITAL LIGATURE OE
+0xBD	0x0153	#	LATIN SMALL LIGATURE OE
+0xBE	0x0178	#	LATIN CAPITAL LETTER Y WITH DIAERESIS
+0xBF	0x00BF	#	INVERTED QUESTION MARK
+0xC0	0x00C0	#	LATIN CAPITAL LETTER A WITH GRAVE
+0xC1	0x00C1	#	LATIN CAPITAL LETTER A WITH ACUTE
+0xC2	0x00C2	#	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+0xC3	0x00C3	#	LATIN CAPITAL LETTER A WITH TILDE
+0xC4	0x00C4	#	LATIN CAPITAL LETTER A WITH DIAERESIS
+0xC5	0x00C5	#	LATIN CAPITAL LETTER A WITH RING ABOVE
+0xC6	0x00C6	#	LATIN CAPITAL LETTER AE
+0xC7	0x00C7	#	LATIN CAPITAL LETTER C WITH CEDILLA
+0xC8	0x00C8	#	LATIN CAPITAL LETTER E WITH GRAVE
+0xC9	0x00C9	#	LATIN CAPITAL LETTER E WITH ACUTE
+0xCA	0x00CA	#	LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+0xCB	0x00CB	#	LATIN CAPITAL LETTER E WITH DIAERESIS
+0xCC	0x00CC	#	LATIN CAPITAL LETTER I WITH GRAVE
+0xCD	0x00CD	#	LATIN CAPITAL LETTER I WITH ACUTE
+0xCE	0x00CE	#	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+0xCF	0x00CF	#	LATIN CAPITAL LETTER I WITH DIAERESIS
+0xD0	0x00D0	#	LATIN CAPITAL LETTER ETH
+0xD1	0x00D1	#	LATIN CAPITAL LETTER N WITH TILDE
+0xD2	0x00D2	#	LATIN CAPITAL LETTER O WITH GRAVE
+0xD3	0x00D3	#	LATIN CAPITAL LETTER O WITH ACUTE
+0xD4	0x00D4	#	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+0xD5	0x00D5	#	LATIN CAPITAL LETTER O WITH TILDE
+0xD6	0x00D6	#	LATIN CAPITAL LETTER O WITH DIAERESIS
+0xD7	0x00D7	#	MULTIPLICATION SIGN
+0xD8	0x00D8	#	LATIN CAPITAL LETTER O WITH STROKE
+0xD9	0x00D9	#	LATIN CAPITAL LETTER U WITH GRAVE
+0xDA	0x00DA	#	LATIN CAPITAL LETTER U WITH ACUTE
+0xDB	0x00DB	#	LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+0xDC	0x00DC	#	LATIN CAPITAL LETTER U WITH DIAERESIS
+0xDD	0x00DD	#	LATIN CAPITAL LETTER Y WITH ACUTE
+0xDE	0x00DE	#	LATIN CAPITAL LETTER THORN
+0xDF	0x00DF	#	LATIN SMALL LETTER SHARP S
+0xE0	0x00E0	#	LATIN SMALL LETTER A WITH GRAVE
+0xE1	0x00E1	#	LATIN SMALL LETTER A WITH ACUTE
+0xE2	0x00E2	#	LATIN SMALL LETTER A WITH CIRCUMFLEX
+0xE3	0x00E3	#	LATIN SMALL LETTER A WITH TILDE
+0xE4	0x00E4	#	LATIN SMALL LETTER A WITH DIAERESIS
+0xE5	0x00E5	#	LATIN SMALL LETTER A WITH RING ABOVE
+0xE6	0x00E6	#	LATIN SMALL LETTER AE
+0xE7	0x00E7	#	LATIN SMALL LETTER C WITH CEDILLA
+0xE8	0x00E8	#	LATIN SMALL LETTER E WITH GRAVE
+0xE9	0x00E9	#	LATIN SMALL LETTER E WITH ACUTE
+0xEA	0x00EA	#	LATIN SMALL LETTER E WITH CIRCUMFLEX
+0xEB	0x00EB	#	LATIN SMALL LETTER E WITH DIAERESIS
+0xEC	0x00EC	#	LATIN SMALL LETTER I WITH GRAVE
+0xED	0x00ED	#	LATIN SMALL LETTER I WITH ACUTE
+0xEE	0x00EE	#	LATIN SMALL LETTER I WITH CIRCUMFLEX
+0xEF	0x00EF	#	LATIN SMALL LETTER I WITH DIAERESIS
+0xF0	0x00F0	#	LATIN SMALL LETTER ETH
+0xF1	0x00F1	#	LATIN SMALL LETTER N WITH TILDE
+0xF2	0x00F2	#	LATIN SMALL LETTER O WITH GRAVE
+0xF3	0x00F3	#	LATIN SMALL LETTER O WITH ACUTE
+0xF4	0x00F4	#	LATIN SMALL LETTER O WITH CIRCUMFLEX
+0xF5	0x00F5	#	LATIN SMALL LETTER O WITH TILDE
+0xF6	0x00F6	#	LATIN SMALL LETTER O WITH DIAERESIS
+0xF7	0x00F7	#	DIVISION SIGN
+0xF8	0x00F8	#	LATIN SMALL LETTER O WITH STROKE
+0xF9	0x00F9	#	LATIN SMALL LETTER U WITH GRAVE
+0xFA	0x00FA	#	LATIN SMALL LETTER U WITH ACUTE
+0xFB	0x00FB	#	LATIN SMALL LETTER U WITH CIRCUMFLEX
+0xFC	0x00FC	#	LATIN SMALL LETTER U WITH DIAERESIS
+0xFD	0x00FD	#	LATIN SMALL LETTER Y WITH ACUTE
+0xFE	0x00FE	#	LATIN SMALL LETTER THORN
+0xFF	0x00FF	#	LATIN SMALL LETTER Y WITH DIAERESIS
+
diff --git a/Unicode/8859_16.cp b/Unicode/8859_16.cp
index 657dfe247..0633e35bc 100644
--- a/Unicode/8859_16.cp
+++ b/Unicode/8859_16.cp
@@ -1,199 +1,313 @@
 ISO 8859-16
 "ISO-8859-16", "iso8859-16", "8859-16", "latin10", "l10", "il10", "ISO_8859-16", "ISO_8859-16:2000", "ISO-IR-226", "ISO_8859-16:2001"
-#       Name:             ISO 8859-16:2001 to Unicode
-#       Date:             2001 Octomber 10
-#       Authors:          Ionel Mugurel Ciobica <I.M.Ciobica@TUe.nl>
+
+# ----------------------------------------------------------------------
+# The following data was downloaded from
+# http://www.unicode.org/Public/MAPPINGS/ISO8859/DatedVersions/8859-16-2001.TXT
+# on 2008-10-05, so it is a Unicode Data File covered by the Unicode
+# copyright and permission notice in the COPYING file of ELinks,
+# regardless of any terms shown below.
 #
-#       Copyright (c) 1991-2001 Unicode, Inc.  All Rights reserved.
+# This file differs from the original in the following ways:
+# - Added this comment, blank lines around it, and charset names above it.
+# ----------------------------------------------------------------------
+
 #
-0x20	0x0020	#SPACE
-0x21	0x0021	#EXCLAMATION MARK
-0x22	0x0022	#QUOTATION MARK
-0x23	0x0023	#NUMBER SIGN
-0x24	0x0024	#DOLLAR SIGN
-0x25	0x0025	#PERCENT SIGN
-0x26	0x0026	#AMPERSAND
-0x27	0x0027	#APOSTROPHE
-0x28	0x0028	#LEFT PARENTHESIS
-0x29	0x0029	#RIGHT PARENTHESIS
-0x2A	0x002A	#ASTERISK
-0x2B	0x002B	#PLUS SIGN
-0x2C	0x002C	#COMMA
-0x2D	0x002D	#HYPHEN-MINUS
-0x2E	0x002E	#FULL STOP
-0x2F	0x002F	#SOLIDUS
-0x30	0x0030	#DIGIT ZERO
-0x31	0x0031	#DIGIT ONE
-0x32	0x0032	#DIGIT TWO
-0x33	0x0033	#DIGIT THREE
-0x34	0x0034	#DIGIT FOUR
-0x35	0x0035	#DIGIT FIVE
-0x36	0x0036	#DIGIT SIX
-0x37	0x0037	#DIGIT SEVEN
-0x38	0x0038	#DIGIT EIGHT
-0x39	0x0039	#DIGIT NINE
-0x3A	0x003A	#COLON
-0x3B	0x003B	#SEMICOLON
-0x3C	0x003C	#LESS-THAN SIGN
-0x3D	0x003D	#EQUALS SIGN
-0x3E	0x003E	#GREATER-THAN SIGN
-0x3F	0x003F	#QUESTION MARK
-0x40	0x0040	#COMMERCIAL AT
-0x41	0x0041	#LATIN CAPITAL LETTER A
-0x42	0x0042	#LATIN CAPITAL LETTER B
-0x43	0x0043	#LATIN CAPITAL LETTER C
-0x44	0x0044	#LATIN CAPITAL LETTER D
-0x45	0x0045	#LATIN CAPITAL LETTER E
-0x46	0x0046	#LATIN CAPITAL LETTER F
-0x47	0x0047	#LATIN CAPITAL LETTER G
-0x48	0x0048	#LATIN CAPITAL LETTER H
-0x49	0x0049	#LATIN CAPITAL LETTER I
-0x4A	0x004A	#LATIN CAPITAL LETTER J
-0x4B	0x004B	#LATIN CAPITAL LETTER K
-0x4C	0x004C	#LATIN CAPITAL LETTER L
-0x4D	0x004D	#LATIN CAPITAL LETTER M
-0x4E	0x004E	#LATIN CAPITAL LETTER N
-0x4F	0x004F	#LATIN CAPITAL LETTER O
-0x50	0x0050	#LATIN CAPITAL LETTER P
-0x51	0x0051	#LATIN CAPITAL LETTER Q
-0x52	0x0052	#LATIN CAPITAL LETTER R
-0x53	0x0053	#LATIN CAPITAL LETTER S
-0x54	0x0054	#LATIN CAPITAL LETTER T
-0x55	0x0055	#LATIN CAPITAL LETTER U
-0x56	0x0056	#LATIN CAPITAL LETTER V
-0x57	0x0057	#LATIN CAPITAL LETTER W
-0x58	0x0058	#LATIN CAPITAL LETTER X
-0x59	0x0059	#LATIN CAPITAL LETTER Y
-0x5A	0x005A	#LATIN CAPITAL LETTER Z
-0x5B	0x005B	#LEFT SQUARE BRACKET
-0x5C	0x005C	#REVERSE SOLIDUS
-0x5D	0x005D	#RIGHT SQUARE BRACKET
-0x5E	0x005E	#CIRCUMFLEX ACCENT
-0x5F	0x005F	#LOW LINE
-0x60	0x0060	#GRAVE ACCENT
-0x61	0x0061	#LATIN SMALL LETTER A
-0x62	0x0062	#LATIN SMALL LETTER B
-0x63	0x0063	#LATIN SMALL LETTER C
-0x64	0x0064	#LATIN SMALL LETTER D
-0x65	0x0065	#LATIN SMALL LETTER E
-0x66	0x0066	#LATIN SMALL LETTER F
-0x67	0x0067	#LATIN SMALL LETTER G
-0x68	0x0068	#LATIN SMALL LETTER H
-0x69	0x0069	#LATIN SMALL LETTER I
-0x6A	0x006A	#LATIN SMALL LETTER J
-0x6B	0x006B	#LATIN SMALL LETTER K
-0x6C	0x006C	#LATIN SMALL LETTER L
-0x6D	0x006D	#LATIN SMALL LETTER M
-0x6E	0x006E	#LATIN SMALL LETTER N
-0x6F	0x006F	#LATIN SMALL LETTER O
-0x70	0x0070	#LATIN SMALL LETTER P
-0x71	0x0071	#LATIN SMALL LETTER Q
-0x72	0x0072	#LATIN SMALL LETTER R
-0x73	0x0073	#LATIN SMALL LETTER S
-0x74	0x0074	#LATIN SMALL LETTER T
-0x75	0x0075	#LATIN SMALL LETTER U
-0x76	0x0076	#LATIN SMALL LETTER V
-0x77	0x0077	#LATIN SMALL LETTER W
-0x78	0x0078	#LATIN SMALL LETTER X
-0x79	0x0079	#LATIN SMALL LETTER Y
-0x7A	0x007A	#LATIN SMALL LETTER Z
-0x7B	0x007B	#LEFT CURLY BRACKET
-0x7C	0x007C	#VERTICAL LINE
-0x7D	0x007D	#RIGHT CURLY BRACKET
-0x7E	0x007E	#TILDE
-0xA0	0x00A0	#NO-BREAK SPACE
-0xA1	0x0104	#LATIN CAPITAL LETTER A WITH OGONEK
-0xA2	0x0105	#LATIN SMALL LETTER A WITH OGONEK
-0xA3	0x0141	#LATIN CAPITAL LETTER L WITH STROKE
-0xA4	0x20AC	#EURO SIGN
-0xA5	0x00AB	#LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xA6	0x0160	#LATIN CAPITAL LETTER S WITH CARON
-0xA7	0x00A7	#SECTION SIGN
-0xA8	0x0161	#LATIN SMALL LETTER S WITH CARON
-0xA9	0x00A9	#COPYRIGHT SIGN
-0xAA	0x0218	#LATIN CAPITAL LETTER S WITH COMMA BELOW
-0xAB	0x201E	#DOUBLE LOW-9 QUOTATION MARK
-0xAC	0x0179	#LATIN CAPITAL LETTER Z WITH ACUTE
-0xAD	0x00AD	#SOFT HYPHEN
-0xAE	0x017A	#LATIN SMALL LETTER Z WITH ACUTE
-0xAF	0x017B	#LATIN CAPITAL LETTER Z WITH DOT ABOVE
-0xB0	0x00B0	#DEGREE SIGN
-0xB1	0x00B1	#PLUS-MINUS SIGN
-0xB2	0x010C	#LATIN CAPITAL LETTER C WITH CARON
-0xB3	0x0142	#LATIN SMALL LETTER L WITH STROKE
-0xB4	0x017D	#LATIN CAPITAL LETTER Z WITH CARON
-0xB5	0x201D	#RIGHT DOUBLE QUOTATION MARK
-0xB6	0x00B6	#PILCROW SIGN
-0xB7	0x00B7	#MIDDLE DOT
-0xB8	0x017E	#LATIN SMALL LETTER Z WITH CARON
-0xB9	0x010D	#LATIN SMALL LETTER C WITH CARON
-0xBA	0x0219	#LATIN SMALL LETTER S WITH COMMA BELOW
-0xBB	0x00BB	#RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xBC	0x0152	#LATIN CAPITAL LIGATURE OE
-0xBD	0x0153	#LATIN SMALL LIGATURE OE
-0xBE	0x0178	#LATIN CAPITAL LETTER Y WITH DIAERESIS
-0xBF	0x017C	#LATIN SMALL LETTER Z WITH DOT ABOVE
-0xC0	0x00C0	#LATIN CAPITAL LETTER A WITH GRAVE
-0xC1	0x00C1	#LATIN CAPITAL LETTER A WITH ACUTE
-0xC2	0x00C2	#LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-0xC3	0x0102	#LATIN CAPITAL LETTER A WITH BREVE
-0xC4	0x00C4	#LATIN CAPITAL LETTER A WITH DIAERESIS
-0xC5	0x0106	#LATIN CAPITAL LETTER C WITH ACUTE
-0xC6	0x00C6	#LATIN CAPITAL LETTER AE
-0xC7	0x00C7	#LATIN CAPITAL LETTER C WITH CEDILLA
-0xC8	0x00C8	#LATIN CAPITAL LETTER E WITH GRAVE
-0xC9	0x00C9	#LATIN CAPITAL LETTER E WITH ACUTE
-0xCA	0x00CA	#LATIN CAPITAL LETTER E WITH CIRCUMFLEX
-0xCB	0x00CB	#LATIN CAPITAL LETTER E WITH DIAERESIS
-0xCC	0x00CC	#LATIN CAPITAL LETTER I WITH GRAVE
-0xCD	0x00CD	#LATIN CAPITAL LETTER I WITH ACUTE
-0xCE	0x00CE	#LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-0xCF	0x00CF	#LATIN CAPITAL LETTER I WITH DIAERESIS
-0xD0	0x0110	#LATIN CAPITAL LETTER D WITH STROKE
-0xD1	0x0143	#LATIN CAPITAL LETTER N WITH ACUTE
-0xD2	0x00D2	#LATIN CAPITAL LETTER O WITH GRAVE
-0xD3	0x00D3	#LATIN CAPITAL LETTER O WITH ACUTE
-0xD4	0x00D4	#LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-0xD5	0x0150	#LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
-0xD6	0x00D6	#LATIN CAPITAL LETTER O WITH DIAERESIS
-0xD7	0x015A	#LATIN CAPITAL LETTER S WITH ACUTE
-0xD8	0x0170	#LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
-0xD9	0x00D9	#LATIN CAPITAL LETTER U WITH GRAVE
-0xDA	0x00DA	#LATIN CAPITAL LETTER U WITH ACUTE
-0xDB	0x00DB	#LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-0xDC	0x00DC	#LATIN CAPITAL LETTER U WITH DIAERESIS
-0xDD	0x0118	#LATIN CAPITAL LETTER E WITH OGONEK
-0xDE	0x021A	#LATIN CAPITAL LETTER T WITH COMMA BELOW
-0xDF	0x00DF	#LATIN SMALL LETTER SHARP S
-0xE0	0x00E0	#LATIN SMALL LETTER A WITH GRAVE
-0xE1	0x00E1	#LATIN SMALL LETTER A WITH ACUTE
-0xE2	0x00E2	#LATIN SMALL LETTER A WITH CIRCUMFLEX
-0xE3	0x0103	#LATIN SMALL LETTER A WITH BREVE
-0xE4	0x00E4	#LATIN SMALL LETTER A WITH DIAERESIS
-0xE5	0x0107	#LATIN SMALL LETTER C WITH ACUTE
-0xE6	0x00E6	#LATIN SMALL LETTER AE
-0xE7	0x00E7	#LATIN SMALL LETTER C WITH CEDILLA
-0xE8	0x00E8	#LATIN SMALL LETTER E WITH GRAVE
-0xE9	0x00E9	#LATIN SMALL LETTER E WITH ACUTE
-0xEA	0x00EA	#LATIN SMALL LETTER E WITH CIRCUMFLEX
-0xEB	0x00EB	#LATIN SMALL LETTER E WITH DIAERESIS
-0xEC	0x00EC	#LATIN SMALL LETTER I WITH GRAVE
-0xED	0x00ED	#LATIN SMALL LETTER I WITH ACUTE
-0xEE	0x00EE	#LATIN SMALL LETTER I WITH CIRCUMFLEX
-0xEF	0x00EF	#LATIN SMALL LETTER I WITH DIAERESIS
-0xF0	0x0111	#LATIN SMALL LETTER D WITH STROKE
-0xF1	0x0144	#LATIN SMALL LETTER N WITH ACUTE
-0xF2	0x00F2	#LATIN SMALL LETTER O WITH GRAVE
-0xF3	0x00F3	#LATIN SMALL LETTER O WITH ACUTE
-0xF4	0x00F4	#LATIN SMALL LETTER O WITH CIRCUMFLEX
-0xF5	0x0151	#LATIN SMALL LETTER O WITH DOUBLE ACUTE
-0xF6	0x00F6	#LATIN SMALL LETTER O WITH DIAERESIS
-0xF7	0x015B	#LATIN SMALL LETTER S WITH ACUTE
-0xF8	0x0171	#LATIN SMALL LETTER U WITH DOUBLE ACUTE
-0xF9	0x00F9	#LATIN SMALL LETTER U WITH GRAVE
-0xFA	0x00FA	#LATIN SMALL LETTER U WITH ACUTE
-0xFB	0x00FB	#LATIN SMALL LETTER U WITH CIRCUMFLEX
-0xFC	0x00FC	#LATIN SMALL LETTER U WITH DIAERESIS
-0xFD	0x0119	#LATIN SMALL LETTER E WITH OGONEK
-0xFE	0x021B	#LATIN SMALL LETTER T WITH COMMA BELOW
-0xFF	0x00FF	#LATIN SMALL LETTER Y WITH DIAERESIS
+#	Name:             ISO/IEC 8859-16:2001 to Unicode
+#	Unicode version:  3.0
+#	Table version:    1.0
+#	Table format:     Format A
+#	Date:             2001 July 26
+#	Authors:          Markus Kuhn <http://www.cl.cam.ac.uk/~mgk25/>
+#
+#	Copyright (c) 1999-2001 Unicode, Inc.  All Rights reserved.
+#
+#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#	No claims are made as to fitness for any particular purpose.  No
+#	warranties of any kind are expressed or implied.  The recipient
+#	agrees to determine applicability of information provided.  If this
+#	file has been provided on optical media by Unicode, Inc., the sole
+#	remedy for any claim will be exchange of defective media within 90
+#	days of receipt.
+#
+#	Unicode, Inc. hereby grants the right to freely use the information
+#	supplied in this file in the creation of products supporting the
+#	Unicode Standard, and to make copies of this file in any form for
+#	internal or external distribution as long as this notice remains
+#	attached.
+#
+#	General notes:
+#
+#	This table contains the data the Unicode Consortium has on how
+#       ISO/IEC 8859-16:2001 characters map into Unicode.
+#
+#	Format:  Three tab-separated columns
+#		 Column #1 is the ISO/IEC 8859-16 code (in hex as 0xXX)
+#		 Column #2 is the Unicode (in hex as 0xXXXX)
+#		 Column #3 the Unicode name (follows a comment sign, '#')
+#
+#	The entries are in ISO/IEC 8859-16 order.
+#
+#	Updated versions of this file may be found in:
+#		<ftp://ftp.unicode.org/Public/MAPPINGS/>
+#
+#	Any comments or problems, contact <errata@unicode.org>
+#	Please note that <errata@unicode.org> is an archival address;
+#	notices will be checked, but do not expect an immediate response.
+#
+0x00	0x0000	#	NULL
+0x01	0x0001	#	START OF HEADING
+0x02	0x0002	#	START OF TEXT
+0x03	0x0003	#	END OF TEXT
+0x04	0x0004	#	END OF TRANSMISSION
+0x05	0x0005	#	ENQUIRY
+0x06	0x0006	#	ACKNOWLEDGE
+0x07	0x0007	#	BELL
+0x08	0x0008	#	BACKSPACE
+0x09	0x0009	#	HORIZONTAL TABULATION
+0x0A	0x000A	#	LINE FEED
+0x0B	0x000B	#	VERTICAL TABULATION
+0x0C	0x000C	#	FORM FEED
+0x0D	0x000D	#	CARRIAGE RETURN
+0x0E	0x000E	#	SHIFT OUT
+0x0F	0x000F	#	SHIFT IN
+0x10	0x0010	#	DATA LINK ESCAPE
+0x11	0x0011	#	DEVICE CONTROL ONE
+0x12	0x0012	#	DEVICE CONTROL TWO
+0x13	0x0013	#	DEVICE CONTROL THREE
+0x14	0x0014	#	DEVICE CONTROL FOUR
+0x15	0x0015	#	NEGATIVE ACKNOWLEDGE
+0x16	0x0016	#	SYNCHRONOUS IDLE
+0x17	0x0017	#	END OF TRANSMISSION BLOCK
+0x18	0x0018	#	CANCEL
+0x19	0x0019	#	END OF MEDIUM
+0x1A	0x001A	#	SUBSTITUTE
+0x1B	0x001B	#	ESCAPE
+0x1C	0x001C	#	FILE SEPARATOR
+0x1D	0x001D	#	GROUP SEPARATOR
+0x1E	0x001E	#	RECORD SEPARATOR
+0x1F	0x001F	#	UNIT SEPARATOR
+0x20	0x0020	#	SPACE
+0x21	0x0021	#	EXCLAMATION MARK
+0x22	0x0022	#	QUOTATION MARK
+0x23	0x0023	#	NUMBER SIGN
+0x24	0x0024	#	DOLLAR SIGN
+0x25	0x0025	#	PERCENT SIGN
+0x26	0x0026	#	AMPERSAND
+0x27	0x0027	#	APOSTROPHE
+0x28	0x0028	#	LEFT PARENTHESIS
+0x29	0x0029	#	RIGHT PARENTHESIS
+0x2A	0x002A	#	ASTERISK
+0x2B	0x002B	#	PLUS SIGN
+0x2C	0x002C	#	COMMA
+0x2D	0x002D	#	HYPHEN-MINUS
+0x2E	0x002E	#	FULL STOP
+0x2F	0x002F	#	SOLIDUS
+0x30	0x0030	#	DIGIT ZERO
+0x31	0x0031	#	DIGIT ONE
+0x32	0x0032	#	DIGIT TWO
+0x33	0x0033	#	DIGIT THREE
+0x34	0x0034	#	DIGIT FOUR
+0x35	0x0035	#	DIGIT FIVE
+0x36	0x0036	#	DIGIT SIX
+0x37	0x0037	#	DIGIT SEVEN
+0x38	0x0038	#	DIGIT EIGHT
+0x39	0x0039	#	DIGIT NINE
+0x3A	0x003A	#	COLON
+0x3B	0x003B	#	SEMICOLON
+0x3C	0x003C	#	LESS-THAN SIGN
+0x3D	0x003D	#	EQUALS SIGN
+0x3E	0x003E	#	GREATER-THAN SIGN
+0x3F	0x003F	#	QUESTION MARK
+0x40	0x0040	#	COMMERCIAL AT
+0x41	0x0041	#	LATIN CAPITAL LETTER A
+0x42	0x0042	#	LATIN CAPITAL LETTER B
+0x43	0x0043	#	LATIN CAPITAL LETTER C
+0x44	0x0044	#	LATIN CAPITAL LETTER D
+0x45	0x0045	#	LATIN CAPITAL LETTER E
+0x46	0x0046	#	LATIN CAPITAL LETTER F
+0x47	0x0047	#	LATIN CAPITAL LETTER G
+0x48	0x0048	#	LATIN CAPITAL LETTER H
+0x49	0x0049	#	LATIN CAPITAL LETTER I
+0x4A	0x004A	#	LATIN CAPITAL LETTER J
+0x4B	0x004B	#	LATIN CAPITAL LETTER K
+0x4C	0x004C	#	LATIN CAPITAL LETTER L
+0x4D	0x004D	#	LATIN CAPITAL LETTER M
+0x4E	0x004E	#	LATIN CAPITAL LETTER N
+0x4F	0x004F	#	LATIN CAPITAL LETTER O
+0x50	0x0050	#	LATIN CAPITAL LETTER P
+0x51	0x0051	#	LATIN CAPITAL LETTER Q
+0x52	0x0052	#	LATIN CAPITAL LETTER R
+0x53	0x0053	#	LATIN CAPITAL LETTER S
+0x54	0x0054	#	LATIN CAPITAL LETTER T
+0x55	0x0055	#	LATIN CAPITAL LETTER U
+0x56	0x0056	#	LATIN CAPITAL LETTER V
+0x57	0x0057	#	LATIN CAPITAL LETTER W
+0x58	0x0058	#	LATIN CAPITAL LETTER X
+0x59	0x0059	#	LATIN CAPITAL LETTER Y
+0x5A	0x005A	#	LATIN CAPITAL LETTER Z
+0x5B	0x005B	#	LEFT SQUARE BRACKET
+0x5C	0x005C	#	REVERSE SOLIDUS
+0x5D	0x005D	#	RIGHT SQUARE BRACKET
+0x5E	0x005E	#	CIRCUMFLEX ACCENT
+0x5F	0x005F	#	LOW LINE
+0x60	0x0060	#	GRAVE ACCENT
+0x61	0x0061	#	LATIN SMALL LETTER A
+0x62	0x0062	#	LATIN SMALL LETTER B
+0x63	0x0063	#	LATIN SMALL LETTER C
+0x64	0x0064	#	LATIN SMALL LETTER D
+0x65	0x0065	#	LATIN SMALL LETTER E
+0x66	0x0066	#	LATIN SMALL LETTER F
+0x67	0x0067	#	LATIN SMALL LETTER G
+0x68	0x0068	#	LATIN SMALL LETTER H
+0x69	0x0069	#	LATIN SMALL LETTER I
+0x6A	0x006A	#	LATIN SMALL LETTER J
+0x6B	0x006B	#	LATIN SMALL LETTER K
+0x6C	0x006C	#	LATIN SMALL LETTER L
+0x6D	0x006D	#	LATIN SMALL LETTER M
+0x6E	0x006E	#	LATIN SMALL LETTER N
+0x6F	0x006F	#	LATIN SMALL LETTER O
+0x70	0x0070	#	LATIN SMALL LETTER P
+0x71	0x0071	#	LATIN SMALL LETTER Q
+0x72	0x0072	#	LATIN SMALL LETTER R
+0x73	0x0073	#	LATIN SMALL LETTER S
+0x74	0x0074	#	LATIN SMALL LETTER T
+0x75	0x0075	#	LATIN SMALL LETTER U
+0x76	0x0076	#	LATIN SMALL LETTER V
+0x77	0x0077	#	LATIN SMALL LETTER W
+0x78	0x0078	#	LATIN SMALL LETTER X
+0x79	0x0079	#	LATIN SMALL LETTER Y
+0x7A	0x007A	#	LATIN SMALL LETTER Z
+0x7B	0x007B	#	LEFT CURLY BRACKET
+0x7C	0x007C	#	VERTICAL LINE
+0x7D	0x007D	#	RIGHT CURLY BRACKET
+0x7E	0x007E	#	TILDE
+0x7F	0x007F	#	DELETE
+0x80	0x0080	#	<control>
+0x81	0x0081	#	<control>
+0x82	0x0082	#	<control>
+0x83	0x0083	#	<control>
+0x84	0x0084	#	<control>
+0x85	0x0085	#	<control>
+0x86	0x0086	#	<control>
+0x87	0x0087	#	<control>
+0x88	0x0088	#	<control>
+0x89	0x0089	#	<control>
+0x8A	0x008A	#	<control>
+0x8B	0x008B	#	<control>
+0x8C	0x008C	#	<control>
+0x8D	0x008D	#	<control>
+0x8E	0x008E	#	<control>
+0x8F	0x008F	#	<control>
+0x90	0x0090	#	<control>
+0x91	0x0091	#	<control>
+0x92	0x0092	#	<control>
+0x93	0x0093	#	<control>
+0x94	0x0094	#	<control>
+0x95	0x0095	#	<control>
+0x96	0x0096	#	<control>
+0x97	0x0097	#	<control>
+0x98	0x0098	#	<control>
+0x99	0x0099	#	<control>
+0x9A	0x009A	#	<control>
+0x9B	0x009B	#	<control>
+0x9C	0x009C	#	<control>
+0x9D	0x009D	#	<control>
+0x9E	0x009E	#	<control>
+0x9F	0x009F	#	<control>
+0xA0	0x00A0	#	NO-BREAK SPACE
+0xA1	0x0104	#	LATIN CAPITAL LETTER A WITH OGONEK
+0xA2	0x0105	#	LATIN SMALL LETTER A WITH OGONEK
+0xA3	0x0141	#	LATIN CAPITAL LETTER L WITH STROKE
+0xA4	0x20AC	#	EURO SIGN
+0xA5	0x201E	#	DOUBLE LOW-9 QUOTATION MARK
+0xA6	0x0160	#	LATIN CAPITAL LETTER S WITH CARON
+0xA7	0x00A7	#	SECTION SIGN
+0xA8	0x0161	#	LATIN SMALL LETTER S WITH CARON
+0xA9	0x00A9	#	COPYRIGHT SIGN
+0xAA	0x0218	#	LATIN CAPITAL LETTER S WITH COMMA BELOW
+0xAB	0x00AB	#	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+0xAC	0x0179	#	LATIN CAPITAL LETTER Z WITH ACUTE
+0xAD	0x00AD	#	SOFT HYPHEN
+0xAE	0x017A	#	LATIN SMALL LETTER Z WITH ACUTE
+0xAF	0x017B	#	LATIN CAPITAL LETTER Z WITH DOT ABOVE
+0xB0	0x00B0	#	DEGREE SIGN
+0xB1	0x00B1	#	PLUS-MINUS SIGN
+0xB2	0x010C	#	LATIN CAPITAL LETTER C WITH CARON
+0xB3	0x0142	#	LATIN SMALL LETTER L WITH STROKE
+0xB4	0x017D	#	LATIN CAPITAL LETTER Z WITH CARON
+0xB5	0x201D	#	RIGHT DOUBLE QUOTATION MARK
+0xB6	0x00B6	#	PILCROW SIGN
+0xB7	0x00B7	#	MIDDLE DOT
+0xB8	0x017E	#	LATIN SMALL LETTER Z WITH CARON
+0xB9	0x010D	#	LATIN SMALL LETTER C WITH CARON
+0xBA	0x0219	#	LATIN SMALL LETTER S WITH COMMA BELOW
+0xBB	0x00BB	#	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+0xBC	0x0152	#	LATIN CAPITAL LIGATURE OE
+0xBD	0x0153	#	LATIN SMALL LIGATURE OE
+0xBE	0x0178	#	LATIN CAPITAL LETTER Y WITH DIAERESIS
+0xBF	0x017C	#	LATIN SMALL LETTER Z WITH DOT ABOVE
+0xC0	0x00C0	#	LATIN CAPITAL LETTER A WITH GRAVE
+0xC1	0x00C1	#	LATIN CAPITAL LETTER A WITH ACUTE
+0xC2	0x00C2	#	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+0xC3	0x0102	#	LATIN CAPITAL LETTER A WITH BREVE
+0xC4	0x00C4	#	LATIN CAPITAL LETTER A WITH DIAERESIS
+0xC5	0x0106	#	LATIN CAPITAL LETTER C WITH ACUTE
+0xC6	0x00C6	#	LATIN CAPITAL LETTER AE
+0xC7	0x00C7	#	LATIN CAPITAL LETTER C WITH CEDILLA
+0xC8	0x00C8	#	LATIN CAPITAL LETTER E WITH GRAVE
+0xC9	0x00C9	#	LATIN CAPITAL LETTER E WITH ACUTE
+0xCA	0x00CA	#	LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+0xCB	0x00CB	#	LATIN CAPITAL LETTER E WITH DIAERESIS
+0xCC	0x00CC	#	LATIN CAPITAL LETTER I WITH GRAVE
+0xCD	0x00CD	#	LATIN CAPITAL LETTER I WITH ACUTE
+0xCE	0x00CE	#	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+0xCF	0x00CF	#	LATIN CAPITAL LETTER I WITH DIAERESIS
+0xD0	0x0110	#	LATIN CAPITAL LETTER D WITH STROKE
+0xD1	0x0143	#	LATIN CAPITAL LETTER N WITH ACUTE
+0xD2	0x00D2	#	LATIN CAPITAL LETTER O WITH GRAVE
+0xD3	0x00D3	#	LATIN CAPITAL LETTER O WITH ACUTE
+0xD4	0x00D4	#	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+0xD5	0x0150	#	LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
+0xD6	0x00D6	#	LATIN CAPITAL LETTER O WITH DIAERESIS
+0xD7	0x015A	#	LATIN CAPITAL LETTER S WITH ACUTE
+0xD8	0x0170	#	LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
+0xD9	0x00D9	#	LATIN CAPITAL LETTER U WITH GRAVE
+0xDA	0x00DA	#	LATIN CAPITAL LETTER U WITH ACUTE
+0xDB	0x00DB	#	LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+0xDC	0x00DC	#	LATIN CAPITAL LETTER U WITH DIAERESIS
+0xDD	0x0118	#	LATIN CAPITAL LETTER E WITH OGONEK
+0xDE	0x021A	#	LATIN CAPITAL LETTER T WITH COMMA BELOW
+0xDF	0x00DF	#	LATIN SMALL LETTER SHARP S
+0xE0	0x00E0	#	LATIN SMALL LETTER A WITH GRAVE
+0xE1	0x00E1	#	LATIN SMALL LETTER A WITH ACUTE
+0xE2	0x00E2	#	LATIN SMALL LETTER A WITH CIRCUMFLEX
+0xE3	0x0103	#	LATIN SMALL LETTER A WITH BREVE
+0xE4	0x00E4	#	LATIN SMALL LETTER A WITH DIAERESIS
+0xE5	0x0107	#	LATIN SMALL LETTER C WITH ACUTE
+0xE6	0x00E6	#	LATIN SMALL LETTER AE
+0xE7	0x00E7	#	LATIN SMALL LETTER C WITH CEDILLA
+0xE8	0x00E8	#	LATIN SMALL LETTER E WITH GRAVE
+0xE9	0x00E9	#	LATIN SMALL LETTER E WITH ACUTE
+0xEA	0x00EA	#	LATIN SMALL LETTER E WITH CIRCUMFLEX
+0xEB	0x00EB	#	LATIN SMALL LETTER E WITH DIAERESIS
+0xEC	0x00EC	#	LATIN SMALL LETTER I WITH GRAVE
+0xED	0x00ED	#	LATIN SMALL LETTER I WITH ACUTE
+0xEE	0x00EE	#	LATIN SMALL LETTER I WITH CIRCUMFLEX
+0xEF	0x00EF	#	LATIN SMALL LETTER I WITH DIAERESIS
+0xF0	0x0111	#	LATIN SMALL LETTER D WITH STROKE
+0xF1	0x0144	#	LATIN SMALL LETTER N WITH ACUTE
+0xF2	0x00F2	#	LATIN SMALL LETTER O WITH GRAVE
+0xF3	0x00F3	#	LATIN SMALL LETTER O WITH ACUTE
+0xF4	0x00F4	#	LATIN SMALL LETTER O WITH CIRCUMFLEX
+0xF5	0x0151	#	LATIN SMALL LETTER O WITH DOUBLE ACUTE
+0xF6	0x00F6	#	LATIN SMALL LETTER O WITH DIAERESIS
+0xF7	0x015B	#	LATIN SMALL LETTER S WITH ACUTE
+0xF8	0x0171	#	LATIN SMALL LETTER U WITH DOUBLE ACUTE
+0xF9	0x00F9	#	LATIN SMALL LETTER U WITH GRAVE
+0xFA	0x00FA	#	LATIN SMALL LETTER U WITH ACUTE
+0xFB	0x00FB	#	LATIN SMALL LETTER U WITH CIRCUMFLEX
+0xFC	0x00FC	#	LATIN SMALL LETTER U WITH DIAERESIS
+0xFD	0x0119	#	LATIN SMALL LETTER E WITH OGONEK
+0xFE	0x021B	#	LATIN SMALL LETTER T WITH COMMA BELOW
+0xFF	0x00FF	#	LATIN SMALL LETTER Y WITH DIAERESIS
diff --git a/Unicode/8859_2.cp b/Unicode/8859_2.cp
index 9bca862e8..c24c0c746 100644
--- a/Unicode/8859_2.cp
+++ b/Unicode/8859_2.cp
@@ -1,193 +1,317 @@
 ISO 8859-2
 "ISO-8859-2", "iso8859-2", "8859-2", "iso-ir-101", "latin2", "l2", "il2", "ISO_8859-2:1987", "ISO_8859-2", "csISOLatin2", "ISO8859_2"
-0x20	0x0020	#SPACE
-0x21	0x0021	#EXCLAMATION MARK
-0x22	0x0022	#QUOTATION MARK
-0x23	0x0023	#NUMBER SIGN
-0x24	0x0024	#DOLLAR SIGN
-0x25	0x0025	#PERCENT SIGN
-0x26	0x0026	#AMPERSAND
-0x27	0x0027	#APOSTROPHE
-0x28	0x0028	#LEFT PARENTHESIS
-0x29	0x0029	#RIGHT PARENTHESIS
-0x2A	0x002A	#ASTERISK
-0x2B	0x002B	#PLUS SIGN
-0x2C	0x002C	#COMMA
-0x2D	0x002D	#HYPHEN-MINUS
-0x2E	0x002E	#FULL STOP
-0x2F	0x002F	#SOLIDUS
-0x30	0x0030	#DIGIT ZERO
-0x31	0x0031	#DIGIT ONE
-0x32	0x0032	#DIGIT TWO
-0x33	0x0033	#DIGIT THREE
-0x34	0x0034	#DIGIT FOUR
-0x35	0x0035	#DIGIT FIVE
-0x36	0x0036	#DIGIT SIX
-0x37	0x0037	#DIGIT SEVEN
-0x38	0x0038	#DIGIT EIGHT
-0x39	0x0039	#DIGIT NINE
-0x3A	0x003A	#COLON
-0x3B	0x003B	#SEMICOLON
-0x3C	0x003C	#LESS-THAN SIGN
-0x3D	0x003D	#EQUALS SIGN
-0x3E	0x003E	#GREATER-THAN SIGN
-0x3F	0x003F	#QUESTION MARK
-0x40	0x0040	#COMMERCIAL AT
-0x41	0x0041	#LATIN CAPITAL LETTER A
-0x42	0x0042	#LATIN CAPITAL LETTER B
-0x43	0x0043	#LATIN CAPITAL LETTER C
-0x44	0x0044	#LATIN CAPITAL LETTER D
-0x45	0x0045	#LATIN CAPITAL LETTER E
-0x46	0x0046	#LATIN CAPITAL LETTER F
-0x47	0x0047	#LATIN CAPITAL LETTER G
-0x48	0x0048	#LATIN CAPITAL LETTER H
-0x49	0x0049	#LATIN CAPITAL LETTER I
-0x4A	0x004A	#LATIN CAPITAL LETTER J
-0x4B	0x004B	#LATIN CAPITAL LETTER K
-0x4C	0x004C	#LATIN CAPITAL LETTER L
-0x4D	0x004D	#LATIN CAPITAL LETTER M
-0x4E	0x004E	#LATIN CAPITAL LETTER N
-0x4F	0x004F	#LATIN CAPITAL LETTER O
-0x50	0x0050	#LATIN CAPITAL LETTER P
-0x51	0x0051	#LATIN CAPITAL LETTER Q
-0x52	0x0052	#LATIN CAPITAL LETTER R
-0x53	0x0053	#LATIN CAPITAL LETTER S
-0x54	0x0054	#LATIN CAPITAL LETTER T
-0x55	0x0055	#LATIN CAPITAL LETTER U
-0x56	0x0056	#LATIN CAPITAL LETTER V
-0x57	0x0057	#LATIN CAPITAL LETTER W
-0x58	0x0058	#LATIN CAPITAL LETTER X
-0x59	0x0059	#LATIN CAPITAL LETTER Y
-0x5A	0x005A	#LATIN CAPITAL LETTER Z
-0x5B	0x005B	#LEFT SQUARE BRACKET
-0x5C	0x005C	#REVERSE SOLIDUS
-0x5D	0x005D	#RIGHT SQUARE BRACKET
-0x5E	0x005E	#CIRCUMFLEX ACCENT
-0x5F	0x005F	#LOW LINE
-0x60	0x0060	#GRAVE ACCENT
-0x61	0x0061	#LATIN SMALL LETTER A
-0x62	0x0062	#LATIN SMALL LETTER B
-0x63	0x0063	#LATIN SMALL LETTER C
-0x64	0x0064	#LATIN SMALL LETTER D
-0x65	0x0065	#LATIN SMALL LETTER E
-0x66	0x0066	#LATIN SMALL LETTER F
-0x67	0x0067	#LATIN SMALL LETTER G
-0x68	0x0068	#LATIN SMALL LETTER H
-0x69	0x0069	#LATIN SMALL LETTER I
-0x6A	0x006A	#LATIN SMALL LETTER J
-0x6B	0x006B	#LATIN SMALL LETTER K
-0x6C	0x006C	#LATIN SMALL LETTER L
-0x6D	0x006D	#LATIN SMALL LETTER M
-0x6E	0x006E	#LATIN SMALL LETTER N
-0x6F	0x006F	#LATIN SMALL LETTER O
-0x70	0x0070	#LATIN SMALL LETTER P
-0x71	0x0071	#LATIN SMALL LETTER Q
-0x72	0x0072	#LATIN SMALL LETTER R
-0x73	0x0073	#LATIN SMALL LETTER S
-0x74	0x0074	#LATIN SMALL LETTER T
-0x75	0x0075	#LATIN SMALL LETTER U
-0x76	0x0076	#LATIN SMALL LETTER V
-0x77	0x0077	#LATIN SMALL LETTER W
-0x78	0x0078	#LATIN SMALL LETTER X
-0x79	0x0079	#LATIN SMALL LETTER Y
-0x7A	0x007A	#LATIN SMALL LETTER Z
-0x7B	0x007B	#LEFT CURLY BRACKET
-0x7C	0x007C	#VERTICAL LINE
-0x7D	0x007D	#RIGHT CURLY BRACKET
-0x7E	0x007E	#TILDE
-0xA0	0x00A0	#NO-BREAK SPACE
-0xA1	0x0104	#LATIN CAPITAL LETTER A WITH OGONEK
-0xA2	0x02D8	#BREVE
-0xA3	0x0141	#LATIN CAPITAL LETTER L WITH STROKE
-0xA4	0x00A4	#CURRENCY SIGN
-0xA5	0x013D	#LATIN CAPITAL LETTER L WITH CARON
-0xA6	0x015A	#LATIN CAPITAL LETTER S WITH ACUTE
-0xA7	0x00A7	#SECTION SIGN
-0xA8	0x00A8	#DIAERESIS
-0xA9	0x0160	#LATIN CAPITAL LETTER S WITH CARON
-0xAA	0x015E	#LATIN CAPITAL LETTER S WITH CEDILLA
-0xAB	0x0164	#LATIN CAPITAL LETTER T WITH CARON
-0xAC	0x0179	#LATIN CAPITAL LETTER Z WITH ACUTE
-0xAD	0x00AD	#SOFT HYPHEN
-0xAE	0x017D	#LATIN CAPITAL LETTER Z WITH CARON
-0xAF	0x017B	#LATIN CAPITAL LETTER Z WITH DOT ABOVE
-0xB0	0x00B0	#DEGREE SIGN
-0xB1	0x0105	#LATIN SMALL LETTER A WITH OGONEK
-0xB2	0x02DB	#OGONEK
-0xB3	0x0142	#LATIN SMALL LETTER L WITH STROKE
-0xB4	0x00B4	#ACUTE ACCENT
-0xB5	0x013E	#LATIN SMALL LETTER L WITH CARON
-0xB6	0x015B	#LATIN SMALL LETTER S WITH ACUTE
-0xB7	0x02C7	#CARON
-0xB8	0x00B8	#CEDILLA
-0xB9	0x0161	#LATIN SMALL LETTER S WITH CARON
-0xBA	0x015F	#LATIN SMALL LETTER S WITH CEDILLA
-0xBB	0x0165	#LATIN SMALL LETTER T WITH CARON
-0xBC	0x017A	#LATIN SMALL LETTER Z WITH ACUTE
-0xBD	0x02DD	#DOUBLE ACUTE ACCENT
-0xBE	0x017E	#LATIN SMALL LETTER Z WITH CARON
-0xBF	0x017C	#LATIN SMALL LETTER Z WITH DOT ABOVE
-0xC0	0x0154	#LATIN CAPITAL LETTER R WITH ACUTE
-0xC1	0x00C1	#LATIN CAPITAL LETTER A WITH ACUTE
-0xC2	0x00C2	#LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-0xC3	0x0102	#LATIN CAPITAL LETTER A WITH BREVE
-0xC4	0x00C4	#LATIN CAPITAL LETTER A WITH DIAERESIS
-0xC5	0x0139	#LATIN CAPITAL LETTER L WITH ACUTE
-0xC6	0x0106	#LATIN CAPITAL LETTER C WITH ACUTE
-0xC7	0x00C7	#LATIN CAPITAL LETTER C WITH CEDILLA
-0xC8	0x010C	#LATIN CAPITAL LETTER C WITH CARON
-0xC9	0x00C9	#LATIN CAPITAL LETTER E WITH ACUTE
-0xCA	0x0118	#LATIN CAPITAL LETTER E WITH OGONEK
-0xCB	0x00CB	#LATIN CAPITAL LETTER E WITH DIAERESIS
-0xCC	0x011A	#LATIN CAPITAL LETTER E WITH CARON
-0xCD	0x00CD	#LATIN CAPITAL LETTER I WITH ACUTE
-0xCE	0x00CE	#LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-0xCF	0x010E	#LATIN CAPITAL LETTER D WITH CARON
-0xD0	0x0110	#LATIN CAPITAL LETTER D WITH STROKE
-0xD1	0x0143	#LATIN CAPITAL LETTER N WITH ACUTE
-0xD2	0x0147	#LATIN CAPITAL LETTER N WITH CARON
-0xD3	0x00D3	#LATIN CAPITAL LETTER O WITH ACUTE
-0xD4	0x00D4	#LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-0xD5	0x0150	#LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
-0xD6	0x00D6	#LATIN CAPITAL LETTER O WITH DIAERESIS
-0xD7	0x00D7	#MULTIPLICATION SIGN
-0xD8	0x0158	#LATIN CAPITAL LETTER R WITH CARON
-0xD9	0x016E	#LATIN CAPITAL LETTER U WITH RING ABOVE
-0xDA	0x00DA	#LATIN CAPITAL LETTER U WITH ACUTE
-0xDB	0x0170	#LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
-0xDC	0x00DC	#LATIN CAPITAL LETTER U WITH DIAERESIS
-0xDD	0x00DD	#LATIN CAPITAL LETTER Y WITH ACUTE
-0xDE	0x0162	#LATIN CAPITAL LETTER T WITH CEDILLA
-0xDF	0x00DF	#LATIN SMALL LETTER SHARP S
-0xE0	0x0155	#LATIN SMALL LETTER R WITH ACUTE
-0xE1	0x00E1	#LATIN SMALL LETTER A WITH ACUTE
-0xE2	0x00E2	#LATIN SMALL LETTER A WITH CIRCUMFLEX
-0xE3	0x0103	#LATIN SMALL LETTER A WITH BREVE
-0xE4	0x00E4	#LATIN SMALL LETTER A WITH DIAERESIS
-0xE5	0x013A	#LATIN SMALL LETTER L WITH ACUTE
-0xE6	0x0107	#LATIN SMALL LETTER C WITH ACUTE
-0xE7	0x00E7	#LATIN SMALL LETTER C WITH CEDILLA
-0xE8	0x010D	#LATIN SMALL LETTER C WITH CARON
-0xE9	0x00E9	#LATIN SMALL LETTER E WITH ACUTE
-0xEA	0x0119	#LATIN SMALL LETTER E WITH OGONEK
-0xEB	0x00EB	#LATIN SMALL LETTER E WITH DIAERESIS
-0xEC	0x011B	#LATIN SMALL LETTER E WITH CARON
-0xED	0x00ED	#LATIN SMALL LETTER I WITH ACUTE
-0xEE	0x00EE	#LATIN SMALL LETTER I WITH CIRCUMFLEX
-0xEF	0x010F	#LATIN SMALL LETTER D WITH CARON
-0xF0	0x0111	#LATIN SMALL LETTER D WITH STROKE
-0xF1	0x0144	#LATIN SMALL LETTER N WITH ACUTE
-0xF2	0x0148	#LATIN SMALL LETTER N WITH CARON
-0xF3	0x00F3	#LATIN SMALL LETTER O WITH ACUTE
-0xF4	0x00F4	#LATIN SMALL LETTER O WITH CIRCUMFLEX
-0xF5	0x0151	#LATIN SMALL LETTER O WITH DOUBLE ACUTE
-0xF6	0x00F6	#LATIN SMALL LETTER O WITH DIAERESIS
-0xF7	0x00F7	#DIVISION SIGN
-0xF8	0x0159	#LATIN SMALL LETTER R WITH CARON
-0xF9	0x016F	#LATIN SMALL LETTER U WITH RING ABOVE
-0xFA	0x00FA	#LATIN SMALL LETTER U WITH ACUTE
-0xFB	0x0171	#LATIN SMALL LETTER U WITH DOUBLE ACUTE
-0xFC	0x00FC	#LATIN SMALL LETTER U WITH DIAERESIS
-0xFD	0x00FD	#LATIN SMALL LETTER Y WITH ACUTE
-0xFE	0x0163	#LATIN SMALL LETTER T WITH CEDILLA
-0xFF	0x02D9	#DOT ABOVE
+
+# ----------------------------------------------------------------------
+# The following data was downloaded from
+# http://www.unicode.org/Public/MAPPINGS/ISO8859/DatedVersions/8859-2-1999.TXT
+# on 2008-10-05, so it is a Unicode Data File covered by the Unicode
+# copyright and permission notice in the COPYING file of ELinks,
+# regardless of any terms shown below.
+#
+# This file differs from the original in the following ways:
+# - Added this comment, blank lines around it, and charset names above it.
+# ----------------------------------------------------------------------
+
+#
+#	Name:             ISO 8859-2:1999 to Unicode
+#	Unicode version:  3.0
+#	Table version:    1.0
+#	Table format:     Format A
+#	Date:             1999 July 27
+#	Authors:          Ken Whistler <kenw@sybase.com>
+#
+#	Copyright (c) 1991-1999 Unicode, Inc.  All Rights reserved.
+#
+#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#	No claims are made as to fitness for any particular purpose.  No
+#	warranties of any kind are expressed or implied.  The recipient
+#	agrees to determine applicability of information provided.  If this
+#	file has been provided on optical media by Unicode, Inc., the sole
+#	remedy for any claim will be exchange of defective media within 90
+#	days of receipt.
+#
+#	Unicode, Inc. hereby grants the right to freely use the information
+#	supplied in this file in the creation of products supporting the
+#	Unicode Standard, and to make copies of this file in any form for
+#	internal or external distribution as long as this notice remains
+#	attached.
+#
+#	General notes:
+#
+#	This table contains the data the Unicode Consortium has on how
+#       ISO/IEC 8859-2:1999 characters map into Unicode.
+#
+#	Format:  Three tab-separated columns
+#		 Column #1 is the ISO/IEC 8859-2 code (in hex as 0xXX)
+#		 Column #2 is the Unicode (in hex as 0xXXXX)
+#		 Column #3 the Unicode name (follows a comment sign, '#')
+#
+#	The entries are in ISO/IEC 8859-2 order.
+#
+#	Version history
+#	1.0 version updates 0.1 version by adding mappings for all
+#	control characters.
+#
+#	Updated versions of this file may be found in:
+#		<ftp://ftp.unicode.org/Public/MAPPINGS/>
+#
+#	Any comments or problems, contact <errata@unicode.org>
+#	Please note that <errata@unicode.org> is an archival address;
+#	notices will be checked, but do not expect an immediate response.
+#
+0x00	0x0000	#	NULL
+0x01	0x0001	#	START OF HEADING
+0x02	0x0002	#	START OF TEXT
+0x03	0x0003	#	END OF TEXT
+0x04	0x0004	#	END OF TRANSMISSION
+0x05	0x0005	#	ENQUIRY
+0x06	0x0006	#	ACKNOWLEDGE
+0x07	0x0007	#	BELL
+0x08	0x0008	#	BACKSPACE
+0x09	0x0009	#	HORIZONTAL TABULATION
+0x0A	0x000A	#	LINE FEED
+0x0B	0x000B	#	VERTICAL TABULATION
+0x0C	0x000C	#	FORM FEED
+0x0D	0x000D	#	CARRIAGE RETURN
+0x0E	0x000E	#	SHIFT OUT
+0x0F	0x000F	#	SHIFT IN
+0x10	0x0010	#	DATA LINK ESCAPE
+0x11	0x0011	#	DEVICE CONTROL ONE
+0x12	0x0012	#	DEVICE CONTROL TWO
+0x13	0x0013	#	DEVICE CONTROL THREE
+0x14	0x0014	#	DEVICE CONTROL FOUR
+0x15	0x0015	#	NEGATIVE ACKNOWLEDGE
+0x16	0x0016	#	SYNCHRONOUS IDLE
+0x17	0x0017	#	END OF TRANSMISSION BLOCK
+0x18	0x0018	#	CANCEL
+0x19	0x0019	#	END OF MEDIUM
+0x1A	0x001A	#	SUBSTITUTE
+0x1B	0x001B	#	ESCAPE
+0x1C	0x001C	#	FILE SEPARATOR
+0x1D	0x001D	#	GROUP SEPARATOR
+0x1E	0x001E	#	RECORD SEPARATOR
+0x1F	0x001F	#	UNIT SEPARATOR
+0x20	0x0020	#	SPACE
+0x21	0x0021	#	EXCLAMATION MARK
+0x22	0x0022	#	QUOTATION MARK
+0x23	0x0023	#	NUMBER SIGN
+0x24	0x0024	#	DOLLAR SIGN
+0x25	0x0025	#	PERCENT SIGN
+0x26	0x0026	#	AMPERSAND
+0x27	0x0027	#	APOSTROPHE
+0x28	0x0028	#	LEFT PARENTHESIS
+0x29	0x0029	#	RIGHT PARENTHESIS
+0x2A	0x002A	#	ASTERISK
+0x2B	0x002B	#	PLUS SIGN
+0x2C	0x002C	#	COMMA
+0x2D	0x002D	#	HYPHEN-MINUS
+0x2E	0x002E	#	FULL STOP
+0x2F	0x002F	#	SOLIDUS
+0x30	0x0030	#	DIGIT ZERO
+0x31	0x0031	#	DIGIT ONE
+0x32	0x0032	#	DIGIT TWO
+0x33	0x0033	#	DIGIT THREE
+0x34	0x0034	#	DIGIT FOUR
+0x35	0x0035	#	DIGIT FIVE
+0x36	0x0036	#	DIGIT SIX
+0x37	0x0037	#	DIGIT SEVEN
+0x38	0x0038	#	DIGIT EIGHT
+0x39	0x0039	#	DIGIT NINE
+0x3A	0x003A	#	COLON
+0x3B	0x003B	#	SEMICOLON
+0x3C	0x003C	#	LESS-THAN SIGN
+0x3D	0x003D	#	EQUALS SIGN
+0x3E	0x003E	#	GREATER-THAN SIGN
+0x3F	0x003F	#	QUESTION MARK
+0x40	0x0040	#	COMMERCIAL AT
+0x41	0x0041	#	LATIN CAPITAL LETTER A
+0x42	0x0042	#	LATIN CAPITAL LETTER B
+0x43	0x0043	#	LATIN CAPITAL LETTER C
+0x44	0x0044	#	LATIN CAPITAL LETTER D
+0x45	0x0045	#	LATIN CAPITAL LETTER E
+0x46	0x0046	#	LATIN CAPITAL LETTER F
+0x47	0x0047	#	LATIN CAPITAL LETTER G
+0x48	0x0048	#	LATIN CAPITAL LETTER H
+0x49	0x0049	#	LATIN CAPITAL LETTER I
+0x4A	0x004A	#	LATIN CAPITAL LETTER J
+0x4B	0x004B	#	LATIN CAPITAL LETTER K
+0x4C	0x004C	#	LATIN CAPITAL LETTER L
+0x4D	0x004D	#	LATIN CAPITAL LETTER M
+0x4E	0x004E	#	LATIN CAPITAL LETTER N
+0x4F	0x004F	#	LATIN CAPITAL LETTER O
+0x50	0x0050	#	LATIN CAPITAL LETTER P
+0x51	0x0051	#	LATIN CAPITAL LETTER Q
+0x52	0x0052	#	LATIN CAPITAL LETTER R
+0x53	0x0053	#	LATIN CAPITAL LETTER S
+0x54	0x0054	#	LATIN CAPITAL LETTER T
+0x55	0x0055	#	LATIN CAPITAL LETTER U
+0x56	0x0056	#	LATIN CAPITAL LETTER V
+0x57	0x0057	#	LATIN CAPITAL LETTER W
+0x58	0x0058	#	LATIN CAPITAL LETTER X
+0x59	0x0059	#	LATIN CAPITAL LETTER Y
+0x5A	0x005A	#	LATIN CAPITAL LETTER Z
+0x5B	0x005B	#	LEFT SQUARE BRACKET
+0x5C	0x005C	#	REVERSE SOLIDUS
+0x5D	0x005D	#	RIGHT SQUARE BRACKET
+0x5E	0x005E	#	CIRCUMFLEX ACCENT
+0x5F	0x005F	#	LOW LINE
+0x60	0x0060	#	GRAVE ACCENT
+0x61	0x0061	#	LATIN SMALL LETTER A
+0x62	0x0062	#	LATIN SMALL LETTER B
+0x63	0x0063	#	LATIN SMALL LETTER C
+0x64	0x0064	#	LATIN SMALL LETTER D
+0x65	0x0065	#	LATIN SMALL LETTER E
+0x66	0x0066	#	LATIN SMALL LETTER F
+0x67	0x0067	#	LATIN SMALL LETTER G
+0x68	0x0068	#	LATIN SMALL LETTER H
+0x69	0x0069	#	LATIN SMALL LETTER I
+0x6A	0x006A	#	LATIN SMALL LETTER J
+0x6B	0x006B	#	LATIN SMALL LETTER K
+0x6C	0x006C	#	LATIN SMALL LETTER L
+0x6D	0x006D	#	LATIN SMALL LETTER M
+0x6E	0x006E	#	LATIN SMALL LETTER N
+0x6F	0x006F	#	LATIN SMALL LETTER O
+0x70	0x0070	#	LATIN SMALL LETTER P
+0x71	0x0071	#	LATIN SMALL LETTER Q
+0x72	0x0072	#	LATIN SMALL LETTER R
+0x73	0x0073	#	LATIN SMALL LETTER S
+0x74	0x0074	#	LATIN SMALL LETTER T
+0x75	0x0075	#	LATIN SMALL LETTER U
+0x76	0x0076	#	LATIN SMALL LETTER V
+0x77	0x0077	#	LATIN SMALL LETTER W
+0x78	0x0078	#	LATIN SMALL LETTER X
+0x79	0x0079	#	LATIN SMALL LETTER Y
+0x7A	0x007A	#	LATIN SMALL LETTER Z
+0x7B	0x007B	#	LEFT CURLY BRACKET
+0x7C	0x007C	#	VERTICAL LINE
+0x7D	0x007D	#	RIGHT CURLY BRACKET
+0x7E	0x007E	#	TILDE
+0x7F	0x007F	#	DELETE
+0x80	0x0080	#	<control>
+0x81	0x0081	#	<control>
+0x82	0x0082	#	<control>
+0x83	0x0083	#	<control>
+0x84	0x0084	#	<control>
+0x85	0x0085	#	<control>
+0x86	0x0086	#	<control>
+0x87	0x0087	#	<control>
+0x88	0x0088	#	<control>
+0x89	0x0089	#	<control>
+0x8A	0x008A	#	<control>
+0x8B	0x008B	#	<control>
+0x8C	0x008C	#	<control>
+0x8D	0x008D	#	<control>
+0x8E	0x008E	#	<control>
+0x8F	0x008F	#	<control>
+0x90	0x0090	#	<control>
+0x91	0x0091	#	<control>
+0x92	0x0092	#	<control>
+0x93	0x0093	#	<control>
+0x94	0x0094	#	<control>
+0x95	0x0095	#	<control>
+0x96	0x0096	#	<control>
+0x97	0x0097	#	<control>
+0x98	0x0098	#	<control>
+0x99	0x0099	#	<control>
+0x9A	0x009A	#	<control>
+0x9B	0x009B	#	<control>
+0x9C	0x009C	#	<control>
+0x9D	0x009D	#	<control>
+0x9E	0x009E	#	<control>
+0x9F	0x009F	#	<control>
+0xA0	0x00A0	#	NO-BREAK SPACE
+0xA1	0x0104	#	LATIN CAPITAL LETTER A WITH OGONEK
+0xA2	0x02D8	#	BREVE
+0xA3	0x0141	#	LATIN CAPITAL LETTER L WITH STROKE
+0xA4	0x00A4	#	CURRENCY SIGN
+0xA5	0x013D	#	LATIN CAPITAL LETTER L WITH CARON
+0xA6	0x015A	#	LATIN CAPITAL LETTER S WITH ACUTE
+0xA7	0x00A7	#	SECTION SIGN
+0xA8	0x00A8	#	DIAERESIS
+0xA9	0x0160	#	LATIN CAPITAL LETTER S WITH CARON
+0xAA	0x015E	#	LATIN CAPITAL LETTER S WITH CEDILLA
+0xAB	0x0164	#	LATIN CAPITAL LETTER T WITH CARON
+0xAC	0x0179	#	LATIN CAPITAL LETTER Z WITH ACUTE
+0xAD	0x00AD	#	SOFT HYPHEN
+0xAE	0x017D	#	LATIN CAPITAL LETTER Z WITH CARON
+0xAF	0x017B	#	LATIN CAPITAL LETTER Z WITH DOT ABOVE
+0xB0	0x00B0	#	DEGREE SIGN
+0xB1	0x0105	#	LATIN SMALL LETTER A WITH OGONEK
+0xB2	0x02DB	#	OGONEK
+0xB3	0x0142	#	LATIN SMALL LETTER L WITH STROKE
+0xB4	0x00B4	#	ACUTE ACCENT
+0xB5	0x013E	#	LATIN SMALL LETTER L WITH CARON
+0xB6	0x015B	#	LATIN SMALL LETTER S WITH ACUTE
+0xB7	0x02C7	#	CARON
+0xB8	0x00B8	#	CEDILLA
+0xB9	0x0161	#	LATIN SMALL LETTER S WITH CARON
+0xBA	0x015F	#	LATIN SMALL LETTER S WITH CEDILLA
+0xBB	0x0165	#	LATIN SMALL LETTER T WITH CARON
+0xBC	0x017A	#	LATIN SMALL LETTER Z WITH ACUTE
+0xBD	0x02DD	#	DOUBLE ACUTE ACCENT
+0xBE	0x017E	#	LATIN SMALL LETTER Z WITH CARON
+0xBF	0x017C	#	LATIN SMALL LETTER Z WITH DOT ABOVE
+0xC0	0x0154	#	LATIN CAPITAL LETTER R WITH ACUTE
+0xC1	0x00C1	#	LATIN CAPITAL LETTER A WITH ACUTE
+0xC2	0x00C2	#	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+0xC3	0x0102	#	LATIN CAPITAL LETTER A WITH BREVE
+0xC4	0x00C4	#	LATIN CAPITAL LETTER A WITH DIAERESIS
+0xC5	0x0139	#	LATIN CAPITAL LETTER L WITH ACUTE
+0xC6	0x0106	#	LATIN CAPITAL LETTER C WITH ACUTE
+0xC7	0x00C7	#	LATIN CAPITAL LETTER C WITH CEDILLA
+0xC8	0x010C	#	LATIN CAPITAL LETTER C WITH CARON
+0xC9	0x00C9	#	LATIN CAPITAL LETTER E WITH ACUTE
+0xCA	0x0118	#	LATIN CAPITAL LETTER E WITH OGONEK
+0xCB	0x00CB	#	LATIN CAPITAL LETTER E WITH DIAERESIS
+0xCC	0x011A	#	LATIN CAPITAL LETTER E WITH CARON
+0xCD	0x00CD	#	LATIN CAPITAL LETTER I WITH ACUTE
+0xCE	0x00CE	#	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+0xCF	0x010E	#	LATIN CAPITAL LETTER D WITH CARON
+0xD0	0x0110	#	LATIN CAPITAL LETTER D WITH STROKE
+0xD1	0x0143	#	LATIN CAPITAL LETTER N WITH ACUTE
+0xD2	0x0147	#	LATIN CAPITAL LETTER N WITH CARON
+0xD3	0x00D3	#	LATIN CAPITAL LETTER O WITH ACUTE
+0xD4	0x00D4	#	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+0xD5	0x0150	#	LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
+0xD6	0x00D6	#	LATIN CAPITAL LETTER O WITH DIAERESIS
+0xD7	0x00D7	#	MULTIPLICATION SIGN
+0xD8	0x0158	#	LATIN CAPITAL LETTER R WITH CARON
+0xD9	0x016E	#	LATIN CAPITAL LETTER U WITH RING ABOVE
+0xDA	0x00DA	#	LATIN CAPITAL LETTER U WITH ACUTE
+0xDB	0x0170	#	LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
+0xDC	0x00DC	#	LATIN CAPITAL LETTER U WITH DIAERESIS
+0xDD	0x00DD	#	LATIN CAPITAL LETTER Y WITH ACUTE
+0xDE	0x0162	#	LATIN CAPITAL LETTER T WITH CEDILLA
+0xDF	0x00DF	#	LATIN SMALL LETTER SHARP S
+0xE0	0x0155	#	LATIN SMALL LETTER R WITH ACUTE
+0xE1	0x00E1	#	LATIN SMALL LETTER A WITH ACUTE
+0xE2	0x00E2	#	LATIN SMALL LETTER A WITH CIRCUMFLEX
+0xE3	0x0103	#	LATIN SMALL LETTER A WITH BREVE
+0xE4	0x00E4	#	LATIN SMALL LETTER A WITH DIAERESIS
+0xE5	0x013A	#	LATIN SMALL LETTER L WITH ACUTE
+0xE6	0x0107	#	LATIN SMALL LETTER C WITH ACUTE
+0xE7	0x00E7	#	LATIN SMALL LETTER C WITH CEDILLA
+0xE8	0x010D	#	LATIN SMALL LETTER C WITH CARON
+0xE9	0x00E9	#	LATIN SMALL LETTER E WITH ACUTE
+0xEA	0x0119	#	LATIN SMALL LETTER E WITH OGONEK
+0xEB	0x00EB	#	LATIN SMALL LETTER E WITH DIAERESIS
+0xEC	0x011B	#	LATIN SMALL LETTER E WITH CARON
+0xED	0x00ED	#	LATIN SMALL LETTER I WITH ACUTE
+0xEE	0x00EE	#	LATIN SMALL LETTER I WITH CIRCUMFLEX
+0xEF	0x010F	#	LATIN SMALL LETTER D WITH CARON
+0xF0	0x0111	#	LATIN SMALL LETTER D WITH STROKE
+0xF1	0x0144	#	LATIN SMALL LETTER N WITH ACUTE
+0xF2	0x0148	#	LATIN SMALL LETTER N WITH CARON
+0xF3	0x00F3	#	LATIN SMALL LETTER O WITH ACUTE
+0xF4	0x00F4	#	LATIN SMALL LETTER O WITH CIRCUMFLEX
+0xF5	0x0151	#	LATIN SMALL LETTER O WITH DOUBLE ACUTE
+0xF6	0x00F6	#	LATIN SMALL LETTER O WITH DIAERESIS
+0xF7	0x00F7	#	DIVISION SIGN
+0xF8	0x0159	#	LATIN SMALL LETTER R WITH CARON
+0xF9	0x016F	#	LATIN SMALL LETTER U WITH RING ABOVE
+0xFA	0x00FA	#	LATIN SMALL LETTER U WITH ACUTE
+0xFB	0x0171	#	LATIN SMALL LETTER U WITH DOUBLE ACUTE
+0xFC	0x00FC	#	LATIN SMALL LETTER U WITH DIAERESIS
+0xFD	0x00FD	#	LATIN SMALL LETTER Y WITH ACUTE
+0xFE	0x0163	#	LATIN SMALL LETTER T WITH CEDILLA
+0xFF	0x02D9	#	DOT ABOVE
diff --git a/Unicode/8859_3.cp b/Unicode/8859_3.cp
index 6e4ce0d86..60b0176f2 100644
--- a/Unicode/8859_3.cp
+++ b/Unicode/8859_3.cp
@@ -1,5 +1,17 @@
 ISO 8859-3
 "ISO-8859-3", "8859-3", "ISO_8859-3:1988", "iso-ir-109", "ISO_8859-3", "latin3", "l3", "csISOLatin3", "ISO8859-3", "ISO8859_3"
+
+# ----------------------------------------------------------------------
+# The following data was downloaded from
+# http://www.unicode.org/Public/MAPPINGS/ISO8859/DatedVersions/8859-3-1999.TXT
+# on 2008-10-05, so it is a Unicode Data File covered by the Unicode
+# copyright and permission notice in the COPYING file of ELinks,
+# regardless of any terms shown below.
+#
+# This file differs from the original in the following ways:
+# - Added this comment, blank lines around it, and charset names above it.
+# ----------------------------------------------------------------------
+
 #
 #	Name:             ISO/IEC 8859-3:1999 to Unicode
 #	Unicode version:  3.0
diff --git a/Unicode/8859_4.cp b/Unicode/8859_4.cp
index dcdcb67e3..e6c2fa829 100644
--- a/Unicode/8859_4.cp
+++ b/Unicode/8859_4.cp
@@ -1,133 +1,317 @@
 ISO 8859-4
 "ISO-8859-4", "iso8859-4", "8859-4", "iso-ir-110", "latin4", "l4", "il4", "ISO_8859-4:1988", "ISO_8859-4", "csISOLatin4", "ISO8859_4"
 
-0x20-0x7e       idem
+# ----------------------------------------------------------------------
+# The following data was downloaded from
+# http://www.unicode.org/Public/MAPPINGS/ISO8859/DatedVersions/8859-4-1998.TXT
+# on 2008-10-05, so it is a Unicode Data File covered by the Unicode
+# copyright and permission notice in the COPYING file of ELinks,
+# regardless of any terms shown below.
 #
-0x80	0x0080	#PADDING CHARACTER (PAD)
-0x81	0x0081	#HIGH OCTET PRESET (HOP)
-0x82	0x0082	#BREAK PERMITTED HERE (BPH)
-0x83	0x0083	#NO BREAK HERE (NBH)
-0x84	0x0084	#INDEX (IND)
-0x85	0x0085	#NEXT LINE (NEL)
-0x86	0x0086	#START OF SELECTED AREA (SSA)
-0x87	0x0087	#END OF SELECTED AREA (ESA)
-0x88	0x0088	#CHARACTER TABULATION SET (HTS)
-0x89	0x0089	#CHARACTER TABULATION WITH JUSTIFICATION (HTJ)
-0x8A	0x008A	#LINE TABULATION SET (VTS)
-0x8B	0x008B	#PARTIAL LINE FORWARD (PLD)
-0x8C	0x008C	#PARTIAL LINE BACKWARD (PLU)
-0x8D	0x008D	#REVERSE LINE FEED (RI)
-0x8E	0x008E	#SINGLE-SHIFT TWO (SS2)
-0x8F	0x008F	#SINGLE-SHIFT THREE (SS3)
-0x90	0x0090	#DEVICE CONTROL STRING (DCS)
-0x91	0x0091	#PRIVATE USE ONE (PU1)
-0x92	0x0092	#PRIVATE USE TWO (PU2)
-0x93	0x0093	#SET TRANSMIT STATE (STS)
-0x94	0x0094	#CANCEL CHARACTER (CCH)
-0x95	0x0095	#MESSAGE WAITING (MW)
-0x96	0x0096	#START OF GUARDED AREA (SPA)
-0x97	0x0097	#END OF GUARDED AREA (EPA)
-0x98	0x0098	#START OF STRING (SOS)
-0x99	0x0099	#SINGLE GRAPHIC CHARACTER INTRODUCER (SGCI)
-0x9A	0x009A	#SINGLE CHARACTER INTRODUCER (SCI)
-0x9B	0x009B	#CONTROL SEQUENCE INTRODUCER (CSI)
-0x9C	0x009C	#STRING TERMINATOR (ST)
-0x9D	0x009D	#OPERATING SYSTEM COMMAND (OSC)
-0x9E	0x009E	#PRIVACY MESSAGE (PM)
-0x9F	0x009F	#APPLICATION PROGRAM COMMAND (APC)
-0xA0	0x00A0	#NO-BREAK SPACE
-0xA1	0x0104	#LATIN CAPITAL LETTER A WITH OGONEK
-0xA2	0x0138	#LATIN SMALL LETTER KRA (Greenlandic)
-0xA3	0x0156	#LATIN CAPITAL LETTER R WITH CEDILLA
-0xA4	0x00A4	#CURRENCY SIGN
-0xA5	0x0128	#LATIN CAPITAL LETTER I WITH TILDE
-0xA6	0x013B	#LATIN CAPITAL LETTER L WITH CEDILLA
-0xA7	0x00A7	#SECTION SIGN
-0xA8	0x00A8	#DIAERESIS
-0xA9	0x0160	#LATIN CAPITAL LETTER S WITH CARON
-0xAA	0x0112	#LATIN CAPITAL LETTER E WITH MACRON
-0xAB	0x0122	#LATIN CAPITAL LETTER G WITH CEDILLA
-0xAC	0x0166	#LATIN CAPITAL LETTER T WITH STROKE
-0xAD	0x00AD	#SOFT HYPHEN
-0xAE	0x017D	#LATIN CAPITAL LETTER Z WITH CARON
-0xAF	0x00AF	#MACRON
-0xB0	0x00B0	#DEGREE SIGN
-0xB1	0x0105	#LATIN SMALL LETTER A WITH OGONEK
-0xB2	0x02DB	#OGONEK
-0xB3	0x0157	#LATIN SMALL LETTER R WITH CEDILLA
-0xB4	0x00B4	#ACUTE ACCENT
-0xB5	0x0129	#LATIN SMALL LETTER I WITH TILDE
-0xB6	0x013C	#LATIN SMALL LETTER L WITH CEDILLA
-0xB7	0x02C7	#CARON (Mandarin Chinese third tone)
-0xB8	0x00B8	#CEDILLA
-0xB9	0x0161	#LATIN SMALL LETTER S WITH CARON
-0xBA	0x0113	#LATIN SMALL LETTER E WITH MACRON
-0xBB	0x0123	#LATIN SMALL LETTER G WITH CEDILLA
-0xBC	0x0167	#LATIN SMALL LETTER T WITH STROKE
-0xBD	0x014A	#LATIN CAPITAL LETTER ENG (Sami)
-0xBE	0x017E	#LATIN SMALL LETTER Z WITH CARON
-0xBF	0x014B	#LATIN SMALL LETTER ENG (Sami)
-0xC0	0x0100	#LATIN CAPITAL LETTER A WITH MACRON
-0xC1	0x00C1	#LATIN CAPITAL LETTER A WITH ACUTE
-0xC2	0x00C2	#LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-0xC3	0x00C3	#LATIN CAPITAL LETTER A WITH TILDE
-0xC4	0x00C4	#LATIN CAPITAL LETTER A WITH DIAERESIS
-0xC5	0x00C5	#LATIN CAPITAL LETTER A WITH RING ABOVE
-0xC6	0x00C6	#LATIN CAPITAL LETTER AE
-0xC7	0x012E	#LATIN CAPITAL LETTER I WITH OGONEK
-0xC8	0x010C	#LATIN CAPITAL LETTER C WITH CARON
-0xC9	0x00C9	#LATIN CAPITAL LETTER E WITH ACUTE
-0xCA	0x0118	#LATIN CAPITAL LETTER E WITH OGONEK
-0xCB	0x00CB	#LATIN CAPITAL LETTER E WITH DIAERESIS
-0xCC	0x0116	#LATIN CAPITAL LETTER E WITH DOT ABOVE
-0xCD	0x00CD	#LATIN CAPITAL LETTER I WITH ACUTE
-0xCE	0x00CE	#LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-0xCF	0x012A	#LATIN CAPITAL LETTER I WITH MACRON
-0xD0	0x0110	#LATIN CAPITAL LETTER D WITH STROKE
-0xD1	0x0145	#LATIN CAPITAL LETTER N WITH CEDILLA
-0xD2	0x014C	#LATIN CAPITAL LETTER O WITH MACRON
-0xD3	0x0136	#LATIN CAPITAL LETTER K WITH CEDILLA
-0xD4	0x00D4	#LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-0xD5	0x00D5	#LATIN CAPITAL LETTER O WITH TILDE
-0xD6	0x00D6	#LATIN CAPITAL LETTER O WITH DIAERESIS
-0xD7	0x00D7	#MULTIPLICATION SIGN
-0xD8	0x00D8	#LATIN CAPITAL LETTER O WITH STROKE
-0xD9	0x0172	#LATIN CAPITAL LETTER U WITH OGONEK
-0xDA	0x00DA	#LATIN CAPITAL LETTER U WITH ACUTE
-0xDB	0x00DB	#LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-0xDC	0x00DC	#LATIN CAPITAL LETTER U WITH DIAERESIS
-0xDD	0x0168	#LATIN CAPITAL LETTER U WITH TILDE
-0xDE	0x016A	#LATIN CAPITAL LETTER U WITH MACRON
-0xDF	0x00DF	#LATIN SMALL LETTER SHARP S (German)
-0xE0	0x0101	#LATIN SMALL LETTER A WITH MACRON
-0xE1	0x00E1	#LATIN SMALL LETTER A WITH ACUTE
-0xE2	0x00E2	#LATIN SMALL LETTER A WITH CIRCUMFLEX
-0xE3	0x00E3	#LATIN SMALL LETTER A WITH TILDE
-0xE4	0x00E4	#LATIN SMALL LETTER A WITH DIAERESIS
-0xE5	0x00E5	#LATIN SMALL LETTER A WITH RING ABOVE
-0xE6	0x00E6	#LATIN SMALL LETTER AE
-0xE7	0x012F	#LATIN SMALL LETTER I WITH OGONEK
-0xE8	0x010D	#LATIN SMALL LETTER C WITH CARON
-0xE9	0x00E9	#LATIN SMALL LETTER E WITH ACUTE
-0xEA	0x0119	#LATIN SMALL LETTER E WITH OGONEK
-0xEB	0x00EB	#LATIN SMALL LETTER E WITH DIAERESIS
-0xEC	0x0117	#LATIN SMALL LETTER E WITH DOT ABOVE
-0xED	0x00ED	#LATIN SMALL LETTER I WITH ACUTE
-0xEE	0x00EE	#LATIN SMALL LETTER I WITH CIRCUMFLEX
-0xEF	0x012B	#LATIN SMALL LETTER I WITH MACRON
-0xF0	0x0111	#LATIN SMALL LETTER D WITH STROKE
-0xF1	0x0146	#LATIN SMALL LETTER N WITH CEDILLA
-0xF2	0x014D	#LATIN SMALL LETTER O WITH MACRON
-0xF3	0x0137	#LATIN SMALL LETTER K WITH CEDILLA
-0xF4	0x00F4	#LATIN SMALL LETTER O WITH CIRCUMFLEX
-0xF5	0x00F5	#LATIN SMALL LETTER O WITH TILDE
-0xF6	0x00F6	#LATIN SMALL LETTER O WITH DIAERESIS
-0xF7	0x00F7	#DIVISION SIGN
-0xF8	0x00F8	#LATIN SMALL LETTER O WITH STROKE
-0xF9	0x0173	#LATIN SMALL LETTER U WITH OGONEK
-0xFA	0x00FA	#LATIN SMALL LETTER U WITH ACUTE
-0xFB	0x00FB	#LATIN SMALL LETTER U WITH CIRCUMFLEX
-0xFC	0x00FC	#LATIN SMALL LETTER U WITH DIAERESIS
-0xFD	0x0169	#LATIN SMALL LETTER U WITH TILDE
-0xFE	0x016B	#LATIN SMALL LETTER U WITH MACRON
-0xFF	0x02D9	#DOT ABOVE (Mandarin Chinese light tone)
+# This file differs from the original in the following ways:
+# - Added this comment, blank lines around it, and charset names above it.
+# ----------------------------------------------------------------------
+
+#
+#	Name:             ISO/IEC 8859-4:1998 to Unicode
+#	Unicode version:  3.0
+#	Table version:    1.0
+#	Table format:     Format A
+#	Date:             1999 July 27
+#	Authors:          Ken Whistler <kenw@sybase.com>
+#
+#	Copyright (c) 1991-1999 Unicode, Inc.  All Rights reserved.
+#
+#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#	No claims are made as to fitness for any particular purpose.  No
+#	warranties of any kind are expressed or implied.  The recipient
+#	agrees to determine applicability of information provided.  If this
+#	file has been provided on optical media by Unicode, Inc., the sole
+#	remedy for any claim will be exchange of defective media within 90
+#	days of receipt.
+#
+#	Unicode, Inc. hereby grants the right to freely use the information
+#	supplied in this file in the creation of products supporting the
+#	Unicode Standard, and to make copies of this file in any form for
+#	internal or external distribution as long as this notice remains
+#	attached.
+#
+#	General notes:
+#
+#	This table contains the data the Unicode Consortium has on how
+#       ISO/IEC 8859-4:1998 characters map into Unicode.
+#
+#	Format:  Three tab-separated columns
+#		 Column #1 is the ISO/IEC 8859-4 code (in hex as 0xXX)
+#		 Column #2 is the Unicode (in hex as 0xXXXX)
+#		 Column #3 the Unicode name (follows a comment sign, '#')
+#
+#	The entries are in ISO/IEC 8859-4 order.
+#
+#	Version history
+#	1.0 version updates 0.1 version by adding mappings for all
+#	control characters.
+#
+#	Updated versions of this file may be found in:
+#		<ftp://ftp.unicode.org/Public/MAPPINGS/>
+#
+#	Any comments or problems, contact <errata@unicode.org>
+#	Please note that <errata@unicode.org> is an archival address;
+#	notices will be checked, but do not expect an immediate response.
+#
+0x00	0x0000	#	NULL
+0x01	0x0001	#	START OF HEADING
+0x02	0x0002	#	START OF TEXT
+0x03	0x0003	#	END OF TEXT
+0x04	0x0004	#	END OF TRANSMISSION
+0x05	0x0005	#	ENQUIRY
+0x06	0x0006	#	ACKNOWLEDGE
+0x07	0x0007	#	BELL
+0x08	0x0008	#	BACKSPACE
+0x09	0x0009	#	HORIZONTAL TABULATION
+0x0A	0x000A	#	LINE FEED
+0x0B	0x000B	#	VERTICAL TABULATION
+0x0C	0x000C	#	FORM FEED
+0x0D	0x000D	#	CARRIAGE RETURN
+0x0E	0x000E	#	SHIFT OUT
+0x0F	0x000F	#	SHIFT IN
+0x10	0x0010	#	DATA LINK ESCAPE
+0x11	0x0011	#	DEVICE CONTROL ONE
+0x12	0x0012	#	DEVICE CONTROL TWO
+0x13	0x0013	#	DEVICE CONTROL THREE
+0x14	0x0014	#	DEVICE CONTROL FOUR
+0x15	0x0015	#	NEGATIVE ACKNOWLEDGE
+0x16	0x0016	#	SYNCHRONOUS IDLE
+0x17	0x0017	#	END OF TRANSMISSION BLOCK
+0x18	0x0018	#	CANCEL
+0x19	0x0019	#	END OF MEDIUM
+0x1A	0x001A	#	SUBSTITUTE
+0x1B	0x001B	#	ESCAPE
+0x1C	0x001C	#	FILE SEPARATOR
+0x1D	0x001D	#	GROUP SEPARATOR
+0x1E	0x001E	#	RECORD SEPARATOR
+0x1F	0x001F	#	UNIT SEPARATOR
+0x20	0x0020	#	SPACE
+0x21	0x0021	#	EXCLAMATION MARK
+0x22	0x0022	#	QUOTATION MARK
+0x23	0x0023	#	NUMBER SIGN
+0x24	0x0024	#	DOLLAR SIGN
+0x25	0x0025	#	PERCENT SIGN
+0x26	0x0026	#	AMPERSAND
+0x27	0x0027	#	APOSTROPHE
+0x28	0x0028	#	LEFT PARENTHESIS
+0x29	0x0029	#	RIGHT PARENTHESIS
+0x2A	0x002A	#	ASTERISK
+0x2B	0x002B	#	PLUS SIGN
+0x2C	0x002C	#	COMMA
+0x2D	0x002D	#	HYPHEN-MINUS
+0x2E	0x002E	#	FULL STOP
+0x2F	0x002F	#	SOLIDUS
+0x30	0x0030	#	DIGIT ZERO
+0x31	0x0031	#	DIGIT ONE
+0x32	0x0032	#	DIGIT TWO
+0x33	0x0033	#	DIGIT THREE
+0x34	0x0034	#	DIGIT FOUR
+0x35	0x0035	#	DIGIT FIVE
+0x36	0x0036	#	DIGIT SIX
+0x37	0x0037	#	DIGIT SEVEN
+0x38	0x0038	#	DIGIT EIGHT
+0x39	0x0039	#	DIGIT NINE
+0x3A	0x003A	#	COLON
+0x3B	0x003B	#	SEMICOLON
+0x3C	0x003C	#	LESS-THAN SIGN
+0x3D	0x003D	#	EQUALS SIGN
+0x3E	0x003E	#	GREATER-THAN SIGN
+0x3F	0x003F	#	QUESTION MARK
+0x40	0x0040	#	COMMERCIAL AT
+0x41	0x0041	#	LATIN CAPITAL LETTER A
+0x42	0x0042	#	LATIN CAPITAL LETTER B
+0x43	0x0043	#	LATIN CAPITAL LETTER C
+0x44	0x0044	#	LATIN CAPITAL LETTER D
+0x45	0x0045	#	LATIN CAPITAL LETTER E
+0x46	0x0046	#	LATIN CAPITAL LETTER F
+0x47	0x0047	#	LATIN CAPITAL LETTER G
+0x48	0x0048	#	LATIN CAPITAL LETTER H
+0x49	0x0049	#	LATIN CAPITAL LETTER I
+0x4A	0x004A	#	LATIN CAPITAL LETTER J
+0x4B	0x004B	#	LATIN CAPITAL LETTER K
+0x4C	0x004C	#	LATIN CAPITAL LETTER L
+0x4D	0x004D	#	LATIN CAPITAL LETTER M
+0x4E	0x004E	#	LATIN CAPITAL LETTER N
+0x4F	0x004F	#	LATIN CAPITAL LETTER O
+0x50	0x0050	#	LATIN CAPITAL LETTER P
+0x51	0x0051	#	LATIN CAPITAL LETTER Q
+0x52	0x0052	#	LATIN CAPITAL LETTER R
+0x53	0x0053	#	LATIN CAPITAL LETTER S
+0x54	0x0054	#	LATIN CAPITAL LETTER T
+0x55	0x0055	#	LATIN CAPITAL LETTER U
+0x56	0x0056	#	LATIN CAPITAL LETTER V
+0x57	0x0057	#	LATIN CAPITAL LETTER W
+0x58	0x0058	#	LATIN CAPITAL LETTER X
+0x59	0x0059	#	LATIN CAPITAL LETTER Y
+0x5A	0x005A	#	LATIN CAPITAL LETTER Z
+0x5B	0x005B	#	LEFT SQUARE BRACKET
+0x5C	0x005C	#	REVERSE SOLIDUS
+0x5D	0x005D	#	RIGHT SQUARE BRACKET
+0x5E	0x005E	#	CIRCUMFLEX ACCENT
+0x5F	0x005F	#	LOW LINE
+0x60	0x0060	#	GRAVE ACCENT
+0x61	0x0061	#	LATIN SMALL LETTER A
+0x62	0x0062	#	LATIN SMALL LETTER B
+0x63	0x0063	#	LATIN SMALL LETTER C
+0x64	0x0064	#	LATIN SMALL LETTER D
+0x65	0x0065	#	LATIN SMALL LETTER E
+0x66	0x0066	#	LATIN SMALL LETTER F
+0x67	0x0067	#	LATIN SMALL LETTER G
+0x68	0x0068	#	LATIN SMALL LETTER H
+0x69	0x0069	#	LATIN SMALL LETTER I
+0x6A	0x006A	#	LATIN SMALL LETTER J
+0x6B	0x006B	#	LATIN SMALL LETTER K
+0x6C	0x006C	#	LATIN SMALL LETTER L
+0x6D	0x006D	#	LATIN SMALL LETTER M
+0x6E	0x006E	#	LATIN SMALL LETTER N
+0x6F	0x006F	#	LATIN SMALL LETTER O
+0x70	0x0070	#	LATIN SMALL LETTER P
+0x71	0x0071	#	LATIN SMALL LETTER Q
+0x72	0x0072	#	LATIN SMALL LETTER R
+0x73	0x0073	#	LATIN SMALL LETTER S
+0x74	0x0074	#	LATIN SMALL LETTER T
+0x75	0x0075	#	LATIN SMALL LETTER U
+0x76	0x0076	#	LATIN SMALL LETTER V
+0x77	0x0077	#	LATIN SMALL LETTER W
+0x78	0x0078	#	LATIN SMALL LETTER X
+0x79	0x0079	#	LATIN SMALL LETTER Y
+0x7A	0x007A	#	LATIN SMALL LETTER Z
+0x7B	0x007B	#	LEFT CURLY BRACKET
+0x7C	0x007C	#	VERTICAL LINE
+0x7D	0x007D	#	RIGHT CURLY BRACKET
+0x7E	0x007E	#	TILDE
+0x7F	0x007F	#	DELETE
+0x80	0x0080	#	<control>
+0x81	0x0081	#	<control>
+0x82	0x0082	#	<control>
+0x83	0x0083	#	<control>
+0x84	0x0084	#	<control>
+0x85	0x0085	#	<control>
+0x86	0x0086	#	<control>
+0x87	0x0087	#	<control>
+0x88	0x0088	#	<control>
+0x89	0x0089	#	<control>
+0x8A	0x008A	#	<control>
+0x8B	0x008B	#	<control>
+0x8C	0x008C	#	<control>
+0x8D	0x008D	#	<control>
+0x8E	0x008E	#	<control>
+0x8F	0x008F	#	<control>
+0x90	0x0090	#	<control>
+0x91	0x0091	#	<control>
+0x92	0x0092	#	<control>
+0x93	0x0093	#	<control>
+0x94	0x0094	#	<control>
+0x95	0x0095	#	<control>
+0x96	0x0096	#	<control>
+0x97	0x0097	#	<control>
+0x98	0x0098	#	<control>
+0x99	0x0099	#	<control>
+0x9A	0x009A	#	<control>
+0x9B	0x009B	#	<control>
+0x9C	0x009C	#	<control>
+0x9D	0x009D	#	<control>
+0x9E	0x009E	#	<control>
+0x9F	0x009F	#	<control>
+0xA0	0x00A0	#	NO-BREAK SPACE
+0xA1	0x0104	#	LATIN CAPITAL LETTER A WITH OGONEK
+0xA2	0x0138	#	LATIN SMALL LETTER KRA
+0xA3	0x0156	#	LATIN CAPITAL LETTER R WITH CEDILLA
+0xA4	0x00A4	#	CURRENCY SIGN
+0xA5	0x0128	#	LATIN CAPITAL LETTER I WITH TILDE
+0xA6	0x013B	#	LATIN CAPITAL LETTER L WITH CEDILLA
+0xA7	0x00A7	#	SECTION SIGN
+0xA8	0x00A8	#	DIAERESIS
+0xA9	0x0160	#	LATIN CAPITAL LETTER S WITH CARON
+0xAA	0x0112	#	LATIN CAPITAL LETTER E WITH MACRON
+0xAB	0x0122	#	LATIN CAPITAL LETTER G WITH CEDILLA
+0xAC	0x0166	#	LATIN CAPITAL LETTER T WITH STROKE
+0xAD	0x00AD	#	SOFT HYPHEN
+0xAE	0x017D	#	LATIN CAPITAL LETTER Z WITH CARON
+0xAF	0x00AF	#	MACRON
+0xB0	0x00B0	#	DEGREE SIGN
+0xB1	0x0105	#	LATIN SMALL LETTER A WITH OGONEK
+0xB2	0x02DB	#	OGONEK
+0xB3	0x0157	#	LATIN SMALL LETTER R WITH CEDILLA
+0xB4	0x00B4	#	ACUTE ACCENT
+0xB5	0x0129	#	LATIN SMALL LETTER I WITH TILDE
+0xB6	0x013C	#	LATIN SMALL LETTER L WITH CEDILLA
+0xB7	0x02C7	#	CARON
+0xB8	0x00B8	#	CEDILLA
+0xB9	0x0161	#	LATIN SMALL LETTER S WITH CARON
+0xBA	0x0113	#	LATIN SMALL LETTER E WITH MACRON
+0xBB	0x0123	#	LATIN SMALL LETTER G WITH CEDILLA
+0xBC	0x0167	#	LATIN SMALL LETTER T WITH STROKE
+0xBD	0x014A	#	LATIN CAPITAL LETTER ENG
+0xBE	0x017E	#	LATIN SMALL LETTER Z WITH CARON
+0xBF	0x014B	#	LATIN SMALL LETTER ENG
+0xC0	0x0100	#	LATIN CAPITAL LETTER A WITH MACRON
+0xC1	0x00C1	#	LATIN CAPITAL LETTER A WITH ACUTE
+0xC2	0x00C2	#	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+0xC3	0x00C3	#	LATIN CAPITAL LETTER A WITH TILDE
+0xC4	0x00C4	#	LATIN CAPITAL LETTER A WITH DIAERESIS
+0xC5	0x00C5	#	LATIN CAPITAL LETTER A WITH RING ABOVE
+0xC6	0x00C6	#	LATIN CAPITAL LETTER AE
+0xC7	0x012E	#	LATIN CAPITAL LETTER I WITH OGONEK
+0xC8	0x010C	#	LATIN CAPITAL LETTER C WITH CARON
+0xC9	0x00C9	#	LATIN CAPITAL LETTER E WITH ACUTE
+0xCA	0x0118	#	LATIN CAPITAL LETTER E WITH OGONEK
+0xCB	0x00CB	#	LATIN CAPITAL LETTER E WITH DIAERESIS
+0xCC	0x0116	#	LATIN CAPITAL LETTER E WITH DOT ABOVE
+0xCD	0x00CD	#	LATIN CAPITAL LETTER I WITH ACUTE
+0xCE	0x00CE	#	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+0xCF	0x012A	#	LATIN CAPITAL LETTER I WITH MACRON
+0xD0	0x0110	#	LATIN CAPITAL LETTER D WITH STROKE
+0xD1	0x0145	#	LATIN CAPITAL LETTER N WITH CEDILLA
+0xD2	0x014C	#	LATIN CAPITAL LETTER O WITH MACRON
+0xD3	0x0136	#	LATIN CAPITAL LETTER K WITH CEDILLA
+0xD4	0x00D4	#	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+0xD5	0x00D5	#	LATIN CAPITAL LETTER O WITH TILDE
+0xD6	0x00D6	#	LATIN CAPITAL LETTER O WITH DIAERESIS
+0xD7	0x00D7	#	MULTIPLICATION SIGN
+0xD8	0x00D8	#	LATIN CAPITAL LETTER O WITH STROKE
+0xD9	0x0172	#	LATIN CAPITAL LETTER U WITH OGONEK
+0xDA	0x00DA	#	LATIN CAPITAL LETTER U WITH ACUTE
+0xDB	0x00DB	#	LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+0xDC	0x00DC	#	LATIN CAPITAL LETTER U WITH DIAERESIS
+0xDD	0x0168	#	LATIN CAPITAL LETTER U WITH TILDE
+0xDE	0x016A	#	LATIN CAPITAL LETTER U WITH MACRON
+0xDF	0x00DF	#	LATIN SMALL LETTER SHARP S
+0xE0	0x0101	#	LATIN SMALL LETTER A WITH MACRON
+0xE1	0x00E1	#	LATIN SMALL LETTER A WITH ACUTE
+0xE2	0x00E2	#	LATIN SMALL LETTER A WITH CIRCUMFLEX
+0xE3	0x00E3	#	LATIN SMALL LETTER A WITH TILDE
+0xE4	0x00E4	#	LATIN SMALL LETTER A WITH DIAERESIS
+0xE5	0x00E5	#	LATIN SMALL LETTER A WITH RING ABOVE
+0xE6	0x00E6	#	LATIN SMALL LETTER AE
+0xE7	0x012F	#	LATIN SMALL LETTER I WITH OGONEK
+0xE8	0x010D	#	LATIN SMALL LETTER C WITH CARON
+0xE9	0x00E9	#	LATIN SMALL LETTER E WITH ACUTE
+0xEA	0x0119	#	LATIN SMALL LETTER E WITH OGONEK
+0xEB	0x00EB	#	LATIN SMALL LETTER E WITH DIAERESIS
+0xEC	0x0117	#	LATIN SMALL LETTER E WITH DOT ABOVE
+0xED	0x00ED	#	LATIN SMALL LETTER I WITH ACUTE
+0xEE	0x00EE	#	LATIN SMALL LETTER I WITH CIRCUMFLEX
+0xEF	0x012B	#	LATIN SMALL LETTER I WITH MACRON
+0xF0	0x0111	#	LATIN SMALL LETTER D WITH STROKE
+0xF1	0x0146	#	LATIN SMALL LETTER N WITH CEDILLA
+0xF2	0x014D	#	LATIN SMALL LETTER O WITH MACRON
+0xF3	0x0137	#	LATIN SMALL LETTER K WITH CEDILLA
+0xF4	0x00F4	#	LATIN SMALL LETTER O WITH CIRCUMFLEX
+0xF5	0x00F5	#	LATIN SMALL LETTER O WITH TILDE
+0xF6	0x00F6	#	LATIN SMALL LETTER O WITH DIAERESIS
+0xF7	0x00F7	#	DIVISION SIGN
+0xF8	0x00F8	#	LATIN SMALL LETTER O WITH STROKE
+0xF9	0x0173	#	LATIN SMALL LETTER U WITH OGONEK
+0xFA	0x00FA	#	LATIN SMALL LETTER U WITH ACUTE
+0xFB	0x00FB	#	LATIN SMALL LETTER U WITH CIRCUMFLEX
+0xFC	0x00FC	#	LATIN SMALL LETTER U WITH DIAERESIS
+0xFD	0x0169	#	LATIN SMALL LETTER U WITH TILDE
+0xFE	0x016B	#	LATIN SMALL LETTER U WITH MACRON
+0xFF	0x02D9	#	DOT ABOVE
diff --git a/Unicode/8859_5.cp b/Unicode/8859_5.cp
index f168ce28e..fc0d30f11 100644
--- a/Unicode/8859_5.cp
+++ b/Unicode/8859_5.cp
@@ -1,5 +1,17 @@
 ISO 8859-5
 "ISO-8859-5", "iso8859-5", "8859-5", "ISO_8859-5:1988", "iso-ir-144", "ISO_8859-5", "cyrillic", "csISOLatinCyrillic", "ISO8859_5"
+
+# ----------------------------------------------------------------------
+# The following data was downloaded from
+# http://www.unicode.org/Public/MAPPINGS/ISO8859/DatedVersions/8859-5-1999.TXT
+# on 2008-10-05, so it is a Unicode Data File covered by the Unicode
+# copyright and permission notice in the COPYING file of ELinks,
+# regardless of any terms shown below.
+#
+# This file differs from the original in the following ways:
+# - Added this comment, blank lines around it, and charset names above it.
+# ----------------------------------------------------------------------
+
 #
 #	Name:             ISO 8859-5:1999 to Unicode
 #	Unicode version:  3.0
diff --git a/Unicode/8859_6.cp b/Unicode/8859_6.cp
index 214f5becb..6990063eb 100644
--- a/Unicode/8859_6.cp
+++ b/Unicode/8859_6.cp
@@ -1,5 +1,17 @@
 ISO 8859-6
 "ISO-8859-6", "8859-6", "ISO_8859-6", "ISO_8859-6:1987", "ISO-IR-127", "ECMA-114", "ASMO-708", "ARABIC", "csISOLatinArabic", "ISO8859-6", "ISO8859_6"
+
+# ----------------------------------------------------------------------
+# The following data was downloaded from
+# http://www.unicode.org/Public/MAPPINGS/ISO8859/DatedVersions/8859-6-1999.TXT
+# on 2008-10-05, so it is a Unicode Data File covered by the Unicode
+# copyright and permission notice in the COPYING file of ELinks,
+# regardless of any terms shown below.
+#
+# This file differs from the original in the following ways:
+# - Added this comment, blank lines around it, and charset names above it.
+# ----------------------------------------------------------------------
+
 #
 #	Name:             ISO 8859-6:1999 to Unicode
 #	Unicode version:  3.0
diff --git a/Unicode/8859_7.cp b/Unicode/8859_7.cp
index 6d245db23..6c4154adc 100644
--- a/Unicode/8859_7.cp
+++ b/Unicode/8859_7.cp
@@ -1,14 +1,26 @@
 ISO 8859-7
 "ISO-8859-7", "iso8859-7", "8859-7", "iso-ir-126", "elot-928", "ISO_8859-7:1987", "ECMA-118", "ELOT_928", "GREEK8", "GREEK", "csISOLatinGreek", "ISO8859_7"
+
+# ----------------------------------------------------------------------
+# The following data was downloaded from
+# http://www.unicode.org/Public/MAPPINGS/ISO8859/DatedVersions/8859-7-2003.txt
+# on 2008-10-07, so it is a Unicode Data File covered by the Unicode
+# copyright and permission notice in the COPYING file of ELinks,
+# regardless of any terms shown below.
 #
-#	Name:             ISO 8859-7:1987 to Unicode
-#	Unicode version:  3.0
-#	Table version:    1.0
+# This file differs from the original in the following ways:
+# - Added this comment, blank lines around it, and charset names above it.
+# ----------------------------------------------------------------------
+
+#
+#	Name:             ISO 8859-7:2003 to Unicode
+#	Unicode version:  4.0
+#	Table version:    2.0
 #	Table format:     Format A
-#	Date:             1999 July 27
+#	Date:             2003-Nov-12
 #	Authors:          Ken Whistler <kenw@sybase.com>
 #
-#	Copyright (c) 1991-1999 Unicode, Inc.  All Rights reserved.
+#	Copyright (c) 1991-2003 Unicode, Inc.  All Rights reserved.
 #
 #	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
 #	No claims are made as to fitness for any particular purpose.  No
@@ -27,10 +39,11 @@ ISO 8859-7
 #	General notes:
 #
 #	This table contains the data the Unicode Consortium has on how
-#       ISO 8859-7:1987 characters map into Unicode.
+#       ISO 8859-7:2003 characters map into Unicode.
 #
 #	ISO 8859-7:1987 is equivalent to ISO-IR-126, ELOT 928,
-#	and ECMA 118.
+#	and ECMA 118. ISO 8859-7:2003 adds two currency signs 
+#	and one other character not in the earlier standard.
 #
 #	Format:  Three tab-separated columns
 #		 Column #1 is the ISO 8859-7 code (in hex as 0xXX)
@@ -45,12 +58,14 @@ ISO 8859-7
 #	Remap 0xA1 to U+2018 (instead of 0x02BD) to match text of 8859-7
 #	Remap 0xA2 to U+2019 (instead of 0x02BC) to match text of 8859-7
 #
-#	Updated versions of this file may be found in:
-#		<ftp://ftp.unicode.org/Public/MAPPINGS/>
+#	2.0 version updates 1.0 version by adding mappings for the
+#	three newly added characters 0xA4, 0xA5, 0xAA.
 #
-#	Any comments or problems, contact <errata@unicode.org>
-#	Please note that <errata@unicode.org> is an archival address;
-#	notices will be checked, but do not expect an immediate response.
+#	Updated versions of this file may be found in:
+#		<http://www.unicode.org/Public/MAPPINGS/>
+#
+#	Any comments or problems, contact the Unicode Consortium at:
+#	        <http://www.unicode.org/reporting.html>
 #
 0x00	0x0000	#	NULL
 0x01	0x0001	#	START OF HEADING
@@ -216,10 +231,13 @@ ISO 8859-7
 0xA1	0x2018	#	LEFT SINGLE QUOTATION MARK
 0xA2	0x2019	#	RIGHT SINGLE QUOTATION MARK
 0xA3	0x00A3	#	POUND SIGN
+0xA4	0x20AC	#	EURO SIGN
+0xA5	0x20AF	#	DRACHMA SIGN
 0xA6	0x00A6	#	BROKEN BAR
 0xA7	0x00A7	#	SECTION SIGN
 0xA8	0x00A8	#	DIAERESIS
 0xA9	0x00A9	#	COPYRIGHT SIGN
+0xAA	0x037A	#	GREEK YPOGEGRAMMENI
 0xAB	0x00AB	#	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
 0xAC	0x00AC	#	NOT SIGN
 0xAD	0x00AD	#	SOFT HYPHEN
diff --git a/Unicode/8859_8.cp b/Unicode/8859_8.cp
index dc2def8a1..a674004a2 100644
--- a/Unicode/8859_8.cp
+++ b/Unicode/8859_8.cp
@@ -1,5 +1,17 @@
 ISO 8859-8
 "ISO-8859-8", "8859-8", "ISO_8859-8:1988", "ISO-IR-138", "HEBREW", "csISOLatinHebrew", "ISO8859-8", "ISO8859_8"
+
+# ----------------------------------------------------------------------
+# The following data was downloaded from
+# http://www.unicode.org/Public/MAPPINGS/ISO8859/DatedVersions/8859-8-1999.TXT
+# on 2008-10-05, so it is a Unicode Data File covered by the Unicode
+# copyright and permission notice in the COPYING file of ELinks,
+# regardless of any terms shown below.
+#
+# This file differs from the original in the following ways:
+# - Added this comment, blank lines around it, and charset names above it.
+# ----------------------------------------------------------------------
+
 #
 #	Name:             ISO/IEC 8859-8:1999 to Unicode
 #	Unicode version:  3.0
diff --git a/Unicode/8859_9.cp b/Unicode/8859_9.cp
index e37d1b06a..006aa00c6 100644
--- a/Unicode/8859_9.cp
+++ b/Unicode/8859_9.cp
@@ -1,5 +1,17 @@
 ISO 8859-9
 "ISO-8859-9", "iso8859-9", "8859-9", "ISO_8859-9:1989", "ISO-IR-148", "LATIN5", "L5", "csISOLatin5", "ISO8859_9"
+
+# ----------------------------------------------------------------------
+# The following data was downloaded from
+# http://www.unicode.org/Public/MAPPINGS/ISO8859/DatedVersions/8859-9-1999.TXT
+# on 2008-10-05, so it is a Unicode Data File covered by the Unicode
+# copyright and permission notice in the COPYING file of ELinks,
+# regardless of any terms shown below.
+#
+# This file differs from the original in the following ways:
+# - Added this comment, blank lines around it, and charset names above it.
+# ----------------------------------------------------------------------
+
 #
 #	Name:             ISO/IEC 8859-9:1999 to Unicode
 #	Unicode version:  3.0
diff --git a/Unicode/cp1250.cp b/Unicode/cp1250.cp
index dee634715..127b4361d 100644
--- a/Unicode/cp1250.cp
+++ b/Unicode/cp1250.cp
@@ -1,5 +1,17 @@
 Window$ 1250
 "windows-1250", "windows1250", "1250", "cp1250", "MS-EE"
+
+# ----------------------------------------------------------------------
+# The following data was downloaded from
+# http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP1250.TXT
+# on 2008-10-05, so it is a Unicode Data File covered by the Unicode
+# copyright and permission notice in the COPYING file of ELinks,
+# regardless of any terms shown below.
+#
+# This file differs from the original in the following ways:
+# - Added this comment, blank lines around it, and charset names above it.
+# ----------------------------------------------------------------------
+
 #
 #    Name:     cp1250 to Unicode table
 #    Unicode version: 2.0
@@ -7,7 +19,7 @@ Window$ 1250
 #    Table format:  Format A
 #    Date:          04/15/98
 #
-#    Contact:       cpxlate@microsoft.com
+#    Contact:       Shawn.Steele@microsoft.com
 #
 #    General notes: none
 #
diff --git a/Unicode/cp1251.cp b/Unicode/cp1251.cp
index 6837c5509..ab436fa13 100644
--- a/Unicode/cp1251.cp
+++ b/Unicode/cp1251.cp
@@ -1,225 +1,288 @@
 Window$ 1251
 "windows-1251", "windows1251", "1251", "cp1251", "MS-CYRL"
 
-0x20	0x0020	# SPACE
-0x21	0x0021	# EXCLAMATION MARK
-0x22	0x0022	# QUOTATION MARK
-0x23	0x0023	# NUMBER SIGN
-0x24	0x0024	# DOLLAR SIGN
-0x25	0x0025	# PERCENT SIGN
-0x26	0x0026	# AMPERSAND
-0x27	0x0027	# APOSTROPHE
-0x28	0x0028	# LEFT PARENTHESIS
-0x29	0x0029	# RIGHT PARENTHESIS
-0x2A	0x002A	# ASTERISK
-0x2B	0x002B	# PLUS SIGN
-0x2C	0x002C	# COMMA
-0x2D	0x002D	# HYPHEN-MINUS
-0x2E	0x002E	# FULL STOP
-0x2F	0x002F	# SOLIDUS
-0x30	0x0030	# DIGIT ZERO
-0x31	0x0031	# DIGIT ONE
-0x32	0x0032	# DIGIT TWO
-0x33	0x0033	# DIGIT THREE
-0x34	0x0034	# DIGIT FOUR
-0x35	0x0035	# DIGIT FIVE
-0x36	0x0036	# DIGIT SIX
-0x37	0x0037	# DIGIT SEVEN
-0x38	0x0038	# DIGIT EIGHT
-0x39	0x0039	# DIGIT NINE
-0x3A	0x003A	# COLON
-0x3B	0x003B	# SEMICOLON
-0x3C	0x003C	# LESS-THAN SIGN
-0x3D	0x003D	# EQUALS SIGN
-0x3E	0x003E	# GREATER-THAN SIGN
-0x3F	0x003F	# QUESTION MARK
-0x40	0x0040	# COMMERCIAL AT
-0x41	0x0041	# LATIN CAPITAL LETTER A
-0x42	0x0042	# LATIN CAPITAL LETTER B
-0x43	0x0043	# LATIN CAPITAL LETTER C
-0x44	0x0044	# LATIN CAPITAL LETTER D
-0x45	0x0045	# LATIN CAPITAL LETTER E
-0x46	0x0046	# LATIN CAPITAL LETTER F
-0x47	0x0047	# LATIN CAPITAL LETTER G
-0x48	0x0048	# LATIN CAPITAL LETTER H
-0x49	0x0049	# LATIN CAPITAL LETTER I
-0x4A	0x004A	# LATIN CAPITAL LETTER J
-0x4B	0x004B	# LATIN CAPITAL LETTER K
-0x4C	0x004C	# LATIN CAPITAL LETTER L
-0x4D	0x004D	# LATIN CAPITAL LETTER M
-0x4E	0x004E	# LATIN CAPITAL LETTER N
-0x4F	0x004F	# LATIN CAPITAL LETTER O
-0x50	0x0050	# LATIN CAPITAL LETTER P
-0x51	0x0051	# LATIN CAPITAL LETTER Q
-0x52	0x0052	# LATIN CAPITAL LETTER R
-0x53	0x0053	# LATIN CAPITAL LETTER S
-0x54	0x0054	# LATIN CAPITAL LETTER T
-0x55	0x0055	# LATIN CAPITAL LETTER U
-0x56	0x0056	# LATIN CAPITAL LETTER V
-0x57	0x0057	# LATIN CAPITAL LETTER W
-0x58	0x0058	# LATIN CAPITAL LETTER X
-0x59	0x0059	# LATIN CAPITAL LETTER Y
-0x5A	0x005A	# LATIN CAPITAL LETTER Z
-0x5B	0x005B	# LEFT SQUARE BRACKET
-0x5C	0x005C	# REVERSE SOLIDUS
-0x5D	0x005D	# RIGHT SQUARE BRACKET
-0x5E	0x005E	# CIRCUMFLEX ACCENT
-0x5F	0x005F	# LOW LINE
-0x60	0x0060	# GRAVE ACCENT
-0x61	0x0061	# LATIN SMALL LETTER A
-0x62	0x0062	# LATIN SMALL LETTER B
-0x63	0x0063	# LATIN SMALL LETTER C
-0x64	0x0064	# LATIN SMALL LETTER D
-0x65	0x0065	# LATIN SMALL LETTER E
-0x66	0x0066	# LATIN SMALL LETTER F
-0x67	0x0067	# LATIN SMALL LETTER G
-0x68	0x0068	# LATIN SMALL LETTER H
-0x69	0x0069	# LATIN SMALL LETTER I
-0x6A	0x006A	# LATIN SMALL LETTER J
-0x6B	0x006B	# LATIN SMALL LETTER K
-0x6C	0x006C	# LATIN SMALL LETTER L
-0x6D	0x006D	# LATIN SMALL LETTER M
-0x6E	0x006E	# LATIN SMALL LETTER N
-0x6F	0x006F	# LATIN SMALL LETTER O
-0x70	0x0070	# LATIN SMALL LETTER P
-0x71	0x0071	# LATIN SMALL LETTER Q
-0x72	0x0072	# LATIN SMALL LETTER R
-0x73	0x0073	# LATIN SMALL LETTER S
-0x74	0x0074	# LATIN SMALL LETTER T
-0x75	0x0075	# LATIN SMALL LETTER U
-0x76	0x0076	# LATIN SMALL LETTER V
-0x77	0x0077	# LATIN SMALL LETTER W
-0x78	0x0078	# LATIN SMALL LETTER X
-0x79	0x0079	# LATIN SMALL LETTER Y
-0x7A	0x007A	# LATIN SMALL LETTER Z
-0x7B	0x007B	# LEFT CURLY BRACKET
-0x7C	0x007C	# VERTICAL LINE
-0x7D	0x007D	# RIGHT CURLY BRACKET
-0x7E	0x007E	# TILDE
-0x80	0x0402	# CYRILLIC CAPITAL LETTER DJE
-0x81	0x0403	# CYRILLIC CAPITAL LETTER GJE
-0x82	0x201A	# SINGLE LOW-9 QUOTATION MARK
-0x83	0x0453	# CYRILLIC SMALL LETTER GJE
-0x84	0x201E	# DOUBLE LOW-9 QUOTATION MARK
-0x85	0x2026	# HORIZONTAL ELLIPSIS
-0x86	0x2020	# DAGGER
-0x87	0x2021	# DOUBLE DAGGER
-0x88	0x20AC	# EURO SIGN
-0x89	0x2030	# PER MILLE SIGN
-0x8A	0x0409	# CYRILLIC CAPITAL LETTER LJE
-0x8B	0x2039	# SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-0x8C	0x040A	# CYRILLIC CAPITAL LETTER NJE
-0x8D	0x040C	# CYRILLIC CAPITAL LETTER KJE
-0x8E	0x040B	# CYRILLIC CAPITAL LETTER TSHE
-0x8F	0x040F	# CYRILLIC CAPITAL LETTER DZHE
-0x90	0x0452	# CYRILLIC SMALL LETTER DJE
-0x91	0x2018	# LEFT SINGLE QUOTATION MARK
-0x92	0x2019	# RIGHT SINGLE QUOTATION MARK
-0x93	0x201C	# LEFT DOUBLE QUOTATION MARK
-0x94	0x201D	# RIGHT DOUBLE QUOTATION MARK
-0x95	0x2022	# BULLET
-0x96	0x2013	# EN DASH
-0x97	0x2014	# EM DASH
-0x99	0x2122	# TRADE MARK SIGN
-0x9A	0x0459	# CYRILLIC SMALL LETTER LJE
-0x9B	0x203A	# SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
-0x9C	0x045A	# CYRILLIC SMALL LETTER NJE
-0x9D	0x045C	# CYRILLIC SMALL LETTER KJE
-0x9E	0x045B	# CYRILLIC SMALL LETTER TSHE
-0x9F	0x045F	# CYRILLIC SMALL LETTER DZHE
-0xA0	0x00A0	# NO-BREAK SPACE
-0xA1	0x040E	# CYRILLIC CAPITAL LETTER SHORT U
-0xA2	0x045E	# CYRILLIC SMALL LETTER SHORT U
-0xA3	0x0408	# CYRILLIC CAPITAL LETTER JE
-0xA4	0x00A4	# CURRENCY SIGN
-0xA5	0x0490	# CYRILLIC CAPITAL LETTER GHE WITH UPTURN
-0xA6	0x00A6	# BROKEN BAR
-0xA7	0x00A7	# SECTION SIGN
-0xA8	0x0401	# CYRILLIC CAPITAL LETTER IO
-0xA9	0x00A9	# COPYRIGHT SIGN
-0xAA	0x0404	# CYRILLIC CAPITAL LETTER UKRAINIAN IE
-0xAB	0x00AB	# LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xAC	0x00AC	# NOT SIGN
-0xAD	0x00AD	# SOFT HYPHEN
-0xAE	0x00AE	# REGISTERED SIGN
-0xAF	0x0407	# CYRILLIC CAPITAL LETTER YI
-0xB0	0x00B0	# DEGREE SIGN
-0xB1	0x00B1	# PLUS-MINUS SIGN
-0xB2	0x0406	# CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
-0xB3	0x0456	# CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
-0xB4	0x0491	# CYRILLIC SMALL LETTER GHE WITH UPTURN
-0xB5	0x00B5	# MICRO SIGN
-0xB6	0x00B6	# PILCROW SIGN
-0xB7	0x00B7	# MIDDLE DOT
-0xB8	0x0451	# CYRILLIC SMALL LETTER IO
-0xB9	0x2116	# NUMERO SIGN
-0xBA	0x0454	# CYRILLIC SMALL LETTER UKRAINIAN IE
-0xBB	0x00BB	# RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xBC	0x0458	# CYRILLIC SMALL LETTER JE
-0xBD	0x0405	# CYRILLIC CAPITAL LETTER DZE
-0xBE	0x0455	# CYRILLIC SMALL LETTER DZE
-0xBF	0x0457	# CYRILLIC SMALL LETTER YI
-0xC0	0x0410	# CYRILLIC CAPITAL LETTER A
-0xC1	0x0411	# CYRILLIC CAPITAL LETTER BE
-0xC2	0x0412	# CYRILLIC CAPITAL LETTER VE
-0xC3	0x0413	# CYRILLIC CAPITAL LETTER GHE
-0xC4	0x0414	# CYRILLIC CAPITAL LETTER DE
-0xC5	0x0415	# CYRILLIC CAPITAL LETTER IE
-0xC6	0x0416	# CYRILLIC CAPITAL LETTER ZHE
-0xC7	0x0417	# CYRILLIC CAPITAL LETTER ZE
-0xC8	0x0418	# CYRILLIC CAPITAL LETTER I
-0xC9	0x0419	# CYRILLIC CAPITAL LETTER SHORT I
-0xCA	0x041A	# CYRILLIC CAPITAL LETTER KA
-0xCB	0x041B	# CYRILLIC CAPITAL LETTER EL
-0xCC	0x041C	# CYRILLIC CAPITAL LETTER EM
-0xCD	0x041D	# CYRILLIC CAPITAL LETTER EN
-0xCE	0x041E	# CYRILLIC CAPITAL LETTER O
-0xCF	0x041F	# CYRILLIC CAPITAL LETTER PE
-0xD0	0x0420	# CYRILLIC CAPITAL LETTER ER
-0xD1	0x0421	# CYRILLIC CAPITAL LETTER ES
-0xD2	0x0422	# CYRILLIC CAPITAL LETTER TE
-0xD3	0x0423	# CYRILLIC CAPITAL LETTER U
-0xD4	0x0424	# CYRILLIC CAPITAL LETTER EF
-0xD5	0x0425	# CYRILLIC CAPITAL LETTER HA
-0xD6	0x0426	# CYRILLIC CAPITAL LETTER TSE
-0xD7	0x0427	# CYRILLIC CAPITAL LETTER CHE
-0xD8	0x0428	# CYRILLIC CAPITAL LETTER SHA
-0xD9	0x0429	# CYRILLIC CAPITAL LETTER SHCHA
-0xDA	0x042A	# CYRILLIC CAPITAL LETTER HARD SIGN
-0xDB	0x042B	# CYRILLIC CAPITAL LETTER YERU
-0xDC	0x042C	# CYRILLIC CAPITAL LETTER SOFT SIGN
-0xDD	0x042D	# CYRILLIC CAPITAL LETTER E
-0xDE	0x042E	# CYRILLIC CAPITAL LETTER YU
-0xDF	0x042F	# CYRILLIC CAPITAL LETTER YA
-0xE0	0x0430	# CYRILLIC SMALL LETTER A
-0xE1	0x0431	# CYRILLIC SMALL LETTER BE
-0xE2	0x0432	# CYRILLIC SMALL LETTER VE
-0xE3	0x0433	# CYRILLIC SMALL LETTER GHE
-0xE4	0x0434	# CYRILLIC SMALL LETTER DE
-0xE5	0x0435	# CYRILLIC SMALL LETTER IE
-0xE6	0x0436	# CYRILLIC SMALL LETTER ZHE
-0xE7	0x0437	# CYRILLIC SMALL LETTER ZE
-0xE8	0x0438	# CYRILLIC SMALL LETTER I
-0xE9	0x0439	# CYRILLIC SMALL LETTER SHORT I
-0xEA	0x043A	# CYRILLIC SMALL LETTER KA
-0xEB	0x043B	# CYRILLIC SMALL LETTER EL
-0xEC	0x043C	# CYRILLIC SMALL LETTER EM
-0xED	0x043D	# CYRILLIC SMALL LETTER EN
-0xEE	0x043E	# CYRILLIC SMALL LETTER O
-0xEF	0x043F	# CYRILLIC SMALL LETTER PE
-0xF0	0x0440	# CYRILLIC SMALL LETTER ER
-0xF1	0x0441	# CYRILLIC SMALL LETTER ES
-0xF2	0x0442	# CYRILLIC SMALL LETTER TE
-0xF3	0x0443	# CYRILLIC SMALL LETTER U
-0xF4	0x0444	# CYRILLIC SMALL LETTER EF
-0xF5	0x0445	# CYRILLIC SMALL LETTER HA
-0xF6	0x0446	# CYRILLIC SMALL LETTER TSE
-0xF7	0x0447	# CYRILLIC SMALL LETTER CHE
-0xF8	0x0448	# CYRILLIC SMALL LETTER SHA
-0xF9	0x0449	# CYRILLIC SMALL LETTER SHCHA
-0xFA	0x044A	# CYRILLIC SMALL LETTER HARD SIGN
-0xFB	0x044B	# CYRILLIC SMALL LETTER YERU
-0xFC	0x044C	# CYRILLIC SMALL LETTER SOFT SIGN
-0xFD	0x044D	# CYRILLIC SMALL LETTER E
-0xFE	0x044E	# CYRILLIC SMALL LETTER YU
-0xFF	0x044F	# CYRILLIC SMALL LETTER YA
+# ----------------------------------------------------------------------
+# The following data was downloaded from
+# http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP1251.TXT
+# on 2008-10-05, so it is a Unicode Data File covered by the Unicode
+# copyright and permission notice in the COPYING file of ELinks,
+# regardless of any terms shown below.
+#
+# This file differs from the original in the following ways:
+# - Added this comment, blank lines around it, and charset names above it.
+# ----------------------------------------------------------------------
+
+#
+#    Name:     cp1251 to Unicode table
+#    Unicode version: 2.0
+#    Table version: 2.01
+#    Table format:  Format A
+#    Date:          04/15/98
+#
+#    Contact:       Shawn.Steele@microsoft.com
+#
+#    General notes: none
+#
+#    Format: Three tab-separated columns
+#        Column #1 is the cp1251 code (in hex)
+#        Column #2 is the Unicode (in hex as 0xXXXX)
+#        Column #3 is the Unicode name (follows a comment sign, '#')
+#
+#    The entries are in cp1251 order
+#
+0x00	0x0000	#NULL
+0x01	0x0001	#START OF HEADING
+0x02	0x0002	#START OF TEXT
+0x03	0x0003	#END OF TEXT
+0x04	0x0004	#END OF TRANSMISSION
+0x05	0x0005	#ENQUIRY
+0x06	0x0006	#ACKNOWLEDGE
+0x07	0x0007	#BELL
+0x08	0x0008	#BACKSPACE
+0x09	0x0009	#HORIZONTAL TABULATION
+0x0A	0x000A	#LINE FEED
+0x0B	0x000B	#VERTICAL TABULATION
+0x0C	0x000C	#FORM FEED
+0x0D	0x000D	#CARRIAGE RETURN
+0x0E	0x000E	#SHIFT OUT
+0x0F	0x000F	#SHIFT IN
+0x10	0x0010	#DATA LINK ESCAPE
+0x11	0x0011	#DEVICE CONTROL ONE
+0x12	0x0012	#DEVICE CONTROL TWO
+0x13	0x0013	#DEVICE CONTROL THREE
+0x14	0x0014	#DEVICE CONTROL FOUR
+0x15	0x0015	#NEGATIVE ACKNOWLEDGE
+0x16	0x0016	#SYNCHRONOUS IDLE
+0x17	0x0017	#END OF TRANSMISSION BLOCK
+0x18	0x0018	#CANCEL
+0x19	0x0019	#END OF MEDIUM
+0x1A	0x001A	#SUBSTITUTE
+0x1B	0x001B	#ESCAPE
+0x1C	0x001C	#FILE SEPARATOR
+0x1D	0x001D	#GROUP SEPARATOR
+0x1E	0x001E	#RECORD SEPARATOR
+0x1F	0x001F	#UNIT SEPARATOR
+0x20	0x0020	#SPACE
+0x21	0x0021	#EXCLAMATION MARK
+0x22	0x0022	#QUOTATION MARK
+0x23	0x0023	#NUMBER SIGN
+0x24	0x0024	#DOLLAR SIGN
+0x25	0x0025	#PERCENT SIGN
+0x26	0x0026	#AMPERSAND
+0x27	0x0027	#APOSTROPHE
+0x28	0x0028	#LEFT PARENTHESIS
+0x29	0x0029	#RIGHT PARENTHESIS
+0x2A	0x002A	#ASTERISK
+0x2B	0x002B	#PLUS SIGN
+0x2C	0x002C	#COMMA
+0x2D	0x002D	#HYPHEN-MINUS
+0x2E	0x002E	#FULL STOP
+0x2F	0x002F	#SOLIDUS
+0x30	0x0030	#DIGIT ZERO
+0x31	0x0031	#DIGIT ONE
+0x32	0x0032	#DIGIT TWO
+0x33	0x0033	#DIGIT THREE
+0x34	0x0034	#DIGIT FOUR
+0x35	0x0035	#DIGIT FIVE
+0x36	0x0036	#DIGIT SIX
+0x37	0x0037	#DIGIT SEVEN
+0x38	0x0038	#DIGIT EIGHT
+0x39	0x0039	#DIGIT NINE
+0x3A	0x003A	#COLON
+0x3B	0x003B	#SEMICOLON
+0x3C	0x003C	#LESS-THAN SIGN
+0x3D	0x003D	#EQUALS SIGN
+0x3E	0x003E	#GREATER-THAN SIGN
+0x3F	0x003F	#QUESTION MARK
+0x40	0x0040	#COMMERCIAL AT
+0x41	0x0041	#LATIN CAPITAL LETTER A
+0x42	0x0042	#LATIN CAPITAL LETTER B
+0x43	0x0043	#LATIN CAPITAL LETTER C
+0x44	0x0044	#LATIN CAPITAL LETTER D
+0x45	0x0045	#LATIN CAPITAL LETTER E
+0x46	0x0046	#LATIN CAPITAL LETTER F
+0x47	0x0047	#LATIN CAPITAL LETTER G
+0x48	0x0048	#LATIN CAPITAL LETTER H
+0x49	0x0049	#LATIN CAPITAL LETTER I
+0x4A	0x004A	#LATIN CAPITAL LETTER J
+0x4B	0x004B	#LATIN CAPITAL LETTER K
+0x4C	0x004C	#LATIN CAPITAL LETTER L
+0x4D	0x004D	#LATIN CAPITAL LETTER M
+0x4E	0x004E	#LATIN CAPITAL LETTER N
+0x4F	0x004F	#LATIN CAPITAL LETTER O
+0x50	0x0050	#LATIN CAPITAL LETTER P
+0x51	0x0051	#LATIN CAPITAL LETTER Q
+0x52	0x0052	#LATIN CAPITAL LETTER R
+0x53	0x0053	#LATIN CAPITAL LETTER S
+0x54	0x0054	#LATIN CAPITAL LETTER T
+0x55	0x0055	#LATIN CAPITAL LETTER U
+0x56	0x0056	#LATIN CAPITAL LETTER V
+0x57	0x0057	#LATIN CAPITAL LETTER W
+0x58	0x0058	#LATIN CAPITAL LETTER X
+0x59	0x0059	#LATIN CAPITAL LETTER Y
+0x5A	0x005A	#LATIN CAPITAL LETTER Z
+0x5B	0x005B	#LEFT SQUARE BRACKET
+0x5C	0x005C	#REVERSE SOLIDUS
+0x5D	0x005D	#RIGHT SQUARE BRACKET
+0x5E	0x005E	#CIRCUMFLEX ACCENT
+0x5F	0x005F	#LOW LINE
+0x60	0x0060	#GRAVE ACCENT
+0x61	0x0061	#LATIN SMALL LETTER A
+0x62	0x0062	#LATIN SMALL LETTER B
+0x63	0x0063	#LATIN SMALL LETTER C
+0x64	0x0064	#LATIN SMALL LETTER D
+0x65	0x0065	#LATIN SMALL LETTER E
+0x66	0x0066	#LATIN SMALL LETTER F
+0x67	0x0067	#LATIN SMALL LETTER G
+0x68	0x0068	#LATIN SMALL LETTER H
+0x69	0x0069	#LATIN SMALL LETTER I
+0x6A	0x006A	#LATIN SMALL LETTER J
+0x6B	0x006B	#LATIN SMALL LETTER K
+0x6C	0x006C	#LATIN SMALL LETTER L
+0x6D	0x006D	#LATIN SMALL LETTER M
+0x6E	0x006E	#LATIN SMALL LETTER N
+0x6F	0x006F	#LATIN SMALL LETTER O
+0x70	0x0070	#LATIN SMALL LETTER P
+0x71	0x0071	#LATIN SMALL LETTER Q
+0x72	0x0072	#LATIN SMALL LETTER R
+0x73	0x0073	#LATIN SMALL LETTER S
+0x74	0x0074	#LATIN SMALL LETTER T
+0x75	0x0075	#LATIN SMALL LETTER U
+0x76	0x0076	#LATIN SMALL LETTER V
+0x77	0x0077	#LATIN SMALL LETTER W
+0x78	0x0078	#LATIN SMALL LETTER X
+0x79	0x0079	#LATIN SMALL LETTER Y
+0x7A	0x007A	#LATIN SMALL LETTER Z
+0x7B	0x007B	#LEFT CURLY BRACKET
+0x7C	0x007C	#VERTICAL LINE
+0x7D	0x007D	#RIGHT CURLY BRACKET
+0x7E	0x007E	#TILDE
+0x7F	0x007F	#DELETE
+0x80	0x0402	#CYRILLIC CAPITAL LETTER DJE
+0x81	0x0403	#CYRILLIC CAPITAL LETTER GJE
+0x82	0x201A	#SINGLE LOW-9 QUOTATION MARK
+0x83	0x0453	#CYRILLIC SMALL LETTER GJE
+0x84	0x201E	#DOUBLE LOW-9 QUOTATION MARK
+0x85	0x2026	#HORIZONTAL ELLIPSIS
+0x86	0x2020	#DAGGER
+0x87	0x2021	#DOUBLE DAGGER
+0x88	0x20AC	#EURO SIGN
+0x89	0x2030	#PER MILLE SIGN
+0x8A	0x0409	#CYRILLIC CAPITAL LETTER LJE
+0x8B	0x2039	#SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+0x8C	0x040A	#CYRILLIC CAPITAL LETTER NJE
+0x8D	0x040C	#CYRILLIC CAPITAL LETTER KJE
+0x8E	0x040B	#CYRILLIC CAPITAL LETTER TSHE
+0x8F	0x040F	#CYRILLIC CAPITAL LETTER DZHE
+0x90	0x0452	#CYRILLIC SMALL LETTER DJE
+0x91	0x2018	#LEFT SINGLE QUOTATION MARK
+0x92	0x2019	#RIGHT SINGLE QUOTATION MARK
+0x93	0x201C	#LEFT DOUBLE QUOTATION MARK
+0x94	0x201D	#RIGHT DOUBLE QUOTATION MARK
+0x95	0x2022	#BULLET
+0x96	0x2013	#EN DASH
+0x97	0x2014	#EM DASH
+0x98	      	#UNDEFINED
+0x99	0x2122	#TRADE MARK SIGN
+0x9A	0x0459	#CYRILLIC SMALL LETTER LJE
+0x9B	0x203A	#SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+0x9C	0x045A	#CYRILLIC SMALL LETTER NJE
+0x9D	0x045C	#CYRILLIC SMALL LETTER KJE
+0x9E	0x045B	#CYRILLIC SMALL LETTER TSHE
+0x9F	0x045F	#CYRILLIC SMALL LETTER DZHE
+0xA0	0x00A0	#NO-BREAK SPACE
+0xA1	0x040E	#CYRILLIC CAPITAL LETTER SHORT U
+0xA2	0x045E	#CYRILLIC SMALL LETTER SHORT U
+0xA3	0x0408	#CYRILLIC CAPITAL LETTER JE
+0xA4	0x00A4	#CURRENCY SIGN
+0xA5	0x0490	#CYRILLIC CAPITAL LETTER GHE WITH UPTURN
+0xA6	0x00A6	#BROKEN BAR
+0xA7	0x00A7	#SECTION SIGN
+0xA8	0x0401	#CYRILLIC CAPITAL LETTER IO
+0xA9	0x00A9	#COPYRIGHT SIGN
+0xAA	0x0404	#CYRILLIC CAPITAL LETTER UKRAINIAN IE
+0xAB	0x00AB	#LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+0xAC	0x00AC	#NOT SIGN
+0xAD	0x00AD	#SOFT HYPHEN
+0xAE	0x00AE	#REGISTERED SIGN
+0xAF	0x0407	#CYRILLIC CAPITAL LETTER YI
+0xB0	0x00B0	#DEGREE SIGN
+0xB1	0x00B1	#PLUS-MINUS SIGN
+0xB2	0x0406	#CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
+0xB3	0x0456	#CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
+0xB4	0x0491	#CYRILLIC SMALL LETTER GHE WITH UPTURN
+0xB5	0x00B5	#MICRO SIGN
+0xB6	0x00B6	#PILCROW SIGN
+0xB7	0x00B7	#MIDDLE DOT
+0xB8	0x0451	#CYRILLIC SMALL LETTER IO
+0xB9	0x2116	#NUMERO SIGN
+0xBA	0x0454	#CYRILLIC SMALL LETTER UKRAINIAN IE
+0xBB	0x00BB	#RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+0xBC	0x0458	#CYRILLIC SMALL LETTER JE
+0xBD	0x0405	#CYRILLIC CAPITAL LETTER DZE
+0xBE	0x0455	#CYRILLIC SMALL LETTER DZE
+0xBF	0x0457	#CYRILLIC SMALL LETTER YI
+0xC0	0x0410	#CYRILLIC CAPITAL LETTER A
+0xC1	0x0411	#CYRILLIC CAPITAL LETTER BE
+0xC2	0x0412	#CYRILLIC CAPITAL LETTER VE
+0xC3	0x0413	#CYRILLIC CAPITAL LETTER GHE
+0xC4	0x0414	#CYRILLIC CAPITAL LETTER DE
+0xC5	0x0415	#CYRILLIC CAPITAL LETTER IE
+0xC6	0x0416	#CYRILLIC CAPITAL LETTER ZHE
+0xC7	0x0417	#CYRILLIC CAPITAL LETTER ZE
+0xC8	0x0418	#CYRILLIC CAPITAL LETTER I
+0xC9	0x0419	#CYRILLIC CAPITAL LETTER SHORT I
+0xCA	0x041A	#CYRILLIC CAPITAL LETTER KA
+0xCB	0x041B	#CYRILLIC CAPITAL LETTER EL
+0xCC	0x041C	#CYRILLIC CAPITAL LETTER EM
+0xCD	0x041D	#CYRILLIC CAPITAL LETTER EN
+0xCE	0x041E	#CYRILLIC CAPITAL LETTER O
+0xCF	0x041F	#CYRILLIC CAPITAL LETTER PE
+0xD0	0x0420	#CYRILLIC CAPITAL LETTER ER
+0xD1	0x0421	#CYRILLIC CAPITAL LETTER ES
+0xD2	0x0422	#CYRILLIC CAPITAL LETTER TE
+0xD3	0x0423	#CYRILLIC CAPITAL LETTER U
+0xD4	0x0424	#CYRILLIC CAPITAL LETTER EF
+0xD5	0x0425	#CYRILLIC CAPITAL LETTER HA
+0xD6	0x0426	#CYRILLIC CAPITAL LETTER TSE
+0xD7	0x0427	#CYRILLIC CAPITAL LETTER CHE
+0xD8	0x0428	#CYRILLIC CAPITAL LETTER SHA
+0xD9	0x0429	#CYRILLIC CAPITAL LETTER SHCHA
+0xDA	0x042A	#CYRILLIC CAPITAL LETTER HARD SIGN
+0xDB	0x042B	#CYRILLIC CAPITAL LETTER YERU
+0xDC	0x042C	#CYRILLIC CAPITAL LETTER SOFT SIGN
+0xDD	0x042D	#CYRILLIC CAPITAL LETTER E
+0xDE	0x042E	#CYRILLIC CAPITAL LETTER YU
+0xDF	0x042F	#CYRILLIC CAPITAL LETTER YA
+0xE0	0x0430	#CYRILLIC SMALL LETTER A
+0xE1	0x0431	#CYRILLIC SMALL LETTER BE
+0xE2	0x0432	#CYRILLIC SMALL LETTER VE
+0xE3	0x0433	#CYRILLIC SMALL LETTER GHE
+0xE4	0x0434	#CYRILLIC SMALL LETTER DE
+0xE5	0x0435	#CYRILLIC SMALL LETTER IE
+0xE6	0x0436	#CYRILLIC SMALL LETTER ZHE
+0xE7	0x0437	#CYRILLIC SMALL LETTER ZE
+0xE8	0x0438	#CYRILLIC SMALL LETTER I
+0xE9	0x0439	#CYRILLIC SMALL LETTER SHORT I
+0xEA	0x043A	#CYRILLIC SMALL LETTER KA
+0xEB	0x043B	#CYRILLIC SMALL LETTER EL
+0xEC	0x043C	#CYRILLIC SMALL LETTER EM
+0xED	0x043D	#CYRILLIC SMALL LETTER EN
+0xEE	0x043E	#CYRILLIC SMALL LETTER O
+0xEF	0x043F	#CYRILLIC SMALL LETTER PE
+0xF0	0x0440	#CYRILLIC SMALL LETTER ER
+0xF1	0x0441	#CYRILLIC SMALL LETTER ES
+0xF2	0x0442	#CYRILLIC SMALL LETTER TE
+0xF3	0x0443	#CYRILLIC SMALL LETTER U
+0xF4	0x0444	#CYRILLIC SMALL LETTER EF
+0xF5	0x0445	#CYRILLIC SMALL LETTER HA
+0xF6	0x0446	#CYRILLIC SMALL LETTER TSE
+0xF7	0x0447	#CYRILLIC SMALL LETTER CHE
+0xF8	0x0448	#CYRILLIC SMALL LETTER SHA
+0xF9	0x0449	#CYRILLIC SMALL LETTER SHCHA
+0xFA	0x044A	#CYRILLIC SMALL LETTER HARD SIGN
+0xFB	0x044B	#CYRILLIC SMALL LETTER YERU
+0xFC	0x044C	#CYRILLIC SMALL LETTER SOFT SIGN
+0xFD	0x044D	#CYRILLIC SMALL LETTER E
+0xFE	0x044E	#CYRILLIC SMALL LETTER YU
+0xFF	0x044F	#CYRILLIC SMALL LETTER YA
diff --git a/Unicode/cp1252.cp b/Unicode/cp1252.cp
index 195aa67c9..94be71ad2 100644
--- a/Unicode/cp1252.cp
+++ b/Unicode/cp1252.cp
@@ -1,6 +1,35 @@
 Window$ 1252
 "windows-1252", "1252"
 
+# ----------------------------------------------------------------------
+# The following data was downloaded from
+# http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP1252.TXT
+# on 2008-10-05, so it is a Unicode Data File covered by the Unicode
+# copyright and permission notice in the COPYING file of ELinks,
+# regardless of any terms shown below.
+#
+# This file differs from the original in the following ways:
+# - Added this comment, blank lines around it, and charset names above it.
+# ----------------------------------------------------------------------
+
+#
+#    Name:     cp1252 to Unicode table
+#    Unicode version: 2.0
+#    Table version: 2.01
+#    Table format:  Format A
+#    Date:          04/15/98
+#
+#    Contact:       Shawn.Steele@microsoft.com
+#
+#    General notes: none
+#
+#    Format: Three tab-separated columns
+#        Column #1 is the cp1252 code (in hex)
+#        Column #2 is the Unicode (in hex as 0xXXXX)
+#        Column #3 is the Unicode name (follows a comment sign, '#')
+#
+#    The entries are in cp1252 order
+#
 0x00	0x0000	#NULL
 0x01	0x0001	#START OF HEADING
 0x02	0x0002	#START OF TEXT
@@ -130,6 +159,7 @@ Window$ 1252
 0x7E	0x007E	#TILDE
 0x7F	0x007F	#DELETE
 0x80	0x20AC	#EURO SIGN
+0x81	      	#UNDEFINED
 0x82	0x201A	#SINGLE LOW-9 QUOTATION MARK
 0x83	0x0192	#LATIN SMALL LETTER F WITH HOOK
 0x84	0x201E	#DOUBLE LOW-9 QUOTATION MARK
@@ -141,7 +171,10 @@ Window$ 1252
 0x8A	0x0160	#LATIN CAPITAL LETTER S WITH CARON
 0x8B	0x2039	#SINGLE LEFT-POINTING ANGLE QUOTATION MARK
 0x8C	0x0152	#LATIN CAPITAL LIGATURE OE
+0x8D	      	#UNDEFINED
 0x8E	0x017D	#LATIN CAPITAL LETTER Z WITH CARON
+0x8F	      	#UNDEFINED
+0x90	      	#UNDEFINED
 0x91	0x2018	#LEFT SINGLE QUOTATION MARK
 0x92	0x2019	#RIGHT SINGLE QUOTATION MARK
 0x93	0x201C	#LEFT DOUBLE QUOTATION MARK
@@ -154,6 +187,7 @@ Window$ 1252
 0x9A	0x0161	#LATIN SMALL LETTER S WITH CARON
 0x9B	0x203A	#SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
 0x9C	0x0153	#LATIN SMALL LIGATURE OE
+0x9D	      	#UNDEFINED
 0x9E	0x017E	#LATIN SMALL LETTER Z WITH CARON
 0x9F	0x0178	#LATIN CAPITAL LETTER Y WITH DIAERESIS
 0xA0	0x00A0	#NO-BREAK SPACE
@@ -194,7 +228,7 @@ Window$ 1252
 0xC3	0x00C3	#LATIN CAPITAL LETTER A WITH TILDE
 0xC4	0x00C4	#LATIN CAPITAL LETTER A WITH DIAERESIS
 0xC5	0x00C5	#LATIN CAPITAL LETTER A WITH RING ABOVE
-0xC6	0x00C6	#LATIN CAPITAL LIGATURE AE
+0xC6	0x00C6	#LATIN CAPITAL LETTER AE
 0xC7	0x00C7	#LATIN CAPITAL LETTER C WITH CEDILLA
 0xC8	0x00C8	#LATIN CAPITAL LETTER E WITH GRAVE
 0xC9	0x00C9	#LATIN CAPITAL LETTER E WITH ACUTE
@@ -226,7 +260,7 @@ Window$ 1252
 0xE3	0x00E3	#LATIN SMALL LETTER A WITH TILDE
 0xE4	0x00E4	#LATIN SMALL LETTER A WITH DIAERESIS
 0xE5	0x00E5	#LATIN SMALL LETTER A WITH RING ABOVE
-0xE6	0x00E6	#LATIN SMALL LIGATURE AE
+0xE6	0x00E6	#LATIN SMALL LETTER AE
 0xE7	0x00E7	#LATIN SMALL LETTER C WITH CEDILLA
 0xE8	0x00E8	#LATIN SMALL LETTER E WITH GRAVE
 0xE9	0x00E9	#LATIN SMALL LETTER E WITH ACUTE
diff --git a/Unicode/cp1256.cp b/Unicode/cp1256.cp
index f0f3782d0..3694eed87 100644
--- a/Unicode/cp1256.cp
+++ b/Unicode/cp1256.cp
@@ -1,5 +1,17 @@
 Window$ 1256
 "windows-1256", "1256", "cp1256", "MS-ARAB"
+
+# ----------------------------------------------------------------------
+# The following data was downloaded from
+# http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP1256.TXT
+# on 2008-10-05, so it is a Unicode Data File covered by the Unicode
+# copyright and permission notice in the COPYING file of ELinks,
+# regardless of any terms shown below.
+#
+# This file differs from the original in the following ways:
+# - Added this comment, blank lines around it, and charset names above it.
+# ----------------------------------------------------------------------
+
 #
 #    Name:     cp1256 to Unicode table
 #    Unicode version: 2.1
@@ -7,7 +19,7 @@ Window$ 1256
 #    Table format:  Format A
 #    Date:          01/5/99
 #
-#    Contact:       cpxlate@microsoft.com
+#    Contact:       Shawn.Steele@microsoft.com
 #
 #    General notes: none
 #
diff --git a/Unicode/cp1257.cp b/Unicode/cp1257.cp
index 266f221e3..205aa4ed0 100644
--- a/Unicode/cp1257.cp
+++ b/Unicode/cp1257.cp
@@ -1,5 +1,17 @@
 Window$ 1257
 "windows-1257", "windows1257", "1257", "cp1257", "WINBALTRIM"
+
+# ----------------------------------------------------------------------
+# The following data was downloaded from
+# http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP1257.TXT
+# on 2008-10-05, so it is a Unicode Data File covered by the Unicode
+# copyright and permission notice in the COPYING file of ELinks,
+# regardless of any terms shown below.
+#
+# This file differs from the original in the following ways:
+# - Added this comment, blank lines around it, and charset names above it.
+# ----------------------------------------------------------------------
+
 #
 #    Name:     cp1257 to Unicode table
 #    Unicode version: 2.0
@@ -7,7 +19,7 @@ Window$ 1257
 #    Table format:  Format A
 #    Date:          04/15/98
 #
-#    Contact:       cpxlate@microsoft.com
+#    Contact:       Shawn.Steele@microsoft.com
 #
 #    General notes: none
 #
@@ -18,10 +30,134 @@ Window$ 1257
 #
 #    The entries are in cp1257 order
 #
-##################
-
-0x20-0x7e       idem
-#
+0x00	0x0000	#NULL
+0x01	0x0001	#START OF HEADING
+0x02	0x0002	#START OF TEXT
+0x03	0x0003	#END OF TEXT
+0x04	0x0004	#END OF TRANSMISSION
+0x05	0x0005	#ENQUIRY
+0x06	0x0006	#ACKNOWLEDGE
+0x07	0x0007	#BELL
+0x08	0x0008	#BACKSPACE
+0x09	0x0009	#HORIZONTAL TABULATION
+0x0A	0x000A	#LINE FEED
+0x0B	0x000B	#VERTICAL TABULATION
+0x0C	0x000C	#FORM FEED
+0x0D	0x000D	#CARRIAGE RETURN
+0x0E	0x000E	#SHIFT OUT
+0x0F	0x000F	#SHIFT IN
+0x10	0x0010	#DATA LINK ESCAPE
+0x11	0x0011	#DEVICE CONTROL ONE
+0x12	0x0012	#DEVICE CONTROL TWO
+0x13	0x0013	#DEVICE CONTROL THREE
+0x14	0x0014	#DEVICE CONTROL FOUR
+0x15	0x0015	#NEGATIVE ACKNOWLEDGE
+0x16	0x0016	#SYNCHRONOUS IDLE
+0x17	0x0017	#END OF TRANSMISSION BLOCK
+0x18	0x0018	#CANCEL
+0x19	0x0019	#END OF MEDIUM
+0x1A	0x001A	#SUBSTITUTE
+0x1B	0x001B	#ESCAPE
+0x1C	0x001C	#FILE SEPARATOR
+0x1D	0x001D	#GROUP SEPARATOR
+0x1E	0x001E	#RECORD SEPARATOR
+0x1F	0x001F	#UNIT SEPARATOR
+0x20	0x0020	#SPACE
+0x21	0x0021	#EXCLAMATION MARK
+0x22	0x0022	#QUOTATION MARK
+0x23	0x0023	#NUMBER SIGN
+0x24	0x0024	#DOLLAR SIGN
+0x25	0x0025	#PERCENT SIGN
+0x26	0x0026	#AMPERSAND
+0x27	0x0027	#APOSTROPHE
+0x28	0x0028	#LEFT PARENTHESIS
+0x29	0x0029	#RIGHT PARENTHESIS
+0x2A	0x002A	#ASTERISK
+0x2B	0x002B	#PLUS SIGN
+0x2C	0x002C	#COMMA
+0x2D	0x002D	#HYPHEN-MINUS
+0x2E	0x002E	#FULL STOP
+0x2F	0x002F	#SOLIDUS
+0x30	0x0030	#DIGIT ZERO
+0x31	0x0031	#DIGIT ONE
+0x32	0x0032	#DIGIT TWO
+0x33	0x0033	#DIGIT THREE
+0x34	0x0034	#DIGIT FOUR
+0x35	0x0035	#DIGIT FIVE
+0x36	0x0036	#DIGIT SIX
+0x37	0x0037	#DIGIT SEVEN
+0x38	0x0038	#DIGIT EIGHT
+0x39	0x0039	#DIGIT NINE
+0x3A	0x003A	#COLON
+0x3B	0x003B	#SEMICOLON
+0x3C	0x003C	#LESS-THAN SIGN
+0x3D	0x003D	#EQUALS SIGN
+0x3E	0x003E	#GREATER-THAN SIGN
+0x3F	0x003F	#QUESTION MARK
+0x40	0x0040	#COMMERCIAL AT
+0x41	0x0041	#LATIN CAPITAL LETTER A
+0x42	0x0042	#LATIN CAPITAL LETTER B
+0x43	0x0043	#LATIN CAPITAL LETTER C
+0x44	0x0044	#LATIN CAPITAL LETTER D
+0x45	0x0045	#LATIN CAPITAL LETTER E
+0x46	0x0046	#LATIN CAPITAL LETTER F
+0x47	0x0047	#LATIN CAPITAL LETTER G
+0x48	0x0048	#LATIN CAPITAL LETTER H
+0x49	0x0049	#LATIN CAPITAL LETTER I
+0x4A	0x004A	#LATIN CAPITAL LETTER J
+0x4B	0x004B	#LATIN CAPITAL LETTER K
+0x4C	0x004C	#LATIN CAPITAL LETTER L
+0x4D	0x004D	#LATIN CAPITAL LETTER M
+0x4E	0x004E	#LATIN CAPITAL LETTER N
+0x4F	0x004F	#LATIN CAPITAL LETTER O
+0x50	0x0050	#LATIN CAPITAL LETTER P
+0x51	0x0051	#LATIN CAPITAL LETTER Q
+0x52	0x0052	#LATIN CAPITAL LETTER R
+0x53	0x0053	#LATIN CAPITAL LETTER S
+0x54	0x0054	#LATIN CAPITAL LETTER T
+0x55	0x0055	#LATIN CAPITAL LETTER U
+0x56	0x0056	#LATIN CAPITAL LETTER V
+0x57	0x0057	#LATIN CAPITAL LETTER W
+0x58	0x0058	#LATIN CAPITAL LETTER X
+0x59	0x0059	#LATIN CAPITAL LETTER Y
+0x5A	0x005A	#LATIN CAPITAL LETTER Z
+0x5B	0x005B	#LEFT SQUARE BRACKET
+0x5C	0x005C	#REVERSE SOLIDUS
+0x5D	0x005D	#RIGHT SQUARE BRACKET
+0x5E	0x005E	#CIRCUMFLEX ACCENT
+0x5F	0x005F	#LOW LINE
+0x60	0x0060	#GRAVE ACCENT
+0x61	0x0061	#LATIN SMALL LETTER A
+0x62	0x0062	#LATIN SMALL LETTER B
+0x63	0x0063	#LATIN SMALL LETTER C
+0x64	0x0064	#LATIN SMALL LETTER D
+0x65	0x0065	#LATIN SMALL LETTER E
+0x66	0x0066	#LATIN SMALL LETTER F
+0x67	0x0067	#LATIN SMALL LETTER G
+0x68	0x0068	#LATIN SMALL LETTER H
+0x69	0x0069	#LATIN SMALL LETTER I
+0x6A	0x006A	#LATIN SMALL LETTER J
+0x6B	0x006B	#LATIN SMALL LETTER K
+0x6C	0x006C	#LATIN SMALL LETTER L
+0x6D	0x006D	#LATIN SMALL LETTER M
+0x6E	0x006E	#LATIN SMALL LETTER N
+0x6F	0x006F	#LATIN SMALL LETTER O
+0x70	0x0070	#LATIN SMALL LETTER P
+0x71	0x0071	#LATIN SMALL LETTER Q
+0x72	0x0072	#LATIN SMALL LETTER R
+0x73	0x0073	#LATIN SMALL LETTER S
+0x74	0x0074	#LATIN SMALL LETTER T
+0x75	0x0075	#LATIN SMALL LETTER U
+0x76	0x0076	#LATIN SMALL LETTER V
+0x77	0x0077	#LATIN SMALL LETTER W
+0x78	0x0078	#LATIN SMALL LETTER X
+0x79	0x0079	#LATIN SMALL LETTER Y
+0x7A	0x007A	#LATIN SMALL LETTER Z
+0x7B	0x007B	#LEFT CURLY BRACKET
+0x7C	0x007C	#VERTICAL LINE
+0x7D	0x007D	#RIGHT CURLY BRACKET
+0x7E	0x007E	#TILDE
+0x7F	0x007F	#DELETE
 0x80	0x20AC	#EURO SIGN
 0x81	      	#UNDEFINED
 0x82	0x201A	#SINGLE LOW-9 QUOTATION MARK
@@ -150,4 +286,3 @@ Window$ 1257
 0xFD	0x017C	#LATIN SMALL LETTER Z WITH DOT ABOVE
 0xFE	0x017E	#LATIN SMALL LETTER Z WITH CARON
 0xFF	0x02D9	#DOT ABOVE
-
diff --git a/Unicode/cp437.cp b/Unicode/cp437.cp
index 23d00d950..487012093 100644
--- a/Unicode/cp437.cp
+++ b/Unicode/cp437.cp
@@ -1,13 +1,25 @@
 CP 437
 "cp437", "437", "IBM437", "csPC8CodePage437"
+
+# ----------------------------------------------------------------------
+# The following data was downloaded from
+# http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/PC/CP437.TXT
+# on 2008-10-05, so it is a Unicode Data File covered by the Unicode
+# copyright and permission notice in the COPYING file of ELinks,
+# regardless of any terms shown below.
+#
+# This file differs from the original in the following ways:
+# - Added this comment, blank lines around it, and charset names above it.
+# ----------------------------------------------------------------------
+
 #
 #    Name:     cp437_DOSLatinUS to Unicode table
 #    Unicode version: 2.0
 #    Table version: 2.00
 #    Table format:  Format A
 #    Date:          04/24/96
-#    Authors:       Lori Brownell <loribr@microsoft.com>
-#                   K.D. Chang    <a-kchang@microsoft.com>
+#    Contact: Shawn.Steele@microsoft.com
+#                   
 #    General notes: none
 #
 #    Format: Three tab-separated columns
@@ -273,3 +285,4 @@ CP 437
 0xfd	0x00b2	#SUPERSCRIPT TWO
 0xfe	0x25a0	#BLACK SQUARE
 0xff	0x00a0	#NO-BREAK SPACE
+
\ No newline at end of file
diff --git a/Unicode/cp737.cp b/Unicode/cp737.cp
index d1fe3a4e5..162a68f8a 100644
--- a/Unicode/cp737.cp
+++ b/Unicode/cp737.cp
@@ -1,13 +1,25 @@
 CP 737
 "cp737", "737"
+
+# ----------------------------------------------------------------------
+# The following data was downloaded from
+# http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/PC/CP737.TXT
+# on 2008-10-05, so it is a Unicode Data File covered by the Unicode
+# copyright and permission notice in the COPYING file of ELinks,
+# regardless of any terms shown below.
+#
+# This file differs from the original in the following ways:
+# - Added this comment, blank lines around it, and charset names above it.
+# ----------------------------------------------------------------------
+
 #
 #    Name:     cp737_DOSGreek to Unicode table
 #    Unicode version: 2.0
 #    Table version: 2.00
 #    Table format:  Format A
 #    Date:          04/24/96
-#    Authors:       Lori Brownell <loribr@microsoft.com>
-#                   K.D. Chang    <a-kchang@microsoft.com>
+#    Contact: Shawn.Steele@microsoft.com
+#                   
 #    General notes: none
 #
 #    Format: Three tab-separated columns
@@ -273,3 +285,4 @@ CP 737
 0xfd	0x00b2	#SUPERSCRIPT TWO
 0xfe	0x25a0	#BLACK SQUARE
 0xff	0x00a0	#NO-BREAK SPACE
+
\ No newline at end of file
diff --git a/Unicode/cp850.cp b/Unicode/cp850.cp
index 0992eb0db..6f7b82282 100644
--- a/Unicode/cp850.cp
+++ b/Unicode/cp850.cp
@@ -1,13 +1,25 @@
 CP 850
 "cp850", "850", "IBM850", "csPC850Multilingual"
+
+# ----------------------------------------------------------------------
+# The following data was downloaded from
+# http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/PC/CP850.TXT
+# on 2008-10-05, so it is a Unicode Data File covered by the Unicode
+# copyright and permission notice in the COPYING file of ELinks,
+# regardless of any terms shown below.
+#
+# This file differs from the original in the following ways:
+# - Added this comment, blank lines around it, and charset names above it.
+# ----------------------------------------------------------------------
+
 #
 #    Name:     cp850_DOSLatin1 to Unicode table
 #    Unicode version: 2.0
 #    Table version: 2.00
 #    Table format:  Format A
 #    Date:          04/24/96
-#    Authors:       Lori Brownell <loribr@microsoft.com>
-#                   K.D. Chang    <a-kchang@microsoft.com>
+#    Contact: Shawn.Steele@microsoft.com
+#                   
 #    General notes: none
 #
 #    Format: Three tab-separated columns
@@ -273,3 +285,4 @@ CP 850
 0xfd	0x00b2	#SUPERSCRIPT TWO
 0xfe	0x25a0	#BLACK SQUARE
 0xff	0x00a0	#NO-BREAK SPACE
+
\ No newline at end of file
diff --git a/Unicode/cp852.cp b/Unicode/cp852.cp
index 87cb449c5..a9619de74 100644
--- a/Unicode/cp852.cp
+++ b/Unicode/cp852.cp
@@ -1,13 +1,25 @@
 CP 852
 "cp852", "852", "csPCp852"
+
+# ----------------------------------------------------------------------
+# The following data was downloaded from
+# http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/PC/CP852.TXT
+# on 2008-10-05, so it is a Unicode Data File covered by the Unicode
+# copyright and permission notice in the COPYING file of ELinks,
+# regardless of any terms shown below.
+#
+# This file differs from the original in the following ways:
+# - Added this comment, blank lines around it, and charset names above it.
+# ----------------------------------------------------------------------
+
 #
 #    Name:     cp852_DOSLatin2 to Unicode table
 #    Unicode version: 2.0
 #    Table version: 2.00
 #    Table format:  Format A
 #    Date:          04/24/96
-#    Authors:       Lori Brownell <loribr@microsoft.com>
-#                   K.D. Chang    <a-kchang@microsoft.com>
+#    Contact: Shawn.Steele@microsoft.com
+#                   
 #    General notes: none
 #
 #    Format: Three tab-separated columns
@@ -273,3 +285,4 @@ CP 852
 0xfd	0x0159	#LATIN SMALL LETTER R WITH CARON
 0xfe	0x25a0	#BLACK SQUARE
 0xff	0x00a0	#NO-BREAK SPACE
+
\ No newline at end of file
diff --git a/Unicode/cp866.cp b/Unicode/cp866.cp
index a67dcb494..5ba3aaf6e 100644
--- a/Unicode/cp866.cp
+++ b/Unicode/cp866.cp
@@ -1,13 +1,25 @@
 CP 866
 "cp866", "866", "IBM866", "csIBM866"
+
+# ----------------------------------------------------------------------
+# The following data was downloaded from
+# http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/PC/CP866.TXT
+# on 2008-10-05, so it is a Unicode Data File covered by the Unicode
+# copyright and permission notice in the COPYING file of ELinks,
+# regardless of any terms shown below.
+#
+# This file differs from the original in the following ways:
+# - Added this comment, blank lines around it, and charset names above it.
+# ----------------------------------------------------------------------
+
 #
 #    Name:     cp866_DOSCyrillicRussian to Unicode table
 #    Unicode version: 2.0
 #    Table version: 2.00
 #    Table format:  Format A
 #    Date:          04/24/96
-#    Authors:       Lori Brownell <loribr@microsoft.com>
-#                   K.D. Chang    <a-kchang@microsoft.com>
+#    Contact: Shawn.Steele@microsoft.com
+#                   
 #    General notes: none
 #
 #    Format: Three tab-separated columns
@@ -274,3 +286,4 @@ CP 866
 0xfe	0x25a0	#BLACK SQUARE
 0xff	0x00a0	#NO-BREAK SPACE
 
+
\ No newline at end of file
diff --git a/Unicode/gen-cp b/Unicode/gen-cp
index 83f8090d6..1cc5a0d43 100755
--- a/Unicode/gen-cp
+++ b/Unicode/gen-cp
@@ -13,6 +13,7 @@ n=0
 
 echo '/* Automatically generated by gen-cp */'
 echo '/* DO NOT EDIT THIS FILE! EDIT Unicode/<whatever> INSTEAD! */'
+echo '/* See the input files for copyrights and licences. */'
 echo
 
 for i in $codepages; do
diff --git a/Unicode/koi8_r.cp b/Unicode/koi8_r.cp
index 46e28e189..62ac5824b 100644
--- a/Unicode/koi8_r.cp
+++ b/Unicode/koi8_r.cp
@@ -1,226 +1,316 @@
 KOI8-R
 "koi8-r", "csKOI8R"
 
-0x20	0x0020	# SPACE
-0x21	0x0021	# EXCLAMATION MARK
-0x22	0x0022	# QUOTATION MARK
-0x23	0x0023	# NUMBER SIGN
-0x24	0x0024	# DOLLAR SIGN
-0x25	0x0025	# PERCENT SIGN
-0x26	0x0026	# AMPERSAND
-0x27	0x0027	# APOSTROPHE
-0x28	0x0028	# LEFT PARENTHESIS
-0x29	0x0029	# RIGHT PARENTHESIS
-0x2A	0x002A	# ASTERISK
-0x2B	0x002B	# PLUS SIGN
-0x2C	0x002C	# COMMA
-0x2D	0x002D	# HYPHEN-MINUS
-0x2E	0x002E	# FULL STOP
-0x2F	0x002F	# SOLIDUS
-0x30	0x0030	# DIGIT ZERO
-0x31	0x0031	# DIGIT ONE
-0x32	0x0032	# DIGIT TWO
-0x33	0x0033	# DIGIT THREE
-0x34	0x0034	# DIGIT FOUR
-0x35	0x0035	# DIGIT FIVE
-0x36	0x0036	# DIGIT SIX
-0x37	0x0037	# DIGIT SEVEN
-0x38	0x0038	# DIGIT EIGHT
-0x39	0x0039	# DIGIT NINE
-0x3A	0x003A	# COLON
-0x3B	0x003B	# SEMICOLON
-0x3C	0x003C	# LESS-THAN SIGN
-0x3D	0x003D	# EQUALS SIGN
-0x3E	0x003E	# GREATER-THAN SIGN
-0x3F	0x003F	# QUESTION MARK
-0x40	0x0040	# COMMERCIAL AT
-0x41	0x0041	# LATIN CAPITAL LETTER A
-0x42	0x0042	# LATIN CAPITAL LETTER B
-0x43	0x0043	# LATIN CAPITAL LETTER C
-0x44	0x0044	# LATIN CAPITAL LETTER D
-0x45	0x0045	# LATIN CAPITAL LETTER E
-0x46	0x0046	# LATIN CAPITAL LETTER F
-0x47	0x0047	# LATIN CAPITAL LETTER G
-0x48	0x0048	# LATIN CAPITAL LETTER H
-0x49	0x0049	# LATIN CAPITAL LETTER I
-0x4A	0x004A	# LATIN CAPITAL LETTER J
-0x4B	0x004B	# LATIN CAPITAL LETTER K
-0x4C	0x004C	# LATIN CAPITAL LETTER L
-0x4D	0x004D	# LATIN CAPITAL LETTER M
-0x4E	0x004E	# LATIN CAPITAL LETTER N
-0x4F	0x004F	# LATIN CAPITAL LETTER O
-0x50	0x0050	# LATIN CAPITAL LETTER P
-0x51	0x0051	# LATIN CAPITAL LETTER Q
-0x52	0x0052	# LATIN CAPITAL LETTER R
-0x53	0x0053	# LATIN CAPITAL LETTER S
-0x54	0x0054	# LATIN CAPITAL LETTER T
-0x55	0x0055	# LATIN CAPITAL LETTER U
-0x56	0x0056	# LATIN CAPITAL LETTER V
-0x57	0x0057	# LATIN CAPITAL LETTER W
-0x58	0x0058	# LATIN CAPITAL LETTER X
-0x59	0x0059	# LATIN CAPITAL LETTER Y
-0x5A	0x005A	# LATIN CAPITAL LETTER Z
-0x5B	0x005B	# LEFT SQUARE BRACKET
-0x5C	0x005C	# REVERSE SOLIDUS
-0x5D	0x005D	# RIGHT SQUARE BRACKET
-0x5E	0x005E	# CIRCUMFLEX ACCENT
-0x5F	0x005F	# LOW LINE
-0x60	0x0060	# GRAVE ACCENT
-0x61	0x0061	# LATIN SMALL LETTER A
-0x62	0x0062	# LATIN SMALL LETTER B
-0x63	0x0063	# LATIN SMALL LETTER C
-0x64	0x0064	# LATIN SMALL LETTER D
-0x65	0x0065	# LATIN SMALL LETTER E
-0x66	0x0066	# LATIN SMALL LETTER F
-0x67	0x0067	# LATIN SMALL LETTER G
-0x68	0x0068	# LATIN SMALL LETTER H
-0x69	0x0069	# LATIN SMALL LETTER I
-0x6A	0x006A	# LATIN SMALL LETTER J
-0x6B	0x006B	# LATIN SMALL LETTER K
-0x6C	0x006C	# LATIN SMALL LETTER L
-0x6D	0x006D	# LATIN SMALL LETTER M
-0x6E	0x006E	# LATIN SMALL LETTER N
-0x6F	0x006F	# LATIN SMALL LETTER O
-0x70	0x0070	# LATIN SMALL LETTER P
-0x71	0x0071	# LATIN SMALL LETTER Q
-0x72	0x0072	# LATIN SMALL LETTER R
-0x73	0x0073	# LATIN SMALL LETTER S
-0x74	0x0074	# LATIN SMALL LETTER T
-0x75	0x0075	# LATIN SMALL LETTER U
-0x76	0x0076	# LATIN SMALL LETTER V
-0x77	0x0077	# LATIN SMALL LETTER W
-0x78	0x0078	# LATIN SMALL LETTER X
-0x79	0x0079	# LATIN SMALL LETTER Y
-0x7A	0x007A	# LATIN SMALL LETTER Z
-0x7B	0x007B	# LEFT CURLY BRACKET
-0x7C	0x007C	# VERTICAL LINE
-0x7D	0x007D	# RIGHT CURLY BRACKET
-0x7E	0x007E	# TILDE
-0x80	0x2500	# BOX DRAWINGS LIGHT HORIZONTAL
-0x81	0x2502	# BOX DRAWINGS LIGHT VERTICAL
-0x82	0x250C	# BOX DRAWINGS LIGHT DOWN AND RIGHT
-0x83	0x2510	# BOX DRAWINGS LIGHT DOWN AND LEFT
-0x84	0x2514	# BOX DRAWINGS LIGHT UP AND RIGHT
-0x85	0x2518	# BOX DRAWINGS LIGHT UP AND LEFT
-0x86	0x251C	# BOX DRAWINGS LIGHT VERTICAL AND RIGHT
-0x87	0x2524	# BOX DRAWINGS LIGHT VERTICAL AND LEFT
-0x88	0x252C	# BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
-0x89	0x2534	# BOX DRAWINGS LIGHT UP AND HORIZONTAL
-0x8A	0x253C	# BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
-0x8B	0x2580	# UPPER HALF BLOCK
-0x8C	0x2584	# LOWER HALF BLOCK
-0x8D	0x2588	# FULL BLOCK
-0x8E	0x258C	# LEFT HALF BLOCK
-0x8F	0x2590	# RIGHT HALF BLOCK
-0x90	0x2591	# LIGHT SHADE
-0x91	0x2592	# MEDIUM SHADE
-0x92	0x2593	# DARK SHADE
-0x93	0x2320	# TOP HALF INTEGRAL
-0x94	0x25A0	# BLACK SQUARE
-0x95	0x2022	# BULLET
-0x96	0x221A	# SQUARE ROOT
-0x97	0x2248	# ALMOST EQUAL TO
-0x98	0x2264	# LESS-THAN OR EQUAL TO
-0x99	0x2265	# GREATER-THAN OR EQUAL TO
-0x9A	0x00A0	# NO-BREAK SPACE
-0x9B	0x2321	# BOTTOM HALF INTEGRAL
-0x9C	0x00B0	# DEGREE SIGN
-0x9D	0x00B2	# SUPERSCRIPT TWO
-0x9E	0x00B7	# MIDDLE DOT
-0x9F	0x00F7	# DIVISION SIGN
-0xA0	0x2550	# BOX DRAWINGS DOUBLE HORIZONTAL
-0xA1	0x2551	# BOX DRAWINGS DOUBLE VERTICAL
-0xA2	0x2552	# BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE
-0xA3	0x0451	# CYRILLIC SMALL LETTER IO
-0xA4	0x2553	# BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE
-0xA5	0x2554	# BOX DRAWINGS DOUBLE DOWN AND RIGHT
-0xA6	0x2555	# BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE
-0xA7	0x2556	# BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE
-0xA8	0x2557	# BOX DRAWINGS DOUBLE DOWN AND LEFT
-0xA9	0x2558	# BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE
-0xAA	0x2559	# BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE
-0xAB	0x255A	# BOX DRAWINGS DOUBLE UP AND RIGHT
-0xAC	0x255B	# BOX DRAWINGS UP SINGLE AND LEFT DOUBLE
-0xAD	0x255C	# BOX DRAWINGS UP DOUBLE AND LEFT SINGLE
-0xAE	0x255D	# BOX DRAWINGS DOUBLE UP AND LEFT
-0xAF	0x255E	# BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE
-0xB0	0x255F	# BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE
-0xB1	0x2560	# BOX DRAWINGS DOUBLE VERTICAL AND RIGHT
-0xB2	0x2561	# BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE
-0xB3	0x0401	# CYRILLIC CAPITAL LETTER IO
-0xB4	0x2562	# BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE
-0xB5	0x2563	# BOX DRAWINGS DOUBLE VERTICAL AND LEFT
-0xB6	0x2564	# BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE
-0xB7	0x2565	# BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE
-0xB8	0x2566	# BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL
-0xB9	0x2567	# BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE
-0xBA	0x2568	# BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE
-0xBB	0x2569	# BOX DRAWINGS DOUBLE UP AND HORIZONTAL
-0xBC	0x256A	# BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE
-0xBD	0x256B	# BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE
-0xBE	0x256C	# BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL
-0xBF	0x00A9	# COPYRIGHT SIGN
-0xC0	0x044E	# CYRILLIC SMALL LETTER YU
-0xC1	0x0430	# CYRILLIC SMALL LETTER A
-0xC2	0x0431	# CYRILLIC SMALL LETTER BE
-0xC3	0x0446	# CYRILLIC SMALL LETTER TSE
-0xC4	0x0434	# CYRILLIC SMALL LETTER DE
-0xC5	0x0435	# CYRILLIC SMALL LETTER IE
-0xC6	0x0444	# CYRILLIC SMALL LETTER EF
-0xC7	0x0433	# CYRILLIC SMALL LETTER GHE
-0xC8	0x0445	# CYRILLIC SMALL LETTER HA
-0xC9	0x0438	# CYRILLIC SMALL LETTER I
-0xCA	0x0439	# CYRILLIC SMALL LETTER SHORT I
-0xCB	0x043A	# CYRILLIC SMALL LETTER KA
-0xCC	0x043B	# CYRILLIC SMALL LETTER EL
-0xCD	0x043C	# CYRILLIC SMALL LETTER EM
-0xCE	0x043D	# CYRILLIC SMALL LETTER EN
-0xCF	0x043E	# CYRILLIC SMALL LETTER O
-0xD0	0x043F	# CYRILLIC SMALL LETTER PE
-0xD1	0x044F	# CYRILLIC SMALL LETTER YA
-0xD2	0x0440	# CYRILLIC SMALL LETTER ER
-0xD3	0x0441	# CYRILLIC SMALL LETTER ES
-0xD4	0x0442	# CYRILLIC SMALL LETTER TE
-0xD5	0x0443	# CYRILLIC SMALL LETTER U
-0xD6	0x0436	# CYRILLIC SMALL LETTER ZHE
-0xD7	0x0432	# CYRILLIC SMALL LETTER VE
-0xD8	0x044C	# CYRILLIC SMALL LETTER SOFT SIGN
-0xD9	0x044B	# CYRILLIC SMALL LETTER YERU
-0xDA	0x0437	# CYRILLIC SMALL LETTER ZE
-0xDB	0x0448	# CYRILLIC SMALL LETTER SHA
-0xDC	0x044D	# CYRILLIC SMALL LETTER E
-0xDD	0x0449	# CYRILLIC SMALL LETTER SHCHA
-0xDE	0x0447	# CYRILLIC SMALL LETTER CHE
-0xDF	0x044A	# CYRILLIC SMALL LETTER HARD SIGN
-0xE0	0x042E	# CYRILLIC CAPITAL LETTER YU
-0xE1	0x0410	# CYRILLIC CAPITAL LETTER A
-0xE2	0x0411	# CYRILLIC CAPITAL LETTER BE
-0xE3	0x0426	# CYRILLIC CAPITAL LETTER TSE
-0xE4	0x0414	# CYRILLIC CAPITAL LETTER DE
-0xE5	0x0415	# CYRILLIC CAPITAL LETTER IE
-0xE6	0x0424	# CYRILLIC CAPITAL LETTER EF
-0xE7	0x0413	# CYRILLIC CAPITAL LETTER GHE
-0xE8	0x0425	# CYRILLIC CAPITAL LETTER HA
-0xE9	0x0418	# CYRILLIC CAPITAL LETTER I
-0xEA	0x0419	# CYRILLIC CAPITAL LETTER SHORT I
-0xEB	0x041A	# CYRILLIC CAPITAL LETTER KA
-0xEC	0x041B	# CYRILLIC CAPITAL LETTER EL
-0xED	0x041C	# CYRILLIC CAPITAL LETTER EM
-0xEE	0x041D	# CYRILLIC CAPITAL LETTER EN
-0xEF	0x041E	# CYRILLIC CAPITAL LETTER O
-0xF0	0x041F	# CYRILLIC CAPITAL LETTER PE
-0xF1	0x042F	# CYRILLIC CAPITAL LETTER YA
-0xF2	0x0420	# CYRILLIC CAPITAL LETTER ER
-0xF3	0x0421	# CYRILLIC CAPITAL LETTER ES
-0xF4	0x0422	# CYRILLIC CAPITAL LETTER TE
-0xF5	0x0423	# CYRILLIC CAPITAL LETTER U
-0xF6	0x0416	# CYRILLIC CAPITAL LETTER ZHE
-0xF7	0x0412	# CYRILLIC CAPITAL LETTER VE
-0xF8	0x042C	# CYRILLIC CAPITAL LETTER SOFT SIGN
-0xF9	0x042B	# CYRILLIC CAPITAL LETTER YERU
-0xFA	0x0417	# CYRILLIC CAPITAL LETTER ZE
-0xFB	0x0428	# CYRILLIC CAPITAL LETTER SHA
-0xFC	0x042D	# CYRILLIC CAPITAL LETTER E
-0xFD	0x0429	# CYRILLIC CAPITAL LETTER SHCHA
-0xFE	0x0427	# CYRILLIC CAPITAL LETTER CHE
-0xFF	0x042A	# CYRILLIC CAPITAL LETTER HARD SIGN
+# ----------------------------------------------------------------------
+# The following data was downloaded from
+# http://www.unicode.org/Public/MAPPINGS/VENDORS/MISC/KOI8-R.TXT
+# on 2008-10-05, so it is a Unicode Data File covered by the Unicode
+# copyright and permission notice in the COPYING file of ELinks,
+# regardless of any terms shown below.
+#
+# This file differs from the original in the following ways:
+# - Added this comment, blank lines around it, and charset names above it.
+# ----------------------------------------------------------------------
+
+#
+#	Name:             KOI8-R (RFC1489) to Unicode
+#	Unicode version:  3.0
+#	Table version:    1.0
+#	Table format:     Format A
+#	Date:             18 August 1999
+#	Authors:          Helmut Richter <richter@lrz.de>
+#
+#	Copyright (c) 1991-1999 Unicode, Inc.  All Rights reserved.
+#
+#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#	No claims are made as to fitness for any particular purpose.  No
+#	warranties of any kind are expressed or implied.  The recipient
+#	agrees to determine applicability of information provided.  If this
+#	file has been provided on optical media by Unicode, Inc., the sole
+#	remedy for any claim will be exchange of defective media within 90
+#	days of receipt.
+#
+#	Unicode, Inc. hereby grants the right to freely use the information
+#	supplied in this file in the creation of products supporting the
+#	Unicode Standard, and to make copies of this file in any form for
+#	internal or external distribution as long as this notice remains
+#	attached.
+#
+#	General notes:
+#
+#	This table contains the data the Unicode Consortium has on how
+#       KOI8-R characters map into Unicode. The underlying document is the
+#	mapping described in RFC 1489. No statements are made as to whether
+#	this mapping is the same as the mapping defined as "Code Page 878"
+#	with some vendors.
+#
+#	Format:  Three tab-separated columns
+#		 Column #1 is the KOI8-R code (in hex as 0xXX)
+#		 Column #2 is the Unicode (in hex as 0xXXXX)
+#		 Column #3 the Unicode name (follows a comment sign, '#')
+#
+#	The entries are in KOI8-R order.
+#
+#	Version history
+#	1.0 version: created.
+#
+#	Any comments or problems, contact <errata@unicode.org>
+#	Please note that <errata@unicode.org> is an archival address;
+#	notices will be checked, but do not expect an immediate response.
+#
+0x00	0x0000	#	NULL
+0x01	0x0001	#	START OF HEADING
+0x02	0x0002	#	START OF TEXT
+0x03	0x0003	#	END OF TEXT
+0x04	0x0004	#	END OF TRANSMISSION
+0x05	0x0005	#	ENQUIRY
+0x06	0x0006	#	ACKNOWLEDGE
+0x07	0x0007	#	BELL
+0x08	0x0008	#	BACKSPACE
+0x09	0x0009	#	HORIZONTAL TABULATION
+0x0A	0x000A	#	LINE FEED
+0x0B	0x000B	#	VERTICAL TABULATION
+0x0C	0x000C	#	FORM FEED
+0x0D	0x000D	#	CARRIAGE RETURN
+0x0E	0x000E	#	SHIFT OUT
+0x0F	0x000F	#	SHIFT IN
+0x10	0x0010	#	DATA LINK ESCAPE
+0x11	0x0011	#	DEVICE CONTROL ONE
+0x12	0x0012	#	DEVICE CONTROL TWO
+0x13	0x0013	#	DEVICE CONTROL THREE
+0x14	0x0014	#	DEVICE CONTROL FOUR
+0x15	0x0015	#	NEGATIVE ACKNOWLEDGE
+0x16	0x0016	#	SYNCHRONOUS IDLE
+0x17	0x0017	#	END OF TRANSMISSION BLOCK
+0x18	0x0018	#	CANCEL
+0x19	0x0019	#	END OF MEDIUM
+0x1A	0x001A	#	SUBSTITUTE
+0x1B	0x001B	#	ESCAPE
+0x1C	0x001C	#	FILE SEPARATOR
+0x1D	0x001D	#	GROUP SEPARATOR
+0x1E	0x001E	#	RECORD SEPARATOR
+0x1F	0x001F	#	UNIT SEPARATOR
+0x20	0x0020	#	SPACE
+0x21	0x0021	#	EXCLAMATION MARK
+0x22	0x0022	#	QUOTATION MARK
+0x23	0x0023	#	NUMBER SIGN
+0x24	0x0024	#	DOLLAR SIGN
+0x25	0x0025	#	PERCENT SIGN
+0x26	0x0026	#	AMPERSAND
+0x27	0x0027	#	APOSTROPHE
+0x28	0x0028	#	LEFT PARENTHESIS
+0x29	0x0029	#	RIGHT PARENTHESIS
+0x2A	0x002A	#	ASTERISK
+0x2B	0x002B	#	PLUS SIGN
+0x2C	0x002C	#	COMMA
+0x2D	0x002D	#	HYPHEN-MINUS
+0x2E	0x002E	#	FULL STOP
+0x2F	0x002F	#	SOLIDUS
+0x30	0x0030	#	DIGIT ZERO
+0x31	0x0031	#	DIGIT ONE
+0x32	0x0032	#	DIGIT TWO
+0x33	0x0033	#	DIGIT THREE
+0x34	0x0034	#	DIGIT FOUR
+0x35	0x0035	#	DIGIT FIVE
+0x36	0x0036	#	DIGIT SIX
+0x37	0x0037	#	DIGIT SEVEN
+0x38	0x0038	#	DIGIT EIGHT
+0x39	0x0039	#	DIGIT NINE
+0x3A	0x003A	#	COLON
+0x3B	0x003B	#	SEMICOLON
+0x3C	0x003C	#	LESS-THAN SIGN
+0x3D	0x003D	#	EQUALS SIGN
+0x3E	0x003E	#	GREATER-THAN SIGN
+0x3F	0x003F	#	QUESTION MARK
+0x40	0x0040	#	COMMERCIAL AT
+0x41	0x0041	#	LATIN CAPITAL LETTER A
+0x42	0x0042	#	LATIN CAPITAL LETTER B
+0x43	0x0043	#	LATIN CAPITAL LETTER C
+0x44	0x0044	#	LATIN CAPITAL LETTER D
+0x45	0x0045	#	LATIN CAPITAL LETTER E
+0x46	0x0046	#	LATIN CAPITAL LETTER F
+0x47	0x0047	#	LATIN CAPITAL LETTER G
+0x48	0x0048	#	LATIN CAPITAL LETTER H
+0x49	0x0049	#	LATIN CAPITAL LETTER I
+0x4A	0x004A	#	LATIN CAPITAL LETTER J
+0x4B	0x004B	#	LATIN CAPITAL LETTER K
+0x4C	0x004C	#	LATIN CAPITAL LETTER L
+0x4D	0x004D	#	LATIN CAPITAL LETTER M
+0x4E	0x004E	#	LATIN CAPITAL LETTER N
+0x4F	0x004F	#	LATIN CAPITAL LETTER O
+0x50	0x0050	#	LATIN CAPITAL LETTER P
+0x51	0x0051	#	LATIN CAPITAL LETTER Q
+0x52	0x0052	#	LATIN CAPITAL LETTER R
+0x53	0x0053	#	LATIN CAPITAL LETTER S
+0x54	0x0054	#	LATIN CAPITAL LETTER T
+0x55	0x0055	#	LATIN CAPITAL LETTER U
+0x56	0x0056	#	LATIN CAPITAL LETTER V
+0x57	0x0057	#	LATIN CAPITAL LETTER W
+0x58	0x0058	#	LATIN CAPITAL LETTER X
+0x59	0x0059	#	LATIN CAPITAL LETTER Y
+0x5A	0x005A	#	LATIN CAPITAL LETTER Z
+0x5B	0x005B	#	LEFT SQUARE BRACKET
+0x5C	0x005C	#	REVERSE SOLIDUS
+0x5D	0x005D	#	RIGHT SQUARE BRACKET
+0x5E	0x005E	#	CIRCUMFLEX ACCENT
+0x5F	0x005F	#	LOW LINE
+0x60	0x0060	#	GRAVE ACCENT
+0x61	0x0061	#	LATIN SMALL LETTER A
+0x62	0x0062	#	LATIN SMALL LETTER B
+0x63	0x0063	#	LATIN SMALL LETTER C
+0x64	0x0064	#	LATIN SMALL LETTER D
+0x65	0x0065	#	LATIN SMALL LETTER E
+0x66	0x0066	#	LATIN SMALL LETTER F
+0x67	0x0067	#	LATIN SMALL LETTER G
+0x68	0x0068	#	LATIN SMALL LETTER H
+0x69	0x0069	#	LATIN SMALL LETTER I
+0x6A	0x006A	#	LATIN SMALL LETTER J
+0x6B	0x006B	#	LATIN SMALL LETTER K
+0x6C	0x006C	#	LATIN SMALL LETTER L
+0x6D	0x006D	#	LATIN SMALL LETTER M
+0x6E	0x006E	#	LATIN SMALL LETTER N
+0x6F	0x006F	#	LATIN SMALL LETTER O
+0x70	0x0070	#	LATIN SMALL LETTER P
+0x71	0x0071	#	LATIN SMALL LETTER Q
+0x72	0x0072	#	LATIN SMALL LETTER R
+0x73	0x0073	#	LATIN SMALL LETTER S
+0x74	0x0074	#	LATIN SMALL LETTER T
+0x75	0x0075	#	LATIN SMALL LETTER U
+0x76	0x0076	#	LATIN SMALL LETTER V
+0x77	0x0077	#	LATIN SMALL LETTER W
+0x78	0x0078	#	LATIN SMALL LETTER X
+0x79	0x0079	#	LATIN SMALL LETTER Y
+0x7A	0x007A	#	LATIN SMALL LETTER Z
+0x7B	0x007B	#	LEFT CURLY BRACKET
+0x7C	0x007C	#	VERTICAL LINE
+0x7D	0x007D	#	RIGHT CURLY BRACKET
+0x7E	0x007E	#	TILDE
+0x7F	0x007F	#	DELETE
+0x80	0x2500	#	BOX DRAWINGS LIGHT HORIZONTAL
+0x81	0x2502	#	BOX DRAWINGS LIGHT VERTICAL
+0x82	0x250C	#	BOX DRAWINGS LIGHT DOWN AND RIGHT
+0x83	0x2510	#	BOX DRAWINGS LIGHT DOWN AND LEFT
+0x84	0x2514	#	BOX DRAWINGS LIGHT UP AND RIGHT
+0x85	0x2518	#	BOX DRAWINGS LIGHT UP AND LEFT
+0x86	0x251C	#	BOX DRAWINGS LIGHT VERTICAL AND RIGHT
+0x87	0x2524	#	BOX DRAWINGS LIGHT VERTICAL AND LEFT
+0x88	0x252C	#	BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
+0x89	0x2534	#	BOX DRAWINGS LIGHT UP AND HORIZONTAL
+0x8A	0x253C	#	BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
+0x8B	0x2580	#	UPPER HALF BLOCK
+0x8C	0x2584	#	LOWER HALF BLOCK
+0x8D	0x2588	#	FULL BLOCK
+0x8E	0x258C	#	LEFT HALF BLOCK
+0x8F	0x2590	#	RIGHT HALF BLOCK
+0x90	0x2591	#	LIGHT SHADE
+0x91	0x2592	#	MEDIUM SHADE
+0x92	0x2593	#	DARK SHADE
+0x93	0x2320	#	TOP HALF INTEGRAL
+0x94	0x25A0	#	BLACK SQUARE
+0x95	0x2219	#	BULLET OPERATOR
+0x96	0x221A	#	SQUARE ROOT
+0x97	0x2248	#	ALMOST EQUAL TO
+0x98	0x2264	#	LESS-THAN OR EQUAL TO
+0x99	0x2265	#	GREATER-THAN OR EQUAL TO
+0x9A	0x00A0	#	NO-BREAK SPACE
+0x9B	0x2321	#	BOTTOM HALF INTEGRAL
+0x9C	0x00B0	#	DEGREE SIGN
+0x9D	0x00B2	#	SUPERSCRIPT TWO
+0x9E	0x00B7	#	MIDDLE DOT
+0x9F	0x00F7	#	DIVISION SIGN
+0xA0	0x2550	#	BOX DRAWINGS DOUBLE HORIZONTAL
+0xA1	0x2551	#	BOX DRAWINGS DOUBLE VERTICAL
+0xA2	0x2552	#	BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE
+0xA3	0x0451	#	CYRILLIC SMALL LETTER IO
+0xA4	0x2553	#	BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE
+0xA5	0x2554	#	BOX DRAWINGS DOUBLE DOWN AND RIGHT
+0xA6	0x2555	#	BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE
+0xA7	0x2556	#	BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE
+0xA8	0x2557	#	BOX DRAWINGS DOUBLE DOWN AND LEFT
+0xA9	0x2558	#	BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE
+0xAA	0x2559	#	BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE
+0xAB	0x255A	#	BOX DRAWINGS DOUBLE UP AND RIGHT
+0xAC	0x255B	#	BOX DRAWINGS UP SINGLE AND LEFT DOUBLE
+0xAD	0x255C	#	BOX DRAWINGS UP DOUBLE AND LEFT SINGLE
+0xAE	0x255D	#	BOX DRAWINGS DOUBLE UP AND LEFT
+0xAF	0x255E	#	BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE
+0xB0	0x255F	#	BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE
+0xB1	0x2560	#	BOX DRAWINGS DOUBLE VERTICAL AND RIGHT
+0xB2	0x2561	#	BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE
+0xB3	0x0401	#	CYRILLIC CAPITAL LETTER IO
+0xB4	0x2562	#	BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE
+0xB5	0x2563	#	BOX DRAWINGS DOUBLE VERTICAL AND LEFT
+0xB6	0x2564	#	BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE
+0xB7	0x2565	#	BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE
+0xB8	0x2566	#	BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL
+0xB9	0x2567	#	BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE
+0xBA	0x2568	#	BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE
+0xBB	0x2569	#	BOX DRAWINGS DOUBLE UP AND HORIZONTAL
+0xBC	0x256A	#	BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE
+0xBD	0x256B	#	BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE
+0xBE	0x256C	#	BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL
+0xBF	0x00A9	#	COPYRIGHT SIGN
+0xC0	0x044E	#	CYRILLIC SMALL LETTER YU
+0xC1	0x0430	#	CYRILLIC SMALL LETTER A
+0xC2	0x0431	#	CYRILLIC SMALL LETTER BE
+0xC3	0x0446	#	CYRILLIC SMALL LETTER TSE
+0xC4	0x0434	#	CYRILLIC SMALL LETTER DE
+0xC5	0x0435	#	CYRILLIC SMALL LETTER IE
+0xC6	0x0444	#	CYRILLIC SMALL LETTER EF
+0xC7	0x0433	#	CYRILLIC SMALL LETTER GHE
+0xC8	0x0445	#	CYRILLIC SMALL LETTER HA
+0xC9	0x0438	#	CYRILLIC SMALL LETTER I
+0xCA	0x0439	#	CYRILLIC SMALL LETTER SHORT I
+0xCB	0x043A	#	CYRILLIC SMALL LETTER KA
+0xCC	0x043B	#	CYRILLIC SMALL LETTER EL
+0xCD	0x043C	#	CYRILLIC SMALL LETTER EM
+0xCE	0x043D	#	CYRILLIC SMALL LETTER EN
+0xCF	0x043E	#	CYRILLIC SMALL LETTER O
+0xD0	0x043F	#	CYRILLIC SMALL LETTER PE
+0xD1	0x044F	#	CYRILLIC SMALL LETTER YA
+0xD2	0x0440	#	CYRILLIC SMALL LETTER ER
+0xD3	0x0441	#	CYRILLIC SMALL LETTER ES
+0xD4	0x0442	#	CYRILLIC SMALL LETTER TE
+0xD5	0x0443	#	CYRILLIC SMALL LETTER U
+0xD6	0x0436	#	CYRILLIC SMALL LETTER ZHE
+0xD7	0x0432	#	CYRILLIC SMALL LETTER VE
+0xD8	0x044C	#	CYRILLIC SMALL LETTER SOFT SIGN
+0xD9	0x044B	#	CYRILLIC SMALL LETTER YERU
+0xDA	0x0437	#	CYRILLIC SMALL LETTER ZE
+0xDB	0x0448	#	CYRILLIC SMALL LETTER SHA
+0xDC	0x044D	#	CYRILLIC SMALL LETTER E
+0xDD	0x0449	#	CYRILLIC SMALL LETTER SHCHA
+0xDE	0x0447	#	CYRILLIC SMALL LETTER CHE
+0xDF	0x044A	#	CYRILLIC SMALL LETTER HARD SIGN
+0xE0	0x042E	#	CYRILLIC CAPITAL LETTER YU
+0xE1	0x0410	#	CYRILLIC CAPITAL LETTER A
+0xE2	0x0411	#	CYRILLIC CAPITAL LETTER BE
+0xE3	0x0426	#	CYRILLIC CAPITAL LETTER TSE
+0xE4	0x0414	#	CYRILLIC CAPITAL LETTER DE
+0xE5	0x0415	#	CYRILLIC CAPITAL LETTER IE
+0xE6	0x0424	#	CYRILLIC CAPITAL LETTER EF
+0xE7	0x0413	#	CYRILLIC CAPITAL LETTER GHE
+0xE8	0x0425	#	CYRILLIC CAPITAL LETTER HA
+0xE9	0x0418	#	CYRILLIC CAPITAL LETTER I
+0xEA	0x0419	#	CYRILLIC CAPITAL LETTER SHORT I
+0xEB	0x041A	#	CYRILLIC CAPITAL LETTER KA
+0xEC	0x041B	#	CYRILLIC CAPITAL LETTER EL
+0xED	0x041C	#	CYRILLIC CAPITAL LETTER EM
+0xEE	0x041D	#	CYRILLIC CAPITAL LETTER EN
+0xEF	0x041E	#	CYRILLIC CAPITAL LETTER O
+0xF0	0x041F	#	CYRILLIC CAPITAL LETTER PE
+0xF1	0x042F	#	CYRILLIC CAPITAL LETTER YA
+0xF2	0x0420	#	CYRILLIC CAPITAL LETTER ER
+0xF3	0x0421	#	CYRILLIC CAPITAL LETTER ES
+0xF4	0x0422	#	CYRILLIC CAPITAL LETTER TE
+0xF5	0x0423	#	CYRILLIC CAPITAL LETTER U
+0xF6	0x0416	#	CYRILLIC CAPITAL LETTER ZHE
+0xF7	0x0412	#	CYRILLIC CAPITAL LETTER VE
+0xF8	0x042C	#	CYRILLIC CAPITAL LETTER SOFT SIGN
+0xF9	0x042B	#	CYRILLIC CAPITAL LETTER YERU
+0xFA	0x0417	#	CYRILLIC CAPITAL LETTER ZE
+0xFB	0x0428	#	CYRILLIC CAPITAL LETTER SHA
+0xFC	0x042D	#	CYRILLIC CAPITAL LETTER E
+0xFD	0x0429	#	CYRILLIC CAPITAL LETTER SHCHA
+0xFE	0x0427	#	CYRILLIC CAPITAL LETTER CHE
+0xFF	0x042A	#	CYRILLIC CAPITAL LETTER HARD SIGN
diff --git a/Unicode/mac_lat2.cp b/Unicode/mac_lat2.cp
index 4dc97eb38..3e0068b69 100644
--- a/Unicode/mac_lat2.cp
+++ b/Unicode/mac_lat2.cp
@@ -1,13 +1,27 @@
 Mac latin 2
 "x-mac-ce", "mac-ce", "maclatin2", "10029", "cp10029"
+
+# ----------------------------------------------------------------------
+# The following data was downloaded from
+# http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/MAC/LATIN2.TXT
+# on 2008-10-05, so it is a Unicode Data File covered by the Unicode
+# copyright and permission notice in the COPYING file of ELinks,
+# regardless of any terms shown below.  (There was a similar mapping at
+# http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/CENTEURO.TXT
+# but that one lacked control characters.)
+#
+# This file differs from the original in the following ways:
+# - Added this comment, blank lines around it, and charset names above it.
+# ----------------------------------------------------------------------
+
 #
 #    Name:     cp10029_MacLatin2 to Unicode table
 #    Unicode version: 2.0
 #    Table version: 2.00
 #    Table format:  Format A
 #    Date:          04/24/96
-#    Authors:       Lori Brownell <loribr@microsoft.com>
-#                   K.D. Chang    <a-kchang@microsoft.com>
+#    Contact: Shawn.Steele@microsoft.com
+#                   
 #    General notes: none
 #
 #    Format: Three tab-separated columns
@@ -274,3 +288,4 @@ Mac latin 2
 0xFE	0x0122	#LATIN CAPITAL LETTER G WITH CEDILLA
 0xFF	0x02C7	#CARON
 
+
\ No newline at end of file
diff --git a/Unicode/macroman.cp b/Unicode/macroman.cp
index db3dcc9aa..846d5028c 100644
--- a/Unicode/macroman.cp
+++ b/Unicode/macroman.cp
@@ -1,258 +1,386 @@
 MacRoman 2000
 "x-mac", "mac", "macroman", "Macintosh", "csMacintosh"
-0x00	0x0000	#NULL
-0x01	0x0001	#START OF HEADING
-0x02	0x0002	#START OF TEXT
-0x03	0x0003	#END OF TEXT
-0x04	0x0004	#END OF TRANSMISSION
-0x05	0x0005	#ENQUIRY
-0x06	0x0006	#ACKNOWLEDGE
-0x07	0x0007	#BELL
-0x08	0x0008	#BACKSPACE
-0x09	0x0009	#HORIZONTAL TABULATION
-0x0A	0x000A	#LINE FEED
-0x0B	0x000B	#VERTICAL TABULATION
-0x0C	0x000C	#FORM FEED
-0x0D	0x000D	#CARRIAGE RETURN
-0x0E	0x000E	#SHIFT OUT
-0x0F	0x000F	#SHIFT IN
-0x10	0x0010	#DATA LINK ESCAPE
-0x11	0x0011	#DEVICE CONTROL ONE
-0x12	0x0012	#DEVICE CONTROL TWO
-0x13	0x0013	#DEVICE CONTROL THREE
-0x14	0x0014	#DEVICE CONTROL FOUR
-0x15	0x0015	#NEGATIVE ACKNOWLEDGE
-0x16	0x0016	#SYNCHRONOUS IDLE
-0x17	0x0017	#END OF TRANSMISSION BLOCK
-0x18	0x0018	#CANCEL
-0x19	0x0019	#END OF MEDIUM
-0x1A	0x001A	#SUBSTITUTE
-0x1B	0x001B	#ESCAPE
-0x1C	0x001C	#FILE SEPARATOR
-0x1D	0x001D	#GROUP SEPARATOR
-0x1E	0x001E	#RECORD SEPARATOR
-0x1F	0x001F	#UNIT SEPARATOR
-0x20	0x0020	#SPACE
-0x21	0x0021	#EXCLAMATION MARK
-0x22	0x0022	#QUOTATION MARK
-0x23	0x0023	#NUMBER SIGN
-0x24	0x0024	#DOLLAR SIGN
-0x25	0x0025	#PERCENT SIGN
-0x26	0x0026	#AMPERSAND
-0x27	0x0027	#APOSTROPHE
-0x28	0x0028	#LEFT PARENTHESIS
-0x29	0x0029	#RIGHT PARENTHESIS
-0x2A	0x002A	#ASTERISK
-0x2B	0x002B	#PLUS SIGN
-0x2C	0x002C	#COMMA
-0x2D	0x002D	#HYPHEN-MINUS
-0x2E	0x002E	#FULL STOP
-0x2F	0x002F	#SOLIDUS
-0x30	0x0030	#DIGIT ZERO
-0x31	0x0031	#DIGIT ONE
-0x32	0x0032	#DIGIT TWO
-0x33	0x0033	#DIGIT THREE
-0x34	0x0034	#DIGIT FOUR
-0x35	0x0035	#DIGIT FIVE
-0x36	0x0036	#DIGIT SIX
-0x37	0x0037	#DIGIT SEVEN
-0x38	0x0038	#DIGIT EIGHT
-0x39	0x0039	#DIGIT NINE
-0x3A	0x003A	#COLON
-0x3B	0x003B	#SEMICOLON
-0x3C	0x003C	#LESS-THAN SIGN
-0x3D	0x003D	#EQUALS SIGN
-0x3E	0x003E	#GREATER-THAN SIGN
-0x3F	0x003F	#QUESTION MARK
-0x40	0x0040	#COMMERCIAL AT
-0x41	0x0041	#LATIN CAPITAL LETTER A
-0x42	0x0042	#LATIN CAPITAL LETTER B
-0x43	0x0043	#LATIN CAPITAL LETTER C
-0x44	0x0044	#LATIN CAPITAL LETTER D
-0x45	0x0045	#LATIN CAPITAL LETTER E
-0x46	0x0046	#LATIN CAPITAL LETTER F
-0x47	0x0047	#LATIN CAPITAL LETTER G
-0x48	0x0048	#LATIN CAPITAL LETTER H
-0x49	0x0049	#LATIN CAPITAL LETTER I
-0x4A	0x004A	#LATIN CAPITAL LETTER J
-0x4B	0x004B	#LATIN CAPITAL LETTER K
-0x4C	0x004C	#LATIN CAPITAL LETTER L
-0x4D	0x004D	#LATIN CAPITAL LETTER M
-0x4E	0x004E	#LATIN CAPITAL LETTER N
-0x4F	0x004F	#LATIN CAPITAL LETTER O
-0x50	0x0050	#LATIN CAPITAL LETTER P
-0x51	0x0051	#LATIN CAPITAL LETTER Q
-0x52	0x0052	#LATIN CAPITAL LETTER R
-0x53	0x0053	#LATIN CAPITAL LETTER S
-0x54	0x0054	#LATIN CAPITAL LETTER T
-0x55	0x0055	#LATIN CAPITAL LETTER U
-0x56	0x0056	#LATIN CAPITAL LETTER V
-0x57	0x0057	#LATIN CAPITAL LETTER W
-0x58	0x0058	#LATIN CAPITAL LETTER X
-0x59	0x0059	#LATIN CAPITAL LETTER Y
-0x5A	0x005A	#LATIN CAPITAL LETTER Z
-0x5B	0x005B	#LEFT SQUARE BRACKET
-0x5C	0x005C	#REVERSE SOLIDUS
-0x5D	0x005D	#RIGHT SQUARE BRACKET
-0x5E	0x005E	#CIRCUMFLEX ACCENT
-0x5F	0x005F	#LOW LINE
-0x60	0x0060	#GRAVE ACCENT
-0x61	0x0061	#LATIN SMALL LETTER A
-0x62	0x0062	#LATIN SMALL LETTER B
-0x63	0x0063	#LATIN SMALL LETTER C
-0x64	0x0064	#LATIN SMALL LETTER D
-0x65	0x0065	#LATIN SMALL LETTER E
-0x66	0x0066	#LATIN SMALL LETTER F
-0x67	0x0067	#LATIN SMALL LETTER G
-0x68	0x0068	#LATIN SMALL LETTER H
-0x69	0x0069	#LATIN SMALL LETTER I
-0x6A	0x006A	#LATIN SMALL LETTER J
-0x6B	0x006B	#LATIN SMALL LETTER K
-0x6C	0x006C	#LATIN SMALL LETTER L
-0x6D	0x006D	#LATIN SMALL LETTER M
-0x6E	0x006E	#LATIN SMALL LETTER N
-0x6F	0x006F	#LATIN SMALL LETTER O
-0x70	0x0070	#LATIN SMALL LETTER P
-0x71	0x0071	#LATIN SMALL LETTER Q
-0x72	0x0072	#LATIN SMALL LETTER R
-0x73	0x0073	#LATIN SMALL LETTER S
-0x74	0x0074	#LATIN SMALL LETTER T
-0x75	0x0075	#LATIN SMALL LETTER U
-0x76	0x0076	#LATIN SMALL LETTER V
-0x77	0x0077	#LATIN SMALL LETTER W
-0x78	0x0078	#LATIN SMALL LETTER X
-0x79	0x0079	#LATIN SMALL LETTER Y
-0x7A	0x007A	#LATIN SMALL LETTER Z
-0x7B	0x007B	#LEFT CURLY BRACKET
-0x7C	0x007C	#VERTICAL LINE
-0x7D	0x007D	#RIGHT CURLY BRACKET
-0x7E	0x007E	#TILDE
-0x7F	0x007F	#DELETE
-0x80	0x00C4	#LATIN CAPITAL LETTER A WITH DIAERESIS
-0x81	0x00C5	#LATIN CAPITAL LETTER A WITH RING ABOVE
-0x82	0x00C7	#LATIN CAPITAL LETTER C WITH CEDILLA
-0x83	0x00C9	#LATIN CAPITAL LETTER E WITH ACUTE
-0x84	0x00D1	#LATIN CAPITAL LETTER N WITH TILDE
-0x85	0x00D6	#LATIN CAPITAL LETTER O WITH DIAERESIS
-0x86	0x00DC	#LATIN CAPITAL LETTER U WITH DIAERESIS
-0x87	0x00E1	#LATIN SMALL LETTER A WITH ACUTE
-0x88	0x00E0	#LATIN SMALL LETTER A WITH GRAVE
-0x89	0x00E2	#LATIN SMALL LETTER A WITH CIRCUMFLEX
-0x8A	0x00E4	#LATIN SMALL LETTER A WITH DIAERESIS
-0x8B	0x00E3	#LATIN SMALL LETTER A WITH TILDE
-0x8C	0x00E5	#LATIN SMALL LETTER A WITH RING ABOVE
-0x8D	0x00E7	#LATIN SMALL LETTER C WITH CEDILLA
-0x8E	0x00E9	#LATIN SMALL LETTER E WITH ACUTE
-0x8F	0x00E8	#LATIN SMALL LETTER E WITH GRAVE
-0x90	0x00EA	#LATIN SMALL LETTER E WITH CIRCUMFLEX
-0x91	0x00EB	#LATIN SMALL LETTER E WITH DIAERESIS
-0x92	0x00ED	#LATIN SMALL LETTER I WITH ACUTE
-0x93	0x00EC	#LATIN SMALL LETTER I WITH GRAVE
-0x94	0x00EE	#LATIN SMALL LETTER I WITH CIRCUMFLEX
-0x95	0x00EF	#LATIN SMALL LETTER I WITH DIAERESIS
-0x96	0x00F1	#LATIN SMALL LETTER N WITH TILDE
-0x97	0x00F3	#LATIN SMALL LETTER O WITH ACUTE
-0x98	0x00F2	#LATIN SMALL LETTER O WITH GRAVE
-0x99	0x00F4	#LATIN SMALL LETTER O WITH CIRCUMFLEX
-0x9A	0x00F6	#LATIN SMALL LETTER O WITH DIAERESIS
-0x9B	0x00F5	#LATIN SMALL LETTER O WITH TILDE
-0x9C	0x00FA	#LATIN SMALL LETTER U WITH ACUTE
-0x9D	0x00F9	#LATIN SMALL LETTER U WITH GRAVE
-0x9E	0x00FB	#LATIN SMALL LETTER U WITH CIRCUMFLEX
-0x9F	0x00FC	#LATIN SMALL LETTER U WITH DIAERESIS
-0xA0	0x2020	#DAGGER
-0xA1	0x00B0	#DEGREE SIGN
-0xA2	0x00A2	#CENT SIGN
-0xA3	0x00A3	#POUND SIGN
-0xA4	0x00A7	#SECTION SIGN
-0xA5	0x2022	#PUCE
-0xA6	0x00B6	#PILCROW SIGN
-0xA7	0x00DF	#LATIN SMALL LETTER SHARP S (GERMAN)
-0xA8	0x00AE	#REGISTERED SIGN
-0xA9	0x00A9	#COPYRIGHT SIGN
-0xAA	0x2122	#TRADE MARK SIGN
-0xAB	0x00B4	#ACUTE ACCENT
-0xAC	0x00A8	#DIAERESIS
-0xAD	0x2260	#NOT EQUAL TO
-0xAE	0x00C6	#LATIN CAPITAL LETTER AE
-0xAF	0x00D8	#LATIN CAPITAL LETTER O WITH STROKE
-0xB0	0x221E	#INFINITY
-0xB1	0x00B1	#PLUS-MINUS SIGN
-0xB2	0x2264	#LESS-THAN OR EQUAL TO
-0xB3	0x2265	#GREATER-THAN OR EQUAL TO
-0xB4	0x00A5	#YEN SIGN
-0xB5	0x00B5	#MICRO SIGN
-0xB6	0x2202	#PARTIAL DIFFERENTIAL
-0xB7	0x2211	#N-ARY SUMMATION
-0xB8	0x220F	#N-ARY PRODUCT
-0xB9	0x03C0	#GREEK SMALL LETTER PI
-0xBA	0x222B	#INTEGRAL
-0xBB	0x00AA	#FEMININE ORDINAL INDICATOR
-0xBC	0x00BA	#MASCULINE ORDINAL INDICATOR
-0xBD	0x03A9	#GREEK CAPITAL LETTER OMEGA
-0xBE	0x00E6	#LATIN SMALL LETTER AE
-0xBF	0x00F8	#LATIN SMALL LETTER O WITH STROKE
-0xC0	0x00BF	#INVERTED QUESTION MARK
-0xC1	0x00A1	#INVERTED EXCLAMATION MARK
-0xC2	0x00AC	#NOT SIGN
-0xC3	0x221A	#SQUARE ROOT
-0xC4	0x0192	#LETTRE MINUSCULE LATINE F HAMEçON
-0xC5	0x2248	#ALMOST EQUAL TO
-0xC6	0x0394	#GREEK CAPITAL LETTER DELTA
-0xC7	0x00AB	#LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xC8	0x00BB	#RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xC9	0x2026	#MIDLINE HORIZONTAL ELLIPSIS
-0xCA	0x00A0	#NO-BREAK SPACE
-0xCB	0x00C0	#LATIN CAPITAL LETTER A WITH GRAVE
-0xCC	0x00C3	#LATIN CAPITAL LETTER A WITH TILDE
-0xCD	0x00D5	#LATIN CAPITAL LETTER O WITH TILDE
-0xCE	0x0152	#LATIN CAPITAL LIGATURE OE
-0xCF	0x0153	#LATIN SMALL LIGATURE OE
-0xD0	0x2013	#EN DASH
-0xD1	0x2014	#EM DASH
-0xD2	0x201C	#LEFT DOUBLE QUOTATION MARK
-0xD3	0x201D	#RIGHT DOUBLE QUOTATION MARK
-0xD4	0x2018	#LEFT SINGLE QUOTATION MARK
-0xD5	0x2019	#RIGHT SINGLE QUOTATION MARK
-0xD6	0x00F7	#DIVISION SIGN
-0xD7	0x25CA	#LOZENGE
-0xD8	0x00FF	#LATIN SMALL LETTER Y WITH DIAERESIS
-0xD9	0x0178	#LATIN CAPITAL LETTER Y WITH DIAERESIS
-0xDA	0x2044	#FRACTION SLASH
-0xDB	0x20AC	#SYMBOLE EURO
-0xDC	0x2039	#SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-0xDD	0x203A	#SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
-0xDE	0xFB01	#LATIN SMALL LIGATURE FI
-0xDF	0xFB02	#LATIN SMALL LIGATURE FL
-0xE0	0x2021	#DOUBLE DAGGER
-0xE1	0x00B7	#MIDDLE DOT
-0xE2	0x201A	#SINGLE LOW-9 QUOTATION MARK
-0xE3	0x201E	#DOUBLE LOW-9 QUOTATION MARK
-0xE4	0x2030	#PER MILLE SIGN
-0xE5	0x00C2	#LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-0xE6	0x00CA	#LATIN CAPITAL LETTER E WITH CIRCUMFLEX
-0xE7	0x00C1	#LATIN CAPITAL LETTER A WITH ACUTE
-0xE8	0x00CB	#LATIN CAPITAL LETTER E WITH DIAERESIS
-0xE9	0x00C8	#LATIN CAPITAL LETTER E WITH GRAVE
-0xEA	0x00CD	#LATIN CAPITAL LETTER I WITH ACUTE
-0xEB	0x00CE	#LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-0xEC	0x00CF	#LATIN CAPITAL LETTER I WITH DIAERESIS
-0xED	0x00CC	#LATIN CAPITAL LETTER I WITH GRAVE
-0xEE	0x00D3	#LATIN CAPITAL LETTER O WITH ACUTE
-0xEF	0x00D4	#LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-0xF0	0xF8FF	#Mac Logo (in Private Use Area)
-0xF1	0x00D2	#LATIN CAPITAL LETTER O WITH GRAVE
-0xF2	0x00DA	#LATIN CAPITAL LETTER U WITH ACUTE
-0xF3	0x00DB	#LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-0xF4	0x00D9	#LATIN CAPITAL LETTER U WITH GRAVE
-0xF5	0x0131	#LATIN SMALL LETTER I DOTLESS
-0xF6	0x02C6	#LETTRE MODIFICATIVE ACCENT CIRCONFLEXE
-0xF7	0x02DC	#PETIT TILDE
-0xF8	0x00AF	#MACRON
-0xF9	0x02D8	#BREVE
-0xFA	0x02D9	#DOT ABOVE
-0xFB	0x02DA	#RING ABOVE
-0xFC	0x00B8	#CEDILLA
-0xFD	0x02DD	#DOUBLE ACUTE ACCENT
-0xFE	0x02DB	#OGONEK
-0xFF	0x02C7	#CARON
+
+# ----------------------------------------------------------------------
+# The following data was downloaded from
+# http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/ROMAN.TXT
+# on 2008-10-11, so it is a Unicode Data File covered by the Unicode
+# copyright and permission notice in the COPYING file of ELinks,
+# regardless of any terms shown below.  (There was a similar mapping at
+# http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/MAC/ROMAN.TXT
+# but that one was out of date.)
+#
+# This file differs from the original in the following ways:
+# - Added this comment, blank lines around it, and charset names above it.
+# ----------------------------------------------------------------------
+
+#=======================================================================
+#   File name:  ROMAN.TXT
+#
+#   Contents:   Map (external version) from Mac OS Roman
+#               character set to Unicode 2.1 and later.
+#
+#   Copyright:  (c) 1994-2002, 2005 by Apple Computer, Inc., all rights
+#               reserved.
+#
+#   Contact:    charsets@apple.com
+#
+#   Changes:
+#
+#       c02  2005-Apr-05    Update header comments. Matches internal xml
+#                           <c1.1> and Text Encoding Converter 2.0.
+#      b4,c1 2002-Dec-19    Update URLs, notes. Matches internal
+#                           utom<b5>.
+#       b03  1999-Sep-22    Update contact e-mail address. Matches
+#                           internal utom<b4>, ufrm<b3>, and Text
+#                           Encoding Converter version 1.5.
+#       b02  1998-Aug-18    Encoding changed for Mac OS 8.5; change
+#                           mapping of 0xDB from CURRENCY SIGN to
+#                           EURO SIGN. Matches internal utom<b3>,
+#                           ufrm<b3>.
+#       n08  1998-Feb-05    Minor update to header comments
+#       n06  1997-Dec-14    Add warning about future changes to 0xDB
+#                           from CURRENCY SIGN to EURO SIGN. Clarify
+#                           some header information
+#       n04  1997-Dec-01    Update to match internal utom<n3>, ufrm<n22>:
+#                           Change standard mapping for 0xBD from U+2126
+#                           to its canonical decomposition, U+03A9.
+#       n03  1995-Apr-15    First version (after fixing some typos).
+#                           Matches internal ufrm<n9>.
+#
+# Standard header:
+# ----------------
+#
+#   Apple, the Apple logo, and Macintosh are trademarks of Apple
+#   Computer, Inc., registered in the United States and other countries.
+#   Unicode is a trademark of Unicode Inc. For the sake of brevity,
+#   throughout this document, "Macintosh" can be used to refer to
+#   Macintosh computers and "Unicode" can be used to refer to the
+#   Unicode standard.
+#
+#   Apple Computer, Inc. ("Apple") makes no warranty or representation,
+#   either express or implied, with respect to this document and the
+#   included data, its quality, accuracy, or fitness for a particular
+#   purpose. In no event will Apple be liable for direct, indirect,
+#   special, incidental, or consequential damages resulting from any
+#   defect or inaccuracy in this document or the included data.
+#
+#   These mapping tables and character lists are subject to change.
+#   The latest tables should be available from the following:
+#
+#   <http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/>
+#
+#   For general information about Mac OS encodings and these mapping
+#   tables, see the file "README.TXT".
+#
+# Format:
+# -------
+#
+#   Three tab-separated columns;
+#   '#' begins a comment which continues to the end of the line.
+#     Column #1 is the Mac OS Roman code (in hex as 0xNN)
+#     Column #2 is the corresponding Unicode (in hex as 0xNNNN)
+#     Column #3 is a comment containing the Unicode name
+#
+#   The entries are in Mac OS Roman code order.
+#
+#   One of these mappings requires the use of a corporate character.
+#   See the file "CORPCHAR.TXT" and notes below.
+#
+#   Control character mappings are not shown in this table, following
+#   the conventions of the standard UTC mapping tables. However, the
+#   Mac OS Roman character set uses the standard control characters at
+#   0x00-0x1F and 0x7F.
+#
+# Notes on Mac OS Roman:
+# ----------------------
+#
+#   This is a legacy Mac OS encoding; in the Mac OS X Carbon and Cocoa
+#   environments, it is only supported directly in programming
+#   interfaces for QuickDraw Text, the Script Manager, and related
+#   Text Utilities. For other purposes it is supported via transcoding
+#   to and from Unicode.
+#
+#   This character set is used for at least the following Mac OS
+#   localizations: U.S., British, Canadian French, French, Swiss
+#   French, German, Swiss German, Italian, Swiss Italian, Dutch,
+#   Swedish, Norwegian, Danish, Finnish, Spanish, Catalan,
+#   Portuguese, Brazilian, and the default International system.
+#
+#   Variants of Mac OS Roman are used for Croatian, Icelandic,
+#   Turkish, Romanian, and other encodings. Separate mapping tables
+#   are available for these encodings.
+#
+#   Before Mac OS 8.5, code point 0xDB was CURRENCY SIGN, and was
+#   mapped to U+00A4. In Mac OS 8.5 and later versions, code point
+#   0xDB is changed to EURO SIGN and maps to U+20AC; the standard
+#   Apple fonts are updated for Mac OS 8.5 to reflect this. There is
+#   a "currency sign" variant of the Mac OS Roman encoding that still
+#   maps 0xDB to U+00A4; this can be used for older fonts.
+#
+#   Before Mac OS 8.5, the ROM bitmap versions of the fonts Chicago,
+#   New York, Geneva, and Monaco did not implement the full Mac OS
+#   Roman character set; they only supported character codes up to
+#   0xD8. The TrueType versions of these fonts have always implemented
+#   the full character set, as with the bitmap and TrueType versions
+#   of the other standard Roman fonts.
+#
+#   In all Mac OS encodings, fonts such as Chicago which are used
+#   as "system" fonts (for menus, dialogs, etc.) have four glyphs
+#   at code points 0x11-0x14 for transient use by the Menu Manager.
+#   These glyphs are not intended as characters for use in normal
+#   text, and the associated code points are not generally
+#   interpreted as associated with these glyphs; they are usually
+#   interpreted (if at all) as the control codes DC1-DC4.
+#
+# Unicode mapping issues and notes:
+# ---------------------------------
+#
+#   The following corporate zone Unicode character is used in this
+#   mapping:
+#
+#     0xF8FF  Apple logo
+#
+#   NOTE: The graphic image associated with the Apple logo character
+#   is not authorized for use without permission of Apple, and
+#   unauthorized use might constitute trademark infringement.
+#
+# Details of mapping changes in each version:
+# -------------------------------------------
+#
+#   Changes from version n08 to version b02:
+#
+#   - Encoding changed for Mac OS 8.5; change mapping of 0xDB from
+#   CURRENCY SIGN (U+00A4) to EURO SIGN (U+20AC).
+#
+#   Changes from version n03 to version n04:
+#
+#   - Change mapping of 0xBD from U+2126 to its canonical
+#     decomposition, U+03A9.
+#
+##################
+
+0x20	0x0020	# SPACE
+0x21	0x0021	# EXCLAMATION MARK
+0x22	0x0022	# QUOTATION MARK
+0x23	0x0023	# NUMBER SIGN
+0x24	0x0024	# DOLLAR SIGN
+0x25	0x0025	# PERCENT SIGN
+0x26	0x0026	# AMPERSAND
+0x27	0x0027	# APOSTROPHE
+0x28	0x0028	# LEFT PARENTHESIS
+0x29	0x0029	# RIGHT PARENTHESIS
+0x2A	0x002A	# ASTERISK
+0x2B	0x002B	# PLUS SIGN
+0x2C	0x002C	# COMMA
+0x2D	0x002D	# HYPHEN-MINUS
+0x2E	0x002E	# FULL STOP
+0x2F	0x002F	# SOLIDUS
+0x30	0x0030	# DIGIT ZERO
+0x31	0x0031	# DIGIT ONE
+0x32	0x0032	# DIGIT TWO
+0x33	0x0033	# DIGIT THREE
+0x34	0x0034	# DIGIT FOUR
+0x35	0x0035	# DIGIT FIVE
+0x36	0x0036	# DIGIT SIX
+0x37	0x0037	# DIGIT SEVEN
+0x38	0x0038	# DIGIT EIGHT
+0x39	0x0039	# DIGIT NINE
+0x3A	0x003A	# COLON
+0x3B	0x003B	# SEMICOLON
+0x3C	0x003C	# LESS-THAN SIGN
+0x3D	0x003D	# EQUALS SIGN
+0x3E	0x003E	# GREATER-THAN SIGN
+0x3F	0x003F	# QUESTION MARK
+0x40	0x0040	# COMMERCIAL AT
+0x41	0x0041	# LATIN CAPITAL LETTER A
+0x42	0x0042	# LATIN CAPITAL LETTER B
+0x43	0x0043	# LATIN CAPITAL LETTER C
+0x44	0x0044	# LATIN CAPITAL LETTER D
+0x45	0x0045	# LATIN CAPITAL LETTER E
+0x46	0x0046	# LATIN CAPITAL LETTER F
+0x47	0x0047	# LATIN CAPITAL LETTER G
+0x48	0x0048	# LATIN CAPITAL LETTER H
+0x49	0x0049	# LATIN CAPITAL LETTER I
+0x4A	0x004A	# LATIN CAPITAL LETTER J
+0x4B	0x004B	# LATIN CAPITAL LETTER K
+0x4C	0x004C	# LATIN CAPITAL LETTER L
+0x4D	0x004D	# LATIN CAPITAL LETTER M
+0x4E	0x004E	# LATIN CAPITAL LETTER N
+0x4F	0x004F	# LATIN CAPITAL LETTER O
+0x50	0x0050	# LATIN CAPITAL LETTER P
+0x51	0x0051	# LATIN CAPITAL LETTER Q
+0x52	0x0052	# LATIN CAPITAL LETTER R
+0x53	0x0053	# LATIN CAPITAL LETTER S
+0x54	0x0054	# LATIN CAPITAL LETTER T
+0x55	0x0055	# LATIN CAPITAL LETTER U
+0x56	0x0056	# LATIN CAPITAL LETTER V
+0x57	0x0057	# LATIN CAPITAL LETTER W
+0x58	0x0058	# LATIN CAPITAL LETTER X
+0x59	0x0059	# LATIN CAPITAL LETTER Y
+0x5A	0x005A	# LATIN CAPITAL LETTER Z
+0x5B	0x005B	# LEFT SQUARE BRACKET
+0x5C	0x005C	# REVERSE SOLIDUS
+0x5D	0x005D	# RIGHT SQUARE BRACKET
+0x5E	0x005E	# CIRCUMFLEX ACCENT
+0x5F	0x005F	# LOW LINE
+0x60	0x0060	# GRAVE ACCENT
+0x61	0x0061	# LATIN SMALL LETTER A
+0x62	0x0062	# LATIN SMALL LETTER B
+0x63	0x0063	# LATIN SMALL LETTER C
+0x64	0x0064	# LATIN SMALL LETTER D
+0x65	0x0065	# LATIN SMALL LETTER E
+0x66	0x0066	# LATIN SMALL LETTER F
+0x67	0x0067	# LATIN SMALL LETTER G
+0x68	0x0068	# LATIN SMALL LETTER H
+0x69	0x0069	# LATIN SMALL LETTER I
+0x6A	0x006A	# LATIN SMALL LETTER J
+0x6B	0x006B	# LATIN SMALL LETTER K
+0x6C	0x006C	# LATIN SMALL LETTER L
+0x6D	0x006D	# LATIN SMALL LETTER M
+0x6E	0x006E	# LATIN SMALL LETTER N
+0x6F	0x006F	# LATIN SMALL LETTER O
+0x70	0x0070	# LATIN SMALL LETTER P
+0x71	0x0071	# LATIN SMALL LETTER Q
+0x72	0x0072	# LATIN SMALL LETTER R
+0x73	0x0073	# LATIN SMALL LETTER S
+0x74	0x0074	# LATIN SMALL LETTER T
+0x75	0x0075	# LATIN SMALL LETTER U
+0x76	0x0076	# LATIN SMALL LETTER V
+0x77	0x0077	# LATIN SMALL LETTER W
+0x78	0x0078	# LATIN SMALL LETTER X
+0x79	0x0079	# LATIN SMALL LETTER Y
+0x7A	0x007A	# LATIN SMALL LETTER Z
+0x7B	0x007B	# LEFT CURLY BRACKET
+0x7C	0x007C	# VERTICAL LINE
+0x7D	0x007D	# RIGHT CURLY BRACKET
+0x7E	0x007E	# TILDE
+#
+0x80	0x00C4	# LATIN CAPITAL LETTER A WITH DIAERESIS
+0x81	0x00C5	# LATIN CAPITAL LETTER A WITH RING ABOVE
+0x82	0x00C7	# LATIN CAPITAL LETTER C WITH CEDILLA
+0x83	0x00C9	# LATIN CAPITAL LETTER E WITH ACUTE
+0x84	0x00D1	# LATIN CAPITAL LETTER N WITH TILDE
+0x85	0x00D6	# LATIN CAPITAL LETTER O WITH DIAERESIS
+0x86	0x00DC	# LATIN CAPITAL LETTER U WITH DIAERESIS
+0x87	0x00E1	# LATIN SMALL LETTER A WITH ACUTE
+0x88	0x00E0	# LATIN SMALL LETTER A WITH GRAVE
+0x89	0x00E2	# LATIN SMALL LETTER A WITH CIRCUMFLEX
+0x8A	0x00E4	# LATIN SMALL LETTER A WITH DIAERESIS
+0x8B	0x00E3	# LATIN SMALL LETTER A WITH TILDE
+0x8C	0x00E5	# LATIN SMALL LETTER A WITH RING ABOVE
+0x8D	0x00E7	# LATIN SMALL LETTER C WITH CEDILLA
+0x8E	0x00E9	# LATIN SMALL LETTER E WITH ACUTE
+0x8F	0x00E8	# LATIN SMALL LETTER E WITH GRAVE
+0x90	0x00EA	# LATIN SMALL LETTER E WITH CIRCUMFLEX
+0x91	0x00EB	# LATIN SMALL LETTER E WITH DIAERESIS
+0x92	0x00ED	# LATIN SMALL LETTER I WITH ACUTE
+0x93	0x00EC	# LATIN SMALL LETTER I WITH GRAVE
+0x94	0x00EE	# LATIN SMALL LETTER I WITH CIRCUMFLEX
+0x95	0x00EF	# LATIN SMALL LETTER I WITH DIAERESIS
+0x96	0x00F1	# LATIN SMALL LETTER N WITH TILDE
+0x97	0x00F3	# LATIN SMALL LETTER O WITH ACUTE
+0x98	0x00F2	# LATIN SMALL LETTER O WITH GRAVE
+0x99	0x00F4	# LATIN SMALL LETTER O WITH CIRCUMFLEX
+0x9A	0x00F6	# LATIN SMALL LETTER O WITH DIAERESIS
+0x9B	0x00F5	# LATIN SMALL LETTER O WITH TILDE
+0x9C	0x00FA	# LATIN SMALL LETTER U WITH ACUTE
+0x9D	0x00F9	# LATIN SMALL LETTER U WITH GRAVE
+0x9E	0x00FB	# LATIN SMALL LETTER U WITH CIRCUMFLEX
+0x9F	0x00FC	# LATIN SMALL LETTER U WITH DIAERESIS
+0xA0	0x2020	# DAGGER
+0xA1	0x00B0	# DEGREE SIGN
+0xA2	0x00A2	# CENT SIGN
+0xA3	0x00A3	# POUND SIGN
+0xA4	0x00A7	# SECTION SIGN
+0xA5	0x2022	# BULLET
+0xA6	0x00B6	# PILCROW SIGN
+0xA7	0x00DF	# LATIN SMALL LETTER SHARP S
+0xA8	0x00AE	# REGISTERED SIGN
+0xA9	0x00A9	# COPYRIGHT SIGN
+0xAA	0x2122	# TRADE MARK SIGN
+0xAB	0x00B4	# ACUTE ACCENT
+0xAC	0x00A8	# DIAERESIS
+0xAD	0x2260	# NOT EQUAL TO
+0xAE	0x00C6	# LATIN CAPITAL LETTER AE
+0xAF	0x00D8	# LATIN CAPITAL LETTER O WITH STROKE
+0xB0	0x221E	# INFINITY
+0xB1	0x00B1	# PLUS-MINUS SIGN
+0xB2	0x2264	# LESS-THAN OR EQUAL TO
+0xB3	0x2265	# GREATER-THAN OR EQUAL TO
+0xB4	0x00A5	# YEN SIGN
+0xB5	0x00B5	# MICRO SIGN
+0xB6	0x2202	# PARTIAL DIFFERENTIAL
+0xB7	0x2211	# N-ARY SUMMATION
+0xB8	0x220F	# N-ARY PRODUCT
+0xB9	0x03C0	# GREEK SMALL LETTER PI
+0xBA	0x222B	# INTEGRAL
+0xBB	0x00AA	# FEMININE ORDINAL INDICATOR
+0xBC	0x00BA	# MASCULINE ORDINAL INDICATOR
+0xBD	0x03A9	# GREEK CAPITAL LETTER OMEGA
+0xBE	0x00E6	# LATIN SMALL LETTER AE
+0xBF	0x00F8	# LATIN SMALL LETTER O WITH STROKE
+0xC0	0x00BF	# INVERTED QUESTION MARK
+0xC1	0x00A1	# INVERTED EXCLAMATION MARK
+0xC2	0x00AC	# NOT SIGN
+0xC3	0x221A	# SQUARE ROOT
+0xC4	0x0192	# LATIN SMALL LETTER F WITH HOOK
+0xC5	0x2248	# ALMOST EQUAL TO
+0xC6	0x2206	# INCREMENT
+0xC7	0x00AB	# LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+0xC8	0x00BB	# RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+0xC9	0x2026	# HORIZONTAL ELLIPSIS
+0xCA	0x00A0	# NO-BREAK SPACE
+0xCB	0x00C0	# LATIN CAPITAL LETTER A WITH GRAVE
+0xCC	0x00C3	# LATIN CAPITAL LETTER A WITH TILDE
+0xCD	0x00D5	# LATIN CAPITAL LETTER O WITH TILDE
+0xCE	0x0152	# LATIN CAPITAL LIGATURE OE
+0xCF	0x0153	# LATIN SMALL LIGATURE OE
+0xD0	0x2013	# EN DASH
+0xD1	0x2014	# EM DASH
+0xD2	0x201C	# LEFT DOUBLE QUOTATION MARK
+0xD3	0x201D	# RIGHT DOUBLE QUOTATION MARK
+0xD4	0x2018	# LEFT SINGLE QUOTATION MARK
+0xD5	0x2019	# RIGHT SINGLE QUOTATION MARK
+0xD6	0x00F7	# DIVISION SIGN
+0xD7	0x25CA	# LOZENGE
+0xD8	0x00FF	# LATIN SMALL LETTER Y WITH DIAERESIS
+0xD9	0x0178	# LATIN CAPITAL LETTER Y WITH DIAERESIS
+0xDA	0x2044	# FRACTION SLASH
+0xDB	0x20AC	# EURO SIGN
+0xDC	0x2039	# SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+0xDD	0x203A	# SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+0xDE	0xFB01	# LATIN SMALL LIGATURE FI
+0xDF	0xFB02	# LATIN SMALL LIGATURE FL
+0xE0	0x2021	# DOUBLE DAGGER
+0xE1	0x00B7	# MIDDLE DOT
+0xE2	0x201A	# SINGLE LOW-9 QUOTATION MARK
+0xE3	0x201E	# DOUBLE LOW-9 QUOTATION MARK
+0xE4	0x2030	# PER MILLE SIGN
+0xE5	0x00C2	# LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+0xE6	0x00CA	# LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+0xE7	0x00C1	# LATIN CAPITAL LETTER A WITH ACUTE
+0xE8	0x00CB	# LATIN CAPITAL LETTER E WITH DIAERESIS
+0xE9	0x00C8	# LATIN CAPITAL LETTER E WITH GRAVE
+0xEA	0x00CD	# LATIN CAPITAL LETTER I WITH ACUTE
+0xEB	0x00CE	# LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+0xEC	0x00CF	# LATIN CAPITAL LETTER I WITH DIAERESIS
+0xED	0x00CC	# LATIN CAPITAL LETTER I WITH GRAVE
+0xEE	0x00D3	# LATIN CAPITAL LETTER O WITH ACUTE
+0xEF	0x00D4	# LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+0xF0	0xF8FF	# Apple logo
+0xF1	0x00D2	# LATIN CAPITAL LETTER O WITH GRAVE
+0xF2	0x00DA	# LATIN CAPITAL LETTER U WITH ACUTE
+0xF3	0x00DB	# LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+0xF4	0x00D9	# LATIN CAPITAL LETTER U WITH GRAVE
+0xF5	0x0131	# LATIN SMALL LETTER DOTLESS I
+0xF6	0x02C6	# MODIFIER LETTER CIRCUMFLEX ACCENT
+0xF7	0x02DC	# SMALL TILDE
+0xF8	0x00AF	# MACRON
+0xF9	0x02D8	# BREVE
+0xFA	0x02D9	# DOT ABOVE
+0xFB	0x02DA	# RING ABOVE
+0xFC	0x00B8	# CEDILLA
+0xFD	0x02DD	# DOUBLE ACUTE ACCENT
+0xFE	0x02DB	# OGONEK
+0xFF	0x02C7	# CARON
diff --git a/src/intl/codepage.inc b/src/intl/codepage.inc
index 026d60424..40561424b 100644
--- a/src/intl/codepage.inc
+++ b/src/intl/codepage.inc
@@ -1,5 +1,6 @@
 /* Automatically generated by gen-cp */
 /* DO NOT EDIT THIS FILE! EDIT Unicode/<whatever> INSTEAD! */
+/* See the input files for copyrights and licences. */
 
 
 
@@ -33,38 +34,38 @@ unsigned char *const aliases_7bit [] = {
 /*** 8859_1 ***/
 
 const uint16_t highhalf_8859_1 [] = {
-	/* 0x80 */ 0xFFFF,
-	/* 0x81 */ 0xFFFF,
-	/* 0x82 */ 0xFFFF,
-	/* 0x83 */ 0xFFFF,
-	/* 0x84 */ 0xFFFF,
-	/* 0x85 */ 0xFFFF,
-	/* 0x86 */ 0xFFFF,
-	/* 0x87 */ 0xFFFF,
-	/* 0x88 */ 0xFFFF,
-	/* 0x89 */ 0xFFFF,
-	/* 0x8A */ 0xFFFF,
-	/* 0x8B */ 0xFFFF,
-	/* 0x8C */ 0xFFFF,
-	/* 0x8D */ 0xFFFF,
-	/* 0x8E */ 0xFFFF,
-	/* 0x8F */ 0xFFFF,
-	/* 0x90 */ 0xFFFF,
-	/* 0x91 */ 0xFFFF,
-	/* 0x92 */ 0xFFFF,
-	/* 0x93 */ 0xFFFF,
-	/* 0x94 */ 0xFFFF,
-	/* 0x95 */ 0xFFFF,
-	/* 0x96 */ 0xFFFF,
-	/* 0x97 */ 0xFFFF,
-	/* 0x98 */ 0xFFFF,
-	/* 0x99 */ 0xFFFF,
-	/* 0x9A */ 0xFFFF,
-	/* 0x9B */ 0xFFFF,
-	/* 0x9C */ 0xFFFF,
-	/* 0x9D */ 0xFFFF,
-	/* 0x9E */ 0xFFFF,
-	/* 0x9F */ 0xFFFF,
+	/* 0x80 */ 0x0080, /* <control> */
+	/* 0x81 */ 0x0081, /* <control> */
+	/* 0x82 */ 0x0082, /* <control> */
+	/* 0x83 */ 0x0083, /* <control> */
+	/* 0x84 */ 0x0084, /* <control> */
+	/* 0x85 */ 0x0085, /* <control> */
+	/* 0x86 */ 0x0086, /* <control> */
+	/* 0x87 */ 0x0087, /* <control> */
+	/* 0x88 */ 0x0088, /* <control> */
+	/* 0x89 */ 0x0089, /* <control> */
+	/* 0x8A */ 0x008A, /* <control> */
+	/* 0x8B */ 0x008B, /* <control> */
+	/* 0x8C */ 0x008C, /* <control> */
+	/* 0x8D */ 0x008D, /* <control> */
+	/* 0x8E */ 0x008E, /* <control> */
+	/* 0x8F */ 0x008F, /* <control> */
+	/* 0x90 */ 0x0090, /* <control> */
+	/* 0x91 */ 0x0091, /* <control> */
+	/* 0x92 */ 0x0092, /* <control> */
+	/* 0x93 */ 0x0093, /* <control> */
+	/* 0x94 */ 0x0094, /* <control> */
+	/* 0x95 */ 0x0095, /* <control> */
+	/* 0x96 */ 0x0096, /* <control> */
+	/* 0x97 */ 0x0097, /* <control> */
+	/* 0x98 */ 0x0098, /* <control> */
+	/* 0x99 */ 0x0099, /* <control> */
+	/* 0x9A */ 0x009A, /* <control> */
+	/* 0x9B */ 0x009B, /* <control> */
+	/* 0x9C */ 0x009C, /* <control> */
+	/* 0x9D */ 0x009D, /* <control> */
+	/* 0x9E */ 0x009E, /* <control> */
+	/* 0x9F */ 0x009F, /* <control> */
 	/* 0xA0 */ 0x00A0, /* NO-BREAK SPACE */
 	/* 0xA1 */ 0x00A1, /* INVERTED EXCLAMATION MARK */
 	/* 0xA2 */ 0x00A2, /* CENT SIGN */
@@ -113,7 +114,7 @@ const uint16_t highhalf_8859_1 [] = {
 	/* 0xCD */ 0x00CD, /* LATIN CAPITAL LETTER I WITH ACUTE */
 	/* 0xCE */ 0x00CE, /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
 	/* 0xCF */ 0x00CF, /* LATIN CAPITAL LETTER I WITH DIAERESIS */
-	/* 0xD0 */ 0x00D0, /* LATIN CAPITAL LETTER ETH */
+	/* 0xD0 */ 0x00D0, /* LATIN CAPITAL LETTER ETH (Icelandic) */
 	/* 0xD1 */ 0x00D1, /* LATIN CAPITAL LETTER N WITH TILDE */
 	/* 0xD2 */ 0x00D2, /* LATIN CAPITAL LETTER O WITH GRAVE */
 	/* 0xD3 */ 0x00D3, /* LATIN CAPITAL LETTER O WITH ACUTE */
@@ -127,8 +128,8 @@ const uint16_t highhalf_8859_1 [] = {
 	/* 0xDB */ 0x00DB, /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */
 	/* 0xDC */ 0x00DC, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
 	/* 0xDD */ 0x00DD, /* LATIN CAPITAL LETTER Y WITH ACUTE */
-	/* 0xDE */ 0x00DE, /* LATIN CAPITAL LETTER THORN */
-	/* 0xDF */ 0x00DF, /* LATIN SMALL LETTER SHARP S */
+	/* 0xDE */ 0x00DE, /* LATIN CAPITAL LETTER THORN (Icelandic) */
+	/* 0xDF */ 0x00DF, /* LATIN SMALL LETTER SHARP S (German) */
 	/* 0xE0 */ 0x00E0, /* LATIN SMALL LETTER A WITH GRAVE */
 	/* 0xE1 */ 0x00E1, /* LATIN SMALL LETTER A WITH ACUTE */
 	/* 0xE2 */ 0x00E2, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
@@ -145,7 +146,7 @@ const uint16_t highhalf_8859_1 [] = {
 	/* 0xED */ 0x00ED, /* LATIN SMALL LETTER I WITH ACUTE */
 	/* 0xEE */ 0x00EE, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */
 	/* 0xEF */ 0x00EF, /* LATIN SMALL LETTER I WITH DIAERESIS */
-	/* 0xF0 */ 0x00F0, /* LATIN SMALL LETTER ETH */
+	/* 0xF0 */ 0x00F0, /* LATIN SMALL LETTER ETH (Icelandic) */
 	/* 0xF1 */ 0x00F1, /* LATIN SMALL LETTER N WITH TILDE */
 	/* 0xF2 */ 0x00F2, /* LATIN SMALL LETTER O WITH GRAVE */
 	/* 0xF3 */ 0x00F3, /* LATIN SMALL LETTER O WITH ACUTE */
@@ -159,7 +160,7 @@ const uint16_t highhalf_8859_1 [] = {
 	/* 0xFB */ 0x00FB, /* LATIN SMALL LETTER U WITH CIRCUMFLEX */
 	/* 0xFC */ 0x00FC, /* LATIN SMALL LETTER U WITH DIAERESIS */
 	/* 0xFD */ 0x00FD, /* LATIN SMALL LETTER Y WITH ACUTE */
-	/* 0xFE */ 0x00FE, /* LATIN SMALL LETTER THORN */
+	/* 0xFE */ 0x00FE, /* LATIN SMALL LETTER THORN (Icelandic) */
 	/* 0xFF */ 0x00FF, /* LATIN SMALL LETTER Y WITH DIAERESIS */
 };
 
@@ -187,38 +188,38 @@ unsigned char *const aliases_8859_1 [] = {
 /*** 8859_2 ***/
 
 const uint16_t highhalf_8859_2 [] = {
-	/* 0x80 */ 0xFFFF,
-	/* 0x81 */ 0xFFFF,
-	/* 0x82 */ 0xFFFF,
-	/* 0x83 */ 0xFFFF,
-	/* 0x84 */ 0xFFFF,
-	/* 0x85 */ 0xFFFF,
-	/* 0x86 */ 0xFFFF,
-	/* 0x87 */ 0xFFFF,
-	/* 0x88 */ 0xFFFF,
-	/* 0x89 */ 0xFFFF,
-	/* 0x8A */ 0xFFFF,
-	/* 0x8B */ 0xFFFF,
-	/* 0x8C */ 0xFFFF,
-	/* 0x8D */ 0xFFFF,
-	/* 0x8E */ 0xFFFF,
-	/* 0x8F */ 0xFFFF,
-	/* 0x90 */ 0xFFFF,
-	/* 0x91 */ 0xFFFF,
-	/* 0x92 */ 0xFFFF,
-	/* 0x93 */ 0xFFFF,
-	/* 0x94 */ 0xFFFF,
-	/* 0x95 */ 0xFFFF,
-	/* 0x96 */ 0xFFFF,
-	/* 0x97 */ 0xFFFF,
-	/* 0x98 */ 0xFFFF,
-	/* 0x99 */ 0xFFFF,
-	/* 0x9A */ 0xFFFF,
-	/* 0x9B */ 0xFFFF,
-	/* 0x9C */ 0xFFFF,
-	/* 0x9D */ 0xFFFF,
-	/* 0x9E */ 0xFFFF,
-	/* 0x9F */ 0xFFFF,
+	/* 0x80 */ 0x0080, /* <control> */
+	/* 0x81 */ 0x0081, /* <control> */
+	/* 0x82 */ 0x0082, /* <control> */
+	/* 0x83 */ 0x0083, /* <control> */
+	/* 0x84 */ 0x0084, /* <control> */
+	/* 0x85 */ 0x0085, /* <control> */
+	/* 0x86 */ 0x0086, /* <control> */
+	/* 0x87 */ 0x0087, /* <control> */
+	/* 0x88 */ 0x0088, /* <control> */
+	/* 0x89 */ 0x0089, /* <control> */
+	/* 0x8A */ 0x008A, /* <control> */
+	/* 0x8B */ 0x008B, /* <control> */
+	/* 0x8C */ 0x008C, /* <control> */
+	/* 0x8D */ 0x008D, /* <control> */
+	/* 0x8E */ 0x008E, /* <control> */
+	/* 0x8F */ 0x008F, /* <control> */
+	/* 0x90 */ 0x0090, /* <control> */
+	/* 0x91 */ 0x0091, /* <control> */
+	/* 0x92 */ 0x0092, /* <control> */
+	/* 0x93 */ 0x0093, /* <control> */
+	/* 0x94 */ 0x0094, /* <control> */
+	/* 0x95 */ 0x0095, /* <control> */
+	/* 0x96 */ 0x0096, /* <control> */
+	/* 0x97 */ 0x0097, /* <control> */
+	/* 0x98 */ 0x0098, /* <control> */
+	/* 0x99 */ 0x0099, /* <control> */
+	/* 0x9A */ 0x009A, /* <control> */
+	/* 0x9B */ 0x009B, /* <control> */
+	/* 0x9C */ 0x009C, /* <control> */
+	/* 0x9D */ 0x009D, /* <control> */
+	/* 0x9E */ 0x009E, /* <control> */
+	/* 0x9F */ 0x009F, /* <control> */
 	/* 0xA0 */ 0x00A0, /* NO-BREAK SPACE */
 	/* 0xA1 */ 0x0104, /* LATIN CAPITAL LETTER A WITH OGONEK */
 	/* 0xA2 */ 0x02D8, /* BREVE */
@@ -488,41 +489,41 @@ unsigned char *const aliases_8859_3 [] = {
 /*** 8859_4 ***/
 
 const uint16_t highhalf_8859_4 [] = {
-	/* 0x80 */ 0x0080, /* PADDING CHARACTER (PAD) */
-	/* 0x81 */ 0x0081, /* HIGH OCTET PRESET (HOP) */
-	/* 0x82 */ 0x0082, /* BREAK PERMITTED HERE (BPH) */
-	/* 0x83 */ 0x0083, /* NO BREAK HERE (NBH) */
-	/* 0x84 */ 0x0084, /* INDEX (IND) */
-	/* 0x85 */ 0x0085, /* NEXT LINE (NEL) */
-	/* 0x86 */ 0x0086, /* START OF SELECTED AREA (SSA) */
-	/* 0x87 */ 0x0087, /* END OF SELECTED AREA (ESA) */
-	/* 0x88 */ 0x0088, /* CHARACTER TABULATION SET (HTS) */
-	/* 0x89 */ 0x0089, /* CHARACTER TABULATION WITH JUSTIFICATION (HTJ) */
-	/* 0x8A */ 0x008A, /* LINE TABULATION SET (VTS) */
-	/* 0x8B */ 0x008B, /* PARTIAL LINE FORWARD (PLD) */
-	/* 0x8C */ 0x008C, /* PARTIAL LINE BACKWARD (PLU) */
-	/* 0x8D */ 0x008D, /* REVERSE LINE FEED (RI) */
-	/* 0x8E */ 0x008E, /* SINGLE-SHIFT TWO (SS2) */
-	/* 0x8F */ 0x008F, /* SINGLE-SHIFT THREE (SS3) */
-	/* 0x90 */ 0x0090, /* DEVICE CONTROL STRING (DCS) */
-	/* 0x91 */ 0x0091, /* PRIVATE USE ONE (PU1) */
-	/* 0x92 */ 0x0092, /* PRIVATE USE TWO (PU2) */
-	/* 0x93 */ 0x0093, /* SET TRANSMIT STATE (STS) */
-	/* 0x94 */ 0x0094, /* CANCEL CHARACTER (CCH) */
-	/* 0x95 */ 0x0095, /* MESSAGE WAITING (MW) */
-	/* 0x96 */ 0x0096, /* START OF GUARDED AREA (SPA) */
-	/* 0x97 */ 0x0097, /* END OF GUARDED AREA (EPA) */
-	/* 0x98 */ 0x0098, /* START OF STRING (SOS) */
-	/* 0x99 */ 0x0099, /* SINGLE GRAPHIC CHARACTER INTRODUCER (SGCI) */
-	/* 0x9A */ 0x009A, /* SINGLE CHARACTER INTRODUCER (SCI) */
-	/* 0x9B */ 0x009B, /* CONTROL SEQUENCE INTRODUCER (CSI) */
-	/* 0x9C */ 0x009C, /* STRING TERMINATOR (ST) */
-	/* 0x9D */ 0x009D, /* OPERATING SYSTEM COMMAND (OSC) */
-	/* 0x9E */ 0x009E, /* PRIVACY MESSAGE (PM) */
-	/* 0x9F */ 0x009F, /* APPLICATION PROGRAM COMMAND (APC) */
+	/* 0x80 */ 0x0080, /* <control> */
+	/* 0x81 */ 0x0081, /* <control> */
+	/* 0x82 */ 0x0082, /* <control> */
+	/* 0x83 */ 0x0083, /* <control> */
+	/* 0x84 */ 0x0084, /* <control> */
+	/* 0x85 */ 0x0085, /* <control> */
+	/* 0x86 */ 0x0086, /* <control> */
+	/* 0x87 */ 0x0087, /* <control> */
+	/* 0x88 */ 0x0088, /* <control> */
+	/* 0x89 */ 0x0089, /* <control> */
+	/* 0x8A */ 0x008A, /* <control> */
+	/* 0x8B */ 0x008B, /* <control> */
+	/* 0x8C */ 0x008C, /* <control> */
+	/* 0x8D */ 0x008D, /* <control> */
+	/* 0x8E */ 0x008E, /* <control> */
+	/* 0x8F */ 0x008F, /* <control> */
+	/* 0x90 */ 0x0090, /* <control> */
+	/* 0x91 */ 0x0091, /* <control> */
+	/* 0x92 */ 0x0092, /* <control> */
+	/* 0x93 */ 0x0093, /* <control> */
+	/* 0x94 */ 0x0094, /* <control> */
+	/* 0x95 */ 0x0095, /* <control> */
+	/* 0x96 */ 0x0096, /* <control> */
+	/* 0x97 */ 0x0097, /* <control> */
+	/* 0x98 */ 0x0098, /* <control> */
+	/* 0x99 */ 0x0099, /* <control> */
+	/* 0x9A */ 0x009A, /* <control> */
+	/* 0x9B */ 0x009B, /* <control> */
+	/* 0x9C */ 0x009C, /* <control> */
+	/* 0x9D */ 0x009D, /* <control> */
+	/* 0x9E */ 0x009E, /* <control> */
+	/* 0x9F */ 0x009F, /* <control> */
 	/* 0xA0 */ 0x00A0, /* NO-BREAK SPACE */
 	/* 0xA1 */ 0x0104, /* LATIN CAPITAL LETTER A WITH OGONEK */
-	/* 0xA2 */ 0x0138, /* LATIN SMALL LETTER KRA (Greenlandic) */
+	/* 0xA2 */ 0x0138, /* LATIN SMALL LETTER KRA */
 	/* 0xA3 */ 0x0156, /* LATIN CAPITAL LETTER R WITH CEDILLA */
 	/* 0xA4 */ 0x00A4, /* CURRENCY SIGN */
 	/* 0xA5 */ 0x0128, /* LATIN CAPITAL LETTER I WITH TILDE */
@@ -543,15 +544,15 @@ const uint16_t highhalf_8859_4 [] = {
 	/* 0xB4 */ 0x00B4, /* ACUTE ACCENT */
 	/* 0xB5 */ 0x0129, /* LATIN SMALL LETTER I WITH TILDE */
 	/* 0xB6 */ 0x013C, /* LATIN SMALL LETTER L WITH CEDILLA */
-	/* 0xB7 */ 0x02C7, /* CARON (Mandarin Chinese third tone) */
+	/* 0xB7 */ 0x02C7, /* CARON */
 	/* 0xB8 */ 0x00B8, /* CEDILLA */
 	/* 0xB9 */ 0x0161, /* LATIN SMALL LETTER S WITH CARON */
 	/* 0xBA */ 0x0113, /* LATIN SMALL LETTER E WITH MACRON */
 	/* 0xBB */ 0x0123, /* LATIN SMALL LETTER G WITH CEDILLA */
 	/* 0xBC */ 0x0167, /* LATIN SMALL LETTER T WITH STROKE */
-	/* 0xBD */ 0x014A, /* LATIN CAPITAL LETTER ENG (Sami) */
+	/* 0xBD */ 0x014A, /* LATIN CAPITAL LETTER ENG */
 	/* 0xBE */ 0x017E, /* LATIN SMALL LETTER Z WITH CARON */
-	/* 0xBF */ 0x014B, /* LATIN SMALL LETTER ENG (Sami) */
+	/* 0xBF */ 0x014B, /* LATIN SMALL LETTER ENG */
 	/* 0xC0 */ 0x0100, /* LATIN CAPITAL LETTER A WITH MACRON */
 	/* 0xC1 */ 0x00C1, /* LATIN CAPITAL LETTER A WITH ACUTE */
 	/* 0xC2 */ 0x00C2, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
@@ -583,7 +584,7 @@ const uint16_t highhalf_8859_4 [] = {
 	/* 0xDC */ 0x00DC, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
 	/* 0xDD */ 0x0168, /* LATIN CAPITAL LETTER U WITH TILDE */
 	/* 0xDE */ 0x016A, /* LATIN CAPITAL LETTER U WITH MACRON */
-	/* 0xDF */ 0x00DF, /* LATIN SMALL LETTER SHARP S (German) */
+	/* 0xDF */ 0x00DF, /* LATIN SMALL LETTER SHARP S */
 	/* 0xE0 */ 0x0101, /* LATIN SMALL LETTER A WITH MACRON */
 	/* 0xE1 */ 0x00E1, /* LATIN SMALL LETTER A WITH ACUTE */
 	/* 0xE2 */ 0x00E2, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
@@ -615,7 +616,7 @@ const uint16_t highhalf_8859_4 [] = {
 	/* 0xFC */ 0x00FC, /* LATIN SMALL LETTER U WITH DIAERESIS */
 	/* 0xFD */ 0x0169, /* LATIN SMALL LETTER U WITH TILDE */
 	/* 0xFE */ 0x016B, /* LATIN SMALL LETTER U WITH MACRON */
-	/* 0xFF */ 0x02D9, /* DOT ABOVE (Mandarin Chinese light tone) */
+	/* 0xFF */ 0x02D9, /* DOT ABOVE */
 };
 
 #define table_8859_4 table_NULL
@@ -975,13 +976,13 @@ const uint16_t highhalf_8859_7 [] = {
 	/* 0xA1 */ 0x2018, /* LEFT SINGLE QUOTATION MARK */
 	/* 0xA2 */ 0x2019, /* RIGHT SINGLE QUOTATION MARK */
 	/* 0xA3 */ 0x00A3, /* POUND SIGN */
-	/* 0xA4 */ 0xFFFF,
-	/* 0xA5 */ 0xFFFF,
+	/* 0xA4 */ 0x20AC, /* EURO SIGN */
+	/* 0xA5 */ 0x20AF, /* DRACHMA SIGN */
 	/* 0xA6 */ 0x00A6, /* BROKEN BAR */
 	/* 0xA7 */ 0x00A7, /* SECTION SIGN */
 	/* 0xA8 */ 0x00A8, /* DIAERESIS */
 	/* 0xA9 */ 0x00A9, /* COPYRIGHT SIGN */
-	/* 0xAA */ 0xFFFF,
+	/* 0xAA */ 0x037A, /* GREEK YPOGEGRAMMENI */
 	/* 0xAB */ 0x00AB, /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */
 	/* 0xAC */ 0x00AC, /* NOT SIGN */
 	/* 0xAD */ 0x00AD, /* SOFT HYPHEN */
@@ -1536,38 +1537,38 @@ unsigned char *const aliases_8859_10 [] = {
 /*** 8859_13 ***/
 
 const uint16_t highhalf_8859_13 [] = {
-	/* 0x80 */ 0x0080, /* PADDING CHARACTER (PAD) */
-	/* 0x81 */ 0x0081, /* HIGH OCTET PRESET (HOP) */
-	/* 0x82 */ 0x0082, /* BREAK PERMITTED HERE (BPH) */
-	/* 0x83 */ 0x0083, /* NO BREAK HERE (NBH) */
-	/* 0x84 */ 0x0084, /* INDEX (IND) */
-	/* 0x85 */ 0x0085, /* NEXT LINE (NEL) */
-	/* 0x86 */ 0x0086, /* START OF SELECTED AREA (SSA) */
-	/* 0x87 */ 0x0087, /* END OF SELECTED AREA (ESA) */
-	/* 0x88 */ 0x0088, /* CHARACTER TABULATION SET (HTS) */
-	/* 0x89 */ 0x0089, /* CHARACTER TABULATION WITH JUSTIFICATION (HTJ) */
-	/* 0x8A */ 0x008A, /* LINE TABULATION SET (VTS) */
-	/* 0x8B */ 0x008B, /* PARTIAL LINE FORWARD (PLD) */
-	/* 0x8C */ 0x008C, /* PARTIAL LINE BACKWARD (PLU) */
-	/* 0x8D */ 0x008D, /* REVERSE LINE FEED (RI) */
-	/* 0x8E */ 0x008E, /* SINGLE-SHIFT TWO (SS2) */
-	/* 0x8F */ 0x008F, /* SINGLE-SHIFT THREE (SS3) */
-	/* 0x90 */ 0x0090, /* DEVICE CONTROL STRING (DCS) */
-	/* 0x91 */ 0x0091, /* PRIVATE USE ONE (PU1) */
-	/* 0x92 */ 0x0092, /* PRIVATE USE TWO (PU2) */
-	/* 0x93 */ 0x0093, /* SET TRANSMIT STATE (STS) */
-	/* 0x94 */ 0x0094, /* CANCEL CHARACTER (CCH) */
-	/* 0x95 */ 0x0095, /* MESSAGE WAITING (MW) */
-	/* 0x96 */ 0x0096, /* START OF GUARDED AREA (SPA) */
-	/* 0x97 */ 0x0097, /* END OF GUARDED AREA (EPA) */
-	/* 0x98 */ 0x0098, /* START OF STRING (SOS) */
-	/* 0x99 */ 0x0099, /* SINGLE GRAPHIC CHARACTER INTRODUCER (SGCI) */
-	/* 0x9A */ 0x009A, /* SINGLE CHARACTER INTRODUCER (SCI) */
-	/* 0x9B */ 0x009B, /* CONTROL SEQUENCE INTRODUCER (CSI) */
-	/* 0x9C */ 0x009C, /* STRING TERMINATOR (ST) */
-	/* 0x9D */ 0x009D, /* OPERATING SYSTEM COMMAND (OSC) */
-	/* 0x9E */ 0x009E, /* PRIVACY MESSAGE (PM) */
-	/* 0x9F */ 0x009F, /* APPLICATION PROGRAM COMMAND (APC) */
+	/* 0x80 */ 0x0080, /* <control> */
+	/* 0x81 */ 0x0081, /* <control> */
+	/* 0x82 */ 0x0082, /* <control> */
+	/* 0x83 */ 0x0083, /* <control> */
+	/* 0x84 */ 0x0084, /* <control> */
+	/* 0x85 */ 0x0085, /* <control> */
+	/* 0x86 */ 0x0086, /* <control> */
+	/* 0x87 */ 0x0087, /* <control> */
+	/* 0x88 */ 0x0088, /* <control> */
+	/* 0x89 */ 0x0089, /* <control> */
+	/* 0x8A */ 0x008A, /* <control> */
+	/* 0x8B */ 0x008B, /* <control> */
+	/* 0x8C */ 0x008C, /* <control> */
+	/* 0x8D */ 0x008D, /* <control> */
+	/* 0x8E */ 0x008E, /* <control> */
+	/* 0x8F */ 0x008F, /* <control> */
+	/* 0x90 */ 0x0090, /* <control> */
+	/* 0x91 */ 0x0091, /* <control> */
+	/* 0x92 */ 0x0092, /* <control> */
+	/* 0x93 */ 0x0093, /* <control> */
+	/* 0x94 */ 0x0094, /* <control> */
+	/* 0x95 */ 0x0095, /* <control> */
+	/* 0x96 */ 0x0096, /* <control> */
+	/* 0x97 */ 0x0097, /* <control> */
+	/* 0x98 */ 0x0098, /* <control> */
+	/* 0x99 */ 0x0099, /* <control> */
+	/* 0x9A */ 0x009A, /* <control> */
+	/* 0x9B */ 0x009B, /* <control> */
+	/* 0x9C */ 0x009C, /* <control> */
+	/* 0x9D */ 0x009D, /* <control> */
+	/* 0x9E */ 0x009E, /* <control> */
+	/* 0x9F */ 0x009F, /* <control> */
 	/* 0xA0 */ 0x00A0, /* NO-BREAK SPACE */
 	/* 0xA1 */ 0x201D, /* RIGHT DOUBLE QUOTATION MARK */
 	/* 0xA2 */ 0x00A2, /* CENT SIGN */
@@ -1631,7 +1632,7 @@ const uint16_t highhalf_8859_13 [] = {
 	/* 0xDC */ 0x00DC, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
 	/* 0xDD */ 0x017B, /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */
 	/* 0xDE */ 0x017D, /* LATIN CAPITAL LETTER Z WITH CARON */
-	/* 0xDF */ 0x00DF, /* LATIN SMALL LETTER SHARP S */
+	/* 0xDF */ 0x00DF, /* LATIN SMALL LETTER SHARP S (German) */
 	/* 0xE0 */ 0x0105, /* LATIN SMALL LETTER A WITH OGONEK */
 	/* 0xE1 */ 0x012F, /* LATIN SMALL LETTER I WITH OGONEK */
 	/* 0xE2 */ 0x0101, /* LATIN SMALL LETTER A WITH MACRON */
@@ -1831,43 +1832,43 @@ unsigned char *const aliases_8859_14 [] = {
 /*** 8859_15 ***/
 
 const uint16_t highhalf_8859_15 [] = {
-	/* 0x80 */ 0xFFFF,
-	/* 0x81 */ 0xFFFF,
-	/* 0x82 */ 0xFFFF,
-	/* 0x83 */ 0xFFFF,
-	/* 0x84 */ 0xFFFF,
-	/* 0x85 */ 0xFFFF,
-	/* 0x86 */ 0xFFFF,
-	/* 0x87 */ 0xFFFF,
-	/* 0x88 */ 0xFFFF,
-	/* 0x89 */ 0xFFFF,
-	/* 0x8A */ 0xFFFF,
-	/* 0x8B */ 0xFFFF,
-	/* 0x8C */ 0xFFFF,
-	/* 0x8D */ 0xFFFF,
-	/* 0x8E */ 0xFFFF,
-	/* 0x8F */ 0xFFFF,
-	/* 0x90 */ 0xFFFF,
-	/* 0x91 */ 0xFFFF,
-	/* 0x92 */ 0xFFFF,
-	/* 0x93 */ 0xFFFF,
-	/* 0x94 */ 0xFFFF,
-	/* 0x95 */ 0xFFFF,
-	/* 0x96 */ 0xFFFF,
-	/* 0x97 */ 0xFFFF,
-	/* 0x98 */ 0xFFFF,
-	/* 0x99 */ 0xFFFF,
-	/* 0x9A */ 0xFFFF,
-	/* 0x9B */ 0xFFFF,
-	/* 0x9C */ 0xFFFF,
-	/* 0x9D */ 0xFFFF,
-	/* 0x9E */ 0xFFFF,
-	/* 0x9F */ 0xFFFF,
+	/* 0x80 */ 0x0080, /* <control> */
+	/* 0x81 */ 0x0081, /* <control> */
+	/* 0x82 */ 0x0082, /* <control> */
+	/* 0x83 */ 0x0083, /* <control> */
+	/* 0x84 */ 0x0084, /* <control> */
+	/* 0x85 */ 0x0085, /* <control> */
+	/* 0x86 */ 0x0086, /* <control> */
+	/* 0x87 */ 0x0087, /* <control> */
+	/* 0x88 */ 0x0088, /* <control> */
+	/* 0x89 */ 0x0089, /* <control> */
+	/* 0x8A */ 0x008A, /* <control> */
+	/* 0x8B */ 0x008B, /* <control> */
+	/* 0x8C */ 0x008C, /* <control> */
+	/* 0x8D */ 0x008D, /* <control> */
+	/* 0x8E */ 0x008E, /* <control> */
+	/* 0x8F */ 0x008F, /* <control> */
+	/* 0x90 */ 0x0090, /* <control> */
+	/* 0x91 */ 0x0091, /* <control> */
+	/* 0x92 */ 0x0092, /* <control> */
+	/* 0x93 */ 0x0093, /* <control> */
+	/* 0x94 */ 0x0094, /* <control> */
+	/* 0x95 */ 0x0095, /* <control> */
+	/* 0x96 */ 0x0096, /* <control> */
+	/* 0x97 */ 0x0097, /* <control> */
+	/* 0x98 */ 0x0098, /* <control> */
+	/* 0x99 */ 0x0099, /* <control> */
+	/* 0x9A */ 0x009A, /* <control> */
+	/* 0x9B */ 0x009B, /* <control> */
+	/* 0x9C */ 0x009C, /* <control> */
+	/* 0x9D */ 0x009D, /* <control> */
+	/* 0x9E */ 0x009E, /* <control> */
+	/* 0x9F */ 0x009F, /* <control> */
 	/* 0xA0 */ 0x00A0, /* NO-BREAK SPACE */
 	/* 0xA1 */ 0x00A1, /* INVERTED EXCLAMATION MARK */
 	/* 0xA2 */ 0x00A2, /* CENT SIGN */
 	/* 0xA3 */ 0x00A3, /* POUND SIGN */
-	/* 0xA4 */ 0x20AC, /* EURO */
+	/* 0xA4 */ 0x20AC, /* EURO SIGN */
 	/* 0xA5 */ 0x00A5, /* YEN SIGN */
 	/* 0xA6 */ 0x0160, /* LATIN CAPITAL LETTER S WITH CARON */
 	/* 0xA7 */ 0x00A7, /* SECTION SIGN */
@@ -1983,50 +1984,50 @@ unsigned char *const aliases_8859_15 [] = {
 /*** 8859_16 ***/
 
 const uint16_t highhalf_8859_16 [] = {
-	/* 0x80 */ 0xFFFF,
-	/* 0x81 */ 0xFFFF,
-	/* 0x82 */ 0xFFFF,
-	/* 0x83 */ 0xFFFF,
-	/* 0x84 */ 0xFFFF,
-	/* 0x85 */ 0xFFFF,
-	/* 0x86 */ 0xFFFF,
-	/* 0x87 */ 0xFFFF,
-	/* 0x88 */ 0xFFFF,
-	/* 0x89 */ 0xFFFF,
-	/* 0x8A */ 0xFFFF,
-	/* 0x8B */ 0xFFFF,
-	/* 0x8C */ 0xFFFF,
-	/* 0x8D */ 0xFFFF,
-	/* 0x8E */ 0xFFFF,
-	/* 0x8F */ 0xFFFF,
-	/* 0x90 */ 0xFFFF,
-	/* 0x91 */ 0xFFFF,
-	/* 0x92 */ 0xFFFF,
-	/* 0x93 */ 0xFFFF,
-	/* 0x94 */ 0xFFFF,
-	/* 0x95 */ 0xFFFF,
-	/* 0x96 */ 0xFFFF,
-	/* 0x97 */ 0xFFFF,
-	/* 0x98 */ 0xFFFF,
-	/* 0x99 */ 0xFFFF,
-	/* 0x9A */ 0xFFFF,
-	/* 0x9B */ 0xFFFF,
-	/* 0x9C */ 0xFFFF,
-	/* 0x9D */ 0xFFFF,
-	/* 0x9E */ 0xFFFF,
-	/* 0x9F */ 0xFFFF,
+	/* 0x80 */ 0x0080, /* <control> */
+	/* 0x81 */ 0x0081, /* <control> */
+	/* 0x82 */ 0x0082, /* <control> */
+	/* 0x83 */ 0x0083, /* <control> */
+	/* 0x84 */ 0x0084, /* <control> */
+	/* 0x85 */ 0x0085, /* <control> */
+	/* 0x86 */ 0x0086, /* <control> */
+	/* 0x87 */ 0x0087, /* <control> */
+	/* 0x88 */ 0x0088, /* <control> */
+	/* 0x89 */ 0x0089, /* <control> */
+	/* 0x8A */ 0x008A, /* <control> */
+	/* 0x8B */ 0x008B, /* <control> */
+	/* 0x8C */ 0x008C, /* <control> */
+	/* 0x8D */ 0x008D, /* <control> */
+	/* 0x8E */ 0x008E, /* <control> */
+	/* 0x8F */ 0x008F, /* <control> */
+	/* 0x90 */ 0x0090, /* <control> */
+	/* 0x91 */ 0x0091, /* <control> */
+	/* 0x92 */ 0x0092, /* <control> */
+	/* 0x93 */ 0x0093, /* <control> */
+	/* 0x94 */ 0x0094, /* <control> */
+	/* 0x95 */ 0x0095, /* <control> */
+	/* 0x96 */ 0x0096, /* <control> */
+	/* 0x97 */ 0x0097, /* <control> */
+	/* 0x98 */ 0x0098, /* <control> */
+	/* 0x99 */ 0x0099, /* <control> */
+	/* 0x9A */ 0x009A, /* <control> */
+	/* 0x9B */ 0x009B, /* <control> */
+	/* 0x9C */ 0x009C, /* <control> */
+	/* 0x9D */ 0x009D, /* <control> */
+	/* 0x9E */ 0x009E, /* <control> */
+	/* 0x9F */ 0x009F, /* <control> */
 	/* 0xA0 */ 0x00A0, /* NO-BREAK SPACE */
 	/* 0xA1 */ 0x0104, /* LATIN CAPITAL LETTER A WITH OGONEK */
 	/* 0xA2 */ 0x0105, /* LATIN SMALL LETTER A WITH OGONEK */
 	/* 0xA3 */ 0x0141, /* LATIN CAPITAL LETTER L WITH STROKE */
 	/* 0xA4 */ 0x20AC, /* EURO SIGN */
-	/* 0xA5 */ 0x00AB, /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xA5 */ 0x201E, /* DOUBLE LOW-9 QUOTATION MARK */
 	/* 0xA6 */ 0x0160, /* LATIN CAPITAL LETTER S WITH CARON */
 	/* 0xA7 */ 0x00A7, /* SECTION SIGN */
 	/* 0xA8 */ 0x0161, /* LATIN SMALL LETTER S WITH CARON */
 	/* 0xA9 */ 0x00A9, /* COPYRIGHT SIGN */
 	/* 0xAA */ 0x0218, /* LATIN CAPITAL LETTER S WITH COMMA BELOW */
-	/* 0xAB */ 0x201E, /* DOUBLE LOW-9 QUOTATION MARK */
+	/* 0xAB */ 0x00AB, /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */
 	/* 0xAC */ 0x0179, /* LATIN CAPITAL LETTER Z WITH ACUTE */
 	/* 0xAD */ 0x00AD, /* SOFT HYPHEN */
 	/* 0xAE */ 0x017A, /* LATIN SMALL LETTER Z WITH ACUTE */
@@ -2493,7 +2494,7 @@ const uint16_t highhalf_cp1252 [] = {
 	/* 0xC3 */ 0x00C3, /* LATIN CAPITAL LETTER A WITH TILDE */
 	/* 0xC4 */ 0x00C4, /* LATIN CAPITAL LETTER A WITH DIAERESIS */
 	/* 0xC5 */ 0x00C5, /* LATIN CAPITAL LETTER A WITH RING ABOVE */
-	/* 0xC6 */ 0x00C6, /* LATIN CAPITAL LIGATURE AE */
+	/* 0xC6 */ 0x00C6, /* LATIN CAPITAL LETTER AE */
 	/* 0xC7 */ 0x00C7, /* LATIN CAPITAL LETTER C WITH CEDILLA */
 	/* 0xC8 */ 0x00C8, /* LATIN CAPITAL LETTER E WITH GRAVE */
 	/* 0xC9 */ 0x00C9, /* LATIN CAPITAL LETTER E WITH ACUTE */
@@ -2525,7 +2526,7 @@ const uint16_t highhalf_cp1252 [] = {
 	/* 0xE3 */ 0x00E3, /* LATIN SMALL LETTER A WITH TILDE */
 	/* 0xE4 */ 0x00E4, /* LATIN SMALL LETTER A WITH DIAERESIS */
 	/* 0xE5 */ 0x00E5, /* LATIN SMALL LETTER A WITH RING ABOVE */
-	/* 0xE6 */ 0x00E6, /* LATIN SMALL LIGATURE AE */
+	/* 0xE6 */ 0x00E6, /* LATIN SMALL LETTER AE */
 	/* 0xE7 */ 0x00E7, /* LATIN SMALL LETTER C WITH CEDILLA */
 	/* 0xE8 */ 0x00E8, /* LATIN SMALL LETTER E WITH GRAVE */
 	/* 0xE9 */ 0x00E9, /* LATIN SMALL LETTER E WITH ACUTE */
@@ -3752,9 +3753,9 @@ const uint16_t highhalf_macroman [] = {
 	/* 0xA2 */ 0x00A2, /* CENT SIGN */
 	/* 0xA3 */ 0x00A3, /* POUND SIGN */
 	/* 0xA4 */ 0x00A7, /* SECTION SIGN */
-	/* 0xA5 */ 0x2022, /* PUCE */
+	/* 0xA5 */ 0x2022, /* BULLET */
 	/* 0xA6 */ 0x00B6, /* PILCROW SIGN */
-	/* 0xA7 */ 0x00DF, /* LATIN SMALL LETTER SHARP S (GERMAN) */
+	/* 0xA7 */ 0x00DF, /* LATIN SMALL LETTER SHARP S */
 	/* 0xA8 */ 0x00AE, /* REGISTERED SIGN */
 	/* 0xA9 */ 0x00A9, /* COPYRIGHT SIGN */
 	/* 0xAA */ 0x2122, /* TRADE MARK SIGN */
@@ -3783,12 +3784,12 @@ const uint16_t highhalf_macroman [] = {
 	/* 0xC1 */ 0x00A1, /* INVERTED EXCLAMATION MARK */
 	/* 0xC2 */ 0x00AC, /* NOT SIGN */
 	/* 0xC3 */ 0x221A, /* SQUARE ROOT */
-	/* 0xC4 */ 0x0192, /* LETTRE MINUSCULE LATINE F HAMEçON */
+	/* 0xC4 */ 0x0192, /* LATIN SMALL LETTER F WITH HOOK */
 	/* 0xC5 */ 0x2248, /* ALMOST EQUAL TO */
-	/* 0xC6 */ 0x0394, /* GREEK CAPITAL LETTER DELTA */
+	/* 0xC6 */ 0x2206, /* INCREMENT */
 	/* 0xC7 */ 0x00AB, /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */
 	/* 0xC8 */ 0x00BB, /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */
-	/* 0xC9 */ 0x2026, /* MIDLINE HORIZONTAL ELLIPSIS */
+	/* 0xC9 */ 0x2026, /* HORIZONTAL ELLIPSIS */
 	/* 0xCA */ 0x00A0, /* NO-BREAK SPACE */
 	/* 0xCB */ 0x00C0, /* LATIN CAPITAL LETTER A WITH GRAVE */
 	/* 0xCC */ 0x00C3, /* LATIN CAPITAL LETTER A WITH TILDE */
@@ -3806,7 +3807,7 @@ const uint16_t highhalf_macroman [] = {
 	/* 0xD8 */ 0x00FF, /* LATIN SMALL LETTER Y WITH DIAERESIS */
 	/* 0xD9 */ 0x0178, /* LATIN CAPITAL LETTER Y WITH DIAERESIS */
 	/* 0xDA */ 0x2044, /* FRACTION SLASH */
-	/* 0xDB */ 0x20AC, /* SYMBOLE EURO */
+	/* 0xDB */ 0x20AC, /* EURO SIGN */
 	/* 0xDC */ 0x2039, /* SINGLE LEFT-POINTING ANGLE QUOTATION MARK */
 	/* 0xDD */ 0x203A, /* SINGLE RIGHT-POINTING ANGLE QUOTATION MARK */
 	/* 0xDE */ 0xFB01, /* LATIN SMALL LIGATURE FI */
@@ -3827,14 +3828,14 @@ const uint16_t highhalf_macroman [] = {
 	/* 0xED */ 0x00CC, /* LATIN CAPITAL LETTER I WITH GRAVE */
 	/* 0xEE */ 0x00D3, /* LATIN CAPITAL LETTER O WITH ACUTE */
 	/* 0xEF */ 0x00D4, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
-	/* 0xF0 */ 0xF8FF, /* Mac Logo (in Private Use Area) */
+	/* 0xF0 */ 0xF8FF, /* Apple logo */
 	/* 0xF1 */ 0x00D2, /* LATIN CAPITAL LETTER O WITH GRAVE */
 	/* 0xF2 */ 0x00DA, /* LATIN CAPITAL LETTER U WITH ACUTE */
 	/* 0xF3 */ 0x00DB, /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */
 	/* 0xF4 */ 0x00D9, /* LATIN CAPITAL LETTER U WITH GRAVE */
-	/* 0xF5 */ 0x0131, /* LATIN SMALL LETTER I DOTLESS */
-	/* 0xF6 */ 0x02C6, /* LETTRE MODIFICATIVE ACCENT CIRCONFLEXE */
-	/* 0xF7 */ 0x02DC, /* PETIT TILDE */
+	/* 0xF5 */ 0x0131, /* LATIN SMALL LETTER DOTLESS I */
+	/* 0xF6 */ 0x02C6, /* MODIFIER LETTER CIRCUMFLEX ACCENT */
+	/* 0xF7 */ 0x02DC, /* SMALL TILDE */
 	/* 0xF8 */ 0x00AF, /* MACRON */
 	/* 0xF9 */ 0x02D8, /* BREVE */
 	/* 0xFA */ 0x02D9, /* DOT ABOVE */
@@ -4170,7 +4171,7 @@ const uint16_t highhalf_koi8_r [] = {
 	/* 0x92 */ 0x2593, /* DARK SHADE */
 	/* 0x93 */ 0x2320, /* TOP HALF INTEGRAL */
 	/* 0x94 */ 0x25A0, /* BLACK SQUARE */
-	/* 0x95 */ 0x2022, /* BULLET */
+	/* 0x95 */ 0x2219, /* BULLET OPERATOR */
 	/* 0x96 */ 0x221A, /* SQUARE ROOT */
 	/* 0x97 */ 0x2248, /* ALMOST EQUAL TO */
 	/* 0x98 */ 0x2264, /* LESS-THAN OR EQUAL TO */