diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | enc/trans/single_byte.trans | 15 |
2 files changed, 10 insertions, 11 deletions
@@ -1,3 +1,9 @@ +Tue Oct 14 20:32:09 2008 Tanaka Akira <akr@fsij.org> + + * enc/trans/single_byte.trans (transcode_tblgen_singlebyte): renamed + from transcode_tblgen_windows. + (transcode_tblgen_iso8859): use transcode_tblgen_singlebyte. + Tue Oct 14 14:11:17 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * ruby.c (proc_options): -U can be followed by other options. diff --git a/enc/trans/single_byte.trans b/enc/trans/single_byte.trans index c33a850ad8..9030b9a942 100644 --- a/enc/trans/single_byte.trans +++ b/enc/trans/single_byte.trans @@ -26,9 +26,7 @@ transcode_tblgen "ASCII-8BIT", "UTF-8", us_ascii_map transcode_tblgen "UTF-8", "ASCII-8BIT", us_ascii_map - def transcode_tblgen_iso8859(name, tbl_to_ucs) - tbl_to_ucs = CONTROL1_TO_UCS_TBL + tbl_to_ucs - name_ident = name.tr('-','_') + def transcode_tblgen_singlebyte(name, tbl_to_ucs) code = '' code << transcode_tblgen(name, "UTF-8", [["{00-7f}", :nomap], *tbl_to_ucs]) code << "\n" @@ -36,13 +34,8 @@ code end - def transcode_tblgen_windows(name, tbl_to_ucs) - name_ident = name.tr('-','_') - code = '' - code << transcode_tblgen(name, "UTF-8", [["{00-7f}", :nomap], *tbl_to_ucs]) - code << "\n" - code << transcode_tblgen("UTF-8", name, [["{00-7f}", :nomap], *tbl_to_ucs.map {|a,b| [b,a] }]) - code + def transcode_tblgen_iso8859(name, tbl_to_ucs) + transcode_tblgen_singlebyte(name, CONTROL1_TO_UCS_TBL + tbl_to_ucs) end transcode_tblgen_iso8859("ISO-8859-1", ISO_8859_1_TO_UCS_TBL) @@ -59,7 +52,7 @@ transcode_tblgen_iso8859("ISO-8859-13", ISO_8859_13_TO_UCS_TBL) transcode_tblgen_iso8859("ISO-8859-14", ISO_8859_14_TO_UCS_TBL) transcode_tblgen_iso8859("ISO-8859-15", ISO_8859_15_TO_UCS_TBL) - transcode_tblgen_windows("WINDOWS-1252", WINDOWS_1252_TO_UCS_TBL) + transcode_tblgen_singlebyte("WINDOWS-1252", WINDOWS_1252_TO_UCS_TBL) %> <%= transcode_generated_code %> |