summaryrefslogtreecommitdiff
path: root/pod/pod2man.PL
diff options
context:
space:
mode:
authorTim Bunce <Tim.Bunce@ig.co.uk>1997-08-07 00:00:00 +1200
committerTim Bunce <Tim.Bunce@ig.co.uk>1997-08-07 00:00:00 +1200
commit5b4ebf24ca11cf22be52bfe38f5f55eb66d9405f (patch)
tree2c87816f4745a2be764f713a0c3c3fc2c84c3ceb /pod/pod2man.PL
parent88785b6d17314e2c64ab55d13da4069ec0329ac6 (diff)
downloadperl-5b4ebf24ca11cf22be52bfe38f5f55eb66d9405f.tar.gz
[BUG:47:LOG] Dropped "and" in pod2man
(this is the same change as commit 5d3b0638f4c2cf44af3831abe68fc08048b89bc2, but as applied)
Diffstat (limited to 'pod/pod2man.PL')
-rw-r--r--pod/pod2man.PL8
1 files changed, 5 insertions, 3 deletions
diff --git a/pod/pod2man.PL b/pod/pod2man.PL
index 2c1837a37a..79e3edd1a1 100644
--- a/pod/pod2man.PL
+++ b/pod/pod2man.PL
@@ -727,9 +727,9 @@ while (<>) {
# trofficate backslashes; must do it before what happens below
s/\\/noremap('\\e')/ge;
-# protect leading periods and quotes against *roff
-# mistaking them for directives
-s/^(?:[A-Z]<)?[.']/\\&$&/gm;
+ # protect leading periods and quotes against *roff
+ # mistaking them for directives
+ s/^(?:[A-Z]<)?[.']/\\&$&/gm;
# first hide the escapes in case we need to
# intuit something and get it wrong due to fmting
@@ -1101,6 +1101,7 @@ sub clear_noremap {
sub internal_lrefs {
local($_) = shift;
+ local $trailing_and = s/and\s+$// ? "and " : "";
s{L</([^>]+)>}{$1}g;
my(@items) = split( /(?:,?\s+(?:and\s+)?)/ );
@@ -1114,6 +1115,7 @@ sub internal_lrefs {
$retstr .= " entr" . ( @items > 1 ? "ies" : "y" )
. " elsewhere in this document "; # terminal space to avoid words running together (pattern used strips terminal spaces)
+ $retstr .= $trailing_and;
return $retstr;