Skip to content

Commit

Permalink
Update Pod-Perldoc to CPAN version 3.20
Browse files Browse the repository at this point in the history
  [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)
  • Loading branch information
bingos committed May 24, 2013
1 parent 5b9c515 commit cb1974b
Show file tree
Hide file tree
Showing 17 changed files with 29 additions and 19 deletions.
2 changes: 1 addition & 1 deletion MANIFEST
Expand Up @@ -1803,7 +1803,6 @@ cpan/Pod-Parser/t/pod/twice.t Test Pod::Parser
cpan/Pod-Perldoc/corpus/no-head.pod test file for Pod-Perldoc
cpan/Pod-Perldoc/corpus/perlfunc.pod test file for Pod-Perldoc
cpan/Pod-Perldoc/corpus/utf8.pod test file for Pod-Perldoc
cpan/Pod-Perldoc/lib/perldoc.pod Look up Perl documentation in Pod format
cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm utility module for perldoc
cpan/Pod-Perldoc/lib/Pod/Perldoc/GetOptsOO.pm options parsing for perldoc
cpan/Pod-Perldoc/lib/Pod/Perldoc.pm guts of the 'perldoc' utility
Expand All @@ -1817,6 +1816,7 @@ cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm convert POD to terminal output
cpan/Pod-Perldoc/lib/Pod/Perldoc/ToText.pm convert POD to plain text
cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTk.pm convert POD via Tk::Pod
cpan/Pod-Perldoc/lib/Pod/Perldoc/ToXml.pm convert POD to XML
cpan/Pod-Perldoc/perldoc.pod
cpan/Pod-Perldoc/t/load.t test file for Pod-Perldoc
cpan/Pod-Perldoc/t/man/_get_columns.t test file for Pod-Perldoc
cpan/Pod-Perldoc/t/pod.t test file for Pod-Perldoc
Expand Down
2 changes: 1 addition & 1 deletion Porting/Maintainers.pl
Expand Up @@ -1460,7 +1460,7 @@ package Maintainers;

'Pod::Perldoc' => {
'MAINTAINER' => 'mallen',
'DISTRIBUTION' => 'MALLEN/Pod-Perldoc-3.19.tar.gz',
'DISTRIBUTION' => 'MALLEN/Pod-Perldoc-3.20.tar.gz',
'FILES' => q[cpan/Pod-Perldoc],

# in blead, the perldoc executable is generated by perldoc.PL
Expand Down
14 changes: 12 additions & 2 deletions cpan/Pod-Perldoc/lib/Pod/Perldoc.pm
Expand Up @@ -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';

#..........................................................................

Expand Down Expand Up @@ -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
));
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion cpan/Pod-Perldoc/lib/Pod/Perldoc/GetOptsOO.pm
Expand Up @@ -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 )
Expand Down
2 changes: 1 addition & 1 deletion cpan/Pod-Perldoc/lib/Pod/Perldoc/ToANSI.pm
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion cpan/Pod-Perldoc/lib/Pod/Perldoc/ToChecker.pm
Expand Up @@ -4,7 +4,7 @@ use warnings;
use vars qw(@ISA);

use vars qw($VERSION);
$VERSION = '3.19';
$VERSION = '3.20';

# Pick our superclass...
#
Expand Down
6 changes: 3 additions & 3 deletions cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion cpan/Pod-Perldoc/lib/Pod/Perldoc/ToNroff.pm
Expand Up @@ -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!

Expand Down
2 changes: 1 addition & 1 deletion cpan/Pod-Perldoc/lib/Pod/Perldoc/ToPod.pm
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion cpan/Pod-Perldoc/lib/Pod/Perldoc/ToRtf.pm
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm
Expand Up @@ -3,7 +3,7 @@ use strict;
use warnings;

use vars qw($VERSION);
$VERSION = '3.19';
$VERSION = '3.20';

use parent qw(Pod::Perldoc::BaseTo);

Expand Down
2 changes: 1 addition & 1 deletion cpan/Pod-Perldoc/lib/Pod/Perldoc/ToText.pm
Expand Up @@ -3,7 +3,7 @@ use strict;
use warnings;

use vars qw($VERSION);
$VERSION = '3.19';
$VERSION = '3.20';

use parent qw(Pod::Perldoc::BaseTo);

Expand Down
2 changes: 1 addition & 1 deletion cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTk.pm
Expand Up @@ -3,7 +3,7 @@ use strict;
use warnings;

use vars qw($VERSION);
$VERSION = '3.19';
$VERSION = '3.20';

use parent qw(Pod::Perldoc::BaseTo);

Expand Down
2 changes: 1 addition & 1 deletion cpan/Pod-Perldoc/lib/Pod/Perldoc/ToXml.pm
Expand Up @@ -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 }
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion pod/perl.pod
Expand Up @@ -42,7 +42,7 @@ flag = perlvms
path perlfaq.* cpan/perlfaq/lib/
path perlglossary cpan/perlfaq/lib/
path perlxs(?:tut|typemap)? dist/ExtUtils-ParseXS/lib/
path perldoc cpan/Pod-Perldoc/lib/
path perldoc cpan/Pod-Perldoc/

aux a2p c2ph h2ph h2xs perlbug pl2pm pod2html pod2man s2p splain xsubpp

Expand Down

0 comments on commit cb1974b

Please sign in to comment.