ruby-changes:7493
From: naruse <ko1@a...>
Date: Mon, 1 Sep 2008 14:28:25 +0900 (JST)
Subject: [ruby-changes:7493] Ruby:r19014 (trunk): * enc/trans/japanese.trans: fix Ruby 1.8 compatibility.
naruse 2008-09-01 14:27:48 +0900 (Mon, 01 Sep 2008) New Revision: 19014 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19014 Log: * enc/trans/japanese.trans: fix Ruby 1.8 compatibility. * enc/trans/japanese.trans: fix mapping priority. [ruby-dev:36068] Modified files: trunk/ChangeLog trunk/enc/trans/japanese.trans Index: ChangeLog =================================================================== --- ChangeLog (revision 19013) +++ ChangeLog (revision 19014) @@ -1,3 +1,9 @@ +Mon Sep 1 14:25:26 2008 NARUSE, Yui <naruse@r...> + + * enc/trans/japanese.trans: fix Ruby 1.8 compatibility. + + * enc/trans/japanese.trans: fix mapping priority. [ruby-dev:36068] + Mon Sep 1 14:24:14 2008 NARUSE, Yui <naruse@r...> * test/ruby/test_transcode.rb (test_windows_31j): added. Index: enc/trans/japanese.trans =================================================================== --- enc/trans/japanese.trans (revision 19013) +++ enc/trans/japanese.trans (revision 19014) @@ -1,65 +1,64 @@ #include "transcode_data.h" <% - transcode_tblgen "Shift_JIS", "UTF-8", [ - ["{00-7f}", :nomap], - *citrus_decode_mapsrc("mskanji", 1, "JISX0201-KANA/UCS"), - *citrus_decode_mapsrc("mskanji", 2, "JISX0208:1990/UCS"), - ] - transcode_tblgen "Windows-31J", "UTF-8", [ - ["{00-7f}", :nomap], - *citrus_decode_mapsrc("mskanji", 1, "JISX0201-KANA/UCS"), - *citrus_decode_mapsrc("mskanji", 2, - "JISX0208VDC:NEC/UCS,CP932VDC:NEC_IBM/UCS,CP932VDC:IBM/UCS,CP932UDA/UCS,JISX0208:MS/UCS"), - ] + transcode_tblgen "Shift_JIS", "UTF-8", + [["{00-7f}", :nomap]] + + citrus_decode_mapsrc("mskanji", 1, "JISX0201-KANA/UCS") + + citrus_decode_mapsrc("mskanji", 2, "JISX0208:1990/UCS") - transcode_tblgen "UTF-8", "Shift_JIS", [ - ["{00-7f}", :nomap], - *citrus_decode_mapsrc("mskanji", 1, "UCS/JISX0201-KANA"), - *citrus_decode_mapsrc("mskanji", 2, "UCS/JISX0208:1990"), - ] - transcode_tblgen "UTF-8", "Windows-31J", [ - ["{00-7f}", :nomap], - *citrus_decode_mapsrc("mskanji", 1, "UCS/JISX0201-KANA"), - *citrus_decode_mapsrc("mskanji", 2, - "UCS/JISX0208VDC:NEC,UCS/CP932VDC:NEC_IBM,UCS/CP932VDC:IBM,UCS/CP932UDA,UCS/JISX0208:MS"), - ] + transcode_tblgen "Windows-31J", "UTF-8", + [["{00-7f}", :nomap]] + + citrus_decode_mapsrc("mskanji", 1, "JISX0201-KANA/UCS") + + citrus_decode_mapsrc("mskanji", 2, + "JISX0208VDC:NEC/UCS,CP932VDC:NEC_IBM/UCS,CP932VDC:IBM/UCS,CP932UDA/UCS,JISX0208:MS/UCS") - transcode_tblgen "EUC-JP", "UTF-8", [ - ["{00-7f}", :nomap], - *citrus_decode_mapsrc("euc", 0x8080, "JISX0208:1990/UCS"), - *citrus_decode_mapsrc("euc", 0x0080, "JISX0201-KANA/UCS"), - *citrus_decode_mapsrc("euc", 0x8000, "JISX0212/UCS"), - ] - transcode_tblgen "EUC-JP-MS", "UTF-8", [ - ["{00-7f}", :nomap], - *citrus_decode_mapsrc("euc", 0x8080, "JISX0208VDC:NEC/UCS,JISX0208UDC/UCS,JISX0208:MS/UCS"), - *citrus_decode_mapsrc("euc", 0x0080, "JISX0201-KANA/UCS"), - *citrus_decode_mapsrc("euc", 0x8000, "JISX0212VDC:IBM/UCS,JISX0212UDC/UCS,JISX0212:MS/UCS"), - ] - transcode_tblgen "CP51932", "UTF-8", [ - ["{00-7f}", :nomap], - *citrus_decode_mapsrc("euc", 0x8080, "JISX0208VDC:NEC/UCS,CP932VDC:NEC_IBM/UCS,JISX0208:MS/UCS"), - *citrus_decode_mapsrc("euc", 0x0080, "JISX0201-KANA/UCS"), - ] - transcode_tblgen "UTF-8", "EUC-JP", [ - ["{00-7f}", :nomap], - *citrus_decode_mapsrc("euc", 0x8080, "UCS/JISX0208:1990"), - *citrus_decode_mapsrc("euc", 0x0080, "UCS/JISX0201-KANA"), - *citrus_decode_mapsrc("euc", 0x8000, "UCS/JISX0212"), - ] - transcode_tblgen "UTF-8", "EUC-JP-MS", [ - ["{00-7f}", :nomap], - *citrus_decode_mapsrc("euc", 0x8080, "UCS/JISX0208VDC:NEC,UCS/JISX0208UDC,UCS/JISX0208:MS"), - *citrus_decode_mapsrc("euc", 0x0080, "UCS/JISX0201-KANA"), - *citrus_decode_mapsrc("euc", 0x8000, "UCS/JISX0212VDC:IBM,UCS/JISX0212UDC,UCS/JISX0212:MS"), - ] - transcode_tblgen "UTF-8", "CP51932", [ - ["{00-7f}", :nomap], - *citrus_decode_mapsrc("euc", 0x8080, "UCS/JISX0208VDC:NEC,UCS/CP932VDC:NEC_IBM,UCS/JISX0208:MS"), - *citrus_decode_mapsrc("euc", 0x0080, "UCS/JISX0201-KANA"), - ] + transcode_tblgen "UTF-8", "Shift_JIS", + [["{00-7f}", :nomap]] + + citrus_decode_mapsrc("mskanji", 1, "UCS/JISX0201-KANA") + + citrus_decode_mapsrc("mskanji", 2, "UCS/JISX0208:1990") + + transcode_tblgen "UTF-8", "Windows-31J", + [["{00-7f}", :nomap]] + + citrus_decode_mapsrc("mskanji", 1, "UCS/JISX0201-KANA") + + citrus_decode_mapsrc("mskanji", 2, + "UCS/JISX0208:MS,UCS/JISX0208VDC:NEC,UCS/CP932VDC:NEC_IBM,UCS/CP932VDC:IBM,UCS/CP932UDA") + + + transcode_tblgen "EUC-JP", "UTF-8", + [["{00-7f}", :nomap]] + + citrus_decode_mapsrc("euc", 0x8080, "JISX0208:1990/UCS") + + citrus_decode_mapsrc("euc", 0x0080, "JISX0201-KANA/UCS") + + citrus_decode_mapsrc("euc", 0x8000, "JISX0212/UCS") + + transcode_tblgen "EUC-JP-MS", "UTF-8", + [["{00-7f}", :nomap]] + + citrus_decode_mapsrc("euc", 0x8080, "JISX0208VDC:NEC/UCS,JISX0208UDC/UCS,JISX0208:MS/UCS") + + citrus_decode_mapsrc("euc", 0x0080, "JISX0201-KANA/UCS") + + citrus_decode_mapsrc("euc", 0x8000, "JISX0212VDC:IBM/UCS,JISX0212UDC/UCS,JISX0212:MS/UCS") + + transcode_tblgen "CP51932", "UTF-8", + [["{00-7f}", :nomap]] + + citrus_decode_mapsrc("euc", 0x8080, "JISX0208VDC:NEC/UCS,CP932VDC:NEC_IBM/UCS,JISX0208:MS/UCS") + + citrus_decode_mapsrc("euc", 0x0080, "JISX0201-KANA/UCS") + + + transcode_tblgen "UTF-8", "EUC-JP", + [["{00-7f}", :nomap]] + + citrus_decode_mapsrc("euc", 0x8080, "UCS/JISX0208:1990") + + citrus_decode_mapsrc("euc", 0x0080, "UCS/JISX0201-KANA") + + citrus_decode_mapsrc("euc", 0x8000, "UCS/JISX0212") + + transcode_tblgen "UTF-8", "EUC-JP-MS", + [["{00-7f}", :nomap]] + + citrus_decode_mapsrc("euc", 0x8080, "UCS/JISX0208:MS,UCS/JISX0208VDC:NEC,UCS/JISX0208UDC") + + citrus_decode_mapsrc("euc", 0x0080, "UCS/JISX0201-KANA") + + citrus_decode_mapsrc("euc", 0x8000, "UCS/JISX0212VDC:IBM,UCS/JISX0212UDC,UCS/JISX0212:MS") + + transcode_tblgen "UTF-8", "CP51932", + [["{00-7f}", :nomap]] + + citrus_decode_mapsrc("euc", 0x8080, "UCS/JISX0208:MS,UCS/JISX0208VDC:NEC,UCS/CP932VDC:NEC_IBM") + + citrus_decode_mapsrc("euc", 0x0080, "UCS/JISX0201-KANA") %> <%= transcode_generated_code %> -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/