r66016 - in /trunk/libpod-simple-perl: ./ debian/ lib/ lib/Pod/ lib/Pod/Simple/ t/
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Sun Dec 19 22:29:18 UTC 2010
Author: gregoa
Date: Sun Dec 19 22:29:11 2010
New Revision: 66016
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=66016
Log:
svn merge ^/branches/upstream/libpod-simple-perl/3.14 ^/branches/upstream/libpod-simple-perl/current .
Added:
trunk/libpod-simple-perl/MANIFEST.SKIP
- copied unchanged from r66015, branches/upstream/libpod-simple-perl/current/MANIFEST.SKIP
Removed:
trunk/libpod-simple-perl/lib/perlpod.pod
trunk/libpod-simple-perl/lib/perlpodspec.pod
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/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/search50.t
trunk/libpod-simple-perl/t/xhtml01.t
trunk/libpod-simple-perl/t/xhtml05.t
Modified: trunk/libpod-simple-perl/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/ChangeLog?rev=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/ChangeLog (original)
+++ trunk/libpod-simple-perl/ChangeLog Sun Dec 19 22:29:11 2010
@@ -1,5 +1,35 @@
# ChangeLog for Pod::Simple dist
#---------------------------------------------------------------------------
+
+2010-11-11 David E. Wheeler <david at justatheory.org>
+ * Release 3.15
+
+ Removed "perlpod.pod" and "perlpodspec.pod". These now just live
+ in the Perl core.
+
+ Fixed stylesheet names output by HTMLBatch to match the names of
+ the actual stylesheet files (broken in 3.09). Thanks to Kevin Ryde
+ for the report (RT #56725).
+
+ Added missing closing slash to the CSS links in the XHTML output.
+ Thanks to HarleyPig for the patch!
+
+ Added parens around bar "qw(...)" in t/xhtml05.t. Thanks to Jerry
+ D. Hedden for the patch.
+
+ Improved the Pod::Simple::HTML docs. Thanks to Gabor Szabo for the
+ patch.
+
+ Pod::Simple::XHTML now properly encodes entities in URLs in the
+ anchor tag. Thanks to John McNamara for the report (RT-60249).
+
+ Pod::Simple::HTML and XHTML now strip whitespace from the end of
+ section names that appear as anchor names for headers (in HTML)
+ and IDs (in XHTML). Such whitespace appeared when "X<>" entities
+ were stripped out but not the space between them (RT-56572).
+
+ Make test "t/search50.t" always pass on case-insensitive file
+ systems rather than just skip VMS.
2009-04-27
* Release 3.14
Modified: trunk/libpod-simple-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/MANIFEST?rev=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/MANIFEST (original)
+++ trunk/libpod-simple-perl/MANIFEST Sun Dec 19 22:29:11 2010
@@ -1,6 +1,4 @@
ChangeLog
-lib/perlpod.pod
-lib/perlpodspec.pod
lib/Pod/Simple.pm
lib/Pod/Simple.pod
lib/Pod/Simple/BlackBox.pm
@@ -32,8 +30,8 @@
lib/Pod/Simple/XHTML.pm
lib/Pod/Simple/XMLOutStream.pm
Makefile.PL
-MANIFEST
-META.yml Module meta-data (added by MakeMaker)
+MANIFEST This list of files
+MANIFEST.SKIP
README
t/00about.t
t/20_skip.t
@@ -179,3 +177,4 @@
t/xhtml01.t
t/xhtml05.t
t/xhtml10.t
+META.yml Module meta-data (added by MakeMaker)
Modified: trunk/libpod-simple-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/META.yml?rev=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/META.yml (original)
+++ trunk/libpod-simple-perl/META.yml Sun Dec 19 22:29:11 2010
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: Pod-Simple
-version: 3.14
+version: 3.15
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=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/README (original)
+++ trunk/libpod-simple-perl/README Sun Dec 19 22:29:11 2010
@@ -1,4 +1,4 @@
-=head1 Pod::Simple version 3.14
+=head1 Pod::Simple version 3.15
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=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/debian/changelog (original)
+++ trunk/libpod-simple-perl/debian/changelog Sun Dec 19 22:29:11 2010
@@ -1,6 +1,4 @@
libpod-simple-perl (3.15-1) UNRELEASED; urgency=low
-
- TODO: Only changes in debian/ were committed.
* Team upload.
* New upstream release
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=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple.pm Sun Dec 19 22:29:11 2010
@@ -18,7 +18,7 @@
);
@ISA = ('Pod::Simple::BlackBox');
-$VERSION = '3.14';
+$VERSION = '3.15';
@Known_formatting_codes = qw(I B C L E F S X Z);
%Known_formatting_codes = map(($_=>1), @Known_formatting_codes);
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=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/BlackBox.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/BlackBox.pm Sun Dec 19 22:29:11 2010
@@ -23,7 +23,7 @@
use strict;
use Carp ();
use vars qw($VERSION );
-$VERSION = '3.14';
+$VERSION = '3.15';
#use constant DEBUG => 7;
BEGIN {
require Pod::Simple;
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=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/Checker.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/Checker.pm Sun Dec 19 22:29:11 2010
@@ -9,7 +9,7 @@
use Pod::Simple::Methody ();
use Pod::Simple ();
use vars qw( @ISA $VERSION );
-$VERSION = '3.14';
+$VERSION = '3.15';
@ISA = ('Pod::Simple::Methody');
BEGIN { *DEBUG = defined(&Pod::Simple::DEBUG)
? \&Pod::Simple::DEBUG
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=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/Debug.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/Debug.pm Sun Dec 19 22:29:11 2010
@@ -3,7 +3,7 @@
package Pod::Simple::Debug;
use strict;
use vars qw($VERSION );
-$VERSION = '3.14';
+$VERSION = '3.15';
sub import {
my($value,$variable);
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=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/DumpAsText.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/DumpAsText.pm Sun Dec 19 22:29:11 2010
@@ -1,7 +1,7 @@
require 5;
package Pod::Simple::DumpAsText;
-$VERSION = '3.14';
+$VERSION = '3.15';
use Pod::Simple ();
BEGIN {@ISA = ('Pod::Simple')}
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=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/DumpAsXML.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/DumpAsXML.pm Sun Dec 19 22:29:11 2010
@@ -1,7 +1,7 @@
require 5;
package Pod::Simple::DumpAsXML;
-$VERSION = '3.14';
+$VERSION = '3.15';
use Pod::Simple ();
BEGIN {@ISA = ('Pod::Simple')}
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=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/HTML.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/HTML.pm Sun Dec 19 22:29:11 2010
@@ -10,7 +10,7 @@
$Doctype_decl $Content_decl
);
@ISA = ('Pod::Simple::PullParser');
-$VERSION = '3.14';
+$VERSION = '3.15';
BEGIN {
if(defined &DEBUG) { } # no-op
@@ -81,7 +81,7 @@
# out of apparently longstanding habit)
'html_css', # URL of CSS file to point to
- 'html_javascript', # URL of CSS file to point to
+ 'html_javascript', # URL of Javascript file to point to
'force_title', # should already be &-escaped
'default_title', # should already be &-escaped
@@ -685,6 +685,8 @@
sub section_name_tidy {
my($self, $section) = @_;
+ $section =~ s/^\s+//;
+ $section =~ s/\s+$//;
$section =~ tr/ /_/;
$section =~ tr/\x00-\x1F\x80-\x9F//d if 'A' eq chr(65); # drop crazy characters
$section = $self->unicode_escape_url($section);
@@ -897,25 +899,176 @@
=head1 CALLING FROM PERL
-TODO make a new object, set any options, and use parse_from_file
-
+=head2 Minimal code
+
+ use Pod::Simple::HTML;
+ my $html;
+ $p->output_string(\$html);
+ $p->parse_from_file('path/to/Module/Name.pm');
+ open my $out, '>', 'out.html' or die;
+ print $out $html;
+
+=head2 More detailed example
+
+ use Pod::Simple::HTML;
+
+Set the content type:
+
+ $Pod::Simple::HTML::Content_decl = q{<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" >};
+
+ my $p = Pod::Simple::HTML->new;
+
+Include a single javascript source:
+
+ $p->html_javascript('http://abc.com/a.js');
+
+Or insert multiple javascript source in the header
+(or for that matter include anything, thought this is not recommended)
+
+ $p->html_javascript('
+ <script type="text/javascript" src="http://abc.com/b.js"></script>
+ <script type="text/javascript" src="http://abc.com/c.js"></script>');
+
+Include a single css source in the header:
+
+ $p->html_css('/style.css');
+
+or insert multiple css sources:
+
+ $p->html_css('
+ <link rel="stylesheet" type="text/css" title="pod_stylesheet" href="http://remote.server.com/jquery.css">
+ <link rel="stylesheet" type="text/css" title="pod_stylesheet" href="/style.css">');
+
+Tell the parser where should the output go. In this case it will be placed in the $html variable:
+
+ my $html;
+ $p->output_string(\$html);
+
+Parse and process a file with pod in it:
+
+ $p->parse_from_file('path/to/Module/Name.pm');
=head1 METHODS
TODO
all (most?) accessorized methods
+The following variables need to be set B<before> the call to the ->new constructor.
+
+Set the string that is included before the opening <html> tag:
+
+ $Pod::Simple::HTML::Doctype_decl = qq{<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">\n};
+
+Set the content-type in the HTML head: (defaults to ISO-8859-1)
+
+ $Pod::Simple::HTML::Content_decl = q{<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" >};
+
+Set the value that will be ebedded in the opening tags of F, C tags and verbatim text.
+F maps to <em>, C maps to <code>, Verbatim text maps to <pre> (Computerese defaults to "")
+
+ $Pod::Simple::HTML::Computerese = ' class="some_class_name';
+
+=head2 html_css
+
+=head2 html_javascript
+
+=head2 title_prefix
+
+=head2 title_postfix
+
+=head2 html_header_before_title
+
+This includes everything before the <title> opening tag including the Document type
+and including the opening <title> tag. The following call will set it to be a simple HTML
+file:
+
+ $p->html_header_before_title('<html><head><title>');
+
+=head2 html_h_level
+
+Normally =head1 will become <h1>, =head2 will become <h2> etc.
+Using the html_h_level method will change these levels setting the h level
+of =head1 tags:
+
+ $p->html_h_level(3);
+
+Will make sure that =head1 will become <h3> and =head2 will become <h4> etc...
+
+
+=head2 index
+
+Set it to some true value if you want to have an index (in reality a table of contents)
+to be added at the top of the generated HTML.
+
+ $p->index(1);
+
+=head2 html_header_after_title
+
+Includes the closing tag of </title> and throught the rest of the head
+till the opening of the body
+
+ $p->html_header_after_title('</title>...</head><body id="my_id">');
+
+=head2 html_footer
+
+The very end of the document:
+
+ $p->html_footer( qq[\n<!-- end doc -->\n\n</body></html>\n] );
=head1 SUBCLASSING
+Can use any of the methods described above but for further customization
+one needs to override some of the methods:
+
+ package My::Pod;
+ use strict;
+ use warnings;
+
+ use base 'Pod::Simple::HTML';
+
+ # needs to return a URL string such
+ # http://some.other.com/page.html
+ # #anchor_in_the_same_file
+ # /internal/ref.html
+ sub do_pod_link {
+ # My::Pod object and Pod::Simple::PullParserStartToken object
+ my ($self, $link) = @_;
+
+ say $link->tagname; # will be L for links
+ say $link->attr('to'); #
+ say $link->attr('type'); # will be 'pod' always
+ say $link->attr('section');
+
+ # Links local to our web site
+ if ($link->tagname eq 'L' and $link->attr('type') eq 'pod') {
+ my $to = $link->attr('to');
+ if ($to =~ /^Padre::/) {
+ $to =~ s{::}{/}g;
+ return "/docs/Padre/$to.html";
+ }
+ }
+
+ # all other links are generated by the parent class
+ my $ret = $self->SUPER::do_pod_link($link);
+ return $ret;
+ }
+
+ 1;
+
+Meanwhile in script.pl:
+
+ use My::Pod;
+
+ my $p = My::Pod->new;
+
+ my $html;
+ $p->output_string(\$html);
+ $p->parse_from_file('path/to/Module/Name.pm');
+ open my $out, '>', 'out.html' or die;
+ print $out $html;
+
TODO
-
- can just set any of: html_css html_javascript title_prefix
- 'html_header_before_title',
- 'html_header_after_title',
- 'html_footer',
-
-maybe override do_pod_link
maybe override do_beginning do_end
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=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/HTMLBatch.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/HTMLBatch.pm Sun Dec 19 22:29:11 2010
@@ -5,7 +5,7 @@
use vars qw( $VERSION $HTML_RENDER_CLASS $HTML_EXTENSION
$CSS $JAVASCRIPT $SLEEPY $SEARCH_CLASS @ISA
);
-$VERSION = '3.14';
+$VERSION = '3.15';
@ISA = (); # Yup, we're NOT a subclass of Pod::Simple::HTML!
# TODO: nocontents stylesheets. Strike some of the color variations?
@@ -726,7 +726,7 @@
'whtgrng', # white_with_green_on_grey
'grygrnw', # grey_with_green_on_white
) {
- my $outname = "$variation\_";
+ my $outname = $variation;
my $this_css = join "\n",
"/* This file is autogenerated. Do not edit. $outname */\n",
"\@import url(\"./_$variation.css\");",
@@ -735,7 +735,7 @@
;
my $name = $outname;
$name =~ tr/-_/ /;
- $self->add_css( "$outname.css", 0, $name, 0, 0, \$this_css);
+ $self->add_css( "_$outname.css", 0, $name, 0, 0, \$this_css);
}
return;
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=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/LinkSection.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/LinkSection.pm Sun Dec 19 22:29:11 2010
@@ -3,12 +3,12 @@
package Pod::Simple::LinkSection;
# Based somewhat dimly on Array::Autojoin
use vars qw($VERSION );
-$VERSION = '3.14';
+$VERSION = '3.15';
use strict;
use Pod::Simple::BlackBox;
use vars qw($VERSION );
-$VERSION = '3.14';
+$VERSION = '3.15';
use overload( # So it'll stringify nice
'""' => \&Pod::Simple::BlackBox::stringify_lol,
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=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/Methody.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/Methody.pm Sun Dec 19 22:29:11 2010
@@ -4,7 +4,7 @@
use strict;
use Pod::Simple ();
use vars qw(@ISA $VERSION);
-$VERSION = '3.14';
+$VERSION = '3.15';
@ISA = ('Pod::Simple');
# Yes, we could use named variables, but I want this to be impose
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=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/Progress.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/Progress.pm Sun Dec 19 22:29:11 2010
@@ -1,7 +1,7 @@
require 5;
package Pod::Simple::Progress;
-$VERSION = '3.14';
+$VERSION = '3.15';
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=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/PullParser.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/PullParser.pm Sun Dec 19 22:29:11 2010
@@ -1,7 +1,7 @@
require 5;
package Pod::Simple::PullParser;
-$VERSION = '3.14';
+$VERSION = '3.15';
use Pod::Simple ();
BEGIN {@ISA = ('Pod::Simple')}
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=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/PullParserEndToken.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/PullParserEndToken.pm Sun Dec 19 22:29:11 2010
@@ -5,7 +5,7 @@
use strict;
use vars qw(@ISA $VERSION);
@ISA = ('Pod::Simple::PullParserToken');
-$VERSION = '3.14';
+$VERSION = '3.15';
sub new { # Class->new(tagname);
my $class = shift;
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=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/PullParserStartToken.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/PullParserStartToken.pm Sun Dec 19 22:29:11 2010
@@ -5,7 +5,7 @@
use strict;
use vars qw(@ISA $VERSION);
@ISA = ('Pod::Simple::PullParserToken');
-$VERSION = '3.14';
+$VERSION = '3.15';
sub new { # Class->new(tagname, optional_attrhash);
my $class = shift;
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=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/PullParserTextToken.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/PullParserTextToken.pm Sun Dec 19 22:29:11 2010
@@ -5,7 +5,7 @@
use strict;
use vars qw(@ISA $VERSION);
@ISA = ('Pod::Simple::PullParserToken');
-$VERSION = '3.14';
+$VERSION = '3.15';
sub new { # Class->new(text);
my $class = shift;
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=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/PullParserToken.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/PullParserToken.pm Sun Dec 19 22:29:11 2010
@@ -3,7 +3,7 @@
package Pod::Simple::PullParserToken;
# Base class for tokens gotten from Pod::Simple::PullParser's $parser->get_token
@ISA = ();
-$VERSION = '3.14';
+$VERSION = '3.15';
use strict;
sub new { # Class->new('type', stuff...); ## Overridden in derived classes anyway
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=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/RTF.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/RTF.pm Sun Dec 19 22:29:11 2010
@@ -8,7 +8,7 @@
use strict;
use vars qw($VERSION @ISA %Escape $WRAP %Tagmap);
-$VERSION = '3.14';
+$VERSION = '3.15';
use Pod::Simple::PullParser ();
BEGIN {@ISA = ('Pod::Simple::PullParser')}
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=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/Search.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/Search.pm Sun Dec 19 22:29:11 2010
@@ -4,7 +4,7 @@
use strict;
use vars qw($VERSION $MAX_VERSION_WITHIN $SLEEPY);
-$VERSION = '3.14'; ## Current version of this package
+$VERSION = '3.15'; ## Current version of this package
BEGIN { *DEBUG = sub () {0} unless defined &DEBUG; } # set DEBUG level
use Carp ();
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=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/SimpleTree.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/SimpleTree.pm Sun Dec 19 22:29:11 2010
@@ -6,7 +6,7 @@
use Carp ();
use Pod::Simple ();
use vars qw( $ATTR_PAD @ISA $VERSION $SORT_ATTRS);
-$VERSION = '3.14';
+$VERSION = '3.15';
BEGIN {
@ISA = ('Pod::Simple');
*DEBUG = \&Pod::Simple::DEBUG unless defined &DEBUG;
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=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/Subclassing.pod (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/Subclassing.pod Sun Dec 19 22:29:11 2010
@@ -887,6 +887,8 @@
L<Pod::Simple::TextContent> -- like Pod::Simple::Text, but
makes no effort for indent or wrap the text being formatted
+L<Pod::Simple::HTML> -- a simple HTML formatter for Pod
+
L<perlpod|perlpod>
L<perlpodspec|perlpodspec>
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=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/Text.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/Text.pm Sun Dec 19 22:29:11 2010
@@ -6,7 +6,7 @@
use Pod::Simple::Methody ();
use Pod::Simple ();
use vars qw( @ISA $VERSION $FREAKYMODE);
-$VERSION = '3.14';
+$VERSION = '3.15';
@ISA = ('Pod::Simple::Methody');
BEGIN { *DEBUG = defined(&Pod::Simple::DEBUG)
? \&Pod::Simple::DEBUG
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=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/TextContent.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/TextContent.pm Sun Dec 19 22:29:11 2010
@@ -6,7 +6,7 @@
use Carp ();
use Pod::Simple ();
use vars qw( @ISA $VERSION );
-$VERSION = '3.14';
+$VERSION = '3.15';
@ISA = ('Pod::Simple');
sub new {
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=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/TiedOutFH.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/TiedOutFH.pm Sun Dec 19 22:29:11 2010
@@ -4,7 +4,7 @@
use Symbol ('gensym');
use Carp ();
use vars qw($VERSION );
-$VERSION = '3.14';
+$VERSION = '3.15';
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
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=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/Transcode.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/Transcode.pm Sun Dec 19 22:29:11 2010
@@ -2,7 +2,7 @@
require 5;
package Pod::Simple::Transcode;
use vars qw($VERSION );
-$VERSION = '3.14';
+$VERSION = '3.15';
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=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/TranscodeDumb.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/TranscodeDumb.pm Sun Dec 19 22:29:11 2010
@@ -5,7 +5,7 @@
package Pod::Simple::TranscodeDumb;
use strict;
use vars qw($VERSION %Supported);
-$VERSION = '3.14';
+$VERSION = '3.15';
# 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=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/TranscodeSmart.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/TranscodeSmart.pm Sun Dec 19 22:29:11 2010
@@ -9,7 +9,7 @@
use Pod::Simple;
require Encode;
use vars qw($VERSION );
-$VERSION = '3.14';
+$VERSION = '3.15';
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=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/XHTML.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/XHTML.pm Sun Dec 19 22:29:11 2010
@@ -28,7 +28,7 @@
package Pod::Simple::XHTML;
use strict;
use vars qw( $VERSION @ISA $HAS_HTML_ENTITIES );
-$VERSION = '3.14';
+$VERSION = '3.15';
use Carp ();
use Pod::Simple::Methody ();
@ISA = ('Pod::Simple::Methody');
@@ -165,7 +165,7 @@
'man_url_prefix',
'man_url_postfix',
'title_prefix', 'title_postfix',
- 'html_css',
+ 'html_css',
'html_javascript',
'html_doctype',
'html_header_tags',
@@ -372,7 +372,7 @@
}
# This handles =begin and =for blocks of all kinds.
-sub start_for {
+sub start_for {
my ($self, $flags) = @_;
push @{ $self->{__region_targets} }, $flags->{target_matching};
@@ -386,7 +386,7 @@
$self->emit;
}
-sub end_for {
+sub end_for {
my ($self) = @_;
$self->{'scratch'} .= '</div>' unless $self->__in_literal_xhtml_region;
@@ -395,7 +395,7 @@
$self->emit;
}
-sub start_Document {
+sub start_Document {
my ($self) = @_;
if (defined $self->html_header) {
$self->{'scratch'} .= $self->html_header;
@@ -407,7 +407,7 @@
$metatags = $self->html_header_tags || '';
if ($self->html_css) {
$metatags .= "\n<link rel='stylesheet' href='" .
- $self->html_css . "' type='text/css'>";
+ $self->html_css . "' type='text/css' />";
}
if ($self->html_javascript) {
$metatags .= "\n<script type='text/javascript' src='" .
@@ -500,10 +500,12 @@
sub start_L {
my ($self, $flags) = @_;
my ($type, $to, $section) = @{$flags}{'type', 'to', 'section'};
- my $url = $type eq 'url' ? $to
+ my $url = encode_entities(
+ $type eq 'url' ? $to
: $type eq 'pod' ? $self->resolve_pod_page_link($to, $section)
: $type eq 'man' ? $self->resolve_man_page_link($to, $section)
- : undef;
+ : undef
+ );
# If it's an unknown type, use an attribute-less <a> like HTML.pm.
$self->{'scratch'} .= '<a' . ($url ? ' href="'. $url . '">' : '>');
@@ -627,6 +629,7 @@
for ($t) {
s/<[^>]+>//g; # Strip HTML.
s/&[^;]+;//g; # Strip entities.
+ s/^\s+//; s/\s+$//; # Strip white space.
s/^([^a-zA-Z]+)$/pod$1/; # Prepend "pod" if no valid chars.
s/^[^a-zA-Z]+//; # First char must be a letter.
s/[^-a-zA-Z0-9_:.]+/-/g; # All other chars must be valid.
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=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/lib/Pod/Simple/XMLOutStream.pm (original)
+++ trunk/libpod-simple-perl/lib/Pod/Simple/XMLOutStream.pm Sun Dec 19 22:29:11 2010
@@ -5,7 +5,7 @@
use Carp ();
use Pod::Simple ();
use vars qw( $ATTR_PAD @ISA $VERSION $SORT_ATTRS);
-$VERSION = '3.14';
+$VERSION = '3.15';
BEGIN {
@ISA = ('Pod::Simple');
*DEBUG = \&Pod::Simple::DEBUG unless defined &DEBUG;
Modified: trunk/libpod-simple-perl/t/html01.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/t/html01.t?rev=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/t/html01.t (original)
+++ trunk/libpod-simple-perl/t/html01.t Sun Dec 19 22:29:11 2010
@@ -9,7 +9,7 @@
use strict;
use Test;
-BEGIN { plan tests => 11 };
+BEGIN { plan tests => 12 };
#use Pod::Simple::Debug (10);
@@ -78,6 +78,13 @@
"heading building"
);
+ok(x(
+'=head2 Yada Yada Operator
+X<...> X<... operator> X<yada yada operator>')
+ => q{/name="Yada_Yada_Operator"/},
+ "heading anchor name"
+);
+
ok(
x("=over 4\n\n=item one\n\n=item two\n\nHello\n\n=back\n"),
q{
Modified: trunk/libpod-simple-perl/t/search50.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/t/search50.t?rev=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/t/search50.t (original)
+++ trunk/libpod-simple-perl/t/search50.t Sun Dec 19 22:29:11 2010
@@ -77,9 +77,9 @@
print "# Comparing \"$x[0]\" to \"$x[1]\"\n";
for(@x) { s{[/\\]}{/}g; }
print "# => \"$x[0]\" to \"$x[1]\"\n";
- skip $^O eq 'VMS' ? '-- case may or may not be preserved' : 0,
- $x[0],
- $x[1],
+ ok
+ lc $x[0],
+ lc $x[1],
" find('$testmod') should match survey's name2where{$testmod}";
} else {
ok 0; # no 'thatpath/<name>.pm' means can't test find()
Modified: trunk/libpod-simple-perl/t/xhtml01.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/t/xhtml01.t?rev=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/t/xhtml01.t (original)
+++ trunk/libpod-simple-perl/t/xhtml01.t Sun Dec 19 22:29:11 2010
@@ -8,7 +8,7 @@
use strict;
use lib '../lib';
-use Test::More tests => 48;
+use Test::More tests => 50;
#use Test::More 'no_plan';
use_ok('Pod::Simple::XHTML') or exit;
@@ -24,6 +24,11 @@
initialize($parser, $results);
$parser->parse_string_document( "=head1 Poit!" );
is($results, qq{<h1 id="Poit-">Poit!</h1>\n\n}, "head1 level output");
+
+initialize($parser, $results);
+$parser->parse_string_document( "=head2 Yada Yada Operator
+X<...> X<... operator> X<yada yada operator>" );
+is($results, qq{<h2 id="Yada-Yada-Operator">Yada Yada Operator </h2>\n\n}, "head ID with X<>");
initialize($parser, $results);
$parser->html_h_level(2);
@@ -76,13 +81,13 @@
remember you are Gunther Heindriksen from Appenzell. You moved to
Grindelwald to drive the cog train to Murren. Can you repeat that?
-P: Mmmm, no, Brain, don't think I can.
+P: Mmmm, no, Brain, dont think I can.
EOPOD
is($results, <<'EOHTML', "multiple paragraphs");
<p>B: Now, Pinky, if by any chance you are captured during this mission, remember you are Gunther Heindriksen from Appenzell. You moved to Grindelwald to drive the cog train to Murren. Can you repeat that?</p>
-<p>P: Mmmm, no, Brain, don't think I can.</p>
+<p>P: Mmmm, no, Brain, dont think I can.</p>
EOHTML
@@ -400,7 +405,7 @@
A plain paragraph with body tags and css tags turned on.
EOPOD
-like($results, qr/<link rel='stylesheet' href='style.css' type='text\/css'>/,
+like($results, qr/<link rel='stylesheet' href='style.css' type='text\/css' \/>/,
"adding html body tags and css tags");
@@ -456,6 +461,17 @@
EOPOD
is($results, <<"EOHTML", "A link in a paragraph");
<p>A plain paragraph with a <a href="http://link.included.here">http://link.included.here</a>.</p>
+
+EOHTML
+
+initialize($parser, $results);
+$parser->parse_string_document(<<'EOPOD');
+=pod
+
+A plain paragraph with a L<http://link.included.here?o=1&p=2>.
+EOPOD
+is($results, <<"EOHTML", "A link in a paragraph");
+<p>A plain paragraph with a <a href="http://link.included.here?o=1&p=2">http://link.included.here?o=1&p=2</a>.</p>
EOHTML
@@ -540,12 +556,12 @@
=pod
# this header is very important & dont you forget it
- B<my $file = <FILEE<gt> || 'Blank!';>
+ B<my $file = <FILEE<gt> || Blank!;>
my $text = "File is: " . <FILE>;
EOPOD
is($results, <<"EOHTML", "Verbatim text with markup and embedded formatting");
<pre><code> # this header is very important & dont you forget it
- <b>my \$file = <FILE> || 'Blank!';</b>
+ <b>my \$file = <FILE> || Blank!;</b>
my \$text = "File is: " . <FILE>;</code></pre>
EOHTML
Modified: trunk/libpod-simple-perl/t/xhtml05.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-simple-perl/t/xhtml05.t?rev=66016&op=diff
==============================================================================
--- trunk/libpod-simple-perl/t/xhtml05.t (original)
+++ trunk/libpod-simple-perl/t/xhtml05.t Sun Dec 19 22:29:11 2010
@@ -33,7 +33,7 @@
EOHTML
-foreach my $target qw(note tip warning) {
+foreach my $target (qw(note tip warning)) {
initialize($parser, $results);
$parser->accept_targets_as_text( $target );
$parser->parse_string_document(<<"EOPOD");
More information about the Pkg-perl-cvs-commits
mailing list