Change 18227 by jhi@kosh on 2002/12/02 13:23:48
Integrate
[ 18216]
64bit Peek failure on HP-UX 11.00
Subject: Re: Smoke 18188
From: "H.Merijn Brand" <[EMAIL PROTECTED]>
From: Slaven Rezic <[EMAIL PROTECTED]>
Date: 28 Nov 2002 19:25:25 +0100
Message-ID: <[EMAIL PROTECTED]>
[ 18217]
Document the hint constants and where they're used.
[ 18224]
Integrate PodParser-1.20, with matching tweaks to lib/Pod/t/latex.t
and lib/Pod/t/utils.t to cater for simpler output text.
[ 18226]
missed the new file from #18224
Affected files ...
.... //depot/maint-5.8/perl/MANIFEST#10 integrate
.... //depot/maint-5.8/perl/ext/Devel/Peek/Peek.t#4 integrate
.... //depot/maint-5.8/perl/ext/re/re.pm#2 integrate
.... //depot/maint-5.8/perl/lib/File/Basename.pm#3 integrate
.... //depot/maint-5.8/perl/lib/Pod/Checker.pm#2 integrate
.... //depot/maint-5.8/perl/lib/Pod/ParseUtils.pm#2 integrate
.... //depot/maint-5.8/perl/lib/Pod/PlainText.pm#1 branch
.... //depot/maint-5.8/perl/lib/Pod/Usage.pm#3 integrate
.... //depot/maint-5.8/perl/lib/Pod/t/latex.t#2 integrate
.... //depot/maint-5.8/perl/lib/Pod/t/utils.t#2 integrate
.... //depot/maint-5.8/perl/lib/charnames.pm#4 integrate
.... //depot/maint-5.8/perl/lib/filetest.pm#3 integrate
.... //depot/maint-5.8/perl/lib/open.pm#3 integrate
.... //depot/maint-5.8/perl/lib/overload.pm#2 integrate
.... //depot/maint-5.8/perl/lib/vmsish.pm#2 integrate
.... //depot/maint-5.8/perl/perl.h#8 integrate
.... //depot/maint-5.8/perl/pod/podselect.PL#2 integrate
.... //depot/maint-5.8/perl/t/pod/emptycmd.t#2 integrate
.... //depot/maint-5.8/perl/t/pod/for.t#2 integrate
.... //depot/maint-5.8/perl/t/pod/headings.t#2 integrate
.... //depot/maint-5.8/perl/t/pod/include.t#2 integrate
.... //depot/maint-5.8/perl/t/pod/included.t#2 integrate
.... //depot/maint-5.8/perl/t/pod/lref.t#2 integrate
.... //depot/maint-5.8/perl/t/pod/lref.xr#2 integrate
.... //depot/maint-5.8/perl/t/pod/multiline_items.t#2 integrate
.... //depot/maint-5.8/perl/t/pod/multiline_items.xr#2 integrate
.... //depot/maint-5.8/perl/t/pod/nested_items.t#2 integrate
.... //depot/maint-5.8/perl/t/pod/nested_seqs.t#2 integrate
.... //depot/maint-5.8/perl/t/pod/oneline_cmds.t#2 integrate
.... //depot/maint-5.8/perl/t/pod/pod2usage.t#2 integrate
.... //depot/maint-5.8/perl/t/pod/pod2usage.xr#2 integrate
.... //depot/maint-5.8/perl/t/pod/poderrs.t#2 integrate
.... //depot/maint-5.8/perl/t/pod/poderrs.xr#2 integrate
.... //depot/maint-5.8/perl/t/pod/podselect.t#2 integrate
.... //depot/maint-5.8/perl/t/pod/podselect.xr#2 integrate
.... //depot/maint-5.8/perl/t/pod/special_seqs.t#2 integrate
.... //depot/maint-5.8/perl/t/pod/special_seqs.xr#2 integrate
.... //depot/maint-5.8/perl/t/pod/testp2pt.pl#2 integrate
Differences ...
==== //depot/maint-5.8/perl/MANIFEST#10 (text) ====
Index: perl/MANIFEST
--- perl/MANIFEST#9~18189~ Tue Nov 26 17:51:45 2002
+++ perl/MANIFEST Mon Dec 2 05:23:48 2002
@@ -1397,6 +1397,7 @@
lib/Pod/Parser.pm Pod-Parser - define base class for parsing POD
lib/Pod/ParseUtils.pm Pod-Parser - pod utility functions
lib/Pod/Plainer.pm Pod migration utility module
+lib/Pod/PlainText.pm Convert POD data to formatted ASCII text
lib/Pod/Select.pm Pod-Parser - select portions of POD docs
lib/Pod/t/basic.cap podlators test
lib/Pod/t/basic.clr podlators test
==== //depot/maint-5.8/perl/ext/Devel/Peek/Peek.t#4 (text) ====
Index: perl/ext/Devel/Peek/Peek.t
--- perl/ext/Devel/Peek/Peek.t#3~18197~ Wed Nov 27 20:14:27 2002
+++ perl/ext/Devel/Peek/Peek.t Mon Dec 2 05:23:48 2002
@@ -449,8 +449,8 @@
SV = PVMG\\($ADDR\\) at $ADDR
REFCNT = 2
FLAGS = \\(OBJECT,ROK\\)
- IV = \d+
- NV = \d+
+ IV = -?\d+
+ NV = $FLOAT
RV = $ADDR
SV = NULL\\(0x0\\) at $ADDR
REFCNT = \d+
==== //depot/maint-5.8/perl/ext/re/re.pm#2 (text) ====
Index: perl/ext/re/re.pm
--- perl/ext/re/re.pm#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/ext/re/re.pm Mon Dec 2 05:23:48 2002
@@ -77,8 +77,8 @@
# N.B. File::Basename contains a literal for 'taint' as a fallback. If
# taint is changed here, File::Basename must be updated as well.
my %bitmask = (
-taint => 0x00100000,
-eval => 0x00200000,
+taint => 0x00100000, # HINT_RE_TAINT
+eval => 0x00200000, # HINT_RE_EVAL
);
sub setcolor {
==== //depot/maint-5.8/perl/lib/File/Basename.pm#3 (text) ====
Index: perl/lib/File/Basename.pm
--- perl/lib/File/Basename.pm#2~18080~ Sun Nov 3 21:23:04 2002
+++ perl/lib/File/Basename.pm Mon Dec 2 05:23:48 2002
@@ -130,7 +130,7 @@
# not be available.
BEGIN {
unless (eval { require re; })
- { eval ' sub re::import { $^H |= 0x00100000; } ' }
+ { eval ' sub re::import { $^H |= 0x00100000; } ' } # HINT_RE_TAINT
import re 'taint';
}
==== //depot/maint-5.8/perl/lib/Pod/Checker.pm#2 (text) ====
Index: perl/lib/Pod/Checker.pm
--- perl/lib/Pod/Checker.pm#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/lib/Pod/Checker.pm Mon Dec 2 05:23:48 2002
@@ -10,7 +10,7 @@
package Pod::Checker;
use vars qw($VERSION);
-$VERSION = 1.3; ## Current version of this package
+$VERSION = 1.40; ## Current version of this package
require 5.005; ## requires this Perl version or later
use Pod::ParseUtils; ## for hyperlinks and lists
@@ -274,6 +274,11 @@
with the script/module name, followed by a dash `-' and a very short
description of what the thing is good for.
+=item * =headI<n> without preceding higher level
+
+For example if there is a C<=head2> in the POD file prior to a
+C<=head1>.
+
=back
=head2 Hyperlinks
@@ -548,6 +553,7 @@
## Initialize number of errors, and setup an error function to
## increment this number and then print to the designated output.
$self->{_NUM_ERRORS} = 0;
+ $self->{_NUM_WARNINGS} = 0;
$self->{-quiet} ||= 0;
# set the error handling subroutine
$self->errorsub($self->{-quiet} ? sub { 1; } : 'poderror');
@@ -609,6 +615,8 @@
## Increment error count and print message "
++($self->{_NUM_ERRORS})
if(!%opts || ($opts{-severity} && $opts{-severity} eq 'ERROR'));
+ ++($self->{_NUM_WARNINGS})
+ if(!%opts || ($opts{-severity} && $opts{-severity} eq 'WARNING'));
my $out_fh = $self->output_handle() || \*STDERR;
print $out_fh ($severity, $msg, $line, $file, "\n")
if($self->{-warnings} || !%opts || $opts{-severity} ne 'WARNING');
@@ -628,6 +636,18 @@
##################################
+=item C<$checker-E<gt>num_warnings()>
+
+Set (if argument specified) and retrieve the number of warnings found.
+
+=cut
+
+sub num_warnings {
+ return (@_ > 1) ? ($_[0]->{_NUM_WARNINGS} = $_[1]) : $_[0]->{_NUM_WARNINGS};
+}
+
+##################################
+
=item C<$checker-E<gt>name()>
Set (if argument specified) and retrieve the canonical name of POD as
@@ -907,17 +927,24 @@
}
}
elsif($cmd =~ /^head(\d+)/) {
+ my $hnum = $1;
+ $self->{"_have_head_$hnum"}++; # count head types
+ if($hnum > 1 && !$self->{"_have_head_".($hnum -1)}) {
+ $self->poderror({ -line => $line, -file => $file,
+ -severity => 'WARNING',
+ -msg => "=head$hnum without preceding higher level"});
+ }
# check whether the previous =head section had some contents
if(defined $self->{_commands_in_head} &&
$self->{_commands_in_head} == 0 &&
defined $self->{_last_head} &&
- $self->{_last_head} >= $1) {
+ $self->{_last_head} >= $hnum) {
$self->poderror({ -line => $line, -file => $file,
-severity => 'WARNING',
-msg => "empty section in previous paragraph"});
}
$self->{_commands_in_head} = -1;
- $self->{_last_head} = $1;
+ $self->{_last_head} = $hnum;
# check if there is an open list
if(@{$self->{_list_stack}}) {
my $list;
==== //depot/maint-5.8/perl/lib/Pod/ParseUtils.pm#2 (text) ====
Index: perl/lib/Pod/ParseUtils.pm
--- perl/lib/Pod/ParseUtils.pm#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/lib/Pod/ParseUtils.pm Mon Dec 2 05:23:48 2002
@@ -10,7 +10,7 @@
package Pod::ParseUtils;
use vars qw($VERSION);
-$VERSION = 0.22; ## Current version of this package
+$VERSION = 0.30; ## Current version of this package
require 5.005; ## requires this Perl version or later
=head1 NAME
@@ -284,7 +284,7 @@
my $self = shift;
local($_) = $_[0];
# syntax check the link and extract destination
- my ($alttext,$page,$node,$type) = (undef,'','','');
+ my ($alttext,$page,$node,$type,$quoted) = (undef,'','','',0);
$self->{_warnings} = [];
@@ -311,7 +311,7 @@
# problem: a lot of people use (), or (1) or the like to indicate
# man page sections. But this collides with L<func()> that is supposed
# to point to an internal funtion...
- my $page_rx = '[\w.]+(?:::[\w.]+)*(?:[(](?:\d\w*|)[)]|)';
+ my $page_rx = '[\w.-]+(?:::[\w.-]+)*(?:[(](?:\d\w*|)[)]|)';
# page name only
if(m!^($page_rx)$!o) {
$page = $1;
@@ -321,6 +321,7 @@
elsif(m!^(.*?)\s*[|]\s*($page_rx)\s*/\s*"(.+)"$!o) {
($alttext, $page, $node) = ($1, $2, $3);
$type = 'section';
+ $quoted = 1; #... therefore | and / are allowed
}
# alttext and page
elsif(m!^(.*?)\s*[|]\s*($page_rx)$!o) {
@@ -331,11 +332,13 @@
elsif(m!^(.*?)\s*[|]\s*(?:/\s*|)"(.+)"$!) {
($alttext, $node) = ($1,$2);
$type = 'section';
+ $quoted = 1;
}
# page and "section"
elsif(m!^($page_rx)\s*/\s*"(.+)"$!o) {
($page, $node) = ($1, $2);
$type = 'section';
+ $quoted = 1;
}
# page and item
elsif(m!^($page_rx)\s*/\s*(.+)$!o) {
@@ -346,6 +349,7 @@
elsif(m!^/?"(.+)"$!) {
$node = $1;
$type = 'section';
+ $quoted = 1;
}
# only item
elsif(m!^\s*/(.+)$!) {
@@ -392,7 +396,7 @@
if($page =~ /[(]\w*[)]$/) {
$self->warning("(section) in '$page' deprecated");
}
- if($node =~ m:[|/]:) {
+ if(!$quoted && $node =~ m:[|/]:) {
$self->warning("node '$node' contains non-escaped | or /");
}
if($alttext =~ m:[|/]:) {
@@ -422,11 +426,9 @@
$self->{_text} = $section;
}
else {
- $self->{_text} = (!$section ? '' :
- $type eq 'item' ? "the $section entry" :
- "the section on $section" ) .
- ($page ? ($section ? ' in ':'') . "the $page$page_ext manpage" :
- ' elsewhere in this document');
+ $self->{_text} = ($section || '') .
+ (($page && $section) ? ' in ' : '') .
+ "$page$page_ext";
}
# for being marked up later
# use the non-standard markers P<> and Q<>, so that the resulting
@@ -439,11 +441,8 @@
$self->{_markup} = "Q<$section>";
}
else {
- $self->{_markup} = (!$section ? '' :
- $type eq 'item' ? "the Q<$section> entry" :
- "the section on Q<$section>" ) .
- ($page ? ($section ? ' in ':'') . "the P<$page>$page_ext manpage" :
- ' elsewhere in this document');
+ $self->{_markup} = (!$section ? '' : "Q<$section>") .
+ ($page ? ($section ? ' in ':'') . "P<$page>$page_ext" : '');
}
}
@@ -469,10 +468,10 @@
the following alternatives (the + and * denote the portions of the text
that are marked up):
- the +perl+ manpage
- the *$|* entry in the +perlvar+ manpage
- the section on *OPTIONS* in the +perldoc+ manpage
- the section on *DESCRIPTION* elsewhere in this document
+ +perl+ L<perl>
+ *$|* in +perlvar+ L<perlvar/$|>
+ *OPTIONS* in +perldoc+ L<perldoc/"OPTIONS">
+ *DESCRIPTION* L<"DESCRIPTION">
=cut
==== //depot/maint-5.8/perl/lib/Pod/PlainText.pm#1 (text) ====
Index: perl/lib/Pod/PlainText.pm
--- /dev/null Tue May 5 13:32:27 1998
+++ perl/lib/Pod/PlainText.pm Mon Dec 2 05:23:48 2002
@@ -0,0 +1,700 @@
+# Pod::PlainText -- Convert POD data to formatted ASCII text.
+# $Id: Text.pm,v 2.1 1999/09/20 11:53:33 eagle Exp $
+#
+# Copyright 1999-2000 by Russ Allbery <[EMAIL PROTECTED]>
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the same terms as Perl itself.
+#
+# This module is intended to be a replacement for Pod::Text, and attempts to
+# match its output except for some specific circumstances where other
+# decisions seemed to produce better output. It uses Pod::Parser and is
+# designed to be very easy to subclass.
+
+############################################################################
+# Modules and declarations
+############################################################################
+
+package Pod::PlainText;
+
+require 5.005;
+
+use Carp qw(carp croak);
+use Pod::Select ();
+
+use strict;
+use vars qw(@ISA %ESCAPES $VERSION);
+
+# We inherit from Pod::Select instead of Pod::Parser so that we can be used
+# by Pod::Usage.
+@ISA = qw(Pod::Select);
+
+($VERSION = (split (' ', q$Revision: 2.1 $ ))[1]) =~ s/\.(\d)$/.0$1/;
+
+
+############################################################################
+# Table of supported E<> escapes
+############################################################################
+
+# This table is taken near verbatim from Pod::PlainText in Pod::Parser,
+# which got it near verbatim from the original Pod::Text. It is therefore
+# credited to Tom Christiansen, and I'm glad I didn't have to write it. :)
+%ESCAPES = (
+ 'amp' => '&', # ampersand
+ 'lt' => '<', # left chevron, less-than
+ 'gt' => '>', # right chevron, greater-than
+ 'quot' => '"', # double quote
+
+ "Aacute" => "\xC1", # capital A, acute accent
+ "aacute" => "\xE1", # small a, acute accent
+ "Acirc" => "\xC2", # capital A, circumflex accent
+ "acirc" => "\xE2", # small a, circumflex accent
+ "AElig" => "\xC6", # capital AE diphthong (ligature)
+ "aelig" => "\xE6", # small ae diphthong (ligature)
+ "Agrave" => "\xC0", # capital A, grave accent
+ "agrave" => "\xE0", # small a, grave accent
+ "Aring" => "\xC5", # capital A, ring
+ "aring" => "\xE5", # small a, ring
+ "Atilde" => "\xC3", # capital A, tilde
+ "atilde" => "\xE3", # small a, tilde
+ "Auml" => "\xC4", # capital A, dieresis or umlaut mark
+ "auml" => "\xE4", # small a, dieresis or umlaut mark
+ "Ccedil" => "\xC7", # capital C, cedilla
+ "ccedil" => "\xE7", # small c, cedilla
+ "Eacute" => "\xC9", # capital E, acute accent
+ "eacute" => "\xE9", # small e, acute accent
+ "Ecirc" => "\xCA", # capital E, circumflex accent
+ "ecirc" => "\xEA", # small e, circumflex accent
+ "Egrave" => "\xC8", # capital E, grave accent
+ "egrave" => "\xE8", # small e, grave accent
+ "ETH" => "\xD0", # capital Eth, Icelandic
+ "eth" => "\xF0", # small eth, Icelandic
+ "Euml" => "\xCB", # capital E, dieresis or umlaut mark
+ "euml" => "\xEB", # small e, dieresis or umlaut mark
+ "Iacute" => "\xCD", # capital I, acute accent
+ "iacute" => "\xED", # small i, acute accent
+ "Icirc" => "\xCE", # capital I, circumflex accent
+ "icirc" => "\xEE", # small i, circumflex accent
+ "Igrave" => "\xCD", # capital I, grave accent
+ "igrave" => "\xED", # small i, grave accent
+ "Iuml" => "\xCF", # capital I, dieresis or umlaut mark
+ "iuml" => "\xEF", # small i, dieresis or umlaut mark
+ "Ntilde" => "\xD1", # capital N, tilde
+ "ntilde" => "\xF1", # small n, tilde
+ "Oacute" => "\xD3", # capital O, acute accent
+ "oacute" => "\xF3", # small o, acute accent
+ "Ocirc" => "\xD4", # capital O, circumflex accent
+ "ocirc" => "\xF4", # small o, circumflex accent
+ "Ograve" => "\xD2", # capital O, grave accent
+ "ograve" => "\xF2", # small o, grave accent
+ "Oslash" => "\xD8", # capital O, slash
+ "oslash" => "\xF8", # small o, slash
+ "Otilde" => "\xD5", # capital O, tilde
+ "otilde" => "\xF5", # small o, tilde
+ "Ouml" => "\xD6", # capital O, dieresis or umlaut mark
+ "ouml" => "\xF6", # small o, dieresis or umlaut mark
+ "szlig" => "\xDF", # small sharp s, German (sz ligature)
+ "THORN" => "\xDE", # capital THORN, Icelandic
+ "thorn" => "\xFE", # small thorn, Icelandic
+ "Uacute" => "\xDA", # capital U, acute accent
+ "uacute" => "\xFA", # small u, acute accent
+ "Ucirc" => "\xDB", # capital U, circumflex accent
+ "ucirc" => "\xFB", # small u, circumflex accent
+ "Ugrave" => "\xD9", # capital U, grave accent
+ "ugrave" => "\xF9", # small u, grave accent
+ "Uuml" => "\xDC", # capital U, dieresis or umlaut mark
+ "uuml" => "\xFC", # small u, dieresis or umlaut mark
+ "Yacute" => "\xDD", # capital Y, acute accent
+ "yacute" => "\xFD", # small y, acute accent
+ "yuml" => "\xFF", # small y, dieresis or umlaut mark
+
+ "lchevron" => "\xAB", # left chevron (double less than)
+ "rchevron" => "\xBB", # right chevron (double greater than)
+);
+
+
+############################################################################
+# Initialization
+############################################################################
+
+# Initialize the object. Must be sure to call our parent initializer.
+sub initialize {
+ my $self = shift;
+
+ $$self{alt} = 0 unless defined $$self{alt};
+ $$self{indent} = 4 unless defined $$self{indent};
+ $$self{loose} = 0 unless defined $$self{loose};
+ $$self{sentence} = 0 unless defined $$self{sentence};
+ $$self{width} = 76 unless defined $$self{width};
+
+ $$self{INDENTS} = []; # Stack of indentations.
+ $$self{MARGIN} = $$self{indent}; # Current left margin in spaces.
+
+ $self->SUPER::initialize;
+}
+
+
+############################################################################
+# Core overrides
+############################################################################
+
+# Called for each command paragraph. Gets the command, the associated
+# paragraph, the line number, and a Pod::Paragraph object. Just dispatches
+# the command to a method named the same as the command. =cut is handled
+# internally by Pod::Parser.
+sub command {
+ my $self = shift;
+ my $command = shift;
+ return if $command eq 'pod';
+ return if ($$self{EXCLUDE} && $command ne 'end');
+ $self->item ("\n") if defined $$self{ITEM};
+ $command = 'cmd_' . $command;
+ $self->$command (@_);
+}
+
+# Called for a verbatim paragraph. Gets the paragraph, the line number, and
+# a Pod::Paragraph object. Just output it verbatim, but with tabs converted
+# to spaces.
+sub verbatim {
+ my $self = shift;
+ return if $$self{EXCLUDE};
+ $self->item if defined $$self{ITEM};
+ local $_ = shift;
+ return if /^\s*$/;
+ s/^(\s*\S+)/(' ' x $$self{MARGIN}) . $1/gme;
+ $self->output ($_);
+}
+
+# Called for a regular text block. Gets the paragraph, the line number, and
+# a Pod::Paragraph object. Perform interpolation and output the results.
+sub textblock {
+ my $self = shift;
+ return if $$self{EXCLUDE};
+ $self->output ($_[0]), return if $$self{VERBATIM};
+ local $_ = shift;
+ my $line = shift;
+
+ # Perform a little magic to collapse multiple L<> references. This is
+ # here mostly for backwards-compatibility. We'll just rewrite the whole
+ # thing into actual text at this part, bypassing the whole internal
+ # sequence parsing thing.
+ s{
+ (
+ L< # A link of the form L</something>.
+ /
+ (
+ [:\w]+ # The item has to be a simple word...
+ (\(\))? # ...or simple function.
+ )
+ >
+ (
+ ,?\s+(and\s+)? # Allow lots of them, conjuncted.
+ L<
+ /
+ (
+ [:\w]+
+ (\(\))?
+ )
+ >
+ )+
+ )
+ } {
+ local $_ = $1;
+ s%L</([^>]+)>%$1%g;
+ my @items = split /(?:,?\s+(?:and\s+)?)/;
+ my $string = "the ";
+ my $i;
+ for ($i = 0; $i < @items; $i++) {
+ $string .= $items[$i];
+ $string .= ", " if @items > 2 && $i != $#items;
+ $string .= " and " if ($i == $#items - 1);
+ }
+ $string .= " entries elsewhere in this document";
+ $string;
+ }gex;
+
+ # Now actually interpolate and output the paragraph.
+ $_ = $self->interpolate ($_, $line);
+ s/\s+$/\n/;
+ if (defined $$self{ITEM}) {
+ $self->item ($_ . "\n");
+ } else {
+ $self->output ($self->reformat ($_ . "\n"));
+ }
+}
+
+# Called for an interior sequence. Gets the command, argument, and a
+# Pod::InteriorSequence object and is expected to return the resulting text.
+# Calls code, bold, italic, file, and link to handle those types of
+# sequences, and handles S<>, E<>, X<>, and Z<> directly.
+sub interior_sequence {
+ my $self = shift;
+ my $command = shift;
+ local $_ = shift;
+ return '' if ($command eq 'X' || $command eq 'Z');
+
+ # Expand escapes into the actual character now, carping if invalid.
+ if ($command eq 'E') {
+ return $ESCAPES{$_} if defined $ESCAPES{$_};
+ carp "Unknown escape: E<$_>";
+ return "E<$_>";
+ }
+
+ # For all the other sequences, empty content produces no output.
+ return if $_ eq '';
+
+ # For S<>, compress all internal whitespace and then map spaces to \01.
+ # When we output the text, we'll map this back.
+ if ($command eq 'S') {
+ s/\s{2,}/ /g;
+ tr/ /\01/;
+ return $_;
+ }
+
+ # Anything else needs to get dispatched to another method.
+ if ($command eq 'B') { return $self->seq_b ($_) }
+ elsif ($command eq 'C') { return $self->seq_c ($_) }
+ elsif ($command eq 'F') { return $self->seq_f ($_) }
+ elsif ($command eq 'I') { return $self->seq_i ($_) }
+ elsif ($command eq 'L') { return $self->seq_l ($_) }
+ else { carp "Unknown sequence $command<$_>" }
+}
+
+# Called for each paragraph that's actually part of the POD. We take
+# advantage of this opportunity to untabify the input.
+sub preprocess_paragraph {
+ my $self = shift;
+ local $_ = shift;
+ 1 while s/^(.*?)(\t+)/$1 . ' ' x (length ($2) * 8 - length ($1) % 8)/me;
+ $_;
+}
+
+
+############################################################################
+# Command paragraphs
+############################################################################
+
+# All command paragraphs take the paragraph and the line number.
+
+# First level heading.
+sub cmd_head1 {
+ my $self = shift;
+ local $_ = shift;
+ s/\s+$//;
+ $_ = $self->interpolate ($_, shift);
+ if ($$self{alt}) {
+ $self->output ("\n==== $_ ====\n\n");
+ } else {
+ $_ .= "\n" if $$self{loose};
+ $self->output ($_ . "\n");
+ }
+}
+
+# Second level heading.
+sub cmd_head2 {
+ my $self = shift;
+ local $_ = shift;
+ s/\s+$//;
+ $_ = $self->interpolate ($_, shift);
+ if ($$self{alt}) {
+ $self->output ("\n== $_ ==\n\n");
+ } else {
+ $self->output (' ' x ($$self{indent} / 2) . $_ . "\n\n");
+ }
+}
+
+# Start a list.
+sub cmd_over {
+ my $self = shift;
+ local $_ = shift;
+ unless (/^[-+]?\d+\s+$/) { $_ = $$self{indent} }
+ push (@{ $$self{INDENTS} }, $$self{MARGIN});
+ $$self{MARGIN} += ($_ + 0);
+}
+
+# End a list.
+sub cmd_back {
+ my $self = shift;
+ $$self{MARGIN} = pop @{ $$self{INDENTS} };
+ unless (defined $$self{MARGIN}) {
+ carp "Unmatched =back";
+ $$self{MARGIN} = $$self{indent};
+ }
+}
+
+# An individual list item.
+sub cmd_item {
+ my $self = shift;
+ if (defined $$self{ITEM}) { $self->item }
+ local $_ = shift;
+ s/\s+$//;
+ $$self{ITEM} = $self->interpolate ($_);
+}
+
+# Begin a block for a particular translator. Setting VERBATIM triggers
+# special handling in textblock().
+sub cmd_begin {
+ my $self = shift;
+ local $_ = shift;
+ my ($kind) = /^(\S+)/ or return;
+ if ($kind eq 'text') {
+ $$self{VERBATIM} = 1;
+ } else {
+ $$self{EXCLUDE} = 1;
+ }
+}
+
+# End a block for a particular translator. We assume that all =begin/=end
+# pairs are properly closed.
+sub cmd_end {
+ my $self = shift;
+ $$self{EXCLUDE} = 0;
+ $$self{VERBATIM} = 0;
+}
+
+# One paragraph for a particular translator. Ignore it unless it's intended
+# for text, in which case we treat it as a verbatim text block.
+sub cmd_for {
+ my $self = shift;
+ local $_ = shift;
+ my $line = shift;
+ return unless s/^text\b[ \t]*\n?//;
+ $self->verbatim ($_, $line);
+}
+
+
+############################################################################
+# Interior sequences
+############################################################################
+
+# The simple formatting ones. These are here mostly so that subclasses can
+# override them and do more complicated things.
+sub seq_b { return $_[0]{alt} ? "``$_[1]''" : $_[1] }
+sub seq_c { return $_[0]{alt} ? "``$_[1]''" : "`$_[1]'" }
+sub seq_f { return $_[0]{alt} ? "\"$_[1]\"" : $_[1] }
+sub seq_i { return '*' . $_[1] . '*' }
+
+# The complicated one. Handle links. Since this is plain text, we can't
+# actually make any real links, so this is all to figure out what text we
+# print out.
+sub seq_l {
+ my $self = shift;
+ local $_ = shift;
+
+ # Smash whitespace in case we were split across multiple lines.
+ s/\s+/ /g;
+
+ # If we were given any explicit text, just output it.
+ if (/^([^|]+)\|/) { return $1 }
+
+ # Okay, leading and trailing whitespace isn't important; get rid of it.
+ s/^\s+//;
+ s/\s+$//;
+
+ # Default to using the whole content of the link entry as a section
+ # name. Note that L<manpage/> forces a manpage interpretation, as does
+ # something looking like L<manpage(section)>. The latter is an
+ # enhancement over the original Pod::Text.
+ my ($manpage, $section) = ('', $_);
+ if (/^"\s*(.*?)\s*"$/) {
+ $section = '"' . $1 . '"';
+ } elsif (m/^[-:.\w]+(?:\(\S+\))?$/) {
+ ($manpage, $section) = ($_, '');
+ } elsif (m%/%) {
+ ($manpage, $section) = split (/\s*\/\s*/, $_, 2);
+ }
+
+ # Now build the actual output text.
+ my $text = '';
+ if (!length $section) {
+ $text = "the $manpage manpage" if length $manpage;
+ } elsif ($section =~ /^[:\w]+(?:\(\))?/) {
+ $text .= 'the ' . $section . ' entry';
+ $text .= (length $manpage) ? " in the $manpage manpage"
+ : " elsewhere in this document";
+ } else {
+ $section =~ s/^\"\s*//;
+ $section =~ s/\s*\"$//;
+ $text .= 'the section on "' . $section . '"';
+ $text .= " in the $manpage manpage" if length $manpage;
+ }
+ $text;
+}
+
+
+############################################################################
+# List handling
+############################################################################
+
+# This method is called whenever an =item command is complete (in other
+# words, we've seen its associated paragraph or know for certain that it
+# doesn't have one). It gets the paragraph associated with the item as an
+# argument. If that argument is empty, just output the item tag; if it
+# contains a newline, output the item tag followed by the newline.
+# Otherwise, see if there's enough room for us to output the item tag in the
+# margin of the text or if we have to put it on a separate line.
+sub item {
+ my $self = shift;
+ local $_ = shift;
+ my $tag = $$self{ITEM};
+ unless (defined $tag) {
+ carp "item called without tag";
+ return;
+ }
+ undef $$self{ITEM};
+ my $indent = $$self{INDENTS}[-1];
+ unless (defined $indent) { $indent = $$self{indent} }
+ my $space = ' ' x $indent;
+ $space =~ s/^ /:/ if $$self{alt};
+ if (!$_ || /^\s+$/ || ($$self{MARGIN} - $indent < length ($tag) + 1)) {
+ my $margin = $$self{MARGIN};
+ $$self{MARGIN} = $indent;
+ my $output = $self->reformat ($tag);
+ $output =~ s/\n*$/\n/;
+ $self->output ($output);
+ $$self{MARGIN} = $margin;
+ $self->output ($self->reformat ($_)) if /\S/;
+ } else {
+ $_ = $self->reformat ($_);
+ s/^ /:/ if ($$self{alt} && $indent > 0);
+ my $tagspace = ' ' x length $tag;
+ s/^($space)$tagspace/$1$tag/ or warn "Bizarre space in item";
+ $self->output ($_);
+ }
+}
+
+
+############################################################################
+# Output formatting
+############################################################################
+
+# Wrap a line, indenting by the current left margin. We can't use
+# Text::Wrap because it plays games with tabs. We can't use formline, even
+# though we'd really like to, because it screws up non-printing characters.
+# So we have to do the wrapping ourselves.
+sub wrap {
+ my $self = shift;
+ local $_ = shift;
+ my $output = '';
+ my $spaces = ' ' x $$self{MARGIN};
+ my $width = $$self{width} - $$self{MARGIN};
+ while (length > $width) {
+ if (s/^([^\n]{0,$width})\s+// || s/^([^\n]{$width})//) {
+ $output .= $spaces . $1 . "\n";
+ } else {
+ last;
+ }
+ }
+ $output .= $spaces . $_;
+ $output =~ s/\s+$/\n\n/;
+ $output;
+}
+
+# Reformat a paragraph of text for the current margin. Takes the text to
+# reformat and returns the formatted text.
+sub reformat {
+ my $self = shift;
+ local $_ = shift;
+
+ # If we're trying to preserve two spaces after sentences, do some
+ # munging to support that. Otherwise, smash all repeated whitespace.
+ if ($$self{sentence}) {
+ s/ +$//mg;
+ s/\.\n/. \n/g;
+ s/\n/ /g;
+ s/ +/ /g;
+ } else {
+ s/\s+/ /g;
+ }
+ $self->wrap ($_);
+}
+
+# Output text to the output device.
+sub output { $_[1] =~ tr/\01/ /; print { $_[0]->output_handle } $_[1] }
+
+
+############################################################################
+# Backwards compatibility
+############################################################################
+
+# The old Pod::Text module did everything in a pod2text() function. This
+# tries to provide the same interface for legacy applications.
+sub pod2text {
+ my @args;
+
+ # This is really ugly; I hate doing option parsing in the middle of a
+ # module. But the old Pod::Text module supported passing flags to its
+ # entry function, so handle -a and -<number>.
+ while ($_[0] =~ /^-/) {
+ my $flag = shift;
+ if ($flag eq '-a') { push (@args, alt => 1) }
+ elsif ($flag =~ /^-(\d+)$/) { push (@args, width => $1) }
+ else {
+ unshift (@_, $flag);
+ last;
+ }
+ }
+
+ # Now that we know what arguments we're using, create the parser.
+ my $parser = Pod::PlainText->new (@args);
+
+ # If two arguments were given, the second argument is going to be a file
+ # handle. That means we want to call parse_from_filehandle(), which
+ # means we need to turn the first argument into a file handle. Magic
+ # open will handle the <&STDIN case automagically.
+ if (defined $_[1]) {
+ local *IN;
+ unless (open (IN, $_[0])) {
+ croak ("Can't open $_[0] for reading: $!\n");
+ return;
+ }
+ $_[0] = \*IN;
+ return $parser->parse_from_filehandle (@_);
+ } else {
+ return $parser->parse_from_file (@_);
+ }
+}
+
+
+############################################################################
+# Module return value and documentation
+############################################################################
+
+1;
+__END__
+
+=head1 NAME
+
+Pod::PlainText - Convert POD data to formatted ASCII text
+
+=head1 SYNOPSIS
+
+ use Pod::PlainText;
+ my $parser = Pod::PlainText->new (sentence => 0, width => 78);
+
+ # Read POD from STDIN and write to STDOUT.
+ $parser->parse_from_filehandle;
+
+ # Read POD from file.pod and write to file.txt.
+ $parser->parse_from_file ('file.pod', 'file.txt');
+
+=head1 DESCRIPTION
+
+Pod::PlainText is a module that can convert documentation in the POD format (the
+preferred language for documenting Perl) into formatted ASCII. It uses no
+special formatting controls or codes whatsoever, and its output is therefore
+suitable for nearly any device.
+
+As a derived class from Pod::Parser, Pod::PlainText supports the same methods and
+interfaces. See L<Pod::Parser> for all the details; briefly, one creates a
+new parser with C<Pod::PlainText-E<gt>new()> and then calls either
+parse_from_filehandle() or parse_from_file().
+
+new() can take options, in the form of key/value pairs, that control the
+behavior of the parser. The currently recognized options are:
+
+=over 4
+
+=item alt
+
+If set to a true value, selects an alternate output format that, among other
+things, uses a different heading style and marks C<=item> entries with a
+colon in the left margin. Defaults to false.
+
+=item indent
+
+The number of spaces to indent regular text, and the default indentation for
+C<=over> blocks. Defaults to 4.
+
+=item loose
+
+If set to a true value, a blank line is printed after a C<=head1> heading.
+If set to false (the default), no blank line is printed after C<=head1>,
+although one is still printed after C<=head2>. This is the default because
+it's the expected formatting for manual pages; if you're formatting
+arbitrary text documents, setting this to true may result in more pleasing
+output.
+
+=item sentence
+
+If set to a true value, Pod::PlainText will assume that each sentence ends in two
+spaces, and will try to preserve that spacing. If set to false, all
+consecutive whitespace in non-verbatim paragraphs is compressed into a
+single space. Defaults to true.
+
+=item width
+
+The column at which to wrap text on the right-hand side. Defaults to 76.
+
+=back
+
+The standard Pod::Parser method parse_from_filehandle() takes up to two
+arguments, the first being the file handle to read POD from and the second
+being the file handle to write the formatted output to. The first defaults
+to STDIN if not given, and the second defaults to STDOUT. The method
+parse_from_file() is almost identical, except that its two arguments are the
+input and output disk files instead. See L<Pod::Parser> for the specific
+details.
+
+=head1 DIAGNOSTICS
+
+=over 4
+
+=item Bizarre space in item
+
+(W) Something has gone wrong in internal C<=item> processing. This message
+indicates a bug in Pod::PlainText; you should never see it.
+
+=item Can't open %s for reading: %s
+
+(F) Pod::PlainText was invoked via the compatibility mode pod2text() interface
+and the input file it was given could not be opened.
+
+=item Unknown escape: %s
+
+(W) The POD source contained an C<EE<lt>E<gt>> escape that Pod::PlainText didn't
+know about.
+
+=item Unknown sequence: %s
+
+(W) The POD source contained a non-standard internal sequence (something of
+the form C<XE<lt>E<gt>>) that Pod::PlainText didn't know about.
+
+=item Unmatched =back
+
+(W) Pod::PlainText encountered a C<=back> command that didn't correspond to an
+C<=over> command.
+
+=back
+
+=head1 RESTRICTIONS
+
+Embedded Ctrl-As (octal 001) in the input will be mapped to spaces on
+output, due to an internal implementation detail.
+
+=head1 NOTES
+
+This is a replacement for an earlier Pod::Text module written by Tom
+Christiansen. It has a revamped interface, since it now uses Pod::Parser,
+but an interface roughly compatible with the old Pod::Text::pod2text()
+function is still available. Please change to the new calling convention,
+though.
+
+The original Pod::Text contained code to do formatting via termcap
+sequences, although it wasn't turned on by default and it was problematic to
+get it to work at all. This rewrite doesn't even try to do that, but a
+subclass of it does. Look for L<Pod::Text::Termcap|Pod::Text::Termcap>.
+
+=head1 SEE ALSO
+
+L<Pod::Parser|Pod::Parser>, L<Pod::Text::Termcap|Pod::Text::Termcap>,
+pod2text(1)
+
+=head1 AUTHOR
+
+Russ Allbery E<lt>[EMAIL PROTECTED]<gt>, based I<very> heavily on the
+original Pod::Text by Tom Christiansen E<lt>[EMAIL PROTECTED]<gt> and
+its conversion to Pod::Parser by Brad Appleton
+E<lt>[EMAIL PROTECTED]<gt>.
+
+=cut
==== //depot/maint-5.8/perl/lib/Pod/Usage.pm#3 (text) ====
Index: perl/lib/Pod/Usage.pm
--- perl/lib/Pod/Usage.pm#2~18080~ Sun Nov 3 21:23:04 2002
+++ perl/lib/Pod/Usage.pm Mon Dec 2 05:23:48 2002
@@ -506,7 +506,7 @@
and $opts{"-output"} == \*STDOUT )
{
## spit out the entire PODs. Might as well invoke perldoc
- my $progpath = File::Spec->catfile($Config{scriptdir}, "perldoc");
+ my $progpath = File::Spec->catfile($Config{bin}, "perldoc");
system($progpath, $opts{"-input"});
}
else {
==== //depot/maint-5.8/perl/lib/Pod/t/latex.t#2 (text) ====
Index: perl/lib/Pod/t/latex.t
--- perl/lib/Pod/t/latex.t#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/lib/Pod/t/latex.t Mon Dec 2 05:23:48 2002
@@ -142,11 +142,11 @@
-Standard link: the \emph{Pod::LaTeX} manpage.
+Standard link: \emph{Pod::LaTeX}.
-Now refer to an external section: the section on \textsf{sec} in the
\emph{Pod::LaTeX} manpage
+Now refer to an external section: \textsf{sec} in \emph{Pod::LaTeX}
\section{Lists\label{Lists}\index{Lists}}
==== //depot/maint-5.8/perl/lib/Pod/t/utils.t#2 (text) ====
Index: perl/lib/Pod/t/utils.t
--- perl/lib/Pod/t/utils.t#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/lib/Pod/t/utils.t Mon Dec 2 05:23:48 2002
@@ -27,11 +27,11 @@
};
my @results = (
- "the P<name> manpage",
- "the Q<ident> entry in the P<name> manpage",
- "the section on Q<sec> in the P<name> manpage",
- "the section on Q<sec> elsewhere in this document",
- "the section on Q<sec> elsewhere in this document",
+ "P<name>",
+ "Q<ident> in P<name>",
+ "Q<sec> in P<name>",
+ "Q<sec>",
+ "Q<sec>",
"Q<http://www.perl.org/>",
"Q<text>",
"Q<text>",
==== //depot/maint-5.8/perl/lib/charnames.pm#4 (text) ====
Index: perl/lib/charnames.pm
--- perl/lib/charnames.pm#3~18095~ Mon Nov 4 09:45:47 2002
+++ perl/lib/charnames.pm Mon Dec 2 05:23:48 2002
@@ -6,7 +6,7 @@
our $VERSION = '1.02';
use bytes (); # for $bytes::hint_bits
-$charnames::hint_bits = 0x20000;
+$charnames::hint_bits = 0x20000; # HINT_LOCALIZE_HH
my %alias1 = (
# Icky 3.2 names with parentheses.
==== //depot/maint-5.8/perl/lib/filetest.pm#3 (text) ====
Index: perl/lib/filetest.pm
--- perl/lib/filetest.pm#2~18080~ Sun Nov 3 21:23:04 2002
+++ perl/lib/filetest.pm Mon Dec 2 05:23:48 2002
@@ -50,7 +50,7 @@
=cut
-$filetest::hint_bits = 0x00400000;
+$filetest::hint_bits = 0x00400000; # HINT_FILETEST_ACCESS
sub import {
if ( $_[1] eq 'access' ) {
==== //depot/maint-5.8/perl/lib/open.pm#3 (text) ====
Index: perl/lib/open.pm
--- perl/lib/open.pm#2~18173~ Fri Nov 22 18:02:33 2002
+++ perl/lib/open.pm Mon Dec 2 05:23:48 2002
@@ -1,7 +1,7 @@
package open;
use warnings;
use Carp;
-$open::hint_bits = 0x20000;
+$open::hint_bits = 0x20000; # HINT_LOCALIZE_HH
our $VERSION = '1.01';
==== //depot/maint-5.8/perl/lib/overload.pm#2 (text) ====
Index: perl/lib/overload.pm
--- perl/lib/overload.pm#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/lib/overload.pm Mon Dec 2 05:23:48 2002
@@ -2,7 +2,7 @@
our $VERSION = '1.00';
-$overload::hint_bits = 0x20000;
+$overload::hint_bits = 0x20000; # HINT_LOCALIZE_HH
sub nil {}
@@ -108,11 +108,11 @@
}
%constants = (
- 'integer' => 0x1000,
- 'float' => 0x2000,
- 'binary' => 0x4000,
- 'q' => 0x8000,
- 'qr' => 0x10000,
+ 'integer' => 0x1000, # HINT_NEW_INTEGER
+ 'float' => 0x2000, # HINT_NEW_FLOAT
+ 'binary' => 0x4000, # HINT_NEW_BINARY
+ 'q' => 0x8000, # HINT_NEW_STRING
+ 'qr' => 0x10000, # HINT_NEW_RE
);
%ops = ( with_assign => "+ - * / % ** << >> x .",
==== //depot/maint-5.8/perl/lib/vmsish.pm#2 (text) ====
Index: perl/lib/vmsish.pm
--- perl/lib/vmsish.pm#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/lib/vmsish.pm Mon Dec 2 05:23:48 2002
@@ -117,6 +117,8 @@
my $bits = 0;
my $sememe;
foreach $sememe (@_) {
+ # Those hints are defined in vms/vmsish.h :
+ # HINT_M_VMSISH_STATUS and HINT_M_VMSISH_TIME
$bits |= 0x40000000, next if $sememe eq 'status' || $sememe eq '$?';
$bits |= 0x80000000, next if $sememe eq 'time';
}
==== //depot/maint-5.8/perl/perl.h#8 (text) ====
Index: perl/perl.h
--- perl/perl.h#7~18208~ Thu Nov 28 08:57:01 2002
+++ perl/perl.h Mon Dec 2 05:23:48 2002
@@ -3253,17 +3253,19 @@
/* Note: the lowest 8 bits are reserved for
stuffing into op->op_private */
#define HINT_PRIVATE_MASK 0x000000ff
-#define HINT_INTEGER 0x00000001
-#define HINT_STRICT_REFS 0x00000002
-#define HINT_LOCALE 0x00000004
-#define HINT_BYTES 0x00000008
+#define HINT_INTEGER 0x00000001 /* integer pragma */
+#define HINT_STRICT_REFS 0x00000002 /* strict pragma */
+#define HINT_LOCALE 0x00000004 /* locale pragma */
+#define HINT_BYTES 0x00000008 /* bytes pragma */
/* #define HINT_notused10 0x00000010 */
/* Note: 20,40,80 used for NATIVE_HINTS */
+ /* currently defined by vms/vmsish.h */
#define HINT_BLOCK_SCOPE 0x00000100
-#define HINT_STRICT_SUBS 0x00000200
-#define HINT_STRICT_VARS 0x00000400
+#define HINT_STRICT_SUBS 0x00000200 /* strict pragma */
+#define HINT_STRICT_VARS 0x00000400 /* strict pragma */
+/* The HINT_NEW_* constants are used by the overload pragma */
#define HINT_NEW_INTEGER 0x00001000
#define HINT_NEW_FLOAT 0x00002000
#define HINT_NEW_BINARY 0x00004000
@@ -3271,12 +3273,13 @@
#define HINT_NEW_RE 0x00010000
#define HINT_LOCALIZE_HH 0x00020000 /* %^H needs to be copied */
-#define HINT_RE_TAINT 0x00100000
-#define HINT_RE_EVAL 0x00200000
+#define HINT_RE_TAINT 0x00100000 /* re pragma */
+#define HINT_RE_EVAL 0x00200000 /* re pragma */
-#define HINT_FILETEST_ACCESS 0x00400000
-#define HINT_UTF8 0x00800000
+#define HINT_FILETEST_ACCESS 0x00400000 /* filetest pragma */
+#define HINT_UTF8 0x00800000 /* utf8 pragma */
+/* The following are stored in $sort::hints, not in PL_hints */
#define HINT_SORT_SORT_BITS 0x000000FF /* allow 256 different ones */
#define HINT_SORT_QUICKSORT 0x00000001
#define HINT_SORT_MERGESORT 0x00000002
==== //depot/maint-5.8/perl/pod/podselect.PL#2 (text) ====
Index: perl/pod/podselect.PL
--- perl/pod/podselect.PL#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/pod/podselect.PL Mon Dec 2 05:23:48 2002
@@ -72,7 +72,7 @@
=item B<-section>S< >I<section-spec>
Specify a section to include in the output.
-See L<Pod::Select/"SECTION SPECIFICATIONS">
+See L<Pod::Parser/"SECTION SPECIFICATIONS">
for the format to use for I<section-spec>.
This option may be given multiple times on the command line.
==== //depot/maint-5.8/perl/t/pod/emptycmd.t#2 (xtext) ====
Index: perl/t/pod/emptycmd.t
--- perl/t/pod/emptycmd.t#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/t/pod/emptycmd.t Mon Dec 2 05:23:48 2002
@@ -1,7 +1,7 @@
BEGIN {
- chdir 't' if -d 't';
- unshift @INC, '../lib';
- unshift @INC, './pod';
+ use File::Basename;
+ my $THISDIR = dirname $0;
+ unshift @INC, $THISDIR;
require "testp2pt.pl";
import TestPodIncPlainText;
}
==== //depot/maint-5.8/perl/t/pod/for.t#2 (xtext) ====
Index: perl/t/pod/for.t
--- perl/t/pod/for.t#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/t/pod/for.t Mon Dec 2 05:23:48 2002
@@ -1,7 +1,7 @@
BEGIN {
- chdir 't' if -d 't';
- unshift @INC, '../lib';
- unshift @INC, './pod';
+ use File::Basename;
+ my $THISDIR = dirname $0;
+ unshift @INC, $THISDIR;
require "testp2pt.pl";
import TestPodIncPlainText;
}
==== //depot/maint-5.8/perl/t/pod/headings.t#2 (xtext) ====
Index: perl/t/pod/headings.t
--- perl/t/pod/headings.t#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/t/pod/headings.t Mon Dec 2 05:23:48 2002
@@ -1,7 +1,7 @@
BEGIN {
- chdir 't' if -d 't';
- unshift @INC, '../lib';
- unshift @INC, './pod';
+ use File::Basename;
+ my $THISDIR = dirname $0;
+ unshift @INC, $THISDIR;
require "testp2pt.pl";
import TestPodIncPlainText;
}
==== //depot/maint-5.8/perl/t/pod/include.t#2 (xtext) ====
Index: perl/t/pod/include.t
--- perl/t/pod/include.t#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/t/pod/include.t Mon Dec 2 05:23:48 2002
@@ -1,7 +1,7 @@
BEGIN {
- chdir 't' if -d 't';
- unshift @INC, '../lib';
- unshift @INC, './pod';
+ use File::Basename;
+ my $THISDIR = dirname $0;
+ unshift @INC, $THISDIR;
require "testp2pt.pl";
import TestPodIncPlainText;
}
==== //depot/maint-5.8/perl/t/pod/included.t#2 (xtext) ====
Index: perl/t/pod/included.t
--- perl/t/pod/included.t#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/t/pod/included.t Mon Dec 2 05:23:48 2002
@@ -1,7 +1,7 @@
BEGIN {
- chdir 't' if -d 't';
- unshift @INC, '../lib';
- unshift @INC, './pod';
+ use File::Basename;
+ my $THISDIR = dirname $0;
+ unshift @INC, $THISDIR;
require "testp2pt.pl";
import TestPodIncPlainText;
}
==== //depot/maint-5.8/perl/t/pod/lref.t#2 (xtext) ====
Index: perl/t/pod/lref.t
--- perl/t/pod/lref.t#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/t/pod/lref.t Mon Dec 2 05:23:48 2002
@@ -1,7 +1,7 @@
BEGIN {
- chdir 't' if -d 't';
- unshift @INC, '../lib';
- unshift @INC, './pod';
+ use File::Basename;
+ my $THISDIR = dirname $0;
+ unshift @INC, $THISDIR;
require "testp2pt.pl";
import TestPodIncPlainText;
}
==== //depot/maint-5.8/perl/t/pod/lref.xr#2 (text) ====
Index: perl/t/pod/lref.xr
--- perl/t/pod/lref.xr#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/t/pod/lref.xr Mon Dec 2 05:23:48 2002
@@ -1,22 +1,22 @@
Try out *LOTS* of different ways of specifying references:
- Reference the "section" in manpage
+ Reference the the section entry in the manpage manpage
- Reference the "section" in manpage
+ Reference the the section entry in the manpage manpage
- Reference the "section" in manpage
+ Reference the the section entry in the manpage manpage
- Reference the "section" in manpage
+ Reference the the section entry in the manpage manpage
- Reference the "manpage/section"
+ Reference the the section on "manpage/section"
- Reference the "section" in "manpage"
+ Reference the the section entry in the "manpage" manpage
- Reference the "section" in manpage
+ Reference the the section on "section" in the manpage manpage
- Reference the "section" in manpage
+ Reference the the section entry in the manpage manpage
- Reference the "section" in manpage
+ Reference the the section entry in the manpage manpage
Now try it using the new "|" stuff ...
==== //depot/maint-5.8/perl/t/pod/multiline_items.t#2 (xtext) ====
Index: perl/t/pod/multiline_items.t
--- perl/t/pod/multiline_items.t#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/t/pod/multiline_items.t Mon Dec 2 05:23:48 2002
@@ -1,7 +1,7 @@
BEGIN {
- chdir 't' if -d 't';
- unshift @INC, '../lib';
- unshift @INC, './pod';
+ use File::Basename;
+ my $THISDIR = dirname $0;
+ unshift @INC, $THISDIR;
require "testp2pt.pl";
import TestPodIncPlainText;
}
==== //depot/maint-5.8/perl/t/pod/multiline_items.xr#2 (text) ====
Index: perl/t/pod/multiline_items.xr
--- perl/t/pod/multiline_items.xr#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/t/pod/multiline_items.xr Mon Dec 2 05:23:48 2002
@@ -3,4 +3,3 @@
appropriately.
This is a test.
-
==== //depot/maint-5.8/perl/t/pod/nested_items.t#2 (xtext) ====
Index: perl/t/pod/nested_items.t
--- perl/t/pod/nested_items.t#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/t/pod/nested_items.t Mon Dec 2 05:23:48 2002
@@ -1,7 +1,7 @@
BEGIN {
- chdir 't' if -d 't';
- unshift @INC, '../lib';
- unshift @INC, './pod';
+ use File::Basename;
+ my $THISDIR = dirname $0;
+ unshift @INC, $THISDIR;
require "testp2pt.pl";
import TestPodIncPlainText;
}
==== //depot/maint-5.8/perl/t/pod/nested_seqs.t#2 (xtext) ====
Index: perl/t/pod/nested_seqs.t
--- perl/t/pod/nested_seqs.t#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/t/pod/nested_seqs.t Mon Dec 2 05:23:48 2002
@@ -1,7 +1,7 @@
BEGIN {
- chdir 't' if -d 't';
- unshift @INC, '../lib';
- unshift @INC, './pod';
+ use File::Basename;
+ my $THISDIR = dirname $0;
+ unshift @INC, $THISDIR;
require "testp2pt.pl";
import TestPodIncPlainText;
}
==== //depot/maint-5.8/perl/t/pod/oneline_cmds.t#2 (xtext) ====
Index: perl/t/pod/oneline_cmds.t
--- perl/t/pod/oneline_cmds.t#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/t/pod/oneline_cmds.t Mon Dec 2 05:23:48 2002
@@ -1,7 +1,7 @@
BEGIN {
- chdir 't' if -d 't';
- unshift @INC, '../lib';
- unshift @INC, './pod';
+ use File::Basename;
+ my $THISDIR = dirname $0;
+ unshift @INC, $THISDIR;
require "testp2pt.pl";
import TestPodIncPlainText;
}
==== //depot/maint-5.8/perl/t/pod/pod2usage.t#2 (xtext) ====
Index: perl/t/pod/pod2usage.t
--- perl/t/pod/pod2usage.t#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/t/pod/pod2usage.t Mon Dec 2 05:23:48 2002
@@ -1,7 +1,7 @@
BEGIN {
- chdir 't' if -d 't';
- unshift @INC, '../lib';
- unshift @INC, './pod';
+ use File::Basename;
+ my $THISDIR = dirname $0;
+ unshift @INC, $THISDIR;
require "testp2pt.pl";
import TestPodIncPlainText;
}
==== //depot/maint-5.8/perl/t/pod/pod2usage.xr#2 (text) ====
Index: perl/t/pod/pod2usage.xr
--- perl/t/pod/pod2usage.xr#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/t/pod/pod2usage.xr Mon Dec 2 05:23:48 2002
@@ -41,10 +41,10 @@
specifed than standard input is read.
pod2usage invokes the pod2usage() function in the Pod::Usage module.
- Please see "pod2usage()" in Pod::Usage.
+ Please see the pod2usage() entry in the Pod::Usage manpage.
SEE ALSO
- Pod::Usage, pod2text(1)
+ the Pod::Usage manpage, the pod2text(1) manpage
AUTHOR
Brad Appleton <[EMAIL PROTECTED]>
==== //depot/maint-5.8/perl/t/pod/poderrs.t#2 (xtext) ====
Index: perl/t/pod/poderrs.t
--- perl/t/pod/poderrs.t#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/t/pod/poderrs.t Mon Dec 2 05:23:48 2002
@@ -1,7 +1,7 @@
BEGIN {
- chdir 't' if -d 't';
- unshift @INC, '../lib';
- unshift @INC, './pod';
+ use File::Basename;
+ my $THISDIR = dirname $0;
+ unshift @INC, $THISDIR;
require "testpchk.pl";
import TestPodChecker;
}
@@ -17,6 +17,7 @@
__END__
+=head2 This should cause a warning
=head1 NAME
@@ -177,7 +178,7 @@
blub is evil
-=head2 reoccurrence
+=head2 reoccurence
=over 4
@@ -192,6 +193,16 @@
=head2 another one
previous section is empty!
+
+=head1 LINK TESTS
+
+Due to bug reported by Rafael Garcia-Suarez "[EMAIL PROTECTED]":
+
+The following hyperlinks :
+L<"I/O Operators">
+L<perlop/"I/O Operators">
+trigger a podchecker warning (using bleadperl) :
+ node 'I/O Operators' contains non-escaped | or /
=cut
==== //depot/maint-5.8/perl/t/pod/poderrs.xr#2 (text) ====
Index: perl/t/pod/poderrs.xr
--- perl/t/pod/poderrs.xr#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/t/pod/poderrs.xr Mon Dec 2 05:23:48 2002
@@ -1,46 +1,49 @@
-*** ERROR: Unknown command 'unknown1' at line 25 in file t/pod/poderrs.t
-*** ERROR: Unknown interior-sequence 'Q' at line 29 in file t/pod/poderrs.t
-*** ERROR: Unknown interior-sequence 'A' at line 30 in file t/pod/poderrs.t
-*** ERROR: Unknown interior-sequence 'Y' at line 31 in file t/pod/poderrs.t
-*** ERROR: Unknown interior-sequence 'V' at line 31 in file t/pod/poderrs.t
-*** ERROR: unterminated B<...> at line 35 in file t/pod/poderrs.t
-*** ERROR: unterminated I<...> at line 34 in file t/pod/poderrs.t
-*** ERROR: unterminated C<...> at line 37 in file t/pod/poderrs.t
-*** WARNING: line containing nothing but whitespace in paragraph at line 45 in file
t/pod/poderrs.t
-*** ERROR: =item without previous =over at line 52 in file t/pod/poderrs.t
-*** ERROR: =back without previous =over at line 56 in file t/pod/poderrs.t
-*** ERROR: =over on line 60 without closing =back (at head2) at line 64 in file
t/pod/poderrs.t
-*** ERROR: =end without =begin at line 66 in file t/pod/poderrs.t
-*** ERROR: Nested =begin's (first at line 70:html) at line 72 in file t/pod/poderrs.t
-*** ERROR: =end without =begin at line 76 in file t/pod/poderrs.t
-*** ERROR: No argument for =begin at line 82 in file t/pod/poderrs.t
-*** ERROR: =for without formatter specification at line 88 in file t/pod/poderrs.t
-*** ERROR: nested commands C<...C<...>...> at line 94 in file t/pod/poderrs.t
-*** ERROR: garbled entity E<alea iacta est> at line 98 in file t/pod/poderrs.t
-*** ERROR: garbled entity E<C<auml>> at line 99 in file t/pod/poderrs.t
-*** ERROR: garbled entity E<abcI<bla>> at line 100 in file t/pod/poderrs.t
-*** ERROR: Entity number out of range E<0x100> at line 101 in file t/pod/poderrs.t
-*** ERROR: Entity number out of range E<07777> at line 102 in file t/pod/poderrs.t
-*** ERROR: Entity number out of range E<300> at line 103 in file t/pod/poderrs.t
-*** ERROR: malformed link L<> : empty link at line 115 in file t/pod/poderrs.t
-*** WARNING: ignoring leading whitespace in link at line 116 in file t/pod/poderrs.t
-*** WARNING: ignoring trailing whitespace in link at line 117 in file t/pod/poderrs.t
-*** WARNING: (section) in 'passwd(5)' deprecated at line 123 in file t/pod/poderrs.t
-*** WARNING: node '$|' contains non-escaped | or / at line 124 in file t/pod/poderrs.t
-*** WARNING: alternative text '$|' contains non-escaped | or / at line 124 in file
t/pod/poderrs.t
-*** ERROR: Spurious character(s) after =back at line 130 in file t/pod/poderrs.t
-*** ERROR: Nonempty Z<> at line 144 in file t/pod/poderrs.t
-*** ERROR: Empty X<> at line 146 in file t/pod/poderrs.t
-*** WARNING: preceding non-item paragraph(s) at line 152 in file t/pod/poderrs.t
-*** WARNING: No argument for =item at line 154 in file t/pod/poderrs.t
-*** WARNING: previous =item has no contents at line 156 in file t/pod/poderrs.t
-*** WARNING: No items in =over (at line 164) / =back list at line 166 in file
t/pod/poderrs.t
-*** ERROR: Spurious text after =pod at line 172 in file t/pod/poderrs.t
-*** ERROR: Spurious text after =cut at line 176 in file t/pod/poderrs.t
-*** WARNING: empty section in previous paragraph at line 192 in file t/pod/poderrs.t
-*** ERROR: unresolved internal link 'begin or begin' at line 107 in file
t/pod/poderrs.t
-*** ERROR: unresolved internal link 'end with begin' at line 108 in file
t/pod/poderrs.t
-*** ERROR: unresolved internal link 'OoPs' at line 109 in file t/pod/poderrs.t
-*** ERROR: unresolved internal link 'abc def' at line 113 in file t/pod/poderrs.t
+*** WARNING: =head2 without preceding higher level at line 20 in file t/pod/poderrs.t
+*** WARNING: empty section in previous paragraph at line 22 in file t/pod/poderrs.t
+*** ERROR: Unknown command 'unknown1' at line 26 in file t/pod/poderrs.t
+*** ERROR: Unknown interior-sequence 'Q' at line 30 in file t/pod/poderrs.t
+*** ERROR: Unknown interior-sequence 'A' at line 31 in file t/pod/poderrs.t
+*** ERROR: Unknown interior-sequence 'Y' at line 32 in file t/pod/poderrs.t
+*** ERROR: Unknown interior-sequence 'V' at line 32 in file t/pod/poderrs.t
+*** ERROR: unterminated B<...> at line 36 in file t/pod/poderrs.t
+*** ERROR: unterminated I<...> at line 35 in file t/pod/poderrs.t
+*** ERROR: unterminated C<...> at line 38 in file t/pod/poderrs.t
+*** WARNING: line containing nothing but whitespace in paragraph at line 46 in file
+t/pod/poderrs.t
+*** ERROR: =item without previous =over at line 53 in file t/pod/poderrs.t
+*** ERROR: =back without previous =over at line 57 in file t/pod/poderrs.t
+*** ERROR: =over on line 61 without closing =back (at head2) at line 65 in file
+t/pod/poderrs.t
+*** ERROR: =end without =begin at line 67 in file t/pod/poderrs.t
+*** ERROR: Nested =begin's (first at line 71:html) at line 73 in file t/pod/poderrs.t
+*** ERROR: =end without =begin at line 77 in file t/pod/poderrs.t
+*** ERROR: No argument for =begin at line 83 in file t/pod/poderrs.t
+*** ERROR: =for without formatter specification at line 89 in file t/pod/poderrs.t
+*** ERROR: nested commands C<...C<...>...> at line 95 in file t/pod/poderrs.t
+*** ERROR: garbled entity E<alea iacta est> at line 99 in file t/pod/poderrs.t
+*** ERROR: garbled entity E<C<auml>> at line 100 in file t/pod/poderrs.t
+*** ERROR: garbled entity E<abcI<bla>> at line 101 in file t/pod/poderrs.t
+*** ERROR: Entity number out of range E<0x100> at line 102 in file t/pod/poderrs.t
+*** ERROR: Entity number out of range E<07777> at line 103 in file t/pod/poderrs.t
+*** ERROR: Entity number out of range E<300> at line 104 in file t/pod/poderrs.t
+*** ERROR: malformed link L<> : empty link at line 116 in file t/pod/poderrs.t
+*** WARNING: ignoring leading whitespace in link at line 117 in file t/pod/poderrs.t
+*** WARNING: ignoring trailing whitespace in link at line 118 in file t/pod/poderrs.t
+*** WARNING: (section) in 'passwd(5)' deprecated at line 124 in file t/pod/poderrs.t
+*** WARNING: node '$|' contains non-escaped | or / at line 125 in file t/pod/poderrs.t
+*** WARNING: alternative text '$|' contains non-escaped | or / at line 125 in file
+t/pod/poderrs.t
+*** ERROR: Spurious character(s) after =back at line 131 in file t/pod/poderrs.t
+*** ERROR: Nonempty Z<> at line 145 in file t/pod/poderrs.t
+*** ERROR: Empty X<> at line 147 in file t/pod/poderrs.t
+*** WARNING: preceding non-item paragraph(s) at line 153 in file t/pod/poderrs.t
+*** WARNING: No argument for =item at line 155 in file t/pod/poderrs.t
+*** WARNING: previous =item has no contents at line 157 in file t/pod/poderrs.t
+*** WARNING: No items in =over (at line 165) / =back list at line 167 in file
+t/pod/poderrs.t
+*** ERROR: Spurious text after =pod at line 173 in file t/pod/poderrs.t
+*** ERROR: Spurious text after =cut at line 177 in file t/pod/poderrs.t
+*** WARNING: empty section in previous paragraph at line 193 in file t/pod/poderrs.t
+*** ERROR: unresolved internal link 'begin or begin' at line 108 in file
+t/pod/poderrs.t
+*** ERROR: unresolved internal link 'end with begin' at line 109 in file
+t/pod/poderrs.t
+*** ERROR: unresolved internal link 'OoPs' at line 110 in file t/pod/poderrs.t
+*** ERROR: unresolved internal link 'abc def' at line 114 in file t/pod/poderrs.t
+*** ERROR: unresolved internal link 'I/O Operators' at line 202 in file
+t/pod/poderrs.t
*** WARNING: multiple occurrence of link target 'Misc' at line - in file
t/pod/poderrs.t
-t/pod/poderrs.t has 33 pod syntax errors.
+t/pod/poderrs.t has 34 pod syntax errors.
==== //depot/maint-5.8/perl/t/pod/podselect.t#2 (xtext) ====
Index: perl/t/pod/podselect.t
--- perl/t/pod/podselect.t#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/t/pod/podselect.t Mon Dec 2 05:23:48 2002
@@ -1,7 +1,7 @@
BEGIN {
- chdir 't' if -d 't';
- unshift @INC, '../lib';
- unshift @INC, './pod';
+ use File::Basename;
+ my $THISDIR = dirname $0;
+ unshift @INC, $THISDIR;
require "testp2pt.pl";
import TestPodIncPlainText;
}
==== //depot/maint-5.8/perl/t/pod/podselect.xr#2 (text) ====
Index: perl/t/pod/podselect.xr
--- perl/t/pod/podselect.xr#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/t/pod/podselect.xr Mon Dec 2 05:23:48 2002
@@ -12,10 +12,10 @@
-man Print the manual page and exit.
-section *section-spec*
- Specify a section to include in the output. See "SECTION
- SPECIFICATIONS" in Pod::Select for the format to use for
- *section-spec*. This option may be given multiple times on the
- command line.
+ Specify a section to include in the output. See the section on
+ "SECTION SPECIFICATIONS" in the Pod::Parser manpage for the
+ format to use for *section-spec*. This option may be given
+ multiple times on the command line.
*file* The pathname of a file from which to select sections of pod
documentation (defaults to standard input).
@@ -27,10 +27,11 @@
are given than all pod sections encountered are output.
podselect invokes the podselect() function exported by Pod::Select
- Please see "podselect()" in Pod::Select for more details.
+ Please see the podselect() entry in the Pod::Select manpage for more
+ details.
SEE ALSO
- Pod::Parser and Pod::Select
+ the Pod::Parser manpage and the Pod::Select manpage
AUTHOR
Brad Appleton <[EMAIL PROTECTED]>
==== //depot/maint-5.8/perl/t/pod/special_seqs.t#2 (xtext) ====
Index: perl/t/pod/special_seqs.t
--- perl/t/pod/special_seqs.t#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/t/pod/special_seqs.t Mon Dec 2 05:23:48 2002
@@ -1,7 +1,7 @@
BEGIN {
- chdir 't' if -d 't';
- unshift @INC, '../lib';
- unshift @INC, './pod';
+ use File::Basename;
+ my $THISDIR = dirname $0;
+ unshift @INC, $THISDIR;
require "testp2pt.pl";
import TestPodIncPlainText;
}
==== //depot/maint-5.8/perl/t/pod/special_seqs.xr#2 (text) ====
Index: perl/t/pod/special_seqs.xr
--- perl/t/pod/special_seqs.xr#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/t/pod/special_seqs.xr Mon Dec 2 05:23:48 2002
@@ -1,4 +1,4 @@
- This is a test to see if I can do not only $self and `method()', but
+ This is a test to see if I can do not only `$self' and `method()', but
also `$self->method()' and `$self->{FIELDNAME}' and `$Foo <=> $Bar'
without resorting to escape sequences. If I want to refer to the
right-shift operator I can do something like `$x >> 3' or even `$y >>
@@ -13,7 +13,7 @@
Dont forget `$self->method()->{FIELDNAME} = {FOO=>BAR}'.
- And make sure that 0 works too!
+ And make sure that `0' works too!
Now, if I use << or >> as my delimiters, then I have to use whitespace.
So things like `<$self-'method()>> and `<$self-'{FIELDNAME}>> wont end
==== //depot/maint-5.8/perl/t/pod/testp2pt.pl#2 (text) ====
Index: perl/t/pod/testp2pt.pl
--- perl/t/pod/testp2pt.pl#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/t/pod/testp2pt.pl Mon Dec 2 05:23:48 2002
@@ -24,14 +24,8 @@
$MYPKG = eval { (caller)[0] };
@EXPORT = qw(&testpodplaintext);
BEGIN {
- if ( $] >= 5.005_58 ) {
- require Pod::Text;
- @ISA = qw( Pod::Text );
- }
- else {
- require Pod::PlainText;
- @ISA = qw( Pod::PlainText );
- }
+ require Pod::PlainText;
+ @ISA = qw( Pod::PlainText );
require VMS::Filespec if $^O eq 'VMS';
}
@@ -42,30 +36,15 @@
sub catfile(@) { File::Spec->catfile(@_); }
my $INSTDIR = abs_path(dirname $0);
-if ($^O eq 'VMS') { # clean up directory spec
- $INSTDIR = VMS::Filespec::unixpath($INSTDIR);
- $INSTDIR =~ s#/$##;
- $INSTDIR =~ s#/000000/#/#;
-}
-
-if ($^O eq 'VMS') {
- # File::Spec::VMS::splitdir doesn't work on Unix syntax filespecs, but
- # on VMS syntax filespecs dirname returns (as documented) the directory
- # part of the path (NOT the parent directory, as is assumed in this script).
- $INSTDIR = (dirname $INSTDIR) if (basename($INSTDIR) eq 'pod');
- $INSTDIR = (dirname $INSTDIR) if (basename($INSTDIR) eq 't');
-}
-else {
- $INSTDIR = (dirname $INSTDIR) if ((File::Spec->splitdir($INSTDIR))[-1] eq 'pod');
- $INSTDIR = (dirname $INSTDIR) if ((File::Spec->splitdir($INSTDIR))[-1] eq 't');
-}
-
+$INSTDIR = VMS::Filespec::unixpath($INSTDIR) if $^O eq 'VMS';
+$INSTDIR =~ s#/$## if $^O eq 'VMS';
+$INSTDIR = (dirname $INSTDIR) if (basename($INSTDIR) eq 'pod');
+$INSTDIR = (dirname $INSTDIR) if (basename($INSTDIR) eq 't');
my @PODINCDIRS = ( catfile($INSTDIR, 'lib', 'Pod'),
catfile($INSTDIR, 'scripts'),
catfile($INSTDIR, 'pod'),
catfile($INSTDIR, 't', 'pod')
);
-print "PODINCDIRS = ",join(', ',@PODINCDIRS),"\n";
## Find the path to the file to =include
sub findinclude {
@@ -121,7 +100,7 @@
sub podinc2plaintext( $ $ ) {
my ($infile, $outfile) = @_;
local $_;
- my $text_parser = $MYPKG->new(quotes => "`'");
+ my $text_parser = $MYPKG->new;
$text_parser->parse_from_file($infile, $outfile);
}
@@ -167,7 +146,7 @@
for $podfile (@testpods) {
($testname, $_) = fileparse($podfile);
$testdir ||= $_;
- $testname =~ s/\..*$//;
+ $testname =~ s/\.t$//;
$cmpfile = $testdir . $testname . '.xr';
$outfile = $testdir . $testname . '.OUT';
End of Patch.
