nagachika	2014-09-10 03:25:50 +0900 (Wed, 10 Sep 2014)

  New Revision: 47485

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=47485

  Log:
    merge revision(s) r47221: [Backport #10149]
    
    * enc/trans/euckr-tbl.rb (EUCKR_TO_UCS_TBL): add missing euro and
      registered signs.  [ruby-core:64452] [Bug #10149]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/enc/trans/euckr-tbl.rb
    branches/ruby_2_1/test/ruby/enc/test_euc_kr.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 47484)
+++ ruby_2_1/ChangeLog	(revision 47485)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Wed Sep 10 03:17:13 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* enc/trans/euckr-tbl.rb (EUCKR_TO_UCS_TBL): add missing euro and
+	  registered signs.  [ruby-core:64452] [Bug #10149]
+
 Wed Sep 10 03:01:31 2014  Eric Wong  <e@8...>
 
 	* time.c (time_timespec): fix tv_nsec overflow
Index: ruby_2_1/enc/trans/euckr-tbl.rb
===================================================================
--- ruby_2_1/enc/trans/euckr-tbl.rb	(revision 47484)
+++ ruby_2_1/enc/trans/euckr-tbl.rb	(revision 47485)
@@ -162,6 +162,8 @@ EUCKR_TO_UCS_TBL = [ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/enc/trans/euckr-tbl.rb#L162
   ["A2E3",0x33C2],
   ["A2E4",0x33D8],
   ["A2E5",0x2121],
+  ["A2E6",0x20AC],
+  ["A2E7",0x00AE],
   ["A3A1",0xFF01],
   ["A3A2",0xFF02],
   ["A3A3",0xFF03],
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 47484)
+++ ruby_2_1/version.h	(revision 47485)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-09-10"
-#define RUBY_PATCHLEVEL 230
+#define RUBY_PATCHLEVEL 231
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 9
Index: ruby_2_1/test/ruby/enc/test_euc_kr.rb
===================================================================
--- ruby_2_1/test/ruby/enc/test_euc_kr.rb	(revision 47484)
+++ ruby_2_1/test/ruby/enc/test_euc_kr.rb	(revision 47485)
@@ -25,4 +25,12 @@ class TestEucKr < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/ruby/enc/test_euc_kr.rb#L25
   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

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r47221


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/