summaryrefslogtreecommitdiff
path: root/lib/Pod
diff options
context:
space:
mode:
authorJarkko Hietaniemi <jhi@iki.fi>2001-02-15 13:51:16 +0000
committerJarkko Hietaniemi <jhi@iki.fi>2001-02-15 13:51:16 +0000
commit16ba52cf04376a6afd806dc9ac35d10e783fbbd1 (patch)
tree5d117c16e59eb656ecb1392c4f3c14edbc723b99 /lib/Pod
parent5063f371507cfa5b5bcf491d5e6dd63320bd1fdf (diff)
downloadperl-16ba52cf04376a6afd806dc9ac35d10e783fbbd1.tar.gz
Integrate changes #8659,8702,8808,8809,8810 from maintperl.
Subject: [PATCH 5.6.1-TRIAL? and 5.7.?] perldoc uses unescaped backslashes in filenames From: Jan Dubois <JanD@ActiveState.com> Date: Wed, 31 Jan 2001 21:17:03 -0800 Message-ID: <8qrh7t069jt32m98sap53l9dfoge0vjrle@4ax.com> tweak change#8659 to keep it simple Subject: [PATCH 5.6.1-TRIAL2] perldoc.PL using install directories From: Russ Allbery <rra@stanford.edu> Date: 14 Feb 2001 10:15:41 -0800 Message-ID: <ylzofpf7w2.fsf@windlord.stanford.edu> (8809 empty) Upgrade to podlators 1.08, from Russ Allbery. p4raw-link: @8810 on //depot/maint-5.6/perl: 7c65f0d950b7573697d3a2b13bac2a2d735b5d12 p4raw-link: @8809 on //depot/maint-5.6/perl: ae8e9c66e6b22648f62fa11b710adc72c14d41b3 p4raw-link: @8808 on //depot/maint-5.6/perl: 29ccf9fef653725d9c585ded9e407a99bf4dd055 p4raw-link: @8702 on //depot/maint-5.6/perl: 09b7bf3bd289c6fbe48f56ca8eba6fc55af583dd p4raw-link: @8659 on //depot/maint-5.6/perl: 0afa9c6889acca50d837d7aa71ecf0291ac457a6 p4raw-id: //depot/perl@8811 p4raw-integrated: from //depot/maint-5.6/perl@8807 'copy in' lib/Pod/Text.pm (@8175..) lib/Pod/Man.pm (@8621..) utils/perldoc.PL (@8702..) 'ignore' lib/Test/Harness.pm (@7846..)
Diffstat (limited to 'lib/Pod')
-rw-r--r--lib/Pod/Man.pm8
-rw-r--r--lib/Pod/Text.pm10
2 files changed, 13 insertions, 5 deletions
diff --git a/lib/Pod/Man.pm b/lib/Pod/Man.pm
index 2c61a9b233..31036826b9 100644
--- a/lib/Pod/Man.pm
+++ b/lib/Pod/Man.pm
@@ -1,5 +1,5 @@
# Pod::Man -- Convert POD data to formatted *roff input.
-# $Id: Man.pm,v 1.14 2001/01/16 13:39:45 eagle Exp $
+# $Id: Man.pm,v 1.15 2001/02/10 06:50:22 eagle Exp $
#
# Copyright 1999, 2000, 2001 by Russ Allbery <rra@stanford.edu>
#
@@ -38,7 +38,7 @@ use vars qw(@ISA %ESCAPES $PREAMBLE $VERSION);
# Perl core and too many things could munge CVS magic revision strings.
# This number should ideally be the same as the CVS revision in podlators,
# however.
-$VERSION = 1.14;
+$VERSION = 1.15;
############################################################################
@@ -806,6 +806,10 @@ sub buildlink {
s/^\s+//;
s/\s+$//;
+ # If the argument looks like a URL, return it verbatim. This only
+ # handles URLs that use the server syntax.
+ if (m%^[a-z]+://\S+$%) { return $_ }
+
# 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)>. Do the same thing to
diff --git a/lib/Pod/Text.pm b/lib/Pod/Text.pm
index 5f2dae049a..9936025101 100644
--- a/lib/Pod/Text.pm
+++ b/lib/Pod/Text.pm
@@ -1,7 +1,7 @@
# Pod::Text -- Convert POD data to formatted ASCII text.
-# $Id: Text.pm,v 2.7 2000/11/19 04:47:50 eagle Exp $
+# $Id: Text.pm,v 2.8 2001/02/10 06:50:23 eagle Exp $
#
-# Copyright 1999, 2000 by Russ Allbery <rra@stanford.edu>
+# Copyright 1999, 2000, 2001 by Russ Allbery <rra@stanford.edu>
#
# This program is free software; you can redistribute it and/or modify it
# under the same terms as Perl itself.
@@ -37,7 +37,7 @@ use vars qw(@ISA @EXPORT %ESCAPES $VERSION);
# Perl core and too many things could munge CVS magic revision strings.
# This number should ideally be the same as the CVS revision in podlators,
# however.
-$VERSION = 2.07;
+$VERSION = 2.08;
############################################################################
@@ -492,6 +492,10 @@ sub seq_l {
s/^\s+//;
s/\s+$//;
+ # If the argument looks like a URL, return it verbatim. This only
+ # handles URLs that use the server syntax.
+ if (m%^[a-z]+://\S+$%) { return $_ }
+
# 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