diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | enc/trans/euckr-tbl.rb | 2 | ||||
| -rw-r--r-- | test/ruby/enc/test_euc_kr.rb | 8 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 16 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Wed Sep 10 12:27:08 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] + Wed Sep 10 12:25:24 2014 Eric Wong <e@80x24.org> * time.c (time_timespec): fix tv_nsec overflow 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 @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-09-10" -#define RUBY_PATCHLEVEL 563 +#define RUBY_PATCHLEVEL 564 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 9 |