summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-08-19 13:22:46 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-08-19 13:22:46 +0000
commitf587347c28cd7b9ea445ca8150cfdb62a761523b (patch)
tree14eb99173899e8d83f4041f496ddf9468ce90d9e
parent40db3d97ac03c8346fff14aa98340a68e79e85a5 (diff)
euckr-tbl.rb: euro and registered signs
* enc/trans/euckr-tbl.rb (EUCKR_TO_UCS_TBL): add missing euro and registered signs. [ruby-core:64452] [Bug #10149] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47221 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--enc/trans/euckr-tbl.rb2
-rw-r--r--test/ruby/enc/test_euc_kr.rb8
3 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 837062f7d0..366370456e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 19 22:22:45 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * enc/trans/euckr-tbl.rb (EUCKR_TO_UCS_TBL): add missing euro and
+ registered signs. [ruby-core:64452] [Bug #10149]
+
Tue Aug 19 13:59:43 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* compar.c (rb_cmperr): preserve encodings of arguments in the
diff --git a/enc/trans/euckr-tbl.rb b/enc/trans/euckr-tbl.rb
index 773cd90122..4ce8521a8a 100644
--- a/enc/trans/euckr-tbl.rb
+++ b/enc/trans/euckr-tbl.rb
@@ -162,6 +162,8 @@ EUCKR_TO_UCS_TBL = [
["A2E3",0x33C2],
["A2E4",0x33D8],
["A2E5",0x2121],
+ ["A2E6",0x20AC],
+ ["A2E7",0x00AE],
["A3A1",0xFF01],
["A3A2",0xFF02],
["A3A3",0xFF03],
diff --git a/test/ruby/enc/test_euc_kr.rb b/test/ruby/enc/test_euc_kr.rb
index 087bc795f7..5413fa6062 100644
--- a/test/ruby/enc/test_euc_kr.rb
+++ b/test/ruby/enc/test_euc_kr.rb
@@ -25,4 +25,12 @@ class TestEucKr < Test::Unit::TestCase
def test_left_adjust_char_head
assert_equal(s("\xa1\xa1"), s("\xa1\xa1\xa1\xa1").chop)
end
+
+ def test_euro_sign
+ assert_equal("\u{20ac}", s("\xa2\xe6").encode("utf-8"))
+ end
+
+ def test_registered_mark
+ assert_equal("\u{00ae}", s("\xa2\xe7").encode("utf-8"))
+ end
end