r17460 - in /branches/upstream/libencode-perl/current: Changes Encode.pm Encode.xs MANIFEST META.yml Makefile.PL bin/ucmlint encoding.pm lib/Encode/Alias.pm lib/Encode/Config.pm t/mime_header_iso2022jp.t ucm/cp858.ucm ucm/macJapanese.ucm
tincho-guest at users.alioth.debian.org
tincho-guest at users.alioth.debian.org
Sat Mar 15 03:54:07 UTC 2008
Author: tincho-guest
Date: Sat Mar 15 03:54:05 2008
New Revision: 17460
URL: http://svn.debian.org/wsvn/?sc=1&rev=17460
Log:
[svn-upgrade] Integrating new upstream version, libencode-perl (2.24)
Added:
branches/upstream/libencode-perl/current/ucm/cp858.ucm
Modified:
branches/upstream/libencode-perl/current/Changes
branches/upstream/libencode-perl/current/Encode.pm
branches/upstream/libencode-perl/current/Encode.xs
branches/upstream/libencode-perl/current/MANIFEST
branches/upstream/libencode-perl/current/META.yml
branches/upstream/libencode-perl/current/Makefile.PL
branches/upstream/libencode-perl/current/bin/ucmlint
branches/upstream/libencode-perl/current/encoding.pm
branches/upstream/libencode-perl/current/lib/Encode/Alias.pm
branches/upstream/libencode-perl/current/lib/Encode/Config.pm
branches/upstream/libencode-perl/current/t/mime_header_iso2022jp.t
branches/upstream/libencode-perl/current/ucm/macJapanese.ucm
Modified: branches/upstream/libencode-perl/current/Changes
URL: http://svn.debian.org/wsvn/branches/upstream/libencode-perl/current/Changes?rev=17460&op=diff
==============================================================================
--- branches/upstream/libencode-perl/current/Changes (original)
+++ branches/upstream/libencode-perl/current/Changes Sat Mar 15 03:54:05 2008
@@ -1,8 +1,28 @@
# Revision history for Perl extension Encode.
#
-# $Id: Changes,v 2.23 2007/05/29 18:15:32 dankogai Exp dankogai $
+# $Id: Changes,v 2.24 2008/03/12 09:51:11 dankogai Exp $
#
-$Revision: 2.23 $ $Date: 2007/05/29 18:15:32 $
+$Revision: 2.24 $ $Date: 2008/03/12 09:51:11 $
+! lib/Encode/Config.pm
+ adds and fixes also adds cp858 support.
+! Encode.pm encoding.pm lib/Encode/Alias.pm ucm/cp858.ucm
+ Merged perl at 33486.
+ > Change 33486 by rgs at scipion on 2008/03/12 08:50:11
+ An unfortunate side-effect of Encode and Encode::Alias use'ing each
+ other, and Encode::Alias exporting functions into Encode for it to use
+ as methods, broke the loading of the find_alias() Encode method in some
+ cases since 5.10. Breaking the recursive inheritance fixes it.
+ Message-Id: <b77c1dce0803120151o4166c3a0gfcfd14681ab7e10d at mail.gmail.com>
+! Encode.pm
+ POD fix by tels
+ Message-Id: <200711281835.36125 at bloodgate.com>
+! bin/ucmlint
+ Fix by MIYAGAWA via CodeRepos
+ http://coderepos.org/share/changeset/1791
+! encoding.pm t/mime_header_iso2022jp.t
+ ported back from Perl 5.10-RC1
+
+2.23 2007/05/29 18:15:32
! Encode.xs
got rid of global fallback_cb; encode_method() now takes one more
argument which is a coderef to fallback. This should make
Modified: branches/upstream/libencode-perl/current/Encode.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libencode-perl/current/Encode.pm?rev=17460&op=diff
==============================================================================
--- branches/upstream/libencode-perl/current/Encode.pm (original)
+++ branches/upstream/libencode-perl/current/Encode.pm Sat Mar 15 03:54:05 2008
@@ -1,10 +1,10 @@
#
-# $Id: Encode.pm,v 2.23 2007/05/29 18:15:32 dankogai Exp dankogai $
+# $Id: Encode.pm,v 2.24 2008/03/12 09:58:12 dankogai Exp dankogai $
#
package Encode;
use strict;
use warnings;
-our $VERSION = sprintf "%d.%02d", q$Revision: 2.23 $ =~ /(\d+)/g;
+our $VERSION = sprintf "%d.%02d", q$Revision: 2.24 $ =~ /(\d+)/g;
sub DEBUG () { 0 }
use XSLoader ();
XSLoader::load( __PACKAGE__, $VERSION );
@@ -734,7 +734,7 @@
=back
-=Head2 coderef for CHECK
+=head2 coderef for CHECK
As of Encode 2.12 CHECK can also be a code reference which takes the
ord value of unmapped caharacter as an argument and returns a string
Modified: branches/upstream/libencode-perl/current/Encode.xs
URL: http://svn.debian.org/wsvn/branches/upstream/libencode-perl/current/Encode.xs?rev=17460&op=diff
==============================================================================
--- branches/upstream/libencode-perl/current/Encode.xs (original)
+++ branches/upstream/libencode-perl/current/Encode.xs Sat Mar 15 03:54:05 2008
@@ -1,5 +1,5 @@
/*
- $Id: Encode.xs,v 2.14 2007/05/29 18:15:32 dankogai Exp dankogai $
+ $Id: Encode.xs,v 2.14 2007/05/29 18:15:32 dankogai Exp $
*/
#define PERL_NO_GET_CONTEXT
Modified: branches/upstream/libencode-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/branches/upstream/libencode-perl/current/MANIFEST?rev=17460&op=diff
==============================================================================
--- branches/upstream/libencode-perl/current/MANIFEST (original)
+++ branches/upstream/libencode-perl/current/MANIFEST Sat Mar 15 03:54:05 2008
@@ -90,8 +90,8 @@
t/jperl.t test script
t/ksc5601.enc test data
t/ksc5601.utf test data
+t/mime-header.t test script
t/mime-name.t test script
-t/mime-header.t test script
t/mime_header_iso2022jp.t test script
t/perlio.t test script
t/rt.pl even more test script
@@ -141,6 +141,7 @@
ucm/cp855.ucm Unicode Character Map
ucm/cp856.ucm Unicode Character Map
ucm/cp857.ucm Unicode Character Map
+ucm/cp858.ucm Unicode Character Map
ucm/cp860.ucm Unicode Character Map
ucm/cp861.ucm Unicode Character Map
ucm/cp862.ucm Unicode Character Map
Modified: branches/upstream/libencode-perl/current/META.yml
URL: http://svn.debian.org/wsvn/branches/upstream/libencode-perl/current/META.yml?rev=17460&op=diff
==============================================================================
--- branches/upstream/libencode-perl/current/META.yml (original)
+++ branches/upstream/libencode-perl/current/META.yml Sat Mar 15 03:54:05 2008
@@ -1,11 +1,12 @@
--- #YAML:1.0
name: Encode
-version: 2.23
+version: 2.24
abstract: ~
license: ~
-generated_by: ExtUtils::MakeMaker version 6.32
+author: ~
+generated_by: ExtUtils::MakeMaker version 6.42
distribution_type: module
requires:
meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.2.html
- version: 1.2
+ url: http://module-build.sourceforge.net/META-spec-v1.3.html
+ version: 1.3
Modified: branches/upstream/libencode-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/branches/upstream/libencode-perl/current/Makefile.PL?rev=17460&op=diff
==============================================================================
--- branches/upstream/libencode-perl/current/Makefile.PL (original)
+++ branches/upstream/libencode-perl/current/Makefile.PL Sat Mar 15 03:54:05 2008
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.PL,v 2.5 2007/05/29 18:15:32 dankogai Exp dankogai $
+# $Id: Makefile.PL,v 2.5 2007/05/29 18:15:32 dankogai Exp $
#
use 5.007003;
use strict;
Modified: branches/upstream/libencode-perl/current/bin/ucmlint
URL: http://svn.debian.org/wsvn/branches/upstream/libencode-perl/current/bin/ucmlint?rev=17460&op=diff
==============================================================================
--- branches/upstream/libencode-perl/current/bin/ucmlint (original)
+++ branches/upstream/libencode-perl/current/bin/ucmlint Sat Mar 15 03:54:05 2008
@@ -1,10 +1,10 @@
#!/usr/local/bin/perl
#
-# $Id: ucmlint,v 2.1 2006/05/03 18:24:10 dankogai Exp $
+# $Id: ucmlint,v 2.2 2008/03/12 09:51:11 dankogai Exp $
#
use strict;
-our $VERSION = do { my @r = (q$Revision: 2.1 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+our $VERSION = do { my @r = (q$Revision: 2.2 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
use Getopt::Std;
our %Opt;
@@ -30,7 +30,7 @@
}
$| = 1;
-my (%Hdr, %U2E, %E2U);
+my (%Hdr, %U2E, %E2U, %Fallback);
my $in_charmap = 0;
my $nerror = 0;
my $nwarning = 0;
@@ -39,92 +39,94 @@
my ($msg, $level) = @_;
my $lstr;
if ($level == 2){
- $lstr = 'notice';
+ $lstr = 'notice';
}elsif ($level == 1){
- $lstr = 'warning'; $nwarning++;
+ $lstr = 'warning'; $nwarning++;
}else{
- $lstr = 'error'; $nerror++;
+ $lstr = 'error'; $nerror++;
}
print "$ARGV:$lstr in line $.: $msg\n";
}
for $ARGV (@ARGV){
open UCM, $ARGV or die "$ARGV:$!";
- %Hdr = %U2E = %E2U = ();
+ %Hdr = %U2E = %E2U = %Fallback = ();
$in_charmap = $nerror = $nwarning = 0;
$. = 0;
while(<UCM>){
- chomp;
- s/\s*#.*$//o; /^$/ and next;
- if ($_ eq "CHARMAP"){
- $in_charmap = 1;
- for my $must (qw/code_set_name mb_cur_min mb_cur_max/){
- exists $Hdr{$must} or nit "<$must> nonexistent";
+ chomp;
+ s/\s*#.*$//o; /^$/ and next;
+ if ($_ eq "CHARMAP"){
+ $in_charmap = 1;
+ for my $must (qw/code_set_name mb_cur_min mb_cur_max/){
+ exists $Hdr{$must} or nit "<$must> nonexistent";
+ }
+ $Hdr{mb_cur_min} > $Hdr{mb_cur_max}
+ and nit sprintf("mb_cur_min(%d) > mb_cur_max(%d)",
+ $Hdr{mb_cur_min},$Hdr{mb_cur_max});
+ $in_charmap = 1;
+ next;
}
- $Hdr{mb_cur_min} > $Hdr{mb_cur_max}
- and nit sprintf("mb_cur_min(%d) > mb_cur_max(%d)",
- $Hdr{mb_cur_min},$Hdr{mb_cur_max});
- $in_charmap = 1;
- next;
- }
- unless ($in_charmap){
- my($hkey, $hvalue) = /^<(\S+)>\s+[\"\']?([^\"\']+)/o or next;
- $Opt{D} and warn "$hkey => $hvalue";
- if ($hkey eq "code_set_name"){ # name check
- exists $Hdr{code_set_name}
- and nit "Duplicate <code_set_name>: $hkey";
+ unless ($in_charmap){
+ my($hkey, $hvalue) = /^<(\S+)>\s+[\"\']?([^\"\']+)/o or next;
+ $Opt{D} and warn "$hkey => $hvalue";
+ if ($hkey eq "code_set_name"){ # name check
+ exists $Hdr{code_set_name}
+ and nit "Duplicate <code_set_name>: $hkey";
+ }
+ if ($hkey eq "code_set_alias"){ # alias check
+ $hvalue eq $Hdr{code_set_name}
+ and nit qq(alias "$hvalue" is already in <code_set_name>);
+ }
+ $Hdr{$hkey} = $hvalue;
+ }else{
+ my $name = $Hdr{code_set_name};
+ my($unistr, $encstr, $fb) = /^(\S+)\s+(\S+)\s(\S+)/o or next;
+ $Opt{v} and nit $_, 2;
+ my $uni = uniparse($unistr);
+ my $enc = encparse($encstr);
+ $fb =~ /^\|([0123])$/ or nit "malformed fallback: $fb";
+ $fb = $1;
+ $Opt{f} and $fb = 0;
+ unless ($fb == 3){ # check uni -> enc
+ if (exists $U2E{$uni}){
+ nit "dupe encode map: U$uni => $U2E{$uni} and $enc", 1;
+ }else{
+ $U2E{$uni} = $enc;
+ $Fallback{$uni}{$enc} = 1 if $fb == 1;
+ if ($Opt{e}) {
+ my $e = hex2enc($enc);
+ my $u = hex2uni($uni);
+ my $eu = Encode::encode($name, $u);
+ $e eq $eu
+ or nit qq(encode('$name', $uni) != $enc);
+ }
+ }
+ }
+ unless ($fb == 1){ # check enc -> uni
+ if (exists $E2U{$enc}){
+ nit "dupe decode map: $enc => U$E2U{$enc} and U$uni", 1;
+ }else{
+ $E2U{$enc} = $uni;
+ $Fallback{$enc}{$uni} = 1 if $fb == 3;
+ if ($Opt{e}) {
+ my $e = hex2enc($enc);
+ my $u = hex2uni($uni);
+ $Opt{D} and warn "$uni, $enc";
+ my $de = Encode::decode($name, $e);
+ $de eq $u
+ or nit qq(decode('$name', $enc) != $uni);
+ }
+ }
+ }
+ # warn "$uni, $enc, $fb";
}
- if ($hkey eq "code_set_alias"){ # alias check
- $hvalue eq $Hdr{code_set_name}
- and nit qq(alias "$hvalue" is already in <code_set_name>);
- }
- $Hdr{$hkey} = $hvalue;
- }else{
- my $name = $Hdr{code_set_name};
- my($unistr, $encstr, $fb) = /^(\S+)\s+(\S+)\s(\S+)/o or next;
- $Opt{v} and nit $_, 2;
- my $uni = uniparse($unistr);
- my $enc = encparse($encstr);
- $fb =~ /^\|([0123])$/ or nit "malformed fallback: $fb";
- $fb = $1;
- $Opt{f} and $fb = 0;
- unless ($fb == 1){ # check uni -> enc
- if (exists $U2E{$uni}){
- nit "dupe encode map: U$uni => $U2E{$uni} and $enc", 1;
- }else{
- $U2E{$uni} = $enc;
- if ($Opt{e} and $fb != 3) {
- my $e = hex2enc($enc);
- my $u = hex2uni($uni);
- my $eu = Encode::encode($name, $u);
- $e eq $eu
- or nit qq(encode('$name', $uni) != $enc);
- }
- }
- }
- unless ($fb == 3){ # check enc -> uni
- if (exists $E2U{$enc}){
- nit "dupe decode map: $enc => U$E2U{$enc} and U$uni", 1;
- }else{
- $E2U{$enc} = $uni;
- if ($Opt{e} and $fb != 1) {
- my $e = hex2enc($enc);
- my $u = hex2uni($uni);
- $Opt{D} and warn "$uni, $enc";
- my $de = Encode::decode($name, $e);
- $de eq $u
- or nit qq(decode('$name', $enc) != $uni);
- }
- }
- }
- # warn "$uni, $enc, $fb";
- }
}
$in_charmap or nit "Where is CHARMAP?";
checkRT();
printf ("$ARGV: %s error%s found\n",
- ($nerror == 0 ? 'no' : $nerror),
- ($nerror > 1 ? 's' : ''));
+ ($nerror == 0 ? 'no' : $nerror),
+ ($nerror > 1 ? 's' : ''));
}
exit;
@@ -138,14 +140,14 @@
sub checkRT{
for my $uni (keys %E2U){
- my $enc = $U2E{$uni} or next; # okay
- $E2U{$U2E{$uni}} eq $uni or
- nit "RT failure: U$uni => $enc =>U$E2U{$U2E{$uni}}";
+ my $enc = $U2E{$uni} or next; # okay
+ $E2U{$U2E{$uni}} eq $uni or $Fallback{$uni}{$enc} or
+ nit "RT failure: U$uni => $enc =>U$E2U{$U2E{$uni}}";
}
for my $enc (keys %E2U){
- my $uni = $E2U{$enc} or next; # okay
- $U2E{$E2U{$enc}} eq $enc or
- nit "RT failure: $enc => U$uni => $U2E{$E2U{$enc}}";
+ my $uni = $E2U{$enc} or next; # okay
+ $U2E{$E2U{$enc}} eq $enc or $Fallback{$enc}{$uni} or
+ nit "RT failure: $enc => U$uni => $U2E{$E2U{$enc}}";
}
}
@@ -155,8 +157,8 @@
my @u;
push @u, $1 while($str =~ /\G<U(.*?)>/ig);
for my $u (@u){
- $u =~ /^([0-9A-Za-z]+)$/o
- or nit "malformed Unicode character: $u";
+ $u =~ /^([0-9A-Za-z]+)$/o
+ or nit "malformed Unicode character: $u";
}
return join(',', @u);
}
@@ -165,10 +167,10 @@
my $str = shift;
my @e;
for my $e (split /\\x/io, $str){
- $e or next; # first \x
- $e =~ /^([0-9A-Za-z]{1,2})$/io
- or nit "Hex $e in $str is bogus";
- push @e, $1;
+ $e or next; # first \x
+ $e =~ /^([0-9A-Za-z]{1,2})$/io
+ or nit "Hex $e in $str is bogus";
+ push @e, $1;
}
return join(',', @e);
}
Modified: branches/upstream/libencode-perl/current/encoding.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libencode-perl/current/encoding.pm?rev=17460&op=diff
==============================================================================
--- branches/upstream/libencode-perl/current/encoding.pm (original)
+++ branches/upstream/libencode-perl/current/encoding.pm Sat Mar 15 03:54:05 2008
@@ -1,6 +1,6 @@
-# $Id: encoding.pm,v 2.6 2007/04/22 14:56:12 dankogai Exp $
+# $Id: encoding.pm,v 2.7 2008/03/12 09:51:11 dankogai Exp $
package encoding;
-our $VERSION = do { my @r = ( q$Revision: 2.6 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
+our $VERSION = '2.6_01';
use Encode;
use strict;
@@ -50,11 +50,11 @@
no warnings 'uninitialized';
- if ( not $locale_encoding && in_locale() ) {
- if ( $ENV{LC_ALL} =~ /^([^.]+)\.([^.]+)$/ ) {
+ if ( (not $locale_encoding) && in_locale() ) {
+ if ( $ENV{LC_ALL} =~ /^([^.]+)\.([^.@]+)(@.*)?$/ ) {
( $country_language, $locale_encoding ) = ( $1, $2 );
}
- elsif ( $ENV{LANG} =~ /^([^.]+)\.([^.]+)$/ ) {
+ elsif ( $ENV{LANG} =~ /^([^.]+)\.([^.@]+)(@.*)?$/ ) {
( $country_language, $locale_encoding ) = ( $1, $2 );
}
@@ -315,14 +315,6 @@
This pragma affects utf8::upgrade, but not utf8::downgrade.
-=head2 Side effects
-
-If the C<encoding> pragma is in scope then the lengths returned are
-calculated from the length of C<$/> in Unicode characters, which is not
-always the same as the length of C<$/> in the native encoding.
-
-This pragma affects utf8::upgrade, but not utf8::downgrade.
-
=head1 FEATURES THAT REQUIRE 5.8.1
Some of the features offered by this pragma requires perl 5.8.1. Most
@@ -620,6 +612,11 @@
width (i.e. double-width for ideographs) and directions (i.e. BIDI for
Arabic and Hebrew).
+=item Thread safety
+
+C<use encoding ...> is not thread-safe (i.e., do not use in threaded
+applications).
+
=back
=head2 The Logic of :locale
Modified: branches/upstream/libencode-perl/current/lib/Encode/Alias.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libencode-perl/current/lib/Encode/Alias.pm?rev=17460&op=diff
==============================================================================
--- branches/upstream/libencode-perl/current/lib/Encode/Alias.pm (original)
+++ branches/upstream/libencode-perl/current/lib/Encode/Alias.pm Sat Mar 15 03:54:05 2008
@@ -2,8 +2,7 @@
use strict;
use warnings;
no warnings 'redefine';
-use Encode;
-our $VERSION = do { my @r = ( q$Revision: 2.7 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
+our $VERSION = do { my @r = ( q$Revision: 2.8 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
sub DEBUG () { 0 }
use base qw(Exporter);
@@ -20,6 +19,7 @@
our %Alias; # cached known aliases
sub find_alias {
+ require Encode;
my $class = shift;
my $find = shift;
unless ( exists $Alias{$find} ) {
@@ -128,6 +128,7 @@
}
sub init_aliases {
+ require Encode;
undef_aliases();
# Try all-lower-case version should all else fails
Modified: branches/upstream/libencode-perl/current/lib/Encode/Config.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libencode-perl/current/lib/Encode/Config.pm?rev=17460&op=diff
==============================================================================
--- branches/upstream/libencode-perl/current/lib/Encode/Config.pm (original)
+++ branches/upstream/libencode-perl/current/lib/Encode/Config.pm Sat Mar 15 03:54:05 2008
@@ -2,7 +2,7 @@
# Demand-load module list
#
package Encode::Config;
-our $VERSION = do { my @r = ( q$Revision: 2.4 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
+our $VERSION = do { my @r = ( q$Revision: 2.5 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
use strict;
use warnings;
@@ -38,6 +38,7 @@
'cp855' => 'Encode::Byte',
'cp856' => 'Encode::Byte',
'cp857' => 'Encode::Byte',
+ 'cp858' => 'Encode::Byte',
'cp860' => 'Encode::Byte',
'cp861' => 'Encode::Byte',
'cp862' => 'Encode::Byte',
Modified: branches/upstream/libencode-perl/current/t/mime_header_iso2022jp.t
URL: http://svn.debian.org/wsvn/branches/upstream/libencode-perl/current/t/mime_header_iso2022jp.t?rev=17460&op=diff
==============================================================================
--- branches/upstream/libencode-perl/current/t/mime_header_iso2022jp.t (original)
+++ branches/upstream/libencode-perl/current/t/mime_header_iso2022jp.t Sat Mar 15 03:54:05 2008
@@ -1,5 +1,13 @@
-use Test::More tests => 14;
+use Test::More;
+
+BEGIN {
+ if( ord("A") == 193 ) {
+ plan skip_all => 'No Encode::MIME::Header::ISO_2022_JP on EBCDIC Platforms';
+ } else {
+ plan tests => 14;
+ }
+}
use strict;
use Encode;
Added: branches/upstream/libencode-perl/current/ucm/cp858.ucm
URL: http://svn.debian.org/wsvn/branches/upstream/libencode-perl/current/ucm/cp858.ucm?rev=17460&op=file
==============================================================================
--- branches/upstream/libencode-perl/current/ucm/cp858.ucm (added)
+++ branches/upstream/libencode-perl/current/ucm/cp858.ucm Sat Mar 15 03:54:05 2008
@@ -1,0 +1,279 @@
+#
+# $Id: cp858.ucm,v 1.1 2008/03/12 09:51:11 dankogai Exp $
+#
+# cf. http://en.wikipedia.org/wiki/Code_page_858
+#
+<code_set_name> "cp858"
+<mb_cur_min> 1
+<mb_cur_max> 1
+<subchar> \x3f
+CHARMAP
+<U0000> \x00 |0 # NULL
+<U0001> \x01 |0 # START OF HEADING
+<U0002> \x02 |0 # START OF TEXT
+<U0003> \x03 |0 # END OF TEXT
+<U0004> \x04 |0 # END OF TRANSMISSION
+<U0005> \x05 |0 # ENQUIRY
+<U0006> \x06 |0 # ACKNOWLEDGE
+<U0007> \x07 |0 # BELL
+<U0008> \x08 |0 # BACKSPACE
+<U0009> \x09 |0 # HORIZONTAL TABULATION
+<U000A> \x0A |0 # <control>
+<U000B> \x0B |0 # <control>
+<U000C> \x0C |0 # <control>
+<U000D> \x0D |0 # <control>
+<U000E> \x0E |0 # <control>
+<U000F> \x0F |0 # <control>
+<U000a> \x0a |0 # LINE FEED
+<U000b> \x0b |0 # VERTICAL TABULATION
+<U000c> \x0c |0 # FORM FEED
+<U000d> \x0d |0 # CARRIAGE RETURN
+<U000e> \x0e |0 # SHIFT OUT
+<U000f> \x0f |0 # SHIFT IN
+<U0010> \x10 |0 # DATA LINK ESCAPE
+<U0011> \x11 |0 # DEVICE CONTROL ONE
+<U0012> \x12 |0 # DEVICE CONTROL TWO
+<U0013> \x13 |0 # DEVICE CONTROL THREE
+<U0014> \x14 |0 # DEVICE CONTROL FOUR
+<U0015> \x15 |0 # NEGATIVE ACKNOWLEDGE
+<U0016> \x16 |0 # SYNCHRONOUS IDLE
+<U0017> \x17 |0 # END OF TRANSMISSION BLOCK
+<U0018> \x18 |0 # CANCEL
+<U0019> \x19 |0 # END OF MEDIUM
+<U001A> \x1A |0 # <control>
+<U001B> \x1B |0 # <control>
+<U001C> \x1C |0 # <control>
+<U001D> \x1D |0 # <control>
+<U001E> \x1E |0 # <control>
+<U001F> \x1F |0 # <control>
+<U001a> \x1a |0 # SUBSTITUTE
+<U001b> \x1b |0 # ESCAPE
+<U001c> \x1c |0 # FILE SEPARATOR
+<U001d> \x1d |0 # GROUP SEPARATOR
+<U001e> \x1e |0 # RECORD SEPARATOR
+<U001f> \x1f |0 # UNIT SEPARATOR
+<U0020> \x20 |0 # SPACE
+<U0021> \x21 |0 # EXCLAMATION MARK
+<U0022> \x22 |0 # QUOTATION MARK
+<U0023> \x23 |0 # NUMBER SIGN
+<U0024> \x24 |0 # DOLLAR SIGN
+<U0025> \x25 |0 # PERCENT SIGN
+<U0026> \x26 |0 # AMPERSAND
+<U0027> \x27 |0 # APOSTROPHE
+<U0028> \x28 |0 # LEFT PARENTHESIS
+<U0029> \x29 |0 # RIGHT PARENTHESIS
+<U002a> \x2a |0 # ASTERISK
+<U002b> \x2b |0 # PLUS SIGN
+<U002c> \x2c |0 # COMMA
+<U002d> \x2d |0 # HYPHEN-MINUS
+<U002e> \x2e |0 # FULL STOP
+<U002f> \x2f |0 # SOLIDUS
+<U0030> \x30 |0 # DIGIT ZERO
+<U0031> \x31 |0 # DIGIT ONE
+<U0032> \x32 |0 # DIGIT TWO
+<U0033> \x33 |0 # DIGIT THREE
+<U0034> \x34 |0 # DIGIT FOUR
+<U0035> \x35 |0 # DIGIT FIVE
+<U0036> \x36 |0 # DIGIT SIX
+<U0037> \x37 |0 # DIGIT SEVEN
+<U0038> \x38 |0 # DIGIT EIGHT
+<U0039> \x39 |0 # DIGIT NINE
+<U003a> \x3a |0 # COLON
+<U003b> \x3b |0 # SEMICOLON
+<U003c> \x3c |0 # LESS-THAN SIGN
+<U003d> \x3d |0 # EQUALS SIGN
+<U003e> \x3e |0 # GREATER-THAN SIGN
+<U003f> \x3f |0 # QUESTION MARK
+<U0040> \x40 |0 # COMMERCIAL AT
+<U0041> \x41 |0 # LATIN CAPITAL LETTER A
+<U0042> \x42 |0 # LATIN CAPITAL LETTER B
+<U0043> \x43 |0 # LATIN CAPITAL LETTER C
+<U0044> \x44 |0 # LATIN CAPITAL LETTER D
+<U0045> \x45 |0 # LATIN CAPITAL LETTER E
+<U0046> \x46 |0 # LATIN CAPITAL LETTER F
+<U0047> \x47 |0 # LATIN CAPITAL LETTER G
+<U0048> \x48 |0 # LATIN CAPITAL LETTER H
+<U0049> \x49 |0 # LATIN CAPITAL LETTER I
+<U004a> \x4a |0 # LATIN CAPITAL LETTER J
+<U004b> \x4b |0 # LATIN CAPITAL LETTER K
+<U004c> \x4c |0 # LATIN CAPITAL LETTER L
+<U004d> \x4d |0 # LATIN CAPITAL LETTER M
+<U004e> \x4e |0 # LATIN CAPITAL LETTER N
+<U004f> \x4f |0 # LATIN CAPITAL LETTER O
+<U0050> \x50 |0 # LATIN CAPITAL LETTER P
+<U0051> \x51 |0 # LATIN CAPITAL LETTER Q
+<U0052> \x52 |0 # LATIN CAPITAL LETTER R
+<U0053> \x53 |0 # LATIN CAPITAL LETTER S
+<U0054> \x54 |0 # LATIN CAPITAL LETTER T
+<U0055> \x55 |0 # LATIN CAPITAL LETTER U
+<U0056> \x56 |0 # LATIN CAPITAL LETTER V
+<U0057> \x57 |0 # LATIN CAPITAL LETTER W
+<U0058> \x58 |0 # LATIN CAPITAL LETTER X
+<U0059> \x59 |0 # LATIN CAPITAL LETTER Y
+<U005a> \x5a |0 # LATIN CAPITAL LETTER Z
+<U005b> \x5b |0 # LEFT SQUARE BRACKET
+<U005c> \x5c |0 # REVERSE SOLIDUS
+<U005d> \x5d |0 # RIGHT SQUARE BRACKET
+<U005e> \x5e |0 # CIRCUMFLEX ACCENT
+<U005f> \x5f |0 # LOW LINE
+<U0060> \x60 |0 # GRAVE ACCENT
+<U0061> \x61 |0 # LATIN SMALL LETTER A
+<U0062> \x62 |0 # LATIN SMALL LETTER B
+<U0063> \x63 |0 # LATIN SMALL LETTER C
+<U0064> \x64 |0 # LATIN SMALL LETTER D
+<U0065> \x65 |0 # LATIN SMALL LETTER E
+<U0066> \x66 |0 # LATIN SMALL LETTER F
+<U0067> \x67 |0 # LATIN SMALL LETTER G
+<U0068> \x68 |0 # LATIN SMALL LETTER H
+<U0069> \x69 |0 # LATIN SMALL LETTER I
+<U006a> \x6a |0 # LATIN SMALL LETTER J
+<U006b> \x6b |0 # LATIN SMALL LETTER K
+<U006c> \x6c |0 # LATIN SMALL LETTER L
+<U006d> \x6d |0 # LATIN SMALL LETTER M
+<U006e> \x6e |0 # LATIN SMALL LETTER N
+<U006f> \x6f |0 # LATIN SMALL LETTER O
+<U0070> \x70 |0 # LATIN SMALL LETTER P
+<U0071> \x71 |0 # LATIN SMALL LETTER Q
+<U0072> \x72 |0 # LATIN SMALL LETTER R
+<U0073> \x73 |0 # LATIN SMALL LETTER S
+<U0074> \x74 |0 # LATIN SMALL LETTER T
+<U0075> \x75 |0 # LATIN SMALL LETTER U
+<U0076> \x76 |0 # LATIN SMALL LETTER V
+<U0077> \x77 |0 # LATIN SMALL LETTER W
+<U0078> \x78 |0 # LATIN SMALL LETTER X
+<U0079> \x79 |0 # LATIN SMALL LETTER Y
+<U007a> \x7a |0 # LATIN SMALL LETTER Z
+<U007b> \x7b |0 # LEFT CURLY BRACKET
+<U007c> \x7c |0 # VERTICAL LINE
+<U007d> \x7d |0 # RIGHT CURLY BRACKET
+<U007e> \x7e |0 # TILDE
+<U007f> \x7f |0 # DELETE
+<U00a0> \xff |0 # NO-BREAK SPACE
+<U00a1> \xad |0 # INVERTED EXCLAMATION MARK
+<U00a2> \xbd |0 # CENT SIGN
+<U00a3> \x9c |0 # POUND SIGN
+<U00a4> \xcf |0 # CURRENCY SIGN
+<U00a5> \xbe |0 # YEN SIGN
+<U00a6> \xdd |0 # BROKEN BAR
+<U00a7> \xf5 |0 # SECTION SIGN
+<U00a8> \xf9 |0 # DIAERESIS
+<U00a9> \xb8 |0 # COPYRIGHT SIGN
+<U00aa> \xa6 |0 # FEMININE ORDINAL INDICATOR
+<U00ab> \xae |0 # LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+<U00ac> \xaa |0 # NOT SIGN
+<U00ad> \xf0 |0 # SOFT HYPHEN
+<U00ae> \xa9 |0 # REGISTERED SIGN
+<U00af> \xee |0 # MACRON
+<U00b0> \xf8 |0 # DEGREE SIGN
+<U00b1> \xf1 |0 # PLUS-MINUS SIGN
+<U00b2> \xfd |0 # SUPERSCRIPT TWO
+<U00b3> \xfc |0 # SUPERSCRIPT THREE
+<U00b4> \xef |0 # ACUTE ACCENT
+<U00b5> \xe6 |0 # MICRO SIGN
+<U00b6> \xf4 |0 # PILCROW SIGN
+<U00b7> \xfa |0 # MIDDLE DOT
+<U00b8> \xf7 |0 # CEDILLA
+<U00b9> \xfb |0 # SUPERSCRIPT ONE
+<U00ba> \xa7 |0 # MASCULINE ORDINAL INDICATOR
+<U00bb> \xaf |0 # RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+<U00bc> \xac |0 # VULGAR FRACTION ONE QUARTER
+<U00bd> \xab |0 # VULGAR FRACTION ONE HALF
+<U00be> \xf3 |0 # VULGAR FRACTION THREE QUARTERS
+<U00bf> \xa8 |0 # INVERTED QUESTION MARK
+<U00c0> \xb7 |0 # LATIN CAPITAL LETTER A WITH GRAVE
+<U00c1> \xb5 |0 # LATIN CAPITAL LETTER A WITH ACUTE
+<U00c2> \xb6 |0 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+<U00c3> \xc7 |0 # LATIN CAPITAL LETTER A WITH TILDE
+<U00c4> \x8e |0 # LATIN CAPITAL LETTER A WITH DIAERESIS
+<U00c5> \x8f |0 # LATIN CAPITAL LETTER A WITH RING ABOVE
+<U00c6> \x92 |0 # LATIN CAPITAL LIGATURE AE
+<U00c7> \x80 |0 # LATIN CAPITAL LETTER C WITH CEDILLA
+<U00c8> \xd4 |0 # LATIN CAPITAL LETTER E WITH GRAVE
+<U00c9> \x90 |0 # LATIN CAPITAL LETTER E WITH ACUTE
+<U00ca> \xd2 |0 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+<U00cb> \xd3 |0 # LATIN CAPITAL LETTER E WITH DIAERESIS
+<U00cc> \xde |0 # LATIN CAPITAL LETTER I WITH GRAVE
+<U00cd> \xd6 |0 # LATIN CAPITAL LETTER I WITH ACUTE
+<U00ce> \xd7 |0 # LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+<U00cf> \xd8 |0 # LATIN CAPITAL LETTER I WITH DIAERESIS
+<U00d0> \xd1 |0 # LATIN CAPITAL LETTER ETH
+<U00d1> \xa5 |0 # LATIN CAPITAL LETTER N WITH TILDE
+<U00d2> \xe3 |0 # LATIN CAPITAL LETTER O WITH GRAVE
+<U00d3> \xe0 |0 # LATIN CAPITAL LETTER O WITH ACUTE
+<U00d4> \xe2 |0 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+<U00d5> \xe5 |0 # LATIN CAPITAL LETTER O WITH TILDE
+<U00d6> \x99 |0 # LATIN CAPITAL LETTER O WITH DIAERESIS
+<U00d7> \x9e |0 # MULTIPLICATION SIGN
+<U00d8> \x9d |0 # LATIN CAPITAL LETTER O WITH STROKE
+<U00d9> \xeb |0 # LATIN CAPITAL LETTER U WITH GRAVE
+<U00da> \xe9 |0 # LATIN CAPITAL LETTER U WITH ACUTE
+<U00db> \xea |0 # LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+<U00dc> \x9a |0 # LATIN CAPITAL LETTER U WITH DIAERESIS
+<U00dd> \xed |0 # LATIN CAPITAL LETTER Y WITH ACUTE
+<U00de> \xe8 |0 # LATIN CAPITAL LETTER THORN
+<U00df> \xe1 |0 # LATIN SMALL LETTER SHARP S
+<U00e0> \x85 |0 # LATIN SMALL LETTER A WITH GRAVE
+<U00e1> \xa0 |0 # LATIN SMALL LETTER A WITH ACUTE
+<U00e2> \x83 |0 # LATIN SMALL LETTER A WITH CIRCUMFLEX
+<U00e3> \xc6 |0 # LATIN SMALL LETTER A WITH TILDE
+<U00e4> \x84 |0 # LATIN SMALL LETTER A WITH DIAERESIS
+<U00e5> \x86 |0 # LATIN SMALL LETTER A WITH RING ABOVE
+<U00e6> \x91 |0 # LATIN SMALL LIGATURE AE
+<U00e7> \x87 |0 # LATIN SMALL LETTER C WITH CEDILLA
+<U00e8> \x8a |0 # LATIN SMALL LETTER E WITH GRAVE
+<U00e9> \x82 |0 # LATIN SMALL LETTER E WITH ACUTE
+<U00ea> \x88 |0 # LATIN SMALL LETTER E WITH CIRCUMFLEX
+<U00eb> \x89 |0 # LATIN SMALL LETTER E WITH DIAERESIS
+<U00ec> \x8d |0 # LATIN SMALL LETTER I WITH GRAVE
+<U00ed> \xa1 |0 # LATIN SMALL LETTER I WITH ACUTE
+<U00ee> \x8c |0 # LATIN SMALL LETTER I WITH CIRCUMFLEX
+<U00ef> \x8b |0 # LATIN SMALL LETTER I WITH DIAERESIS
+<U00f0> \xd0 |0 # LATIN SMALL LETTER ETH
+<U00f1> \xa4 |0 # LATIN SMALL LETTER N WITH TILDE
+<U00f2> \x95 |0 # LATIN SMALL LETTER O WITH GRAVE
+<U00f3> \xa2 |0 # LATIN SMALL LETTER O WITH ACUTE
+<U00f4> \x93 |0 # LATIN SMALL LETTER O WITH CIRCUMFLEX
+<U00f5> \xe4 |0 # LATIN SMALL LETTER O WITH TILDE
+<U00f6> \x94 |0 # LATIN SMALL LETTER O WITH DIAERESIS
+<U00f7> \xf6 |0 # DIVISION SIGN
+<U00f8> \x9b |0 # LATIN SMALL LETTER O WITH STROKE
+<U00f9> \x97 |0 # LATIN SMALL LETTER U WITH GRAVE
+<U00fa> \xa3 |0 # LATIN SMALL LETTER U WITH ACUTE
+<U00fb> \x96 |0 # LATIN SMALL LETTER U WITH CIRCUMFLEX
+<U00fc> \x81 |0 # LATIN SMALL LETTER U WITH DIAERESIS
+<U00fd> \xec |0 # LATIN SMALL LETTER Y WITH ACUTE
+<U00fe> \xe7 |0 # LATIN SMALL LETTER THORN
+<U00ff> \x98 |0 # LATIN SMALL LETTER Y WITH DIAERESIS
+<U20ac> \xd5 |0 # EURO SIGN
+<U0192> \x9f |0 # LATIN SMALL LETTER F WITH HOOK
+<U2017> \xf2 |0 # DOUBLE LOW LINE
+<U2500> \xc4 |0 # BOX DRAWINGS LIGHT HORIZONTAL
+<U2502> \xb3 |0 # BOX DRAWINGS LIGHT VERTICAL
+<U250c> \xda |0 # BOX DRAWINGS LIGHT DOWN AND RIGHT
+<U2510> \xbf |0 # BOX DRAWINGS LIGHT DOWN AND LEFT
+<U2514> \xc0 |0 # BOX DRAWINGS LIGHT UP AND RIGHT
+<U2518> \xd9 |0 # BOX DRAWINGS LIGHT UP AND LEFT
+<U251c> \xc3 |0 # BOX DRAWINGS LIGHT VERTICAL AND RIGHT
+<U2524> \xb4 |0 # BOX DRAWINGS LIGHT VERTICAL AND LEFT
+<U252c> \xc2 |0 # BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
+<U2534> \xc1 |0 # BOX DRAWINGS LIGHT UP AND HORIZONTAL
+<U253c> \xc5 |0 # BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
+<U2550> \xcd |0 # BOX DRAWINGS DOUBLE HORIZONTAL
+<U2551> \xba |0 # BOX DRAWINGS DOUBLE VERTICAL
+<U2554> \xc9 |0 # BOX DRAWINGS DOUBLE DOWN AND RIGHT
+<U2557> \xbb |0 # BOX DRAWINGS DOUBLE DOWN AND LEFT
+<U255a> \xc8 |0 # BOX DRAWINGS DOUBLE UP AND RIGHT
+<U255d> \xbc |0 # BOX DRAWINGS DOUBLE UP AND LEFT
+<U2560> \xcc |0 # BOX DRAWINGS DOUBLE VERTICAL AND RIGHT
+<U2563> \xb9 |0 # BOX DRAWINGS DOUBLE VERTICAL AND LEFT
+<U2566> \xcb |0 # BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL
+<U2569> \xca |0 # BOX DRAWINGS DOUBLE UP AND HORIZONTAL
+<U256c> \xce |0 # BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL
+<U2580> \xdf |0 # UPPER HALF BLOCK
+<U2584> \xdc |0 # LOWER HALF BLOCK
+<U2588> \xdb |0 # FULL BLOCK
+<U2591> \xb0 |0 # LIGHT SHADE
+<U2592> \xb1 |0 # MEDIUM SHADE
+<U2593> \xb2 |0 # DARK SHADE
+<U25a0> \xfe |0 # BLACK SQUARE
+END CHARMAP
Modified: branches/upstream/libencode-perl/current/ucm/macJapanese.ucm
URL: http://svn.debian.org/wsvn/branches/upstream/libencode-perl/current/ucm/macJapanese.ucm?rev=17460&op=diff
==============================================================================
--- branches/upstream/libencode-perl/current/ucm/macJapanese.ucm (original)
+++ branches/upstream/libencode-perl/current/ucm/macJapanese.ucm Sat Mar 15 03:54:05 2008
@@ -1,5 +1,5 @@
#
-# $Id: macJapanese.ucm,v 2.0 2004/05/16 20:55:27 dankogai Exp $
+# $Id: macJapanese.ucm,v 2.1 2008/03/12 09:51:11 dankogai Exp $
#
# Original table can be obtained at
# http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/JAPANESE.TXT
@@ -135,7 +135,7 @@
<U007B> \x7B |0 # LEFT CURLY BRACKET
<U007C> \x7C |0 # VERTICAL LINE
<U007D> \x7D |0 # RIGHT CURLY BRACKET
-<U007E> \x7E |0 # TILDE # Apple change from standard Shift-JIS
+<U007E> \x7E |0 # TILDE # Apple change from standard Shift_JIS
<U00A0> \xA0 |0 # NO-BREAK SPACE # Apple addition
<U00A2> \x81\x91 |0 # CENT SIGN
<U00A3> \x81\x92 |0 # POUND SIGN
More information about the Pkg-perl-cvs-commits
mailing list