Merge tip-468 branch

1 files changed, 29 insertions, 14 deletions

diff --git a/unix/installManPage b/unix/installManPage
index 1f1cbde..09a31dd 100755
--- a/unix/installManPage
+++ b/unix/installManPage
@@ -60,20 +60,35 @@ test -z "$SymOrLoc" && SymOrLoc="$Dir/"
 #
 Names=`sed -n '
 #                               Look for a line that starts with .SH NAME
-    /^\.SH NAME/{
-#                               Read next line
-	n
-#                               Remove all commas ...
-	s/,//g
-#                               ... and backslash-escaped spaces.
-	s/\\\ //g
-#                               Delete from \- to the end of line
-	s/ \\\-.*//
-#                               Convert all non-space non-alphanum sequences
-#                               to single underscores.
-	s/[^ A-Za-z0-9][^ A-Za-z0-9]*/_/g
-#                               print the result and exit
-	p;q
+    /^\.SH NAME/,/^\./{
+
+
+	/^\./!{
+
+	    # Remove all commas...
+	    s/,//g
+
+	    # ... and backslash-escaped spaces.
+	    s/\\\ //g
+
+	    /\\\-.*/{
+		# Delete from \- to the end of line
+		s/ \\\-.*//
+		h
+		s/.*/./
+		x
+	    }
+
+	    # Convert all non-space non-alphanum sequences
+	    # to single underscores.
+	    s/[^ A-Za-z0-9][^ A-Za-z0-9]*/_/g
+	    p
+	    g
+	    /^\./{
+		q
+	    }
+    }
+
     }' $ManPage`
 
 if test -z "$Names" ; then