Updated encodings with latest mappings from www.unicode.org. This

	did not include some Mac encodings that have special multi-unichar
	translations now (like symbols, dingbats and japanese).  Also does
	not include big5, gb or euc* as those have different formats in
	the latest Unicode version that need new conversion tools.  Not
	all related .enc files changed as some had been updates separately.

1 files changed, 95 insertions, 38 deletions

diff --git a/tools/encoding/macCyrillic.txt b/tools/encoding/macCyrillic.txt
index 59ac721..b58bb83 100644
--- a/tools/encoding/macCyrillic.txt
+++ b/tools/encoding/macCyrillic.txt
@@ -1,12 +1,31 @@
+#=======================================================================
+#   FTP file name:  CYRILLIC.TXT
 #
-#   Name:             MacOS_Cyrillic [to Unicode]
-#   Unicode versions: 1.1, 2.0
-#   Table version:    0.2 (from internal ufrm version <5>)
-#   Date:             15 April 1995
-#   Authors:          Peter Edberg <edberg1@applelink.apple.com>
-#                     Judy Kettenhofen
+#   Contents:       Map (external version) from Mac OS Cyrillic
+#                   character set to Unicode 2.1
 #
-#   Copyright (c) 1995 Apple Computer, Inc.  All Rights reserved.
+#   Copyright:      (c) 1995-1999 by Apple Computer, Inc., all rights
+#                   reserved.
+#
+#   Contact:        charsets@apple.com
+#
+#   Changes:
+#
+#       b02  1999-Sep-22    Encoding changed for Mac OS 9.0 to merge
+#                           with Mac OS Ukrainian and support EURO SIGN;
+#                           Change mappings for 0xA2, 0xB6, and 0xFF.
+#                           Update contact e-mail address. Matches
+#                           internal utom<b2>, ufrm<b2>, and Text
+#                           Encoding Converter version 1.5.
+#       n05  1998-Feb-05    Update header comments to new format; no
+#                           mapping changes.  Matches internal utom<n3>,
+#                           ufrm<n13>, and Text Encoding Converter
+#                           version 1.3.
+#       n03  1995-Apr-15    First version (after fixing some typos).
+#                           Matches internal ufrm<n5>.
+#
+# Standard header:
+# ----------------
 #
 #   Apple, the Apple logo, and Macintosh are trademarks of Apple
 #   Computer, Inc., registered in the United States and other countries.
@@ -18,46 +37,84 @@
 #   Apple makes no warranty or representation, either express or
 #   implied, with respect to these tables, their quality, accuracy, or
 #   fitness for a particular purpose. In no event will Apple be liable
-#   for direct, indirect, special, incidental, or consequential damages
+#   for direct, indirect, special, incidental, or consequential damages 
 #   resulting from any defect or inaccuracy in this document or the
 #   accompanying tables.
 #
-#   These mapping tables and character lists are preliminary and
-#   subject to change. Updated tables will be available from the
-#   Unicode Inc. ftp site (unicode.org), the Apple Computer ftp site
-#   (ftp.info.apple.com), the Apple Computer World-Wide Web pages
-#   (http://www.info.apple.com), and possibly on diskette from APDA
-#   (Apple's mail-order distribution service for developers).
+#   These mapping tables and character lists are subject to change.
+#   The latest tables should be available from the following:
 #
