Update Pod-Simple from version 3.40 to 3.41

92 files changed, 491 insertions, 166 deletions

diff --git a/cpan/Pod-Simple/lib/Pod/Simple.pm b/cpan/Pod-Simple/lib/Pod/Simple.pm
index 6c91b8ac1f..504baff706 100644
--- a/cpan/Pod-Simple/lib/Pod/Simple.pm
+++ b/cpan/Pod-Simple/lib/Pod/Simple.pm
@@ -18,11 +18,11 @@ use vars qw(
 );
 
 @ISA = ('Pod::Simple::BlackBox');
-$VERSION = '3.40';
+$VERSION = '3.41';
 
 @Known_formatting_codes = qw(I B C L E F S X Z); 
 %Known_formatting_codes = map(($_=>1), @Known_formatting_codes);
-@Known_directives       = qw(head1 head2 head3 head4 item over back); 
+@Known_directives       = qw(head1 head2 head3 head4 head5 head6 item over back); 
 %Known_directives       = map(($_=>'Plain'), @Known_directives);
 $NL = $/ unless defined $NL;
 
diff --git a/cpan/Pod-Simple/lib/Pod/Simple/BlackBox.pm b/cpan/Pod-Simple/lib/Pod/Simple/BlackBox.pm
index d115aee7e3..17b8f6d7db 100644
--- a/cpan/Pod-Simple/lib/Pod/Simple/BlackBox.pm
+++ b/cpan/Pod-Simple/lib/Pod/Simple/BlackBox.pm
@@ -22,7 +22,7 @@ use integer; # vroom!
 use strict;
 use Carp ();
 use vars qw($VERSION );
