diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-15 12:25:20 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-15 12:25:20 +0000 |
| commit | a73374bb5716287b82879e6ced116315aac77f7d (patch) | |
| tree | 0c6b7c81955a031af3714ecb042768444c6132ed /enc/trans | |
| parent | 21c7d36573736e6e3937c24dfa1cfccf6aa907ad (diff) | |
* tool/transcode-tblgen.rb (transcode_tblgen): add valid_encoding
optional argument.
* enc/trans/single_byte.trans use valid_encoding argument for
transcode_tblgen.
* enc/trans/chinese.trans: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26941 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enc/trans')
| -rw-r--r-- | enc/trans/chinese.trans | 10 | ||||
| -rw-r--r-- | enc/trans/single_byte.trans | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/enc/trans/chinese.trans b/enc/trans/chinese.trans index 1db6565254..3689696018 100644 --- a/enc/trans/chinese.trans +++ b/enc/trans/chinese.trans @@ -1,16 +1,18 @@ #include "transcode_data.h" <% - set_valid_byte_pattern 'GB2312', 'EUC-KR' - set_valid_byte_pattern 'GB12345', 'EUC-KR' + gb2312_valid_byte_pattern = ValidEncoding['EUC-KR'] + gb12345_valid_byte_pattern = ValidEncoding['EUC-KR'] transcode_tblgen "GB2312", "UTF-8", [["{00-7f}", :nomap]] + - citrus_decode_mapsrc("euc", 0x8080, "GB2312/UCS") + citrus_decode_mapsrc("euc", 0x8080, "GB2312/UCS"), + gb2312_valid_byte_pattern transcode_tblgen "GB12345", "UTF-8", [["{00-7f}", :nomap]] + - citrus_decode_mapsrc("euc", 0x8080, "GB12345/UCS") + citrus_decode_mapsrc("euc", 0x8080, "GB12345/UCS"), + gb12345_valid_byte_pattern transcode_tblgen "UTF-8", "GB2312", [["{00-7f}", :nomap]] + diff --git a/enc/trans/single_byte.trans b/enc/trans/single_byte.trans index db47074570..55d8430932 100644 --- a/enc/trans/single_byte.trans +++ b/enc/trans/single_byte.trans @@ -22,9 +22,8 @@ require(name.downcase + "-tbl") control1_if_needed = (name =~ /^ISO-8859/) ? CONTROL1_TO_UCS_TBL : [] tbl_to_ucs = control1_if_needed + eval(name.gsub(/-/, '_') + "_TO_UCS_TBL") - set_valid_byte_pattern(name, '1byte') code = '' - code << transcode_tblgen(name, "UTF-8", [["{00-7f}", :nomap], *tbl_to_ucs.reject {|a, b| a.length != 2 }]) + code << transcode_tblgen(name, "UTF-8", [["{00-7f}", :nomap], *tbl_to_ucs.reject {|a, b| a.length != 2 }], '{00-ff}') code << "\n" code << transcode_tblgen("UTF-8", name, [["{00-7f}", :nomap], *tbl_to_ucs.map {|a,b| [b,a] }]) code |