Upgrade Encode from 2.51 to 2.52

40 files changed, 421 insertions, 77 deletions

diff --git a/cpan/Encode/Byte/Makefile.PL b/cpan/Encode/Byte/Makefile.PL
index 60caf38e0d..e368ac8113 100644
--- a/cpan/Encode/Byte/Makefile.PL
+++ b/cpan/Encode/Byte/Makefile.PL
@@ -108,7 +108,7 @@ sub post_initialize
 #define U8 U8
 #include "encode.h"
 END
-    foreach my $table (keys %tables) {
+    foreach my $table (sort keys %tables) {
     print XS qq[#include "${table}.h"\n];
     }
     print XS <<"END";
@@ -137,7 +137,7 @@ PROTOTYPES: DISABLE
 BOOT:
 {
 END
-    foreach my $table (keys %tables) {
+    foreach my $table (sort keys %tables) {
     print XS qq[#include "${table}.exh"\n];
     }
     print XS "}\n";
diff --git a/cpan/Encode/CN/Makefile.PL b/cpan/Encode/CN/Makefile.PL
index 6d54404a3d..323b47ebf6 100644
--- a/cpan/Encode/CN/Makefile.PL
+++ b/cpan/Encode/CN/Makefile.PL
@@ -84,7 +84,7 @@ sub post_initialize
 #define U8 U8
 #include "encode.h"
 END
-    foreach my $table (keys %tables) {
+    foreach my $table (sort keys %tables) {
     print XS qq[#include "${table}.h"\n];
     }
     print XS <<"END";
@@ -113,7 +113,7 @@ PROTOTYPES: DISABLE
 BOOT:
 {
 END
-    foreach my $table (keys %tables) {
+    foreach my $table (sort keys %tables) {
     print XS qq[#include "${table}.exh"\n];
     }
     print XS "}\n";
diff --git a/cpan/Encode/Changes b/cpan/Encode/Changes
index f8dd7264ee..3e6b9b037c 100644
--- a/cpan/Encode/Changes
+++ b/cpan/Encode/Changes
@@ -1,8 +1,29 @@
 # Revision history for Perl extension Encode.
 #
-# $Id: Changes,v 2.51 2013/04/29 22:19:11 dankogai Exp dankogai $
+# $Id: Changes,v 2.52 2013/08/14 02:29:54 dankogai Exp $
 #
-$Revision: 2.51 $ $Date: 2013/04/29 22:19:11 $
+$Revision: 2.52 $ $Date: 2013/08/14 02:29:54 $
+! ucm/*.ucm
+  Addressed:
+    Unicode Mappping tables are missing Unicode Inc. license notification
+    All files including "as long as this notice remains attached" now
+    have that notice attached in the comment section.  (cp* and mac*
+    do not since their source files do not include that notice)
+  https://rt.cpan.org/Ticket/Display.html?id=87340
+! lib/Encode/MIME/Header.pm
+  t/mime-header.t
+  Addressed: encoding "0" with MIME-Headers gets a blank string
+  https://rt.cpan.org/Ticket/Display.html?id=87831
+! Encode.pm
+  Addressed: Documentation buglet
+  https://rt.cpan.org/Ticket/Display.html?id=84992
+! Byte/Makefile.PL CN/Makefile.PL EBCDIC/Makefile.PL
+  Encode/Makefile_PL.e2x JP/Makefile.PL KR/Makefile.PL
+  Symbol/Makefile.PL TW/Makefile.PL
+  Applied: Patch to output #includes in deterministic order
+  https://rt.cpan.org/Ticket/Display.html?id=86974
+
+2.51 2013/04/29 22:19:11
 ! Encode.xs
   Addressed: Encode.xs doesn't compile with Microsoft C compiler
   https://rt.cpan.org/Public/Bug/Display.html?id=84920
diff --git a/cpan/Encode/EBCDIC/Makefile.PL b/cpan/Encode/EBCDIC/Makefile.PL
index 0e2a13cb11..1c78c6a6a9 100644
--- a/cpan/Encode/EBCDIC/Makefile.PL
+++ b/cpan/Encode/EBCDIC/Makefile.PL
@@ -65,7 +65,7 @@ sub post_initialize
 #define U8 U8
 #include "encode.h"
 END
-    foreach my $table (keys %tables) {
+    foreach my $table (sort keys %tables) {
     print XS qq[#include "${table}.h"\n];
     }
     print XS <<"END";
@@ -94,7 +94,7 @@ PROTOTYPES: DISABLE
 BOOT:
 {
 END
-    foreach my $table (keys %tables) {
+    foreach my $table (sort keys %tables) {
     print XS qq[#include "${table}.exh"\n];
     }
     print XS "}\n";
diff --git a/cpan/Encode/Encode.pm b/cpan/Encode/Encode.pm
index 5c30031dc0..aea404a030 100644
--- a/cpan/Encode/Encode.pm
+++ b/cpan/Encode/Encode.pm
@@ -1,10 +1,10 @@
 #
-# $Id: Encode.pm,v 2.51 2013/04/29 22:19:11 dankogai Exp dankogai $
+# $Id: Encode.pm,v 2.52 2013/08/14 02:29:54 dankogai Exp $
 #
 package Encode;
 use strict;
 use warnings;
-our $VERSION = sprintf "%d.%02d", q$Revision: 2.51 $ =~ /(\d+)/g;
+our $VERSION = sprintf "%d.%02d", q$Revision: 2.52 $ =~ /(\d+)/g;
 use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG};
 use XSLoader ();
 XSLoader::load( __PACKAGE__, $VERSION );
@@ -53,7 +53,7 @@ our %ExtModule;
 require Encode::Config;
 #  See
 #  https://bugzilla.redhat.com/show_bug.cgi?id=435505#c2
-#  to find why sig handers inside eval{} are disabled.
+#  to find why sig handlers inside eval{} are disabled.
 eval {
     local $SIG{__DIE__};
     local $SIG{__WARN__};
@@ -471,8 +471,7 @@ internal format:
 
 B<CAVEAT>: When you run C<$string = decode("utf8", $octets)>, then $string
 I<might not be equal to> $octets.  Though both contain the same data, the
-UTF8 flag for $string is on unless $octets consists entirely of ASCII data
-on ASCII machines or EBCDIC on EBCDIC machines.  See L</"The UTF8 flag">
+UTF8 flag for $string is on.  See L</"The UTF8 flag">
 below.
 
 If the $string is C<undef>, then C<undef> is returned.
diff --git a/cpan/Encode/Encode.xs b/cpan/Encode/Encode.xs
index 25b0b831bc..d088d25083 100644
--- a/cpan/Encode/Encode.xs
+++ b/cpan/Encode/Encode.xs
@@ -1,5 +1,5 @@
 /*
- $Id: Encode.xs,v 2.23 2013/04/29 22:19:11 dankogai Exp dankogai $
+ $Id: Encode.xs,v 2.23 2013/04/29 22:19:11 dankogai Exp $
  */
 
 #define PERL_NO_GET_CONTEXT
diff --git a/cpan/Encode/Encode/Makefile_PL.e2x b/cpan/Encode/Encode/Makefile_PL.e2x
index ece58830fe..9fe60effc2 100644
--- a/cpan/Encode/Encode/Makefile_PL.e2x
+++ b/cpan/Encode/Encode/Makefile_PL.e2x
@@ -83,7 +83,7 @@ sub post_initialize
         if $^O eq 'MacOS' && $self->{SOURCE} !~ /\b$name\.c\b/;
     # $self->{'H'} = [$self->catfile($self->updir,'encode.h')];
     my %xs;
-    foreach my $table (keys %tables) {
+    foreach my $table (sort keys %tables) {
     push (@{$self->{'C'}},"$table.c");
     # Do NOT add $table.h etc. to H_FILES unless we own up as to how they
     # get built.
@@ -101,7 +101,7 @@ sub post_initialize
 #define U8 U8
 #include "encode.h"
 END
-    foreach my $table (keys %tables) {
+    foreach my $table (sort keys %tables) {
     print XS qq[#include "${table}.h"\n];
     }
     print XS <<"END";
@@ -130,7 +130,7 @@ PROTOTYPES: DISABLE
 BOOT:
 {
 END
-    foreach my $table (keys %tables) {
+    foreach my $table (sort keys %tables) {
     print XS qq[#include "${table}.exh"\n];
     }
     print XS "}\n";
@@ -144,14 +144,14 @@ sub postamble
     my $dir  = "."; # $self->catdir('Encode');
     my $str  = "# $name\$(OBJ_EXT) depends on .h and .exh files not .c files - but all written by enc2xs\n";
     $str    .= "$name.c : $name.xs ";
-    foreach my $table (keys %tables)
+    foreach my $table (sort keys %tables)
     {
     $str .= " $table.c";
     }
     $str .= "\n\n";
     $str .= "$name\$(OBJ_EXT) : $name.c\n\n";
 
-    foreach my $table (keys %tables)
+    foreach my $table (sort keys %tables)
     {
     my $numlines = 1;
     my $lengthsofar = length($str);
diff --git a/cpan/Encode/JP/Makefile.PL b/cpan/Encode/JP/Makefile.PL
index a75685efd8..c6a725fec6 100644
--- a/cpan/Encode/JP/Makefile.PL
+++ b/cpan/Encode/JP/Makefile.PL
@@ -84,7 +84,7 @@ sub post_initialize
 #define U8 U8
 #include "encode.h"
 END
-    foreach my $table (keys %tables) {
+    foreach my $table (sort keys %tables) {
     print XS qq[#include "${table}.h"\n];
     }
     print XS <<"END";
@@ -113,7 +113,7 @@ PROTOTYPES: DISABLE
 BOOT:
 {
 END
-    foreach my $table (keys %tables) {
+    foreach my $table (sort keys %tables) {
     print XS qq[#include "${table}.exh"\n];
     }
     print XS "}\n";
diff --git a/cpan/Encode/KR/Makefile.PL b/cpan/Encode/KR/Makefile.PL
index e95d0399d2..49c03199fd 100644
--- a/cpan/Encode/KR/Makefile.PL
+++ b/cpan/Encode/KR/Makefile.PL
@@ -82,7 +82,7 @@ sub post_initialize
 #define U8 U8
 #include "encode.h"
 END
-    foreach my $table (keys %tables) {
+    foreach my $table (sort keys %tables) {
     print XS qq[#include "${table}.h"\n];
     }
     print XS <<"END";
@@ -111,7 +111,7 @@ PROTOTYPES: DISABLE
 BOOT:
 {
 END
-    foreach my $table (keys %tables) {
+    foreach my $table (sort keys %tables) {
     print XS qq[#include "${table}.exh"\n];
     }
     print XS "}\n";
diff --git a/cpan/Encode/META.json b/cpan/Encode/META.json
index 60e2b60b50..4f3b6d8ffd 100644
--- a/cpan/Encode/META.json
+++ b/cpan/Encode/META.json
@@ -4,7 +4,7 @@
       "unknown"
    ],
    "dynamic_config" : 1,
-   "generated_by" : "ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.130880",
+   "generated_by" : "ExtUtils::MakeMaker version 6.68, CPAN::Meta::Converter version 2.131560",
    "license" : [
       "perl_5"
    ],
@@ -35,5 +35,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "2.51"
+   "version" : "2.52"
 }
diff --git a/cpan/Encode/META.yml b/cpan/Encode/META.yml
index 84a426dd3f..f2a8256f57 100644
--- a/cpan/Encode/META.yml
+++ b/cpan/Encode/META.yml
@@ -7,7 +7,7 @@ build_requires:
 configure_requires:
   ExtUtils::MakeMaker: 0
 dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.130880'
+generated_by: 'ExtUtils::MakeMaker version 6.68, CPAN::Meta::Converter version 2.131560'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -18,4 +18,4 @@ no_index:
     - t
     - inc
 requires: {}
-version: 2.51
+version: 2.52
diff --git a/cpan/Encode/Symbol/Makefile.PL b/cpan/Encode/Symbol/Makefile.PL
index 23ca1f431a..2c94aab3c5 100644
--- a/cpan/Encode/Symbol/Makefile.PL
+++ b/cpan/Encode/Symbol/Makefile.PL
@@ -70,7 +70,7 @@ sub post_initialize
 #define U8 U8
 #include "encode.h"
 END
-    foreach my $table (keys %tables) {
+    foreach my $table (sort keys %tables) {
     print XS qq[#include "${table}.h"\n];
     }
     print XS <<"END";
@@ -99,7 +99,7 @@ PROTOTYPES: DISABLE
 BOOT:
 {
 END
-    foreach my $table (keys %tables) {
+    foreach my $table (sort keys %tables) {
     print XS qq[#include "${table}.exh"\n];
     }
     print XS "}\n";
diff --git a/cpan/Encode/TW/Makefile.PL b/cpan/Encode/TW/Makefile.PL
index 99c94bf8d9..f90861f3f3 100644
--- a/cpan/Encode/TW/Makefile.PL
+++ b/cpan/Encode/TW/Makefile.PL
@@ -80,7 +80,7 @@ sub post_initialize
 #define U8 U8
 #include "encode.h"
 END
-    foreach my $table (keys %tables) {
+    foreach my $table (sort keys %tables) {
     print XS qq[#include "${table}.h"\n];
     }
     print XS <<"END";
@@ -109,7 +109,7 @@ PROTOTYPES: DISABLE
 BOOT:
 {
 END
-    foreach my $table (keys %tables) {
+    foreach my $table (sort keys %tables) {
     print XS qq[#include "${table}.exh"\n];
     }
     print XS "}\n";
diff --git a/cpan/Encode/Unicode/Unicode.pm b/cpan/Encode/Unicode/Unicode.pm
index f71567c619..54df4f41e0 100644
--- a/cpan/Encode/Unicode/Unicode.pm
+++ b/cpan/Encode/Unicode/Unicode.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 
-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 };
 
 use XSLoader;
 XSLoader::load( __PACKAGE__, $VERSION );
@@ -52,7 +52,7 @@ sub renew {
     return $clone;
 }
 
-# There used to be a perl implemntation of (en|de)code but with
+# There used to be a perl implementation of (en|de)code but with
 # XS version is ripe, perl version is zapped for optimal speed
 
 *decode = \&decode_xs;
diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs
index 773c0a09fb..0fe1da47db 100644
--- a/cpan/Encode/bin/enc2xs
+++ b/cpan/Encode/bin/enc2xs
@@ -10,11 +10,11 @@ use warnings;
 use Getopt::Std;
 use Config;
 my @orig_ARGV = @ARGV;
-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 };
 
 # These may get re-ordered.
 # RAW is a do_now as inserted by &enter
-# AGG is an aggreagated do_now, as built up by &process
+# AGG is an aggregated do_now, as built up by &process
 
 use constant {
   RAW_NEXT => 0,
@@ -50,7 +50,7 @@ use constant {
 # only the leaf "do_now"s cause output bytes, and they in turn point back to
 # the start state.
 
-# For an encoding where there are varaible length input byte sequences, you
+# For an encoding where there are variable length input byte sequences, you
 # will encounter a leaf "do_now" sooner for the shorter input sequences, but
 # as before the leaves will point back to the start state.
 
@@ -68,7 +68,7 @@ use constant {
 # single byte encoding, with  "ABCD" going "abcd". There will be
 # 4 "do_now"s, {"A" => [...,"a",...], "B" => [...,"b",...], "C"=>..., "D"=>...}
 
-# &process then walks the tree, building aggregate "do_now" structres for
+# &process then walks the tree, building aggregate "do_now" structures for
 # adjacent bytes where possible. The aggregate is for a contiguous range of
 # bytes which each produce the same length of output, each move to the
 # same next state, and each have the same fallback flag.
@@ -566,7 +566,7 @@ sub enter {
   # as current state.
   $next ||= $current;
   # Making sure it is defined seems to be faster than {no warnings;} in
-  # &process, or passing it in as 0 explicity.
+  # &process, or passing it in as 0 explicitly.
   # XXX $fallback ||= 0;
 
   # Start at the beginning and work forwards through the string to zero.
@@ -595,12 +595,12 @@ sub enter {
       $do_now->[RAW_NEXT] = $next;
       return;
     }
-    # Tail recursion. The intermdiate state may not have a name yet.
+    # Tail recursion. The intermediate state may not have a name yet.
     $current = $do_now->[RAW_NEXT];
   }
 }
 
-# This is purely for optimistation. It's just &enter hard coded for $fallback
+# This is purely for optimisation. It's just &enter hard coded for $fallback
 # of 0, using only a 3 entry array ref to save memory for every entry.
 sub enter_fb0 {
   my ($current,$inbytes,$outbytes,$next) = @_;
@@ -713,7 +713,7 @@ sub outbigstring
 
   # Make the big string in the string accumulator. Longest first, on the hope
   # that this makes it more likely that we find the short strings later on.
-  # Not sure if it helps sorting strings of the same length lexcically.
+  # Not sure if it helps sorting strings of the same length lexically.
   foreach my $s (sort {length $b <=> length $a || $a cmp $b} keys %strings) {
     my $index = index $string_acc, $s;
     if ($index >= 0) {
@@ -951,7 +951,7 @@ sub make_makefile_pl
 {
     eval { require Encode; };
     $@ and die "You need to install Encode to use enc2xs -M\nerror: $@\n";
-    # our used for variable expanstion
+    # our used for variable expansion
     $_Enc2xs = $0;
     $_Version = $VERSION;
     $_E2X = find_e2x();
@@ -978,7 +978,7 @@ sub make_configlocal_pm {
     $@ and die "Unable to require Encode: $@\n";
     eval { require File::Spec; };
 
-    # our used for variable expanstion
+    # our used for variable expantion
     my %in_core = map { $_ => 1 } (
         'ascii',      'iso-8859-1', 'utf8',
         'ascii-ctrl', 'null',       'utf-8-strict'
diff --git a/cpan/Encode/lib/Encode/Alias.pm b/cpan/Encode/lib/Encode/Alias.pm
index 9e15fe3c8c..362115be45 100644
--- a/cpan/Encode/lib/Encode/Alias.pm
+++ b/cpan/Encode/lib/Encode/Alias.pm
@@ -2,7 +2,7 @@ package Encode::Alias;
 use strict;
 use warnings;
 no warnings 'redefine';
-our $VERSION = do { my @r = ( q$Revision: 2.16 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
+our $VERSION = do { my @r = ( q$Revision: 2.17 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
 use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG};
 
 use base qw(Exporter);
@@ -211,7 +211,7 @@ sub init_aliases {
     define_alias( qr/^macintosh$/i => '"MacRoman"' );
     # https://rt.cpan.org/Ticket/Display.html?id=78125
     define_alias( qr/^macce$/i => '"MacCentralEurRoman"' );
-    # Ououououou. gone.  They are differente!
+    # Ououououou. gone.  They are different!
     # define_alias( qr/\bmacRomanian$/i => '"macRumanian"');
 
     # Standardize on the dashed versions.
@@ -338,7 +338,7 @@ As of Encode 1.87, the older form
 
 no longer works. 
 
-Encode up to 1.86 internally used "local $_" to implement ths older
+Encode up to 1.86 internally used "local $_" to implement this older
 form.  But consider the code below;
 
   use Encode;
diff --git a/cpan/Encode/lib/Encode/Encoding.pm b/cpan/Encode/lib/Encode/Encoding.pm
index 768d6d126a..62f6ee4f14 100644
--- a/cpan/Encode/lib/Encode/Encoding.pm
+++ b/cpan/Encode/lib/Encode/Encoding.pm
@@ -3,7 +3,7 @@ package Encode::Encoding;
 # Base class for classes which implement encodings
 use strict;
 use warnings;
-our $VERSION = do { my @r = ( q$Revision: 2.5 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
+our $VERSION = do { my @r = ( q$Revision: 2.6 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
 
 require Encode;
 
@@ -121,14 +121,14 @@ fragment.  If perlio_ok() is true, SHOULD becomes MUST.
 
 =item *
 
-If I<$check> is is false then C<encode> MUST  make a "best effort" to
+If I<$check> is false then C<encode> MUST  make a "best effort" to
 convert the string - for example, by using a replacement character.
 
 =back
 
 =item -E<gt>decode($octets [,$check])
 
-MUST return the string that I<$octets> represents. 
+MUST return the string that I<$octets> represents.
 
 =over 2
 
diff --git a/cpan/Encode/lib/Encode/GSM0338.pm b/cpan/Encode/lib/Encode/GSM0338.pm
index e1a11bd96a..e1058449eb 100644
--- a/cpan/Encode/lib/Encode/GSM0338.pm
+++ b/cpan/Encode/lib/Encode/GSM0338.pm
@@ -1,5 +1,5 @@
 #
-# $Id: GSM0338.pm,v 2.3 2013/04/26 18:30:46 dankogai Exp $
+# $Id: GSM0338.pm,v 2.4 2013/08/14 02:29:54 dankogai Exp $
 #
 package Encode::GSM0338;
 
@@ -8,7 +8,7 @@ use warnings;
 use Carp;
 
 use vars qw($VERSION);
-$VERSION = do { my @r = ( q$Revision: 2.3 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
+$VERSION = do { my @r = ( q$Revision: 2.4 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
 
 use Encode qw(:fallbacks);
 
@@ -259,7 +259,7 @@ this module.
 
 =head1 NOTES
 
-Unlike most other encodings,  the following aways croaks on error
+Unlike most other encodings,  the following always croaks on error
 for any $chk that evaluates to true.
 
   $gsm0338 = encode("gsm0338", $utf8      $chk);
diff --git a/cpan/Encode/lib/Encode/MIME/Header.pm b/cpan/Encode/lib/Encode/MIME/Header.pm
index c41797c703..de769ccac7 100644
--- a/cpan/Encode/lib/Encode/MIME/Header.pm
+++ b/cpan/Encode/lib/Encode/MIME/Header.pm
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 no warnings 'redefine';
 
-our $VERSION = do { my @r = ( q$Revision: 2.13 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
+our $VERSION = do { my @r = ( q$Revision: 2.14 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r };
 use Encode qw(find_encoding encode_utf8 decode_utf8);
 use MIME::Base64;
 use Carp;
@@ -135,7 +135,7 @@ sub encode($$;$) {
             $subline .= ' ' if ($subline =~ /\?=$/ and $word =~ /^=\?/);
             $subline .= $word;
         }
-        $subline and push @subline, $subline;
+        length($subline) and push @subline, $subline;
         push @line, join( "\n " => @subline );
     }
     $_[1] = '' if $chk;
diff --git a/cpan/Encode/t/mime-header.t b/cpan/Encode/t/mime-header.t
index a444d437e8..83a4448b18 100644
--- a/cpan/Encode/t/mime-header.t
+++ b/cpan/Encode/t/mime-header.t
@@ -1,5 +1,5 @@
 #
-# $Id: mime-header.t,v 2.5 2010/09/18 18:39:51 dankogai Exp $
+# $Id: mime-header.t,v 2.6 2013/08/14 02:29:54 dankogai Exp $
 # This script is written in utf8
 #
 BEGIN {
@@ -23,7 +23,7 @@ no utf8;
 
 use strict;
 #use Test::More qw(no_plan);
-use Test::More tests => 13;
+use Test::More tests => 14;
 use_ok("Encode::MIME::Header");
 
 my $eheader =<<'EOS';
@@ -125,4 +125,7 @@ my $rt42627 = Encode::decode_utf8("\x{c2}\x{a3}xxxxxxxxxxxxxxxxxxx0");
 is(Encode::encode('MIME-Q', $rt42627), 
    '=?UTF-8?Q?=C2=A3xxxxxxxxxxxxxxxxxxx?= =?UTF-8?Q?0?=',
    'MIME-Q encoding does not truncate trailing zeros');
+
+# RT87831
+is(Encode::encode('MIME-Header', '0'), '0', 'RT87831');
 __END__;
diff --git a/cpan/Encode/ucm/8859-1.ucm b/cpan/Encode/ucm/8859-1.ucm
index 223e566be0..4ac023f6a2 100644
--- a/cpan/Encode/ucm/8859-1.ucm
+++ b/cpan/Encode/ucm/8859-1.ucm
@@ -1,9 +1,25 @@
 #
-# $Id: 8859-1.ucm,v 2.0 2004/05/16 20:55:19 dankogai Exp $
+# $Id: 8859-1.ucm,v 2.1 2013/08/14 02:29:54 dankogai Exp $
 #
 # Original table can be obtained at
 # http://www.unicode.org/Public/MAPPINGS/ISO8859/8859-1.TXT
 #
+#       Copyright (c) 1991-1999 Unicode, Inc.  All Rights reserved.
+#
+#       This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#       No claims are made as to fitness for any particular purpose.  No
+#       warranties of any kind are expressed or implied.  The recipient
+#       agrees to determine applicability of information provided.  If this
+#       file has been provided on optical media by Unicode, Inc., the sole
+#       remedy for any claim will be exchange of defective media within 90
+#       days of receipt.
+#
+#       Unicode, Inc. hereby grants the right to freely use the information
+#       supplied in this file in the creation of products supporting the
+#       Unicode Standard, and to make copies of this file in any form for
+#       internal or external distribution as long as this notice remains
+#       attached.
+#
 <code_set_name> "iso-8859-1"
 <mb_cur_min> 1
 <mb_cur_max> 1
diff --git a/cpan/Encode/ucm/8859-10.ucm b/cpan/Encode/ucm/8859-10.ucm
index 1808fde086..4bf19add49 100644
--- a/cpan/Encode/ucm/8859-10.ucm
+++ b/cpan/Encode/ucm/8859-10.ucm
@@ -1,9 +1,25 @@
 #
-# $Id: 8859-10.ucm,v 2.0 2004/05/16 20:55:19 dankogai Exp $
+# $Id: 8859-10.ucm,v 2.1 2013/08/14 02:29:54 dankogai Exp $
 #
 # Original table can be obtained at
 # http://www.unicode.org/Public/MAPPINGS/ISO8859/8859-10.TXT
 #
+#       Copyright (c) 1999 Unicode, Inc.  All Rights reserved.
+#
+#       This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#       No claims are made as to fitness for any particular purpose.  No
+#       warranties of any kind are expressed or implied.  The recipient
+#       agrees to determine applicability of information provided.  If this
+#       file has been provided on optical media by Unicode, Inc., the sole
+#       remedy for any claim will be exchange of defective media within 90
+#       days of receipt.
+#
+#       Unicode, Inc. hereby grants the right to freely use the information
+#       supplied in this file in the creation of products supporting the
+#       Unicode Standard, and to make copies of this file in any form for
+#       internal or external distribution as long as this notice remains
+#       attached.
+#
 <code_set_name> "iso-8859-10"
 <mb_cur_min> 1
 <mb_cur_max> 1
diff --git a/cpan/Encode/ucm/8859-11.ucm b/cpan/Encode/ucm/8859-11.ucm
index 260440acac..c5ea6536b6 100644
--- a/cpan/Encode/ucm/8859-11.ucm
+++ b/cpan/Encode/ucm/8859-11.ucm
@@ -1,9 +1,25 @@
 #
-# $Id: 8859-11.ucm,v 2.0 2004/05/16 20:55:19 dankogai Exp $
+# $Id: 8859-11.ucm,v 2.1 2013/08/14 02:29:54 dankogai Exp $
 #
 # Original table can be obtained at
 # http://www.unicode.org/Public/MAPPINGS/ISO8859/8859-11.TXT
 #
+#       Copyright (c) 2002 Unicode, Inc.  All Rights reserved.
+#
+#       This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#       No claims are made as to fitness for any particular purpose.  No
+#       warranties of any kind are expressed or implied.  The recipient
+#       agrees to determine applicability of information provided.  If this
+#       file has been provided on optical media by Unicode, Inc., the sole
+#       remedy for any claim will be exchange of defective media within 90
+#       days of receipt.
+#
+#       Unicode, Inc. hereby grants the right to freely use the information
+#       supplied in this file in the creation of products supporting the
+#       Unicode Standard, and to make copies of this file in any form for
+#       internal or external distribution as long as this notice remains
+#       attached.
+#
 <code_set_name> "iso-8859-11"
 <mb_cur_min> 1
 <mb_cur_max> 1
diff --git a/cpan/Encode/ucm/8859-13.ucm b/cpan/Encode/ucm/8859-13.ucm
index 0a64023146..4f8b51700d 100644
--- a/cpan/Encode/ucm/8859-13.ucm
+++ b/cpan/Encode/ucm/8859-13.ucm
@@ -1,9 +1,25 @@
 #
-# $Id: 8859-13.ucm,v 2.0 2004/05/16 20:55:19 dankogai Exp $
+# $Id: 8859-13.ucm,v 2.1 2013/08/14 02:29:54 dankogai Exp $
 #
 # Original table can be obtained at
 # http://www.unicode.org/Public/MAPPINGS/ISO8859/8859-13.TXT
 #
+#       Copyright (c) 1998 - 1999 Unicode, Inc.  All Rights reserved.
+#
+#       This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#       No claims are made as to fitness for any particular purpose.  No
+#       warranties of any kind are expressed or implied.  The recipient
+#       agrees to determine applicability of information provided.  If this
+#       file has been provided on optical media by Unicode, Inc., the sole
+#       remedy for any claim will be exchange of defective media within 90
+#       days of receipt.
+#
+#       Unicode, Inc. hereby grants the right to freely use the information
+#       supplied in this file in the creation of products supporting the
+#       Unicode Standard, and to make copies of this file in any form for
+#       internal or external distribution as long as this notice remains
+#       attached.
+#
 <code_set_name> "iso-8859-13"
 <mb_cur_min> 1
 <mb_cur_max> 1
diff --git a/cpan/Encode/ucm/8859-14.ucm b/cpan/Encode/ucm/8859-14.ucm
index c4a2cba625..6a6efa0212 100644
--- a/cpan/Encode/ucm/8859-14.ucm
+++ b/cpan/Encode/ucm/8859-14.ucm
@@ -1,9 +1,25 @@
 #
-# $Id: 8859-14.ucm,v 2.0 2004/05/16 20:55:19 dankogai Exp $
+# $Id: 8859-14.ucm,v 2.1 2013/08/14 02:29:54 dankogai Exp $
 #
 # Original table can be obtained at
 # http://www.unicode.org/Public/MAPPINGS/ISO8859/8859-14.TXT
 #
+#       Copyright (c) 1998 - 1999 Unicode, Inc.  All Rights reserved.
+#
+#       This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#       No claims are made as to fitness for any particular purpose.  No
+#       warranties of any kind are expressed or implied.  The recipient
+#       agrees to determine applicability of information provided.  If this
+#       file has been provided on optical media by Unicode, Inc., the sole
+#       remedy for any claim will be exchange of defective media within 90
+#       days of receipt.
+#
+#       Unicode, Inc. hereby grants the right to freely use the information
+#       supplied in this file in the creation of products supporting the
+#       Unicode Standard, and to make copies of this file in any form for
+#       internal or external distribution as long as this notice remains
+#       attached.
+#
 <code_set_name> "iso-8859-14"
 <mb_cur_min> 1
 <mb_cur_max> 1
diff --git a/cpan/Encode/ucm/8859-15.ucm b/cpan/Encode/ucm/8859-15.ucm
index e63de8fcc7..9b1bd8acba 100644
--- a/cpan/Encode/ucm/8859-15.ucm
+++ b/cpan/Encode/ucm/8859-15.ucm
@@ -1,9 +1,25 @@
 #
-# $Id: 8859-15.ucm,v 2.0 2004/05/16 20:55:19 dankogai Exp $
+# $Id: 8859-15.ucm,v 2.1 2013/08/14 02:29:54 dankogai Exp $
 #
 # Original table can be obtained at
 # http://www.unicode.org/Public/MAPPINGS/ISO8859/8859-15.TXT
 #
+#       Copyright (c) 1998 - 1999 Unicode, Inc.  All Rights reserved.
+#
+#       This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#       No claims are made as to fitness for any particular purpose.  No
+#       warranties of any kind are expressed or implied.  The recipient
+#       agrees to determine applicability of information provided.  If this
+#       file has been provided on optical media by Unicode, Inc., the sole
+#       remedy for any claim will be exchange of defective media within 90
+#       days of receipt.
+#
+#       Unicode, Inc. hereby grants the right to freely use the information
+#       supplied in this file in the creation of products supporting the
+#       Unicode Standard, and to make copies of this file in any form for
+#       internal or external distribution as long as this notice remains
+#       attached.
+#
 <code_set_name> "iso-8859-15"
 <mb_cur_min> 1
 <mb_cur_max> 1
diff --git a/cpan/Encode/ucm/8859-16.ucm b/cpan/Encode/ucm/8859-16.ucm
index 70c9b7d73c..02e09c7a7d 100644
--- a/cpan/Encode/ucm/8859-16.ucm
+++ b/cpan/Encode/ucm/8859-16.ucm
@@ -1,9 +1,25 @@
 #
-# $Id: 8859-16.ucm,v 2.0 2004/05/16 20:55:19 dankogai Exp $
+# $Id: 8859-16.ucm,v 2.1 2013/08/14 02:29:54 dankogai Exp $
 #
 # Original table can be obtained at
 # http://www.unicode.org/Public/MAPPINGS/ISO8859/8859-16.TXT
 #
+#       Copyright (c) 1999-2001 Unicode, Inc.  All Rights reserved.
+#
+#       This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#       No claims are made as to fitness for any particular purpose.  No
+#       warranties of any kind are expressed or implied.  The recipient
+#       agrees to determine applicability of information provided.  If this
+#       file has been provided on optical media by Unicode, Inc., the sole
+#       remedy for any claim will be exchange of defective media within 90
+#       days of receipt.
+#
+#       Unicode, Inc. hereby grants the right to freely use the information
+#       supplied in this file in the creation of products supporting the
+#       Unicode Standard, and to make copies of this file in any form for
+#       internal or external distribution as long as this notice remains
+#       attached.
+#
 <code_set_name> "iso-8859-16"
 <mb_cur_min> 1
 <mb_cur_max> 1
diff --git a/cpan/Encode/ucm/8859-2.ucm b/cpan/Encode/ucm/8859-2.ucm
index fe61819437..b7bebd1f12 100644
--- a/cpan/Encode/ucm/8859-2.ucm
+++ b/cpan/Encode/ucm/8859-2.ucm
@@ -1,9 +1,25 @@
 #
-# $Id: 8859-2.ucm,v 2.0 2004/05/16 20:55:19 dankogai Exp $
+# $Id: 8859-2.ucm,v 2.1 2013/08/14 02:29:54 dankogai Exp $
 #
 # Original table can be obtained at
 # http://www.unicode.org/Public/MAPPINGS/ISO8859/8859-2.TXT
 #
+#       Copyright (c) 1991-1999 Unicode, Inc.  All Rights reserved.
+#
+#       This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#       No claims are made as to fitness for any particular purpose.  No
+#       warranties of any kind are expressed or implied.  The recipient
+#       agrees to determine applicability of information provided.  If this
+#       file has been provided on optical media by Unicode, Inc., the sole
+#       remedy for any claim will be exchange of defective media within 90
+#       days of receipt.
+#
+#       Unicode, Inc. hereby grants the right to freely use the information
+#       supplied in this file in the creation of products supporting the
+#       Unicode Standard, and to make copies of this file in any form for
+#       internal or external distribution as long as this notice remains
+#       attached.
+#
 <code_set_name> "iso-8859-2"
 <mb_cur_min> 1
 <mb_cur_max> 1
diff --git a/cpan/Encode/ucm/8859-3.ucm b/cpan/Encode/ucm/8859-3.ucm
index caf1cc5cf6..fa64131ac4 100644
--- a/cpan/Encode/ucm/8859-3.ucm
+++ b/cpan/Encode/ucm/8859-3.ucm
@@ -1,9 +1,25 @@
 #
-# $Id: 8859-3.ucm,v 2.0 2004/05/16 20:55:19 dankogai Exp $
+# $Id: 8859-3.ucm,v 2.1 2013/08/14 02:29:54 dankogai Exp $
 #
 # Original table can be obtained at
 # http://www.unicode.org/Public/MAPPINGS/ISO8859/8859-3.TXT
 #
+#       Copyright (c) 1991-1999 Unicode, Inc.  All Rights reserved.
+#
+#       This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#       No claims are made as to fitness for any particular purpose.  No
+#       warranties of any kind are expressed or implied.  The recipient
+#       agrees to determine applicability of information provided.  If this
+#       file has been provided on optical media by Unicode, Inc., the sole
+#       remedy for any claim will be exchange of defective media within 90
+#       days of receipt.
+#
+#       Unicode, Inc. hereby grants the right to freely use the information
+#       supplied in this file in the creation of products supporting the
+#       Unicode Standard, and to make copies of this file in any form for
+#       internal or external distribution as long as this notice remains
+#       attached.
+#
 <code_set_name> "iso-8859-3"
 <mb_cur_min> 1
 <mb_cur_max> 1
diff --git a/cpan/Encode/ucm/8859-4.ucm b/cpan/Encode/ucm/8859-4.ucm
index 56f8d6310c..31908568fc 100644
--- a/cpan/Encode/ucm/8859-4.ucm
+++ b/cpan/Encode/ucm/8859-4.ucm
@@ -1,9 +1,25 @@
 #
-# $Id: 8859-4.ucm,v 2.0 2004/05/16 20:55:19 dankogai Exp $
+# $Id: 8859-4.ucm,v 2.1 2013/08/14 02:29:54 dankogai Exp $
 #
 # Original table can be obtained at
 # http://www.unicode.org/Public/MAPPINGS/ISO8859/8859-4.TXT
 #
+#       Copyright (c) 1991-1999 Unicode, Inc.  All Rights reserved.
+#
+#       This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#       No claims are made as to fitness for any particular purpose.  No
+#       warranties of any kind are expressed or implied.  The recipient
+#       agrees to determine applicability of information provided.  If this
+#       file has been provided on optical media by Unicode, Inc., the sole
+#       remedy for any claim will be exchange of defective media within 90
+#       days of receipt.
+#
+#       Unicode, Inc. hereby grants the right to freely use the information
+#       supplied in this file in the creation of products supporting the
+#       Unicode Standard, and to make copies of this file in any form for
+#       internal or external distribution as long as this notice remains
+#       attached.
+#
 <code_set_name> "iso-8859-4"
 <mb_cur_min> 1
 <mb_cur_max> 1
diff --git a/cpan/Encode/ucm/8859-5.ucm b/cpan/Encode/ucm/8859-5.ucm
index 5099b908a0..9ac930e1a1 100644
--- a/cpan/Encode/ucm/8859-5.ucm
+++ b/cpan/Encode/ucm/8859-5.ucm
@@ -1,9 +1,25 @@
 #
-# $Id: 8859-5.ucm,v 2.0 2004/05/16 20:55:19 dankogai Exp $
+# $Id: 8859-5.ucm,v 2.1 2013/08/14 02:29:54 dankogai Exp $
 #
 # Original table can be obtained at
 # http://www.unicode.org/Public/MAPPINGS/ISO8859/8859-5.TXT
 #
+#       Copyright (c) 1991-1999 Unicode, Inc.  All Rights reserved.
+#
+#       This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#       No claims are made as to fitness for any particular purpose.  No
+#       warranties of any kind are expressed or implied.  The recipient
+#       agrees to determine applicability of information provided.  If this
+#       file has been provided on optical media by Unicode, Inc., the sole
+#       remedy for any claim will be exchange of defective media within 90
+#       days of receipt.
+#
+#       Unicode, Inc. hereby grants the right to freely use the information
+#       supplied in this file in the creation of products supporting the
+#       Unicode Standard, and to make copies of this file in any form for
+#       internal or external distribution as long as this notice remains
+#       attached.
+#
 <code_set_name> "iso-8859-5"
 <mb_cur_min> 1
 <mb_cur_max> 1
diff --git a/cpan/Encode/ucm/8859-6.ucm b/cpan/Encode/ucm/8859-6.ucm
index 20bc82fb50..c0499e808a 100644
--- a/cpan/Encode/ucm/8859-6.ucm
+++ b/cpan/Encode/ucm/8859-6.ucm
@@ -1,9 +1,25 @@
 #
-# $Id: 8859-6.ucm,v 2.0 2004/05/16 20:55:19 dankogai Exp $
+# $Id: 8859-6.ucm,v 2.1 2013/08/14 02:29:54 dankogai Exp $
 #
 # Original table can be obtained at
 # http://www.unicode.org/Public/MAPPINGS/ISO8859/8859-6.TXT
 #
+#       Copyright (c) 1991-1999 Unicode, Inc.  All Rights reserved.
+#
+#       This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#       No claims are made as to fitness for any particular purpose.  No
+#       warranties of any kind are expressed or implied.  The recipient
+#       agrees to determine applicability of information provided.  If this
+#       file has been provided on optical media by Unicode, Inc., the sole
+#       remedy for any claim will be exchange of defective media within 90
+#       days of receipt.
+#
+#       Unicode, Inc. hereby grants the right to freely use the information
+#       supplied in this file in the creation of products supporting the
+#       Unicode Standard, and to make copies of this file in any form for
+#       internal or external distribution as long as this notice remains
+#       attached.
+#
 <code_set_name> "iso-8859-6"
 <mb_cur_min> 1
 <mb_cur_max> 1
diff --git a/cpan/Encode/ucm/8859-7.ucm b/cpan/Encode/ucm/8859-7.ucm
index 4dd4c6ad7c..c2fd606e37 100644
--- a/cpan/Encode/ucm/8859-7.ucm
+++ b/cpan/Encode/ucm/8859-7.ucm
@@ -1,9 +1,25 @@
 #
-# $Id: 8859-7.ucm,v 2.1 2005/09/08 14:17:17 dankogai Exp $
+# $Id: 8859-7.ucm,v 2.2 2013/08/14 02:29:54 dankogai Exp $
 #
 # Original table can be obtained at
 # http://www.unicode.org/Public/MAPPINGS/ISO8859/8859-7.TXT
 #
+#       Copyright (c) 1991-1999 Unicode, Inc.  All Rights reserved.
+#
+#       This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#       No claims are made as to fitness for any particular purpose.  No
+#       warranties of any kind are expressed or implied.  The recipient
+#       agrees to determine applicability of information provided.  If this
+#       file has been provided on optical media by Unicode, Inc., the sole
+#       remedy for any claim will be exchange of defective media within 90
+#       days of receipt.
+#
+#       Unicode, Inc. hereby grants the right to freely use the information
+#       supplied in this file in the creation of products supporting the
+#       Unicode Standard, and to make copies of this file in any form for
+#       internal or external distribution as long as this notice remains
+#       attached.
+#
 <code_set_name> "iso-8859-7"
 <mb_cur_min> 1
 <mb_cur_max> 1
diff --git a/cpan/Encode/ucm/8859-8.ucm b/cpan/Encode/ucm/8859-8.ucm
index 75721020bb..9e696ba7a0 100644
--- a/cpan/Encode/ucm/8859-8.ucm
+++ b/cpan/Encode/ucm/8859-8.ucm
@@ -1,9 +1,25 @@
 #
-# $Id: 8859-8.ucm,v 2.0 2004/05/16 20:55:19 dankogai Exp $
+# $Id: 8859-8.ucm,v 2.1 2013/08/14 02:29:54 dankogai Exp $
 #
 # Original table can be obtained at
 # http://www.unicode.org/Public/MAPPINGS/ISO8859/8859-8.TXT
 #
+#       Copyright (c) 1991-1999 Unicode, Inc.  All Rights reserved.
+#
+#       This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#       No claims are made as to fitness for any particular purpose.  No
+#       warranties of any kind are expressed or implied.  The recipient
+#       agrees to determine applicability of information provided.  If this
+#       file has been provided on optical media by Unicode, Inc., the sole
+#       remedy for any claim will be exchange of defective media within 90
+#       days of receipt.
+#
+#       Unicode, Inc. hereby grants the right to freely use the information
+#       supplied in this file in the creation of products supporting the
+#       Unicode Standard, and to make copies of this file in any form for
+#       internal or external distribution as long as this notice remains
+#       attached.
+#
 <code_set_name> "iso-8859-8"
 <mb_cur_min> 1
 <mb_cur_max> 1
diff --git a/cpan/Encode/ucm/8859-9.ucm b/cpan/Encode/ucm/8859-9.ucm
index 02022eb91e..ee5b80c532 100644
--- a/cpan/Encode/ucm/8859-9.ucm
+++ b/cpan/Encode/ucm/8859-9.ucm
@@ -1,9 +1,25 @@
 #
-# $Id: 8859-9.ucm,v 2.0 2004/05/16 20:55:19 dankogai Exp $
+# $Id: 8859-9.ucm,v 2.1 2013/08/14 02:29:54 dankogai Exp $
 #
 # Original table can be obtained at
 # http://www.unicode.org/Public/MAPPINGS/ISO8859/8859-9.TXT
 #
+#       Copyright (c) 1991-1999 Unicode, Inc.  All Rights reserved.
+#
+#       This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#       No claims are made as to fitness for any particular purpose.  No
+#       warranties of any kind are expressed or implied.  The recipient
+#       agrees to determine applicability of information provided.  If this
+#       file has been provided on optical media by Unicode, Inc., the sole
+#       remedy for any claim will be exchange of defective media within 90
+#       days of receipt.
+#
+#       Unicode, Inc. hereby grants the right to freely use the information
+#       supplied in this file in the creation of products supporting the
+#       Unicode Standard, and to make copies of this file in any form for
+#       internal or external distribution as long as this notice remains
+#       attached.
+#
 <code_set_name> "iso-8859-9"
 <mb_cur_min> 1
 <mb_cur_max> 1
diff --git a/cpan/Encode/ucm/adobeStdenc.ucm b/cpan/Encode/ucm/adobeStdenc.ucm
index c4e4c91a95..f889268843 100644
--- a/cpan/Encode/ucm/adobeStdenc.ucm
+++ b/cpan/Encode/ucm/adobeStdenc.ucm
@@ -1,9 +1,24 @@
 ##
-# $Id: adobeStdenc.ucm,v 2.0 2004/05/16 20:55:19 dankogai Exp $
+# $Id: adobeStdenc.ucm,v 2.1 2013/08/14 02:29:54 dankogai Exp $
 #
 # Original table can be obtained at
 # http://www.unicode.org/Public/MAPPINGS/VENDORS/ADOBE/stdenc.txt
 #
+#  Copyright (c) 1991-2011 Unicode, Inc. All Rights reserved.
+#  
+#  This file is provided as-is by Unicode, Inc. (The Unicode Consortium). No
+#  claims are made as to fitness for any particular purpose. No warranties of
+#  any kind are expressed or implied. The recipient agrees to determine
+#  applicability of information provided. If this file has been provided on
+#  magnetic media by Unicode, Inc., the sole remedy for any claim will be
+#  exchange of defective media within 90 days of receipt.
+#  
+#  Unicode, Inc. hereby grants the right to freely use the information
+#  supplied in this file in the creation of products supporting the
+#  Unicode Standard, and to make copies of this file in any form for
+#  internal or external distribution as long as this notice remains
+#  attached.
+#
 <code_set_name>  "AdobeStandardEncoding"
 <code_set_alias> "AdobeStdEnc"
 <mb_cur_min> 1
diff --git a/cpan/Encode/ucm/adobeSymbol.ucm b/cpan/Encode/ucm/adobeSymbol.ucm
index 1d735b347b..a2c9e77c31 100644
--- a/cpan/Encode/ucm/adobeSymbol.ucm
+++ b/cpan/Encode/ucm/adobeSymbol.ucm
@@ -1,9 +1,24 @@
 #
-# $Id: adobeSymbol.ucm,v 2.0 2004/05/16 20:55:19 dankogai Exp $
+# $Id: adobeSymbol.ucm,v 2.1 2013/08/14 02:29:54 dankogai Exp $
 #
 # Original table can be obtained at
 # http://www.unicode.org/Public/MAPPINGS/VENDORS/ADOBE/symbol.txt
 #
+#  Copyright (c) 1991-2011 Unicode, Inc. All Rights reserved.
+#  
+#  This file is provided as-is by Unicode, Inc. (The Unicode Consortium). No
+#  claims are made as to fitness for any particular purpose. No warranties of
+#  any kind are expressed or implied. The recipient agrees to determine
+#  applicability of information provided. If this file has been provided on
+#  magnetic media by Unicode, Inc., the sole remedy for any claim will be
+#  exchange of defective media within 90 days of receipt.
+#  
+#  Unicode, Inc. hereby grants the right to freely use the information
+#  supplied in this file in the creation of products supporting the
+#  Unicode Standard, and to make copies of this file in any form for
+#  internal or external distribution as long as this notice remains
+#  attached.
+#  
 <code_set_name> "AdobeSymbol"
 <mb_cur_min> 1
 <mb_cur_max> 1
diff --git a/cpan/Encode/ucm/adobeZdingbat.ucm b/cpan/Encode/ucm/adobeZdingbat.ucm
index b338f75adc..6bf4e251d5 100644
--- a/cpan/Encode/ucm/adobeZdingbat.ucm
+++ b/cpan/Encode/ucm/adobeZdingbat.ucm
@@ -1,9 +1,24 @@
 #
-# $Id: adobeZdingbat.ucm,v 2.0 2004/05/16 20:55:19 dankogai Exp $
+# $Id: adobeZdingbat.ucm,v 2.1 2013/08/14 02:29:54 dankogai Exp $
 #
 # Original table can be obtained at
 # http://www.unicode.org/Public/MAPPINGS/VENDORS/ADOBE/zdingbat.txt
 #
+#  Copyright (c) 1991-2011 Unicode, Inc. All Rights reserved.
+#  
+#  This file is provided as-is by Unicode, Inc. (The Unicode Consortium). No
+#  claims are made as to fitness for any particular purpose. No warranties of
+#  any kind are expressed or implied. The recipient agrees to determine
+#  applicability of information provided. If this file has been provided on
+#  magnetic media by Unicode, Inc., the sole remedy for any claim will be
+#  exchange of defective media within 90 days of receipt.
+#  
+#  Unicode, Inc. hereby grants the right to freely use the information
+#  supplied in this file in the creation of products supporting the
+#  Unicode Standard, and to make copies of this file in any form for
+#  internal or external distribution as long as this notice remains
+#  attached.
+#  
 <code_set_name> "AdobeZdingbat"
 <mb_cur_min> 1
 <mb_cur_max> 1
diff --git a/cpan/Encode/ucm/koi8-r.ucm b/cpan/Encode/ucm/koi8-r.ucm
index 3f0e86fcc1..7b10d1c300 100644
--- a/cpan/Encode/ucm/koi8-r.ucm
+++ b/cpan/Encode/ucm/koi8-r.ucm
@@ -1,9 +1,25 @@
 #
-# $Id: koi8-r.ucm,v 2.0 2004/05/16 20:55:26 dankogai Exp $
+# $Id: koi8-r.ucm,v 2.1 2013/08/14 02:29:54 dankogai Exp $
 #
 # Original table can be obtained at
 # http://www.unicode.org/Public/MAPPINGS/VENDORS/MISC/KOI8-R.TXT
 #
+#       Copyright (c) 1991-1999 Unicode, Inc.  All Rights reserved.
+#
+#       This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#       No claims are made as to fitness for any particular purpose.  No
+#       warranties of any kind are expressed or implied.  The recipient
+#       agrees to determine applicability of information provided.  If this
+#       file has been provided on optical media by Unicode, Inc., the sole
+#       remedy for any claim will be exchange of defective media within 90
+#       days of receipt.
+#
+#       Unicode, Inc. hereby grants the right to freely use the information
+#       supplied in this file in the creation of products supporting the
+#       Unicode Standard, and to make copies of this file in any form for
+#       internal or external distribution as long as this notice remains
+#       attached.
+#
 <code_set_name> "koi8-r"
 <mb_cur_min> 1
 <mb_cur_max> 1
diff --git a/cpan/Encode/ucm/koi8-u.ucm b/cpan/Encode/ucm/koi8-u.ucm
index 9b349296d6..d92df5a130 100644
--- a/cpan/Encode/ucm/koi8-u.ucm
+++ b/cpan/Encode/ucm/koi8-u.ucm
@@ -1,8 +1,28 @@
 #
-# $Id: koi8-u.ucm,v 2.0 2004/05/16 20:55:26 dankogai Exp $
+# $Id: koi8-u.ucm,v 2.1 2013/08/14 02:29:54 dankogai Exp $
 #
-# Written $Id: koi8-u.ucm,v 2.0 2004/05/16 20:55:26 dankogai Exp $
+# Written $Id: koi8-u.ucm,v 2.1 2013/08/14 02:29:54 dankogai Exp $
 # ./compile -n koi8-u -o Encode/koi8-u.ucm Encode/koi8-u.enc
+#
+# Original table can be obtained at
+# http://www.unicode.org/Public/MAPPINGS/VENDORS/MISC/KOI8-R.TXT
+#
+#       Copyright (c) 1991-2008 Unicode, Inc.  All Rights reserved.
+#
+#       This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#       No claims are made as to fitness for any particular purpose.  No
+#       warranties of any kind are expressed or implied.  The recipient
+#       agrees to determine applicability of information provided.  If this
+#       file has been provided on optical media by Unicode, Inc., the sole
+#       remedy for any claim will be exchange of defective media within 90
+#       days of receipt.
+#
+#       Unicode, Inc. hereby grants the right to freely use the information
+#       supplied in this file in the creation of products supporting the
+#       Unicode Standard, and to make copies of this file in any form for
+#       internal or external distribution as long as this notice remains
+#       attached.
+#
 <code_set_name> "koi8-u"
 <mb_cur_min> 1
 <mb_cur_max> 1