summaryrefslogtreecommitdiff
path: root/cpan
diff options
context:
space:
mode:
authorChris 'BinGOs' Williams <chris@bingosnet.co.uk>2013-05-30 17:16:14 +0100
committerChris 'BinGOs' Williams <chris@bingosnet.co.uk>2013-05-30 17:47:43 +0100
commit83aea42c35461c43421a52f925ba2757fe31d211 (patch)
tree146018c57bdea0ae88973938c3ec9adb5a92378c /cpan
parent3b4fbbca1235aae94be865802dcd4899232efd82 (diff)
downloadperl-83aea42c35461c43421a52f925ba2757fe31d211.tar.gz
Update Text-Tabs to CPAN version 2013.0523
[DELTA] = 2013/05/23 Change module 'NAME' = 2013/05/22 Typos = 2013/04/26 Minor test suite fixes - bug 81698. Fixed bug 79766 -- an extraneous "=" in a regex. Changed the license to qualify as an "open source" license.
Diffstat (limited to 'cpan')
-rw-r--r--cpan/Text-Tabs/CHANGELOG16
-rw-r--r--cpan/Text-Tabs/lib/Text/Tabs.pm12
-rw-r--r--cpan/Text-Tabs/lib/Text/Wrap.pm11
-rw-r--r--cpan/Text-Tabs/t/79766.t18
-rw-r--r--cpan/Text-Tabs/t/Tabs-ElCid.t4
-rw-r--r--cpan/Text-Tabs/t/Wrap-JLB.t2
6 files changed, 49 insertions, 14 deletions
diff --git a/cpan/Text-Tabs/CHANGELOG b/cpan/Text-Tabs/CHANGELOG
index e72f6db29e..a3c6af8fa6 100644
--- a/cpan/Text-Tabs/CHANGELOG
+++ b/cpan/Text-Tabs/CHANGELOG
@@ -1,4 +1,20 @@
+= 2013/05/23
+
+Change module 'NAME'
+
+= 2013/05/22
+
+Typos
+
+= 2013/04/26
+
+Minor test suite fixes - bug 81698.
+
+Fixed bug 79766 -- an extraneous "=" in a regex.
+
+Changed the license to qualify as an "open source" license.
+
= 2012/08/18
Packaging fix.
diff --git a/cpan/Text-Tabs/lib/Text/Tabs.pm b/cpan/Text-Tabs/lib/Text/Tabs.pm
index 34d81ab8b7..07fe2b8b02 100644
--- a/cpan/Text-Tabs/lib/Text/Tabs.pm
+++ b/cpan/Text-Tabs/lib/Text/Tabs.pm
@@ -1,4 +1,3 @@
-
package Text::Tabs;
require Exporter;
@@ -7,7 +6,7 @@ require Exporter;
@EXPORT = qw(expand unexpand $tabstop);
use vars qw($VERSION $SUBVERSION $tabstop $debug);
-$VERSION = 2012.0818;
+$VERSION = 2013.0523;
$SUBVERSION = 'modern';
use strict;
@@ -157,7 +156,7 @@ C<local($Text::Tabs::tabstop)>.
print unexpand $_;
}
-Instead of the shell's C<expand> comand, use:
+Instead of the shell's C<expand> command, use:
perl -MText::Tabs -n -e 'print expand $_'
@@ -186,7 +185,8 @@ or otherwise deal with any other zero-, half-, and full-width characters.
Copyright (C) 1996-2002,2005,2006 David Muir Sharnoff.
Copyright (C) 2005 Aristotle Pagaltzis
-Copyright (C) 2012 Google, Inc.
+Copyright (C) 2012-2013 Google, Inc.
This module may be modified, used, copied, and redistributed at your own risk.
-Publicly redistributed modified versions must use a different name.
-
+Although allowed by the preceding license, please do not publicly
+redistribute modified versions of this code with the name "Text::Tabs"
+unless it passes the unmodified Text::Tabs test suite.
diff --git a/cpan/Text-Tabs/lib/Text/Wrap.pm b/cpan/Text-Tabs/lib/Text/Wrap.pm
index 1b40ab4f2b..db0d15f610 100644
--- a/cpan/Text-Tabs/lib/Text/Wrap.pm
+++ b/cpan/Text-Tabs/lib/Text/Wrap.pm
@@ -7,7 +7,7 @@ require Exporter;
@EXPORT = qw(wrap fill);
@EXPORT_OK = qw($columns $break $huge);
-$VERSION = 2012.0818;
+$VERSION = 2013.0523;
$SUBVERSION = 'modern';
use 5.010_000;
@@ -64,7 +64,7 @@ sub wrap
? unexpand($nl . $lead . $1)
: $nl . $lead . $1;
$remainder = $2;
- } elsif ($huge eq 'wrap' && $t =~ /\G((?:(?!=[^\n])\X){$ll})/gc) {
+ } elsif ($huge eq 'wrap' && $t =~ /\G((?:(?=[^\n])\X){$ll})/gc) {
$r .= $unexpand
? unexpand($nl . $lead . $1)
: $nl . $lead . $1;
@@ -293,7 +293,8 @@ many many others.
=head1 LICENSE
Copyright (C) 1996-2009 David Muir Sharnoff.
-Copyright (C) 2012 Google, Inc.
+Copyright (C) 2012-2013 Google, Inc.
This module may be modified, used, copied, and redistributed at your own risk.
-Publicly redistributed modified versions must use a different name.
-
+Although allowed by the preceding license, please do not publicly
+redistribute modified versions of this code with the name "Text::Wrap"
+unless it passes the unmodified Text::Wrap test suite.
diff --git a/cpan/Text-Tabs/t/79766.t b/cpan/Text-Tabs/t/79766.t
new file mode 100644
index 0000000000..cc579b2c97
--- /dev/null
+++ b/cpan/Text-Tabs/t/79766.t
@@ -0,0 +1,18 @@
+#!/usr/bin/perl -I.
+
+use warnings;
+use strict;
+use Text::Wrap;
+use Test::More tests => 2;
+
+my $r;
+my $s = q{xx xxxxxxxx xxxxxxxxx xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=xxxxxxxxxxxxxxxxxxxxxxxx};
+
+eval { $r = wrap("", "", $s) };
+ok(! $@, $@);
+is($r, "xx xxxxxxxx xxxxxxxxx xx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=xxxxxxxxxxxxx
+xxxxxxxxxxx", "match");
+
diff --git a/cpan/Text-Tabs/t/Tabs-ElCid.t b/cpan/Text-Tabs/t/Tabs-ElCid.t
index 32572e7661..79e265d4db 100644
--- a/cpan/Text-Tabs/t/Tabs-ElCid.t
+++ b/cpan/Text-Tabs/t/Tabs-ElCid.t
@@ -2,7 +2,7 @@
BEGIN {
if ($] <= 5.010) {
- print "1..0 # skip this test requires perl 5.010 or greater\n";
+ print "1..0 # skip this test requires perl 5.010 or greater ($])\n";
exit 0;
}
}
@@ -105,8 +105,8 @@ sub check($$$$) {
sub check_data {
- local $_;
binmode(DATA, ":utf8") || die "can't binmode DATA to utf8: $!";
+ local($_);
while ( <DATA> ) {
my $bad = 0;
diff --git a/cpan/Text-Tabs/t/Wrap-JLB.t b/cpan/Text-Tabs/t/Wrap-JLB.t
index 67163e2a70..f3d655ade5 100644
--- a/cpan/Text-Tabs/t/Wrap-JLB.t
+++ b/cpan/Text-Tabs/t/Wrap-JLB.t
@@ -87,7 +87,7 @@ sub check($$$$) {
sub check_data {
binmode(DATA, ":utf8") || die "can't binmode DATA to utf8: $!";
- local $_;
+ local($_);
while ( <DATA> ) {
my $bad = 0;