diff options
| author | Steve Hay <steve.m.hay@googlemail.com> | 2012-08-14 23:48:38 +0100 |
|---|---|---|
| committer | Steve Hay <steve.m.hay@googlemail.com> | 2012-08-15 00:33:34 +0100 |
| commit | 0ace302a2635019d2fcbe257549cdf1497c4f585 (patch) | |
| tree | fd12af51b52cf4d6ea4c1da6f5ef1dbb862e86a8 /cpan/Pod-Simple | |
| parent | 95ccf9d5dfbf8e9c58a97a47713562d01ddfc7cf (diff) | |
| download | perl-0ace302a2635019d2fcbe257549cdf1497c4f585.tar.gz | |
Upgrade to Pod-Simple 3.23
Diffstat (limited to 'cpan/Pod-Simple')
62 files changed, 1076 insertions, 718 deletions
diff --git a/cpan/Pod-Simple/ChangeLog b/cpan/Pod-Simple/ChangeLog index 2f00dc7301..0fe203e4f4 100644 --- a/cpan/Pod-Simple/ChangeLog +++ b/cpan/Pod-Simple/ChangeLog @@ -1,6 +1,71 @@ # ChangeLog for Pod::Simple dist #--------------------------------------------------------------------------- +2012-08-14 David E. Wheeler <david@justatheory.org> + * Release 3.23 + + Eliminated nested elements in table of contents (index) items + output of Pod::Simple::XHTML. This was especially problematic for + headers that included links, as the TOC then got nested anchor + elements, which simply would not work. Thanks to Ben Bullock for + the report and test case (RT #77686). + + Fixed semantically invalid nested XHTML generated by + Pod::Simple::XHTML since v3.21. Gisle Aas. + + Improved support for nested "C< >" tags in Pod::Simple::XHTML. + Gisle Aas. + + No longer tries to decode a string with the "utf8" flag set, as + the double-decoding only triggered an error. Grant McLean. + + Added documentation note that the API expects encoded text + (octets). Grant McLean. + + Added "parse_characters()" option to specify that strings to are + already decoded from octets into characters. Grant McLean. + +2012-05-27 David E. Wheeler <david@justatheory.org> + * Release 3.22 + + Fix but where Pod::Simple would whine about non-ASCII bytes in + code or comments. Now only does so for Pod (in the absence of an + "=encoding" tag. Broken in 3.21. Grant McLean. + +2012-05-23 David E. Wheeler <david@justatheory.org> + * Release 3.21 + + NOTE: COMPATABILITY CHANGE: The 'codes_in_verbatim' option in + Pod::Simple::XHTML is no longer enabled by default. This brings it + agreement with the other formatting classes, and eliminates + unexpected behavior in XHTML-formatted Pod. Users who depended on + this functionality can still get it by enabling + 'codes_in_verbatim' in their code. + + Fixed some typos in the documentation. Thanks to Jonathan Yu via + the Debian packagers via Florian Ragwitz (RT #75532). + + Now emit a warning the first time a non-ASCII byte is encountered + when no "=encoding" has been seen. Grant McLean. + + When a non-ASCII byte is encounted before an "=encoding" line has + been seen, a heuristic (as described in perlpodspec) is applied to + select UTF-8 encoding if the non-ASCII bytes form a valid UTF-8 + byte sequence, or Latin-1 otherwise. Grant McLean. + + Added 'handle_code' method to Pod::Simple::XHTML. This allows + subclasses to override the handling of verbatim blocks, and makes + for a more cohesive interface, to boot. Gisle Aas. + + Subsequent text segments are now joined together and passed as a + single unit to text handling code. This makes it easier for custom + handlers to process complete blocks of text in a single call to + 'handle_text', rather than in dribs and drabs. Gisle Aas. + + Replaced naive text wrapping code in Pod::Simple::DumpAsXML with + Text::Wrap, which was already used for similar purposes elsewhere + in Pod::Simple. Gisle Aas. + 2012-03-01 David E. Wheeler <david@justatheory.org> * Release 3.20 diff --git a/cpan/Pod-Simple/README b/cpan/Pod-Simple/README index 4608038f26..be1517c5d1 100644 --- a/cpan/Pod-Simple/README +++ b/cpan/Pod-Simple/README @@ -1,4 +1,4 @@ -=head1 Pod::Simple version 3.20 +=head1 Pod::Simple version 3.23 Pod::Simple is a Perl library for parsing text in the Pod ("plain old documentation") markup language that is typically used for writing diff --git a/cpan/Pod-Simple/lib/Pod/Simple.pm b/cpan/Pod-Simple/lib/Pod/Simple.pm index ad7a19b8ef..fead5b5232 100644 --- 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.20'; +$VERSION = '3.23'; @Known_formatting_codes = qw(I B C L E F S X Z); %Known_formatting_codes = map(($_=>1), @Known_formatting_codes); @@ -87,6 +87,8 @@ __PACKAGE__->_accessorize( 'preserve_whitespace', # whether to try to keep whitespace as-is 'strip_verbatim_indent', # What indent to strip from verbatim + 'parse_characters', # Whether parser should expect chars rather than octets + 'content_seen', # whether we've seen any real Pod content 'errors_seen', # TODO: document. whether we've seen any errors (fatal or not) diff --git a/cpan/Pod-Simple/lib/Pod/Simple.pod b/cpan/Pod-Simple/lib/Pod/Simple.pod index a8ad211d3b..0ead93b1a3 100644 --- a/cpan/Pod-Simple/lib/Pod/Simple.pod +++ b/cpan/Pod-Simple/lib/Pod/Simple.pod @@ -14,6 +14,8 @@ documentation") markup language that is typically used for writing documentation for Perl and for Perl modules. The Pod format is explained L<perlpod>; the most common formatter is called C<perldoc>. +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 @@ -121,6 +123,14 @@ most likely to use. =over +=item C<< $parser->parse_characters( I<SOMEVALUE> ) >> + +The Pod parser normally expects to read octets and to convert those octets +to characters based on the C<=encoding> declaration in the Pod source. Set +this option to a true value to indicate that the Pod source is already a Perl +character stream. This tells the parser to ignore any C<=encoding> command +and to skip all the code paths involving decoding octets. + =item C<< $parser->no_whining( I<SOMEVALUE> ) >> If you set this attribute to a true value, you will suppress the @@ -322,6 +332,21 @@ Log an error unless C<< $parser->no_whining( TRUE ); >>. =back +=head1 ENCODING + +The Pod::Simple parser expects to read B<octets>. The parser will decode the +octets into Perl's internal character string representation using the value of +the C<=encoding> declaration in the POD source. + +If the POD source does not include an C<=encoding> declaration, the parser will +attempt to guess the encoding (selecting one of UTF-8 or Latin-1) by examining +the first non-ASCII bytes and applying the heuristic described in +L<perlpodspec>. + +If you set the C<parse_characters> option to a true value the parser will +expect characters rather than octets; will ignore any C<=encoding>; and will +make no attempt to decode the input. + =head1 CAVEATS This is just a beta release -- there are a good number of things still diff --git a/cpan/Pod-Simple/lib/Pod/Simple/BlackBox.pm b/cpan/Pod-Simple/lib/Pod/Simple/BlackBox.pm index c17cfd0ad5..d3878f826d 100644 --- a/cpan/Pod-Simple/lib/Pod/Simple/BlackBox.pm +++ b/cpan/Pod-Simple/lib/Pod/Simple/BlackBox.pm @@ -23,7 +23,7 @@ use integer; # vroom! use strict; use Carp (); use vars qw($VERSION ); -$VERSION = '3.20'; +$VERSION = '3.23'; #use constant DEBUG => 7; BEGIN { require Pod::Simple; @@ -123,6 +123,9 @@ sub parse_lines { # Usage: $parser->parse_lines(@lines) } } + if(!$self->parse_characters && !$self->{'encoding'}) { + $self->_try_encoding_guess($line) + } DEBUG > 5 and print "# Parsing line: [$line]\n"; @@ -176,6 +179,7 @@ sub parse_lines { # Usage: $parser->parse_lines(@lines) # HERE WE CATCH =encoding EARLY! if( $line =~ m/^=encoding\s+\S+\s*$/s ) { + next if $self->parse_characters; # Ignore this line $line = $self->_handle_encoding_line( $line ); } @@ -269,6 +273,8 @@ sub parse_lines { # Usage: $parser->parse_lines(@lines) sub _handle_encoding_line { my($self, $line) = @_; + return if $self->parse_characters; + # The point of this routine is to set $self->{'_transcoder'} as indicated. return $line unless $line =~ m/^=encoding\s+(\S+)\s*$/s; @@ -395,6 +401,28 @@ sub _handle_encoding_second_level { return; } +sub _try_encoding_guess { + my ($self,$line) = @_; + + if(!$self->{'in_pod'} and $line !~ /^=/m) { + return; # don't whine about non-ASCII bytes in code/comments + } + + return unless $line =~ /[^\x00-\x7f]/; # Look for non-ASCII byte + + my $encoding = $line =~ /[\xC0-\xFD][\x80-\xBF]/ ? 'UTF-8' : 'ISO8859-1'; + $self->_handle_encoding_line( "=encoding $encoding" ); + $self->{'_transcoder'} && $self->{'_transcoder'}->($line); + + my ($word) = $line =~ /(\S*[^\x00-\x7f]\S*)/; + + $self->whine( + $self->{'line_count'}, + "Non-ASCII character seen before =encoding in '$word'. Assuming $encoding" + ); + +} + #~`~`~`~`~`~`~`~`~`~`~`~`~`~`~`~`~`~`~`~`~`~`~`~`~`~`~`~`~`~`~`~`~`~`~`~`~` { @@ -1459,10 +1487,12 @@ sub _traverse_treelet_bit { # for use only by the routine above my $scratch; $self->_handle_element_start(($scratch=$name), shift @_); - foreach my $x (@_) { - if(ref($x)) { + while (@_) { + my $x = shift; + if (ref($x)) { &_traverse_treelet_bit($self, @$x); } else { + $x .= shift while @_ && !ref($_[0]); $self->_handle_text($x); } } diff --git a/cpan/Pod-Simple/lib/Pod/Simple/Checker.pm b/cpan/Pod-Simple/lib/Pod/Simple/Checker.pm index c97267a86b..42c942ac8f 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.20'; +$VERSION = '3.23'; @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 5773302842..d9bd4e43a8 100644 --- a/cpan/Pod-Simple/lib/Pod/Simple/Debug.pm +++ b/cpan/Pod-Simple/lib/Pod/Simple/Debug.pm @@ -3,7 +3,7 @@ require 5; package Pod::Simple::Debug; use strict; use vars qw($VERSION ); -$VERSION = '3.20'; +$VERSION = '3.23'; 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 5e2d7ebf5f..c86d4ebd4e 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.20'; +$VERSION = '3.23'; 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 e43422bbd7..576ca7d369 100644 --- a/cpan/Pod-Simple/lib/Pod/Simple/DumpAsXML.pm +++ b/cpan/Pod-Simple/lib/Pod/Simple/DumpAsXML.pm @@ -1,13 +1,14 @@ require 5; package Pod::Simple::DumpAsXML; -$VERSION = '3.20'; +$VERSION = '3.23'; use Pod::Simple (); BEGIN {@ISA = ('Pod::Simple')} use strict; use Carp (); +use Text::Wrap qw(wrap); BEGIN { *DEBUG = \&Pod::Simple::DEBUG unless defined &DEBUG } @@ -49,15 +50,8 @@ sub _handle_text { my $indent = ' ' x $_[0]{'indent'}; my $text = $_[1]; _xml_escape($text); - $text =~ # A not-totally-brilliant wrapping algorithm: - s/( - [^\n]{55} # Snare some characters from a line - [^\n\ ]{0,50} # and finish any current word - ) - \x20{1,10}(?!\n) # capture some spaces not at line-end - /$1\n$indent/gx # => line-break here - ; - + local $Text::Wrap::huge = 'overflow'; + $text = wrap('', $indent, $text); print {$_[0]{'output_fh'}} $indent, $text, "\n"; } return; diff --git a/cpan/Pod-Simple/lib/Pod/Simple/HTML.pm b/cpan/Pod-Simple/lib/Pod/Simple/HTML.pm index 12fad40358..528581e212 100644 --- a/cpan/Pod-Simple/lib/Pod/Simple/HTML.pm +++ b/cpan/Pod-Simple/lib/Pod/Simple/HTML.pm @@ -10,7 +10,7 @@ use vars qw( $Doctype_decl $Content_decl ); @ISA = ('Pod::Simple::PullParser'); -$VERSION = '3.20'; +$VERSION = '3.23'; BEGIN { if(defined &DEBUG) { } # no-op diff --git a/cpan/Pod-Simple/lib/Pod/Simple/HTMLBatch.pm b/cpan/Pod-Simple/lib/Pod/Simple/HTMLBatch.pm index 52e77bcc1b..70e28edc20 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.20'; +$VERSION = '3.23'; @ISA = (); # Yup, we're NOT a subclass of Pod::Simple::HTML! # TODO: nocontents stylesheets. Strike some of the color variations? diff --git a/cpan/Pod-Simple/lib/Pod/Simple/LinkSection.pm b/cpan/Pod-Simple/lib/Pod/Simple/LinkSection.pm index 5aa5bc1989..fb80a59ba0 100644 --- a/cpan/Pod-Simple/lib/Pod/Simple/LinkSection.pm +++ b/cpan/Pod-Simple/lib/Pod/Simple/LinkSection.pm @@ -3,12 +3,12 @@ require 5; package Pod::Simple::LinkSection; # Based somewhat dimly on Array::Autojoin use vars qw($VERSION ); -$VERSION = '3.20'; +$VERSION = '3.23'; use strict; use Pod::Simple::BlackBox; use vars qw($VERSION ); -$VERSION = '3.20'; +$VERSION = '3.23'; 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 4113daf235..2f6a52823f 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.20'; +$VERSION = '3.23'; @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 e85084a1c2..9c0e9d9ce4 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.20'; +$VERSION = '3.23'; 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 c9726fd564..053fbf33f1 100644 --- a/cpan/Pod-Simple/lib/Pod/Simple/PullParser.pm +++ b/cpan/Pod-Simple/lib/Pod/Simple/PullParser.pm @@ -1,7 +1,7 @@ require 5; package Pod::Simple::PullParser; -$VERSION = '3.20'; +$VERSION = '3.23'; 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 a45aba18ba..aaa5796b50 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.20'; +$VERSION = '3.23'; 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 e9fbaa2b5e..ee4c48491b 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.20'; +$VERSION = '3.23'; 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 34985fdfb0..872fa25862 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.20'; +$VERSION = '3.23'; 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 b323ece2a3..41251886e6 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.20'; +$VERSION = '3.23'; 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 0d184e3a66..3663d043d0 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.20'; +$VERSION = '3.23'; use Pod::Simple::PullParser (); BEGIN {@ISA = ('Pod::Simple::PullParser')} diff --git a/cpan/Pod-Simple/lib/Pod/Simple/Search.pm b/cpan/Pod-Simple/lib/Pod/Simple/Search.pm index 7e507e62b9..79fb37aac3 100644 --- a/cpan/Pod-Simple/lib/Pod/Simple/Search.pm +++ b/cpan/Pod-Simple/lib/Pod/Simple/Search.pm @@ -4,7 +4,7 @@ package Pod::Simple::Search; use strict; use vars qw($VERSION $MAX_VERSION_WITHIN $SLEEPY); -$VERSION = '3.20'; ## Current version of this package +$VERSION = '3.23'; ## 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 3671af121f..940c0f340e 100644 --- a/cpan/Pod-Simple/lib/Pod/Simple/SimpleTree.pm +++ b/cpan/Pod-Simple/lib/Pod/Simple/SimpleTree.pm @@ -6,7 +6,7 @@ use strict; use Carp (); use Pod::Simple (); use vars qw( $ATTR_PAD @ISA $VERSION $SORT_ATTRS); -$VERSION = '3.20'; +$VERSION = '3.23'; BEGIN { @ISA = ('Pod::Simple'); *DEBUG = \&Pod::Simple::DEBUG unless defined &DEBUG; diff --git a/cpan/Pod-Simple/lib/Pod/Simple/Subclassing.pod b/cpan/Pod-Simple/lib/Pod/Simple/Subclassing.pod index 792d1be5a2..6be2defcc8 100644 --- a/cpan/Pod-Simple/lib/Pod/Simple/Subclassing.pod +++ b/cpan/Pod-Simple/lib/Pod/Simple/Subclassing.pod @@ -378,13 +378,13 @@ That is, they all produce the same event structure (for the most part), namely: "Member Data" </L> -The I<raw> attribute depends on what the raw content of the L<> is, so that is -why the event structure is the same "for the most part". +The I<raw> attribute depends on what the raw content of the C<LE<lt>E<gt>> is, +so that is why the event structure is the same "for the most part". If you have not guessed it yet, the I<raw> attribute contains the raw, -original, unescaped content of the L<> formatting code. In addition to the -examples above, take notice of the following event structure produced by -the following L<> formatting code. +original, unescaped content of the C<LE<lt>E<gt>> formatting code. In addition +to the examples above, take notice of the following event structure produced +by the following C<LE<lt>E<gt>> formatting code. L<click B<here>|page/About the C<-M> switch> @@ -725,10 +725,10 @@ or =end html ...the parser will ignore these sections unless your subclass has -specified that it wants to see sections targetted to "html" (or whatever +specified that it wants to see sections targeted to "html" (or whatever the formatter name is). -If you want to process all sections, even if they're not targetted for you, +If you want to process all sections, even if they're not targeted for you, call this before you start parsing: $parser->accept_targets('*'); diff --git a/cpan/Pod-Simple/lib/Pod/Simple/Text.pm b/cpan/Pod-Simple/lib/Pod/Simple/Text.pm index 3032d0fcd5..3e0c022894 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.20'; +$VERSION = '3.23'; @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 dea1cde7cc..758b78f16f 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.20'; +$VERSION = '3.23'; @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 9f2a224a27..3e99202b7f 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.20'; +$VERSION = '3.23'; #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/cpan/Pod-Simple/lib/Pod/Simple/Transcode.pm b/cpan/Pod-Simple/lib/Pod/Simple/Transcode.pm index 892436db7f..fcaf4e62c9 100644 --- a/cpan/Pod-Simple/lib/Pod/Simple/Transcode.pm +++ b/cpan/Pod-Simple/lib/Pod/Simple/Transcode.pm @@ -2,7 +2,7 @@ require 5; package Pod::Simple::Transcode; use vars qw($VERSION ); -$VERSION = '3.20'; +$VERSION = '3.23'; 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 3303090343..32e98399a1 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.20'; +$VERSION = '3.23'; # 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 a66dedd03b..0dec8b5def 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.20'; +$VERSION = '3.23'; sub is_dumb {0} sub is_smart {1} @@ -32,7 +32,7 @@ sub make_transcoder { my $x; return sub { foreach $x (@_) { - $x = Encode::decode($e, $x); + $x = Encode::decode($e, $x) unless Encode::is_utf8($x); } return; }; diff --git a/cpan/Pod-Simple/lib/Pod/Simple/XHTML.pm b/cpan/Pod-Simple/lib/Pod/Simple/XHTML.pm index 9d31db0bad..5fd0967f8e 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.20'; +$VERSION = '3.23'; use Pod::Simple::Methody (); @ISA = ('Pod::Simple::Methody'); @@ -151,7 +151,7 @@ Add additional meta tags here, or blocks of inline CSS or JavaScript A string containing all characters that should be encoded as HTML entities, specified using the regular expression character class syntax (what you find within brackets in regular expressions). This value will be passed as the -second argument to the C<encode_entities> fuction of L<HTML::Entities>. IF +second argument to the C<encode_entities> function of L<HTML::Entities>. If L<HTML::Entities> is not installed, then any characters other than C<&<>"'> will be encoded numerically. @@ -251,7 +251,6 @@ sub new { $new->man_url_prefix('http://man.he.net/man'); $new->html_charset('ISO-8859-1'); $new->nix_X_codes(1); - $new->codes_in_verbatim(1); $new->{'scratch'} = ''; $new->{'to_index'} = []; $new->{'output'} = []; @@ -301,11 +300,27 @@ something like: my ($self, $text) = @_; if ($self->{'in_foo'}) { $self->{'scratch'} .= build_foo_html($text); - } else { - $self->{'scratch'} .= $text; + return; } + $self->SUPER::handle_text($text); } +=head2 handle_code + +This method handles the body of text that is marked up to be code. +You might for instance override this to plug in a syntax highlighter. +The base implementation just escapes the text. + +The callback methods C<start_code> and C<end_code> emits the C<code> tags +before and after C<handle_code> is invoked, so you might want to override these +together with C<handle_code> if this wrapping isn't suiteable. + +Note that the code might be broken into mulitple segments if there are +nested formatting codes inside a C<< CE<lt>...> >> sequence. In between the +calls to C<handle_code> other markup tags might have been emitted in that +case. The same is true for verbatim sections if the C<codes_in_verbatim> +option is turned on. + =head2 accept_targets_as_html This method behaves like C<accept_targets_as_text>, but also marks the region @@ -327,19 +342,44 @@ sub accept_targets_as_html { } sub handle_text { + if ($_[0]{'in_code'} && @{$_[0]{'in_code'}}) { + return $_[0]->handle_code( $_[1], $_[0]{'in_code'}[-1] ); + } # escape special characters in HTML (<, >, &, etc) - $_[0]{'scratch'} .= $_[0]->__in_literal_xhtml_region - ? $_[1] - : $_[0]->encode_entities( $_[1] ); + my $text = $_[0]->__in_literal_xhtml_region + ? $_[1] + : $_[0]->encode_entities( $_[1] ); + + $_[0]{'scratch'} .= $text; + $_[0]{htext} .= $text if $_[0]{'in_head'}; +} + +sub start_code { + $_[0]{'scratch'} .= '<code>'; } -sub start_Para { $_[0]{'scratch'} = '<p>' } -sub start_Verbatim { $_[0]{'scratch'} = '<pre><code>' } +sub end_code { + $_[0]{'scratch'} .= '</code>'; +} + +sub handle_code { + $_[0]{'scratch'} .= $_[0]->encode_entities( $_[1] ); +} + +sub start_Para { + $_[0]{'scratch'} = '<p>'; +} + +sub start_Verbatim { + $_[0]{'scratch'} = '<pre>'; + push(@{$_[0]{'in_code'}}, 'Verbatim'); + $_[0]->start_code($_[0]{'in_code'}[-1]); +} -sub start_head1 { $_[0]{'in_head'} = 1 } -sub start_head2 { $_[0]{'in_head'} = 2 } -sub start_head3 { $_[0]{'in_head'} = 3 } -sub start_head4 { $_[0]{'in_head'} = 4 } +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_item_number { $_[0]{'scratch'} = "</li>\n" if ($_[0]{'in_li'}->[-1] && pop @{$_[0]{'in_li'}}); @@ -397,7 +437,8 @@ sub end_over_text { sub end_Para { $_[0]{'scratch'} .= '</p>'; $_[0]->emit } sub end_Verbatim { - $_[0]{'scratch'} .= '</code></pre>'; + $_[0]->end_code(pop(@{$_[0]->{'in_code'}})); + $_[0]{'scratch'} .= '</pre>'; $_[0]->emit; } @@ -408,14 +449,14 @@ sub _end_head { $add = 1 unless defined $add; $h += $add - 1; - my $id = $_[0]->idify($_[0]{scratch}); + my $id = $_[0]->idify($_[0]{htext}); my $text = $_[0]{scratch}; - $_[0]{'scratch'} = $_[0]->backlink && ($h - $add == 0) + $_[0]{'scratch'} = $_[0]->backlink && ($h - $add == 0) # backlinks enabled && =head1 ? qq{<a href="#_podtop_"><h$h id="$id">$text</h$h></a>} : qq{<h$h id="$id">$text</h$h>}; $_[0]->emit; - push @{ $_[0]{'to_index'} }, [$h, $id, $text]; + push @{ $_[0]{'to_index'} }, [$h, $id, delete $_[0]{'htext'}]; } sub end_head1 { shift->_end_head(@_); } @@ -568,8 +609,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 { push(@{$_[0]{'in_code'}}, 'C'); $_[0]->start_code($_[0]{'in_code'}[-1]); } +sub end_C { $_[0]->end_code(pop(@{$_[0]{'in_code'}})); } sub start_F { $_[0]{'scratch'} .= '<i>' } sub end_F { $_[0]{'scratch'} .= '</i>' } diff --git a/cpan/Pod-Simple/lib/Pod/Simple/XMLOutStream.pm b/cpan/Pod-Simple/lib/Pod/Simple/XMLOutStream.pm index bbb815a552..1cbc3368cb 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.20'; +$VERSION = '3.23'; BEGIN { @ISA = ('Pod::Simple'); *DEBUG = \&Pod::Simple::DEBUG unless defined &DEBUG; diff --git a/cpan/Pod-Simple/t/corpus.t b/cpan/Pod-Simple/t/corpus.t index 3427b915e1..2f59302cfb 100644 --- a/cpan/Pod-Simple/t/corpus.t +++ b/cpan/Pod-Simple/t/corpus.t @@ -168,6 +168,7 @@ foreach my $f (@testfiles) { skip $skippy, 0; } else { print "# $outfilename and $xml don't match!\n"; + print STDERR `diff -u $xml $outfilename`; ok 0; } diff --git a/cpan/Pod-Simple/t/corpus/2202jp.xml b/cpan/Pod-Simple/t/corpus/2202jp.xml index e0304954d4..ea662aabf3 100644 --- a/cpan/Pod-Simple/t/corpus/2202jp.xml +++ b/cpan/Pod-Simple/t/corpus/2202jp.xml @@ -9,12 +9,11 @@ DESCRIPTION </head1> <Para start_line="11"> - This is a test Pod document in ISO-2202-JP. Its content - is some Japanese haiku by famous poets. + This is a test Pod document in ISO-2202-JP. Its content is some Japanese + haiku by famous poets. </Para> <head2 start_line="15"> - MATSUO BASHO (松尾芭蕉 1644 - 1694) - : + MATSUO BASHO (松尾芭蕉 1644 - 1694) : </head2> <Para start_line="17"> 古池や蛙とび込む水の音 @@ -26,7 +25,8 @@ As verbatim: </Para> <VerbatimFormatted start_line="23" xml:space="preserve"> - 古池や蛙とび込む水の音 + + 古池や蛙とび込む水の音 </VerbatimFormatted> <head2 start_line="27"> YOSA BUSON (与謝蕪村1716 - 1783) @@ -41,7 +41,8 @@ As verbatim: </Para> <VerbatimFormatted start_line="35" xml:space="preserve"> - 方八里雨雲よせぬ牡丹かな + + 方八里雨雲よせぬ牡丹かな </VerbatimFormatted> <head2 start_line="37"> MASAOKA SHIKI (正岡子規 1867 - 1902) @@ -56,7 +57,8 @@ As verbatim: </Para> <VerbatimFormatted start_line="45" xml:space="preserve"> - いちはつの一輪白し春の暮 + + いちはつの一輪白し春の暮 </VerbatimFormatted> <Para start_line="47"> 余命いくばくかある夜短し @@ -65,15 +67,15 @@ (yomei / ikubakuka aru / yo mijikashi) </Para> <VerbatimFormatted start_line="51" xml:space="preserve"> - 余命いくばくかある夜短し + + 余命いくばくかある夜短し </VerbatimFormatted> <head1 start_line="53"> AS A LIST </head1> <over-text indent="4" start_line="55"> <item-text start_line="57"> - MATSUO BASHO (松尾芭蕉 1644 - 1694) - : + MATSUO BASHO (松尾芭蕉 1644 - 1694) : </item-text> <Para start_line="59"> 古池や蛙とび込む水の音 @@ -85,7 +87,8 @@ As verbatim: </Para> <VerbatimFormatted start_line="65" xml:space="preserve"> - 古池や蛙とび込む水の音 + + 古池や蛙とび込む水の音 </VerbatimFormatted> <item-text start_line="69"> YOSA BUSON (与謝蕪村1716 - 1783) @@ -100,7 +103,8 @@ As verbatim: </Para> <VerbatimFormatted start_line="77" xml:space="preserve"> - 方八里雨雲よせぬ牡丹かな + + 方八里雨雲よせぬ牡丹かな </VerbatimFormatted> <item-text start_line="79"> MASAOKA SHIKI (正岡子規 1867 - 1902) @@ -115,7 +119,8 @@ As verbatim: </Para> <VerbatimFormatted start_line="87" xml:space="preserve"> - いちはつの一輪白し春の暮 + + いちはつの一輪白し春の暮 </VerbatimFormatted> <Para start_line="89"> 余命いくばくかある夜短し @@ -124,7 +129,8 @@ (yomei / ikubakuka aru / yo mijikashi) </Para> <VerbatimFormatted start_line="93" xml:space="preserve"> - 余命いくばくかある夜短し + + 余命いくばくかある夜短し </VerbatimFormatted> </over-text> <Para start_line="97"> diff --git a/cpan/Pod-Simple/t/corpus/2202jpx.xml b/cpan/Pod-Simple/t/corpus/2202jpx.xml index 57cb4ceadc..fde111d542 100644 --- a/cpan/Pod-Simple/t/corpus/2202jpx.xml +++ b/cpan/Pod-Simple/t/corpus/2202jpx.xml @@ -9,12 +9,11 @@ DESCRIPTION </head1> <Para start_line="11"> - This is a test Pod document in ISO-2202-JP. Its content - is some Japanese haiku by famous poets. + This is a test Pod document in ISO-2202-JP. Its content is some Japanese + haiku by famous poets. </Para> <head2 start_line="15"> - MATSUO BASHO (松尾芭蕉 1644 - 1694) - : + MATSUO BASHO (松尾芭蕉 1644 - 1694) : </head2> <Para start_line="17"> 古池や蛙とび込む水の音 @@ -26,7 +25,8 @@ As verbatim: </Para> <VerbatimFormatted start_line="23" xml:space="preserve"> - 古池や蛙とび込む水の音 + + 古池や蛙とび込む水の音 </VerbatimFormatted> <head2 start_line="27"> YOSA BUSON (与謝蕪村1716 - 1783) @@ -41,7 +41,8 @@ As verbatim: </Para> <VerbatimFormatted start_line="35" xml:space="preserve"> - 方八里雨雲よせぬ牡丹かな + + 方八里雨雲よせぬ牡丹かな </VerbatimFormatted> <head2 start_line="37"> MASAOKA SHIKI (正岡子規 1867 - 1902) @@ -56,7 +57,8 @@ As verbatim: </Para> <VerbatimFormatted start_line="45" xml:space="preserve"> - いちはつの一輪白し春の暮 + + いちはつの一輪白し春の暮 </VerbatimFormatted> <Para start_line="47"> 余命いくばくかある夜短し @@ -65,15 +67,15 @@ (yomei / ikubakuka aru / yo mijikashi) </Para> <VerbatimFormatted start_line="51" xml:space="preserve"> - 余命いくばくかある夜短し + + 余命いくばくかある夜短し </VerbatimFormatted> <head1 start_line="53"> AS A LIST </head1> <over-text indent="4" start_line="55"> <item-text start_line="57"> - MATSUO BASHO (松尾芭蕉 1644 - 1694) - : + MATSUO BASHO (松尾芭蕉 1644 - 1694) : </item-text> <Para start_line="59"> 古池や蛙とび込む水の音 @@ -85,7 +87,8 @@ As verbatim: </Para> <VerbatimFormatted start_line="65" xml:space="preserve"> - 古池や蛙とび込む水の音 + + 古池や蛙とび込む水の音 </VerbatimFormatted> <item-text start_line="69"> YOSA BUSON (与謝蕪村1716 - 1783) @@ -100,7 +103,8 @@ As verbatim: </Para> <VerbatimFormatted start_line="77" xml:space="preserve"> - 方八里雨雲よせぬ牡丹かな + + 方八里雨雲よせぬ牡丹かな </VerbatimFormatted> <item-text start_line="79"> MASAOKA SHIKI (正岡子規 1867 - 1902) @@ -115,7 +119,8 @@ As verbatim: </Para> <VerbatimFormatted start_line="87" xml:space="preserve"> - いちはつの一輪白し春の暮 + + いちはつの一輪白し春の暮 </VerbatimFormatted> <Para start_line="89"> 余命いくばくかある夜短し @@ -124,7 +129,8 @@ (yomei / ikubakuka aru / yo mijikashi) </Para> <VerbatimFormatted start_line="93" xml:space="preserve"> - 余命いくばくかある夜短し + + 余命いくばくかある夜短し </VerbatimFormatted> </over-text> <Para start_line="97"> diff --git a/cpan/Pod-Simple/t/corpus/2202jpy.xml b/cpan/Pod-Simple/t/corpus/2202jpy.xml index 23d51e1ebb..cc336af786 100644 --- a/cpan/Pod-Simple/t/corpus/2202jpy.xml +++ b/cpan/Pod-Simple/t/corpus/2202jpy.xml @@ -9,12 +9,11 @@ DESCRIPTION </head1> <Para start_line="10"> - This is a test Pod document in ISO-2202-JP. Its content - is some Japanese haiku by famous poets. + This is a test Pod document in ISO-2202-JP. Its content is some Japanese + haiku by famous poets. </Para> <head2 start_line="14"> - MATSUO BASHO (松尾芭蕉 1644 - 1694) - : + MATSUO BASHO (松尾芭蕉 1644 - 1694) : </head2> <Para start_line="16"> 古池や蛙とび込む水の音 @@ -26,7 +25,8 @@ As verbatim: </Para> <VerbatimFormatted start_line="22" xml:space="preserve"> - 古池や蛙とび込む水の音 + + 古池や蛙とび込む水の音 </VerbatimFormatted> <head2 start_line="26"> YOSA BUSON (与謝蕪村1716 - 1783) @@ -41,7 +41,8 @@ As verbatim: </Para> <VerbatimFormatted start_line="34" xml:space="preserve"> - 方八里雨雲よせぬ牡丹かな + + 方八里雨雲よせぬ牡丹かな </VerbatimFormatted> <head2 start_line="36"> MASAOKA SHIKI (正岡子規 1867 - 1902) @@ -56,7 +57,8 @@ As verbatim: </Para> <VerbatimFormatted start_line="44" xml:space="preserve"> - いちはつの一輪白し春の暮 + + いちはつの一輪白し春の暮 </VerbatimFormatted> <Para start_line="46"> 余命いくばくかある夜短し @@ -65,15 +67,15 @@ (yomei / ikubakuka aru / yo mijikashi) </Para> <VerbatimFormatted start_line="50" xml:space="preserve"> - 余命いくばくかある夜短し + + 余命いくばくかある夜短し </VerbatimFormatted> <head1 start_line="52"> AS A LIST </head1> <over-text indent="4" start_line="54"> <item-text start_line="56"> - MATSUO BASHO (松尾芭蕉 1644 - 1694) - : + MATSUO BASHO (松尾芭蕉 1644 - 1694) : </item-text> <Para start_line="58"> 古池や蛙とび込む水の音 @@ -85,7 +87,8 @@ As verbatim: </Para> <VerbatimFormatted start_line="64" xml:space="preserve"> - 古池や蛙とび込む水の音 + + 古池や蛙とび込む水の音 </VerbatimFormatted> <item-text start_line="68"> YOSA BUSON (与謝蕪村1716 - 1783) @@ -100,7 +103,8 @@ As verbatim: </Para> <VerbatimFormatted start_line="76" xml:space="preserve"> - 方八里雨雲よせぬ牡丹かな + + 方八里雨雲よせぬ牡丹かな </VerbatimFormatted> <item-text start_line="78"> MASAOKA SHIKI (正岡子規 1867 - 1902) @@ -115,7 +119,8 @@ As verbatim: </Para> <VerbatimFormatted start_line="86" xml:space="preserve"> - いちはつの一輪白し春の暮 + + いちはつの一輪白し春の暮 </VerbatimFormatted> <Para start_line="88"> 余命いくばくかある夜短し @@ -124,7 +129,8 @@ (yomei / ikubakuka aru / yo mijikashi) </Para> <VerbatimFormatted start_line="92" xml:space="preserve"> - 余命いくばくかある夜短し + + 余命いくばくかある夜短し </VerbatimFormatted> </over-text> <Para start_line="96"> diff --git a/cpan/Pod-Simple/t/corpus/8859_7.xml b/cpan/Pod-Simple/t/corpus/8859_7.xml index ffbf0d0855..436ac9c042 100644 --- a/cpan/Pod-Simple/t/corpus/8859_7.xml +++ b/cpan/Pod-Simple/t/corpus/8859_7.xml @@ -12,31 +12,37 @@ </head1> <Para start_line="10"> Αρχαίο Πνεύμ' - αθάνατον, αγνέ - πατέρα του - ωραίου, του - μεγάλου και - τ' αληθινού, + αθάνατον, + αγνέ πατέρα + του ωραίου, + του μεγάλου + και τ' + αληθινού, </Para> <Para start_line="13"> - κατέβα, φανερώσου - κι άστραψ' εδώ + κατέβα, + φανερώσου κι + άστραψ' εδώ πέρα στη δόξα της δικής σου - γης και τ' ουρανού. + γης και τ' + ουρανού. </Para> <Para start_line="16"> Στο δρόμο και στο πάλεμα - και στο λιθάρι, - στων ευγενών + και στο + λιθάρι, στων + ευγενών Αγώνων λάμψε την ορμή, </Para> <Para start_line="19"> - και με τ' αμάραντο - στεφάνωσε κλωνάρι - και σιδερένιο + και με τ' + αμάραντο + στεφάνωσε + κλωνάρι και + σιδερένιο πλάσε κι άξιο το κορμί. </Para> @@ -49,11 +55,12 @@ μέγας ναός, </Para> <Para start_line="25"> - και τρέχει - στο ναό εδώ + και τρέχει στο + ναό εδώ προσκυνητής σου. Αρχαίο - Πνεύμ' αθάνατο, - κάθε λαός. + Πνεύμ' + αθάνατο, κάθε + λαός. </Para> </Document> diff --git a/cpan/Pod-Simple/t/corpus/cp1256.xml b/cpan/Pod-Simple/t/corpus/cp1256.xml index deacfd6c85..18abda4d41 100644 --- a/cpan/Pod-Simple/t/corpus/cp1256.xml +++ b/cpan/Pod-Simple/t/corpus/cp1256.xml @@ -9,33 +9,37 @@ DESCRIPTION </head1> <Para start_line="8"> - This Pod document is a paragraph in Arabic from "The - Five Pillars of Islam" as CP-1256. + This Pod document is a paragraph in Arabic from "The Five Pillars of + Islam" as CP-1256. </Para> <Para start_line="13"> - وعن عمارة - بن حزم قال - قال رسول الله - صلى الله عليه - وسلم: + وعن عمارة بن + حزم قال قال + رسول الله + صلى الله + عليه وسلم: </Para> <Para start_line="15"> اربع فرضهن الله عز وجل في الاسلام - فمن جاء بثلاث - لم يغنين عنه + فمن جاء + بثلاث لم + يغنين عنه </Para> <Para start_line="17"> - شيئا حتى يأتي - بهن جميعا - الصلاة والزكاة + شيئا حتى + يأتي بهن + جميعا + الصلاة + والزكاة وصيام رمضان وحج </Para> <Para start_line="19"> البيت. رواه - احمد والطبراني + احمد + والطبراني في الكبير وفي اسناده ابن لهيعة. @@ -44,18 +48,22 @@ And now as a real single paragraph: </Para> <Para start_line="23"> - وعن عمارة - بن حزم قال - قال رسول الله - صلى الله عليه - وسلم: اربع - فرضهن الله - عز وجل في الاسلام - فمن جاء بثلاث - لم يغنين عنه - شيئا حتى يأتي - بهن جميعا - الصلاة والزكاة + وعن عمارة بن + حزم قال قال + رسول الله + صلى الله + عليه وسلم: + اربع فرضهن + الله عز وجل + في الاسلام + فمن جاء + بثلاث لم + يغنين عنه + شيئا حتى + يأتي بهن + جميعا + الصلاة + والزكاة وصيام رمضان وحج البيت. رواه احمد @@ -68,26 +76,27 @@ And now as a verbatim paragraph: </Para> <VerbatimFormatted start_line="30" xml:space="preserve"> - وعن عمارة - بن حزم قال - قال رسول الله - صلى الله عليه - وسلم: - + وعن عمارة بن + حزم قال قال + رسول الله + صلى الله + عليه وسلم: اربع فرضهن الله عز وجل في الاسلام - فمن جاء بثلاث - لم يغنين عنه - - شيئا حتى يأتي - بهن جميعا - الصلاة والزكاة + فمن جاء + بثلاث لم + يغنين عنه + شيئا حتى + يأتي بهن + جميعا + الصلاة + والزكاة وصيام رمضان وحج - البيت. رواه - احمد والطبراني + احمد + والطبراني في الكبير وفي اسناده ابن لهيعة. diff --git a/cpan/Pod-Simple/t/corpus/encwarn01.txt b/cpan/Pod-Simple/t/corpus/encwarn01.txt new file mode 100644 index 0000000000..550b9c23d8 --- /dev/null +++ b/cpan/Pod-Simple/t/corpus/encwarn01.txt @@ -0,0 +1,11 @@ + +=head1 NAME + +Encoding Warning 1 - implicitly Latin-1 + +=head2 DESCRIPTION + +This line should warn that the word café contains a non-ASCII character. + +But château should not generate a warning - once is enough. + diff --git a/cpan/Pod-Simple/t/corpus/encwarn01.xml b/cpan/Pod-Simple/t/corpus/encwarn01.xml new file mode 100644 index 0000000000..d64d56f55b --- /dev/null +++ b/cpan/Pod-Simple/t/corpus/encwarn01.xml @@ -0,0 +1,36 @@ +<Document start_line="2"> + <head1 start_line="2"> + NAME + </head1> + <Para start_line="4"> + Encoding Warning 1 - implicitly Latin-1 + </Para> + <head2 start_line="6"> + DESCRIPTION + </head2> + <Para start_line="8"> + This line should warn that the word café contains a non-ASCII + character. + </Para> + <Para start_line="10"> + But château should not generate a warning - once is enough. + </Para> + <head1 errata="1" start_line="-321"> + POD ERRORS + </head1> + <Para errata="1" start_line="-321"> + Hey! + <B> + The above document had some coding errors, which are explained below: + </B> + </Para> + <over-text errata="1" indent="4" start_line="-321"> + <item-text start_line="-321"> + Around line 8: + </item-text> + <Para start_line="-321"> + Non-ASCII character seen before =encoding in 'café'. Assuming + ISO8859-1 + </Para> + </over-text> +</Document> diff --git a/cpan/Pod-Simple/t/corpus/encwarn02.txt b/cpan/Pod-Simple/t/corpus/encwarn02.txt new file mode 100644 index 0000000000..fb1052b6c8 --- /dev/null +++ b/cpan/Pod-Simple/t/corpus/encwarn02.txt @@ -0,0 +1,11 @@ + +=head1 NAME + +Encoding Warning 1 - implicitly UTF-8 + +=head2 DESCRIPTION + +This line should warn that the price €9.99 contains a non-ASCII character. + +But château should not generate a warning - once is enough. + diff --git a/cpan/Pod-Simple/t/corpus/encwarn02.xml b/cpan/Pod-Simple/t/corpus/encwarn02.xml new file mode 100644 index 0000000000..02eeba37c9 --- /dev/null +++ b/cpan/Pod-Simple/t/corpus/encwarn02.xml @@ -0,0 +1,36 @@ +<Document start_line="2"> + <head1 start_line="2"> + NAME + </head1> + <Para start_line="4"> + Encoding Warning 1 - implicitly UTF-8 + </Para> + <head2 start_line="6"> + DESCRIPTION + </head2> + <Para start_line="8"> + This line should warn that the price €9.99 contains a non-ASCII + character. + </Para> + <Para start_line="10"> + But château should not generate a warning - once is enough. + </Para> + <head1 errata="1" start_line="-321"> + POD ERRORS + </head1> + <Para errata="1" start_line="-321"> + Hey! + <B> + The above document had some coding errors, which are explained below: + </B> + </Para> + <over-text errata="1" indent="4" start_line="-321"> + <item-text start_line="-321"> + Around line 8: + </item-text> + <Para start_line="-321"> + Non-ASCII character seen before =encoding in '€9.99'. + Assuming UTF-8 + </Para> + </over-text> +</Document> diff --git a/cpan/Pod-Simple/t/corpus/fet_cont.xml b/cpan/Pod-Simple/t/corpus/fet_cont.xml index 4f4995f925..045de1b97e 100644 --- a/cpan/Pod-Simple/t/corpus/fet_cont.xml +++ b/cpan/Pod-Simple/t/corpus/fet_cont.xml @@ -3,10 +3,11 @@ NAME </head1> <Para start_line="9"> - Когда читала - ты мучительные - строки -- Fet's - "When you were reading" + Когда + читала ты + мучительные + строки -- Fet's "When you + were reading" </Para> <head1 start_line="11"> TEXT @@ -26,8 +27,7 @@ <Para errata="1" start_line="-321"> Hey! <B> - The above document had some coding errors, which are explained - below: + The above document had some coding errors, which are explained below: </B> </Para> <over-text errata="1" indent="4" start_line="-321"> @@ -35,8 +35,7 @@ Around line 13: </item-text> <Para start_line="-321"> - Couldn't do =encoding Shift-JIS: Encoding is already - set to koi8-r + Couldn't do =encoding Shift-JIS: Encoding is already set to koi8-r </Para> </over-text> </Document> diff --git a/cpan/Pod-Simple/t/corpus/fet_dup.xml b/cpan/Pod-Simple/t/corpus/fet_dup.xml index c33277deb0..3259f4e092 100644 --- a/cpan/Pod-Simple/t/corpus/fet_dup.xml +++ b/cpan/Pod-Simple/t/corpus/fet_dup.xml @@ -3,10 +3,11 @@ NAME </head1> <Para start_line="9"> - Когда читала - ты мучительные - строки -- Fet's - "When you were reading" + Когда + читала ты + мучительные + строки -- Fet's "When you + were reading" </Para> <head1 start_line="11"> TEXT @@ -15,14 +16,17 @@ (This is a test Pod pocument in KOI8-R.) </Para> <Para start_line="15"> - Когда читала - ты мучительные + Когда + читала ты + мучительные строки, / Где - сердца звучный - пыл сиянье - льет кругом - / И страсти - роковой вздымаются + сердца + звучный пыл + сиянье льет + кругом / И + страсти + роковой + вздымаются потоки,- / Не вспомнила ль о чем? @@ -31,26 +35,33 @@ Я верить не хочу! Когда в степи, как - диво, / В полночной - темноте безвременно + диво, / В + полночной + темноте + безвременно горя, / Вдали перед тобой - прозрачно - и красиво - / Вставала + прозрачно и + красиво / + Вставала вдругзаря. </Para> <Para start_line="25"> - И в эту красоту + И в эту + красоту невольно - взор тянуло, - / В тот величавый - блеск за темный - весь предел,- - / Ужель ничто - тебе в то время - не шепнуло: - / Там человек + взор + тянуло, / В + тот + величавый + блеск за + темный весь + предел,- / + Ужель ничто + тебе в то + время не + шепнуло: / + Там человек сгорел! </Para> <Para start_line="30"> @@ -60,60 +71,58 @@ And now, as a verbatim section: </Para> <VerbatimFormatted start_line="34" xml:space="preserve"> - Когда читала - ты мучительные + Когда + читала ты + мучительные строки, - Где сердца звучный пыл сиянье льет кругом - И страсти - роковой вздымаются + роковой + вздымаются потоки,- - - Не вспомнила + Не + вспомнила ль о чем? - - - + Я верить не хочу! Когда в степи, как диво, - - В полночной - темноте безвременно + В + полночной + темноте + безвременно горя, - - Вдали перед - тобой прозрачно - и красиво - - Вставала + Вдали + перед тобой + прозрачно и + красиво + Вставала вдругзаря. </VerbatimFormatted> <VerbatimFormatted start_line="46" xml:space="preserve"> - И в эту красоту + И в эту + красоту невольно - взор тянуло, - - В тот величавый - блеск за темный - весь предел,- - - Ужель ничто - тебе в то время + взор + тянуло, + В тот + величавый + блеск за + темный весь + предел,- + Ужель + ничто тебе + в то время не шепнуло: - - Там человек + Там + человек сгорел! - - - 15 февраля - 1887 + 15 февраля 1887 </VerbatimFormatted> <Para start_line="53"> [end] diff --git a/cpan/Pod-Simple/t/corpus/iso6.xml b/cpan/Pod-Simple/t/corpus/iso6.xml index b597324087..dae9fadfc9 100644 --- a/cpan/Pod-Simple/t/corpus/iso6.xml +++ b/cpan/Pod-Simple/t/corpus/iso6.xml @@ -3,40 +3,43 @@ NAME </head1> <Para start_line="4"> - buniya-iso-6 -- test document: a paragraph in Arabic as - ISO-8859-6 + buniya-iso-6 -- test document: a paragraph in Arabic as ISO-8859-6 </Para> <head1 start_line="6"> DESCRIPTION </head1> <Para start_line="8"> - This document is a paragraph in Arabic from "The Five - Pillars of Islam" as ISO-8859-6. + This document is a paragraph in Arabic from "The Five Pillars of + Islam" as ISO-8859-6. </Para> <Para start_line="13"> - وعن عمارة - بن حزم قال - قال رسول الله - صلى الله عليه - وسلم: + وعن عمارة بن + حزم قال قال + رسول الله + صلى الله + عليه وسلم: </Para> <Para start_line="15"> اربع فرضهن الله عز وجل في الاسلام - فمن جاء بثلاث - لم يغنين عنه + فمن جاء + بثلاث لم + يغنين عنه </Para> <Para start_line="17"> - شيئا حتى يأتي - بهن جميعا - الصلاة والزكاة + شيئا حتى + يأتي بهن + جميعا + الصلاة + والزكاة وصيام رمضان وحج </Para> <Para start_line="19"> البيت. رواه - احمد والطبراني + احمد + والطبراني في الكبير وفي اسناده ابن لهيعة. @@ -45,18 +48,22 @@ And now as a real single paragraph: </Para> <Para start_line="23"> - وعن عمارة - بن حزم قال - قال رسول الله - صلى الله عليه - وسلم: اربع - فرضهن الله - عز وجل في الاسلام - فمن جاء بثلاث - لم يغنين عنه - شيئا حتى يأتي - بهن جميعا - الصلاة والزكاة + وعن عمارة بن + حزم قال قال + رسول الله + صلى الله + عليه وسلم: + اربع فرضهن + الله عز وجل + في الاسلام + فمن جاء + بثلاث لم + يغنين عنه + شيئا حتى + يأتي بهن + جميعا + الصلاة + والزكاة وصيام رمضان وحج البيت. رواه احمد @@ -69,30 +76,30 @@ And now as a verbatim paragraph: </Para> <VerbatimFormatted start_line="30" xml:space="preserve"> - وعن عمارة - بن حزم قال - قال رسول الله - صلى الله عليه - وسلم: - + وعن عمارة بن + حزم قال قال + رسول الله + صلى الله + عليه وسلم: اربع فرضهن الله عز وجل في الاسلام - فمن جاء بثلاث - لم يغنين عنه - - شيئا حتى يأتي - بهن جميعا - الصلاة والزكاة + فمن جاء + بثلاث لم + يغنين عنه + شيئا حتى + يأتي بهن + جميعا + الصلاة + والزكاة وصيام رمضان وحج - البيت. رواه - احمد والطبراني + احمد + والطبراني في الكبير وفي اسناده - ابن لهيعة. - + ابن لهيعة. </VerbatimFormatted> <Para start_line="35"> [end] diff --git a/cpan/Pod-Simple/t/corpus/koi8r.xml b/cpan/Pod-Simple/t/corpus/koi8r.xml index 94331d7e4d..2c851d41a8 100644 --- a/cpan/Pod-Simple/t/corpus/koi8r.xml +++ b/cpan/Pod-Simple/t/corpus/koi8r.xml @@ -3,10 +3,11 @@ NAME </head1> <Para start_line="6"> - Когда читала - ты мучительные - строки -- Fet's - "When you were reading" + Когда + читала ты + мучительные + строки -- Fet's "When you + were reading" </Para> <head1 start_line="8"> TEXT @@ -15,14 +16,17 @@ (This is a test Pod pocument in KOI8-R.) </Para> <Para start_line="12"> - Когда читала - ты мучительные + Когда + читала ты + мучительные строки, / Где - сердца звучный - пыл сиянье - льет кругом - / И страсти - роковой вздымаются + сердца + звучный пыл + сиянье льет + кругом / И + страсти + роковой + вздымаются потоки,- / Не вспомнила ль о чем? @@ -31,26 +35,33 @@ Я верить не хочу! Когда в степи, как - диво, / В полночной - темноте безвременно + диво, / В + полночной + темноте + безвременно горя, / Вдали перед тобой - прозрачно - и красиво - / Вставала + прозрачно и + красиво / + Вставала вдругзаря. </Para> <Para start_line="22"> - И в эту красоту + И в эту + красоту невольно - взор тянуло, - / В тот величавый - блеск за темный - весь предел,- - / Ужель ничто - тебе в то время - не шепнуло: - / Там человек + взор + тянуло, / В + тот + величавый + блеск за + темный весь + предел,- / + Ужель ничто + тебе в то + время не + шепнуло: / + Там человек сгорел! </Para> <Para start_line="27"> @@ -60,61 +71,57 @@ And now, as a verbatim section: </Para> <VerbatimFormatted start_line="31" xml:space="preserve"> - Когда читала - ты мучительные + Когда + читала ты + мучительные строки, - Где сердца звучный пыл сиянье льет кругом - И страсти - роковой вздымаются + роковой + вздымаются потоки,- - - Не вспомнила + Не + вспомнила ль о чем? - - - + Я верить не хочу! Когда в степи, как диво, - - В полночной - темноте безвременно + В + полночной + темноте + безвременно горя, - - Вдали перед - тобой прозрачно - и красиво - - Вставала + Вдали + перед тобой + прозрачно и + красиво + Вставала вдругзаря. - - - - И в эту красоту + + И в эту + красоту невольно - взор тянуло, - - В тот величавый - блеск за темный - весь предел,- - - Ужель ничто - тебе в то время + взор + тянуло, + В тот + величавый + блеск за + темный весь + предел,- + Ужель + ничто тебе + в то время не шепнуло: - - Там человек + Там + человек сгорел! - - - 15 февраля - 1887 + 15 февраля 1887 </VerbatimFormatted> <Para start_line="48"> [end] diff --git a/cpan/Pod-Simple/t/corpus/laozi38.xml b/cpan/Pod-Simple/t/corpus/laozi38.xml index 5ff72513ab..e8c3e6597f 100644 --- a/cpan/Pod-Simple/t/corpus/laozi38.xml +++ b/cpan/Pod-Simple/t/corpus/laozi38.xml @@ -22,28 +22,27 @@ And as a verbatim section: </Para> <VerbatimFormatted start_line="20" xml:space="preserve"> - 上德不德，是以有德﹔ - - 下德不失德，是以無德。 - - 上德無為而無以為﹔ - - 下德無為而有以為。 - - 上仁為之而無以為﹔ - - 上義為之而有以為。 - - 上禮為之而莫之應，則攘臂而扔之。 - + + 上德不德，是以有德﹔ + + 下德不失德，是以無德。 + + 上德無為而無以為﹔ + + 下德無為而有以為。 + + 上仁為之而無以為﹔ + + 上義為之而有以為。 + + 上禮為之而莫之應，則攘臂而扔之。 - - 故失道而后德，失德而后仁，失仁而后義，失義而后禮。夫禮者，忠信之薄，而亂之首。 - - 前識者，道之華，而愚之始。 - - 是以大丈夫居其厚，不居其薄﹔居其實，不居其華。 - + + 故失道而后德，失德而后仁，失仁而后義，失義而后禮。夫禮者，忠信之薄，而亂之首。 + + 前識者，道之華，而愚之始。 + + 是以大丈夫居其厚，不居其薄﹔居其實，不居其華。 故去彼取此。 </VerbatimFormatted> <Para start_line="33"> diff --git a/cpan/Pod-Simple/t/corpus/laozi38b.xml b/cpan/Pod-Simple/t/corpus/laozi38b.xml index 5ff72513ab..e8c3e6597f 100644 --- a/cpan/Pod-Simple/t/corpus/laozi38b.xml +++ b/cpan/Pod-Simple/t/corpus/laozi38b.xml @@ -22,28 +22,27 @@ And as a verbatim section: </Para> <VerbatimFormatted start_line="20" xml:space="preserve"> - 上德不德，是以有德﹔ - - 下德不失德，是以無德。 - - 上德無為而無以為﹔ - - 下德無為而有以為。 - - 上仁為之而無以為﹔ - - 上義為之而有以為。 - - 上禮為之而莫之應，則攘臂而扔之。 - + + 上德不德，是以有德﹔ + + 下德不失德，是以無德。 + + 上德無為而無以為﹔ + + 下德無為而有以為。 + + 上仁為之而無以為﹔ + + 上義為之而有以為。 + + 上禮為之而莫之應，則攘臂而扔之。 - - 故失道而后德，失德而后仁，失仁而后義，失義而后禮。夫禮者，忠信之薄，而亂之首。 - - 前識者，道之華，而愚之始。 - - 是以大丈夫居其厚，不居其薄﹔居其實，不居其華。 - + + 故失道而后德，失德而后仁，失仁而后義，失義而后禮。夫禮者，忠信之薄，而亂之首。 + + 前識者，道之華，而愚之始。 + + 是以大丈夫居其厚，不居其薄﹔居其實，不居其華。 故去彼取此。 </VerbatimFormatted> <Para start_line="33"> diff --git a/cpan/Pod-Simple/t/corpus/laozi38p.xml b/cpan/Pod-Simple/t/corpus/laozi38p.xml index bae00f25d4..e504af3628 100644 --- a/cpan/Pod-Simple/t/corpus/laozi38p.xml +++ b/cpan/Pod-Simple/t/corpus/laozi38p.xml @@ -10,8 +10,8 @@ DESCRIPTION </head1> <Para start_line="10"> - This is a test Pod document in the Big5 encoding. Its content - is the 38th canto from the + This is a test Pod document in the Big5 encoding. Its content is the 38th + canto from the <I> Dao De Jing </I> @@ -39,28 +39,27 @@ And as a verbatim section: </Para> <VerbatimFormatted start_line="30" xml:space="preserve"> - 上德不德，是以有德﹔ - - 下德不失德，是以無德。 - - 上德無為而無以為﹔ - - 下德無為而有以為。 - - 上仁為之而無以為﹔ - - 上義為之而有以為。 - - 上禮為之而莫之應，則攘臂而扔之。 - + + 上德不德，是以有德﹔ + + 下德不失德，是以無德。 + + 上德無為而無以為﹔ + + 下德無為而有以為。 + + 上仁為之而無以為﹔ - - 故失道而后德，失德而后仁，失仁而后義，失義而后禮。夫禮者，忠信之薄，而亂之首。 - - 前識者，道之華，而愚之始。 - - 是以大丈夫居其厚，不居其薄﹔居其實，不居其華。 - + 上義為之而有以為。 + + 上禮為之而莫之應，則攘臂而扔之。 + + + 故失道而后德，失德而后仁，失仁而后義，失義而后禮。夫禮者，忠信之薄，而亂之首。 + + 前識者，道之華，而愚之始。 + + 是以大丈夫居其厚，不居其薄﹔居其實，不居其華。 故去彼取此。 </VerbatimFormatted> <Para start_line="43"> diff --git a/cpan/Pod-Simple/t/corpus/lat1fr.xml b/cpan/Pod-Simple/t/corpus/lat1fr.xml index 017ae6abf7..e258844a67 100644 --- a/cpan/Pod-Simple/t/corpus/lat1fr.xml +++ b/cpan/Pod-Simple/t/corpus/lat1fr.xml @@ -9,28 +9,25 @@ DESCRIPTION </head1> <Para start_line="10"> - This is a test Pod document in Latin-1. Its content is the - last two paragraphs of Baudelaire's + This is a test Pod document in Latin-1. Its content is the last two + paragraphs of Baudelaire's <I> Le Joujou du pauvre </I> . </Para> <Para start_line="13"> - A travers ces barreaux symboliques séparant deux mondes, - la grande route et le château, l'enfant pauvre - montrait à l'enfant riche son propre joujou, que - celui-ci examinait avidement comme un objet rare et inconnu. - Or, ce joujou, que le petit souillon agaçait, agitait - et secouait dans une boîte grillée, c'était - un rat vivant -   - ! Les parents, par économie sans doute, avaient tiré - le joujou de la vie elle-même. + A travers ces barreaux symboliques séparant deux mondes, la grande + route et le château, l'enfant pauvre montrait à + l'enfant riche son propre joujou, que celui-ci examinait avidement + comme un objet rare et inconnu. Or, ce joujou, que le petit souillon + agaçait, agitait et secouait dans une boîte grillée, + c'était un rat vivant ! Les parents, par économie + sans doute, avaient tiré le joujou de la vie elle-même. </Para> <Para start_line="20"> - Et les deux enfants se riaient l'un à l'autre - fraternellement, avec des dents d'une + Et les deux enfants se riaient l'un à l'autre fraternellement, + avec des dents d'une <I> égale </I> @@ -40,28 +37,20 @@ As Verbatim </head2> <VerbatimFormatted start_line="25" xml:space="preserve"> - A travers ces barreaux symboliques séparant deux mondes, - la grande route - - et le château, l'enfant pauvre montrait à - l'enfant riche son propre - - joujou, que celui-ci examinait avidement comme un objet - rare et inconnu. - - Or, ce joujou, que le petit souillon agaçait, agitait - et secouait dans - - une boîte grillée, c'était un rat vivant ! + A travers ces barreaux symboliques séparant deux mondes, la grande + route + et le château, l'enfant pauvre montrait à l'enfant + riche son propre + joujou, que celui-ci examinait avidement comme un objet rare et + inconnu. + Or, ce joujou, que le petit souillon agaçait, agitait et secouait + dans + une boîte grillée, c'était un rat vivant ! Les parents, par économie - sans doute, avaient tiré le joujou de la vie elle-même. - - Et les deux enfants se riaient l'un à l'autre fraternellement, avec des - dents d'une égale blancheur. </VerbatimFormatted> <Para start_line="35"> diff --git a/cpan/Pod-Simple/t/corpus/lat1frim.xml b/cpan/Pod-Simple/t/corpus/lat1frim.xml index ffbbdb05ac..8b9191c7e1 100644 --- a/cpan/Pod-Simple/t/corpus/lat1frim.xml +++ b/cpan/Pod-Simple/t/corpus/lat1frim.xml @@ -9,28 +9,25 @@ DESCRIPTION </head1> <Para start_line="8"> - This is a test Pod document in Latin-1. Its content is the - last two paragraphs of Baudelaire's + This is a test Pod document in Latin-1. Its content is the last two + paragraphs of Baudelaire's <I> Le Joujou du pauvre </I> . </Para> <Para start_line="11"> - A travers ces barreaux symboliques séparant deux mondes, - la grande route et le château, l'enfant pauvre - montrait à l'enfant riche son propre joujou, que - celui-ci examinait avidement comme un objet rare et inconnu. - Or, ce joujou, que le petit souillon agaçait, agitait - et secouait dans une boîte grillée, c'était - un rat vivant -   - ! Les parents, par économie sans doute, avaient tiré - le joujou de la vie elle-même. + A travers ces barreaux symboliques séparant deux mondes, la grande + route et le château, l'enfant pauvre montrait à + l'enfant riche son propre joujou, que celui-ci examinait avidement + comme un objet rare et inconnu. Or, ce joujou, que le petit souillon + agaçait, agitait et secouait dans une boîte grillée, + c'était un rat vivant ! Les parents, par économie + sans doute, avaient tiré le joujou de la vie elle-même. </Para> <Para start_line="18"> - Et les deux enfants se riaient l'un à l'autre - fraternellement, avec des dents d'une + Et les deux enfants se riaient l'un à l'autre fraternellement, + avec des dents d'une <I> égale </I> @@ -40,31 +37,41 @@ As Verbatim </head2> <VerbatimFormatted start_line="23" xml:space="preserve"> - A travers ces barreaux symboliques séparant deux mondes, - la grande route - - et le château, l'enfant pauvre montrait à - l'enfant riche son propre - - joujou, que celui-ci examinait avidement comme un objet - rare et inconnu. - - Or, ce joujou, que le petit souillon agaçait, agitait - et secouait dans - - une boîte grillée, c'était un rat vivant ! + A travers ces barreaux symboliques séparant deux mondes, la grande + route + et le château, l'enfant pauvre montrait à l'enfant + riche son propre + joujou, que celui-ci examinait avidement comme un objet rare et + inconnu. + Or, ce joujou, que le petit souillon agaçait, agitait et secouait + dans + une boîte grillée, c'était un rat vivant ! Les parents, par économie - sans doute, avaient tiré le joujou de la vie elle-même. - - Et les deux enfants se riaient l'un à l'autre fraternellement, avec des - dents d'une égale blancheur. </VerbatimFormatted> <Para start_line="33"> [end] </Para> + <head1 errata="1" start_line="-321"> + POD ERRORS + </head1> + <Para errata="1" start_line="-321"> + Hey! + <B> + The above document had some coding errors, which are explained below: + </B> + </Para> + <over-text errata="1" indent="4" start_line="-321"> + <item-text start_line="-321"> + Around line 11: + </item-text> + <Para start_line="-321"> + Non-ASCII character seen before =encoding in 'séparant'. + Assuming ISO8859-1 + </Para> + </over-text> </Document> diff --git a/cpan/Pod-Simple/t/corpus/pasternak_cp1251.xml b/cpan/Pod-Simple/t/corpus/pasternak_cp1251.xml index 2276551b31..c1f59011ba 100644 --- a/cpan/Pod-Simple/t/corpus/pasternak_cp1251.xml +++ b/cpan/Pod-Simple/t/corpus/pasternak_cp1251.xml @@ -3,8 +3,8 @@ NAME </head1> <Para start_line="6"> - Зимняя ночь - -- Pasternak Russian test file (cp1251) + Зимняя ночь -- + Pasternak Russian test file (cp1251) </Para> <head1 start_line="8"> TEXT @@ -16,76 +16,100 @@ Зимняя ночь. </Para> <Para start_line="14"> - Мело, мело - по всей земле - / Во все пределы. - / Свеча горела - на столе, / Свеча + Мело, мело по + всей земле / + Во все + пределы. / + Свеча + горела на + столе, / + Свеча горела. </Para> <Para start_line="19"> Как летом - роем мошкора - / Летит на пламя, - / Слетались + роем + мошкора / + Летит на + пламя, / + Слетались хлопья со - двора / К оконной + двора / К + оконной раме. </Para> <Para start_line="24"> - Метель лепила - на столе / Кружки - и стрелы. / Свеча + Метель + лепила на + столе / + Кружки и + стрелы. / + Свеча горела на - столе, / Свеча + столе, / + Свеча горела. </Para> <Para start_line="29"> - На озаренный - потолок / Ложились - тени, / Скрещенья - рук, скркщенья + На + озаренный + потолок / + Ложились + тени, / + Скрещенья + рук, + скркщенья ног, / Судьбы скрещенья. </Para> <Para start_line="34"> И падали два - башмачка - / Со стуком - на пол, / И воск + башмачка / + Со стуком + на пол, / И + воск слезами с ночника / На - платье капал. + платье + капал. </Para> <Para start_line="39"> - И все терялось - в снежной + И все + терялось в + снежной мгле / Седой - и белой. / Свеча + и белой. / + Свеча горела на - столе, / Свеча + столе, / + Свеча горела. </Para> <Para start_line="44"> На свечку - дуло из угла, - / И жар соблазна - / Вздымал, как - ангел, два - крыла / Крестообразно. + дуло из + угла, / И жар + соблазна / + Вздымал, + как ангел, + два крыла / + Крестообразно. / </Para> <Para start_line="49"> Мело весь - месяц в феврале, - / И то и дело - / Свеча горела - на столе, / Свеча + месяц в + феврале, / И + то и дело / + Свеча + горела на + столе, / + Свеча горела. </Para> <Para start_line="54"> - -- Борис Пастернак, - 1946 + -- Борис + Пастернак, 1946 </Para> <head2 start_line="57"> As Preformatted @@ -95,115 +119,98 @@ </Para> <VerbatimFormatted start_line="61" xml:space="preserve"> Зимняя ночь. - - Мело, мело - по всей земле - - Во все пределы. - - Свеча горела - на столе, - - Свеча горела. - + по всей + земле + Во все + пределы. + Свеча + горела на + столе, + Свеча + горела. - Как летом - роем мошкора - - Летит на пламя, - + роем + мошкора + Летит на + пламя, Слетались хлопья со двора - К оконной раме. - - - Метель лепила - на столе - - Кружки и стрелы. - - Свеча горела - на столе, - - Свеча горела. - + Метель + лепила на + столе + Кружки и + стрелы. + Свеча + горела на + столе, + Свеча + горела. - - На озаренный + На + озаренный потолок - Ложились тени, - Скрещенья - рук, скркщенья + рук, + скркщенья ног, - - Судьбы скрещенья. - + Судьбы + скрещенья. - - И падали два + И падали + два башмачка - Со стуком на пол, - - И воск слезами - с ночника - + И воск + слезами с + ночника На платье капал. - - - И все терялось - в снежной + И все + терялось в + снежной мгле - - Седой и белой. - - Свеча горела - на столе, - - Свеча горела. - + Седой и + белой. + Свеча + горела на + столе, + Свеча + горела. - На свечку - дуло из угла, - - И жар соблазна - - Вздымал, как - ангел, два - крыла - - Крестообразно. - + дуло из + угла, + И жар + соблазна + Вздымал, + как ангел, + два крыла + + Крестообразно. - Мело весь - месяц в феврале, - + месяц в + феврале, И то и дело - - Свеча горела - на столе, - - Свеча горела. - + Свеча + горела на + столе, + Свеча + горела. - - -- Борис Пастернак, - 1946 + -- Борис + Пастернак, 1946 </VerbatimFormatted> <Para start_line="105"> [end] diff --git a/cpan/Pod-Simple/t/corpus/plain.xml b/cpan/Pod-Simple/t/corpus/plain.xml index 05dc732ee5..9358a5f202 100644 --- a/cpan/Pod-Simple/t/corpus/plain.xml +++ b/cpan/Pod-Simple/t/corpus/plain.xml @@ -12,13 +12,12 @@ The quick brown fox jumps over the lazy dog. </Para> <Para start_line="10"> - Military Intelligence Yukon rhosts penrep Weekly World News - DSD Time Cohiba finks rail gun DF ~ Corporate Security NATOA - CCS DEVGRP + Military Intelligence Yukon rhosts penrep Weekly World News DSD Time Cohiba + finks rail gun DF ~ Corporate Security NATOA CCS DEVGRP </Para> <Para start_line="13"> - CONUS Khaddafi NATIA data havens Spetznaz afsatcom BOP Semtex - garbage KGB ^? 737 1080H 1080H Satellite imagery smuggle + CONUS Khaddafi NATIA data havens Spetznaz afsatcom BOP Semtex garbage KGB + ^? 737 1080H 1080H Satellite imagery smuggle </Para> <Para start_line="16"> [end] diff --git a/cpan/Pod-Simple/t/corpus/plain_explicit.xml b/cpan/Pod-Simple/t/corpus/plain_explicit.xml index 1db06b81f8..3fafb99bf5 100644 --- a/cpan/Pod-Simple/t/corpus/plain_explicit.xml +++ b/cpan/Pod-Simple/t/corpus/plain_explicit.xml @@ -12,13 +12,12 @@ The quick brown fox jumps over the lazy dog. </Para> <Para start_line="12"> - Military Intelligence Yukon rhosts penrep Weekly World News - DSD Time Cohiba finks rail gun DF ~ Corporate Security NATOA - CCS DEVGRP + Military Intelligence Yukon rhosts penrep Weekly World News DSD Time Cohiba + finks rail gun DF ~ Corporate Security NATOA CCS DEVGRP </Para> <Para start_line="15"> - CONUS Khaddafi NATIA data havens Spetznaz afsatcom BOP Semtex - garbage KGB ^? 737 1080H 1080H Satellite imagery smuggle + CONUS Khaddafi NATIA data havens Spetznaz afsatcom BOP Semtex garbage KGB + ^? 737 1080H 1080H Satellite imagery smuggle </Para> <Para start_line="18"> [end] diff --git a/cpan/Pod-Simple/t/corpus/plain_latin1.xml b/cpan/Pod-Simple/t/corpus/plain_latin1.xml index 74f9baeb73..c55f67feff 100644 --- a/cpan/Pod-Simple/t/corpus/plain_latin1.xml +++ b/cpan/Pod-Simple/t/corpus/plain_latin1.xml @@ -3,8 +3,7 @@ NAME </head1> <Para start_line="8"> - simple_text_document -- an explicitly Latin-1 (ASCII subset) - test document + simple_text_document -- an explicitly Latin-1 (ASCII subset) test document </Para> <head1 start_line="10"> TEXT @@ -13,13 +12,12 @@ The quick brown fox jumps over the lazy dog. </Para> <Para start_line="14"> - Military Intelligence Yukon rhosts penrep Weekly World News - DSD Time Cohiba finks rail gun DF ~ Corporate Security NATOA - CCS DEVGRP + Military Intelligence Yukon rhosts penrep Weekly World News DSD Time Cohiba + finks rail gun DF ~ Corporate Security NATOA CCS DEVGRP </Para> <Para start_line="17"> - CONUS Khaddafi NATIA data havens Spetznaz afsatcom BOP Semtex - garbage KGB ^? 737 1080H 1080H Satellite imagery smuggle + CONUS Khaddafi NATIA data havens Spetznaz afsatcom BOP Semtex garbage KGB + ^? 737 1080H 1080H Satellite imagery smuggle </Para> <Para start_line="20"> [end] diff --git a/cpan/Pod-Simple/t/corpus/plain_utf8.xml b/cpan/Pod-Simple/t/corpus/plain_utf8.xml index f78846b54a..d6939a488a 100644 --- a/cpan/Pod-Simple/t/corpus/plain_utf8.xml +++ b/cpan/Pod-Simple/t/corpus/plain_utf8.xml @@ -3,8 +3,7 @@ NAME </head1> <Para start_line="8"> - simple_text_document -- an explicitly UTF8 (ASCII subset) - test document + simple_text_document -- an explicitly UTF8 (ASCII subset) test document </Para> <head1 start_line="10"> TEXT @@ -13,13 +12,12 @@ The quick brown fox jumps over the lazy dog. </Para> <Para start_line="14"> - Military Intelligence Yukon rhosts penrep Weekly World News - DSD Time Cohiba finks rail gun DF ~ Corporate Security NATOA - CCS DEVGRP + Military Intelligence Yukon rhosts penrep Weekly World News DSD Time Cohiba + finks rail gun DF ~ Corporate Security NATOA CCS DEVGRP </Para> <Para start_line="17"> - CONUS Khaddafi NATIA data havens Spetznaz afsatcom BOP Semtex - garbage KGB ^? 737 1080H 1080H Satellite imagery smuggle + CONUS Khaddafi NATIA data havens Spetznaz afsatcom BOP Semtex garbage KGB + ^? 737 1080H 1080H Satellite imagery smuggle </Para> <Para start_line="20"> [end] diff --git a/cpan/Pod-Simple/t/corpus/polish_utf8.xml b/cpan/Pod-Simple/t/corpus/polish_utf8.xml index 1aa77ec029..d8e91d8656 100644 --- a/cpan/Pod-Simple/t/corpus/polish_utf8.xml +++ b/cpan/Pod-Simple/t/corpus/polish_utf8.xml @@ -3,32 +3,29 @@ NAME </head1> <Para start_line="6"> - WŚRÓD NOCNEJ CISZY -- explicitly utf8 test document - in Polish + WŚRÓD NOCNEJ CISZY -- explicitly utf8 test document in Polish </Para> <head1 start_line="8"> DESCRIPTION </head1> <Para start_line="10"> - This is a test Pod document in UTF8. Its content is the - lyrics to the Polish Christmas carol "Wśród - nocnej ciszy". + This is a test Pod document in UTF8. Its content is the lyrics to the + Polish Christmas carol "Wśród nocnej ciszy". </Para> <Para start_line="13"> - Wśród nocnej ciszy głos się rozchodzi: - / Wstańcie, pasterze, Bóg się nam rodzi! - / Czym prędzej się wybierajcie, / Do Betlejem - pospieszajcie / Przywitać Pana. + Wśród nocnej ciszy głos się rozchodzi: / Wstańcie, + pasterze, Bóg się nam rodzi! / Czym prędzej się + wybierajcie, / Do Betlejem pospieszajcie / Przywitać Pana. </Para> <Para start_line="19"> - Poszli, znaleźli Dzieciątko w żłobie - / Z wszystkimi znaki danymi sobie. / Jako Bogu cześć - Mu dali, / A witając zawołali / Z wielkiej radości: + Poszli, znaleźli Dzieciątko w żłobie / Z wszystkimi + znaki danymi sobie. / Jako Bogu cześć Mu dali, / A + witając zawołali / Z wielkiej radości: </Para> <Para start_line="25"> - Ach, witaj Zbawco z dawno żądany, / Wiele tysięcy - lat wyglądany / Na Ciebie króle, prorocy / Czekali, - a Tyś tej nocy / Nam się objawił. + Ach, witaj Zbawco z dawno żądany, / Wiele tysięcy lat + wyglądany / Na Ciebie króle, prorocy / Czekali, a Tyś + tej nocy / Nam się objawił. </Para> <Para start_line="31"> I my czekamy na Ciebie, Pana, / A skoro przyjdziesz na głos @@ -43,49 +40,27 @@ </Para> <VerbatimFormatted start_line="41" xml:space="preserve"> Wśród nocnej ciszy głos się rozchodzi: - Wstańcie, pasterze, Bóg się nam rodzi! - Czym prędzej się wybierajcie, - Do Betlejem pospieszajcie - Przywitać Pana. - - Poszli, znaleźli Dzieciątko w żłobie - Z wszystkimi znaki danymi sobie. - Jako Bogu cześć Mu dali, - A witając zawołali - Z wielkiej radości: - - Ach, witaj Zbawco z dawno żądany, - Wiele tysięcy lat wyglądany - Na Ciebie króle, prorocy - Czekali, a Tyś tej nocy - Nam się objawił. - - I my czekamy na Ciebie, Pana, - A skoro przyjdziesz na głos kapłana, - Padniemy na twarz przed Tobą, - Wierząc, żeś jest pod osłoną - Chleba i wina. </VerbatimFormatted> <Para start_line="65"> diff --git a/cpan/Pod-Simple/t/corpus/s2763_sjis.xml b/cpan/Pod-Simple/t/corpus/s2763_sjis.xml index 55a4fd0027..f6f704283b 100644 --- a/cpan/Pod-Simple/t/corpus/s2763_sjis.xml +++ b/cpan/Pod-Simple/t/corpus/s2763_sjis.xml @@ -9,8 +9,8 @@ DESCRIPTION </head1> <Para start_line="10"> - This is a test Pod document in Shift-JIS. Its content is - some uninteresting product specs I found on the Net. + This is a test Pod document in Shift-JIS. Its content is some uninteresting + product specs I found on the Net. </Para> <Para start_line="13"> It's an textitem list: @@ -26,7 +26,8 @@ 光源 </item-text> <Para start_line="23"> - GZ4 ダイクロイックミラーランプ + GZ4 + ダイクロイックミラーランプ 12V 10W×1 </Para> <item-text start_line="25"> @@ -45,7 +46,8 @@ 材質 </item-text> <Para start_line="35"> - 樹脂 アルミ、アルマイト仕上 + 樹脂 + アルミ、アルマイト仕上 ガラス </Para> <item-text start_line="37"> diff --git a/cpan/Pod-Simple/t/corpus/thai_iso11.xml b/cpan/Pod-Simple/t/corpus/thai_iso11.xml index a9f4bb7a6e..79fcff08b6 100644 --- a/cpan/Pod-Simple/t/corpus/thai_iso11.xml +++ b/cpan/Pod-Simple/t/corpus/thai_iso11.xml @@ -9,37 +9,54 @@ DESCRIPTION </head1> <Para start_line="10"> - This is a test Pod document in ISO-8859-11. Its content - is a poem to (by?) Khun Thong Dang (ภาพมิ่งมงคล), + This is a test Pod document in ISO-8859-11. Its content is a poem to (by?) + Khun Thong Dang + (ภาพมิ่งมงคล), the pet of Bhumibol, the King of Thailand. </Para> <Para start_line="14"> As four flowed paragraphs: </Para> <Para start_line="16"> - ๏ พระเมตตาแจ่มจับใจไผทสยาม - / พระทัยงาม...มองภาพถ่ายมิถ่ายถอน - / เกล้าฯ น้อมเกล้าฯ + ๏ + พระเมตตาแจ่มจับใจไผทสยาม + / + พระทัยงาม...มองภาพถ่ายมิถ่ายถอน + / เกล้าฯ + น้อมเกล้าฯ พจน์เรียงเผดียงกลอน - / สื่อสะท้อนพระการุณย์อุ่นดวงมาน๚ + / + สื่อสะท้อนพระการุณย์อุ่นดวงมาน๚ </Para> <Para start_line="21"> - ๏ ทุกภาพมิ่งมงคลยลแล้วยิ้ม - / เอื้ออกอิ่มล้ำค่ามหาศาล - / อยากเป็นคุณทองแดงนักจักอยู่งาน - / เฝ้าคลอเคลียบทมาลย์พระภูมิพล๚ + ๏ + ทุกภาพมิ่งมงคลยลแล้วยิ้ม + / + เอื้ออกอิ่มล้ำค่ามหาศาล + / + อยากเป็นคุณทองแดงนักจักอยู่งาน + / + เฝ้าคลอเคลียบทมาลย์พระภูมิพล๚ </Para> <Para start_line="26"> - ๏ พระหัตถ์บุญทรงเบิกหล้าพลิกหล้าเขียว - / พระโอษฐ์เรียวตรัสห้ามสงครามฉล - / พระทัย ธ โอภาสผ่องถ่องสกล - / พระยุคลบาทย่างสืบสร้างไทย๚ + ๏ + พระหัตถ์บุญทรงเบิกหล้าพลิกหล้าเขียว + / + พระโอษฐ์เรียวตรัสห้ามสงครามฉล + / พระทัย ธ + โอภาสผ่องถ่องสกล + / + พระยุคลบาทย่างสืบสร้างไทย๚ </Para> <Para start_line="31"> - ๏ น้อมเกล้าเทิดองค์ราชันศรันย์ศรี - / บารมีหมื่นคู่คงอสงไขย - / กรรดิราชกฤษฎาก้องหล้าไกล - / ปลื้มประทับถ้วนทุกใจแห่งไท้เอย๚ะ๛ + ๏ + น้อมเกล้าเทิดองค์ราชันศรันย์ศรี + / + บารมีหมื่นคู่คงอสงไขย + / + กรรดิราชกฤษฎาก้องหล้าไกล + / + ปลื้มประทับถ้วนทุกใจแห่งไท้เอย๚ะ๛ </Para> <head2 start_line="36"> Verbatim Section @@ -48,44 +65,42 @@ And as a verbatim section: </Para> <VerbatimFormatted start_line="40" xml:space="preserve"> - ๏ พระเมตตาแจ่มจับใจไผทสยาม - - พระทัยงาม...มองภาพถ่ายมิถ่ายถอน - - เกล้าฯ น้อมเกล้าฯ + ๏ + พระเมตตาแจ่มจับใจไผทสยาม + + พระทัยงาม...มองภาพถ่ายมิถ่ายถอน + เกล้าฯ + น้อมเกล้าฯ พจน์เรียงเผดียงกลอน - - สื่อสะท้อนพระการุณย์อุ่นดวงมาน๚ - + + สื่อสะท้อนพระการุณย์อุ่นดวงมาน๚ - - ๏ ทุกภาพมิ่งมงคลยลแล้วยิ้ม - - เอื้ออกอิ่มล้ำค่ามหาศาล - - อยากเป็นคุณทองแดงนักจักอยู่งาน - - เฝ้าคลอเคลียบทมาลย์พระภูมิพล๚ - + ๏ + ทุกภาพมิ่งมงคลยลแล้วยิ้ม + + เอื้ออกอิ่มล้ำค่ามหาศาล + + อยากเป็นคุณทองแดงนักจักอยู่งาน + + เฝ้าคลอเคลียบทมาลย์พระภูมิพล๚ - - ๏ พระหัตถ์บุญทรงเบิกหล้าพลิกหล้าเขียว - - พระโอษฐ์เรียวตรัสห้ามสงครามฉล - - พระทัย ธ โอภาสผ่องถ่องสกล - - พระยุคลบาทย่างสืบสร้างไทย๚ - + ๏ + พระหัตถ์บุญทรงเบิกหล้าพลิกหล้าเขียว + + พระโอษฐ์เรียวตรัสห้ามสงครามฉล + พระทัย ธ + โอภาสผ่องถ่องสกล + + พระยุคลบาทย่างสืบสร้างไทย๚ - - ๏ น้อมเกล้าเทิดองค์ราชันศรันย์ศรี - - บารมีหมื่นคู่คงอสงไขย - - กรรดิราชกฤษฎาก้องหล้าไกล - - ปลื้มประทับถ้วนทุกใจแห่งไท้เอย๚ะ๛ + ๏ + น้อมเกล้าเทิดองค์ราชันศรันย์ศรี + + บารมีหมื่นคู่คงอสงไขย + + กรรดิราชกฤษฎาก้องหล้าไกล + + ปลื้มประทับถ้วนทุกใจแห่งไท้เอย๚ะ๛ </VerbatimFormatted> <Para start_line="60"> [end] diff --git a/cpan/Pod-Simple/t/x_nixer.t b/cpan/Pod-Simple/t/x_nixer.t index f43518706a..34018109c5 100644 --- a/cpan/Pod-Simple/t/x_nixer.t +++ b/cpan/Pod-Simple/t/x_nixer.t @@ -44,16 +44,14 @@ ok( Pod::Simple::DumpAsXML->_out( "=pod\n\nZ<>F<C<Z<>fE<111>o> I<bar>> B<stuff X ' <Para>', ' <F>', ' <C>', - ' f', - ' o', - ' o', + ' foo', ' </C>', - ' ', + ' ', ' <I>', ' bar', ' </I>', ' </F>', - ' ', + ' ', ' <B>', ' stuff ', ' <X>', @@ -77,19 +75,16 @@ ok( Pod::Simple::DumpAsXML->_out( \&nixy, "=pod\n\nZ<>F<C<Z<>fE<111>o> I<bar>> B ' <Para>', ' <F>', ' <C>', - ' f', - ' o', - ' o', + ' foo', ' </C>', - ' ', + ' ', ' <I>', ' bar', ' </I>', ' </F>', - ' ', + ' ', ' <B>', - ' stuff ', - ' baz', + ' stuff baz', ' </B>', ' </Para>', '</Document>', @@ -109,12 +104,12 @@ ok( Pod::Simple::DumpAsXML->_out( \&mergy, "=pod\n\nZ<>F<C<Z<>fE<111>o> I<bar>> ' <C>', ' foo', ' </C>', - ' ', + ' ', ' <I>', ' bar', ' </I>', ' </F>', - ' ', + ' ', ' <B>', ' stuff ', ' <X>', @@ -140,12 +135,12 @@ ok( Pod::Simple::DumpAsXML->_out( \&nixy_mergy, "=pod\n\nZ<>F<C<Z<>fE<111>o> I<b ' <C>', ' foo', ' </C>', - ' ', + ' ', ' <I>', ' bar', ' </I>', ' </F>', - ' ', + ' ', ' <B>', ' stuff baz', ' </B>', @@ -194,12 +189,12 @@ ok( Pod::Simple::DumpAsXML->_out( \&nixy_mergy, "=pod\n\nZ<>F<C<Z<>fE<111>L<E<78 ' </L>', ' o', ' </C>', - ' ', + ' ', ' <I>', ' bar', ' </I>', ' </F>', - ' ', + ' ', ' <B>', ' stuff baz', ' </B>', diff --git a/cpan/Pod-Simple/t/xhtml01.t b/cpan/Pod-Simple/t/xhtml01.t index 32e875ef12..16fc8a101c 100644 --- a/cpan/Pod-Simple/t/xhtml01.t +++ b/cpan/Pod-Simple/t/xhtml01.t @@ -474,10 +474,15 @@ $parser->parse_string_document(<<'EOPOD'); =pod A plain paragraph with a C<functionname>. + +C<< This code is B<important> to E<lt>me>! >> + EOPOD is($results, <<"EOHTML", "code entity in a paragraph"); <p>A plain paragraph with a <code>functionname</code>.</p> +<p><code>This code is <b>important</b> to <me>!</code></p> + EOHTML @@ -657,6 +662,7 @@ SKIP: for my $use_html_entities (0, 1) { } local $Pod::Simple::XHTML::HAS_HTML_ENTITIES = $use_html_entities; initialize($parser, $results); + $parser->codes_in_verbatim(1); $parser->parse_string_document(<<'EOPOD'); =pod diff --git a/cpan/Pod-Simple/t/xhtml10.t b/cpan/Pod-Simple/t/xhtml10.t index 56ef68c567..5b20a5f668 100644 --- a/cpan/Pod-Simple/t/xhtml10.t +++ b/cpan/Pod-Simple/t/xhtml10.t @@ -74,8 +74,8 @@ ok $parser->parse_string_document( "=head1 Foo B<Bar>\n\n=head1 Foo B<Baz>" ), 'Parse two multiword headers'; is $results, <<'EOF', 'Should have the index'; <ul id="index"> - <li><a href="#Foo-Bar">Foo <b>Bar</b></a></li> - <li><a href="#Foo-Baz">Foo <b>Baz</b></a></li> + <li><a href="#Foo-Bar">Foo Bar</a></li> + <li><a href="#Foo-Baz">Foo Baz</a></li> </ul> <h1 id="Foo-Bar">Foo <b>Bar</b></h1> diff --git a/cpan/Pod-Simple/t/xhtml20.t b/cpan/Pod-Simple/t/xhtml20.t new file mode 100644 index 0000000000..624b8a0193 --- /dev/null +++ b/cpan/Pod-Simple/t/xhtml20.t @@ -0,0 +1,63 @@ +#!/usr/bin/perl -w + +# t/xhtml20.t - test subclassing of Pod::Simple::XHTML + +use strict; +use warnings; +use Test::More tests => 1; + +BEGIN { + package MyXHTML; + use base 'Pod::Simple::XHTML'; + + sub handle_code { + my($self, $code, $kind) = @_; + $code = "${kind}[$code]"; + $self->SUPER::handle_code($code); + } + + sub start_code { + my($self, $kind) = @_; + $self->{scratch} .= "<code class=\"$kind\">"; + } + + sub end_code { + my($self, $kind) = @_; + $self->{scratch} .= "</code><!-- $kind -->"; + } +} + + + +my ($parser, $results); + +initialize(); +$parser->parse_string_document(<<'EOT'); +=head1 Foo + +This is C<$code> and so is: + + my $foo = 1; + +Code might even be C<<< nested( B<< C<1> >> ) >>>. +EOT + +is($results, <<'EOT'); +<h1 id="Foo">Foo</h1> + +<p>This is <code class="C">C[$code]</code><!-- C --> and so is:</p> + +<pre><code class="Verbatim">Verbatim[ my $foo = 1;]</code><!-- Verbatim --></pre> + +<p>Code might even be <code class="C">C[nested( ]<b><code class="C">C[1]</code><!-- C --></b>C[ )]</code><!-- C -->.</p> + +EOT + + +sub initialize { + $parser = MyXHTML->new; + $parser->html_header(''); + $parser->html_footer(''); + $parser->output_string( \$results ); + $results = ''; +} |