Skip to content

Commit df557d2

Browse files
unakunak
committed
merge revision(s) 54129,54130,54132: [Backport ruby#11844]
 * enc/trans/JIS: update Unicode's notice. [Bug ruby#11844] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54283 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent 32299d9 commit df557d2

File tree

9 files changed

+154
-187
lines changed

9 files changed

+154
-187
lines changed

‎ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
Fri Mar 25 18:38:42 2016 NARUSE, Yui <naruse@ruby-lang.org>
2+
3+
* enc/trans/JIS: update Unicode's notice. [Bug #11844]
4+
15
Fri Mar 25 18:36:04 2016 Eric Wong <e@80x24.org>
26

37
* ext/openssl/ossl_ssl.c (ossl_sslctx_setup): document as MT-unsafe

‎enc/trans/JIS/JISX0201-KANA%UCS.src

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,16 @@ BEGIN_MAP
1212
# This mapping data is made from the mapping data provided by Unicode, Inc.
1313
# Original notice:
1414
#
15+
# JIS0201.TXT
16+
# Date: 2015-12-02 23:49:00 GMT [KW]
17+
# © 2015 Unicode®, Inc.
18+
# For terms of use, see http://www.unicode.org/terms_of_use.html
19+
#
1520
# Name: JIS X 0201 (1976) to Unicode 1.1 Table
1621
# Unicode version: 1.1
17-
# Table version: 0.9
22+
# Table version: 2.0
1823
# Table format: Format A
19-
# Date: 8 March 1994
20-
#
21-
# Copyright (c) 1991-1994 Unicode, Inc. All Rights reserved.
22-
#
23-
# This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
24-
# No claims are made as to fitness for any particular purpose. No
25-
# warranties of any kind are expressed or implied. The recipient
26-
# agrees to determine applicability of information provided. If this
27-
# file has been provided on magnetic media by Unicode, Inc., the sole
28-
# remedy for any claim will be exchange of defective media within 90
29-
# days of receipt.
30-
#
31-
# Recipient is granted the right to make copies in any form for
32-
# internal distribution and to freely use the information supplied
33-
# in the creation of products supporting Unicode. Unicode, Inc.
34-
# specifically excludes the right to re-distribute this file directly
35-
# to third parties or other organizations whether for profit or not.
24+
# Date: 2011 October 14 (header updated: 2015 December 02)
3625
#
3726
# General notes:
3827
#
@@ -42,15 +31,7 @@ BEGIN_MAP
4231
# same as those used by actual products, nor may they be the best suited
4332
# for all uses. For more information on the mappings between various code
4433
# pages incorporating the repertoire of JIS X 0201 and Unicode, consult the
45-
# VENDORS mapping data. Normative information on the mapping between
46-
# JIS X 0201 and Unicode may be found in the Unihan.txt file in the
47-
# latest Unicode Character Database.
48-
#
49-
# If you have carefully considered the fact that the mappings in
50-
# this table are only one possible set of mappings between JIS X 0201 and
51-
# Unicode and have no normative status, but still feel that you
52-
# have located an error in the table that requires fixing, you may
53-
# report any such error to errata@unicode.org.
34+
# VENDORS mapping data.
5435
#
5536
#
5637
# Format: Three tab-separated columns
@@ -60,6 +41,22 @@ BEGIN_MAP
6041
#
6142
# The entries are in JIS order
6243
#
44+
# Revision History:
45+
#
46+
# [v2.0, 2015 December 02]
47+
# updates to copyright notice and terms of use
48+
# no changes to character mappings
49+
#
50+
# [v1.0, 2011 October 14]
51+
# Updated terms of use to current wording.
52+
# Updated contact information.
53+
# No changes to the mapping data.
54+
#
55+
# [v0.9, 8 March 1994]
56+
# First release.
57+
#
58+
# Use the Unicode reporting form <http://www.unicode.org/reporting.html>
59+
# for any questions or comments or to report errors in the data.
6360
#
6461
0x21 = 0xFF61
6562
0x22 = 0xFF62

‎enc/trans/JIS/JISX0208@1990%UCS.src

Lines changed: 23 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,17 @@ BEGIN_MAP
1212
# This mapping data is made from the mapping data provided by Unicode, Inc.
1313
# Original notice:
1414
#
15+
#
16+
# JIS0208.TXT
17+
# Date: 2015-12-02 23:50:00 GMT [KW]
18+
# © 2015 Unicode®, Inc.
19+
# For terms of use, see http://www.unicode.org/terms_of_use.html
20+
#
1521
# Name: JIS X 0208 (1990) to Unicode
1622
# Unicode version: 1.1
17-
# Table version: 0.9
23+
# Table version: 2.0
1824
# Table format: Format A
19-
# Date: 8 March 1994
20-
#
21-
# Copyright (c) 1991-1994 Unicode, Inc. All Rights reserved.
22-
#
23-
# This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
24-
# No claims are made as to fitness for any particular purpose. No
25-
# warranties of any kind are expressed or implied. The recipient
26-
# agrees to determine applicability of information provided. If this
27-
# file has been provided on magnetic media by Unicode, Inc., the sole
28-
# remedy for any claim will be exchange of defective media within 90
29-
# days of receipt.
30-
#
31-
# Recipient is granted the right to make copies in any form for
32-
# internal distribution and to freely use the information supplied
33-
# in the creation of products supporting Unicode. Unicode, Inc.
34-
# specifically excludes the right to re-distribute this file directly
35-
# to third parties or other organizations whether for profit or not.
25+
# Date: 2011 October 14 (header updated: 2015 December 02)
3626
#
3727
# General notes:
3828
#
@@ -42,15 +32,7 @@ BEGIN_MAP
4232
# same as those used by actual products, nor may they be the best suited
4333
# for all uses. For more information on the mappings between various code
4434
# pages incorporating the repertoire of JIS X 0208 (1990) and Unicode, consult the
45-
# VENDORS mapping data. Normative information on the mapping between
46-
# JIS X 0208 (1990) and Unicode may be found in the Unihan.txt file in the
47-
# latest Unicode Character Database.
48-
#
49-
# If you have carefully considered the fact that the mappings in
50-
# this table are only one possible set of mappings between JIS X 0208 (1990)
51-
# and Unicode and have no normative status, but still feel that you
52-
# have located an error in the table that requires fixing, you may
53-
# report any such error to errata@unicode.org.
35+
# VENDORS mapping data.
5436
#
5537
#
5638
# Format: Four tab-separated columns
@@ -77,12 +59,22 @@ BEGIN_MAP
7759
# the kuten form. For example, 0x2121 -> 0x0101 -> 0101;
7860
# 0x7426 -> 0x5406 -> 8406
7961
#
80-
# The kanji mappings are a normative part of ISO/IEC 10646. The
81-
# non-kanji mappings are provisional, pending definition of
82-
# official mappings by Japanese standards bodies
62+
# Revision History:
63+
#
64+
# [v2.0, 2015 December 02]
65+
# updates to copyright notice and terms of use
66+
# no changes to character mappings
67+
#
68+
# [v1.0, 2011 October 14]
69+
# Updated terms of use to current wording.
70+
# Updated contact information.
71+
# No changes to the mapping data.
8372
#
84-
# Any comments or problems, contact <John_Jenkins@taligent.com>
73+
# [v0.9, 8 March 1994]
74+
# First release.
8575
#
76+
# Use the Unicode reporting form <http://www.unicode.org/reporting.html>
77+
# for any questions or comments or to report errors in the data.
8678
#
8779
# NetBSD specific modification:
8880
# 2003-08-18 : change the conversion for reverse solidus (0x2140).

‎enc/trans/JIS/JISX0212%UCS.src

Lines changed: 27 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,16 @@ BEGIN_MAP
1212
# This mapping data is made from the mapping data provided by Unicode, Inc.
1313
# Original notice:
1414
#
15+
# JIS0212.TXT
16+
# Date: 2015-12-02 23:51:00 GMT [KW]
17+
# © 2015 Unicode®, Inc.
18+
# For terms of use, see http://www.unicode.org/terms_of_use.html
19+
#
1520
# Name: JIS X 0212 (1990) to Unicode
1621
# Unicode version: 1.1
17-
# Table version: 0.9
22+
# Table version: 2.0
1823
# Table format: Format A
19-
# Date: 8 March 1994
20-
#
21-
# Copyright (c) 1991-1994 Unicode, Inc. All Rights reserved.
22-
#
23-
# This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
24-
# No claims are made as to fitness for any particular purpose. No
25-
# warranties of any kind are expressed or implied. The recipient
26-
# agrees to determine applicability of information provided. If this
27-
# file has been provided on magnetic media by Unicode, Inc., the sole
28-
# remedy for any claim will be exchange of defective media within 90
29-
# days of receipt.
30-
#
31-
# Recipient is granted the right to make copies in any form for
32-
# internal distribution and to freely use the information supplied
33-
# in the creation of products supporting Unicode. Unicode, Inc.
34-
# specifically excludes the right to re-distribute this file directly
35-
# to third parties or other organizations whether for profit or not.
24+
# Date: 2011 October 14 (header updated: 2015 December 02)
3625
#
3726
# General notes:
3827
#
@@ -42,15 +31,7 @@ BEGIN_MAP
4231
# same as those used by actual products, nor may they be the best suited
4332
# for all uses. For more information on the mappings between various code
4433
# pages incorporating the repertoire of JIS X 0212 and Unicode, consult the
45-
# VENDORS mapping data. Normative information on the mapping between
46-
# JIS X 0212 and Unicode may be found in the Unihan.txt file in the
47-
# latest Unicode Character Database.
48-
#
49-
# If you have carefully considered the fact that the mappings in
50-
# this table are only one possible set of mappings between JIS X 0212 and
51-
# Unicode and have no normative status, but still feel that you
52-
# have located an error in the table that requires fixing, you may
53-
# report any such error to errata@unicode.org.
34+
# VENDORS mapping data.
5435
#
5536
#
5637
# Format: Three tab-separated columns
@@ -76,17 +57,11 @@ BEGIN_MAP
7657
# the kuten form. For example, 0x2121 -> 0x0101 -> 0101;
7758
# 0x6D63 -> 0x4D43 -> 7767
7859
#
79-
# The kanji mappings are a normative part of ISO/IEC 10646. The
80-
# non-kanji mappings are provisional, pending definition of
81-
# official mappings by Japanese standards bodies
82-
#
83-
# Any comments or problems, contact <John_Jenkins@taligent.com>
84-
#
8560
# Notes:
8661
#
8762
# 1. JIS X 0212 apparently unified the following two symbols
8863
# into a single character at 0x2922:
89-
#
64+
#
9065
# LATIN CAPITAL LETTER D WITH STROKE
9166
# LATIN CAPITAL LETTER ETH
9267
#
@@ -96,7 +71,24 @@ BEGIN_MAP
9671
# 0x2922 and 0x2942 are intended to be a capital/small pair.
9772
# Consequently, in the Unicode mapping, 0x2922 is treated as
9873
# LATIN CAPITAL LETTER D WITH STROKE.
99-
#
74+
#
75+
# Revision History:
76+
#
77+
# [v2.0, 2015 December 02]
78+
# updates to copyright notice and terms of use
79+
# no changes to character mappings
80+
#
81+
# [v1.0, 2011 October 14]
82+
# Updated terms of use to current wording.
83+
# Updated contact information.
84+
# No changes to the mapping data.
85+
#
86+
# [v0.9, 8 March 1994]
87+
# First release.
88+
#
89+
# Use the Unicode reporting form <http://www.unicode.org/reporting.html>
90+
# for any questions or comments or to report errors in the data.
91+
#
10092
0x222F = 0x02D8
10193
0x2230 = 0x02C7
10294
0x2231 = 0x00B8

‎enc/trans/JIS/UCS%JISX0201-KANA.src

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,16 @@ BEGIN_MAP
1212
# This mapping data is made from the mapping data provided by Unicode, Inc.
1313
# Original notice:
1414
#
15+
# JIS0201.TXT
16+
# Date: 2015-12-02 23:49:00 GMT [KW]
17+
# © 2015 Unicode®, Inc.
18+
# For terms of use, see http://www.unicode.org/terms_of_use.html
19+
#
1520
# Name: JIS X 0201 (1976) to Unicode 1.1 Table
1621
# Unicode version: 1.1
17-
# Table version: 0.9
22+
# Table version: 2.0
1823
# Table format: Format A
19-
# Date: 8 March 1994
20-
#
21-
# Copyright (c) 1991-1994 Unicode, Inc. All Rights reserved.
22-
#
23-
# This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
24-
# No claims are made as to fitness for any particular purpose. No
25-
# warranties of any kind are expressed or implied. The recipient
26-
# agrees to determine applicability of information provided. If this
27-
# file has been provided on magnetic media by Unicode, Inc., the sole
28-
# remedy for any claim will be exchange of defective media within 90
29-
# days of receipt.
30-
#
31-
# Recipient is granted the right to make copies in any form for
32-
# internal distribution and to freely use the information supplied
33-
# in the creation of products supporting Unicode. Unicode, Inc.
34-
# specifically excludes the right to re-distribute this file directly
35-
# to third parties or other organizations whether for profit or not.
24+
# Date: 2011 October 14 (header updated: 2015 December 02)
3625
#
3726
# General notes:
3827
#
@@ -42,15 +31,7 @@ BEGIN_MAP
4231
# same as those used by actual products, nor may they be the best suited
4332
# for all uses. For more information on the mappings between various code
4433
# pages incorporating the repertoire of JIS X 0201 and Unicode, consult the
45-
# VENDORS mapping data. Normative information on the mapping between
46-
# JIS X 0201 and Unicode may be found in the Unihan.txt file in the
47-
# latest Unicode Character Database.
48-
#
49-
# If you have carefully considered the fact that the mappings in
50-
# this table are only one possible set of mappings between JIS X 0201 and
51-
# Unicode and have no normative status, but still feel that you
52-
# have located an error in the table that requires fixing, you may
53-
# report any such error to errata@unicode.org.
34+
# VENDORS mapping data.
5435
#
5536
#
5637
# Format: Three tab-separated columns
@@ -60,6 +41,23 @@ BEGIN_MAP
6041
#
6142
# The entries are in JIS order
6243
#
44+
# Revision History:
45+
#
46+
# [v2.0, 2015 December 02]
47+
# updates to copyright notice and terms of use
48+
# no changes to character mappings
49+
#
50+
# [v1.0, 2011 October 14]
51+
# Updated terms of use to current wording.
52+
# Updated contact information.
53+
# No changes to the mapping data.
54+
#
55+
# [v0.9, 8 March 1994]
56+
# First release.
57+
#
58+
# Use the Unicode reporting form <http://www.unicode.org/reporting.html>
59+
# for any questions or comments or to report errors in the data.
60+
#
6361
#
6462
0xFF61 = 0x21
6563
0xFF62 = 0x22

0 commit comments

Comments
 (0)