Misc. revisions to LaTeX2HTML support.

4 files changed, 20 insertions, 32 deletions

diff --git a/Doc/manual.perl b/Doc/manual.perl
index 0960608..e80f8e4 100644
--- a/Doc/manual.perl
+++ b/Doc/manual.perl
@@ -8,10 +8,7 @@
 
 package main;
 
-$mydir = `pwd`;
-chop $mydir;
-unshift(@INC, $mydir);
-
-require "python.perl";
+&do_require_package("report");
+&do_require_package("python");
 
 1;				# sheesh....
diff --git a/Doc/perl/manual.perl b/Doc/perl/manual.perl
index 0960608..e80f8e4 100644
--- a/Doc/perl/manual.perl
+++ b/Doc/perl/manual.perl
@@ -8,10 +8,7 @@
 
 package main;
 
-$mydir = `pwd`;
-chop $mydir;
-unshift(@INC, $mydir);
-
-require "python.perl";
+&do_require_package("report");
+&do_require_package("python");
 
 1;				# sheesh....
diff --git a/Doc/perl/python.perl b/Doc/perl/python.perl
index f7531a5..07ba65e 100644
--- a/Doc/perl/python.perl
+++ b/Doc/perl/python.perl
@@ -99,7 +99,7 @@ sub do_cmd_url{
 sub do_cmd_manpage{
     # two parameters:  \manpage{name}{section}
     local($_) = @_;
-    local($any_next_pair_pr_rx3) = "$OP(\\d+)$CP([\\s\\S]*)$OP\\3$CP";
+#    local($any_next_pair_pr_rx3) = "$OP(\\d+)$CP([\\s\\S]*)$OP\\3$CP";
     s/$next_pair_pr_rx$any_next_pair_pr_rx3/<i>\2<\/i>(\4)/;
     $_;
 }
@@ -154,7 +154,7 @@ sub do_cmd_strong{
 sub do_cmd_deprecated{
     # two parameters:  \deprecated{version}{whattodo}
     local($_) = @_;
-    local($any_next_pair_pr_rx3) = "$OP(\\d+)$CP([\\s\\S]*)$OP\\3$CP";
+#    local($any_next_pair_pr_rx3) = "$OP(\\d+)$CP([\\s\\S]*)$OP\\3$CP";
     local($release,$action) = ($2, $4);
     s/$next_pair_pr_rx$any_next_pair_pr_rx3//;
     "<b>Deprecated since release $release.</b>"
@@ -630,15 +630,12 @@ sub do_cmd_seemodule{
     # Insert the right magic to jump to the module definition.  This should
     # work most of the time, at least for repeat builds....
     local($_) = @_;
-    local($any_next_pair_pr_rx3) = "$OP(\\d+)$CP([\\s\\S]*)$OP\\3$CP";
-    s/$next_pair_pr_rx$any_next_pair_pr_rx3//;
-    local($module,$text,$node,$key) = ($2, $4, '', "module$2");
-    $key =~ s/_//g;
-    # XXX somewhat bogus computation of $node
-#    $node = $external_labels{$key} unless
-#      ($node = $ref_files{$key});
-    $node = $key;
-    "<p>Module <tt><b><a href=\"$node#$key\">$module</a></b></tt>"
+    local($opt_arg) = "(\\[([^\\]]*)])?";
+#    local($any_next_pair_pr_rx3) = "$OP(\\d+)$CP([\\s\\S]*)$OP\\3$CP";
+    s/$opt_arg$any_next_pair_pr_rx3$any_next_pair_pr_rx5//;
+    local($module,$text,$key) = ($4, $6, $2);
+    $key = $module if not $key;
+    "<p>Module <tt><b><a href=\"module-$key.html\">$module</a></b></tt>"
       . "&nbsp;&nbsp;&nbsp;($text)</p>"
       . $_;
 }
diff --git a/Doc/python.perl b/Doc/python.perl
index f7531a5..07ba65e 100644
--- a/Doc/python.perl
+++ b/Doc/python.perl
@@ -99,7 +99,7 @@ sub do_cmd_url{
 sub do_cmd_manpage{
     # two parameters:  \manpage{name}{section}
     local($_) = @_;
-    local($any_next_pair_pr_rx3) = "$OP(\\d+)$CP([\\s\\S]*)$OP\\3$CP";
+#    local($any_next_pair_pr_rx3) = "$OP(\\d+)$CP([\\s\\S]*)$OP\\3$CP";
     s/$next_pair_pr_rx$any_next_pair_pr_rx3/<i>\2<\/i>(\4)/;
     $_;
 }
@@ -154,7 +154,7 @@ sub do_cmd_strong{
 sub do_cmd_deprecated{
     # two parameters:  \deprecated{version}{whattodo}
     local($_) = @_;
-    local($any_next_pair_pr_rx3) = "$OP(\\d+)$CP([\\s\\S]*)$OP\\3$CP";
+#    local($any_next_pair_pr_rx3) = "$OP(\\d+)$CP([\\s\\S]*)$OP\\3$CP";
     local($release,$action) = ($2, $4);
     s/$next_pair_pr_rx$any_next_pair_pr_rx3//;
     "<b>Deprecated since release $release.</b>"
@@ -630,15 +630,12 @@ sub do_cmd_seemodule{
     # Insert the right magic to jump to the module definition.  This should
     # work most of the time, at least for repeat builds....
     local($_) = @_;
-    local($any_next_pair_pr_rx3) = "$OP(\\d+)$CP([\\s\\S]*)$OP\\3$CP";
-    s/$next_pair_pr_rx$any_next_pair_pr_rx3//;
-    local($module,$text,$node,$key) = ($2, $4, '', "module$2");
-    $key =~ s/_//g;
-    # XXX somewhat bogus computation of $node
-#    $node = $external_labels{$key} unless
-#      ($node = $ref_files{$key});
-    $node = $key;
-    "<p>Module <tt><b><a href=\"$node#$key\">$module</a></b></tt>"
+    local($opt_arg) = "(\\[([^\\]]*)])?";
+#    local($any_next_pair_pr_rx3) = "$OP(\\d+)$CP([\\s\\S]*)$OP\\3$CP";
+    s/$opt_arg$any_next_pair_pr_rx3$any_next_pair_pr_rx5//;
+    local($module,$text,$key) = ($4, $6, $2);
+    $key = $module if not $key;
+    "<p>Module <tt><b><a href=\"module-$key.html\">$module</a></b></tt>"
       . "&nbsp;&nbsp;&nbsp;($text)</p>"
       . $_;
 }