diff options
author | Chris 'BinGOs' Williams <chris@bingosnet.co.uk> | 2013-05-24 20:45:36 +0100 |
---|---|---|
committer | Chris 'BinGOs' Williams <chris@bingosnet.co.uk> | 2013-05-24 21:37:44 +0100 |
commit | cb1974ba967c78b8c4c5124d5b470405af5b8541 (patch) | |
tree | 505b4d4e3fcfeee9499ac24f5f8c824a5d129d65 /cpan | |
parent | 5b9c51566def4f7f9229c13bb00b03103aa4fae8 (diff) | |
download | perl-cb1974ba967c78b8c4c5124d5b470405af5b8541.tar.gz |
Update Pod-Perldoc to CPAN version 3.20
[DELTA]
3.20 - Sat Apr 27 05:25:30 UTC 2013
* Make default formatter "ToTerm" instead of "ToMan" for
better UTF-8 support
* When dynamically building POD from perlfunc (perlvar)
make sure we open filehandles with utf8 and add an
=encoding (RT #80527) (RT #80640)
Diffstat (limited to 'cpan')
-rw-r--r-- | cpan/Pod-Perldoc/lib/Pod/Perldoc.pm | 14 | ||||
-rw-r--r-- | cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm | 2 | ||||
-rw-r--r-- | cpan/Pod-Perldoc/lib/Pod/Perldoc/GetOptsOO.pm | 2 | ||||
-rw-r--r-- | cpan/Pod-Perldoc/lib/Pod/Perldoc/ToANSI.pm | 2 | ||||
-rw-r--r-- | cpan/Pod-Perldoc/lib/Pod/Perldoc/ToChecker.pm | 2 | ||||
-rw-r--r-- | cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm | 6 | ||||
-rw-r--r-- | cpan/Pod-Perldoc/lib/Pod/Perldoc/ToNroff.pm | 2 | ||||
-rw-r--r-- | cpan/Pod-Perldoc/lib/Pod/Perldoc/ToPod.pm | 2 | ||||
-rw-r--r-- | cpan/Pod-Perldoc/lib/Pod/Perldoc/ToRtf.pm | 2 | ||||
-rw-r--r-- | cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm | 2 | ||||
-rw-r--r-- | cpan/Pod-Perldoc/lib/Pod/Perldoc/ToText.pm | 2 | ||||
-rw-r--r-- | cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTk.pm | 2 | ||||
-rw-r--r-- | cpan/Pod-Perldoc/lib/Pod/Perldoc/ToXml.pm | 2 | ||||
-rw-r--r-- | cpan/Pod-Perldoc/perldoc.pod (renamed from cpan/Pod-Perldoc/lib/perldoc.pod) | 0 |
14 files changed, 26 insertions, 16 deletions
diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm index 8c841e833e..9cdee805f7 100644 --- a/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm +++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm @@ -12,7 +12,7 @@ use File::Spec::Functions qw(catfile catdir splitdir); use vars qw($VERSION @Pagers $Bindir $Pod2man $Temp_Files_Created $Temp_File_Lifetime ); -$VERSION = '3.19'; +$VERSION = '3.20'; #.......................................................................... @@ -470,7 +470,7 @@ sub init_formatter_class_list { $self->opt_M_with('Pod::Perldoc::ToPod'); # the always-there fallthru $self->opt_o_with('text'); - $self->opt_o_with('man') unless $self->is_mswin32 || $self->is_dos + $self->opt_o_with('term') unless $self->is_mswin32 || $self->is_dos || !($ENV{TERM} && ( ($ENV{TERM} || '') !~ /dumb|emacs|none|unknown/i )); @@ -927,6 +927,10 @@ sub maybe_generate_dynamic_pod { } elsif ( @dynamic_pod ) { $self->aside("Hm, I found some Pod from that search!\n"); my ($buffd, $buffer) = $self->new_tempfile('pod', 'dyn'); + if ( $] >= 5.008 && $self->opt_L ) { + binmode($buffd, ":utf8"); + print $buffd "=encoding utf8\n\n"; + } push @{ $self->{'temp_file_list'} }, $buffer; # I.e., it MIGHT be deleted at the end. @@ -1162,6 +1166,12 @@ sub search_perlfunc { if ( $self->opt_L && defined $self->{'translators'}->[0] ) { my $tr = $self->{'translators'}->[0]; $re = $tr->search_perlfunc_re if $tr->can('search_perlfunc_re'); + if ( $] < 5.008 ) { + $self->aside("Your old perl doesn't really have proper unicode support."); + } + else { + binmode(PFUNC, ":utf8"); + } } # Skip introduction diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm index 5bf8a936a7..80ffc800df 100644 --- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm +++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm @@ -3,7 +3,7 @@ use strict; use warnings; use vars qw($VERSION); -$VERSION = '3.19'; +$VERSION = '3.20'; use Carp qw(croak carp); use Config qw(%Config); diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/GetOptsOO.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/GetOptsOO.pm index 0355f8f3ca..5b90794fc1 100644 --- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/GetOptsOO.pm +++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/GetOptsOO.pm @@ -2,7 +2,7 @@ package Pod::Perldoc::GetOptsOO; use strict; use vars qw($VERSION); -$VERSION = '3.19'; +$VERSION = '3.20'; BEGIN { # Make a DEBUG constant ASAP *DEBUG = defined( &Pod::Perldoc::DEBUG ) diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToANSI.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToANSI.pm index c6534bd4cf..baaea039e0 100644 --- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToANSI.pm +++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToANSI.pm @@ -4,7 +4,7 @@ use warnings; use parent qw(Pod::Perldoc::BaseTo); use vars qw($VERSION); -$VERSION = '3.19'; +$VERSION = '3.20'; sub is_pageable { 1 } sub write_with_binmode { 0 } diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToChecker.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToChecker.pm index 6f8d12c112..6bf0cf8c9d 100644 --- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToChecker.pm +++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToChecker.pm @@ -4,7 +4,7 @@ use warnings; use vars qw(@ISA); use vars qw($VERSION); -$VERSION = '3.19'; +$VERSION = '3.20'; # Pick our superclass... # diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm index 225a78618d..bdd014025f 100644 --- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm +++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm @@ -5,7 +5,7 @@ use warnings; use parent qw(Pod::Perldoc::BaseTo); use vars qw($VERSION); -$VERSION = '3.19'; +$VERSION = '3.20'; use File::Spec::Functions qw(catfile); use Pod::Man 2.18; @@ -136,7 +136,7 @@ sub _get_columns { sub _get_podman_switches { my( $self ) = @_; - my @switches = grep !m/^_/s, keys %$self; + my @switches = map { $_, $self->{$_} } grep !m/^_/s, keys %$self; # There needs to be a cleaner way to handle setting # the UTF-8 flag, but for now, comment out this @@ -242,7 +242,7 @@ sub _collect_nroff_switches { push @render_switches, $self->_get_device_switches; # Thanks to Brendan O'Dea for contributing the following block - if( $self->_is_roff and $self->is_linux and -t STDOUT and my ($cols) = $self->_get_columns ) { + if( $self->_is_roff and -t STDOUT and my ($cols) = $self->_get_columns ) { my $c = $cols * 39 / 40; $cols = $c > $cols - 2 ? $c : $cols -2; push @render_switches, '-rLL=' . (int $c) . 'n' if $cols > 80; diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToNroff.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToNroff.pm index 4f720e7f0e..c9fa0fabdc 100644 --- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToNroff.pm +++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToNroff.pm @@ -4,7 +4,7 @@ use warnings; use parent qw(Pod::Perldoc::BaseTo); use vars qw($VERSION); -$VERSION = '3.19'; +$VERSION = '3.20'; # This is unlike ToMan.pm in that it emits the raw nroff source! diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToPod.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToPod.pm index 7083ae67b3..dc5523f4da 100644 --- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToPod.pm +++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToPod.pm @@ -4,7 +4,7 @@ use warnings; use parent qw(Pod::Perldoc::BaseTo); use vars qw($VERSION); -$VERSION = '3.19'; +$VERSION = '3.20'; sub is_pageable { 1 } sub write_with_binmode { 0 } diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToRtf.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToRtf.pm index 6e190f73a2..75ea630f1d 100644 --- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToRtf.pm +++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToRtf.pm @@ -4,7 +4,7 @@ use warnings; use parent qw( Pod::Simple::RTF ); use vars qw($VERSION); -$VERSION = '3.19'; +$VERSION = '3.20'; sub is_pageable { 0 } sub write_with_binmode { 0 } diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm index f8d9349d10..bdc5625028 100644 --- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm +++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm @@ -3,7 +3,7 @@ use strict; use warnings; use vars qw($VERSION); -$VERSION = '3.19'; +$VERSION = '3.20'; use parent qw(Pod::Perldoc::BaseTo); diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToText.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToText.pm index 530bdee7ad..b2861f3020 100644 --- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToText.pm +++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToText.pm @@ -3,7 +3,7 @@ use strict; use warnings; use vars qw($VERSION); -$VERSION = '3.19'; +$VERSION = '3.20'; use parent qw(Pod::Perldoc::BaseTo); diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTk.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTk.pm index deed6b3ff1..8c1240ac14 100644 --- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTk.pm +++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTk.pm @@ -3,7 +3,7 @@ use strict; use warnings; use vars qw($VERSION); -$VERSION = '3.19'; +$VERSION = '3.20'; use parent qw(Pod::Perldoc::BaseTo); diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToXml.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToXml.pm index f85f01eb7b..9de73fba0b 100644 --- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToXml.pm +++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToXml.pm @@ -6,7 +6,7 @@ use vars qw($VERSION); use parent qw( Pod::Simple::XMLOutStream ); use vars qw($VERSION); -$VERSION = '3.19'; +$VERSION = '3.20'; sub is_pageable { 0 } sub write_with_binmode { 0 } diff --git a/cpan/Pod-Perldoc/lib/perldoc.pod b/cpan/Pod-Perldoc/perldoc.pod index 55febc4bf9..55febc4bf9 100644 --- a/cpan/Pod-Perldoc/lib/perldoc.pod +++ b/cpan/Pod-Perldoc/perldoc.pod |