r48911 - in /trunk/libpod-simple-perl: ./ debian/ lib/Pod/ lib/Pod/Simple/ t/
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Thu Dec 17 19:10:14 UTC 2009
Author: jawnsy-guest
Date: Thu Dec 17 19:10:07 2009
New Revision: 48911
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=48911
Log:
New upstream release
Removed:
trunk/libpod-simple-perl/t/fullstop.t
Modified:
trunk/libpod-simple-perl/ChangeLog
trunk/libpod-simple-perl/MANIFEST
trunk/libpod-simple-perl/META.yml
trunk/libpod-simple-perl/README
trunk/libpod-simple-perl/debian/changelog
trunk/libpod-simple-perl/lib/Pod/Simple.pm
trunk/libpod-simple-perl/lib/Pod/Simple.pod
trunk/libpod-simple-perl/lib/Pod/Simple/BlackBox.pm
trunk/libpod-simple-perl/lib/Pod/Simple/Checker.pm
trunk/libpod-simple-perl/lib/Pod/Simple/Debug.pm
trunk/libpod-simple-perl/lib/Pod/Simple/DumpAsText.pm
trunk/libpod-simple-perl/lib/Pod/Simple/DumpAsXML.pm
trunk/libpod-simple-perl/lib/Pod/Simple/HTML.pm
trunk/libpod-simple-perl/lib/Pod/Simple/HTMLBatch.pm
trunk/libpod-simple-perl/lib/Pod/Simple/LinkSection.pm
trunk/libpod-simple-perl/lib/Pod/Simple/Methody.pm
trunk/libpod-simple-perl/lib/Pod/Simple/Progress.pm
trunk/libpod-simple-perl/lib/Pod/Simple/PullParser.pm
trunk/libpod-simple-perl/lib/Pod/Simple/PullParserEndToken.pm
trunk/libpod-simple-perl/lib/Pod/Simple/PullParserStartToken.pm
trunk/libpod-simple-perl/lib/Pod/Simple/PullParserTextToken.pm
trunk/libpod-simple-perl/lib/Pod/Simple/PullParserToken.pm
trunk/libpod-simple-perl/lib/Pod/Simple/RTF.pm
trunk/libpod-simple-perl/lib/Pod/Simple/Search.pm
trunk/libpod-simple-perl/lib/Pod/Simple/SimpleTree.pm
trunk/libpod-simple-perl/lib/Pod/Simple/Subclassing.pod
trunk/libpod-simple-perl/lib/Pod/Simple/Text.pm
trunk/libpod-simple-perl/lib/Pod/Simple/TextContent.pm
trunk/libpod-simple-perl/lib/Pod/Simple/TiedOutFH.pm
trunk/libpod-simple-perl/lib/Pod/Simple/Transcode.pm
trunk/libpod-simple-perl/lib/Pod/Simple/TranscodeDumb.pm
trunk/libpod-simple-perl/lib/Pod/Simple/TranscodeSmart.pm
trunk/libpod-simple-perl/lib/Pod/Simple/XHTML.pm
trunk/libpod-simple-perl/lib/Pod/Simple/XMLOutStream.pm
trunk/libpod-simple-perl/t/html01.t
trunk/libpod-simple-perl/t/xhtml01.t
Modified: trunk/libpod-simple-perl/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/ChangeLog?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/ChangeLog (original)
+++ trunk/libpod-simple-perl/ChangeLog Thu Dec 17 19:10:07 2009
@@ -1,5 +1,32 @@
# ChangeLog for Pod::Simple dist
#---------------------------------------------------------------------------
+
+2009-12-17 David E. Wheeler <david at justatheory.org>
+ * Release 3.13
+
+ Removed deleted test file from MANIFEST.
+
+2009-12-17 David E. Wheeler <david at justatheory.org>
+ * Release 3.12
+
+ Removed "All rights reserved" from all files.
+
+ Added acknowledgements to man.he.net and search.cpan.org for
+ permission to link man pages and Perl module links to their sites
+ in the output of Pod::Simple::HTML and Pod::Simple::XHTML.
+
+ Add "html_h_level" option to Pod::Simple::XHTML and ::HTML to allow
+ a =head1 to become an <h2> and so on. RJBS.
+
+ Add batch_mode_page_object_init() method to Pod::Simple::XHTML.
+ This allows it to be used by Pod::Simple::HTMLBatch.
+
+ Fixed a regression in Pod::Simple::XHTML where '=begin html' blocks
+ were incorrectly escaped rather than simply passed through unmolested.
+ RJBS.
+
+ Removed the undocumented "fullstop_space_harden" attribute, which
+ apparently was only used by Pod::Text a very long time ago.
2009-12-09 David E. Wheeler <david at justatheory.org>
* Release 3.11
@@ -45,7 +72,7 @@
version number lowered.
2009-11-12 David E. Wheeler <david at justatheory.org>
- * Release 3.11
+ * Release 3.10
Converted test files that had DOS endings to have Unix endings
(RT #50922 from Steve Hay).
Modified: trunk/libpod-simple-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/MANIFEST?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/MANIFEST (original)
+++ trunk/libpod-simple-perl/MANIFEST Thu Dec 17 19:10:07 2009
@@ -114,7 +114,6 @@
t/fcodes_s.t
t/for.t
t/fornot.t
-t/fullstop.t
t/heads.t
t/html01.t
t/html02.t
Modified: trunk/libpod-simple-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/META.yml?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/META.yml (original)
+++ trunk/libpod-simple-perl/META.yml Thu Dec 17 19:10:07 2009
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: Pod-Simple
-version: 3.11
+version: 3.13
abstract: framework for parsing Pod
author:
- Allison Randal <allison at perl.org>
Modified: trunk/libpod-simple-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/README?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/README (original)
+++ trunk/libpod-simple-perl/README Thu Dec 17 19:10:07 2009
@@ -1,4 +1,4 @@
-=head1 Pod::Simple version 3.11
+=head1 Pod::Simple version 3.13
Pod::Simple is a Perl library for parsing text in the Pod ("plain old
documentation") markup language that is typically used for writing
Modified: trunk/libpod-simple-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/debian/changelog?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/debian/changelog (original)
+++ trunk/libpod-simple-perl/debian/changelog Thu Dec 17 19:10:07 2009
@@ -1,3 +1,9 @@
+libpod-simple-perl (3.13-1) UNRELEASED; urgency=low
+
+ * New upstream release
+
+ -- Jonathan Yu <jawnsy at cpan.org> Thu, 17 Dec 2009 10:59:50 -0500
+
libpod-simple-perl (3.11-1) unstable; urgency=low
[ Jonathan Yu ]
Modified: trunk/libpod-simple-perl/lib/Pod/Simple.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/lib/Pod/Simple.pm?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple.pm Thu Dec 17 19:10:07 2009
@@ -18,7 +18,7 @@
);
@ISA = ('Pod::Simple::BlackBox');
-$VERSION = '3.11';
+$VERSION = '3.13';
@Known_formatting_codes = qw(I B C L E F S X Z);
%Known_formatting_codes = map(($_=>1), @Known_formatting_codes);
@@ -79,8 +79,6 @@
'bare_output', # For some subclasses: whether to prepend
# header-code and postpend footer-code
-
- 'fullstop_space_harden', # Whether to turn ". " into ".[nbsp] ";
'nix_X_codes', # whether to ignore X<...> codes
'merge_text', # whether to avoid breaking a single piece of
Modified: trunk/libpod-simple-perl/lib/Pod/Simple.pod
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/lib/Pod/Simple.pod?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple.pod (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple.pod Thu Dec 17 19:10:07 2009
@@ -245,7 +245,7 @@
=head1 COPYRIGHT AND DISCLAIMERS
-Copyright (c) 2002 Sean M. Burke. All rights reserved.
+Copyright (c) 2002 Sean M. Burke.
This library is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: trunk/libpod-simple-perl/lib/Pod/Simple/BlackBox.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/lib/Pod/Simple/BlackBox.pm?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/BlackBox.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/BlackBox.pm Thu Dec 17 19:10:07 2009
@@ -23,7 +23,7 @@
use strict;
use Carp ();
use vars qw($VERSION );
-$VERSION = '3.11';
+$VERSION = '3.13';
#use constant DEBUG => 7;
BEGIN {
require Pod::Simple;
@@ -1628,8 +1628,6 @@
my $treelet = ['~Top', {'start_line' => $start_line},];
unless ($preserve_space || $self->{'preserve_whitespace'}) {
- $para =~ s/\. /\.\xA0 /g if $self->{'fullstop_space_harden'};
-
$para =~ s/\s+/ /g; # collapse and trim all whitespace first.
$para =~ s/ $//;
$para =~ s/^ //;
Modified: trunk/libpod-simple-perl/lib/Pod/Simple/Checker.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/lib/Pod/Simple/Checker.pm?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/Checker.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/Checker.pm Thu Dec 17 19:10:07 2009
@@ -9,7 +9,7 @@
use Pod::Simple::Methody ();
use Pod::Simple ();
use vars qw( @ISA $VERSION );
-$VERSION = '3.11';
+$VERSION = '3.13';
@ISA = ('Pod::Simple::Methody');
BEGIN { *DEBUG = defined(&Pod::Simple::DEBUG)
? \&Pod::Simple::DEBUG
@@ -167,7 +167,7 @@
=head1 COPYRIGHT AND DISCLAIMERS
-Copyright (c) 2002 Sean M. Burke. All rights reserved.
+Copyright (c) 2002 Sean M. Burke.
This library is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: trunk/libpod-simple-perl/lib/Pod/Simple/Debug.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/lib/Pod/Simple/Debug.pm?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/Debug.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/Debug.pm Thu Dec 17 19:10:07 2009
@@ -3,7 +3,7 @@
package Pod::Simple::Debug;
use strict;
use vars qw($VERSION );
-$VERSION = '3.11';
+$VERSION = '3.13';
sub import {
my($value,$variable);
@@ -149,7 +149,7 @@
=head1 COPYRIGHT AND DISCLAIMERS
-Copyright (c) 2002 Sean M. Burke. All rights reserved.
+Copyright (c) 2002 Sean M. Burke.
This library is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: trunk/libpod-simple-perl/lib/Pod/Simple/DumpAsText.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/lib/Pod/Simple/DumpAsText.pm?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/DumpAsText.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/DumpAsText.pm Thu Dec 17 19:10:07 2009
@@ -1,7 +1,7 @@
require 5;
package Pod::Simple::DumpAsText;
-$VERSION = '3.11';
+$VERSION = '3.13';
use Pod::Simple ();
BEGIN {@ISA = ('Pod::Simple')}
@@ -126,7 +126,7 @@
=head1 COPYRIGHT AND DISCLAIMERS
-Copyright (c) 2002 Sean M. Burke. All rights reserved.
+Copyright (c) 2002 Sean M. Burke.
This library is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: trunk/libpod-simple-perl/lib/Pod/Simple/DumpAsXML.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/lib/Pod/Simple/DumpAsXML.pm?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/DumpAsXML.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/DumpAsXML.pm Thu Dec 17 19:10:07 2009
@@ -1,7 +1,7 @@
require 5;
package Pod::Simple::DumpAsXML;
-$VERSION = '3.11';
+$VERSION = '3.13';
use Pod::Simple ();
BEGIN {@ISA = ('Pod::Simple')}
@@ -141,7 +141,7 @@
=head1 COPYRIGHT AND DISCLAIMERS
-Copyright (c) 2002 Sean M. Burke. All rights reserved.
+Copyright (c) 2002 Sean M. Burke.
This library is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: trunk/libpod-simple-perl/lib/Pod/Simple/HTML.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/lib/Pod/Simple/HTML.pm?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/HTML.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/HTML.pm Thu Dec 17 19:10:07 2009
@@ -10,7 +10,7 @@
$Doctype_decl $Content_decl
);
@ISA = ('Pod::Simple::PullParser');
-$VERSION = '3.11';
+$VERSION = '3.13';
use UNIVERSAL ();
BEGIN {
@@ -70,6 +70,8 @@
'title_prefix', 'title_postfix',
# What to put before and after the title in the head.
# Should already be &-escaped
+
+ 'html_h_level',
'html_header_before_title',
'html_header_after_title',
@@ -208,7 +210,23 @@
$new->html_footer( qq[\n<!-- end doc -->\n\n</body></html>\n] );
$new->{'Tagmap'} = {%Tagmap};
+
return $new;
+}
+
+sub __adjust_html_h_levels {
+ my ($self) = @_;
+ my $Tagmap = $self->{'Tagmap'};
+
+ my $add = $self->html_h_level;
+ return unless defined $add;
+ return if ($self->{'Adjusted_html_h_levels'}||0) == $add;
+
+ $add -= 1;
+ for (1 .. 4) {
+ $Tagmap->{"head$_"} =~ s/$_/$_ + $add/e;
+ $Tagmap->{"/head$_"} =~ s/$_/$_ + $add/e;
+ }
}
sub batch_mode_page_object_init {
@@ -433,6 +451,8 @@
my $self = $_[0];
my $fh = $self->{'output_fh'};
my $tagmap = $self->{'Tagmap'};
+
+ $self->__adjust_html_h_levels;
my($token, $type, $tagname, $linkto, $linktype);
my @stack;
@@ -922,7 +942,7 @@
=head1 COPYRIGHT AND DISCLAIMERS
-Copyright (c) 2002-2004 Sean M. Burke. All rights reserved.
+Copyright (c) 2002-2004 Sean M. Burke.
This library is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
@@ -931,6 +951,14 @@
without any warranty; without even the implied warranty of
merchantability or fitness for a particular purpose.
+=head1 ACKNOWLEDGEMENTS
+
+Thanks to L<Hurricane Electrict|http://he.net/> for permission to use its
+L<Linux man pages online|http://man.he.net/> site for man page links.
+
+Thanks to L<search.cpan.org|http://search.cpan.org/> for permission to use the
+site for Perl module links.
+
=head1 AUTHOR
Pod::Simple was created by Sean M. Burke <sburke at cpan.org>.
Modified: trunk/libpod-simple-perl/lib/Pod/Simple/HTMLBatch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/lib/Pod/Simple/HTMLBatch.pm?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/HTMLBatch.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/HTMLBatch.pm Thu Dec 17 19:10:07 2009
@@ -5,7 +5,7 @@
use vars qw( $VERSION $HTML_RENDER_CLASS $HTML_EXTENSION
$CSS $JAVASCRIPT $SLEEPY $SEARCH_CLASS @ISA
);
-$VERSION = '3.11';
+$VERSION = '3.13';
@ISA = (); # Yup, we're NOT a subclass of Pod::Simple::HTML!
# TODO: nocontents stylesheets. Strike some of the color variations?
@@ -1343,7 +1343,7 @@
=head1 COPYRIGHT AND DISCLAIMERS
-Copyright (c) 2002 Sean M. Burke. All rights reserved.
+Copyright (c) 2002 Sean M. Burke.
This library is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: trunk/libpod-simple-perl/lib/Pod/Simple/LinkSection.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/lib/Pod/Simple/LinkSection.pm?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/LinkSection.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/LinkSection.pm Thu Dec 17 19:10:07 2009
@@ -3,12 +3,12 @@
package Pod::Simple::LinkSection;
# Based somewhat dimly on Array::Autojoin
use vars qw($VERSION );
-$VERSION = '3.11';
+$VERSION = '3.13';
use strict;
use Pod::Simple::BlackBox;
use vars qw($VERSION );
-$VERSION = '3.11';
+$VERSION = '3.13';
use overload( # So it'll stringify nice
'""' => \&Pod::Simple::BlackBox::stringify_lol,
@@ -145,7 +145,7 @@
=head1 COPYRIGHT AND DISCLAIMERS
-Copyright (c) 2004 Sean M. Burke. All rights reserved.
+Copyright (c) 2004 Sean M. Burke.
This library is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: trunk/libpod-simple-perl/lib/Pod/Simple/Methody.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/lib/Pod/Simple/Methody.pm?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/Methody.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/Methody.pm Thu Dec 17 19:10:07 2009
@@ -4,7 +4,7 @@
use strict;
use Pod::Simple ();
use vars qw(@ISA $VERSION);
-$VERSION = '3.11';
+$VERSION = '3.13';
@ISA = ('Pod::Simple');
# Yes, we could use named variables, but I want this to be impose
@@ -123,7 +123,7 @@
=head1 COPYRIGHT AND DISCLAIMERS
-Copyright (c) 2002 Sean M. Burke. All rights reserved.
+Copyright (c) 2002 Sean M. Burke.
This library is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: trunk/libpod-simple-perl/lib/Pod/Simple/Progress.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/lib/Pod/Simple/Progress.pm?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/Progress.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/Progress.pm Thu Dec 17 19:10:07 2009
@@ -1,7 +1,7 @@
require 5;
package Pod::Simple::Progress;
-$VERSION = '3.11';
+$VERSION = '3.13';
use strict;
# Objects of this class are used for noting progress of an
Modified: trunk/libpod-simple-perl/lib/Pod/Simple/PullParser.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/lib/Pod/Simple/PullParser.pm?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/PullParser.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/PullParser.pm Thu Dec 17 19:10:07 2009
@@ -1,7 +1,7 @@
require 5;
package Pod::Simple::PullParser;
-$VERSION = '3.11';
+$VERSION = '3.13';
use Pod::Simple ();
BEGIN {@ISA = ('Pod::Simple')}
@@ -743,7 +743,7 @@
=head1 COPYRIGHT AND DISCLAIMERS
-Copyright (c) 2002 Sean M. Burke. All rights reserved.
+Copyright (c) 2002 Sean M. Burke.
This library is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: trunk/libpod-simple-perl/lib/Pod/Simple/PullParserEndToken.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/lib/Pod/Simple/PullParserEndToken.pm?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/PullParserEndToken.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/PullParserEndToken.pm Thu Dec 17 19:10:07 2009
@@ -5,7 +5,7 @@
use strict;
use vars qw(@ISA $VERSION);
@ISA = ('Pod::Simple::PullParserToken');
-$VERSION = '3.11';
+$VERSION = '3.13';
sub new { # Class->new(tagname);
my $class = shift;
@@ -91,7 +91,7 @@
=head1 COPYRIGHT AND DISCLAIMERS
-Copyright (c) 2002 Sean M. Burke. All rights reserved.
+Copyright (c) 2002 Sean M. Burke.
This library is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: trunk/libpod-simple-perl/lib/Pod/Simple/PullParserStartToken.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/lib/Pod/Simple/PullParserStartToken.pm?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/PullParserStartToken.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/PullParserStartToken.pm Thu Dec 17 19:10:07 2009
@@ -5,7 +5,7 @@
use strict;
use vars qw(@ISA $VERSION);
@ISA = ('Pod::Simple::PullParserToken');
-$VERSION = '3.11';
+$VERSION = '3.13';
sub new { # Class->new(tagname, optional_attrhash);
my $class = shift;
@@ -132,7 +132,7 @@
=head1 COPYRIGHT AND DISCLAIMERS
-Copyright (c) 2002 Sean M. Burke. All rights reserved.
+Copyright (c) 2002 Sean M. Burke.
This library is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: trunk/libpod-simple-perl/lib/Pod/Simple/PullParserTextToken.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/lib/Pod/Simple/PullParserTextToken.pm?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/PullParserTextToken.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/PullParserTextToken.pm Thu Dec 17 19:10:07 2009
@@ -5,7 +5,7 @@
use strict;
use vars qw(@ISA $VERSION);
@ISA = ('Pod::Simple::PullParserToken');
-$VERSION = '3.11';
+$VERSION = '3.13';
sub new { # Class->new(text);
my $class = shift;
@@ -99,7 +99,7 @@
=head1 COPYRIGHT AND DISCLAIMERS
-Copyright (c) 2002 Sean M. Burke. All rights reserved.
+Copyright (c) 2002 Sean M. Burke.
This library is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: trunk/libpod-simple-perl/lib/Pod/Simple/PullParserToken.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/lib/Pod/Simple/PullParserToken.pm?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/PullParserToken.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/PullParserToken.pm Thu Dec 17 19:10:07 2009
@@ -3,7 +3,7 @@
package Pod::Simple::PullParserToken;
# Base class for tokens gotten from Pod::Simple::PullParser's $parser->get_token
@ISA = ();
-$VERSION = '3.11';
+$VERSION = '3.13';
use strict;
sub new { # Class->new('type', stuff...); ## Overridden in derived classes anyway
@@ -134,7 +134,7 @@
=head1 COPYRIGHT AND DISCLAIMERS
-Copyright (c) 2002 Sean M. Burke. All rights reserved.
+Copyright (c) 2002 Sean M. Burke.
This library is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: trunk/libpod-simple-perl/lib/Pod/Simple/RTF.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/lib/Pod/Simple/RTF.pm?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/RTF.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/RTF.pm Thu Dec 17 19:10:07 2009
@@ -8,7 +8,7 @@
use strict;
use vars qw($VERSION @ISA %Escape $WRAP %Tagmap);
-$VERSION = '3.11';
+$VERSION = '3.13';
use Pod::Simple::PullParser ();
BEGIN {@ISA = ('Pod::Simple::PullParser')}
@@ -670,7 +670,7 @@
=head1 COPYRIGHT AND DISCLAIMERS
-Copyright (c) 2002 Sean M. Burke. All rights reserved.
+Copyright (c) 2002 Sean M. Burke.
This library is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: trunk/libpod-simple-perl/lib/Pod/Simple/Search.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/lib/Pod/Simple/Search.pm?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/Search.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/Search.pm Thu Dec 17 19:10:07 2009
@@ -4,7 +4,7 @@
use strict;
use vars qw($VERSION $MAX_VERSION_WITHIN $SLEEPY);
-$VERSION = '3.11'; ## Current version of this package
+$VERSION = '3.13'; ## Current version of this package
BEGIN { *DEBUG = sub () {0} unless defined &DEBUG; } # set DEBUG level
use Carp ();
@@ -1011,7 +1011,7 @@
=head1 COPYRIGHT AND DISCLAIMERS
-Copyright (c) 2002 Sean M. Burke. All rights reserved.
+Copyright (c) 2002 Sean M. Burke.
This library is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: trunk/libpod-simple-perl/lib/Pod/Simple/SimpleTree.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/lib/Pod/Simple/SimpleTree.pm?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/SimpleTree.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/SimpleTree.pm Thu Dec 17 19:10:07 2009
@@ -6,7 +6,7 @@
use Carp ();
use Pod::Simple ();
use vars qw( $ATTR_PAD @ISA $VERSION $SORT_ATTRS);
-$VERSION = '3.11';
+$VERSION = '3.13';
BEGIN {
@ISA = ('Pod::Simple');
*DEBUG = \&Pod::Simple::DEBUG unless defined &DEBUG;
@@ -151,7 +151,7 @@
=head1 COPYRIGHT AND DISCLAIMERS
-Copyright (c) 2002 Sean M. Burke. All rights reserved.
+Copyright (c) 2002 Sean M. Burke.
This library is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: trunk/libpod-simple-perl/lib/Pod/Simple/Subclassing.pod
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/lib/Pod/Simple/Subclassing.pod?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/Subclassing.pod (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/Subclassing.pod Thu Dec 17 19:10:07 2009
@@ -908,7 +908,7 @@
=head1 COPYRIGHT AND DISCLAIMERS
-Copyright (c) 2002 Sean M. Burke. All rights reserved.
+Copyright (c) 2002 Sean M. Burke.
This library is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: trunk/libpod-simple-perl/lib/Pod/Simple/Text.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/lib/Pod/Simple/Text.pm?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/Text.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/Text.pm Thu Dec 17 19:10:07 2009
@@ -6,7 +6,7 @@
use Pod::Simple::Methody ();
use Pod::Simple ();
use vars qw( @ISA $VERSION $FREAKYMODE);
-$VERSION = '3.11';
+$VERSION = '3.13';
@ISA = ('Pod::Simple::Methody');
BEGIN { *DEBUG = defined(&Pod::Simple::DEBUG)
? \&Pod::Simple::DEBUG
@@ -156,7 +156,7 @@
=head1 COPYRIGHT AND DISCLAIMERS
-Copyright (c) 2002 Sean M. Burke. All rights reserved.
+Copyright (c) 2002 Sean M. Burke.
This library is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: trunk/libpod-simple-perl/lib/Pod/Simple/TextContent.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/lib/Pod/Simple/TextContent.pm?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/TextContent.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/TextContent.pm Thu Dec 17 19:10:07 2009
@@ -6,7 +6,7 @@
use Carp ();
use Pod::Simple ();
use vars qw( @ISA $VERSION );
-$VERSION = '3.11';
+$VERSION = '3.13';
@ISA = ('Pod::Simple');
sub new {
@@ -83,7 +83,7 @@
=head1 COPYRIGHT AND DISCLAIMERS
-Copyright (c) 2002 Sean M. Burke. All rights reserved.
+Copyright (c) 2002 Sean M. Burke.
This library is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: trunk/libpod-simple-perl/lib/Pod/Simple/TiedOutFH.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/lib/Pod/Simple/TiedOutFH.pm?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/TiedOutFH.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/TiedOutFH.pm Thu Dec 17 19:10:07 2009
@@ -4,7 +4,7 @@
use Symbol ('gensym');
use Carp ();
use vars qw($VERSION );
-$VERSION = '3.11';
+$VERSION = '3.13';
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Modified: trunk/libpod-simple-perl/lib/Pod/Simple/Transcode.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/lib/Pod/Simple/Transcode.pm?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/Transcode.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/Transcode.pm Thu Dec 17 19:10:07 2009
@@ -2,7 +2,7 @@
require 5;
package Pod::Simple::Transcode;
use vars qw($VERSION );
-$VERSION = '3.11';
+$VERSION = '3.13';
BEGIN {
if(defined &DEBUG) {;} # Okay
Modified: trunk/libpod-simple-perl/lib/Pod/Simple/TranscodeDumb.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/lib/Pod/Simple/TranscodeDumb.pm?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/TranscodeDumb.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/TranscodeDumb.pm Thu Dec 17 19:10:07 2009
@@ -5,7 +5,7 @@
package Pod::Simple::TranscodeDumb;
use strict;
use vars qw($VERSION %Supported);
-$VERSION = '3.11';
+$VERSION = '3.13';
# This module basically pretends it knows how to transcode, except
# only for null-transcodings! We use this when Encode isn't
# available.
Modified: trunk/libpod-simple-perl/lib/Pod/Simple/TranscodeSmart.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/lib/Pod/Simple/TranscodeSmart.pm?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/TranscodeSmart.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/TranscodeSmart.pm Thu Dec 17 19:10:07 2009
@@ -9,7 +9,7 @@
use Pod::Simple;
require Encode;
use vars qw($VERSION );
-$VERSION = '3.11';
+$VERSION = '3.13';
sub is_dumb {0}
sub is_smart {1}
Modified: trunk/libpod-simple-perl/lib/Pod/Simple/XHTML.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/lib/Pod/Simple/XHTML.pm?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/XHTML.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/XHTML.pm Thu Dec 17 19:10:07 2009
@@ -28,7 +28,7 @@
package Pod::Simple::XHTML;
use strict;
use vars qw( $VERSION @ISA $HAS_HTML_ENTITIES );
-$VERSION = '3.11';
+$VERSION = '3.13';
use Carp ();
use Pod::Simple::Methody ();
@ISA = ('Pod::Simple::Methody');
@@ -116,6 +116,12 @@
Add additional meta tags here, or blocks of inline CSS or JavaScript
(wrapped in the appropriate tags).
+
+=head2 html_h_level
+
+This is the level of HTML "Hn" element to which a Pod "head1" corresponds. For
+example, if C<html_h_level> is set to 2, a head1 will produce an H2, a head2
+will produce an H3, and so on.
=head2 default_title
@@ -163,6 +169,7 @@
'html_javascript',
'html_doctype',
'html_header_tags',
+ 'html_h_level',
'title', # Used internally for the title extracted from the content
'default_title',
'force_title',
@@ -189,7 +196,6 @@
my $self = shift;
my $new = $self->SUPER::new(@_);
$new->{'output_fh'} ||= *STDOUT{IO};
- $new->accept_targets( 'html', 'HTML' );
$new->perldoc_url_prefix('http://search.cpan.org/perldoc?');
$new->man_url_prefix('http://man.he.net/man');
$new->html_header_tags('<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />');
@@ -200,6 +206,11 @@
$new->{'output'} = [];
$new->{'saved'} = [];
$new->{'ids'} = {};
+
+ $new->{'__region_targets'} = [];
+ $new->{'__literal_targets'} = {};
+ $new->accept_targets_as_html( 'html', 'HTML' );
+
return $new;
}
@@ -235,11 +246,31 @@
}
}
-=cut
+=head2 accept_targets_as_html
+
+This method behaves like C<accept_targets_as_text>, but also marks the region
+as one whose content should be emitted literally, without HTML entity escaping
+or wrapping in a C<div> element.
+
+=cut
+
+sub __in_literal_xhtml_region {
+ return unless @{ $_[0]{__region_targets} };
+ my $target = $_[0]{__region_targets}[-1];
+ return $_[0]{__literal_targets}{ $target };
+}
+
+sub accept_targets_as_html {
+ my ($self, @targets) = @_;
+ $self->accept_targets(@targets);
+ $self->{__literal_targets}{$_} = 1 for @targets;
+}
sub handle_text {
# escape special characters in HTML (<, >, &, etc)
- $_[0]{'scratch'} .= encode_entities( $_[1] )
+ $_[0]{'scratch'} .= $_[0]->__in_literal_xhtml_region
+ ? $_[1]
+ : encode_entities( $_[1] );
}
sub start_Para { $_[0]{'scratch'} = '<p>' }
@@ -314,6 +345,11 @@
sub _end_head {
my $h = delete $_[0]{in_head};
+
+ my $add = $_[0]->html_h_level;
+ $add = 1 unless defined $add;
+ $h += $add - 1;
+
my $id = $_[0]->idify($_[0]{scratch});
my $text = $_[0]{scratch};
$_[0]{'scratch'} = qq{<h$h id="$id">$text</h$h>};
@@ -338,15 +374,24 @@
# This handles =begin and =for blocks of all kinds.
sub start_for {
my ($self, $flags) = @_;
- $self->{'scratch'} .= '<div';
- $self->{'scratch'} .= ' class="'.$flags->{'target'}.'"' if ($flags->{'target'});
- $self->{'scratch'} .= '>';
+
+ push @{ $self->{__region_targets} }, $flags->{target_matching};
+
+ unless ($self->__in_literal_xhtml_region) {
+ $self->{scratch} .= '<div';
+ $self->{scratch} .= qq( class="$flags->{target}") if $flags->{target};
+ $self->{scratch} .= '>';
+ }
+
$self->emit;
}
sub end_for {
my ($self) = @_;
- $self->{'scratch'} .= '</div>';
+
+ $self->{'scratch'} .= '</div>' unless $self->__in_literal_xhtml_region;
+
+ pop @{ $self->{__region_targets} };
$self->emit;
}
@@ -592,13 +637,27 @@
return "$t$i";
}
+=head2 batch_mode_page_object_init
+
+ $pod->batch_mode_page_object_init($batchconvobj, $module, $infile, $outfile, $depth);
+
+Called by L<Pod::Simple::HTMLBatch> so that the class has a chance to
+initialize the converter. Internally it sets the C<batch_mode> property to
+true and sets C<batch_mode_current_level()>, but Pod::Simple::XHTML does not
+currently use those features. Subclasses might, though.
+
+=cut
+
+sub batch_mode_page_object_init {
+ my ($self, $batchconvobj, $module, $infile, $outfile, $depth) = @_;
+ $self->batch_mode(1);
+ $self->batch_mode_current_level($depth);
+ return $self;
+}
+
1;
__END__
-
-=head1 SEE ALSO
-
-L<Pod::Simple>, L<Pod::Simple::Methody>
=head1 SEE ALSO
@@ -628,6 +687,14 @@
without any warranty; without even the implied warranty of
merchantability or fitness for a particular purpose.
+=head1 ACKNOWLEDGEMENTS
+
+Thanks to L<Hurricane Electrict|http://he.net/> for permission to use its
+L<Linux man pages online|http://man.he.net/> site for man page links.
+
+Thanks to L<search.cpan.org|http://search.cpan.org/> for permission to use the
+site for Perl module links.
+
=head1 AUTHOR
Pod::Simpele::XHTML was created by Allison Randal <allison at perl.org>.
Modified: trunk/libpod-simple-perl/lib/Pod/Simple/XMLOutStream.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/lib/Pod/Simple/XMLOutStream.pm?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/XMLOutStream.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/XMLOutStream.pm Thu Dec 17 19:10:07 2009
@@ -5,7 +5,7 @@
use Carp ();
use Pod::Simple ();
use vars qw( $ATTR_PAD @ISA $VERSION $SORT_ATTRS);
-$VERSION = '3.11';
+$VERSION = '3.13';
BEGIN {
@ISA = ('Pod::Simple');
*DEBUG = \&Pod::Simple::DEBUG unless defined &DEBUG;
@@ -156,7 +156,7 @@
=head1 COPYRIGHT AND DISCLAIMERS
-Copyright (c) 2002-2004 Sean M. Burke. All rights reserved.
+Copyright (c) 2002-2004 Sean M. Burke.
This library is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: trunk/libpod-simple-perl/t/html01.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/t/html01.t?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/t/html01.t (original)
+++ trunk/libpod-simple-perl/t/html01.t Thu Dec 17 19:10:07 2009
@@ -9,14 +9,16 @@
use strict;
use Test;
-BEGIN { plan tests => 10 };
+BEGIN { plan tests => 11 };
#use Pod::Simple::Debug (10);
use Pod::Simple::HTML;
-sub x ($) { Pod::Simple::HTML->_out(
- sub{ $_[0]->bare_output(1) },
+sub x ($;&) {
+ my $code = $_[1];
+ Pod::Simple::HTML->_out(
+ sub{ $_[0]->bare_output(1); $code->($_[0]) if $code },
"=pod\n\n$_[0]",
) }
@@ -49,6 +51,11 @@
ok(x(
'=head1 This is a heading')
=> q{/\s*<h1><a[^<>]+>This\s+is\s+a\s+heading</a></h1>\s*$/},
+ "heading building"
+);
+
+ok(x('=head1 This is a heading', sub { $_[0]->html_h_level(2) })
+ => q{/\s*<h2><a[^<>]+>This\s+is\s+a\s+heading</a></h2>\s*$/},
"heading building"
);
Modified: trunk/libpod-simple-perl/t/xhtml01.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/t/xhtml01.t?rev=48911&op=diff
==============================================================================
--- trunk/libpod-simple-perl/t/xhtml01.t (original)
+++ trunk/libpod-simple-perl/t/xhtml01.t Thu Dec 17 19:10:07 2009
@@ -8,7 +8,7 @@
use strict;
use lib '../lib';
-use Test::More tests => 43;
+use Test::More tests => 48;
#use Test::More 'no_plan';
use_ok('Pod::Simple::XHTML') or exit;
@@ -26,6 +26,11 @@
is($results, qq{<h1 id="Poit-">Poit!</h1>\n\n}, "head1 level output");
initialize($parser, $results);
+$parser->html_h_level(2);
+$parser->parse_string_document( "=head1 Poit!" );
+is($results, qq{<h2 id="Poit-">Poit!</h2>\n\n}, "head1 level output h_level 2");
+
+initialize($parser, $results);
$parser->parse_string_document( "=head2 I think so Brain." );
is($results, qq{<h2 id="I-think-so-Brain.">I think so Brain.</h2>\n\n}, "head2 level output");
@@ -37,6 +42,18 @@
$parser->parse_string_document( "=head4 Zort & Zog!" );
is($results, qq{<h4 id="Zort-Zog-">Zort & Zog!</h4>\n\n}, "head4 level output");
+sub x ($;&) {
+ my $code = $_[1];
+ Pod::Simple::XHTML->_out(
+ sub { $code->($_[0]) if $code },
+ "=pod\n\n$_[0]",
+) }
+
+like(
+ x("=head1 Header\n\n=for html <div>RAW<span>!</span></div>\n\nDone."),
+ qr/.+<\/h1>\s+<div>RAW<span>!<\/span><\/div>\s+.*/sm,
+ "heading building"
+) or exit;
initialize($parser, $results);
$parser->parse_string_document(<<'EOPOD');
@@ -563,6 +580,13 @@
is $parser->resolve_man_page_link('crontab'),
"${MANURL}1/crontab", 'Man link without section';
+# Make sure that batch_mode_page_object_init() works.
+ok $parser->batch_mode_page_object_init(0, 0, 0, 0, 6),
+ 'Call batch_mode_page_object_init()';
+ok $parser->batch_mode, 'We should be in batch mode';
+is $parser->batch_mode_current_level, 6,
+ 'The level should have been set';
+
######################################
sub initialize {
More information about the Pkg-perl-cvs-commits
mailing list