X-Git-Url: https://git.distorted.org.uk/~mdw/sw-tools/blobdiff_plain/961ce1c2fa0e71e5ffc0c16a1d4fa58802a36a1c..e55daacc8888ea40715a620cf21bef29583a670f:/perl/SWDoc.pm

diff --git a/perl/SWDoc.pm b/perl/SWDoc.pm
index d87da58..8278552 100644
--- a/perl/SWDoc.pm
+++ b/perl/SWDoc.pm
@@ -1,6 +1,6 @@
 # -*-perl-*-
 #
-# $Id: SWDoc.pm,v 1.1 1999/07/30 18:46:37 mdw Exp $
+# $Id: SWDoc.pm,v 1.4 2004/04/08 01:52:19 mdw Exp $
 #
 # Display documentation files
 #
@@ -25,13 +25,6 @@
 # along with sw-tools; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-#----- Revision history -----------------------------------------------------
-#
-# $Log: SWDoc.pm,v $
-# Revision 1.1  1999/07/30 18:46:37  mdw
-# New CGI script for browsing installed software and documentation.
-#
-
 #----- Package preamble -----------------------------------------------------
 
 package SWDoc;
@@ -56,12 +49,38 @@ sub doc {
   while (my $line = $fh->getline()) {
     last if $line =~ //;
     $line =~ s/\&/&/g;
-    $line =~ s/\</&lt;/g;
-    $line =~ s/\>/&gt;/g;
-    $line =~ s!(http|ftp)://[^]&)\s]*[^]&).,\s\']!<a href="$&">$&</a>!g;
-    $line =~ s!info:([^]&)\s]*[^]&).,\s\'\"])!<a href="$ref?act=info&file=$1&node=Top">$&</a>!g;
-    $line =~ s![^\s()&;{}.,\`\"][^\s()&;{}\`\"]*\@[^\s()&;{}\'\"]*[^\s()&;{}.,\'\"]!<a href="mailto:$&">$&</a>!g;
-    $line =~ s!([-_.\w]+)\((\d+\w*)\)!SWMan::subst("$1($2)", $1, $2)!eg;
+    $line =~ s/\</&lt;</g;
+    $line =~ s/\>/>&gt;/g;
+
+    # --- Spot URLs (except `mailto') ---
+
+    $line =~ s! \b (http s? | ftp | file | news) :
+		[^])\s<>]* [^]<>&).,\s\']
+	      !SWMan::urlsubst($&, $&)!egx;
+
+    # --- Spot email addresses (including `mailto' URLs) ---
+
+    $line =~ s! (?:\bmailto:)?
+		([^\s()&;:<>&{}.,\`\'\"] [^\s()&;:<>&{}\`\'\"]*
+		 \@
+		 [^\s()&;:{}<>&\'\"]* [^\s()&;:{}<>&.,\'\"])
+	      !<a href="mailto:$1">$&</a>!gx;
+
+    # --- Spot info references ---
+
+    $line =~ s! \b info: ([^]&)\s<>]* [^]&).,\s<>\'\"])
+              !<a href="$ref?act=info&file=$1&node=Top">$&</a>!gx;
+
+    # --- Spot manpage references ---
+
+    $line =~ s! ([-_.\w]+) \( (\d+\w*) \)
+	      !SWMan::subst("$1($2)", $1, $2)!egx;
+
+    # --- Finally fix up the HTML properly ---
+
+    $line =~ s/\&lt\;\</&lt;/g;
+    $line =~ s/\>\&gt\;/&gt;/g;
+
     print $line;
   }
   print "</pre>\n";