r1784 - in packages/libi18n-charset-perl/trunk: . debian inc
inc/Module inc/Module/Install lib/I18N t
Krzysztof Krzyzaniak
eloy at costa.debian.org
Wed Dec 28 13:53:54 UTC 2005
Author: eloy
Date: 2005-12-28 13:53:26 +0000 (Wed, 28 Dec 2005)
New Revision: 1784
Added:
packages/libi18n-charset-perl/trunk/Changes
packages/libi18n-charset-perl/trunk/META.yml
packages/libi18n-charset-perl/trunk/inc/Module/Install/WriteAll.pm
packages/libi18n-charset-perl/trunk/lib/I18N/Charset/
Removed:
packages/libi18n-charset-perl/trunk/ChangeLog
packages/libi18n-charset-perl/trunk/inc/Module/Install/Include.pm
packages/libi18n-charset-perl/trunk/inc/Test/
Modified:
packages/libi18n-charset-perl/trunk/MANIFEST
packages/libi18n-charset-perl/trunk/Makefile.PL
packages/libi18n-charset-perl/trunk/README
packages/libi18n-charset-perl/trunk/debian/changelog
packages/libi18n-charset-perl/trunk/debian/control
packages/libi18n-charset-perl/trunk/debian/watch
packages/libi18n-charset-perl/trunk/inc/Module/Install.pm
packages/libi18n-charset-perl/trunk/inc/Module/Install/Base.pm
packages/libi18n-charset-perl/trunk/inc/Module/Install/Can.pm
packages/libi18n-charset-perl/trunk/inc/Module/Install/Fetch.pm
packages/libi18n-charset-perl/trunk/inc/Module/Install/Makefile.pm
packages/libi18n-charset-perl/trunk/inc/Module/Install/Metadata.pm
packages/libi18n-charset-perl/trunk/inc/Module/Install/Win32.pm
packages/libi18n-charset-perl/trunk/lib/I18N/Charset.pm
packages/libi18n-charset-perl/trunk/t/bug1.t
packages/libi18n-charset-perl/trunk/t/enco.t
packages/libi18n-charset-perl/trunk/t/iana.t
packages/libi18n-charset-perl/trunk/t/libi.t
packages/libi18n-charset-perl/trunk/t/map8.t
packages/libi18n-charset-perl/trunk/t/mib.t
packages/libi18n-charset-perl/trunk/t/mime.t
packages/libi18n-charset-perl/trunk/t/umap.t
packages/libi18n-charset-perl/trunk/t/utf8.t
Log:
eloy: new upstream version
Deleted: packages/libi18n-charset-perl/trunk/ChangeLog
===================================================================
--- packages/libi18n-charset-perl/trunk/ChangeLog 2005-12-28 13:49:20 UTC (rev 1783)
+++ packages/libi18n-charset-perl/trunk/ChangeLog 2005-12-28 13:53:26 UTC (rev 1784)
@@ -1,155 +0,0 @@
-2004-02-07 Kingpin <mthurn at verizon.net>
-
- * t/bug1.t: skip if Encode is not installed
-
- * lib/I18N/Charset.pm: new IANA document (one alias added)
-
-2004-01-30 Kingpin <mthurn at verizon.net>
-
- * lib/I18N/Charset.pm (_init_data): new IANA document (typos fixed)
-
-2004-01-24 Kingpin <mthurn at verizon.net>
-
- * lib/I18N/Charset.pm (_init_data): new IANA document (5 new charsets)
-
-2004-01-15 Kingpin <mthurn at verizon.net>
-
- * lib/I18N/Charset.pm (enco_charset_name): BUGFIX: encoding names were not initialized sometimes
-
-2003-03-28 Kingpin <mthurn at megapipe.net>
-
- * t/enco.t: new file
-
- * lib/I18N/Charset.pm (enco_charset_name): new methods for Encode encoding names
-
-2002-10-11 Kingpin <mthurn at copper.dulles.tasc.com>
-
- * t/libi.t: use App::Info::Lib::Iconv instead of File::Which
-
- * lib/I18N/Charset.pm: check iconv version before running it
- (libi_charset_name): load iconv tables not at startup, but only when needed
-
-2002-10-10 Kingpin <mthurn at copper.dulles.tasc.com>
-
- * lib/I18N/Charset.pm: make sure iconv exists before executing it
-
- * t/libi.t: new test file
-
- * lib/I18N/Charset.pm (libi_charset_name): added support for iconv names
-
-2002-10-07 Kingpin <mthurn at copper.dulles.tasc.com>
-
- * t/utf8.t: typo, and require Unicode::MapUTF8 version 1.09
-
-2002-10-02 Kingpin <mthurn at copper.dulles.tasc.com>
-
- * lib/I18N/Charset.pm (_init_data): new charset list from IANA
-
- * t/iana.t: two new tests for new data
-
-2002-09-05 Kingpin <mthurn at copper.dulles.tasc.com>
-
- * lib/I18N/Charset.pm: new function mime_charset_name()
-
-2002-08-09 Kingpin <mthurn at copper.dulles.tasc.com>
-
- * lib/I18N/Charset.pm (_init_data): use IO::String instead of __DATA__ mechanism
-
-2002-06-17 Kingpin <mthurn at copper.dulles.tasc.com>
-
- * lib/I18N/Charset.pm: new charset list from IANA
-
-2002-05-29 Kingpin <mthurn at copper.dulles.tasc.com>
-
- * lib/I18N/Charset.pm: new charset list from IANA
-
-2002-05-01 Kingpin <mthurn at copper.dulles.tasc.com>
-
- * lib/I18N/Charset.pm: added support for Unicode::MapUTF8
- * updated several of the tests
-
-2002-04-15 Kingpin <mthurn at copper.dulles.tasc.com>
-
- * lib/I18N/Charset.pm: new IANA charset list
-
-2002-02-07 Kingpin <mthurn at copper.dulles.tasc.com>
-
- * lib/I18N/Charset.pm (short_to_mib): short-circuit on positive answer
- (body): BUGFIX for processing Unicode::Map's REGISTRY
-
-2002-02-05 Kingpin <mthurn at copper.dulles.tasc.com>
-
- * t/utf8.t: new file
-
- * t/umap.t: now uses Test::More
-
- * t/map8.t: now uses Test::More
-
- * t/mib.t: new file
-
- * lib/I18N/Charset.pm (mib_to_charset_name): renamed function
-
-2002-01-10 Kingpin <mthurn at copper.dulles.tasc.com>
-
- * lib/I18N/Charset.pm (charset_name_to_mib): new function (thanks to François)
-
-2001-11-30 Kingpin <mthurn at copper.dulles.tasc.com>
-
- * lib/I18N/Charset.pm (strip): localize $/
-
-2001-09-04 Kingpin <mthurn at copper.dulles.tasc.com>
-
- * lib/I18N/Charset.pm (strip): handle whitespace in blank lines of Unicode::Map/REGISTRY
-
-2001-08-24 Kingpin <mthurn at tasc.com>
-
- * lib/I18N/Charset.pm: new IANA charset list
-
-2001-06-05 Kingpin <mthurn at tasc.com>
-
- * 1.09 released
-
-2001-06-04 Kingpin <mthurn at tasc.com>
-
- * lib/I18N/Charset.pm: new IANA charset list in __DATA__; update code & tests to match
-
-2001-04-19 Kingpin <mthurn at tasc.com>
-
- * lib/I18N/Charset.pm: removed some incorrect aliases (thanks to Liam Quinn)
-
-2001-03-08 Kingpin <mthurn at tasc.com>
-
- * 1.07 released
-
-2001-03-07 Kingpin <mthurn at tasc.com>
-
- * README: mention maputf8 tests are skipped
-
- * lib/I18N/Charset.pm (try_list): be more forgiving during ALL lookups
-
-2001-03-06 Kingpin <mthurn at tasc.com>
-
- * 1.06 released
-
-2001-03-05 Kingpin <mthurn at tasc.com>
-
- * lib/I18N/Charset.pm: added support for Unicode::Map
-
-2001-01-08 Kingpin <mthurn at tasc.com>
-
- * 1.05 released (fixed pod)
-
-1999-07-09 Kingpin <mthurn at tasc.com>
-
- * 1.03 released (no code changes, just cleaned up the distribution)
-
-1998-07-29 Kingpin <mthurn at tasc.com>
-
- * 1.02 tests don't complain if Unicode::Map8 is not installed;
- a few tiny documentation changes
-
-1998-07-16 Kingpin <mthurn at tasc.com>
-
- * 1.01 first released version
-
-
Copied: packages/libi18n-charset-perl/trunk/Changes (from rev 1783, packages/libi18n-charset-perl/branches/upstream/current/Changes)
Modified: packages/libi18n-charset-perl/trunk/MANIFEST
===================================================================
--- packages/libi18n-charset-perl/trunk/MANIFEST 2005-12-28 13:49:20 UTC (rev 1783)
+++ packages/libi18n-charset-perl/trunk/MANIFEST 2005-12-28 13:53:26 UTC (rev 1784)
@@ -1,17 +1,17 @@
-ChangeLog
+Changes
inc/Module/Install.pm
inc/Module/Install/Base.pm
inc/Module/Install/Can.pm
inc/Module/Install/Fetch.pm
-inc/Module/Install/Include.pm
inc/Module/Install/Makefile.pm
inc/Module/Install/Metadata.pm
inc/Module/Install/Win32.pm
-inc/Test/Builder.pm
-inc/Test/More.pm
+inc/Module/Install/WriteAll.pm
lib/I18N/Charset.pm
+lib/I18N/Charset/character-sets
Makefile.PL
MANIFEST This list of files
+META.yml
README
t/bug1.t
t/enco.t
Property changes on: packages/libi18n-charset-perl/trunk/MANIFEST
___________________________________________________________________
Name: svn:executable
+ *
Copied: packages/libi18n-charset-perl/trunk/META.yml (from rev 1783, packages/libi18n-charset-perl/branches/upstream/current/META.yml)
Modified: packages/libi18n-charset-perl/trunk/Makefile.PL
===================================================================
--- packages/libi18n-charset-perl/trunk/Makefile.PL 2005-12-28 13:49:20 UTC (rev 1783)
+++ packages/libi18n-charset-perl/trunk/Makefile.PL 2005-12-28 13:53:26 UTC (rev 1784)
@@ -1,3 +1,6 @@
+
+# $Id: Makefile.PL,v 1.14 2005/11/13 03:02:31 Daddy Exp $
+
use inc::Module::Install;
name('I18N-Charset');
@@ -7,16 +10,28 @@
license('perl');
requires( perl => '5.004' );
-requires('IO::String');
recommends('App::Info::Lib::Iconv');
recommends('Encode');
+build_requires('IO::Capture::Stderr' => 0);
+requires('IO::String');
recommends('Unicode::Map');
recommends('Unicode::Map8');
recommends('Unicode::MapUTF8');
-
# Test::More is needed for `make test`:
-include_deps('Test::More', 5.004);
build_requires('Test::More');
-check_nmake(); # check and download nmake.exe for Win32
-&Makefile->write;
+&WriteAll;
+
+sub MY::postamble
+ {
+ my $ret = <<'PART0';
+coverage :
+ $(MAKE) HARNESS_PERL_SWITCHES=-MDevel::Cover coverage_slave
+coverage_slave : test
+ cover
+PART0
+ return $ret;
+ } # MY::postamble
+
+__END__
+
Property changes on: packages/libi18n-charset-perl/trunk/Makefile.PL
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/libi18n-charset-perl/trunk/README
===================================================================
--- packages/libi18n-charset-perl/trunk/README 2005-12-28 13:49:20 UTC (rev 1783)
+++ packages/libi18n-charset-perl/trunk/README 2005-12-28 13:53:26 UTC (rev 1784)
@@ -1,41 +1,41 @@
-
- I18N-Charset Distribution
-
-This distribution contains a module I18N::Charset which maps Character
-Set names to the names officially registered with IANA. For example,
-'Shift_JIS' is the official name of what is often referred to in HTML
-headers as 'x-sjis'.
-
-It also maps character set names to Unicode::Map, Unicode::Map8, and
-Unicode::MapUTF8 conversion scheme names (if those modules are
-installed). For example, the Unicode::Map8 scheme name for
-'windows-1251' is 'cp1251'.
-
-It also maps character set names to their preferred MIME names. For
-example, the preferred MIME name for 'ISO_646.irv:1991' is 'US-ASCII'.
-
-It also maps character set names to conversion scheme names as defined
-by the iconv library. For example, the iconv conversion scheme name
-for 'Shift_JIS' is 'MS_KANJI'.
-
-It also maps character set names to encoding names as defined
-by the Encode module. For example, the Encode encoding name
-for 'Shift_JIS' is 'shiftjis'.
-
-To install these modules, you should just have to run the following:
-
- % perl Makefile.PL
- % make test
- % make install
-
-(If you're on a Windows system, you probably use Nmake instead of make.)
-
-The module is documented using pod. When you "make install", you will
-get a man page I18N::Charset which can be displayed by "perldoc
-I18N::Charset".
-
-Please let me know if you experience any problems with this module, or
-have any ideas for additions, or if you have some new character set
-names or abbreviations you'd like to be included.
-
-Martin Thurn <mthurn at cpan.org>
+
+ I18N-Charset Distribution
+
+This distribution contains a module I18N::Charset which maps Character
+Set names to the names officially registered with IANA. For example,
+'Shift_JIS' is the official name of what is often referred to in HTML
+headers as 'x-sjis'.
+
+It also maps character set names to Unicode::Map, Unicode::Map8, and
+Unicode::MapUTF8 conversion scheme names (if those modules are
+installed). For example, the Unicode::Map8 scheme name for
+'windows-1251' is 'cp1251'.
+
+It also maps character set names to their preferred MIME names. For
+example, the preferred MIME name for 'ISO_646.irv:1991' is 'US-ASCII'.
+
+It also maps character set names to conversion scheme names as defined
+by the iconv library. For example, the iconv conversion scheme name
+for 'Shift_JIS' is 'MS_KANJI'.
+
+It also maps character set names to encoding names as defined
+by the Encode module. For example, the Encode encoding name
+for 'Shift_JIS' is 'shiftjis'.
+
+To install these modules, you should just have to run the following:
+
+ % perl Makefile.PL
+ % make test
+ % make install
+
+(If you're on a Windows system, you probably use Nmake instead of make.)
+
+The module is documented using pod. When you "make install", you will
+get a man page I18N::Charset which can be displayed by "perldoc
+I18N::Charset".
+
+Please let me know if you experience any problems with this module, or
+have any ideas for additions, or if you have some new character set
+names or abbreviations you'd like to be included.
+
+Martin Thurn <mthurn at cpan.org>
Property changes on: packages/libi18n-charset-perl/trunk/README
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/libi18n-charset-perl/trunk/debian/changelog
===================================================================
--- packages/libi18n-charset-perl/trunk/debian/changelog 2005-12-28 13:49:20 UTC (rev 1783)
+++ packages/libi18n-charset-perl/trunk/debian/changelog 2005-12-28 13:53:26 UTC (rev 1784)
@@ -1,3 +1,9 @@
+libi18n-charset-perl (1.379-1) unstable; urgency=low
+
+ * New upstream release (closes: #329561)
+
+ -- Krzysztof Krzyzaniak (eloy) <eloy at debian.org> Wed, 28 Dec 2005 14:49:29 +0100
+
libi18n-charset-perl (1.371-1) unstable; urgency=low
* New upstream release.
Modified: packages/libi18n-charset-perl/trunk/debian/control
===================================================================
--- packages/libi18n-charset-perl/trunk/debian/control 2005-12-28 13:49:20 UTC (rev 1783)
+++ packages/libi18n-charset-perl/trunk/debian/control 2005-12-28 13:53:26 UTC (rev 1784)
@@ -2,8 +2,8 @@
Section: perl
Priority: optional
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Marc 'HE' Brockschmidt <he at debian.org>
-Standards-Version: 3.6.1
+Uploaders: Marc 'HE' Brockschmidt <he at debian.org>, Krzysztof Krzyzaniak (eloy) <eloy at debian.org>
+Standards-Version: 3.6.2
Build-Depends-Indep: debhelper (>= 4.1), perl, libio-string-perl, libtest-simple-perl, libunicode-map-perl, libunicode-maputf8-perl
Package: libi18n-charset-perl
Modified: packages/libi18n-charset-perl/trunk/debian/watch
===================================================================
--- packages/libi18n-charset-perl/trunk/debian/watch 2005-12-28 13:49:20 UTC (rev 1783)
+++ packages/libi18n-charset-perl/trunk/debian/watch 2005-12-28 13:53:26 UTC (rev 1784)
@@ -1,3 +1,3 @@
version=2
+http://mirrors.kernel.org/cpan/modules/by-module/I18N/I18N-Charset-([\.\d]+)\.tar\.gz
-http://www.cpan.org/authors/id/M/MT/MTHURN/I18N-Charset-(.*)\.tar\.gz
Modified: packages/libi18n-charset-perl/trunk/inc/Module/Install/Base.pm
===================================================================
--- packages/libi18n-charset-perl/trunk/inc/Module/Install/Base.pm 2005-12-28 13:49:20 UTC (rev 1783)
+++ packages/libi18n-charset-perl/trunk/inc/Module/Install/Base.pm 2005-12-28 13:53:26 UTC (rev 1784)
@@ -1,10 +1,7 @@
-#line 1 "inc/Module/Install/Base.pm - c:/Perl/site/lib/Module/Install/Base.pm"
-# $File: //depot/cpan/Module-Install/lib/Module/Install/Base.pm $ $Author: autrijus $
-# $Revision: #10 $ $Change: 1847 $ $DateTime: 2003/12/31 23:14:54 $ vim: expandtab shiftwidth=4
-
+#line 1 "inc/Module/Install/Base.pm - c:/perl/site/lib/Module/Install/Base.pm"
package Module::Install::Base;
-#line 31
+#line 28
sub new {
my ($class, %args) = @_;
@@ -18,18 +15,18 @@
bless(\%args, $class);
}
-#line 49
+#line 46
sub AUTOLOAD {
my $self = shift;
goto &{$self->_top->autoload};
}
-#line 60
+#line 57
sub _top { $_[0]->{_top} }
-#line 71
+#line 68
sub admin {
my $self = shift;
@@ -54,4 +51,4 @@
__END__
-#line 115
+#line 112
Property changes on: packages/libi18n-charset-perl/trunk/inc/Module/Install/Base.pm
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/libi18n-charset-perl/trunk/inc/Module/Install/Can.pm
===================================================================
--- packages/libi18n-charset-perl/trunk/inc/Module/Install/Can.pm 2005-12-28 13:49:20 UTC (rev 1783)
+++ packages/libi18n-charset-perl/trunk/inc/Module/Install/Can.pm 2005-12-28 13:53:26 UTC (rev 1784)
@@ -1,7 +1,4 @@
-#line 1 "inc/Module/Install/Can.pm - c:/Perl/site/lib/Module/Install/Can.pm"
-# $File: //depot/cpan/Module-Install/lib/Module/Install/Can.pm $ $Author: autrijus $
-# $Revision: #6 $ $Change: 1840 $ $DateTime: 2003/12/28 19:42:02 $ vim: expandtab shiftwidth=4
-
+#line 1 "inc/Module/Install/Can.pm - c:/perl/site/lib/Module/Install/Can.pm"
package Module::Install::Can;
use Module::Install::Base; @ISA = qw(Module::Install::Base);
$VERSION = '0.01';
Property changes on: packages/libi18n-charset-perl/trunk/inc/Module/Install/Can.pm
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/libi18n-charset-perl/trunk/inc/Module/Install/Fetch.pm
===================================================================
--- packages/libi18n-charset-perl/trunk/inc/Module/Install/Fetch.pm 2005-12-28 13:49:20 UTC (rev 1783)
+++ packages/libi18n-charset-perl/trunk/inc/Module/Install/Fetch.pm 2005-12-28 13:53:26 UTC (rev 1784)
@@ -1,7 +1,4 @@
-#line 1 "inc/Module/Install/Fetch.pm - c:/Perl/site/lib/Module/Install/Fetch.pm"
-# $File: //depot/cpan/Module-Install/lib/Module/Install/Fetch.pm $ $Author: autrijus $
-# $Revision: #8 $ $Change: 1374 $ $DateTime: 2003/03/18 11:50:15 $ vim: expandtab shiftwidth=4
-
+#line 1 "inc/Module/Install/Fetch.pm - c:/perl/site/lib/Module/Install/Fetch.pm"
package Module::Install::Fetch;
use Module::Install::Base; @ISA = qw(Module::Install::Base);
Property changes on: packages/libi18n-charset-perl/trunk/inc/Module/Install/Fetch.pm
___________________________________________________________________
Name: svn:executable
+ *
Deleted: packages/libi18n-charset-perl/trunk/inc/Module/Install/Include.pm
===================================================================
--- packages/libi18n-charset-perl/trunk/inc/Module/Install/Include.pm 2005-12-28 13:49:20 UTC (rev 1783)
+++ packages/libi18n-charset-perl/trunk/inc/Module/Install/Include.pm 2005-12-28 13:53:26 UTC (rev 1784)
@@ -1,12 +0,0 @@
-#line 1 "inc/Module/Install/Include.pm - c:/Perl/site/lib/Module/Install/Include.pm"
-# $File: //depot/cpan/Module-Install/lib/Module/Install/Include.pm $ $Author: autrijus $
-# $Revision: #8 $ $Change: 1811 $ $DateTime: 2003/12/14 18:52:33 $ vim: expandtab shiftwidth=4
-
-package Module::Install::Include;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
-
-sub include { +shift->admin->include(@_) };
-sub include_deps { +shift->admin->include_deps(@_) };
-sub auto_include { +shift->admin->auto_include(@_) };
-
-1;
Modified: packages/libi18n-charset-perl/trunk/inc/Module/Install/Makefile.pm
===================================================================
--- packages/libi18n-charset-perl/trunk/inc/Module/Install/Makefile.pm 2005-12-28 13:49:20 UTC (rev 1783)
+++ packages/libi18n-charset-perl/trunk/inc/Module/Install/Makefile.pm 2005-12-28 13:53:26 UTC (rev 1784)
@@ -1,7 +1,4 @@
-#line 1 "inc/Module/Install/Makefile.pm - c:/Perl/site/lib/Module/Install/Makefile.pm"
-# $File: //depot/cpan/Module-Install/lib/Module/Install/Makefile.pm $ $Author: autrijus $
-# $Revision: #53 $ $Change: 1847 $ $DateTime: 2003/12/31 23:14:54 $ vim: expandtab shiftwidth=4
-
+#line 1 "inc/Module/Install/Makefile.pm - c:/perl/site/lib/Module/Install/Makefile.pm"
package Module::Install::Makefile;
use Module::Install::Base; @ISA = qw(Module::Install::Base);
@@ -143,4 +140,4 @@
__END__
-#line 276
+#line 273
Property changes on: packages/libi18n-charset-perl/trunk/inc/Module/Install/Makefile.pm
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/libi18n-charset-perl/trunk/inc/Module/Install/Metadata.pm
===================================================================
--- packages/libi18n-charset-perl/trunk/inc/Module/Install/Metadata.pm 2005-12-28 13:49:20 UTC (rev 1783)
+++ packages/libi18n-charset-perl/trunk/inc/Module/Install/Metadata.pm 2005-12-28 13:53:26 UTC (rev 1784)
@@ -1,11 +1,8 @@
-#line 1 "inc/Module/Install/Metadata.pm - c:/Perl/site/lib/Module/Install/Metadata.pm"
-# $File: //depot/cpan/Module-Install/lib/Module/Install/Metadata.pm $ $Author: autrijus $
-# $Revision: #31 $ $Change: 1817 $ $DateTime: 2003/12/14 20:57:39 $ vim: expandtab shiftwidth=4
-
+#line 1 "inc/Module/Install/Metadata.pm - c:/perl/site/lib/Module/Install/Metadata.pm"
package Module::Install::Metadata;
use Module::Install::Base; @ISA = qw(Module::Install::Base);
-$VERSION = '0.03';
+$VERSION = '0.04';
use strict 'vars';
use vars qw($VERSION);
@@ -95,6 +92,12 @@
$name;
} if $values{module_name};
+ if ($values{name} =~ /::/) {
+ my $name = $values{name};
+ $name =~ s/::/-/g;
+ die "Error in name(): '$values{name}' should be '$name'!\n";
+ }
+
my $dump = '';
foreach my $key (@scalar_keys) {
$dump .= "$key: $values{$key}\n" if exists $values{$key};
@@ -155,7 +158,7 @@
while (<FH>) {
last META_NOT_OURS if /^generated_by: Module::Install\b/;
}
- return $self;
+ return $self if -s FH;
}
}
@@ -175,7 +178,10 @@
sub abstract_from {
my ($self, $abstract_from) = @_;
require ExtUtils::MM_Unix;
- $self->abstract(ExtUtils::MM_Unix->parse_abstract($abstract_from));
+ $self->abstract(
+ bless( { DISTNAME => $self->name }, 'ExtUtils::MM_Unix')
+ ->parse_abstract($abstract_from)
+ );
}
1;
Property changes on: packages/libi18n-charset-perl/trunk/inc/Module/Install/Metadata.pm
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/libi18n-charset-perl/trunk/inc/Module/Install/Win32.pm
===================================================================
--- packages/libi18n-charset-perl/trunk/inc/Module/Install/Win32.pm 2005-12-28 13:49:20 UTC (rev 1783)
+++ packages/libi18n-charset-perl/trunk/inc/Module/Install/Win32.pm 2005-12-28 13:53:26 UTC (rev 1784)
@@ -1,7 +1,4 @@
-#line 1 "inc/Module/Install/Win32.pm - c:/Perl/site/lib/Module/Install/Win32.pm"
-# $File: //depot/cpan/Module-Install/lib/Module/Install/Win32.pm $ $Author: autrijus $
-# $Revision: #9 $ $Change: 1789 $ $DateTime: 2003/11/11 01:22:54 $ vim: expandtab shiftwidth=4
-
+#line 1 "inc/Module/Install/Win32.pm - c:/perl/site/lib/Module/Install/Win32.pm"
package Module::Install::Win32;
use Module::Install::Base; @ISA = qw(Module::Install::Base);
Property changes on: packages/libi18n-charset-perl/trunk/inc/Module/Install/Win32.pm
___________________________________________________________________
Name: svn:executable
+ *
Copied: packages/libi18n-charset-perl/trunk/inc/Module/Install/WriteAll.pm (from rev 1783, packages/libi18n-charset-perl/branches/upstream/current/inc/Module/Install/WriteAll.pm)
Modified: packages/libi18n-charset-perl/trunk/inc/Module/Install.pm
===================================================================
--- packages/libi18n-charset-perl/trunk/inc/Module/Install.pm 2005-12-28 13:49:20 UTC (rev 1783)
+++ packages/libi18n-charset-perl/trunk/inc/Module/Install.pm 2005-12-28 13:53:26 UTC (rev 1784)
@@ -1,9 +1,6 @@
-#line 1 "inc/Module/Install.pm - c:/Perl/site/lib/Module/Install.pm"
-# $File: //depot/cpan/Module-Install/lib/Module/Install.pm $ $Author: autrijus $
-# $Revision: #66 $ $Change: 1847 $ $DateTime: 2003/12/31 23:14:54 $ vim: expandtab shiftwidth=4
-
+#line 1 "inc/Module/Install.pm - c:/perl/site/lib/Module/Install.pm"
package Module::Install;
-$VERSION = '0.31';
+$VERSION = '0.37';
die << "." unless $INC{join('/', inc => split(/::/, __PACKAGE__)).'.pm'};
Please invoke ${\__PACKAGE__} with:
@@ -22,6 +19,7 @@
use File::Path ();
@inc::Module::Install::ISA = 'Module::Install';
+*inc::Module::Install::VERSION = *VERSION;
#line 129
@@ -168,4 +166,4 @@
__END__
-#line 594
+#line 617
Property changes on: packages/libi18n-charset-perl/trunk/inc/Module/Install.pm
___________________________________________________________________
Name: svn:executable
+ *
Copied: packages/libi18n-charset-perl/trunk/lib/I18N/Charset (from rev 1783, packages/libi18n-charset-perl/branches/upstream/current/lib/I18N/Charset)
Modified: packages/libi18n-charset-perl/trunk/lib/I18N/Charset.pm
===================================================================
--- packages/libi18n-charset-perl/trunk/lib/I18N/Charset.pm 2005-12-28 13:49:20 UTC (rev 1783)
+++ packages/libi18n-charset-perl/trunk/lib/I18N/Charset.pm 2005-12-28 13:53:26 UTC (rev 1784)
@@ -1,6 +1,17 @@
-# $rcs = ' $Id: Charset.pm,v 1.371 2004/02/07 15:26:15 Daddy Exp $ ' ;
+# $rcs = ' $Id: Charset.pm,v 1.379 2005/09/02 21:32:04 Daddy Exp $ ' ;
+package I18N::Charset;
+
+require 5.002;
+
+require Exporter;
+use Carp;
+use IO::String;
+
+# Don't leave home without it:
+use strict;
+
=head1 NAME
I18N::Charset - IANA Character Set Registry names and Unicode::MapUTF8
@@ -29,16 +40,6 @@
I18N::Charset::add_libi_alias('my-sjis' => 'x-sjis');
I18N::Charset::add_enco_alias('my-japanese' => 'shiftjis');
-=cut
-
-#-----------------------------------------------------------------------
-
-package I18N::Charset;
-
-require 5.002;
-
-#-----------------------------------------------------------------------
-
=head1 DESCRIPTION
The C<I18N::Charset> module provides access to the IANA Character Set
@@ -64,19 +65,10 @@
=cut
#-----------------------------------------------------------------------
-
-require Exporter;
-use Carp;
-use IO::String;
-
-# Don't leave home without it:
-use strict;
-
-#-----------------------------------------------------------------------
# Public Global Variables
#-----------------------------------------------------------------------
use vars qw( $VERSION @ISA @EXPORT @EXPORT_OK );
-$VERSION = do { my @r = (q$Revision: 1.371 $ =~ /\d+/g); sprintf "%d."."%03d" x $#r, @r };
+$VERSION = do { my @r = (q$Revision: 1.379 $ =~ /\d+/g); sprintf "%d."."%03d" x $#r, @r };
@ISA = qw( Exporter );
@EXPORT = qw( iana_charset_name
map8_charset_name
@@ -94,14 +86,14 @@
# Private Global Variables
#-----------------------------------------------------------------------
-# %SHORTtoMIB is a hash of stripped names to mib.
-my %SHORTtoMIB;
-# %MIBtoLONG is a hash of mib to long name.
-my %MIBtoLONG;
-# %LONGtoMIB is a hash of long name to mib.
-my %LONGtoMIB;
-# %MIBtoMIME is a hash of mib to preferred MIME names.
-my %MIBtoMIME;
+# %hsMIBofShortname is a hash of stripped names to mib.
+my %hsMIBofShortname;
+# %hsLongnameOfMIB is a hash of mib to long name.
+my %hsLongnameOfMIB;
+# %hsMIBofLongname is a hash of long name to mib.
+my %hsMIBofLongname;
+# %hsMIMEofMIB is a hash of mib to preferred MIME names.
+my %hsMIMEofMIB;
# %MIBtoMAP8 is a hash of mib to Unicode::Map8 names. (Only valid for
# those U::Map8 names that we can find in the IANA registry)
my %MIBtoMAP8;
@@ -116,11 +108,12 @@
# %MIBtoLIBI is a hash of mib to libiconv names. (Only valid for
# those libiconv names that we can find in the IANA registry)
my %MIBtoLIBI;
-# %MIBtoLIBI is a hash of mib to Encode names. (Only valid for
+# %MIBtoENCO is a hash of mib to Encode names. (Only valid for
# those Encode names that we can find in the IANA registry)
my %MIBtoENCO;
use constant DEBUG => 0;
+use constant DEBUG_ENCO => 0;
=head1 CONVERSION ROUTINES
@@ -158,34 +151,34 @@
return undef unless $code ne '';
# $iDebug = ($code =~ m!sjis!);
# print STDERR " + iana_charset_name($code)..." if $iDebug;
- my $mib = &short_to_mib($code);
+ my $mib = &_short_to_mib($code);
return undef unless defined $mib;
# print STDERR " + mib is ($mib)..." if $iDebug;
# Make sure this is really a IANA mib:
return undef if &_is_dummy($mib);
# print STDERR " + is really iana..." if $iDebug;
- return $MIBtoLONG{$mib};
+ return $hsLongnameOfMIB{$mib};
} # iana_charset_name
-sub try_list
+sub _try_list
{
my $code = shift;
- my @asTry = ($code, &strip($code));
- push @asTry, &strip($code) if $code =~ s!\A(x-)+!!; # try without leading x-
+ my @asTry = ($code, &_strip($code));
+ push @asTry, &_strip($code) if $code =~ s!\A(x-)+!!; # try without leading x-
return @asTry;
- } # try_list
+ } # _try_list
-sub short_to_mib
+sub _short_to_mib
{
my $code = shift;
local $^W = 0;
- # print STDERR " + short_to_mib($code)..." if DEBUG;
+ # print STDERR " + _short_to_mib($code)..." if DEBUG;
my $answer = undef;
TRY_SHORT:
- foreach my $sTry (&try_list($code))
+ foreach my $sTry (&_try_list($code))
{
- my $iMIB = $SHORTtoMIB{$sTry} || 'undef';
+ my $iMIB = $hsMIBofShortname{$sTry} || 'undef';
# print STDERR "try($sTry)...$iMIB..." if DEBUG;
if ($iMIB ne 'undef')
{
@@ -195,16 +188,16 @@
} # foreach
# print STDERR "answer is $answer\n" if DEBUG;
return $answer;
- } # short_to_mib
+ } # _short_to_mib
-sub short_to_long
+sub _short_to_long
{
local $^W = 0;
my $s = shift;
- # print STDERR " + short_to_long($s)..." if DEBUG;
- return $MIBtoLONG{&short_to_mib($s)};
- } # short_to_long
+ # print STDERR " + _short_to_long($s)..." if DEBUG;
+ return $hsLongnameOfMIB{&_short_to_mib($s)};
+ } # _short_to_long
=item mime_charset_name()
@@ -226,13 +219,13 @@
return undef unless defined $code;
return undef unless $code ne '';
# print STDERR " + mime_charset_name($code)..." if DEBUG;
- my $mib = &short_to_mib($code);
+ my $mib = &_short_to_mib($code);
return undef unless defined $mib;
# print STDERR " + mib is ($mib)..." if DEBUG;
# Make sure this is really an IANA mib:
return undef if &_is_dummy($mib);
# print STDERR " + is really iana..." if DEBUG;
- return $MIBtoMIME{$mib};
+ return $hsMIMEofMIB{$mib};
} # mime_charset_name
@@ -257,7 +250,11 @@
# Get a list of aliases from Encode:
if (eval q{require Encode})
{
- my @as = Encode->encodings(':all');
+ my @as;
+ @as = Encode->encodings(':all');
+ # push @as, Encode->encodings('EBCDIC');
+ my $iFake = 0;
+ my $iReal = 0;
ENCODING:
foreach my $s (@as)
{
@@ -268,18 +265,28 @@
{
# Create a dummy mib:
$mib = $sFakeMIB++;
+ $iFake++;
} # if
else
{
$mib = &charset_name_to_mib($sIana);
+ $iReal++;
}
# At this point we have a mib for this Encode entry.
$MIBtoENCO{$mib} = $s;
- # print STDERR " + mib for enco ==$s== is $mib\n";
- $SHORTtoMIB{&strip($s)} = $mib;
- # print STDERR " + assign enco =$s==>$mib\n" if &_is_dummy($mib);
+ DEBUG_ENCO && print STDERR " + mib for enco ==$s== is $mib\n";
+ $hsMIBofShortname{&_strip($s)} = $mib;
+ DEBUG_ENCO && print STDERR " + assign enco =$s==>$mib\n" if &_is_dummy($mib);
+ } # foreach ENCODING
+ if (DEBUG_ENCO)
+ {
+ print STDERR " + Summary of Encode encodings:\n";
+ printf STDERR (" + %d encodings found.\n", scalar(@as));
+ print STDERR " + $iFake fake mibs created.\n";
+ print STDERR " + $iReal real mibs re-used.\n";
} # if
$iEncoLoaded = 1;
+ &add_enco_alias('Windows-31J', 'cp932');
} # if
else
{
@@ -300,12 +307,12 @@
return undef unless $code ne '';
&_maybe_load_enco();
my $iDebug = 0; # ($code =~ m!johab!i);
- print STDERR " + enco_charset_name($code)..." if $iDebug;
- my $mib = &short_to_mib($code);
+ print STDERR " + enco_charset_name($code)..." if ($iDebug || DEBUG_ENCO);
+ my $mib = &_short_to_mib($code);
return undef unless defined $mib;
- print STDERR " + mib is ($mib)..." if $iDebug;
+ print STDERR " + mib is ($mib)..." if ($iDebug || DEBUG_ENCO);
my $ret = &_mib_to_enco($mib);
- print STDERR " + enco is ($ret)..." if $iDebug;
+ print STDERR " + enco is ($ret)..." if ($iDebug || DEBUG_ENCO);
return $ret;
} # enco_charset_name
@@ -366,7 +373,7 @@
{
$MIBtoLIBI{$mib} = $sWord;
# print STDERR " + mib for libi ==$sWord== is $mib\n";
- $SHORTtoMIB{&strip($sWord)} = $mib;
+ $hsMIBofShortname{&_strip($sWord)} = $mib;
} # foreach ADD_LIBI
} # foreach ICONV_LINE
} # if
@@ -387,7 +394,7 @@
return undef unless $code ne '';
# my $iDebug = 1; # ($code =~ m!johab!i);
# print STDERR " + libi_charset_name($code)..." if $iDebug;
- my $mib = &short_to_mib($code);
+ my $mib = &_short_to_mib($code);
return undef unless defined $mib;
# print STDERR " + mib is ($mib)..." if $iDebug;
my $ret = &_mib_to_libi($mib);
@@ -418,7 +425,7 @@
return undef unless defined $code;
return undef unless $code ne '';
local $^W = 0;
- return $MIBtoLONG{$code};
+ return $hsLongnameOfMIB{$code};
} # mib_to_charset_name
@@ -439,7 +446,7 @@
{
my $s = shift;
return undef unless defined($s);
- return $LONGtoMIB{$s} || $LONGtoMIB{
+ return $hsMIBofLongname{$s} || $hsMIBofLongname{
&iana_charset_name($s) ||
&umap_charset_name($s) ||
&map8_charset_name($s) ||
@@ -468,9 +475,9 @@
return undef unless $code ne '';
# $iDebug = 0 && ($code =~ m!037!);
# print STDERR " + map8_charset_name($code)..." if $iDebug;
- $code = &strip($code);
+ $code = &_strip($code);
# print STDERR "$code..." if $iDebug;
- my $iMIB = &short_to_mib($code) || 'undef';
+ my $iMIB = &_short_to_mib($code) || 'undef';
# print STDERR "$iMIB..." if $iDebug;
if ($iMIB ne 'undef')
{
@@ -492,8 +499,6 @@
$sCharset = umap_charset_name('hebrew');
-=back
-
=cut
sub umap_charset_name
@@ -504,7 +509,7 @@
# $iDebug = ($code =~ m!apple!i);
# print STDERR "\n + MIBtoUMAP{dummymib029} == $MIBtoUMAP{$sDummy .'029'}\n\n" if $iDebug;
# print STDERR " + umap_charset_name($code)..." if $iDebug;
- my $iMIB = &short_to_mib(&strip($code)) || 'undef';
+ my $iMIB = &_short_to_mib(&_strip($code)) || 'undef';
# print STDERR "$iMIB..." if $iDebug;
if ($iMIB ne 'undef')
{
@@ -536,7 +541,7 @@
return undef unless $code ne '';
# $iDebug = ($code =~ m!u!);
# print STDERR " + umu8_charset_name($code)..." if $iDebug;
- my $iMIB = &short_to_mib($code) || 'undef';
+ my $iMIB = &_short_to_mib($code) || 'undef';
# print STDERR "$iMIB..." if $iDebug;
if ($iMIB ne 'undef')
{
@@ -547,6 +552,7 @@
return undef;
} # umu8_charset_name
+=back
=head1 QUERY ROUTINES
@@ -566,7 +572,7 @@
sub all_iana_charset_names
{
- return values %MIBtoLONG;
+ return values %hsLongnameOfMIB;
} # all_iana_charset_names
#-----------------------------------------------------------------------
@@ -609,12 +615,12 @@
my $sName = &iana_charset_name($sReal);
if (not defined($sName))
{
- carp "attempt to alias \"$sAlias\" to unknown IANA character set \"$sReal\"\n" if DEBUG;
+ carp qq{attempt to alias "$sAlias" to unknown IANA charset "$sReal"};
return undef;
} # if
- my $mib = &short_to_mib(&strip($sName));
+ my $mib = &_short_to_mib(&_strip($sName));
# print STDERR " --> $sName --> $mib\n";
- $SHORTtoMIB{&strip($sAlias)} = $mib;
+ $hsMIBofShortname{&_strip($sAlias)} = $mib;
return $sName;
} # add_iana_alias
@@ -660,16 +666,16 @@
{
my ($sAlias, $sReal) = @_;
my $sName = &map8_charset_name($sReal);
- my $sShort = &strip($sAlias);
- my $sShortName = &strip($sName);
+ my $sShort = &_strip($sAlias);
+ my $sShortName = &_strip($sName);
if (not defined($sName))
{
- carp "attempt to alias \"$sAlias\" to unknown Map8 character set \"$sReal\"\n" if DEBUG;
+ carp qq{attempt to alias "$sAlias" to unknown Map8 charset "$sReal"};
return undef;
} # if
- if (exists $SHORTtoMIB{$sShortName})
+ if (exists $hsMIBofShortname{$sShortName})
{
- $SHORTtoMIB{$sShort} = $SHORTtoMIB{$sShortName};
+ $hsMIBofShortname{$sShort} = $hsMIBofShortname{$sShortName};
} # if
return $sName;
} # add_map8_alias
@@ -687,16 +693,16 @@
{
my ($sAlias, $sReal) = @_;
my $sName = &umap_charset_name($sReal);
- my $sShort = &strip($sAlias);
- my $sShortName = &strip($sName);
+ my $sShort = &_strip($sAlias);
+ my $sShortName = &_strip($sName);
if (not defined($sName))
{
- carp "attempt to alias \"$sAlias\" to unknown U::Map character set \"$sReal\"\n" if DEBUG;
+ carp qq{attempt to alias "$sAlias" to unknown U::Map charset "$sReal"};
return undef;
} # if
- if (exists $SHORTtoMIB{$sShortName})
+ if (exists $hsMIBofShortname{$sShortName})
{
- $SHORTtoMIB{$sShort} = $SHORTtoMIB{$sShortName};
+ $hsMIBofShortname{$sShort} = $hsMIBofShortname{$sShortName};
} # if
return $sName;
} # add_umap_alias
@@ -735,12 +741,12 @@
my $sName = &libi_charset_name($sReal);
if (not defined($sName))
{
- carp "attempt to alias \"$sAlias\" to unknown iconv conversion scheme \"$sReal\"\n" if DEBUG;
+ carp qq{attempt to alias "$sAlias" to unknown iconv charset "$sReal"};
return undef;
} # if
- my $mib = &short_to_mib(&strip($sName));
+ my $mib = &_short_to_mib(&_strip($sName));
# print STDERR "sName=$sName...mib=$mib\n";
- $SHORTtoMIB{&strip($sAlias)} = $mib;
+ $hsMIBofShortname{&_strip($sAlias)} = $mib;
return $sName;
} # add_libi_alias
@@ -775,22 +781,22 @@
{
my ($sAlias, $sReal) = @_;
my $iDebug = 0;
- print STDERR " + add_enco_alias($sAlias,$sReal)..." if $iDebug;
+ print STDERR " + add_enco_alias($sAlias,$sReal)..." if ($iDebug || DEBUG_ENCO);
my $sName = &enco_charset_name($sReal);
if (not defined($sName))
{
- carp "attempt to alias \"$sAlias\" to unknown iconv conversion scheme \"$sReal\"\n" if DEBUG;
+ carp qq{attempt to alias "$sAlias" to unknown Encode charset "$sReal"};
return undef;
} # if
- my $mib = &short_to_mib(&strip($sName));
- print STDERR "sName=$sName...mib=$mib\n" if $iDebug;
- $SHORTtoMIB{&strip($sAlias)} = $mib;
+ my $mib = &_short_to_mib(&_strip($sName));
+ print STDERR "sName=$sName...mib=$mib\n" if ($iDebug || DEBUG_ENCO);
+ $hsMIBofShortname{&_strip($sAlias)} = $mib;
return $sName;
} # add_enco_alias
#-----------------------------------------------------------------------
-=head1 EXAMPLES
+=back
=head1 KNOWN BUGS AND LIMITATIONS
@@ -860,12 +866,12 @@
#-----------------------------------------------------------------------
-sub strip
+sub _strip
{
my $s = lc(shift);
$s =~ tr/[0-9a-zA-Z]//dc;
return $s;
- } # strip
+ } # _strip
# initialization code - stuff the DATA into some data structure
@@ -877,7 +883,9 @@
my ($sName, $iMIB, $sAlias, $mimename);
my $iDebug = 0;
# I used to use the __DATA__ mechanism to initialize the data, but
- # that is not compatible with perlapp
+ # that is not compatible with perlapp. NOTE that storing the IANA
+ # charset data as a file separate from this module code will not
+ # work with perlapp either!
my $io = new IO::String(_init_data());
local $/ = "\n";
DATA:
@@ -906,13 +914,13 @@
$iMIB = $1;
# $iDebug = ($iMIB =~ m!225[23]!);
print STDERR " + found mib: $iMIB, long = $sName\n" if $iDebug;
- $MIBtoLONG{$iMIB} = $sName;
- $LONGtoMIB{$sName} = $iMIB;
- $SHORTtoMIB{&strip($sName)} = $iMIB;
+ $hsLongnameOfMIB{$iMIB} = $sName;
+ $hsMIBofLongname{$sName} = $iMIB;
+ $hsMIBofShortname{&_strip($sName)} = $iMIB;
if ($mimename)
{
print STDERR " + found mime: mib=$iMIB, mime=$sName\n" if $iDebug;
- $MIBtoMIME{$iMIB} = $sName;
+ $hsMIMEofMIB{$iMIB} = $sName;
# We've got the MIME name for this entry, don't look for more
# until next entry:
$mimename = 0;
@@ -924,11 +932,11 @@
if ($sAlias !~ m!None!i)
{
print STDERR " + map Alias ($sAlias) to mib $iMIB\n" if $iDebug;
- $SHORTtoMIB{&strip($sAlias)} = $iMIB;
+ $hsMIBofShortname{&_strip($sAlias)} = $iMIB;
if ($mimename)
{
print STDERR " + found mime: mib=$iMIB, mime=$sAlias\n" if $iDebug;
- $MIBtoMIME{$iMIB} = $sAlias;
+ $hsMIMEofMIB{$iMIB} = $sAlias;
# We've got the MIME name for this entry, don't look for
# more until next entry:
$mimename = 0;
@@ -946,13 +954,14 @@
EQUAL_LINE:
foreach my $sLine (@asEqualLines)
{
+ next if ($sLine =~ m!\A#!);
# print STDERR " + equal-sign line $sLine...\n";
my @as = split(/\ ===\ /, $sLine);
next unless defined $as[0];
next unless $as[0] ne '';
next unless defined $as[1];
next unless $as[1] ne '';
- my $iMIB = $SHORTtoMIB{&strip($as[0])} || '';
+ my $iMIB = $hsMIBofShortname{&_strip($as[0])} || '';
unless ($iMIB ne '')
{
print STDERR " --- can not find IANA entry for equal-sign directive $as[0]\n";
@@ -960,9 +969,9 @@
} # unless
foreach my $s (@as)
{
- my $sStrip = &strip($s);
+ my $sStrip = &_strip($s);
# print STDERR " + $sStrip --> $iMIB\n";
- $SHORTtoMIB{$sStrip} = $iMIB;
+ $hsMIBofShortname{$sStrip} = $iMIB;
} # foreach
} # foreach
@@ -999,11 +1008,11 @@
# $iDebug = 1;
$iMIB = $sFakeMIB++;
print STDERR " + had to use a dummy mib ($iMIB) for U::Map8==$sMap8==\n" if $iDebug;
- $LONGtoMIB{$sMap8} = $iMIB;
+ $hsMIBofLongname{$sMap8} = $iMIB;
} # unless
else
{
- $iMIB = $LONGtoMIB{$sFound};
+ $iMIB = $hsMIBofLongname{$sFound};
print STDERR " + found IANA name $sFound ($iMIB) for Map8 entry $sMap8\n" if $iDebug;
}
# $iDebug = ($iMIB =~ m!225[23]!);
@@ -1013,9 +1022,9 @@
# Map ALL the Map8 aliases to this Map8 master name:
foreach my $s ($sMap8, @as)
{
- $s = &strip($s);
- print STDERR " + map $s to $iMIB in SHORTtoMIB...\n" if $iDebug;
- $SHORTtoMIB{$s} = $iMIB;
+ $s = &_strip($s);
+ print STDERR " + map $s to $iMIB in hsMIBofShortname...\n" if $iDebug;
+ $hsMIBofShortname{$s} = $iMIB;
} # foreach
# $iDebug = 0;
} # while
@@ -1041,16 +1050,16 @@
my $sMapFile = "$MAP_Path/REGISTRY";
if (open MAPS, $sMapFile)
{
- local $/;
- undef $/;
+ local $/ = undef;
my @asMAPS = split(/\n\s*\n/, <MAPS>);
+ UMAP_ENTRY:
foreach my $sEntry (@asMAPS)
{
$iDebug = 0;
# print STDERR " + working on Umap entry >>>>>$sEntry<<<<<...\n";
my ($sName, $iMIB) = ('', '');
# Get the value of the name field, and skip entries with no name:
- next unless $sEntry =~ m!^name:\s+(\S+)!mi;
+ next UMAP_ENTRY unless $sEntry =~ m!^name:\s+(\S+)!mi;
$sName = $1;
# $iDebug = ($sName =~ m!apple!);
print STDERR " + UMAP sName is $sName\n" if $iDebug;
@@ -1065,16 +1074,16 @@
{
# This entry does not have the MIB listed. See if the name
# of any of the aliases are known to our iana tables:
- ALIAS:
+ UMAP_ALIAS:
foreach my $sAlias ($sName, @asAlias)
{
print STDERR " + try alias $sAlias\n" if $iDebug;
- my $iMIBtry = &short_to_mib(&strip($sAlias));
+ my $iMIBtry = &_short_to_mib(&_strip($sAlias));
if ($iMIBtry)
{
print STDERR " + matched\n" if $iDebug;
$iMIB = $iMIBtry;
- last ALIAS;
+ last UMAP_ALIAS;
} # if
} # foreach
# If nothing matched, create a dummy mib:
@@ -1088,16 +1097,14 @@
# $iDebug = ($iMIB eq '17');
print STDERR " + UMAP mib is $iMIB\n" if $iDebug;
$MIBtoUMAP{$iMIB} = $sName;
- # Set the long IANA name, IF it is empty so far:
- $MIBtoLONG{$iMIB} ||= $sName;
- $LONGtoMIB{$sName} ||= $iMIB;
- $SHORTtoMIB{&strip($sName)} ||= $iMIB;
+ $hsMIBofLongname{$sName} ||= $iMIB;
+ $hsMIBofShortname{&_strip($sName)} ||= $iMIB;
foreach my $sAlias (@asAlias)
{
print STDERR " + UMAP alias $sAlias\n" if $iDebug;
- $SHORTtoMIB{&strip($sAlias)} = $iMIB;
- } # while
- } # foreach
+ $hsMIBofShortname{&_strip($sAlias)} = $iMIB;
+ } # foreach $sAlias
+ } # foreach UMAP_ENTRY
close MAPS;
# print STDERR "\n + MIBtoUMAP{dummymib029} == $MIBtoUMAP{$sDummy .'029'}\n\n";
} # if open
@@ -1160,7 +1167,7 @@
print STDERR " + the following IANA names do *not* have entries in the Map8 table:\n";
my %hiTried = ();
- foreach my $sIANA (sort values %MIBtoLONG)
+ foreach my $sIANA (sort values %hsLongnameOfMIB)
{
next if $hiTried{$sIANA};
print "$sIANA\n" unless defined &map8_charset_name($sIANA);
@@ -1187,18 +1194,18 @@
last INFINITE;
# debugging: huge dump:
- # &dumpHash('MIBtoLONG', \%MIBtoLONG);
- # &dumpHash('LONGtoMIB', \%LONGtoMIB);
- # &dumpHash('SHORTtoMIB', \%SHORTtoMIB);
- foreach (keys %SHORTtoMIB)
+ # &_dump_hash('hsLongnameOfMIB', \%hsLongnameOfMIB);
+ # &_dump_hash('hsMIBofLongname', \%hsMIBofLongname);
+ # &_dump_hash('hsMIBofShortname', \%hsMIBofShortname);
+ foreach (keys %hsMIBofShortname)
{
- print STDERR " + short_to_long($_) == ", &short_to_long($_) || 'undef', "\n";
+ print STDERR " + _short_to_long($_) == ", &_short_to_long($_) || 'undef', "\n";
} # foreach
last INFINITE;
} # while
-sub dumpHash
+sub _dump_hash
{
my ($sName, $rh) = @_;
print STDERR " + after initialization, $sName is:\n";
@@ -1206,7 +1213,7 @@
{
print STDERR " + $key => $$rh{$key}\n";
} # foreach
- } # dumpHash
+ } # _dump_hash
sub _init_data_extra
{
@@ -1233,15 +1240,14 @@
EBCDIC-FR === ebcdic-cp-fr
EBCDIC-IT === ebcdic-cp-it
EBCDIC-UK === ebcdic-cp-gb
-EBCDIC-US === ebcdic-cp-us
EBCDIC-FI-SE === ebcdic-cp-fi
UTF-7 === Unicode-2-0-utf-7
UTF-8 === Unicode-2-0-utf-8
Extended_UNIX_Code_Packed_Format_for_Japanese === euc === euc-jp
-# These were added for Unicode::MapUTF8:
+# These are for Unicode::MapUTF8:
ISO-10646-UCS-2 === ucs2
ISO-10646-UCS-4 === ucs4
-# These were added for iconv:
+# These are for iconv:
ISO-2022-JP === ISO-2022-JP-1
# These are for Encode:
IBM1047 === cp1047
@@ -1251,8 +1257,37 @@
JIS_C6226-1983 === jis0208-raw
JIS_X0212-1990 === jis0212-raw
KS_C_5601-1987 === ksc5601-raw
-# This is to workaround a bug in IANA's document:
-ECMA-cyrillic === KOI8-E
+CP037 === CP37
+cp863 === DOSCanadaF
+cp860 === DOSPortuguese
+cp869 === DOSGreek2
+koi8-r === cp878
+# These encodings are handled by Encode, but I don't know what they are:
+# ??? === AdobeZdingbats
+# ??? === MacArabic
+# ??? === MacCentralEurRoman
+# ??? === MacChineseSimp
+# ??? === MacChineseTrad
+# ??? === MacCroatian
+# ??? === MacCyrillic
+# ??? === MacDingbats
+# ??? === MacFarsi
+# ??? === MacGreek
+# ??? === MacHebrew
+# ??? === MacIcelandic
+# ??? === MacJapanese
+# ??? === MacKorean
+# ??? === MacRomanian
+# ??? === MacRumanian
+# ??? === MacSami
+# ??? === MacThai
+# ??? === MacTurkish
+# ??? === MacUkrainian
+# ??? === MacVietnamese
+# ??? === cp1006
+# ??? === dingbats
+# ??? === nextstep
+# ??? === posix-bc
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
} # _init_data_extra
@@ -1265,7 +1300,7 @@
===================================================================
CHARACTER SETS
-(last updated 2004-02-06)
+(last updated 28 January 2005)
These are the official names for character sets that may be used in
the Internet and may be referred to in Internet documentation. These
@@ -1299,13 +1334,17 @@
2000-2999 Vendor
The aliases that start with "cs" have been added for use with the
-Printer MIB (see RFC 1759) and contain the standard numbers along with
-suggestive names in order to facilitate applications that want to
-display the names in user interfaces. The "cs" stands for character
-set and is provided for applications that need a lower case first
-letter but want to use mixed case thereafter that cannot contain any
-special characters, such as underbar ("_") and dash ("-"). If the
-character set is from an ISO standard, its cs alias is the ISO
+IANA-CHARSET-MIB as originally defined in RFC3808, and as currently
+maintained by IANA at http://www/iana.org/assignments/ianacharset-mib.
+Note that the ianacharset-mib needs to be kept in sync with this
+registry. These aliases that start with "cs" contain the standard
+numbers along with suggestive names in order to facilitate applications
+that want to display the names in user interfaces. The "cs" stands
+for character set and is provided for applications that need a lower
+case first letter but want to use mixed case thereafter that cannot
+contain any special characters, such as underbar ("_") and dash ("-").
+
+If the character set is from an ISO standard, its cs alias is the ISO
standard number or name. If the character set is not from an ISO
standard, but is registered with ISO (IPSJ/ITSCJ is the current ISO
Registration Authority), the ISO Registry number is specified as
@@ -1776,7 +1815,7 @@
Source: ISO registry (formerly ECMA registry)
http://www.itscj.ipsj.jp/ISO-IR/111.pdf
Alias: iso-ir-111
-Alias: KO18-E
+Alias: KOI8-E
Alias: csISO111ECMACyrillic
Name: CSA_Z243.4-1985-1 [RFC1345,KXS2]
@@ -3131,3 +3170,4 @@
1;
__END__
+
Property changes on: packages/libi18n-charset-perl/trunk/lib/I18N/Charset.pm
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/libi18n-charset-perl/trunk/t/bug1.t
===================================================================
--- packages/libi18n-charset-perl/trunk/t/bug1.t 2005-12-28 13:49:20 UTC (rev 1783)
+++ packages/libi18n-charset-perl/trunk/t/bug1.t 2005-12-28 13:53:26 UTC (rev 1784)
@@ -1,3 +1,6 @@
+
+# $Id: bug1.t,v 1.5 2005/11/12 14:36:17 Daddy Exp $
+
use ExtUtils::testlib;
use Test::More;
unless (eval "require Encode")
@@ -14,3 +17,4 @@
'test literal -- big5');
__END__
+
Property changes on: packages/libi18n-charset-perl/trunk/t/bug1.t
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/libi18n-charset-perl/trunk/t/enco.t
===================================================================
--- packages/libi18n-charset-perl/trunk/t/enco.t 2005-12-28 13:49:20 UTC (rev 1783)
+++ packages/libi18n-charset-perl/trunk/t/enco.t 2005-12-28 13:53:26 UTC (rev 1784)
@@ -1,15 +1,17 @@
# enco.t - tests for "preferred ENCO name" functionality of I18N::Charset
+# $Id: enco.t,v 1.5 2005/11/12 14:45:08 Daddy Exp $
+
use ExtUtils::testlib;
-use Test::More;
-unless (eval "require Encode")
- {
- plan skip_all => 'Encode is not installed';
- } # unless
+use Test::More no_plan;
-plan tests => 25;
-&use_ok('I18N::Charset', 'enco_charset_name');
+use IO::Capture::Stderr;
+my $oICE = IO::Capture::Stderr->new;
+use strict;
+
+BEGIN { &use_ok('I18N::Charset') };
+
#================================================
# TESTS FOR enco routines
#================================================
@@ -22,37 +24,50 @@
ok(!defined enco_charset_name("junk"), 'junk argument');
ok(!defined enco_charset_name(999999), '999999 argument');
ok(!defined enco_charset_name(\@aa), 'arrayref argument');
+$oICE->start;
+ok(!defined I18N::Charset::add_enco_alias(undef => 'junk argument'));
+ok(!defined I18N::Charset::add_enco_alias('' => 'junk argument'));
+ok(!defined I18N::Charset::add_enco_alias("my-junk" => 'junk argument'));
+$oICE->stop;
-#---- some successful examples -----------------------------------------
-is(enco_charset_name("x-x-sjis"), enco_charset_name("Shift JIS"), 'x-x-sjis');
-is(enco_charset_name("x-ASCII"), "ascii", 'normal literal -- ASCII');
-is(enco_charset_name("S-JIS"), "shiftjis", 'normal -- G.B.K.');
-is(enco_charset_name("cp1251"), "cp1251", 'identity -- cp1251');
-is(enco_charset_name("IBM1047"), "cp1047", 'builtin alias -- cp1047');
-is(enco_charset_name("cs GB-2312"), "gb2312-raw", 'builtin alias -- gb2312-raw');
+SKIP:
+ {
+ skip 'Encode is not installed', 18 unless eval "require Encode";
-#---- some aliasing examples -----------------------------------------
-ok(!defined I18N::Charset::add_enco_alias("my-junk" => 'junk argument'));
-ok(I18N::Charset::add_enco_alias('my-japanese1' => 'jis0201-raw'));
-is(enco_charset_name("my-japanese1"),
- 'jis0201-raw',
- 'alias literal -- my-japanese1');
-is(enco_charset_name("my-japanese1"),
- enco_charset_name('jis-x-0201'),
- 'alias equal -- my-japanese1');
-ok(I18N::Charset::add_enco_alias('my-japanese2' => 'jis0208-raw'));
-is(enco_charset_name("my-japanese2"),
- enco_charset_name('cs ISO-87 JIS_X0208'), 'alias equal -- my-japanese2');
-ok(I18N::Charset::add_enco_alias('my-japanese3' => 'sjis'), 'set alias my-japanese3');
-is(enco_charset_name("my-japanese3"), 'shiftjis', 'alias literal -- my-japanese3');
-is(enco_charset_name("my-japanese3"),
- enco_charset_name('MS_KANJI'), 'alias equal -- my-japanese3');
-ok(I18N::Charset::add_enco_alias('my-japanese4' => 'my-japanese1'), 'alias-to-alias');
-is(enco_charset_name("my-japanese4"),
- enco_charset_name('my-japanese1'), 'alias equal -- my-japanese4');
-is(enco_charset_name("my-japanese4"),
- 'jis0201-raw', 'alias equal -- my-japanese4');
+ #---- some successful examples -----------------------------------------
+ is(enco_charset_name("x-x-sjis"), enco_charset_name("Shift JIS"), 'x-x-sjis');
+ is(enco_charset_name("x-ASCII"), "ascii", 'normal literal -- ASCII');
+ is(enco_charset_name("S-JIS"), "shiftjis", 'normal -- G.B.K.');
+ is(enco_charset_name("cp1251"), "cp1251", 'identity -- cp1251');
+ is(enco_charset_name("IBM1047"), "cp1047", 'builtin alias -- cp1047');
+ is(enco_charset_name("cp037"), "cp37", 'builtin alias -- cp37');
+ is(enco_charset_name("ebcdic-cp-us"), "cp37", 'builtin alias -- cp37');
+ is(enco_charset_name("windows-31-j"), "cp932", 'builtin alias -- cp932');
+ is(enco_charset_name("cs GB-2312"), "gb2312-raw", 'builtin alias -- gb2312-raw');
+ #---- some aliasing examples -----------------------------------------
+ ok(I18N::Charset::add_enco_alias('my-japanese1' => 'jis0201-raw'));
+ is(enco_charset_name("my-japanese1"),
+ 'jis0201-raw',
+ 'alias literal -- my-japanese1');
+ is(enco_charset_name("my-japanese1"),
+ enco_charset_name('jis-x-0201'),
+ 'alias equal -- my-japanese1');
+ ok(I18N::Charset::add_enco_alias('my-japanese2' => 'jis0208-raw'));
+ is(enco_charset_name("my-japanese2"),
+ enco_charset_name('cs ISO-87 JIS_X0208'), 'alias equal -- my-japanese2');
+ ok(I18N::Charset::add_enco_alias('my-japanese3' => 'sjis'), 'set alias my-japanese3');
+ is(enco_charset_name("my-japanese3"), 'shiftjis', 'alias literal -- my-japanese3');
+ is(enco_charset_name("my-japanese3"),
+ enco_charset_name('MS_KANJI'), 'alias equal -- my-japanese3');
+ ok(I18N::Charset::add_enco_alias('my-japanese4' => 'my-japanese1'), 'alias-to-alias');
+ is(enco_charset_name("my-japanese4"),
+ enco_charset_name('my-japanese1'), 'alias equal -- my-japanese4');
+ is(enco_charset_name("my-japanese4"),
+ 'jis0201-raw', 'alias equal -- my-japanese4');
+ } # end of SKIP block
+
exit 0;
__END__
+
Property changes on: packages/libi18n-charset-perl/trunk/t/enco.t
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/libi18n-charset-perl/trunk/t/iana.t
===================================================================
--- packages/libi18n-charset-perl/trunk/t/iana.t 2005-12-28 13:49:20 UTC (rev 1783)
+++ packages/libi18n-charset-perl/trunk/t/iana.t 2005-12-28 13:53:26 UTC (rev 1784)
@@ -1,8 +1,14 @@
-#!./perl
+# $Revision: 1.11 $
# iana.t - tests for Locale::Country
+use ExtUtils::testlib;
use Test::More tests => 27;
+use IO::Capture::Stderr;
+my $oICE = IO::Capture::Stderr->new;
+
+use strict;
+
BEGIN { use_ok('I18N::Charset') };
#================================================
@@ -33,10 +39,11 @@
ok(iana_charset_name("latin 10") eq "ISO-8859-16", 'latin 10');
#---- some aliasing examples -----------------------------------------
+$oICE->start;
ok(!defined(I18N::Charset::add_iana_alias("alias1" => "junk")), 'add alias1');
ok(!defined iana_charset_name("alias1"), 'alias1');
ok(!defined iana_charset_name("junk"), 'junk');
-
+$oICE->stop;
ok(I18N::Charset::add_iana_alias("alias2" => "Shift_JIS") eq "Shift_JIS", 'add alias2');
ok(iana_charset_name("alias2") eq "Shift_JIS", 'alias2');
@@ -44,6 +51,12 @@
ok(iana_charset_name("alias3") eq "Shift_JIS", '');
ok(iana_charset_name("sjis") eq "Shift_JIS", '');
+# Tests for coverage:
+my @asAll = I18N::Charset::all_iana_charset_names();
+my $iAll = scalar(@asAll);
+diag("There are $iAll IANA charset names registered");
+
exit 0;
__END__
+
Modified: packages/libi18n-charset-perl/trunk/t/libi.t
===================================================================
--- packages/libi18n-charset-perl/trunk/t/libi.t 2005-12-28 13:49:20 UTC (rev 1783)
+++ packages/libi18n-charset-perl/trunk/t/libi.t 2005-12-28 13:53:26 UTC (rev 1784)
@@ -1,31 +1,16 @@
# libi.t - tests for "preferred LIBI name" functionality of I18N::Charset
-use Test::More;
+# $Id: libi.t,v 1.10 2005/11/12 14:45:08 Daddy Exp $
-unless (eval "require App::Info::Lib::Iconv")
- {
- plan skip_all => 'App::Info::Lib::Iconv is not installed';
- } # unless
+use Test::More no_plan;
-my $oAILI = new App::Info::Lib::Iconv;
-unless (ref $oAILI)
- {
- plan skip_all => 'can not determine iconv version (not installed?)';
- } # unless
-if (! $oAILI->installed)
- {
- plan skip_all => 'iconv is not installed';
- } # if
-my $iLibiVersion = $oAILI->version || 0.0;
-# print STDERR " + libiconv version is $iLibiVersion\n";
-if ($iLibiVersion < 1.8)
- {
- plan skip_all => 'iconv version is too old(?)';
- } # if
-plan tests => 23;
+use IO::Capture::Stderr;
+my $oICE = IO::Capture::Stderr->new;
-&use_ok('I18N::Charset');
+use strict;
+BEGIN { use_ok('I18N::Charset') };
+
#================================================
# TESTS FOR libi routines
#================================================
@@ -38,27 +23,50 @@
ok(!defined libi_charset_name("junk"), 'junk argument');
ok(!defined libi_charset_name(999999), '999999 argument');
ok(!defined libi_charset_name(\@aa), 'arrayref argument');
+$oICE->start;
+ok(!defined I18N::Charset::add_libi_alias("my-junk" => 'junk argument'));
+$oICE->stop;
-#---- some successful examples -----------------------------------------
-is(libi_charset_name("x-x-sjis"), libi_charset_name("MS_KANJI"), 'x-x-sjis');
-is(libi_charset_name("x-x-sjis"), "MS_KANJI", 'normal literal -- x-x-sjis');
-is(libi_charset_name("G.B.K."), "CP936", 'normal -- G.B.K.');
-is(libi_charset_name("CP936"), "CP936", 'identity -- CP936');
-is(libi_charset_name("Johab"), "CP1361", 'normal -- Johab');
-is(libi_charset_name("johab"), libi_charset_name("cp 1361"), 'equivalent -- johab');
+SKIP:
+ {
+ skip 'App::Info::Lib::Iconv is not installed', 16 unless eval "require App::Info::Lib::Iconv";
+ my $oAILI = new App::Info::Lib::Iconv;
+ SKIP:
+ {
+ skip 'can not determine iconv version (not installed?)', 16 unless ref $oAILI;
+ SKIP:
+ {
+ skip 'iconv is not installed', 16 unless $oAILI->installed;
+ my $iLibiVersion = $oAILI->version || 0.0;
+ # print STDERR " + libiconv version is $iLibiVersion\n";
+ SKIP:
+ {
+ skip 'iconv version is too old(?)', 16 if ($iLibiVersion < 1.8);
-#---- some aliasing examples -----------------------------------------
-ok(!defined I18N::Charset::add_libi_alias("my-junk" => 'junk argument'));
-ok(I18N::Charset::add_libi_alias('my-chinese1' => 'CN-GB'));
-is(libi_charset_name("my-chinese1"), 'CN-GB', 'alias literal -- my-chinese1');
-is(libi_charset_name("my-chinese1"), libi_charset_name('EUC-CN'), 'alias equal -- my-chinese1');
-ok(I18N::Charset::add_libi_alias('my-chinese2' => 'EUC-CN'));
-is(libi_charset_name("my-chinese2"), 'CN-GB', 'alias literal -- my-chinese2');
-is(libi_charset_name("my-chinese2"), libi_charset_name('G.B.2312'), 'alias equal -- my-chinese2');
-ok(I18N::Charset::add_libi_alias('my-japanese' => 'x-x-sjis'));
-is(libi_charset_name("my-japanese"), 'MS_KANJI', 'alias literal -- my-japanese');
-is(libi_charset_name("my-japanese"), libi_charset_name('Shift_JIS'), 'alias equal -- my-japanese');
+ #---- some successful examples -----------------------------------------
+ is(libi_charset_name("x-x-sjis"), libi_charset_name("MS_KANJI"), 'x-x-sjis');
+ is(libi_charset_name("x-x-sjis"), "MS_KANJI", 'normal literal -- x-x-sjis');
+ is(libi_charset_name("G.B.K."), "CP936", 'normal -- G.B.K.');
+ is(libi_charset_name("CP936"), "CP936", 'identity -- CP936');
+ is(libi_charset_name("Johab"), "CP1361", 'normal -- Johab');
+ is(libi_charset_name("johab"), libi_charset_name("cp 1361"), 'equivalent -- johab');
+ #---- some aliasing examples -----------------------------------------
+ ok(I18N::Charset::add_libi_alias('my-chinese1' => 'CN-GB'));
+ is(libi_charset_name("my-chinese1"), 'CN-GB', 'alias literal -- my-chinese1');
+ is(libi_charset_name("my-chinese1"), libi_charset_name('EUC-CN'), 'alias equal -- my-chinese1');
+ ok(I18N::Charset::add_libi_alias('my-chinese2' => 'EUC-CN'));
+ is(libi_charset_name("my-chinese2"), 'CN-GB', 'alias literal -- my-chinese2');
+ is(libi_charset_name("my-chinese2"), libi_charset_name('G.B.2312'), 'alias equal -- my-chinese2');
+ ok(I18N::Charset::add_libi_alias('my-japanese' => 'x-x-sjis'));
+ is(libi_charset_name("my-japanese"), 'MS_KANJI', 'alias literal -- my-japanese');
+ is(libi_charset_name("my-japanese"), libi_charset_name('Shift_JIS'), 'alias equal -- my-japanese');
+ }
+ }
+ }
+ }
+
exit 0;
__END__
+
Property changes on: packages/libi18n-charset-perl/trunk/t/libi.t
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/libi18n-charset-perl/trunk/t/map8.t
===================================================================
--- packages/libi18n-charset-perl/trunk/t/map8.t 2005-12-28 13:49:20 UTC (rev 1783)
+++ packages/libi18n-charset-perl/trunk/t/map8.t 2005-12-28 13:53:26 UTC (rev 1784)
@@ -1,21 +1,16 @@
-#!./perl
-#
# map8.t - tests for Unicode::Map8 functionality of I18N::Charset
-#
-use I18N::Charset;
-use Test::More;
+# $Id: map8.t,v 1.12 2005/11/12 14:45:09 Daddy Exp $
-if (eval "require Unicode::Map8")
- {
- plan tests => 23;
- }
-else
- {
- plan skip_all => 'Unicode::Map8 is not installed';
- } # unless
+use Test::More no_plan;
+use IO::Capture::Stderr;
+my $oICE = IO::Capture::Stderr->new;
+use strict;
+
+BEGIN { use_ok('I18N::Charset') };
+
#================================================
# TESTS FOR map8 routines
#================================================
@@ -27,34 +22,41 @@
ok(!defined map8_charset_name(""), ''); # empty argument
ok(!defined map8_charset_name("junk"), ''); # illegal code
ok(!defined map8_charset_name(\@aa), ''); # illegal argument
+$oICE->start;
+ok(!defined(I18N::Charset::add_map8_alias("alias1" => "junk")), '');
+$oICE->stop;
+ok(!defined map8_charset_name("alias1"), '');
-#---- some successful examples -----------------------------------------
-ok(map8_charset_name("ASMO_449") eq "ASMO_449", '');
-ok(map8_charset_name("ISO_9036") eq "ASMO_449", '');
-ok(map8_charset_name("arabic7") eq "ASMO_449", '');
-ok(map8_charset_name("iso-ir-89") eq "ASMO_449", '');
-ok(map8_charset_name("ISO-IR-89") eq "ASMO_449", '');
-ok(map8_charset_name("ISO - ir _ 89") eq "ASMO_449", '');
+SKIP:
+ {
+ skip 'Unicode::Map8 is not installed', 16 unless eval "require Unicode::Map8";
-#---- an iana example that ONLY works with Unicode::Map8 installed -----
-ok(iana_charset_name("cp1251") eq "windows-1251", '');
+ #---- some successful examples -----------------------------------------
+ ok(map8_charset_name("ASMO_449") eq "ASMO_449", '');
+ ok(map8_charset_name("ISO_9036") eq "ASMO_449", '');
+ ok(map8_charset_name("arabic7") eq "ASMO_449", '');
+ ok(map8_charset_name("iso-ir-89") eq "ASMO_449", '');
+ ok(map8_charset_name("ISO-IR-89") eq "ASMO_449", '');
+ ok(map8_charset_name("ISO - ir _ 89") eq "ASMO_449", '');
-#---- some aliasing examples -------------------------------------------
-ok(!defined(I18N::Charset::add_map8_alias("alias1" => "junk")), '');
-ok(!defined map8_charset_name("alias1"), '');
+ #---- an iana example that ONLY works with Unicode::Map8 installed -----
+ ok(iana_charset_name("cp1251") eq "windows-1251", '');
-ok(I18N::Charset::add_map8_alias("alias2" => "ES2") eq "ES2", '');
-ok(map8_charset_name("alias2") eq "ES2", '');
+ #---- some aliasing examples -------------------------------------------
+ ok(I18N::Charset::add_map8_alias("alias2" => "ES2") eq "ES2", '');
+ ok(map8_charset_name("alias2") eq "ES2", '');
-ok(I18N::Charset::add_map8_alias("alias3" => "iso-ir-85") eq "ES2", '');
-ok(map8_charset_name("alias3") eq "ES2", '');
+ ok(I18N::Charset::add_map8_alias("alias3" => "iso-ir-85") eq "ES2", '');
+ ok(map8_charset_name("alias3") eq "ES2", '');
-ok(map8_charset_name("Ebcdic cp FI") eq "IBM278", '');
-ok(map8_charset_name("IBM278") eq "IBM278", '');
-ok(I18N::Charset::add_map8_alias("my278" => "IBM278") eq "IBM278", '');
-ok(map8_charset_name("My 278") eq "IBM278", '');
-ok(map8_charset_name("cp278") eq "IBM278", '');
+ ok(map8_charset_name("Ebcdic cp FI") eq "IBM278", '');
+ ok(map8_charset_name("IBM278") eq "IBM278", '');
+ ok(I18N::Charset::add_map8_alias("my278" => "IBM278") eq "IBM278", '');
+ ok(map8_charset_name("My 278") eq "IBM278", '');
+ ok(map8_charset_name("cp278") eq "IBM278", '');
+ } # end of SKIP block
exit 0;
__END__
+
Modified: packages/libi18n-charset-perl/trunk/t/mib.t
===================================================================
--- packages/libi18n-charset-perl/trunk/t/mib.t 2005-12-28 13:49:20 UTC (rev 1783)
+++ packages/libi18n-charset-perl/trunk/t/mib.t 2005-12-28 13:53:26 UTC (rev 1784)
@@ -1,52 +1,53 @@
-# mib.t - Tests for converting mib numbers back to charset names
-
-use Test::More tests => 25;
-BEGIN { use_ok('I18N::Charset') };
-
-#================================================
-# TESTS FOR mib routine
-#================================================
-
-#---- selection of examples which should all result in undef -----------
-ok(!defined mib_charset_name()); # no argument
-ok(!defined mib_charset_name(undef)); # undef argument
-ok(!defined mib_charset_name("")); # empty argument
-ok(!defined mib_charset_name("junk")); # illegal code
-ok(!defined mib_charset_name(9999999)); # illegal code
-ok(!defined mib_charset_name("None")); # "None" appears as an Alias
- # in the data but should be
- # ignored
-my @aa;
-ok(!defined mib_charset_name(\@aa)); # illegal argument
-
-# The same things, in the opposite direction:
-ok(!defined charset_name_to_mib()); # no argument
-ok(!defined charset_name_to_mib(undef)); # undef argument
-ok(!defined charset_name_to_mib("")); # empty argument
-ok(!defined charset_name_to_mib("junk")); # illegal code
-ok(!defined charset_name_to_mib(9999999)); # illegal code
-ok(!defined charset_name_to_mib("None")); # "None" appears as an
- # Alias in the data but
- # should be ignored
-ok(!defined charset_name_to_mib(\@aa)); # illegal argument
-
- #---- some successful examples -----------------------------------------
-ok(mib_charset_name("3") eq "ANSI_X3.4-1968");
-ok(mib_charset_name("106") eq "UTF-8");
-ok(mib_to_charset_name("1015") eq "UTF-16");
-ok(mib_to_charset_name("17") eq "Shift_JIS");
-
-# The same things, in the opposite direction:
-ok(charset_name_to_mib("ecma cyrillic") eq '77');
-ok(charset_name_to_mib("UTF-8") == 106);
-ok(charset_name_to_mib("UTF-16") == 1015);
-ok(charset_name_to_mib('s h i f t j i s') eq '17');
-
-# This is the FIRST entry in the IANA list:
-ok(charset_name_to_mib("ANSI_X3.4-1968") eq '3');
-# This is the LAST entry in the IANA list:
-ok(charset_name_to_mib('hz gb 2312') == 2085);
-
-exit 0;
-
-__END__
+# $Revision: 1.4 $
+# mib.t - Tests for converting mib numbers back to charset names
+
+use Test::More tests => 25;
+BEGIN { use_ok('I18N::Charset') };
+
+#================================================
+# TESTS FOR mib routine
+#================================================
+
+#---- selection of examples which should all result in undef -----------
+ok(!defined mib_charset_name()); # no argument
+ok(!defined mib_charset_name(undef)); # undef argument
+ok(!defined mib_charset_name("")); # empty argument
+ok(!defined mib_charset_name("junk")); # illegal code
+ok(!defined mib_charset_name(9999999)); # illegal code
+ok(!defined mib_charset_name("None")); # "None" appears as an Alias
+ # in the data but should be
+ # ignored
+my @aa;
+ok(!defined mib_charset_name(\@aa)); # illegal argument
+
+# The same things, in the opposite direction:
+ok(!defined charset_name_to_mib()); # no argument
+ok(!defined charset_name_to_mib(undef)); # undef argument
+ok(!defined charset_name_to_mib("")); # empty argument
+ok(!defined charset_name_to_mib("junk")); # illegal code
+ok(!defined charset_name_to_mib(9999999)); # illegal code
+ok(!defined charset_name_to_mib("None")); # "None" appears as an
+ # Alias in the data but
+ # should be ignored
+ok(!defined charset_name_to_mib(\@aa)); # illegal argument
+
+ #---- some successful examples -----------------------------------------
+ok(mib_charset_name("3") eq "ANSI_X3.4-1968");
+ok(mib_charset_name("106") eq "UTF-8");
+ok(mib_to_charset_name("1015") eq "UTF-16");
+ok(mib_to_charset_name("17") eq "Shift_JIS");
+
+# The same things, in the opposite direction:
+ok(charset_name_to_mib("ecma cyrillic") eq '77');
+ok(charset_name_to_mib("UTF-8") == 106);
+ok(charset_name_to_mib("UTF-16") == 1015);
+ok(charset_name_to_mib('s h i f t j i s') eq '17');
+
+# This is the FIRST entry in the IANA list:
+ok(charset_name_to_mib("ANSI_X3.4-1968") eq '3');
+# This is the LAST entry in the IANA list:
+ok(charset_name_to_mib('hz gb 2312') == 2085);
+
+exit 0;
+
+__END__
Property changes on: packages/libi18n-charset-perl/trunk/t/mib.t
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/libi18n-charset-perl/trunk/t/mime.t
===================================================================
--- packages/libi18n-charset-perl/trunk/t/mime.t 2005-12-28 13:49:20 UTC (rev 1783)
+++ packages/libi18n-charset-perl/trunk/t/mime.t 2005-12-28 13:53:26 UTC (rev 1784)
@@ -1,3 +1,4 @@
+# $Id: mime.t,v 1.5 2005/09/01 03:09:45 Daddy Exp $
# mime.t - tests for "preferred MIME name" functionality of I18N::Charset
use Test::More tests => 14;
@@ -30,3 +31,5 @@
exit 0;
__END__
+
+
Property changes on: packages/libi18n-charset-perl/trunk/t/mime.t
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/libi18n-charset-perl/trunk/t/umap.t
===================================================================
--- packages/libi18n-charset-perl/trunk/t/umap.t 2005-12-28 13:49:20 UTC (rev 1783)
+++ packages/libi18n-charset-perl/trunk/t/umap.t 2005-12-28 13:53:26 UTC (rev 1784)
@@ -1,48 +1,51 @@
-#
-# umap.t - tests for Unicode::Map functionality of I18N::Charset
-#
-
-use I18N::Charset;
-use Test::More;
-
-if (eval "require Unicode::Map")
- {
- plan tests => 16;
- }
-else
- {
- plan skip_all => 'Unicode::Map is not installed';
- } # unless
-
-#================================================
-# TESTS FOR umap routines
-#================================================
-
-my @aa;
-#---- selection of examples which should all result in undef -----------
-ok(!defined umap_charset_name(), 'no argument');
-ok(!defined umap_charset_name(undef), 'undef argument');
-ok(!defined umap_charset_name(""), 'empty argument');
-ok(!defined umap_charset_name("junk"), 'junk argument');
-ok(!defined umap_charset_name(999999), '999999 argument');
-ok(!defined umap_charset_name(\@aa), 'arrayref argument');
-
-#---- some successful examples -----------------------------------------
-ok(umap_charset_name("apple symbol") eq "APPLE-SYMBOL", 'dummy mib');
-ok(umap_charset_name("Adobe Ding Bats") eq "ADOBE-DINGBATS", 'dummy mib');
-ok(umap_charset_name("cs IBM-037") eq "CP037", 'same as iana');
-ok(umap_charset_name("CP037") eq "CP037", 'identical');
-
-#---- some aliasing examples -------------------------------------------
-ok(!defined(I18N::Charset::add_umap_alias("alias1" => "junk")), 'add alias1');
-ok(!defined umap_charset_name("alias1"), 'alias1');
-
-ok(I18N::Charset::add_umap_alias("alias2" => "IBM775") eq "CP775", 'add alias2');
-ok(umap_charset_name("alias2") eq "CP775", 'alias2');
-
-ok(I18N::Charset::add_umap_alias("alias3" => "alias2") eq "CP775", 'add alias3');
-ok(umap_charset_name("alias3") eq "CP775", 'alias3');
-
-exit 0;
-
-__END__
+# umap.t - tests for Unicode::Map functionality of I18N::Charset
+
+# $Id: umap.t,v 1.8 2005/11/12 14:45:09 Daddy Exp $
+
+use I18N::Charset;
+use Test::More no_plan;
+
+use IO::Capture::Stderr;
+my $oICE = IO::Capture::Stderr->new;
+
+use strict;
+
+#================================================
+# TESTS FOR umap routines
+#================================================
+
+my @aa;
+#---- selection of examples which should all result in undef -----------
+ok(!defined umap_charset_name(), 'no argument');
+ok(!defined umap_charset_name(undef), 'undef argument');
+ok(!defined umap_charset_name(""), 'empty argument');
+ok(!defined umap_charset_name("junk"), 'junk argument');
+ok(!defined umap_charset_name(999999), '999999 argument');
+ok(!defined umap_charset_name(\@aa), 'arrayref argument');
+$oICE->start;
+ok(!defined(I18N::Charset::add_umap_alias("alias1" => "junk")), '+alias1');
+$oICE->stop;
+ok(!defined umap_charset_name("alias1"), '=alias1');
+
+SKIP:
+ {
+ skip 'Unicode::Map is not installed', 8 unless eval "require Unicode::Map";
+
+ #---- some successful examples -----------------------------------------
+ ok(umap_charset_name("apple symbol") eq "APPLE-SYMBOL", 'dummy mib');
+ ok(umap_charset_name("Adobe Ding Bats") eq "ADOBE-DINGBATS", 'dummy mib');
+ ok(umap_charset_name("cs IBM-037") eq "CP037", 'same as iana');
+ ok(umap_charset_name("CP037") eq "CP037", 'identical');
+
+ #---- some aliasing examples -------------------------------------------
+ ok(I18N::Charset::add_umap_alias("alias2" => "IBM775") eq "CP775", '+alias2');
+ ok(umap_charset_name("alias2") eq "CP775", '=alias2');
+
+ ok(I18N::Charset::add_umap_alias("alias3" => "alias2") eq "CP775", '+alias3');
+ ok(umap_charset_name("alias3") eq "CP775", '=alias3');
+ } # end of SKIP block
+
+exit 0;
+
+__END__
+
Property changes on: packages/libi18n-charset-perl/trunk/t/umap.t
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/libi18n-charset-perl/trunk/t/utf8.t
===================================================================
--- packages/libi18n-charset-perl/trunk/t/utf8.t 2005-12-28 13:49:20 UTC (rev 1783)
+++ packages/libi18n-charset-perl/trunk/t/utf8.t 2005-12-28 13:53:26 UTC (rev 1784)
@@ -1,79 +1,76 @@
-# utf8.t - tests for Unicode::MapUTF8 functionality of I18N::Charset
-
-use Test::More;
-
-use strict;
-
-BEGIN
- {
- unless (eval "require Unicode::MapUTF8")
- {
- plan skip_all => 'Unicode::MapUTF8 is not installed';
- } # unless
- plan tests => 22;
- } # BEGIN
-
-BEGIN { use_ok('I18N::Charset') };
-
-# These should fail gracefully:
-my @aa;
-ok(!defined umu8_charset_name(), ''); # no argument
-ok(!defined umu8_charset_name(undef), ''); # undef argument
-ok(!defined umu8_charset_name(""), ''); # empty argument
-ok(!defined umu8_charset_name("junk"), ''); # illegal code
-ok(!defined umu8_charset_name(\@aa), ''); # illegal argument
-
-SKIP:
- {
- skip 'Unicode::MapUTF8 version is too old (1.09 is good)', 16 unless eval '(1.08 < ($Unicode::MapUTF8::VERSION || 0))';
-
- # Plain old IANA names:
- ok(umu8_charset_name("Unicode-2-0-utf-8") eq "utf8", 'Unicode-2-0-utf-8');
- ok(umu8_charset_name("UCS-2") eq "ucs2", 'UCS-2');
- ok(umu8_charset_name("U.C.S. 4") eq "ucs4", 'U.C.S. 4');
- SKIP:
- {
- skip 'Unicode::Map is not installed', 2 unless eval 'require Unicode::Map';
- # Unicode::Map aliases:
- # Unicode::Map names with dummy mib:
- ok(umu8_charset_name("Adobe Ding Bats") eq "ADOBE-DINGBATS", 'Adobe Ding Bats');
- ok(umu8_charset_name("M.S. Turkish") eq "MS-TURKISH", 'M.S. Turkish');
- } # SKIP block for Unicode::Map8 module
- SKIP:
- {
- skip 'Unicode::Map8 is not installed', 7 unless eval 'require Unicode::Map8';
- # Unicode::Map8 aliases:
- ok(umu8_charset_name("Windows-1-2-5-1") eq "windows-1251", 'Windows-1-2-5-1');
- ok(umu8_charset_name("cp1252") eq "windows-1252", 'cp1252');
- ok(umu8_charset_name("win-latin-1") eq "windows-1252", 'win-latin-1');
- ok(umu8_charset_name("windows-1252") ne "cp1253", 'windows-1252');
- ok(umu8_charset_name("cp1253") eq "windows-1253", 'cp1253');
- # Unicode::Map8 names with dummy mib:
- ok(umu8_charset_name("Adobe Zapf Ding Bats") eq "Adobe-Zapf-Dingbats", 'Adobe Zapf Ding Bats');
- ok(umu8_charset_name(" c p 1 0 0 7 9 ") eq "cp10079", ' c p 1 0 0 7 9 ');
- } # SKIP block for Unicode::Map8 module
- SKIP:
- {
- skip 'Jcode is not installed', 4 unless eval 'require Jcode';
- ok(umu8_charset_name("Shift_JIS") eq "sjis", 'Shift_JIS');
- ok(umu8_charset_name("sjis") eq "sjis", 'sjis');
- ok(umu8_charset_name("x-sjis") eq "sjis", 'x-sjis');
- ok(umu8_charset_name("x-x-sjis") eq "sjis", 'x-x-sjis');
- } # SKIP block for Jcode module
- } # SKIP block for VERSION of Unicode::Map8 module
-
-exit 0;
-
-my @as = &Unicode::MapUTF8::utf8_supported_charset();
-my @TESTS = map { 'defined iana_charset_name("'. $_ .'")' } @as;
-
-plan tests => scalar(@TESTS);
-
-foreach (@TESTS)
- {
- ok($_);
- } # foreach
-
-exit 0;
-
-__END__
+# $Revision: 1.7 $
+# utf8.t - tests for Unicode::MapUTF8 functionality of I18N::Charset
+
+use Test::More no_plan;
+
+use strict;
+
+BEGIN { use_ok('I18N::Charset') };
+
+# These should fail gracefully:
+my @aa;
+ok(!defined umu8_charset_name(), ''); # no argument
+ok(!defined umu8_charset_name(undef), ''); # undef argument
+ok(!defined umu8_charset_name(""), ''); # empty argument
+ok(!defined umu8_charset_name("junk"), ''); # illegal code
+ok(!defined umu8_charset_name(\@aa), ''); # illegal argument
+
+SKIP:
+ {
+ skip 'Unicode::MapUTF8 is not installed', 16 unless eval "require Unicode::MapUTF8";
+
+ SKIP:
+ {
+ skip 'Unicode::MapUTF8 version is too old (1.09 is good)', 16 unless eval '(1.08 < ($Unicode::MapUTF8::VERSION || 0))';
+
+ # Plain old IANA names:
+ ok(umu8_charset_name("Unicode-2-0-utf-8") eq "utf8", 'Unicode-2-0-utf-8');
+ ok(umu8_charset_name("UCS-2") eq "ucs2", 'UCS-2');
+ ok(umu8_charset_name("U.C.S. 4") eq "ucs4", 'U.C.S. 4');
+ SKIP:
+ {
+ skip 'Unicode::Map is not installed', 2 unless eval 'require Unicode::Map';
+ # Unicode::Map aliases:
+ # Unicode::Map names with dummy mib:
+ ok(umu8_charset_name("Adobe Ding Bats") eq "ADOBE-DINGBATS", 'Adobe Ding Bats');
+ ok(umu8_charset_name("M.S. Turkish") eq "MS-TURKISH", 'M.S. Turkish');
+ } # SKIP block for Unicode::Map8 module
+ SKIP:
+ {
+ skip 'Unicode::Map8 is not installed', 7 unless eval 'require Unicode::Map8';
+ # Unicode::Map8 aliases:
+ ok(umu8_charset_name("Windows-1-2-5-1") eq "cp1251", 'windows-1-2-5-1');
+ ok(umu8_charset_name("windows-1252") eq "cp1252", 'windows-1252 eq');
+ ok(umu8_charset_name("win-latin-1") eq "cp1252", 'win-latin-1');
+ ok(umu8_charset_name("windows-1252") ne "cp1253", 'windows-1252 ne');
+ ok(umu8_charset_name("windows-1253") eq "cp1253", 'windows-1253');
+ # Unicode::Map8 names with dummy mib:
+ ok(umu8_charset_name("Adobe Zapf Ding Bats") eq "Adobe-Zapf-Dingbats", 'Adobe Zapf Ding Bats');
+ ok(umu8_charset_name(" c p 1 0 0 7 9 ") eq "cp10079", ' c p 1 0 0 7 9 ');
+ } # SKIP block for Unicode::Map8 module
+ SKIP:
+ {
+ skip 'Jcode is not installed', 4 unless eval 'require Jcode';
+ ok(umu8_charset_name("Shift_JIS") eq "sjis", 'Shift_JIS');
+ ok(umu8_charset_name("sjis") eq "sjis", 'sjis');
+ ok(umu8_charset_name("x-sjis") eq "sjis", 'x-sjis');
+ ok(umu8_charset_name("x-x-sjis") eq "sjis", 'x-x-sjis');
+ } # SKIP block for Jcode module
+ } # SKIP block for VERSION of Unicode::MapUTF8 module
+ } # SKIP block for existence of Unicode::MapUTF8 module
+
+exit 0;
+
+my @as = &Unicode::MapUTF8::utf8_supported_charset();
+my @TESTS = map { 'defined iana_charset_name("'. $_ .'")' } @as;
+
+plan tests => scalar(@TESTS);
+
+foreach (@TESTS)
+ {
+ ok($_);
+ } # foreach
+
+exit 0;
+
+__END__
Property changes on: packages/libi18n-charset-perl/trunk/t/utf8.t
___________________________________________________________________
Name: svn:executable
+ *
More information about the Pkg-perl-cvs-commits
mailing list