-#   Format:
-#   -------
+#   <ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/APPLE/>
+#   <ftp://dev.apple.com/devworld/Technical_Documentation/Misc._Standards/>
+#
+#   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 MacOS Cyrillic code (in hex as 0xNN)
-#     Column #2 is the Unicode (in hex as 0xNNNN)
-#     Column #3 is the Unicode name (follows a comment sign, '#')
+#     Column #1 is the Mac OS Cyrillic 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 Cyrillic code order.
+#
+#   Control character mappings are not shown in this table, following
+#   the conventions of the standard UTC mapping tables. However, the
+#   Mac OS Cyrillic character set uses the standard control characters
+#   at 0x00-0x1F and 0x7F.
+#
+# Notes on Mac OS Cyrillic:
+# -------------------------
+#
+#   For Mac OS 9.0 and later, this Mac Cyrillic encoding is used for
+#   all Slavic Cyrillic localized system software and for the Cyrillic
+#   Language Kit. Before Mac OS 9.0, there were two separate Slavic
+#	Cyrillic encodings:
+#
+#   1. The Cyrillic currency sign variant (used for localized Russian
+#      and Bulgarian systems), which had the following:
+#	    0xA2  U+00A2 CENT SIGN
+#	    0xB6  U+2202 PARTIAL DIFFERENTIAL
+#	    0xFF  U+00A4 CURRENCY SIGN
+#
+#   2. The Ukrainian currency sign variant (used for localized Ukrainian
+#      systems and the pre-9.0 Cyrillic Language Kit), which had the
+#      following:
+#	    0xA2  U+0490 CYRILLIC CAPITAL LETTER GHE WITH UPTURN
+#	    0xB6  U+0491 CYRILLIC SMALL LETTER GHE WITH UPTURN
+#	    0xFF  U+00A4 CURRENCY SIGN
+#
+#   This new Cyrillic Euro sign version is based on the old Ukrainian
+#   currency sign variant, with 0xFF changed to be EURO SIGN.
+#
+#   The Mac OS Cyrillic encoding includes the Cyrillic letter repertoire
+#   of ISO 8859-5 (although not at the same code points). This covers
+#   most of the Slavic languages written in Cyrillic script.
+#
+#   The Mac OS Cyrillic encoding also includes a number of characters
+#   needed for the Mac OS user interface and localization (e.g.
+#   ellipsis, bullet, copyright sign). All of the characters in Mac OS
+#   Cyrillic that are also in the Mac OS Roman encoding are at the
+#   same code point in both; this improves application compatibility.
 #
-#   The entries are in MacOS Cyrillic code order.
+#   Note: There is a common Ukrainian glyph variation in which the glyph
+#   for CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I may or may not
+#   have a dot above.
 #
-#   Notes on MacOS Cyrillic:
-#   ------------------------
+# Unicode mapping issues and notes:
+# ---------------------------------
 #
-#   The MacOS Cyrillic encoding includes the full Cyrillic letter
-#   repertoire of ISO 8859-5 (although not at the same code points).
-#   This covers most of the Slavic languages written in Cyrillic
-#   script.
+# Details of mapping changes in each version:
+# -------------------------------------------
 #
-#   The MacOS Cyrillic encoding also includes a number of characters
-#   needed for the MacOS user interface (e.g. ellipsis), MacOS
-#   localization (bullet for echoing passwords, copyright sign, etc.
-#   All of the characters in MacOS Cyrillic that are also in the MacOS
-#   Roman encoding are at the same code point as MacOS Roman. This
-#   improves application compatibility (since some naughty applications
-#   hard-code the MacOS Roman code points of certain characters).
+#   Changes from version n05 to version b02:
 #
-#   A variant of MacOS Cyrillic is used for Ukrainian. A separate
-#   mapping table is available for Ukrainian.
+#   - Encoding changed for Mac OS 9.0 to merge with Mac OS Ukrainian and
+#   support EURO SIGN. 0xA2 changed from U+00A2 to U+0490; 0xB6 changed
+#   from U+2202 to U+0491; 0xFF changed from U+00A4 to U+20AC.
 #
 ##################
 
@@ -191,7 +248,7 @@
 0x9F	0x042F	# CYRILLIC CAPITAL LETTER YA
 0xA0	0x2020	# DAGGER
 0xA1	0x00B0	# DEGREE SIGN
-0xA2	0x00A2	# CENT SIGN
+0xA2	0x0490	# CYRILLIC CAPITAL LETTER GHE WITH UPTURN
 0xA3	0x00A3	# POUND SIGN
 0xA4	0x00A7	# SECTION SIGN
 0xA5	0x2022	# BULLET
@@ -211,7 +268,7 @@
 0xB3	0x2265	# GREATER-THAN OR EQUAL TO
 0xB4	0x0456	# CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
 0xB5	0x00B5	# MICRO SIGN
-0xB6	0x2202	# PARTIAL DIFFERENTIAL
+0xB6	0x0491	# CYRILLIC SMALL LETTER GHE WITH UPTURN
 0xB7	0x0408	# CYRILLIC CAPITAL LETTER JE
 0xB8	0x0404	# CYRILLIC CAPITAL LETTER UKRAINIAN IE
 0xB9	0x0454	# CYRILLIC SMALL LETTER UKRAINIAN IE
@@ -284,4 +341,4 @@
 0xFC	0x044C	# CYRILLIC SMALL LETTER SOFT SIGN
 0xFD	0x044D	# CYRILLIC SMALL LETTER E
 0xFE	0x044E	# CYRILLIC SMALL LETTER YU
-0xFF	0x00A4	# CURRENCY SIGN
+0xFF	0x20AC	# EURO SIGN