-$VERSION = '3.40';
+$VERSION = '3.41';
 #use constant DEBUG => 7;
 
 sub my_qr ($$) {
@@ -64,7 +64,7 @@ my $non_ascii_re = my_qr('[[:^ascii:]]', "\xB6");
 $non_ascii_re = qr/[\x80-\xFF]/ unless $non_ascii_re;
 
 # Use patterns understandable by Perl 5.6, if possible
-my $cs_re = my_qr('\p{IsCs}', "\x{D800}");
+my $cs_re = do { no warnings; my_qr('\p{IsCs}', "\x{D800}") };
 my $cn_re = my_qr('\p{IsCn}', "\x{09E4}");  # <reserved> code point unlikely
                                             # to get assigned
 my $rare_blocks_re = my_qr('[\p{InIPAExtensions}\p{InSpacingModifierLetters}]',
diff --git a/cpan/Pod-Simple/lib/Pod/Simple/Checker.pm b/cpan/Pod-Simple/lib/Pod/Simple/Checker.pm
index 2fef0305a5..1f94afe8d0 100644
--- a/cpan/Pod-Simple/lib/Pod/Simple/Checker.pm
+++ b/cpan/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.40';
+$VERSION = '3.41';
 @ISA = ('Pod::Simple::Methody');
 BEGIN { *DEBUG = defined(&Pod::Simple::DEBUG)
           ? \&Pod::Simple::DEBUG
diff --git a/cpan/Pod-Simple/lib/Pod/Simple/Debug.pm b/cpan/Pod-Simple/lib/Pod/Simple/Debug.pm
index aaa5a887e6..1e089ccf1b 100644
--- a/cpan/Pod-Simple/lib/Pod/Simple/Debug.pm
+++ b/cpan/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.40';
+$VERSION = '3.41';
 
 sub import {
   my($value,$variable);
diff --git a/cpan/Pod-Simple/lib/Pod/Simple/DumpAsText.pm b/cpan/Pod-Simple/lib/Pod/Simple/DumpAsText.pm
index bade6fcc47..dad0b69cb2 100644
--- a/cpan/Pod-Simple/lib/Pod/Simple/DumpAsText.pm
+++ b/cpan/Pod-Simple/lib/Pod/Simple/DumpAsText.pm
@@ -1,7 +1,7 @@
 
 require 5;
 package Pod::Simple::DumpAsText;
-$VERSION = '3.40';
+$VERSION = '3.41';
 use Pod::Simple ();
 BEGIN {@ISA = ('Pod::Simple')}
 
diff --git a/cpan/Pod-Simple/lib/Pod/Simple/DumpAsXML.pm b/cpan/Pod-Simple/lib/Pod/Simple/DumpAsXML.pm
index 6f0b7b1862..4531f9ce78 100644
--- a/cpan/Pod-Simple/lib/Pod/Simple/DumpAsXML.pm
+++ b/cpan/Pod-Simple/lib/Pod/Simple/DumpAsXML.pm
@@ -1,7 +1,7 @@
 
 require 5;
 package Pod::Simple::DumpAsXML;
-$VERSION = '3.40';
+$VERSION = '3.41';
 use Pod::Simple ();
 BEGIN {@ISA = ('Pod::Simple')}
 
diff --git a/cpan/Pod-Simple/lib/Pod/Simple/HTML.pm b/cpan/Pod-Simple/lib/Pod/Simple/HTML.pm
index 0219b97910..8ad7572c56 100644
--- a/cpan/Pod-Simple/lib/Pod/Simple/HTML.pm
+++ b/cpan/Pod-Simple/lib/Pod/Simple/HTML.pm
@@ -9,7 +9,7 @@ use vars qw(
   $Doctype_decl  $Content_decl
 );
 @ISA = ('Pod::Simple::PullParser');
-$VERSION = '3.40';
+$VERSION = '3.41';
 BEGIN {
   if(defined &DEBUG) { } # no-op
   elsif( defined &Pod::Simple::DEBUG ) { *DEBUG = \&Pod::Simple::DEBUG }
@@ -109,10 +109,14 @@ my @_to_accept;
   'head2' => "\n<h2>",  #  ''
   'head3' => "\n<h3>",  #  ''
   'head4' => "\n<h4>",  #  ''
+  'head5' => "\n<h5>",  #  ''
+  'head6' => "\n<h6>",  #  ''
   '/head1' => "</a></h1>\n",
   '/head2' => "</a></h2>\n",
   '/head3' => "</a></h3>\n",
   '/head4' => "</a></h4>\n",
+  '/head5' => "</a></h5>\n",
+  '/head6' => "</a></h6>\n",
 
   'X'  => "<!--\n\tINDEX: ",
   '/X' => "\n-->",
@@ -224,7 +228,7 @@ sub __adjust_html_h_levels {
   return if ($self->{'Adjusted_html_h_levels'}||0) == $add;
 
   $add -= 1;
-  for (1 .. 4) {
+  for (1 .. 6) {
     $Tagmap->{"head$_"}  =~ s/$_/$_ + $add/e;
     $Tagmap->{"/head$_"} =~ s/$_/$_ + $add/e;
   }
@@ -323,7 +327,7 @@ sub version_tag_comment {
    "<!--\n  generated by %s v%s,\n  using %s v%s,\n  under Perl v%s at %s GMT.\n\n %s\n\n-->\n",
    esc(
     ref($self), $self->VERSION(), $ISA[0], $ISA[0]->VERSION(),
-    $], scalar(gmtime),
+    $], scalar(gmtime($ENV{SOURCE_DATE_EPOCH} || time)),
    ), $self->_modnote(),
   ;
 }
diff --git a/cpan/Pod-Simple/lib/Pod/Simple/HTMLBatch.pm b/cpan/Pod-Simple/lib/Pod/Simple/HTMLBatch.pm
index 227d6d3af0..144387ebc0 100644
--- a/cpan/Pod-Simple/lib/Pod/Simple/HTMLBatch.pm
+++ b/cpan/Pod-Simple/lib/Pod/Simple/HTMLBatch.pm
@@ -5,7 +5,7 @@ use strict;
 use vars qw( $VERSION $HTML_RENDER_CLASS $HTML_EXTENSION
  $CSS $JAVASCRIPT $SLEEPY $SEARCH_CLASS @ISA
 );
-$VERSION = '3.40';
+$VERSION = '3.41';
 @ISA = ();  # Yup, we're NOT a subclass of Pod::Simple::HTML!
 
 # TODO: nocontents stylesheets. Strike some of the color variations?
@@ -94,11 +94,11 @@ sub new {
   
   
   $new->contents_page_end( sprintf(
-    "\n\n<p class='contentsfooty'>Generated by %s v%s under Perl v%s\n<br >At %s GMT, which is %s local time.</p>\n\n</body></html>\n",
+    "\n\n<p class='contentsfooty'>Generated by %s v%s under Perl v%s\n<br >At %s GMT.</p>\n\n</body></html>\n",
     esc(
       ref($new),
       eval {$new->VERSION} || $VERSION,
-      $], scalar(gmtime), scalar(localtime), 
+      $], scalar(gmtime($ENV{SOURCE_DATE_EPOCH} || time)),
   )));
 
   return $new;
@@ -871,7 +871,8 @@ $CSS = <<'EOCSS';
     background-color: #000;
   }
 
-  body.pod h1, body.pod h2, body.pod h3, body.pod h4  {
+  body.pod h1, body.pod h2, body.pod h3,
+  body.pod h4, body.pod h5, body.pod h6  {
     font-family: Tahoma, Verdana, Helvetica, Arial, sans-serif;
     font-weight: normal;
     margin-top: 1.2em;
@@ -884,11 +885,15 @@ $CSS = <<'EOCSS';
   body.pod h2  { border-top-color: #080; }
   body.pod h3  { border-top-color: #040; }
   body.pod h4  { border-top-color: #010; }
+  body.pod h5  { border-top-color: #010; }
+  body.pod h6  { border-top-color: #010; }
 
   p.backlinktop + h1 { border-top: none; margin-top: 0em;  }
   p.backlinktop + h2 { border-top: none; margin-top: 0em;  }
   p.backlinktop + h3 { border-top: none; margin-top: 0em;  }
   p.backlinktop + h4 { border-top: none; margin-top: 0em;  }
+  p.backlinktop + h5 { border-top: none; margin-top: 0em;  }
+  p.backlinktop + h6 { border-top: none; margin-top: 0em;  }
 
   body.pod dt {
     font-size: 105%; /* just a wee bit more than normal */
diff --git a/cpan/Pod-Simple/lib/Pod/Simple/JustPod.pm b/cpan/Pod-Simple/lib/Pod/Simple/JustPod.pm
index c7ad3d6977..935c9e8282 100644
--- a/cpan/Pod-Simple/lib/Pod/Simple/JustPod.pm
+++ b/cpan/Pod-Simple/lib/Pod/Simple/JustPod.pm
@@ -74,6 +74,8 @@ sub start_head1       { shift->_generic_start('=head1', @_); }
 sub start_head2       { shift->_generic_start('=head2', @_); }
 sub start_head3       { shift->_generic_start('=head3', @_); }
 sub start_head4       { shift->_generic_start('=head4', @_); }
+sub start_head5       { shift->_generic_start('=head5', @_); }
+sub start_head6       { shift->_generic_start('=head6', @_); }
 sub start_encoding    { shift->_generic_start('=encoding', @_); }
 # sub start_Para
 # sub start_Verbatim
@@ -175,6 +177,8 @@ sub _end_generic  {
 *end_head2    = *_end_generic;
 *end_head3    = *_end_generic;
 *end_head4    = *_end_generic;
+*end_head5    = *_end_generic;
+*end_head6    = *_end_generic;
 *end_encoding = *_end_generic;
 *end_Para     = *_end_generic;
 *end_Verbatim = *_end_generic;
diff --git a/cpan/Pod-Simple/lib/Pod/Simple/LinkSection.pm b/cpan/Pod-Simple/lib/Pod/Simple/LinkSection.pm
index b9ca19cdf9..ced4c3f4d2 100644
--- a/cpan/Pod-Simple/lib/Pod/Simple/LinkSection.pm
+++ b/cpan/Pod-Simple/lib/Pod/Simple/LinkSection.pm
@@ -6,7 +6,7 @@ package Pod::Simple::LinkSection;
 use strict;
 use Pod::Simple::BlackBox;
 use vars qw($VERSION );
-$VERSION = '3.40';
+$VERSION = '3.41';
 
 use overload( # So it'll stringify nice
   '""'   => \&Pod::Simple::BlackBox::stringify_lol,
diff --git a/cpan/Pod-Simple/lib/Pod/Simple/Methody.pm b/cpan/Pod-Simple/lib/Pod/Simple/Methody.pm
index 5bcee54d4f..d8fd3f2626 100644
--- a/cpan/Pod-Simple/lib/Pod/Simple/Methody.pm
+++ b/cpan/Pod-Simple/lib/Pod/Simple/Methody.pm
@@ -4,7 +4,7 @@ package Pod::Simple::Methody;
 use strict;
 use Pod::Simple ();
 use vars qw(@ISA $VERSION);
-$VERSION = '3.40';
+$VERSION = '3.41';
 @ISA = ('Pod::Simple');
 
 # Yes, we could use named variables, but I want this to be impose
diff --git a/cpan/Pod-Simple/lib/Pod/Simple/Progress.pm b/cpan/Pod-Simple/lib/Pod/Simple/Progress.pm
index 3d6f403112..5840c8cff4 100644
--- a/cpan/Pod-Simple/lib/Pod/Simple/Progress.pm
+++ b/cpan/Pod-Simple/lib/Pod/Simple/Progress.pm
@@ -1,7 +1,7 @@
 
 require 5;
 package Pod::Simple::Progress;
-$VERSION = '3.40';
+$VERSION = '3.41';
 use strict;
 
 # Objects of this class are used for noting progress of an
diff --git a/cpan/Pod-Simple/lib/Pod/Simple/PullParser.pm b/cpan/Pod-Simple/lib/Pod/Simple/PullParser.pm
index ceeb3f9250..133dd2ff84 100644
--- a/cpan/Pod-Simple/lib/Pod/Simple/PullParser.pm
+++ b/cpan/Pod-Simple/lib/Pod/Simple/PullParser.pm
@@ -1,6 +1,6 @@
 require 5;
 package Pod::Simple::PullParser;
-$VERSION = '3.40';
+$VERSION = '3.41';
 use Pod::Simple ();
 BEGIN {@ISA = ('Pod::Simple')}
 
diff --git a/cpan/Pod-Simple/lib/Pod/Simple/PullParserEndToken.pm b/cpan/Pod-Simple/lib/Pod/Simple/PullParserEndToken.pm
index d9ebdcbcf0..8a138f5483 100644
--- a/cpan/Pod-Simple/lib/Pod/Simple/PullParserEndToken.pm
+++ b/cpan/Pod-Simple/lib/Pod/Simple/PullParserEndToken.pm
@@ -5,7 +5,7 @@ use Pod::Simple::PullParserToken ();
 use strict;
 use vars qw(@ISA $VERSION);
 @ISA = ('Pod::Simple::PullParserToken');
-$VERSION = '3.40';
+$VERSION = '3.41';
 
 sub new {  # Class->new(tagname);
   my $class = shift;
diff --git a/cpan/Pod-Simple/lib/Pod/Simple/PullParserStartToken.pm b/cpan/Pod-Simple/lib/Pod/Simple/PullParserStartToken.pm
index 61608fb466..c3b56d529d 100644
--- a/cpan/Pod-Simple/lib/Pod/Simple/PullParserStartToken.pm
+++ b/cpan/Pod-Simple/lib/Pod/Simple/PullParserStartToken.pm
@@ -5,7 +5,7 @@ use Pod::Simple::PullParserToken ();
 use strict;
 use vars qw(@ISA $VERSION);
 @ISA = ('Pod::Simple::PullParserToken');
-$VERSION = '3.40';
+$VERSION = '3.41';
 
 sub new {  # Class->new(tagname, optional_attrhash);
   my $class = shift;
diff --git a/cpan/Pod-Simple/lib/Pod/Simple/PullParserTextToken.pm b/cpan/Pod-Simple/lib/Pod/Simple/PullParserTextToken.pm
index c8247a081e..dd60a951e9 100644
--- a/cpan/Pod-Simple/lib/Pod/Simple/PullParserTextToken.pm
+++ b/cpan/Pod-Simple/lib/Pod/Simple/PullParserTextToken.pm
@@ -5,7 +5,7 @@ use Pod::Simple::PullParserToken ();
 use strict;
 use vars qw(@ISA $VERSION);
 @ISA = ('Pod::Simple::PullParserToken');
-$VERSION = '3.40';
+$VERSION = '3.41';
 
 sub new {  # Class->new(text);
   my $class = shift;
diff --git a/cpan/Pod-Simple/lib/Pod/Simple/PullParserToken.pm b/cpan/Pod-Simple/lib/Pod/Simple/PullParserToken.pm
index f14b5637cd..f4b00d2aff 100644
--- a/cpan/Pod-Simple/lib/Pod/Simple/PullParserToken.pm
+++ b/cpan/Pod-Simple/lib/Pod/Simple/PullParserToken.pm
@@ -3,7 +3,7 @@ require 5;
 package Pod::Simple::PullParserToken;
  # Base class for tokens gotten from Pod::Simple::PullParser's $parser->get_token
 @ISA = ();
-$VERSION = '3.40';
+$VERSION = '3.41';
 use strict;
 
 sub new {  # Class->new('type', stuff...);  ## Overridden in derived classes anyway
diff --git a/cpan/Pod-Simple/lib/Pod/Simple/RTF.pm b/cpan/Pod-Simple/lib/Pod/Simple/RTF.pm
index ed0de149ae..9f9c2aca57 100644
--- a/cpan/Pod-Simple/lib/Pod/Simple/RTF.pm
+++ b/cpan/Pod-Simple/lib/Pod/Simple/RTF.pm
@@ -8,7 +8,7 @@ package Pod::Simple::RTF;
 
 use strict;
 use vars qw($VERSION @ISA %Escape $WRAP %Tagmap);
-$VERSION = '3.40';
+$VERSION = '3.41';
 use Pod::Simple::PullParser ();
 BEGIN {@ISA = ('Pod::Simple::PullParser')}
 
@@ -494,7 +494,7 @@ END
   # None of the following things should need escaping, I dare say!
     $tag, 
     $ISA[0], $ISA[0]->VERSION(),
-    $], scalar(gmtime),
+    $], scalar(gmtime($ENV{SOURCE_DATE_EPOCH} || time)),
   ;
 }
 
diff --git a/cpan/Pod-Simple/lib/Pod/Simple/Search.pm b/cpan/Pod-Simple/lib/Pod/Simple/Search.pm
index a07d33b85a..0fbad86de6 100644
--- a/cpan/Pod-Simple/lib/Pod/Simple/Search.pm
+++ b/cpan/Pod-Simple/lib/Pod/Simple/Search.pm
@@ -3,7 +3,7 @@ package Pod::Simple::Search;
 use strict;
 
 use vars qw($VERSION $MAX_VERSION_WITHIN $SLEEPY);
-$VERSION = '3.40';   ## Current version of this package
+$VERSION = '3.41';   ## Current version of this package
 
 BEGIN { *DEBUG = sub () {0} unless defined &DEBUG; }   # set DEBUG level
 use Carp ();
diff --git a/cpan/Pod-Simple/lib/Pod/Simple/SimpleTree.pm b/cpan/Pod-Simple/lib/Pod/Simple/SimpleTree.pm
index 85dbabcd70..63c82cafc1 100644
--- a/cpan/Pod-Simple/lib/Pod/Simple/SimpleTree.pm
+++ b/cpan/Pod-Simple/lib/Pod/Simple/SimpleTree.pm
@@ -5,7 +5,7 @@ use strict;
 use Carp ();
 use Pod::Simple ();
 use vars qw( $ATTR_PAD @ISA $VERSION $SORT_ATTRS);
-$VERSION = '3.40';
+$VERSION = '3.41';
 BEGIN {
   @ISA = ('Pod::Simple');
   *DEBUG = \&Pod::Simple::DEBUG unless defined &DEBUG;
diff --git a/cpan/Pod-Simple/lib/Pod/Simple/Text.pm b/cpan/Pod-Simple/lib/Pod/Simple/Text.pm
index de50b510ea..7feb4c504b 100644
--- a/cpan/Pod-Simple/lib/Pod/Simple/Text.pm
+++ b/cpan/Pod-Simple/lib/Pod/Simple/Text.pm
@@ -6,7 +6,7 @@ use Carp ();
 use Pod::Simple::Methody ();
 use Pod::Simple ();
 use vars qw( @ISA $VERSION $FREAKYMODE);
-$VERSION = '3.40';
+$VERSION = '3.41';
 @ISA = ('Pod::Simple::Methody');
 BEGIN { *DEBUG = defined(&Pod::Simple::DEBUG)
           ? \&Pod::Simple::DEBUG
diff --git a/cpan/Pod-Simple/lib/Pod/Simple/TextContent.pm b/cpan/Pod-Simple/lib/Pod/Simple/TextContent.pm
index ad4172b7a3..affb917edc 100644
--- a/cpan/Pod-Simple/lib/Pod/Simple/TextContent.pm
+++ b/cpan/Pod-Simple/lib/Pod/Simple/TextContent.pm
@@ -6,7 +6,7 @@ use strict;
 use Carp ();
 use Pod::Simple ();
 use vars qw( @ISA $VERSION );
-$VERSION = '3.40';
+$VERSION = '3.41';
 @ISA = ('Pod::Simple');
 
 sub new {
diff --git a/cpan/Pod-Simple/lib/Pod/Simple/TiedOutFH.pm b/cpan/Pod-Simple/lib/Pod/Simple/TiedOutFH.pm
index 0dd12c412d..93d9804c6e 100644
--- a/cpan/Pod-Simple/lib/Pod/Simple/TiedOutFH.pm
+++ b/cpan/Pod-Simple/lib/Pod/Simple/TiedOutFH.pm
@@ -4,7 +4,7 @@ package Pod::Simple::TiedOutFH;
 use Symbol ('gensym');
 use Carp ();
 use vars qw($VERSION );
-$VERSION = '3.40';
+$VERSION = '3.41';
 
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/cpan/Pod-Simple/lib/Pod/Simple/Transcode.pm b/cpan/Pod-Simple/lib/Pod/Simple/Transcode.pm
index eb12702282..8cb71d1aeb 100644
--- a/cpan/Pod-Simple/lib/Pod/Simple/Transcode.pm
+++ b/cpan/Pod-Simple/lib/Pod/Simple/Transcode.pm
@@ -3,7 +3,7 @@ require 5;
 package Pod::Simple::Transcode;
 use strict;
 use vars qw($VERSION @ISA);
-$VERSION = '3.40';
+$VERSION = '3.41';
 
 BEGIN {
   if(defined &DEBUG) {;} # Okay
diff --git a/cpan/Pod-Simple/lib/Pod/Simple/TranscodeDumb.pm b/cpan/Pod-Simple/lib/Pod/Simple/TranscodeDumb.pm
index 2b675ccb78..3f9d09d894 100644
--- a/cpan/Pod-Simple/lib/Pod/Simple/TranscodeDumb.pm
+++ b/cpan/Pod-Simple/lib/Pod/Simple/TranscodeDumb.pm
@@ -5,7 +5,7 @@ require 5;
 package Pod::Simple::TranscodeDumb;
 use strict;
 use vars qw($VERSION %Supported);
-$VERSION = '3.40';
+$VERSION = '3.41';
 # This module basically pretends it knows how to transcode, except
 #  only for null-transcodings!  We use this when Encode isn't
 #  available.
diff --git a/cpan/Pod-Simple/lib/Pod/Simple/TranscodeSmart.pm b/cpan/Pod-Simple/lib/Pod/Simple/TranscodeSmart.pm
index 99f55683ab..4d1004d8da 100644
--- a/cpan/Pod-Simple/lib/Pod/Simple/TranscodeSmart.pm
+++ b/cpan/Pod-Simple/lib/Pod/Simple/TranscodeSmart.pm
@@ -9,7 +9,7 @@ use strict;
 use Pod::Simple;
 require Encode;
 use vars qw($VERSION );
-$VERSION = '3.40';
+$VERSION = '3.41';
 
 sub is_dumb  {0}
 sub is_smart {1}
diff --git a/cpan/Pod-Simple/lib/Pod/Simple/XHTML.pm b/cpan/Pod-Simple/lib/Pod/Simple/XHTML.pm
index b9c6269bf9..d4f59dd1ed 100644
--- a/cpan/Pod-Simple/lib/Pod/Simple/XHTML.pm
+++ b/cpan/Pod-Simple/lib/Pod/Simple/XHTML.pm
@@ -45,7 +45,7 @@ declare the output character set as UTF-8 before parsing, like so:
 package Pod::Simple::XHTML;
 use strict;
 use vars qw( $VERSION @ISA $HAS_HTML_ENTITIES );
-$VERSION = '3.40';
+$VERSION = '3.41';
 use Pod::Simple::Methody ();
 @ISA = ('Pod::Simple::Methody');
 
@@ -400,6 +400,8 @@ sub start_head1 {  $_[0]{'in_head'} = 1; $_[0]{htext} = ''; }
 sub start_head2 {  $_[0]{'in_head'} = 2; $_[0]{htext} = ''; }
 sub start_head3 {  $_[0]{'in_head'} = 3; $_[0]{htext} = ''; }
 sub start_head4 {  $_[0]{'in_head'} = 4; $_[0]{htext} = ''; }
+sub start_head5 {  $_[0]{'in_head'} = 5; $_[0]{htext} = ''; }
+sub start_head6 {  $_[0]{'in_head'} = 6; $_[0]{htext} = ''; }
 
 sub start_item_number {
     $_[0]{'scratch'} = "</li>\n" if ($_[0]{'in_li'}->[-1] && pop @{$_[0]{'in_li'}});
@@ -483,6 +485,8 @@ sub end_head1       { shift->_end_head(@_); }
 sub end_head2       { shift->_end_head(@_); }
 sub end_head3       { shift->_end_head(@_); }
 sub end_head4       { shift->_end_head(@_); }
+sub end_head5       { shift->_end_head(@_); }
+sub end_head6       { shift->_end_head(@_); }
 
 sub end_item_bullet { $_[0]{'scratch'} .= '</p>'; $_[0]->emit }
 sub end_item_number { $_[0]{'scratch'} .= '</p>'; $_[0]->emit }
diff --git a/cpan/Pod-Simple/lib/Pod/Simple/XMLOutStream.pm b/cpan/Pod-Simple/lib/Pod/Simple/XMLOutStream.pm
index cb818a1740..a85520991e 100644
--- a/cpan/Pod-Simple/lib/Pod/Simple/XMLOutStream.pm
+++ b/cpan/Pod-Simple/lib/Pod/Simple/XMLOutStream.pm
@@ -5,7 +5,7 @@ use strict;
 use Carp ();
 use Pod::Simple ();
 use vars qw( $ATTR_PAD @ISA $VERSION $SORT_ATTRS);
-$VERSION = '3.40';
+$VERSION = '3.41';
 BEGIN {
   @ISA = ('Pod::Simple');
   *DEBUG = \&Pod::Simple::DEBUG unless defined &DEBUG;
diff --git a/cpan/Pod-Simple/t/00about.t b/cpan/Pod-Simple/t/00about.t
index 70fcffe12e..f7b4b606f0 100644
--- a/cpan/Pod-Simple/t/00about.t
+++ b/cpan/Pod-Simple/t/00about.t
@@ -12,6 +12,7 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Test;
 my @modules;
 BEGIN {
diff --git a/cpan/Pod-Simple/t/20_skip.t b/cpan/Pod-Simple/t/20_skip.t
index c06220e8c2..a9fdac3552 100644
--- a/cpan/Pod-Simple/t/20_skip.t
+++ b/cpan/Pod-Simple/t/20_skip.t
@@ -1,4 +1,8 @@
 # 20 skip under 5.8
+
+use strict;
+use warnings;
+
 BEGIN {
     if($ENV{PERL_CORE}) {
         chdir 't';
diff --git a/cpan/Pod-Simple/t/JustPod02.t b/cpan/Pod-Simple/t/JustPod02.t
index 8205aecaa0..e4117fe114 100644
--- a/cpan/Pod-Simple/t/JustPod02.t
+++ b/cpan/Pod-Simple/t/JustPod02.t
@@ -78,6 +78,10 @@ other interesting bits.
 
 =head4  Level "4 C<heading>
 
+=head5  Level "5 B<heading>
+
+=head6  Level "6 I<heading>
+
 Now try again with B<intermixed> F<text>.
 
 =head1 This C<is> a "level 1" heading
@@ -96,6 +100,14 @@ Text.
 
 Text.
 
+=head5  Level "5 B<heading>
+
+Text.
+
+=head6  Level "6 I<heading>
+
+Text.
+
 =head1 LINKS
 
 These are all taken from the Pod::Parser tests.
diff --git a/cpan/Pod-Simple/t/JustPod_corpus.t b/cpan/Pod-Simple/t/JustPod_corpus.t
index e0bb8780f8..86e9d92d35 100644
--- a/cpan/Pod-Simple/t/JustPod_corpus.t
+++ b/cpan/Pod-Simple/t/JustPod_corpus.t
@@ -1,5 +1,6 @@
 # Testing Pod::Simple::JustPod against *.pod in /t
 use strict;
+use warnings;
 
 BEGIN {
   if($ENV{PERL_CORE}) {
@@ -58,99 +59,129 @@ BEGIN {
   plan tests => scalar @test_files;
 }
 
+@test_files = sort @test_files;
+
+my @skip_on_windows = qw{
+  t/corpus/8859_7.pod
+  t/corpus/laozi38p.pod
+  t/junk2.pod
+  t/perlcyg.pod
+  t/perlfaq.pod
+  t/perlvar.pod
+  t/search60/A/x.pod
+  t/search60/B/X.pod
+  t/testlib1/hinkhonk/Glunk.pod
+  t/testlib1/pod/perlflif.pod
+  t/testlib1/pod/perlthng.pod
+  t/testlib1/squaa/Glunk.pod
+  t/testlib1/zikzik.pod
+  t/testlib2/hinkhonk/Glunk.pod
+  t/testlib2/pod/perlthng.pod
+  t/testlib2/pod/perlzuk.pod
+  t/testlib2/pods/perlzoned.pod
+  t/testlib2/squaa/Wowo.pod
+};
+
+my $is_windows = $^O eq 'MSWin32';
 foreach my $file (@test_files) {
-  my $parser = Pod::Simple::JustPod->new();
-  $parser->complain_stderr(0);
-
-  my $input;
-  open( IN , '<:raw' , $file ) or die "$file: $!";
-  $input .= $_ while (<IN>);
-  close( IN );
-
-  my $output;
-  $parser->output_string( \$output );
-  $parser->parse_string_document( $input );
-
-  if ($parser->any_errata_seen()) {
-    pass("Skip '$file' because of pod errors");
-    next if "$]" lt '5.010.001';     # note() not found in earlier versions
-    my $errata = $parser->errata_seen();
-    foreach my $line_number (sort { $a <=> $b } keys %$errata) {
-        foreach my $err_msg (sort @{$errata->{$line_number}}) {
-            note("$file: $line_number: $err_msg");
-        }
+  SKIP: {
+    if ( $is_windows && grep { $_ eq $file } @skip_on_windows ) {
+      skip "$file needs investigation on windows", 1;  
+    }    
+
+    my $parser = Pod::Simple::JustPod->new();
+    $parser->complain_stderr(0);
+
+    my $input;
+    open( IN , '<:raw' , $file ) or die "$file: $!";
+    $input .= $_ while (<IN>);
+    close( IN );
+
+    my $output;
+    $parser->output_string( \$output );
+    $parser->parse_string_document( $input );
+
+    if ($parser->any_errata_seen()) {
+      pass("Skip '$file' because of pod errors");
+      next if "$]" lt '5.010.001';     # note() not found in earlier versions
+      my $errata = $parser->errata_seen();
+      foreach my $line_number (sort { $a <=> $b } keys %$errata) {
+          foreach my $err_msg (sort @{$errata->{$line_number}}) {
+              note("$file: $line_number: $err_msg");
+          }
+      }
+      next;
     }
-    next;
-  }
 
-  my $encoding = $parser->encoding();
-  if (defined $encoding) {
-    eval { require Encode; };
-    $input = Encode::decode($parser->encoding(), $input);
-  }
+    my $encoding = $parser->encoding();
+    if (defined $encoding) {
+      eval { require Encode; };
+      $input = Encode::decode($parser->encoding(), $input);
+    }
 
-  my @input = split "\n", $input;
-  my $stripped_input = "";
-  while (defined ($_ = shift @input)) {
-    if (/ ^ = [a-z]+ /x) {
-      my $line = "$_\n";
+    my @input = split "\n", $input;
+    my $stripped_input = "";
+    while (defined ($_ = shift @input)) {
+      if (/ ^ = [a-z]+ /x) {
+        my $line = "$_\n";
 
-      if ($stripped_input eq "" || $_ !~ /^=pod/) {
-        $stripped_input .= $line;
-      }
-      while (defined ($_ = shift @input)) {
-        $stripped_input .= "$_\n";
-        last if / ^ =cut /x;
+        if ($stripped_input eq "" || $_ !~ /^=pod/) {
+          $stripped_input .= $line;
+        }
+        while (defined ($_ = shift @input)) {
+          $stripped_input .= "$_\n";
+          last if / ^ =cut /x;
+        }
       }
     }
-  }
-  $stripped_input =~ s/ ^ =cut \n (.) /$1/mgx;
+    $stripped_input =~ s/ ^ =cut \n (.) /$1/mgx;
 
-  $input = $stripped_input if $stripped_input ne "";
-  if ($input !~ / ^ =pod /x) {
-    $input =~ s/ ^ \s+ //x;
-    $input = "=pod\n\n$input";
-  }
-  if ($input !~ / =cut $ /x) {
-    $input =~ s/ \s+ $ //x;
-    $input .= "\n\n=cut\n";
-  }
+    $input = $stripped_input if $stripped_input ne "";
+    if ($input !~ / ^ =pod /x) {
+      $input =~ s/ ^ \s+ //x;
+      $input = "=pod\n\n$input";
+    }
+    if ($input !~ / =cut $ /x) {
+      $input =~ s/ \s+ $ //x;
+      $input .= "\n\n=cut\n";
+    }
 
-  my $msg = "got expected output for $file";
-  if ($output eq $input) {
-      pass($msg);
-  }
-  elsif ($ENV{PERL_TEST_DIFF}) {
-    fail($msg);
-    require File::Temp;
-    my $orig_file = File::Temp->new();
-    local $/ = "\n";
-    chomp $input;
-    print $orig_file $input, "\n";
-    close $orig_file || die "Can't close orig_file: $!";
-
-    chomp $output;
-    my $parsed_file = File::Temp->new();
-    print $parsed_file $output, "\n";
-    close $parsed_file || die "Can't close parsed_file";
-
-    my $diff = File::Temp->new();
-    system("$ENV{PERL_TEST_DIFF} $orig_file $parsed_file > $diff");
-
-    open my $fh, "<", $diff || die "Can't open $diff";
-    my @diffs = <$fh>;
-    diag(@diffs);
-  }
-  else {
-      eval { require Text::Diff; };
-      if ($@) {
-          is($output, $input, $msg);
-          diag("Set environment variable PERL_TEST_DIFF=diff_tool or install"
-             . " Text::Diff to see just the differences.");
-      }
-      else {
-          fail($msg);
-          diag Text::Diff::diff(\$input, \$output, { STYLE => 'Unified' });
-      }
+    my $msg = "got expected output for $file";
+    if ($output eq $input) {
+        pass($msg);
+    }
+    elsif ($ENV{PERL_TEST_DIFF}) {
+      fail($msg);
+      require File::Temp;
+      my $orig_file = File::Temp->new();
+      local $/ = "\n";
+      chomp $input;
+      print $orig_file $input, "\n";
+      close $orig_file || die "Can't close orig_file: $!";
+
+      chomp $output;
+      my $parsed_file = File::Temp->new();
+      print $parsed_file $output, "\n";
+      close $parsed_file || die "Can't close parsed_file";
+
+      my $diff = File::Temp->new();
+      system("$ENV{PERL_TEST_DIFF} $orig_file $parsed_file > $diff");
+
+      open my $fh, "<", $diff || die "Can't open $diff";
+      my @diffs = <$fh>;
+      diag(@diffs);
+    }
+    else {
+        eval { require Text::Diff; };
+        if ($@) {
+            is($output, $input, $msg);
+            diag("Set environment variable PERL_TEST_DIFF=diff_tool or install"
+               . " Text::Diff to see just the differences.");
+        }
+        else {
+            fail($msg);
+            diag Text::Diff::diff(\$input, \$output, { STYLE => 'Unified' });
+        }
+    }
   }
 }
diff --git a/cpan/Pod-Simple/t/ac_d.t b/cpan/Pod-Simple/t/ac_d.t
index 398456d236..74635f0425 100644
--- a/cpan/Pod-Simple/t/ac_d.t
+++ b/cpan/Pod-Simple/t/ac_d.t
@@ -6,6 +6,7 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 14 };
 
@@ -18,8 +19,6 @@ print "# Pod::Simple version $Pod::Simple::VERSION\n";
 $Pod::Simple::XMLOutStream::ATTR_PAD   = ' ';
 $Pod::Simple::XMLOutStream::SORT_ATTRS = 1; # for predictably testable output
 
-#sub e ($$) { Pod::Simple::DumpAsXML->_duo(@_) }
-
 $Pod::Simple::XMLOutStream::ATTR_PAD   = ' ';
 $Pod::Simple::XMLOutStream::SORT_ATTRS = 1; # for predictably testable output
 
diff --git a/cpan/Pod-Simple/t/accept01.t b/cpan/Pod-Simple/t/accept01.t
index 5c739e29d5..f7d9a9517a 100644
--- a/cpan/Pod-Simple/t/accept01.t
+++ b/cpan/Pod-Simple/t/accept01.t
@@ -7,6 +7,7 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 13 };
 
@@ -17,7 +18,13 @@ ok 1;
 use Pod::Simple::DumpAsXML;
 use Pod::Simple::XMLOutStream;
 print "# Pod::Simple version $Pod::Simple::VERSION\n";
-sub e ($$) { Pod::Simple::DumpAsXML->_duo(@_) }
+
+BEGIN {
+  require FindBin;
+  unshift @INC, $FindBin::Bin . '/lib';
+  require helpers;
+  helpers->import;
+}
 
 my $x = 'Pod::Simple::XMLOutStream';
 sub accept_N { $_[0]->accept_codes('N') }
diff --git a/cpan/Pod-Simple/t/accept05.t b/cpan/Pod-Simple/t/accept05.t
index f259ff2a3f..bcac1ac055 100644
--- a/cpan/Pod-Simple/t/accept05.t
+++ b/cpan/Pod-Simple/t/accept05.t
@@ -7,6 +7,7 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 24 };
 
@@ -17,7 +18,13 @@ ok 1;
 use Pod::Simple::DumpAsXML;
 use Pod::Simple::XMLOutStream;
 print "# Pod::Simple version $Pod::Simple::VERSION\n";
-sub e ($$) { Pod::Simple::DumpAsXML->_duo(@_) }
+
+BEGIN {
+  require FindBin;
+  unshift @INC, $FindBin::Bin . '/lib';
+  require helpers;
+  helpers->import;
+}
 
 my $x = 'Pod::Simple::XMLOutStream';
 sub accept_Q    { $_[0]->accept_codes('Q') }
diff --git a/cpan/Pod-Simple/t/basic.t b/cpan/Pod-Simple/t/basic.t
index 157a640c9c..9b1cecfd33 100644
--- a/cpan/Pod-Simple/t/basic.t
+++ b/cpan/Pod-Simple/t/basic.t
@@ -6,6 +6,7 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 31 };
 
@@ -26,7 +27,12 @@ require Pod::Simple::DumpAsXML; ok 1;
 
 require Pod::Simple::XMLOutStream; ok 1;
 
-sub e ($$) { Pod::Simple::DumpAsXML->_duo(@_) }
+BEGIN {
+  require FindBin;
+  unshift @INC, $FindBin::Bin . '/lib';
+  require helpers;
+  helpers->import;
+}
 
 print "# Simple identity tests...\n";
 
diff --git a/cpan/Pod-Simple/t/begin.t b/cpan/Pod-Simple/t/begin.t
index 3b40095d22..4cfb494822 100644
--- a/cpan/Pod-Simple/t/begin.t
+++ b/cpan/Pod-Simple/t/begin.t
@@ -6,6 +6,7 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 62 };
 
@@ -18,7 +19,13 @@ ok 1;
 use Pod::Simple::DumpAsXML;
 use Pod::Simple::XMLOutStream;
 print "# Pod::Simple version $Pod::Simple::VERSION\n";
-sub e ($$) { Pod::Simple::DumpAsXML->_duo(@_) }
+
+BEGIN {
+  require FindBin;
+  unshift @INC, $FindBin::Bin . '/lib';
+  require helpers;
+  helpers->import;
+}
 
 my $x = 'Pod::Simple::XMLOutStream';
 $Pod::Simple::XMLOutStream::ATTR_PAD   = ' ';
diff --git a/cpan/Pod-Simple/t/cbacks.t b/cpan/Pod-Simple/t/cbacks.t
index 1d639bbf15..cb89b02ba6 100644
--- a/cpan/Pod-Simple/t/cbacks.t
+++ b/cpan/Pod-Simple/t/cbacks.t
@@ -6,6 +6,7 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 8 };
 
diff --git a/cpan/Pod-Simple/t/chunking.t b/cpan/Pod-Simple/t/chunking.t
index f51766dd7b..c372e460da 100644
--- a/cpan/Pod-Simple/t/chunking.t
+++ b/cpan/Pod-Simple/t/chunking.t
@@ -8,16 +8,22 @@ BEGIN {
 #use Pod::Simple::Debug (2);
 
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 11 };
 
+BEGIN {
+  require FindBin;
+  unshift @INC, $FindBin::Bin . '/lib';
+  require helpers;
+  helpers->import;
+}
 
 ok 1;
 
 use Pod::Simple::DumpAsXML;
 use Pod::Simple::XMLOutStream;
 print "# Pod::Simple version $Pod::Simple::VERSION\n";
-sub e ($$) { Pod::Simple::DumpAsXML->_duo(@_) }
 
 ok( Pod::Simple::XMLOutStream->_out("=head1 =head1"),
     '<Document><head1>=head1</head1></Document>'
diff --git a/cpan/Pod-Simple/t/closeys.t b/cpan/Pod-Simple/t/closeys.t
index 7e2b3f85e9..a232464cd3 100644
--- a/cpan/Pod-Simple/t/closeys.t
+++ b/cpan/Pod-Simple/t/closeys.t
@@ -6,9 +6,17 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 3 };
 
+BEGIN {
+  require FindBin;
+  unshift @INC, $FindBin::Bin . '/lib';
+  require helpers;
+  helpers->import('f');
+}
+
 my $d;
 #use Pod::Simple::Debug (\$d,0);
 #use Pod::Simple::Debug (10);
@@ -18,7 +26,6 @@ ok 1;
 use Pod::Simple::DumpAsXML;
 use Pod::Simple::XMLOutStream;
 print "# Pod::Simple version $Pod::Simple::VERSION\n";
-sub e     ($$) { Pod::Simple::XMLOutStream::->_duo(\&nowhine, @_) }
 
 sub nowhine {
 #  $_[0]->{'no_whining'} = 1;
@@ -26,7 +33,8 @@ sub nowhine {
 }
 
 local $Pod::Simple::XMLOutStream::SORT_ATTRS = 1;
-&ok(e(
+&ok(f(
+	\&nowhine,
 "=begin :foo\n\n=begin :bar\n\nZaz\n\n",
 "=begin :foo\n\n=begin :bar\n\nZaz\n\n=end :bar\n\n=end :foo\n\n",
 ));
diff --git a/cpan/Pod-Simple/t/content_seen.t b/cpan/Pod-Simple/t/content_seen.t
index 82095bafb2..67296aff86 100644
--- a/cpan/Pod-Simple/t/content_seen.t
+++ b/cpan/Pod-Simple/t/content_seen.t
@@ -6,6 +6,7 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 2 };
 
diff --git a/cpan/Pod-Simple/t/corpus.t b/cpan/Pod-Simple/t/corpus.t
index 4075f91fd9..013ee3fcb3 100644
--- a/cpan/Pod-Simple/t/corpus.t
+++ b/cpan/Pod-Simple/t/corpus.t
@@ -22,6 +22,7 @@ use Test qw(plan ok skip);
 use File::Spec;
 #use utf8;
 use strict;
+use warnings;
 my(@testfiles, %xmlfiles, %wouldxml);
 #use Pod::Simple::Debug (10);
 BEGIN { 
diff --git a/cpan/Pod-Simple/t/emptylists.t b/cpan/Pod-Simple/t/emptylists.t
index 619cd63bb8..2edfbc8bd2 100644
--- a/cpan/Pod-Simple/t/emptylists.t
+++ b/cpan/Pod-Simple/t/emptylists.t
@@ -6,6 +6,7 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 5 };
 
diff --git a/cpan/Pod-Simple/t/enc-chars.t b/cpan/Pod-Simple/t/enc-chars.t
index 1455ae6417..a648b9e76e 100644
--- a/cpan/Pod-Simple/t/enc-chars.t
+++ b/cpan/Pod-Simple/t/enc-chars.t
@@ -16,6 +16,7 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 5 };
 
diff --git a/cpan/Pod-Simple/t/encod01.t b/cpan/Pod-Simple/t/encod01.t
index 0f83dcc3e2..10c916bdf7 100644
--- a/cpan/Pod-Simple/t/encod01.t
+++ b/cpan/Pod-Simple/t/encod01.t
@@ -11,6 +11,7 @@ use Test;
 use File::Spec;
 #use utf8;
 use strict;
+use warnings;
 #use Pod::Simple::Debug (10);
 
 BEGIN { plan tests => 6 }
diff --git a/cpan/Pod-Simple/t/encod02.t b/cpan/Pod-Simple/t/encod02.t
index a29cbdc67a..f4e8092745 100644
--- a/cpan/Pod-Simple/t/encod02.t
+++ b/cpan/Pod-Simple/t/encod02.t
@@ -7,6 +7,7 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 4 };
 
diff --git a/cpan/Pod-Simple/t/encod03.t b/cpan/Pod-Simple/t/encod03.t
index 48ab2f46cc..c92b2280c9 100644
--- a/cpan/Pod-Simple/t/encod03.t
+++ b/cpan/Pod-Simple/t/encod03.t
@@ -7,6 +7,7 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 4 };
 
diff --git a/cpan/Pod-Simple/t/encod04.t b/cpan/Pod-Simple/t/encod04.t
index 8f41f98a6c..6a821328ea 100644
--- a/cpan/Pod-Simple/t/encod04.t
+++ b/cpan/Pod-Simple/t/encod04.t
@@ -10,6 +10,7 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Test;
 BEGIN {
     plan tests => 6, todo => [];
diff --git a/cpan/Pod-Simple/t/end_over.t b/cpan/Pod-Simple/t/end_over.t
index ccea3fe5e5..e4021ccfd6 100644
--- a/cpan/Pod-Simple/t/end_over.t
+++ b/cpan/Pod-Simple/t/end_over.t
@@ -7,8 +7,16 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Test;
-BEGIN { plan tests => 5 };
+BEGIN { plan tests => 7 };
+
+BEGIN {
+  require FindBin;
+  unshift @INC, $FindBin::Bin . '/lib';
+  require helpers;
+  helpers->import('f');
+}
 
 my $d;
 #use Pod::Simple::Debug (\$d,0);
@@ -18,32 +26,47 @@ ok 1;
 use Pod::Simple::DumpAsXML;
 use Pod::Simple::XMLOutStream;
 print "# Pod::Simple version $Pod::Simple::VERSION\n";
-sub e     ($$) { Pod::Simple::XMLOutStream::->_duo(\&nowhine, @_) }
 
 sub nowhine {
   $_[0]->{'no_whining'} = 1;
 }
 
-&ok(e(
+&ok(f(
+\&nowhine,
 "=head2 BLOOP\n\nHoopbehwo!\n\n=over\n\n=item Stuff.  Um.\n\nBrop.\n\n=head1 SVUP\n\nMyup.",
 "=head2 BLOOP\n\nHoopbehwo!\n\n=over\n\n=item Stuff.  Um.\n\nBrop.\n\n=back\n\n=head1 SVUP\n\nMyup.",
 ));
 
-&ok(e(
+&ok(f(
+\&nowhine,
 "=head2 BLOOP\n\nHoopbehwo!\n\n=over\n\n=item Stuff.  Um.\n\nBrop.\n\n=head2 SVUP\n\nMyup.",
 "=head2 BLOOP\n\nHoopbehwo!\n\n=over\n\n=item Stuff.  Um.\n\nBrop.\n\n=back\n\n=head2 SVUP\n\nMyup.",
 ));
 
-&ok(e(
+&ok(f(
+\&nowhine,
 "=head2 BLOOP\n\nHoopbehwo!\n\n=over\n\n=item Stuff.  Um.\n\nBrop.\n\n=head3 SVUP\n\nMyup.",
 "=head2 BLOOP\n\nHoopbehwo!\n\n=over\n\n=item Stuff.  Um.\n\nBrop.\n\n=back\n\n=head3 SVUP\n\nMyup.",
 ));
 
-&ok(e(
+&ok(f(
+\&nowhine,
 "=head2 BLOOP\n\nHoopbehwo!\n\n=over\n\n=item Stuff.  Um.\n\nBrop.\n\n=head4 SVUP\n\nMyup.",
 "=head2 BLOOP\n\nHoopbehwo!\n\n=over\n\n=item Stuff.  Um.\n\nBrop.\n\n=back\n\n=head4 SVUP\n\nMyup.",
 ));
 
+&ok(f(
+\&nowhine,
+"=head2 BLOOP\n\nHoopbehwo!\n\n=over\n\n=item Stuff.  Um.\n\nBrop.\n\n=head5 SVUP\n\nMyup.",
+"=head2 BLOOP\n\nHoopbehwo!\n\n=over\n\n=item Stuff.  Um.\n\nBrop.\n\n=back\n\n=head5 SVUP\n\nMyup.",
+));
+
+&ok(f(
+\&nowhine,
+"=head2 BLOOP\n\nHoopbehwo!\n\n=over\n\n=item Stuff.  Um.\n\nBrop.\n\n=head6 SVUP\n\nMyup.",
+"=head2 BLOOP\n\nHoopbehwo!\n\n=over\n\n=item Stuff.  Um.\n\nBrop.\n\n=back\n\n=head6 SVUP\n\nMyup.",
+));
+
 
 __END__
 
diff --git a/cpan/Pod-Simple/t/fcodes.t b/cpan/Pod-Simple/t/fcodes.t
index a746b26aa0..6cffcbaabc 100644
--- a/cpan/Pod-Simple/t/fcodes.t
+++ b/cpan/Pod-Simple/t/fcodes.t
@@ -6,17 +6,23 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 23 };
 
 #use Pod::Simple::Debug (5);
+BEGIN {
+  require FindBin;
+  unshift @INC, $FindBin::Bin . '/lib';
+  require helpers;
+  helpers->import;
+}
 
 ok 1;
 
 use Pod::Simple::DumpAsXML;
 use Pod::Simple::XMLOutStream;
 print "# Pod::Simple version $Pod::Simple::VERSION\n";
-sub e ($$) { Pod::Simple::DumpAsXML->_duo(@_) }
 
 print "# With weird leading whitespace...\n";
 # With weird whitespace
diff --git a/cpan/Pod-Simple/t/fcodes_e.t b/cpan/Pod-Simple/t/fcodes_e.t
index a0026dc67a..63d2ab192a 100644
--- a/cpan/Pod-Simple/t/fcodes_e.t
+++ b/cpan/Pod-Simple/t/fcodes_e.t
@@ -7,9 +7,16 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 20 };
 
+BEGIN {
+  require FindBin;
+  unshift @INC, $FindBin::Bin . '/lib';
+  require helpers;
+  helpers->import;
+}
 #use Pod::Simple::Debug (6);
 
 ok 1;
@@ -23,9 +30,6 @@ print "# Pod::Escapes version $Pod::Escapes::VERSION\n",
  if $Pod::Escapes::VERSION;
 # Presumably that's the library being used
 
-
-sub e ($$) { Pod::Simple::DumpAsXML->_duo(@_) }
-
 &ok( e "", "" );
 &ok( e "\n", "", );
 
diff --git a/cpan/Pod-Simple/t/fcodes_l.t b/cpan/Pod-Simple/t/fcodes_l.t
index 3433d24425..f634aaadbf 100644
--- a/cpan/Pod-Simple/t/fcodes_l.t
+++ b/cpan/Pod-Simple/t/fcodes_l.t
@@ -7,9 +7,17 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 101 };
 
+BEGIN {
+  require FindBin;
+  unshift @INC, $FindBin::Bin . '/lib';
+  require helpers;
+  helpers->import;
+}
+
 #use Pod::Simple::Debug (10);
 
 ok 1;
@@ -17,7 +25,7 @@ ok 1;
 use Pod::Simple::DumpAsXML;
 use Pod::Simple::XMLOutStream;
 print "# Pod::Simple version $Pod::Simple::VERSION\n";
-sub e ($$) { Pod::Simple::DumpAsXML->_duo(@_) }
+
 my $x = 'Pod::Simple::XMLOutStream';
 
 print "##### Testing L codes via x class $x...\n";
diff --git a/cpan/Pod-Simple/t/fcodes_s.t b/cpan/Pod-Simple/t/fcodes_s.t
index fd48ec07bf..c8636d43c0 100644
--- a/cpan/Pod-Simple/t/fcodes_s.t
+++ b/cpan/Pod-Simple/t/fcodes_s.t
@@ -7,6 +7,7 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 80 };
 
@@ -17,7 +18,8 @@ ok 1;
 use Pod::Simple::XMLOutStream;
 print "# Pod::Simple version $Pod::Simple::VERSION\n";
 my $x = 'Pod::Simple::XMLOutStream';
-sub e ($$) { $x->_duo(@_) }
+
+sub e { $x->_duo(@_) }
 
 $Pod::Simple::XMLOutStream::ATTR_PAD   = ' ';
 $Pod::Simple::XMLOutStream::SORT_ATTRS = 1; # for predictably testable output
@@ -221,7 +223,7 @@ ok(
 use Pod::Simple::HTML;
 my $PERLDOC = "https://metacpan.org/pod";
 my $MANURL = "http://man.he.net/man";
-sub x ($) {
+sub x {
     Pod::Simple::HTML->_out(
         sub {  $_[0]->bare_output(1)  },
         "=pod\n\n$_[0]",
diff --git a/cpan/Pod-Simple/t/for.t b/cpan/Pod-Simple/t/for.t
index 158cdc2b58..daf8b21670 100644
--- a/cpan/Pod-Simple/t/for.t
+++ b/cpan/Pod-Simple/t/for.t
@@ -6,17 +6,23 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 21 };
 
 #use Pod::Simple::Debug (5);
+BEGIN {
+  require FindBin;
+  unshift @INC, $FindBin::Bin . '/lib';
+  require helpers;
+  helpers->import;
+}
 
 ok 1;
 
 use Pod::Simple::DumpAsXML;
 use Pod::Simple::XMLOutStream;
 print "# Pod::Simple version $Pod::Simple::VERSION\n";
-sub e ($$) { Pod::Simple::DumpAsXML->_duo(@_) }
 
 my $x = 'Pod::Simple::XMLOutStream';
 $Pod::Simple::XMLOutStream::ATTR_PAD   = ' ';
diff --git a/cpan/Pod-Simple/t/fornot.t b/cpan/Pod-Simple/t/fornot.t
index 863b00aa6e..96932d094c 100644
--- a/cpan/Pod-Simple/t/fornot.t
+++ b/cpan/Pod-Simple/t/fornot.t
@@ -6,17 +6,23 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 21 };
 
 #use Pod::Simple::Debug (5);
+BEGIN {
+  require FindBin;
+  unshift @INC, $FindBin::Bin . '/lib';
+  require helpers;
+  helpers->import;
+}
 
 ok 1;
 
 use Pod::Simple::DumpAsXML;
 use Pod::Simple::XMLOutStream;
 print "# Pod::Simple version $Pod::Simple::VERSION\n";
-sub e ($$) { Pod::Simple::DumpAsXML->_duo(@_) }
 
 my $x = 'Pod::Simple::XMLOutStream';
 $Pod::Simple::XMLOutStream::ATTR_PAD   = ' ';
diff --git a/cpan/Pod-Simple/t/heads.t b/cpan/Pod-Simple/t/heads.t
index bd04ce3ba2..6035405c30 100644
--- a/cpan/Pod-Simple/t/heads.t
+++ b/cpan/Pod-Simple/t/heads.t
@@ -6,20 +6,27 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Test;
-BEGIN { plan tests => 19 };
+BEGIN { plan tests => 23 };
 
 #use Pod::Simple::Debug (6);
 
+BEGIN {
+  require FindBin;
+  unshift @INC, $FindBin::Bin . '/lib';
+  require helpers;
+  helpers->import;
+}
+
 ok 1;
 
 use Pod::Simple::DumpAsXML;
 use Pod::Simple::XMLOutStream;
 print "# Pod::Simple version $Pod::Simple::VERSION\n";
-sub e ($$) { Pod::Simple::DumpAsXML->_duo(@_) }
 
 
-print "# Simple tests for head1 - head4...\n";
+print "# Simple tests for head1 - head6...\n";
 ok( Pod::Simple::XMLOutStream->_out("\n=head1 Chacha\n\n"),
     '<Document><head1>Chacha</head1></Document>'
 );
@@ -32,6 +39,12 @@ ok( Pod::Simple::XMLOutStream->_out("\n=head3 Chacha\n\n"),
 ok( Pod::Simple::XMLOutStream->_out("\n=head4 Chacha\n\n"),
     '<Document><head4>Chacha</head4></Document>'
 );
+ok( Pod::Simple::XMLOutStream->_out("\n=head5 Chacha\n\n"),
+    '<Document><head5>Chacha</head5></Document>'
+);
+ok( Pod::Simple::XMLOutStream->_out("\n=head6 Chacha\n\n"),
+    '<Document><head6>Chacha</head6></Document>'
+);
 
 print "# Testing whitespace equivalence...\n";
 
@@ -57,7 +70,7 @@ ok( Pod::Simple::XMLOutStream->_out("=head1     Cha   cha\tcha   \n"),
 
 
 
-print "# Testing head2, head3, head4 more...\n";
+print "# Testing head2 ... head6 more...\n";
 
 ok( Pod::Simple::XMLOutStream->_out("=head2     Cha   cha\tcha   \n"),
     '<Document><head2>Cha cha cha</head2></Document>'
@@ -68,6 +81,12 @@ ok( Pod::Simple::XMLOutStream->_out("=head3     Cha   cha\tcha   \n"),
 ok( Pod::Simple::XMLOutStream->_out("=head4     Cha   cha\tcha   \n"),
     '<Document><head4>Cha cha cha</head4></Document>'
 );
+ok( Pod::Simple::XMLOutStream->_out("=head5     Cha   cha\tcha   \n"),
+    '<Document><head5>Cha cha cha</head5></Document>'
+);
+ok( Pod::Simple::XMLOutStream->_out("=head6     Cha   cha\tcha   \n"),
+    '<Document><head6>Cha cha cha</head6></Document>'
+);
 
 print "# Testing entity expansion...\n";
 
diff --git a/cpan/Pod-Simple/t/html01.t b/cpan/Pod-Simple/t/html01.t
index 8d8e528320..a0e1a55a76 100644
--- a/cpan/Pod-Simple/t/html01.t
+++ b/cpan/Pod-Simple/t/html01.t
@@ -8,14 +8,15 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Test;
-BEGIN { plan tests => 14 };
+BEGIN { plan tests => 16 };
 
 #use Pod::Simple::Debug (10);
 
 use Pod::Simple::HTML;
 
-sub x ($;&) {
+sub x {
   my $code = $_[1];
   Pod::Simple::HTML->_out(
   sub{  $_[0]->bare_output(1); $code->($_[0]) if $code  },
@@ -79,6 +80,18 @@ ok(x(
 );
 
 ok(x(
+'=head5 The number of the heading shall be five')
+ => q{/\s*<h5><a[^<>]+>The\s+number\s+of\s+the\s+heading\s+shall\s+be\s+five</a></h5>\s*$/},
+  "heading building"
+);
+
+ok(x(
+'=head6 The sixth a heading is the perfect heading')
+ => q{/\s*<h6><a[^<>]+>The\s+sixth\s+a\s+heading\s+is\s+the\s+perfect\s+heading</a></h6>\s*$/},
+  "heading building"
+);
+
+ok(x(
 '=head2 Yada Yada Operator
 X<...> X<... operator> X<yada yada operator>')
  => q{/name="Yada_Yada_Operator"/},
diff --git a/cpan/Pod-Simple/t/html02.t b/cpan/Pod-Simple/t/html02.t
index 02349f36e5..265dffd52c 100644
--- a/cpan/Pod-Simple/t/html02.t
+++ b/cpan/Pod-Simple/t/html02.t
@@ -10,11 +10,12 @@ BEGIN {
 #use Pod::Simple::Debug (10);
 
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 7};
 use Pod::Simple::HTML;
 
-sub x ($) { Pod::Simple::HTML->_out(
+sub x { Pod::Simple::HTML->_out(
   sub{  $_[0]->bare_output(1)  },
   "=pod\n\n$_[0]",
 ) }
diff --git a/cpan/Pod-Simple/t/html03.t b/cpan/Pod-Simple/t/html03.t
index 5a59ba2f74..f86e2cce02 100644
--- a/cpan/Pod-Simple/t/html03.t
+++ b/cpan/Pod-Simple/t/html03.t
@@ -8,6 +8,7 @@ BEGIN {
 }
  
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 7 };
 
@@ -15,12 +16,11 @@ BEGIN { plan tests => 7 };
 
 use Pod::Simple::HTML;
 
-sub x ($) { Pod::Simple::HTML->_out(
+sub x { Pod::Simple::HTML->_out(
   #sub{  $_[0]->bare_output(1)  },
   "=pod\n\n$_[0]",
 ) }
 
-
 # make sure empty file => empty output
 
 ok 1;
diff --git a/cpan/Pod-Simple/t/htmlbat.t b/cpan/Pod-Simple/t/htmlbat.t
index ca58e6ea8e..7a870a8e69 100644
--- a/cpan/Pod-Simple/t/htmlbat.t
+++ b/cpan/Pod-Simple/t/htmlbat.t
@@ -8,6 +8,7 @@ BEGIN {
 
 # Time-stamp: "2004-05-24 02:07:47 ADT"
 use strict;
+use warnings;
 my $DEBUG = 0;
 
 #sub Pod::Simple::HTMLBatch::DEBUG () {5};
diff --git a/cpan/Pod-Simple/t/items.t b/cpan/Pod-Simple/t/items.t
index f76cf59fa5..83791bcbd8 100644
--- a/cpan/Pod-Simple/t/items.t
+++ b/cpan/Pod-Simple/t/items.t
@@ -6,18 +6,25 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 24 };
 
 my $d;
 #use Pod::Simple::Debug (\$d,0);
 
+BEGIN {
+  require FindBin;
+  unshift @INC, $FindBin::Bin . '/lib';
+  require helpers;
+  helpers->import;
+}
+
 ok 1;
 
 use Pod::Simple::DumpAsXML;
 use Pod::Simple::XMLOutStream;
 print "# Pod::Simple version $Pod::Simple::VERSION\n";
-sub e ($$) { Pod::Simple::DumpAsXML->_duo(@_) }
 
 my $x = 'Pod::Simple::XMLOutStream';
 
diff --git a/cpan/Pod-Simple/t/items02.t b/cpan/Pod-Simple/t/items02.t
index daab8efe6c..db2a191884 100644
--- a/cpan/Pod-Simple/t/items02.t
+++ b/cpan/Pod-Simple/t/items02.t
@@ -7,9 +7,17 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 4 };
 
+BEGIN {
+  require FindBin;
+  unshift @INC, $FindBin::Bin . '/lib';
+  require helpers;
+  helpers->import;
+}
+
 my $d;
 #use Pod::Simple::Debug (\$d,0);
 
@@ -18,7 +26,6 @@ ok 1;
 use Pod::Simple::DumpAsXML;
 use Pod::Simple::XMLOutStream;
 print "# Pod::Simple version $Pod::Simple::VERSION\n";
-sub e ($$) { Pod::Simple::DumpAsXML->_duo(@_) }
 
 my $x = 'Pod::Simple::XMLOutStream';
 
diff --git a/cpan/Pod-Simple/t/itemstar.t b/cpan/Pod-Simple/t/itemstar.t
index 4e6ac41b66..2d0cce9657 100644
--- a/cpan/Pod-Simple/t/itemstar.t
+++ b/cpan/Pod-Simple/t/itemstar.t
@@ -6,9 +6,16 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 6 };
 
+BEGIN {
+  require FindBin;
+  unshift @INC, $FindBin::Bin . '/lib';
+  require helpers;
+  helpers->import;
+}
 #my $d;
 #use Pod::Simple::Debug (3);
 
@@ -17,7 +24,6 @@ ok 1;
 use Pod::Simple::DumpAsXML;
 use Pod::Simple::XMLOutStream;
 print "# Pod::Simple version $Pod::Simple::VERSION\n";
-sub e ($$) { Pod::Simple::DumpAsXML->_duo(@_) }
 
 my $x = 'Pod::Simple::XMLOutStream';
 
diff --git a/cpan/Pod-Simple/t/lib/helpers.pm b/cpan/Pod-Simple/t/lib/helpers.pm
new file mode 100644
index 0000000000..2b77be8241
--- /dev/null
+++ b/cpan/Pod-Simple/t/lib/helpers.pm
@@ -0,0 +1,18 @@
+#!perl
+
+package helpers;
+
+use strict;
+use warnings;
+
+use Exporter;
+
+our @ISA = qw{Exporter};
+
+our @EXPORT_OK = qw(e f);
+our @EXPORT = qw{e};
+
+sub e { Pod::Simple::DumpAsXML->_duo(@_) };
+sub f { Pod::Simple::DumpAsXML->_duo(@_) };
+
+1;
\ No newline at end of file
diff --git a/cpan/Pod-Simple/t/linkclas.t b/cpan/Pod-Simple/t/linkclas.t
index 50fbfcc272..8de5c5922a 100644
--- a/cpan/Pod-Simple/t/linkclas.t
+++ b/cpan/Pod-Simple/t/linkclas.t
@@ -9,6 +9,7 @@ BEGIN {
 ### Test the basic sanity of the link-section treelet class
 
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 8 };
 
diff --git a/cpan/Pod-Simple/t/output.t b/cpan/Pod-Simple/t/output.t
index 822c2397a4..5da0f3761f 100644
--- a/cpan/Pod-Simple/t/output.t
+++ b/cpan/Pod-Simple/t/output.t
@@ -7,6 +7,7 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use lib '../lib';
 use Test::More tests => 36;
 #use Test::More 'no_plan';
diff --git a/cpan/Pod-Simple/t/puller.t b/cpan/Pod-Simple/t/puller.t
index df0e00ef69..33ba50ebf1 100644
--- a/cpan/Pod-Simple/t/puller.t
+++ b/cpan/Pod-Simple/t/puller.t
@@ -6,6 +6,7 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 136 };
 
diff --git a/cpan/Pod-Simple/t/pulltitl.t b/cpan/Pod-Simple/t/pulltitl.t
index 6fbb6244ab..51b3503e80 100644
--- a/cpan/Pod-Simple/t/pulltitl.t
+++ b/cpan/Pod-Simple/t/pulltitl.t
@@ -6,6 +6,7 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 117 };
 
diff --git a/cpan/Pod-Simple/t/reinit.t b/cpan/Pod-Simple/t/reinit.t
index 8576e9963e..2cbc3cd199 100644
--- a/cpan/Pod-Simple/t/reinit.t
+++ b/cpan/Pod-Simple/t/reinit.t
@@ -8,6 +8,7 @@ BEGIN {
 use lib '../lib';
 
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 5 };
 
diff --git a/cpan/Pod-Simple/t/render.t b/cpan/Pod-Simple/t/render.t
index dd0ee2b6d0..c8ddf64383 100644
--- a/cpan/Pod-Simple/t/render.t
+++ b/cpan/Pod-Simple/t/render.t
@@ -8,6 +8,7 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 26 };
 use Pod::Simple::TextContent;
diff --git a/cpan/Pod-Simple/t/rtf_utf8.t b/cpan/Pod-Simple/t/rtf_utf8.t
index 0d2d8ecf73..4ef7ec709c 100644
--- a/cpan/Pod-Simple/t/rtf_utf8.t
+++ b/cpan/Pod-Simple/t/rtf_utf8.t
@@ -9,6 +9,7 @@ BEGIN {
 my $expected = join "", <DATA>;
 
 use strict;
+use warnings;
 use lib '../lib';
 use Test::More;
 use File::Spec;
diff --git a/cpan/Pod-Simple/t/search05.t b/cpan/Pod-Simple/t/search05.t
index 7250320a9a..b2ea68e51d 100644
--- a/cpan/Pod-Simple/t/search05.t
+++ b/cpan/Pod-Simple/t/search05.t
@@ -6,6 +6,7 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Pod::Simple::Search;
 use Test;
 BEGIN { plan tests => 16 }
diff --git a/cpan/Pod-Simple/t/search10.t b/cpan/Pod-Simple/t/search10.t
index 96ac7fd49f..fd05f46272 100644
--- a/cpan/Pod-Simple/t/search10.t
+++ b/cpan/Pod-Simple/t/search10.t
@@ -8,6 +8,7 @@ BEGIN {
 # Time-stamp: "2004-05-23 22:38:58 ADT"
 
 use strict;
+use warnings;
 
 #sub Pod::Simple::Search::DEBUG () {5};
 
diff --git a/cpan/Pod-Simple/t/search12.t b/cpan/Pod-Simple/t/search12.t
index 5da1859bdb..31596cf2fa 100644
--- a/cpan/Pod-Simple/t/search12.t
+++ b/cpan/Pod-Simple/t/search12.t
@@ -6,6 +6,7 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Pod::Simple::Search;
 use Test;
 BEGIN { plan tests => 11 }
diff --git a/cpan/Pod-Simple/t/search20.t b/cpan/Pod-Simple/t/search20.t
index 1b17c3b021..d9c0699c45 100644
--- a/cpan/Pod-Simple/t/search20.t
+++ b/cpan/Pod-Simple/t/search20.t
@@ -6,6 +6,7 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Pod::Simple::Search;
 use Test;
 BEGIN { plan tests => 11 }
diff --git a/cpan/Pod-Simple/t/search22.t b/cpan/Pod-Simple/t/search22.t
index 6fb498a331..99d9acffca 100644
--- a/cpan/Pod-Simple/t/search22.t
+++ b/cpan/Pod-Simple/t/search22.t
@@ -6,6 +6,7 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Pod::Simple::Search;
 use Test;
 BEGIN { plan tests => 15 }
diff --git a/cpan/Pod-Simple/t/search25.t b/cpan/Pod-Simple/t/search25.t
index 610becb7ef..23ea9fc645 100644
--- a/cpan/Pod-Simple/t/search25.t
+++ b/cpan/Pod-Simple/t/search25.t
@@ -6,6 +6,7 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 
 #sub Pod::Simple::Search::DEBUG () {5};
 
diff --git a/cpan/Pod-Simple/t/search26.t b/cpan/Pod-Simple/t/search26.t
index 5910291a3d..03e1afb957 100644
--- a/cpan/Pod-Simple/t/search26.t
+++ b/cpan/Pod-Simple/t/search26.t
@@ -6,6 +6,7 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Pod::Simple::Search;
 use Test;
 BEGIN { plan tests => 5 }
diff --git a/cpan/Pod-Simple/t/search27.t b/cpan/Pod-Simple/t/search27.t
index 7614e525c4..a1f29f55f1 100644
--- a/cpan/Pod-Simple/t/search27.t
+++ b/cpan/Pod-Simple/t/search27.t
@@ -6,6 +6,7 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Pod::Simple::Search;
 use Test;
 BEGIN { plan tests => 10 }
diff --git a/cpan/Pod-Simple/t/search28.t b/cpan/Pod-Simple/t/search28.t
index 05606a7b1b..680d9cd7c0 100644
--- a/cpan/Pod-Simple/t/search28.t
+++ b/cpan/Pod-Simple/t/search28.t
@@ -6,6 +6,7 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Pod::Simple::Search;
 use Test;
 BEGIN { plan tests => 4 }
diff --git a/cpan/Pod-Simple/t/search29.t b/cpan/Pod-Simple/t/search29.t
index c62befbbf8..d1e604c810 100644
--- a/cpan/Pod-Simple/t/search29.t
+++ b/cpan/Pod-Simple/t/search29.t
@@ -6,6 +6,7 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Pod::Simple::Search;
 use Test;
 BEGIN { plan tests => 4 }
diff --git a/cpan/Pod-Simple/t/search50.t b/cpan/Pod-Simple/t/search50.t
index 0dc9d75a29..5e9b26e186 100644
--- a/cpan/Pod-Simple/t/search50.t
+++ b/cpan/Pod-Simple/t/search50.t
@@ -6,6 +6,7 @@ BEGIN {
     }
 }
 use strict;
+use warnings;
 
 #sub Pod::Simple::Search::DEBUG () {5};
 
diff --git a/cpan/Pod-Simple/t/search60.t b/cpan/Pod-Simple/t/search60.t
index 4ffbbb173a..d351fb57c9 100644
--- a/cpan/Pod-Simple/t/search60.t
+++ b/cpan/Pod-Simple/t/search60.t
@@ -5,7 +5,8 @@ BEGIN {
     }

 }

 

-use strict;

+use strict;
+use warnings;

 use Pod::Simple::Search;

 use Test;

 BEGIN { plan tests => 4 }

diff --git a/cpan/Pod-Simple/t/stree.t b/cpan/Pod-Simple/t/stree.t
index e0f772d290..db7d5f4262 100644
--- a/cpan/Pod-Simple/t/stree.t
+++ b/cpan/Pod-Simple/t/stree.t
@@ -1,6 +1,7 @@
 
 
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 33 };
 
diff --git a/cpan/Pod-Simple/t/strpvbtm.t b/cpan/Pod-Simple/t/strpvbtm.t
index 25c41cc55b..beae99d503 100644
--- a/cpan/Pod-Simple/t/strpvbtm.t
+++ b/cpan/Pod-Simple/t/strpvbtm.t
@@ -7,6 +7,7 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use lib '../lib';
 use Test::More tests => 103;
 #use Test::More 'no_plan';
diff --git a/cpan/Pod-Simple/t/tiedfh.t b/cpan/Pod-Simple/t/tiedfh.t
index 1b10d1ff1e..51b802777c 100644
--- a/cpan/Pod-Simple/t/tiedfh.t
+++ b/cpan/Pod-Simple/t/tiedfh.t
@@ -7,6 +7,7 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 8 };
 
diff --git a/cpan/Pod-Simple/t/verb_fmt.t b/cpan/Pod-Simple/t/verb_fmt.t
index 07dfad5a4e..c2b31f45a5 100644
--- a/cpan/Pod-Simple/t/verb_fmt.t
+++ b/cpan/Pod-Simple/t/verb_fmt.t
@@ -1,5 +1,6 @@
 # Testing verbatim formatted sections
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 62 };
 
@@ -11,8 +12,9 @@ use Pod::Simple::DumpAsXML;
 use Pod::Simple::XMLOutStream;
 
 print "# Pod::Simple version $Pod::Simple::VERSION\n";
-sub e  ($$) { Pod::Simple::DumpAsXML->_duo(\&without_vf, @_) }
-sub ev ($$) { Pod::Simple::DumpAsXML->_duo(\&with_vf,    @_) }
+
+sub e  { Pod::Simple::DumpAsXML->_duo(\&without_vf, @_) }
+sub ev { Pod::Simple::DumpAsXML->_duo(\&with_vf,    @_) }
 
 sub with_vf    { $_[0]->  accept_codes('VerbatimFormatted') }
 sub without_vf { $_[0]->unaccept_codes('VerbatimFormatted') }
diff --git a/cpan/Pod-Simple/t/verbatim.t b/cpan/Pod-Simple/t/verbatim.t
index 299356bd89..823be2bc30 100644
--- a/cpan/Pod-Simple/t/verbatim.t
+++ b/cpan/Pod-Simple/t/verbatim.t
@@ -1,6 +1,9 @@
 # Testing verbatim sections
 use strict;
+use warnings;
+
 use Test;
+
 BEGIN { plan tests => 31 };
 
 #use Pod::Simple::Debug (6);
@@ -10,14 +13,17 @@ ok 1;
 use Pod::Simple::DumpAsXML;
 use Pod::Simple::XMLOutStream;
 print "# Pod::Simple version $Pod::Simple::VERSION\n";
-sub e ($$) { Pod::Simple::DumpAsXML->_duo(@_) }
+
+BEGIN {
+  require FindBin;
+  unshift @INC, $FindBin::Bin . '/lib';
+  require helpers;
+  helpers->import;
+}
 
 &ok( e "", "" );
 &ok( e "\n", "", );
 
-
-
-
 &ok( e "\n=pod\n\n foo bar baz", "\n=pod\n\n foo bar baz" );
 &ok( e "\n=pod\n\n foo bar baz", "\n=pod\n\n foo bar baz\n" );
 
diff --git a/cpan/Pod-Simple/t/x_nixer.t b/cpan/Pod-Simple/t/x_nixer.t
index 3787006266..0a8acf672a 100644
--- a/cpan/Pod-Simple/t/x_nixer.t
+++ b/cpan/Pod-Simple/t/x_nixer.t
@@ -1,6 +1,7 @@
 
 
 use strict;
+use warnings;
 use Test;
 BEGIN { plan tests => 11 };
 
diff --git a/cpan/Pod-Simple/t/xhtml01.t b/cpan/Pod-Simple/t/xhtml01.t
index 7ee0865216..72d3930b43 100644
--- a/cpan/Pod-Simple/t/xhtml01.t
+++ b/cpan/Pod-Simple/t/xhtml01.t
@@ -7,8 +7,9 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use lib '../lib';
-use Test::More tests => 62;
+use Test::More tests => 64;
 #use Test::More 'no_plan';
 
 use_ok('Pod::Simple::XHTML') or exit;
@@ -51,7 +52,15 @@ initialize($parser, $results);
 $parser->parse_string_document( "=head4 Zort & Zog!" );
 is($results, qq{<h4 id="Zort-Zog">Zort &amp; Zog!</h4>\n\n}, "head4 level output");
 
-sub x ($;&) {
+initialize($parser, $results);
+$parser->parse_string_document( "=head5 I think so Brain, but..." );
+is($results, qq{<h5 id="I-think-so-Brain-but">I think so Brain, but...</h5>\n\n}, "head5 level output");
+
+initialize($parser, $results);
+$parser->parse_string_document( "=head6 Narf!" );
+is($results, qq{<h6 id="Narf">Narf!</h6>\n\n}, "head6 level output");
+
+sub x {
   my $code = $_[1];
   Pod::Simple::XHTML->_out(
   sub { $code->($_[0]) if $code },
diff --git a/cpan/Pod-Simple/t/xhtml05.t b/cpan/Pod-Simple/t/xhtml05.t
index 00d5589613..ed82683412 100644
--- a/cpan/Pod-Simple/t/xhtml05.t
+++ b/cpan/Pod-Simple/t/xhtml05.t
@@ -7,6 +7,7 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use lib '../lib';
 use Test::More tests => 6;
 
diff --git a/cpan/Pod-Simple/t/xhtml10.t b/cpan/Pod-Simple/t/xhtml10.t
index 353a50f6cb..1d7af1b7bf 100644
--- a/cpan/Pod-Simple/t/xhtml10.t
+++ b/cpan/Pod-Simple/t/xhtml10.t
@@ -7,8 +7,9 @@ BEGIN {
 }
 
 use strict;
+use warnings;
 use lib '../lib';
-use Test::More tests => 60;
+use Test::More tests => 62;
 #use Test::More 'no_plan';
 
 use_ok('Pod::Simple::XHTML') or exit;
@@ -203,6 +204,48 @@ is $results, <<'EOF', 'Should have the four-level index';
 EOF
 
 initialize($parser, $results);
+ok $parser->parse_string_document( "=head1 Foo\n\n=head2 Bar\n\n=head3 Baz\n\n=head4 Howdy\n\n=head5 Deep\n\n=head6 Thought" ),
+    'Parse six levels';
+is $results, <<'EOF', 'Should have the six-level index';
+<ul id="index">
+  <li><a href="#Foo">Foo</a>
+    <ul>
+      <li><a href="#Bar">Bar</a>
+        <ul>
+          <li><a href="#Baz">Baz</a>
+            <ul>
+              <li><a href="#Howdy">Howdy</a>
+                <ul>
+                  <li><a href="#Deep">Deep</a>
+                    <ul>
+                      <li><a href="#Thought">Thought</a></li>
+                    </ul>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+          </li>
+        </ul>
+      </li>
+    </ul>
+  </li>
+</ul>
+
+<h1 id="Foo">Foo</h1>
+
+<h2 id="Bar">Bar</h2>
+
+<h3 id="Baz">Baz</h3>
+
+<h4 id="Howdy">Howdy</h4>
+
+<h5 id="Deep">Deep</h5>
+
+<h6 id="Thought">Thought</h6>
+
+EOF
+
+initialize($parser, $results);
 ok $parser->parse_string_document( "=head1 Foo\n\n=head2 Bar\n\n=head2 Baz" ),
     'Parse 1/2';
 is $results, <<'EOF', 'Should have the 1/s index';