Fix copyright license notices for Adobe Unicode mapping files.

* charsets/mapfiles/README: The copied files are not compressed.
Check for copies as of today.
* charsets/mapfiles/stdenc.txt, charsets/mapfiles/symbol.txt:
Update from table version 0.2 (1999-03-30) to 1.0 (2011-07-12).
This doesn't change the table data, just copyright license notice.
The new notices are compatible with the GPL, the old ones were not.

4 files changed, 70 insertions, 39 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index d1b0b6e14b4..36a10fa5f30 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,13 @@
+2014-01-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix copyright license notices for Adobe Unicode mapping files.
+        * charsets/mapfiles/README: The copied files are not compressed.
+        Check for copies as of today.
+        * charsets/mapfiles/stdenc.txt, charsets/mapfiles/symbol.txt:
+        Update from table version 0.2 (1999-03-30) to 1.0 (2011-07-12).
+        This doesn't change the table data, just copyright license notice.
+        The new notices are compatible with the GPL, the old ones were not.
+
 2014-01-13  Glenn Morris  <rgm@gnu.org>
 
         * update_autogen (status): New function.  Use throughout.
diff --git a/admin/charsets/mapfiles/README b/admin/charsets/mapfiles/README
index 7c82a6fc1f2..15ec320589f 100644
--- a/admin/charsets/mapfiles/README
+++ b/admin/charsets/mapfiles/README
@@ -6,47 +6,48 @@ See the end of the file for license conditions.
 
                    The charset map files directory
 
-This directory contains two kinds of charset map files; verbatim copies
-(or their compressed versions) of files freely available in the
-Internet, and newly created files based on freely available
-information.
+This directory contains two kinds of charset map files; verbatim
+copies of files freely available in the Internet, and newly created
+files based on freely available information.
 
-(1) Copied files (all files are copied on 2009-06-12)
+(1) Copied files (all files were copied on 2014-01-15):
 
-* CP932.TXT.gz
+* CP932.TXT
 
-The uncompressed version is available at:
+Available at:
     <http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP932.TXT>
 
-* PTCP154.gz
+* PTCP154
 
-The uncompressed version is available at:
+Available at:
     <http://www.iana.org/assignments/charset-reg/PTCP154>
 
-* Uni2JIS.gz
+* Uni2JIS
 
 The version compressed by Unix's "compress" command is available at:
     <http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/CJKtable/Uni2JIS.Z>
+This directory's copy has corrected the misspellings of "characters"
+and of "Byelorussian".
 
-* bulgarian-mik.txt.gz
+* bulgarian-mik.txt
 
-It is available at:
-    <http://czyborra.com/charsets/bulgarian-mik.txt.gz>.
+The compressed version is available at:
+    <http://czyborra.com/charsets/bulgarian-mik.txt.gz>
 
-* cns2ucsdkw.txt.gz
+* cns2ucsdkw.txt
 
-Uncompressed version is available at:
+Available at:
     <http://kanji-database.cvs.sourceforge.net/viewvc/*checkout*/kanji-database/kanji-database/data/cns2ucsdkw.txt?revision=1.4>
 
-* stdenc.txt.gz and symbol.txt.gz
+* stdenc.txt and symbol.txt
 
-The uncompressed versions are available at:
+Available at:
     <http://www.unicode.org/Public/MAPPINGS/VENDORS/ADOBE/stdenc.txt>
     <http://www.unicode.org/Public/MAPPINGS/VENDORS/ADOBE/symbol.txt>
 
 (2) Newly created files
 
-* CP720.map.gz and CP858.map.gz
+* CP720.map and CP858.map
 
 Created manually by looking at these pages:
     <http://en.wikipedia.org/wiki/Code_page_720>.
@@ -54,13 +55,13 @@ Created manually by looking at these pages:
 The text in that page is under the terms of the GNU Free Documentation
 License.
 
-* JISX213A.map.gz
+* JISX213A.map
 
 Created manually based on the description of the section 33 in "JIS X
 0213:2004 Amendment 1".  It lists 10 characters that are newly added
 to "JIS X 0213:2004".
 
-* MULE-*.map.gz
+* MULE-*.map
 
 Created by using ../mule-charsets.el in Emacs 22 as this:
     % emacs-22 -batch -l ../mule-charsets.el
diff --git a/admin/charsets/mapfiles/stdenc.txt b/admin/charsets/mapfiles/stdenc.txt
index d4b9d7c9343..e39486a3195 100644
--- a/admin/charsets/mapfiles/stdenc.txt
+++ b/admin/charsets/mapfiles/stdenc.txt
@@ -1,10 +1,10 @@
 #
 #  Name:             Adobe Standard Encoding to Unicode
 #  Unicode version:  2.0
