archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 47221: [Backport #10149]

Browse source 
* 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/branches/ruby_2_0_0@47502 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2014-09-10 03:32:54 +00:00
parent b84c5c3e36
commit 07b140ecb1
4 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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

2
enc/trans/euckr-tbl.rb
View file

@ -162,6 +162,8 @@ EUCKR_TO_UCS_TBL = [
["A2E3",0x33C2],
["A2E4",0x33D8],
["A2E5",0x2121],
["A2E6",0x20AC],
["A2E7",0x00AE],
["A3A1",0xFF01],
["A3A2",0xFF02],
["A3A3",0xFF03],

8
test/ruby/enc/test_euc_kr.rb
View file

@ -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

2
version.h
View file

@ -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