Changeset 5180

Show
Ignore:
Timestamp:
01/21/08 20:09:37 (10 months ago)
Author:
tokuhirom
Message:

x-sjis-kddi-raw を x-sjis-kddi-cp932-raw に rename.
x-sjis-kddi, x-sjis-ezweb は x-sjis-kddi-cp932-raw の alias とする。docomo からの相互変換機能はカット。

Location:
lang/perl/Encode-JP-Mobile/branches/auto-convert-sjis-pictgram
Files:
10 modified
1 moved

Legend:

Unmodified
Added
Removed
  • lang/perl/Encode-JP-Mobile/branches/auto-convert-sjis-pictgram/Makefile.PL

    r5176 r5180  
    1414 
    1515my @ucms = qw(  
    16     sjis-kddi-raw sjis-kddi-auto-raw sjis-softbank-auto-raw 
     16    sjis-kddi-cp932-raw sjis-kddi-auto-raw sjis-softbank-auto-raw 
    1717    utf8-docomo utf8-kddi utf8-softbank 
    1818); 
  • lang/perl/Encode-JP-Mobile/branches/auto-convert-sjis-pictgram/lib/Encode/JP/Mobile.pm

    r5179 r5180  
    1919define_alias( 'x-sjis-vodafone-auto-raw' => 'x-sjis-softbank-auto-raw' ); 
    2020 
    21 define_alias( 'x-sjis-kddi'              => 'x-sjis-kddi-raw' ); 
    22 define_alias( 'x-sjis-ezweb'             => 'x-sjis-kddi-raw' ); 
    23 define_alias( 'x-sjis-ezweb-raw'         => 'x-sjis-kddi-raw' ); 
     21define_alias( 'x-sjis-kddi'              => 'x-sjis-kddi-cp932-raw' ); 
     22define_alias( 'x-sjis-ezweb'             => 'x-sjis-kddi-cp932-raw' ); 
     23define_alias( 'x-sjis-ezweb-cp932-raw'   => 'x-sjis-kddi-cp932-raw' ); 
    2424define_alias( 'x-sjis-ezweb-auto-raw'    => 'x-sjis-kddi-auto-raw' ); 
    2525 
  • lang/perl/Encode-JP-Mobile/branches/auto-convert-sjis-pictgram/lib/Encode/JP/Mobile/KDDIJIS.pm

    r5176 r5180  
    1717}x; 
    1818 
    19 sub _encoding() { 'x-sjis-kddi-raw' } 
     19sub _encoding() { 'x-sjis-kddi-cp932-raw' } 
    2020 
    2121sub decode($$;$) { 
  • lang/perl/Encode-JP-Mobile/branches/auto-convert-sjis-pictgram/t/Mobile.t

    r5176 r5180  
    77test_rt("x-sjis-imode", "\x82\xb1\xf9\x5d\xf8\xa0\x82\xb1", "\x{3053}\x{e6b9}\x{e63f}\x{3053}"); 
    88test_rt("x-sjis-docomo", "\x82\xb1\xf9\x5d\xf8\xa0\x82\xb1", "\x{3053}\x{e6b9}\x{e63f}\x{3053}"); 
    9 test_rt("x-sjis-kddi-raw", "\x82\xb1\xF6\x59", "\x{3053}\x{e481}"); # x-sjis-kddi encode support not yet, use -raw 
     9test_rt("x-sjis-kddi-cp932-raw", "\x82\xb1\xF6\x59", "\x{3053}\x{e481}"); # x-sjis-kddi encode support not yet, use -raw 
    1010test_rt("x-sjis-kddi-auto", "\x82\xb1\xF6\x59", "\x{3053}\x{ef59}"); 
    11 test_rt("x-sjis-ezweb-raw", "\x82\xb1\xF6\x59", "\x{3053}\x{e481}"); # x-sjis-ezweb encode support not yet, use -raw 
     11test_rt("x-sjis-ezweb-cp932-raw", "\x82\xb1\xF6\x59", "\x{3053}\x{e481}"); # x-sjis-ezweb encode support not yet, use -raw 
    1212test_rt("x-sjis-airedge", "\x82\xb1\xf9\x5d\xf8\xa0\x82\xb1", "\x{3053}\x{e6b9}\x{e63f}\x{3053}"); 
    1313test_rt("x-sjis-airh", "\x82\xb1\xf9\x5d\xf8\xa0\x82\xb1", "\x{3053}\x{e6b9}\x{e63f}\x{3053}"); 
     
    3535test_rt("x-sjis-imode-raw", "\x82\xb1\xf9\x5d\xf8\xa0\x82\xb1", "\x{3053}\x{e6b9}\x{e63f}\x{3053}"); 
    3636test_rt("x-sjis-docomo-raw", "\x82\xb1\xf9\x5d\xf8\xa0\x82\xb1", "\x{3053}\x{e6b9}\x{e63f}\x{3053}"); 
    37 test_rt("x-sjis-kddi-raw", "\x82\xb1\xF6\x59", "\x{3053}\x{e481}"); # x-sjis-kddi encode support not yet 
     37test_rt("x-sjis-kddi-cp932-raw", "\x82\xb1\xF6\x59", "\x{3053}\x{e481}"); # x-sjis-kddi encode support not yet 
    3838test_rt("x-sjis-kddi-auto-raw", "\x82\xb1\xF6\x59", "\x{3053}\x{ef59}"); 
    39 test_rt("x-sjis-ezweb-raw", "\x82\xb1\xF6\x59", "\x{3053}\x{e481}"); # x-sjis-ezweb encode support not yet 
     39test_rt("x-sjis-ezweb-cp932-raw", "\x82\xb1\xF6\x59", "\x{3053}\x{e481}"); # x-sjis-ezweb encode support not yet 
    4040test_rt("x-sjis-airedge-raw", "\x82\xb1\xf9\x5d\xf8\xa0\x82\xb1", "\x{3053}\x{e6b9}\x{e63f}\x{3053}"); 
    4141test_rt("x-sjis-airh-raw", "\x82\xb1\xf9\x5d\xf8\xa0\x82\xb1", "\x{3053}\x{e6b9}\x{e63f}\x{3053}"); 
  • lang/perl/Encode-JP-Mobile/branches/auto-convert-sjis-pictgram/t/kddi-bruteforce.t

    r5176 r5180  
    1818    my $unicode = chr hex $r->{unicode}; 
    1919    my $auto = chr hex $r->{unicode_auto}; 
    20     is decode("x-sjis-kddi-raw", $sjis), $unicode, $r->{unicode}; 
    21     is encode("x-sjis-kddi-raw", $unicode), $sjis, $r->{unicode}; 
     20    is decode("x-sjis-kddi-cp932-raw", $sjis), $unicode, $r->{unicode}; 
     21    is encode("x-sjis-kddi-cp932-raw", $unicode), $sjis, $r->{unicode}; 
    2222    is encode("x-sjis-kddi-auto-raw", $unicode), $sjis, $r->{unicode}; 
    2323    is decode("x-sjis-kddi-auto-raw", $sjis), $auto, $r->{unicode}; 
     
    4141    # decode x-sjis-kddi to Unicode, then encode using x-sjis-kddi-auto 
    4242    my $copy = $sjis; 
    43     Encode::from_to($copy, "x-sjis-kddi-raw", "x-sjis-kddi-auto-raw"); 
    44     is $copy, $sjis, "x-sjis-kddi-raw to x-sjis-kddi-auto-raw roundtrip $r->{unicode}"; 
    45     Encode::from_to($copy, "x-sjis-kddi-auto-raw", "x-sjis-kddi-raw"); 
    46     is $copy, $sjis, "x-sjis-kddi-auto-raw to x-sjis-kddi-raw roundtrip $r->{unicode}"; 
     43    Encode::from_to($copy, "x-sjis-kddi-cp932-raw", "x-sjis-kddi-auto-raw"); 
     44    is $copy, $sjis, "x-sjis-kddi-cp932-raw to x-sjis-kddi-auto-raw roundtrip $r->{unicode}"; 
     45    Encode::from_to($copy, "x-sjis-kddi-auto-raw", "x-sjis-kddi-cp932-raw"); 
     46    is $copy, $sjis, "x-sjis-kddi-auto-raw to x-sjis-kddi-cp932-raw roundtrip $r->{unicode}"; 
    4747 
    4848    ok $unicode =~ /^\p{InKDDIPictograms}+$/; 
  • lang/perl/Encode-JP-Mobile/branches/auto-convert-sjis-pictgram/t/kddi-jis.t

    r5176 r5180  
    1717    # test kddi-auto Unicode chars as well ... rare in reality though 
    1818    my $bytes = $jis; 
    19     Encode::from_to($bytes, "x-iso-2022-jp-kddi" => "x-sjis-kddi-raw"); 
     19    Encode::from_to($bytes, "x-iso-2022-jp-kddi" => "x-sjis-kddi-cp932-raw"); 
    2020    Encode::from_to($bytes, "x-sjis-kddi-auto-raw", "x-iso-2022-jp-kddi"); 
    2121    is $bytes, $jis, "x-sjis-kddi-auto $case"; 
  • lang/perl/Encode-JP-Mobile/branches/auto-convert-sjis-pictgram/t/kddi-trans.t

    r5176 r5180  
    1313sub roundtrip { 
    1414    my $bytes = shift; 
    15     is decode("x-sjis-kddi-raw", $bytes), $kddi_unicode; 
    16     is encode("x-sjis-kddi-raw", $kddi_unicode), $sjis; 
     15    is decode("x-sjis-kddi-cp932-raw", $bytes), $kddi_unicode; 
     16    is encode("x-sjis-kddi-cp932-raw", $kddi_unicode), $sjis; 
    1717    is encode("x-sjis-kddi-auto-raw", $kddi_unicode), $sjis; 
    1818    is decode("x-sjis-kddi-auto-raw", $bytes), $auto_unicode; 
    1919    is encode("x-sjis-kddi-auto-raw", $auto_unicode), $sjis; 
    20     is encode("x-sjis-kddi-raw", $auto_unicode), $sjis; 
     20    is encode("x-sjis-kddi-cp932-raw", $auto_unicode), $sjis; 
    2121} 
    2222 
  • lang/perl/Encode-JP-Mobile/branches/auto-convert-sjis-pictgram/t/props-bruteforce.t

    r5176 r5180  
    2424        my $char = chr $code; 
    2525        my $encoding = "x-sjis-$enc-raw"; 
     26        $encoding =~ s/x-sjis-kddi-raw/x-sjis-kddi-cp932-raw/; 
    2627 
    2728        my $byte = eval { encode($encoding, $char, Encode::FB_CROAK) }; 
  • lang/perl/Encode-JP-Mobile/branches/auto-convert-sjis-pictgram/t/props.t

    r5176 r5180  
    2727    my $string = shift; 
    2828    if ($string =~ /\p{InKDDISoftBankConflicts}/) { 
    29         eval { Encode::encode("x-sjis-kddi-raw", $string, Encode::FB_CROAK) }; 
     29        eval { Encode::encode("x-sjis-kddi-cp932-raw", $string, Encode::FB_CROAK) }; 
    3030        if ($@) { 
    3131            return 'softbank'; 
  • lang/perl/Encode-JP-Mobile/branches/auto-convert-sjis-pictgram/tools/make-kddi-ucm.pl

    r5084 r5180  
    99    die <<"..."; 
    1010Usage: $0 primary-encode secondary-encode 
    11     i.e. $0 unicode unicode_auto > ucm/x-sjis-kddi.ucm 
    12       or $0 unicode_auto unicode > ucm/x-sjis-kddi-auto.ucm 
     11    i.e. $0 unicode unicode_auto > ucm/x-sjis-kddi-cp932-raw.ucm 
     12      or $0 unicode_auto unicode > ucm/x-sjis-kddi-auto-raw.ucm 
    1313... 
    1414} 
     
    5959        ($e1, $e2) = ('x-sjis-kddi-auto', 'x-sjis-ezweb-auto'); 
    6060    } else { 
    61         ($e1, $e2) = ('x-sjis-kddi', 'x-sjis-ezweb'); 
     61        ($e1, $e2) = ('x-sjis-kddi-cp932', 'x-sjis-ezweb-cp932'); 
    6262    } 
    6363 
  • lang/perl/Encode-JP-Mobile/branches/auto-convert-sjis-pictgram/ucm/x-sjis-kddi-cp932-raw.ucm

    r5176 r5180  
    1 <code_set_name> "x-sjis-kddi-raw" 
    2 <code_set_alias> "x-sjis-ezweb-raw" 
     1<code_set_name> "x-sjis-kddi-cp932-raw" 
     2<code_set_alias> "x-sjis-ezweb-cp932-raw" 
    33<mb_cur_min> 1 
    44<mb_cur_max> 2