From df557d28ad2cd9bc38891e8f77c5ed45a0612681 Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 25 Mar 2016 09:39:56 +0000 Subject: merge revision(s) 54129,54130,54132: [Backport #11844] * enc/trans/JIS: update Unicode's notice. [Bug #11844] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54283 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 +++ enc/trans/JIS/JISX0201-KANA%UCS.src | 51 ++++++++++++++---------------- enc/trans/JIS/JISX0208@1990%UCS.src | 54 ++++++++++++++------------------ enc/trans/JIS/JISX0212%UCS.src | 62 ++++++++++++++++--------------------- enc/trans/JIS/UCS%JISX0201-KANA.src | 52 +++++++++++++++---------------- enc/trans/JIS/UCS%JISX0208@1990.src | 53 +++++++++++++------------------ enc/trans/JIS/UCS%JISX0212.src | 61 ++++++++++++++++-------------------- tool/transcode-tblgen.rb | 2 +- version.h | 2 +- 9 files changed, 154 insertions(+), 187 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1392fb5ce0..1dfafa8ff8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Mar 25 18:38:42 2016 NARUSE, Yui + + * enc/trans/JIS: update Unicode's notice. [Bug #11844] + Fri Mar 25 18:36:04 2016 Eric Wong * ext/openssl/ossl_ssl.c (ossl_sslctx_setup): document as MT-unsafe diff --git a/enc/trans/JIS/JISX0201-KANA%UCS.src b/enc/trans/JIS/JISX0201-KANA%UCS.src index d25b580fed..d56b97f7cc 100644 --- a/enc/trans/JIS/JISX0201-KANA%UCS.src +++ b/enc/trans/JIS/JISX0201-KANA%UCS.src @@ -12,27 +12,16 @@ BEGIN_MAP # This mapping data is made from the mapping data provided by Unicode, Inc. # Original notice: # +# JIS0201.TXT +# Date: 2015-12-02 23:49:00 GMT [KW] +# © 2015 Unicode®, Inc. +# For terms of use, see http://www.unicode.org/terms_of_use.html +# # Name: JIS X 0201 (1976) to Unicode 1.1 Table # Unicode version: 1.1 -# Table version: 0.9 +# Table version: 2.0 # Table format: Format A -# Date: 8 March 1994 -# -# Copyright (c) 1991-1994 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 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. +# Date: 2011 October 14 (header updated: 2015 December 02) # # General notes: # @@ -42,15 +31,7 @@ BEGIN_MAP # same as those used by actual products, nor may they be the best suited # for all uses. For more information on the mappings between various code # pages incorporating the repertoire of JIS X 0201 and Unicode, consult the -# VENDORS mapping data. Normative information on the mapping between -# JIS X 0201 and Unicode may be found in the Unihan.txt file in the -# latest Unicode Character Database. -# -# If you have carefully considered the fact that the mappings in -# this table are only one possible set of mappings between JIS X 0201 and -# Unicode and have no normative status, but still feel that you -# have located an error in the table that requires fixing, you may -# report any such error to errata@unicode.org. +# VENDORS mapping data. # # # Format: Three tab-separated columns @@ -60,6 +41,22 @@ BEGIN_MAP # # The entries are in JIS order # +# Revision History: +# +# [v2.0, 2015 December 02] +# updates to copyright notice and terms of use +# no changes to character mappings +# +# [v1.0, 2011 October 14] +# Updated terms of use to current wording. +# Updated contact information. +# No changes to the mapping data. +# +# [v0.9, 8 March 1994] +# First release. +# +# Use the Unicode reporting form +# for any questions or comments or to report errors in the data. # 0x21 = 0xFF61 0x22 = 0xFF62 diff --git a/enc/trans/JIS/JISX0208@1990%UCS.src b/enc/trans/JIS/JISX0208@1990%UCS.src index c2cacd422e..7875969b95 100644 --- a/enc/trans/JIS/JISX0208@1990%UCS.src +++ b/enc/trans/JIS/JISX0208@1990%UCS.src @@ -12,27 +12,17 @@ BEGIN_MAP # This mapping data is made from the mapping data provided by Unicode, Inc. # Original notice: # +# +# JIS0208.TXT +# Date: 2015-12-02 23:50:00 GMT [KW] +# © 2015 Unicode®, Inc. +# For terms of use, see http://www.unicode.org/terms_of_use.html +# # Name: JIS X 0208 (1990) to Unicode # Unicode version: 1.1 -# Table version: 0.9 +# Table version: 2.0 # Table format: Format A -# Date: 8 March 1994 -# -# Copyright (c) 1991-1994 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 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. +# Date: 2011 October 14 (header updated: 2015 December 02) # # General notes: # @@ -42,15 +32,7 @@ BEGIN_MAP # same as those used by actual products, nor may they be the best suited # for all uses. For more information on the mappings between various code # pages incorporating the repertoire of JIS X 0208 (1990) and Unicode, consult the -# VENDORS mapping data. Normative information on the mapping between -# JIS X 0208 (1990) and Unicode may be found in the Unihan.txt file in the -# latest Unicode Character Database. -# -# If you have carefully considered the fact that the mappings in -# this table are only one possible set of mappings between JIS X 0208 (1990) -# and Unicode and have no normative status, but still feel that you -# have located an error in the table that requires fixing, you may -# report any such error to errata@unicode.org. +# VENDORS mapping data. # # # Format: Four tab-separated columns @@ -77,12 +59,22 @@ BEGIN_MAP # the kuten form. For example, 0x2121 -> 0x0101 -> 0101; # 0x7426 -> 0x5406 -> 8406 # -# The kanji mappings are a normative part of ISO/IEC 10646. The -# non-kanji mappings are provisional, pending definition of -# official mappings by Japanese standards bodies +# Revision History: +# +# [v2.0, 2015 December 02] +# updates to copyright notice and terms of use +# no changes to character mappings +# +# [v1.0, 2011 October 14] +# Updated terms of use to current wording. +# Updated contact information. +# No changes to the mapping data. # -# Any comments or problems, contact +# [v0.9, 8 March 1994] +# First release. # +# Use the Unicode reporting form +# for any questions or comments or to report errors in the data. # # NetBSD specific modification: # 2003-08-18 : change the conversion for reverse solidus (0x2140). diff --git a/enc/trans/JIS/JISX0212%UCS.src b/enc/trans/JIS/JISX0212%UCS.src index cf4e7ecf62..aa51257b99 100644 --- a/enc/trans/JIS/JISX0212%UCS.src +++ b/enc/trans/JIS/JISX0212%UCS.src @@ -12,27 +12,16 @@ BEGIN_MAP # This mapping data is made from the mapping data provided by Unicode, Inc. # Original notice: # +# JIS0212.TXT +# Date: 2015-12-02 23:51:00 GMT [KW] +# © 2015 Unicode®, Inc. +# For terms of use, see http://www.unicode.org/terms_of_use.html +# # Name: JIS X 0212 (1990) to Unicode # Unicode version: 1.1 -# Table version: 0.9 +# Table version: 2.0 # Table format: Format A -# Date: 8 March 1994 -# -# Copyright (c) 1991-1994 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 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. +# Date: 2011 October 14 (header updated: 2015 December 02) # # General notes: # @@ -42,15 +31,7 @@ BEGIN_MAP # same as those used by actual products, nor may they be the best suited # for all uses. For more information on the mappings between various code # pages incorporating the repertoire of JIS X 0212 and Unicode, consult the -# VENDORS mapping data. Normative information on the mapping between -# JIS X 0212 and Unicode may be found in the Unihan.txt file in the -# latest Unicode Character Database. -# -# If you have carefully considered the fact that the mappings in -# this table are only one possible set of mappings between JIS X 0212 and -# Unicode and have no normative status, but still feel that you -# have located an error in the table that requires fixing, you may -# report any such error to errata@unicode.org. +# VENDORS mapping data. # # # Format: Three tab-separated columns @@ -76,17 +57,11 @@ BEGIN_MAP # the kuten form. For example, 0x2121 -> 0x0101 -> 0101; # 0x6D63 -> 0x4D43 -> 7767 # -# The kanji mappings are a normative part of ISO/IEC 10646. The -# non-kanji mappings are provisional, pending definition of -# official mappings by Japanese standards bodies -# -# Any comments or problems, contact -# # Notes: # # 1. JIS X 0212 apparently unified the following two symbols # into a single character at 0x2922: -# +# # LATIN CAPITAL LETTER D WITH STROKE # LATIN CAPITAL LETTER ETH # @@ -96,7 +71,24 @@ BEGIN_MAP # 0x2922 and 0x2942 are intended to be a capital/small pair. # Consequently, in the Unicode mapping, 0x2922 is treated as # LATIN CAPITAL LETTER D WITH STROKE. -# +# +# Revision History: +# +# [v2.0, 2015 December 02] +# updates to copyright notice and terms of use +# no changes to character mappings +# +# [v1.0, 2011 October 14] +# Updated terms of use to current wording. +# Updated contact information. +# No changes to the mapping data. +# +# [v0.9, 8 March 1994] +# First release. +# +# Use the Unicode reporting form +# for any questions or comments or to report errors in the data. +# 0x222F = 0x02D8 0x2230 = 0x02C7 0x2231 = 0x00B8 diff --git a/enc/trans/JIS/UCS%JISX0201-KANA.src b/enc/trans/JIS/UCS%JISX0201-KANA.src index 57ae00f23b..fac6ae8afe 100644 --- a/enc/trans/JIS/UCS%JISX0201-KANA.src +++ b/enc/trans/JIS/UCS%JISX0201-KANA.src @@ -12,27 +12,16 @@ BEGIN_MAP # This mapping data is made from the mapping data provided by Unicode, Inc. # Original notice: # +# JIS0201.TXT +# Date: 2015-12-02 23:49:00 GMT [KW] +# © 2015 Unicode®, Inc. +# For terms of use, see http://www.unicode.org/terms_of_use.html +# # Name: JIS X 0201 (1976) to Unicode 1.1 Table # Unicode version: 1.1 -# Table version: 0.9 +# Table version: 2.0 # Table format: Format A -# Date: 8 March 1994 -# -# Copyright (c) 1991-1994 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 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. +# Date: 2011 October 14 (header updated: 2015 December 02) # # General notes: # @@ -42,15 +31,7 @@ BEGIN_MAP # same as those used by actual products, nor may they be the best suited # for all uses. For more information on the mappings between various code # pages incorporating the repertoire of JIS X 0201 and Unicode, consult the -# VENDORS mapping data. Normative information on the mapping between -# JIS X 0201 and Unicode may be found in the Unihan.txt file in the -# latest Unicode Character Database. -# -# If you have carefully considered the fact that the mappings in -# this table are only one possible set of mappings between JIS X 0201 and -# Unicode and have no normative status, but still feel that you -# have located an error in the table that requires fixing, you may -# report any such error to errata@unicode.org. +# VENDORS mapping data. # # # Format: Three tab-separated columns @@ -60,6 +41,23 @@ BEGIN_MAP # # The entries are in JIS order # +# Revision History: +# +# [v2.0, 2015 December 02] +# updates to copyright notice and terms of use +# no changes to character mappings +# +# [v1.0, 2011 October 14] +# Updated terms of use to current wording. +# Updated contact information. +# No changes to the mapping data. +# +# [v0.9, 8 March 1994] +# First release. +# +# Use the Unicode reporting form +# for any questions or comments or to report errors in the data. +# # 0xFF61 = 0x21 0xFF62 = 0x22 diff --git a/enc/trans/JIS/UCS%JISX0208@1990.src b/enc/trans/JIS/UCS%JISX0208@1990.src index 977171ccda..b06e6de231 100644 --- a/enc/trans/JIS/UCS%JISX0208@1990.src +++ b/enc/trans/JIS/UCS%JISX0208@1990.src @@ -12,27 +12,16 @@ BEGIN_MAP # This mapping data is made from the mapping data provided by Unicode, Inc. # Original notice: # +# JIS0208.TXT +# Date: 2015-12-02 23:50:00 GMT [KW] +# © 2015 Unicode®, Inc. +# For terms of use, see http://www.unicode.org/terms_of_use.html +# # Name: JIS X 0208 (1990) to Unicode # Unicode version: 1.1 -# Table version: 0.9 +# Table version: 2.0 # Table format: Format A -# Date: 8 March 1994 -# -# Copyright (c) 1991-1994 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 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. +# Date: 2011 October 14 (header updated: 2015 December 02) # # General notes: # @@ -42,15 +31,7 @@ BEGIN_MAP # same as those used by actual products, nor may they be the best suited # for all uses. For more information on the mappings between various code # pages incorporating the repertoire of JIS X 0208 (1990) and Unicode, consult the -# VENDORS mapping data. Normative information on the mapping between -# JIS X 0208 (1990) and Unicode may be found in the Unihan.txt file in the -# latest Unicode Character Database. -# -# If you have carefully considered the fact that the mappings in -# this table are only one possible set of mappings between JIS X 0208 (1990) -# and Unicode and have no normative status, but still feel that you -# have located an error in the table that requires fixing, you may -# report any such error to errata@unicode.org. +# VENDORS mapping data. # # # Format: Four tab-separated columns @@ -77,12 +58,22 @@ BEGIN_MAP # the kuten form. For example, 0x2121 -> 0x0101 -> 0101; # 0x7426 -> 0x5406 -> 8406 # -# The kanji mappings are a normative part of ISO/IEC 10646. The -# non-kanji mappings are provisional, pending definition of -# official mappings by Japanese standards bodies +# Revision History: +# +# [v2.0, 2015 December 02] +# updates to copyright notice and terms of use +# no changes to character mappings +# +# [v1.0, 2011 October 14] +# Updated terms of use to current wording. +# Updated contact information. +# No changes to the mapping data. # -# Any comments or problems, contact +# [v0.9, 8 March 1994] +# First release. # +# Use the Unicode reporting form +# for any questions or comments or to report errors in the data. # # NetBSD specific modification: # 2003-08-18 : add U+FF3C -> 0x2140 conversion. diff --git a/enc/trans/JIS/UCS%JISX0212.src b/enc/trans/JIS/UCS%JISX0212.src index f3b2e7089b..65383a1c9f 100644 --- a/enc/trans/JIS/UCS%JISX0212.src +++ b/enc/trans/JIS/UCS%JISX0212.src @@ -12,27 +12,16 @@ BEGIN_MAP # This mapping data is made from the mapping data provided by Unicode, Inc. # Original notice: # +# JIS0212.TXT +# Date: 2015-12-02 23:51:00 GMT [KW] +# © 2015 Unicode®, Inc. +# For terms of use, see http://www.unicode.org/terms_of_use.html +# # Name: JIS X 0212 (1990) to Unicode # Unicode version: 1.1 -# Table version: 0.9 +# Table version: 2.0 # Table format: Format A -# Date: 8 March 1994 -# -# Copyright (c) 1991-1994 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 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. +# Date: 2011 October 14 (header updated: 2015 December 02) # # General notes: # @@ -42,15 +31,7 @@ BEGIN_MAP # same as those used by actual products, nor may they be the best suited # for all uses. For more information on the mappings between various code # pages incorporating the repertoire of JIS X 0212 and Unicode, consult the -# VENDORS mapping data. Normative information on the mapping between -# JIS X 0212 and Unicode may be found in the Unihan.txt file in the -# latest Unicode Character Database. -# -# If you have carefully considered the fact that the mappings in -# this table are only one possible set of mappings between JIS X 0212 and -# Unicode and have no normative status, but still feel that you -# have located an error in the table that requires fixing, you may -# report any such error to errata@unicode.org. +# VENDORS mapping data. # # # Format: Three tab-separated columns @@ -76,17 +57,11 @@ BEGIN_MAP # the kuten form. For example, 0x2121 -> 0x0101 -> 0101; # 0x6D63 -> 0x4D43 -> 7767 # -# The kanji mappings are a normative part of ISO/IEC 10646. The -# non-kanji mappings are provisional, pending definition of -# official mappings by Japanese standards bodies -# -# Any comments or problems, contact -# # Notes: # # 1. JIS X 0212 apparently unified the following two symbols # into a single character at 0x2922: -# +# # LATIN CAPITAL LETTER D WITH STROKE # LATIN CAPITAL LETTER ETH # @@ -97,6 +72,24 @@ BEGIN_MAP # Consequently, in the Unicode mapping, 0x2922 is treated as # LATIN CAPITAL LETTER D WITH STROKE. # +# Revision History: +# +# [v2.0, 2015 December 02] +# updates to copyright notice and terms of use +# no changes to character mappings +# +# [v1.0, 2011 October 14] +# Updated terms of use to current wording. +# Updated contact information. +# No changes to the mapping data. +# +# [v0.9, 8 March 1994] +# First release. +# +# Use the Unicode reporting form +# for any questions or comments or to report errors in the data. +# +# # Ruby specific modification: # remove 0x007E to 0x2237 conversion. # diff --git a/tool/transcode-tblgen.rb b/tool/transcode-tblgen.rb index 832d9a4762..2e5e68ba16 100644 --- a/tool/transcode-tblgen.rb +++ b/tool/transcode-tblgen.rb @@ -723,7 +723,7 @@ def citrus_decode_mapsrc(ces, csid, mapsrcs) path << ".src" path[path.rindex('/')] = '%' STDERR.puts 'load mapsrc %s' % path if VERBOSE_MODE - open(path) do |f| + open(path, 'rb') do |f| f.each_line do |l| break if /^BEGIN_MAP/ =~ l end diff --git a/version.h b/version.h index 90343939a4..fa57305b75 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.1.9" #define RUBY_RELEASE_DATE "2016-03-25" -#define RUBY_PATCHLEVEL 480 +#define RUBY_PATCHLEVEL 481 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 3 -- cgit v1.2.3