Changeset 5243 for lang/perl/Encode-JP-Mobile/trunk/tools

Timestamp:

01/22/08 10:01:31 (10 months ago)

Author:

tokuhirom

Message:

2コマ系絵文字の相互変換に対応。2コマ分の bytes を ucm に定義。以前は、最初の1コマをひろっていた。
see. http://gyazo.com/db2cc92d58aff62fb3e1783bd32b9b5e.png

Location:

lang/perl/Encode-JP-Mobile/trunk/tools

Files:

• make-convert-map.pl (modified) (1 diff)
• make-utf8-ucm.pl (modified) (1 diff)

lang/perl/Encode-JP-Mobile/trunk/tools/make-convert-map.pl

@@ -42 +42 @@
         $file eq 'emoji_i2es.txt' && do {
             my ($docomo, undef, $kddi, $softbank) = split "\t", $line;
-            $kddi = $1 if $kddi =~ /(%.+?%)%/;
-            $softbank = $1 if $softbank =~ /(%.+?%)%/;
-            $map{docomo}{ $no2uni->{$docomo} }->{kddi}     = $no2uni->{$kddi};
-            $map{docomo}{ $no2uni->{$docomo} }->{softbank} = $no2uni->{$softbank};
+            $map{docomo}{ $no2uni->{$docomo} }->{kddi}     = get_unicode($kddi);
+            $map{docomo}{ $no2uni->{$docomo} }->{softbank} = get_unicode($softbank);
         };
         
         $file eq 'emoji_e2is.txt' && do {
             my ($kddi, undef, $docomo, $softbank) = split "\t", $line;
-            $docomo = $1 if $docomo =~ /(%.+?%)%/;
-            $softbank = $1 if $softbank =~ /(%.+?%)%/;
-            $map{kddi}{ $no2uni->{$kddi} }->{docomo}   = $no2uni->{$docomo};
-            $map{kddi}{ $no2uni->{$kddi} }->{softbank} = $no2uni->{$softbank};
+            $map{kddi}{ $no2uni->{$kddi} }->{docomo}   = get_unicode($docomo);
+            $map{kddi}{ $no2uni->{$kddi} }->{softbank} = get_unicode($softbank);
         };
         
         $file eq 'emoji_s2ie.txt' && do {
             my ($softbank, undef, $docomo, $kddi) = split "\t", $line;
-            $docomo = $1 if $docomo =~ /(%.+?%)%/;
-            $kddi = $1 if $kddi =~ /(%.+?%)%/;
-            $map{softbank}{ $no2uni->{$softbank} }->{docomo} = $no2uni->{$docomo};
-            $map{softbank}{ $no2uni->{$softbank} }->{kddi}   = $no2uni->{$kddi};
+            $map{softbank}{ $no2uni->{$softbank} }->{docomo} = get_unicode($docomo);
+            $map{softbank}{ $no2uni->{$softbank} }->{kddi}   = get_unicode($kddi);
         };
     }
 }
 
+sub get_unicode($) {
+    my $key = shift;
+    if ($key =~ /^%/) {
+        $key =~ s/(%[^%]+%)/$no2uni->{$1}/ge;
+        return $key;
+    } else {
+        return;
+    }
+}
+
 print YAML::Dump \%map;

lang/perl/Encode-JP-Mobile/trunk/tools/make-utf8-ucm.pl

@@ -90 +90 @@
 sub unihex2utf8hex {
     my $uni = shift;
-    $uni = 'H*'->unpack($uni->hex->chr->encode('utf-8'));
-    $uni =~ s/(..)/\\x$1/g;
+    $uni =~ s{(....)}{
+        my $x = 'H*'->unpack($1->hex->chr->encode('utf-8'));
+        $x =~ s/(..)/\\x$1/g;
+        $x;
+    }ge;
     $uni;
 }