diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-01 05:27:48 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-01 05:27:48 +0000 |
commit | 7ea3d11e22764866d70c9ec8441d9c322013d934 (patch) | |
tree | b772980872b1acecd20053dc31c018adb7865f42 /enc | |
parent | 629da9d04903295fb3905697ab015777c590f257 (diff) | |
download | ruby-7ea3d11e22764866d70c9ec8441d9c322013d934.tar.gz |
* enc/trans/japanese.trans: fix Ruby 1.8 compatibility.
* enc/trans/japanese.trans: fix mapping priority. [ruby-dev:36068]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19014 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enc')
-rw-r--r-- | enc/trans/japanese.trans | 111 |
1 files changed, 55 insertions, 56 deletions
diff --git a/enc/trans/japanese.trans b/enc/trans/japanese.trans index abb9765379..43fe1df07e 100644 --- a/enc/trans/japanese.trans +++ b/enc/trans/japanese.trans @@ -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 %> |