-#  Table version:    0.2
-#  Date:             30 March 1999
+#  Table version:    1.0
+#  Date:             2011 July 12
 #  
-#  Copyright (c) 1991-1999 Unicode, Inc. All Rights reserved.
+#  Copyright (c) 1991-2011 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
@@ -13,12 +13,12 @@
 #  magnetic media by Unicode, Inc., the sole remedy for any claim will be
 #  exchange of defective media within 90 days of receipt.
 #  
-#  Recipient is granted the right to make copies in any form for internal
-#  distribution and to freely use the information supplied in the creation of
-#  products supporting Unicode. Unicode, Inc. specifically excludes the right
-#  to re-distribute this file directly to third parties or other organizations
-#  whether for profit or not.
-#  
+#  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.
+#
 #  Format: 4 tab-delimited fields:
 #
 #    (1) The Unicode value (in hexadecimal)
@@ -36,8 +36,17 @@
 #    Standard Encoding characters, such as "space", are mapped to 2 Unicode
 #    values. Refer to the above document for more details.
 #
+#    2011 July 12: The above link is no longer valid. For comparable,
+#    more current information, see the document, "Glyph", at:
+#    <http://www.adobe.com/devnet/opentype/archives/glyph.html>
+#
 #  Revision History:
 #
+#    [v1.0, 2011 July 12]
+#    Updated terms of use to current wording.
+#    Updated contact information and document link.
+#    No changes to the mapping data.
+#
 #    [v0.2, 30 March 1999]
 #    Different algorithm to produce Unicode values (see notes above) results in
 #    some character codes being mapped to 2 Unicode values. Updated Unicode
@@ -45,7 +54,8 @@
 #    
 #    [v0.1, 5 May 1995] First release.
 #
-#  Contact <unicode-inc@unicode.org> with any questions or comments.
+#  Use the Unicode reporting form <http://www.unicode.org/reporting.html>
+#    for any questions or comments or to report errors in the data.
 #
 0020    20      # SPACE # space
 00A0    20      # NO-BREAK SPACE        # space
diff --git a/admin/charsets/mapfiles/symbol.txt b/admin/charsets/mapfiles/symbol.txt
index a545915a323..b98baf6cf0c 100644
--- a/admin/charsets/mapfiles/symbol.txt
+++ b/admin/charsets/mapfiles/symbol.txt
@@ -1,10 +1,10 @@
 #
 #  Name:             Adobe Symbol Encoding to Unicode
 #  Unicode version:  2.0
-#  Table version:    0.2
-#  Date:             30 March 1999
+#  Table version:    1.0
+#  Date:             2011 July 12
 #  
-#  Copyright (c) 1991-1999 Unicode, Inc. All Rights reserved.
+#  Copyright (c) 1991-2011 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
@@ -13,11 +13,11 @@
 #  magnetic media by Unicode, Inc., the sole remedy for any claim will be
 #  exchange of defective media within 90 days of receipt.
 #  
-#  Recipient is granted the right to make copies in any form for internal
-#  distribution and to freely use the information supplied in the creation of
-#  products supporting Unicode. Unicode, Inc. specifically excludes the right
-#  to re-distribute this file directly to third parties or other organizations
-#  whether for profit or not.
+#  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.
 #  
 #  Format: 4 tab-delimited fields:
 #
@@ -37,8 +37,17 @@
 #    Corporate Use Subarea; these are indicated by "(CUS)" in field 4. Refer to
 #    the above document for more details.
 #
+#    2011 July 12: The above link is no longer valid. For comparable,
+#    more current information, see the document, "Glyph", at:
+#    <http://www.adobe.com/devnet/opentype/archives/glyph.html>
+#
 #  Revision History:
 #
+#    [v1.0, 2011 July 12]
+#    Updated terms of use to current wording.
+#    Updated contact information and document link.
+#    No changes to the mapping data.
+#
 #    [v0.2, 30 March 1999]
 #    Different algorithm to produce Unicode values (see notes above) results in
 #    some character codes being mapped to 2 Unicode values; use of Corporate
@@ -48,7 +57,8 @@
 #
 #    [v0.1, 5 May 1995] First release.
 #
-#  Contact <unicode-inc@unicode.org> with any questions or comments.
+#  Use the Unicode reporting form <http://www.unicode.org/reporting.html>
+#    for any questions or comments or to report errors in the data.
 #
 0020    20      # SPACE # space
 00A0    20      # NO-BREAK SPACE        # space