From: Tim Bunce <Tim.Bunce@ig.co.uk>
Date: Wed, 6 Aug 1997 12:00:00 +0000 (+1200)
Subject: [BUG:47:LOG] Dropped "and" in pod2man
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=5b4ebf24ca11cf22be52bfe38f5f55eb66d9405f;p=p5sagit%2Fp5-mst-13.2.git

[BUG:47:LOG] Dropped "and" in pod2man

(this is the same change as commit 5d3b0638f4c2cf44af3831abe68fc08048b89bc2, but as applied)
---

diff --git a/pod/pod2man.PL b/pod/pod2man.PL
index 2c1837a..79e3edd 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;