Pod-Simple-4.39c

merged with upstream 3.39
relaxed some str types

Author: rurban

MANIFEST

@@ -4404,6 +4404,7 @@ dist/Pod-Simple/t/begin.t				Pod::Simple test file
 dist/Pod-Simple/t/cbacks.t				Pod::Simple test file
 dist/Pod-Simple/t/chunking.t				Pod::Simple test file
 dist/Pod-Simple/t/closeys.t				Pod::Simple test file
+dist/Pod-Simple/t/content_seen.t			Pod::Simple test file
 dist/Pod-Simple/t/corpus.t				Pod::Simple test file
 dist/Pod-Simple/t/corpus/2202jp.txt			Pod::Simple test file
 dist/Pod-Simple/t/corpus/2202jp.xml			Pod::Simple test file

Porting/Maintainers.pl

@@ -1226,10 +1226,8 @@ package Maintainers;
     },
 
     'Pod::Simple' => {
-        'DISTRIBUTION' => 'KHW/Pod-Simple-3.38.tar.gz',
+        'DISTRIBUTION' => 'KHW/Pod-Simple-3.39.tar.gz',
         'FILES'        => q[dist/Pod-Simple],
-        # https://rt.cpan.org/Public/Bug/Display.html?id=103439
-        # https://rt.cpan.org/Public/Bug/Display.html?id=105192
         # Modernized for cperl: https://github.com/rurban/pod-simple/tree/cperl
         #'CUSTOMIZED'   => [
         #    qw( dist/Pod-Simple/lib/Pod/Simple/Search.pm

dist/Module-CoreList/lib/Module/CoreList.pm

@@ -18986,33 +18986,33 @@ our %delta :const = (
             'perlfaq'               => '5.20190126',
             'Pod::Man'              => '4.12',
             'Pod::ParseLink'        => '4.12',
-            'Pod::Simple'           => '4.38c',
-            'Pod::Simple::BlackBox' => '3.38',
-            'Pod::Simple::Checker'  => '3.38',
-            'Pod::Simple::Debug'    => '3.38',
-            'Pod::Simple::DumpAsText'=> '4.38c',
+            'Pod::Simple'           => '4.39c',
+            'Pod::Simple::BlackBox' => '3.39',
+            'Pod::Simple::Checker'  => '3.39',
+            'Pod::Simple::Debug'    => '3.39',
+            'Pod::Simple::DumpAsText'=> '4.39c',
             'Pod::Simple::DumpAsXML'=> '4.36c',
-            'Pod::Simple::HTML'     => '4.38c',
-            'Pod::Simple::HTMLBatch'=> '3.38',
-            'Pod::Simple::LinkSection'=> '3.38',
-            'Pod::Simple::Methody'  => '4.38c',
-            'Pod::Simple::Progress' => '3.38',
-            'Pod::Simple::PullParser'=> '4.38c',
-            'Pod::Simple::PullParserEndToken'=> '3.38',
-            'Pod::Simple::PullParserStartToken'=> '3.38',
-            'Pod::Simple::PullParserTextToken'=> '3.38',
-            'Pod::Simple::PullParserToken'=> '3.38',
-            'Pod::Simple::RTF'      => '3.38',
-            'Pod::Simple::Search'   => '3.38',
-            'Pod::Simple::SimpleTree'=> '3.38',
-            'Pod::Simple::Text'     => '3.38',
-            'Pod::Simple::TextContent'=> '3.38',
-            'Pod::Simple::TiedOutFH'=> '3.38',
-            'Pod::Simple::Transcode'=> '3.38',
-            'Pod::Simple::TranscodeDumb'=> '3.38',
-            'Pod::Simple::TranscodeSmart'=> '3.38',
-            'Pod::Simple::XHTML'    => '3.38',
-            'Pod::Simple::XMLOutStream'=> '4.38c',
+            'Pod::Simple::HTML'     => '4.39c',
+            'Pod::Simple::HTMLBatch'=> '3.39',
+            'Pod::Simple::LinkSection'=> '3.39',
+            'Pod::Simple::Methody'  => '4.39c',
+            'Pod::Simple::Progress' => '3.39',
+            'Pod::Simple::PullParser'=> '4.39c',
+            'Pod::Simple::PullParserEndToken'=> '3.39',
+            'Pod::Simple::PullParserStartToken'=> '3.39',
+            'Pod::Simple::PullParserTextToken'=> '3.39',
+            'Pod::Simple::PullParserToken'=> '3.39',
+            'Pod::Simple::RTF'      => '3.39',
+            'Pod::Simple::Search'   => '3.39',
+            'Pod::Simple::SimpleTree'=> '3.39',
+            'Pod::Simple::Text'     => '3.39',
+            'Pod::Simple::TextContent'=> '3.39',
+            'Pod::Simple::TiedOutFH'=> '3.39',
+            'Pod::Simple::Transcode'=> '3.39',
+            'Pod::Simple::TranscodeDumb'=> '3.39',
+            'Pod::Simple::TranscodeSmart'=> '3.39',
+            'Pod::Simple::XHTML'    => '3.39',
+            'Pod::Simple::XMLOutStream'=> '4.39c',
             'Pod::Text'             => '4.12',
             'Pod::Text::Color'      => '4.12',
             'Pod::Text::Overstrike' => '4.12',

dist/Pod-Simple/lib/Pod/Simple.pm

@@ -1,3 +1,4 @@
+
 require 5;
 package Pod::Simple;
 use strict;
@@ -10,15 +11,15 @@ use Pod::Simple::BlackBox ();
 #use utf8;
 
 use vars qw(
-  $VERSION @ISA
+  @ISA
   @Known_formatting_codes  @Known_directives
   %Known_formatting_codes  %Known_directives
   $NL
 );
 
 @ISA = ('Pod::Simple::BlackBox');
 use cperl;
-our $VERSION = '4.38c'; # modernized
+our $VERSION = '4.39c'; # modernized
 $VERSION =~ s/c$//;
 
 @Known_formatting_codes = qw(I B C L E F S X Z); 
@@ -252,13 +253,13 @@ sub _handle_text ($self, $text) {
 #
 # And now directives (not targets)
 
-sub accept_directive_as_verbatim ($self, @args) { 
+sub accept_directive_as_verbatim ($self, @args) {
   $self->_accept_directives('Verbatim', @args)
 }
 sub accept_directive_as_data ($self, @args) {
   $self->_accept_directives('Data', @args)
 }
-sub accept_directive_as_processed ($self, @args) { 
+sub accept_directive_as_processed ($self, @args) {
   $self->_accept_directives('Plain', @args)
 }
 

dist/Pod-Simple/lib/Pod/Simple.pod

@@ -19,7 +19,11 @@ Be sure to read L</ENCODING> if your Pod contains non-ASCII characters.
 Pod formatters can use Pod::Simple to parse Pod documents and render them into
 plain text, HTML, or any number of other formats. Typically, such formatters
 will be subclasses of Pod::Simple, and so they will inherit its methods, like
-C<parse_file>.
+C<parse_file>.  But note that Pod::Simple doesn't understand and
+properly parse Perl itself, so if you have a file which contains a Perl
+program that has a multi-line quoted string which has lines that look
+like pod, Pod::Simple will treat them as pod.  This can be avoided if
+the file makes these into indented here documents instead.
 
 If you're reading this document just because you have a Pod-processing
 subclass that you want to use, this document (plus the documentation for the
@@ -390,8 +394,8 @@ This module is managed in an open GitHub repository,
 L<https://github.com/perl-pod/pod-simple/>. Feel free to fork and contribute, or
 to clone L<git://github.com/perl-pod/pod-simple.git> and send patches!
 
-Patches against Pod::Simple are welcome. Please send bug reports to
-<bug-pod-simple@rt.cpan.org>.
+Please use L<https://github.com/perl-pod/pod-simple/issues/new> to file a bug
+report.
 
 =head1 COPYRIGHT AND DISCLAIMERS
 
@@ -419,6 +423,8 @@ Pod::Simple is maintained by:
 
 =item * David E. Wheeler C<dwheeler@cpan.org>
 
+=item * Karl Williamson C<khw@cpan.org>
+
 =back
 
 Documentation has been contributed by:

dist/Pod-Simple/lib/Pod/Simple/BlackBox.pm

@@ -22,7 +22,7 @@ use integer; # vroom!
 use strict;
 use Carp ();
 use vars qw($VERSION );
-$VERSION = '3.38';
+$VERSION = '3.39';
 #use constant DEBUG => 7;
 
 sub my_qr ($$) {
@@ -100,6 +100,11 @@ if (($] ge 5.007_003)) {
   $utf8_bom = "\xEF\xBB\xBF";   # No EBCDIC BOM detection for early Perls.
 }
 
+# This is used so that the 'content_seen' method doesn't return true on a
+# file that just happens to have a line that matches /^=[a-zA-z]/.  Only if
+# there is a valid =foo line will we return that content was seen.
+my $seen_legal_directive = 0;
+
 #@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 
 sub parse_line { shift->parse_lines(@_) } # alias
@@ -859,6 +864,10 @@ sub _ponder_paragraph_buffer {
 
   my($para, $para_type);
   while(@$paras) {
+
+    # If a directive, assume it's legal; subtract below if found not to be
+    $seen_legal_directive++ if $paras->[0][0] =~ /^=/;
+
     last if      @$paras == 1
             and (    $paras->[0][0] eq '=over'
                  or  $paras->[0][0] eq '=item'
@@ -1148,6 +1157,7 @@ sub _ponder_paragraph_buffer {
         DEBUG > 1 and print STDERR " Pondering known directive ${$para}[0] as $para_type\n";
       } else {
         # An unknown directive!
+        $seen_legal_directive--;
         DEBUG > 1 and printf STDERR "Unhandled directive %s (Handled: %s)\n",
          $para->[0], join(' ', sort keys %{$self->{'accept_directives'}} )
         ;
@@ -1208,7 +1218,8 @@ sub _ponder_paragraph_buffer {
       DEBUG and print STDERR "\n", pretty($para), "\n";
 
       # traverse the treelet (which might well be just one string scalar)
-      $self->{'content_seen'} ||= 1;
+      $self->{'content_seen'} ||= 1 if   $seen_legal_directive
+                                    && ! $self->{'~tried_gen_errata'};
       $self->_traverse_treelet_bit(@$para);
     }
   }
@@ -1336,7 +1347,7 @@ sub _ponder_begin {
   if(!$dont_ignore or scalar grep $_->[1]{'~ignore'}, @$curr_open) {
     DEBUG > 1 and print STDERR "Ignoring ignorable =begin\n";
   } else {
-    $self->{'content_seen'} ||= 1;
+    $self->{'content_seen'} ||= 1 unless $self->{'~tried_gen_errata'};
     $self->_handle_element_start((my $scratch='for'), $para->[1]);
   }
 
@@ -1404,7 +1415,7 @@ sub _ponder_end {
     $curr_open->[-1][1]{'start_line'} = $para->[1]{'start_line'};
       # what's that for?
 
-    $self->{'content_seen'} ||= 1;
+    $self->{'content_seen'} ||= 1 unless $self->{'~tried_gen_errata'};
     $self->_handle_element_end( my $scratch = 'for', $para->[1]);
   }
   DEBUG > 1 and print STDERR "Popping $curr_open->[-1][0] $curr_open->[-1][1]{'target'} because of =end $content\n";
@@ -1468,7 +1479,7 @@ sub _ponder_pod {
 
   # The surrounding methods set content_seen, so let us remain consistent.
   # I do not know why it was not here before -- should it not be here?
-  # $self->{'content_seen'} ||= 1;
+  # $self->{'content_seen'} ||= 1 unless $self->{'~tried_gen_errata'};
 
   return;
 }
@@ -1526,7 +1537,7 @@ sub _ponder_over {
   }
   DEBUG > 1 and print STDERR "=over found of type $list_type\n";
 
-  $self->{'content_seen'} ||= 1;
+  $self->{'content_seen'} ||= 1 unless $self->{'~tried_gen_errata'};
   $self->_handle_element_start((my $scratch = 'over-' . $list_type), $para->[1]);
 
   return;
@@ -1548,7 +1559,7 @@ sub _ponder_back {
     DEBUG > 1 and print STDERR "=back happily closes matching =over\n";
     # Expected case: we're closing the most recently opened thing
     #my $over = pop @$curr_open;
-    $self->{'content_seen'} ||= 1;
+    $self->{'content_seen'} ||= 1 unless $self->{'~tried_gen_errata'};
     $self->_handle_element_end( my $scratch =
       'over-' . ( (pop @$curr_open)->[1]{'~type'} ), $para->[1]
     );

dist/Pod-Simple/lib/Pod/Simple/Checker.pm

@@ -9,7 +9,7 @@ use Carp ();
 use Pod::Simple::Methody ();
 use Pod::Simple ();
 use vars qw( @ISA $VERSION );
-$VERSION = '3.38';
+$VERSION = '3.39';
 @ISA = ('Pod::Simple::Methody');
 BEGIN { *DEBUG = defined(&Pod::Simple::DEBUG)
           ? \&Pod::Simple::DEBUG

dist/Pod-Simple/lib/Pod/Simple/Debug.pm

@@ -2,7 +2,7 @@ require 5;
 package Pod::Simple::Debug;
 use strict;
 use vars qw($VERSION );
-$VERSION = '3.38';
+$VERSION = '3.39';
 
 sub import {
   my($value,$variable);

dist/Pod-Simple/lib/Pod/Simple/DumpAsText.pm

@@ -2,7 +2,7 @@
 require 5;
 package Pod::Simple::DumpAsText;
 use cperl;
-our $VERSION = '4.38c'; # modernized
+our $VERSION = '4.39c'; # modernized
 $VERSION =~ s/c$//;
 use Pod::Simple ();
 BEGIN {@ISA = ('Pod::Simple')}

dist/Pod-Simple/lib/Pod/Simple/DumpAsXML.pm

@@ -2,7 +2,7 @@
 require 5;
 package Pod::Simple::DumpAsXML;
 use cperl;
-our $VERSION = '4.38c'; # modernized
+our $VERSION = '4.39c'; # modernized
 $VERSION =~ s/c$//;
 use Pod::Simple ();
 BEGIN {@ISA = ('Pod::Simple')}