Upgrade to Pod-Simple-3.08

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index d4beee8..773de17 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1269,15 +1269,15 @@ use File::Glob qw(:case);
     'Pod::Simple' =>
        {
        'MAINTAINER'    => 'arandal',
-       'DISTRIBUTION'  => 'ARANDAL/Pod-Simple-3.07.tar.gz',
+       'DISTRIBUTION'  => 'ARANDAL/Pod-Simple-3.08.tar.gz',
        'FILES'         => q[cpan/Pod-Simple],
-       # XXX these two files correspond to similar ones in bleed under
-       # pod/, but the bleed ones have newer changes, and also seem to
+       # XXX these two files correspond to similar ones in blead under
+       # pod/, but the blead ones have newer changes, and also seem to
        # have been in blead a long time. I'm going to assume then that
        # the blead versions of these two files are authoritative - DAPM
        'EXCLUDED'      => [ qw( lib/perlpod.pod lib/perlpodspec.pod ) ],
        'CPAN'          => 1,
-       'UPSTREAM'      => undef,
+       'UPSTREAM'      => 'cpan',
        },
 
     'podlators' =>

diff --git a/cpan/Pod-Simple/ChangeLog b/cpan/Pod-Simple/ChangeLog
index 8c1e1d7..4ab15b2 100644 (file)
--- a/cpan/Pod-Simple/ChangeLog
+++ b/cpan/Pod-Simple/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for Pod::Simple dist
 #---------------------------------------------------------------------------
 
+2009-07-16   Allison Randal <allison@perl.org>
+       * Release 3.08
+
+       Fix installdirs for Perl versions where Pod::Simple was core;
+        RT#36446 & RT#39709, thanks to Jerry Hedden.
+
+       Fix encoding handling for code in paragraphs; RT#45829, thanks
+        to David Wheeler.
+
 2008-06-04   Allison Randal <allison@perl.org>
        * Release 3.07
 

diff --git a/cpan/Pod-Simple/lib/Pod/Simple.pm b/cpan/Pod-Simple/lib/Pod/Simple.pm
index 1e32572..1089099 100644 (file)
--- a/cpan/Pod-Simple/lib/Pod/Simple.pm
+++ b/cpan/Pod-Simple/lib/Pod/Simple.pm
@@ -18,7 +18,7 @@ use vars qw(
 );
 
 @ISA = ('Pod::Simple::BlackBox');
-$VERSION = '3.07';
+$VERSION = '3.08';
 
 @Known_formatting_codes = qw(I B C L E F S X Z); 
 %Known_formatting_codes = map(($_=>1), @Known_formatting_codes);

diff --git a/cpan/Pod-Simple/lib/Pod/Simple/XHTML.pm b/cpan/Pod-Simple/lib/Pod/Simple/XHTML.pm
index d130faa..e7832e6 100644 (file)
--- a/cpan/Pod-Simple/lib/Pod/Simple/XHTML.pm
+++ b/cpan/Pod-Simple/lib/Pod/Simple/XHTML.pm
@@ -328,8 +328,8 @@ sub end_Document   {
 sub start_B { $_[0]{'scratch'} .= '<b>' }
 sub end_B   { $_[0]{'scratch'} .= '</b>' }
 
-sub start_C { $_[0]{'scratch'} .= '<code>' }
-sub end_C   { $_[0]{'scratch'} .= '</code>' }
+sub start_C { $_[0]{'scratch'} .= '<code>'; $_[0]{'in_verbatim'} = 1; }
+sub end_C   { $_[0]{'scratch'} .= '</code>'; $_[0]{'in_verbatim'} = 0; }
 
 sub start_E { $_[0]{'scratch'} .= '&' }
 sub end_E   { $_[0]{'scratch'} .= ';' }