diff options
author | Fred Drake <fdrake@acm.org> | 1998-03-06 21:20:08 (GMT) |
---|---|---|
committer | Fred Drake <fdrake@acm.org> | 1998-03-06 21:20:08 (GMT) |
commit | b3c9bca242cdf3e0dff1545860624366ff1afad4 (patch) | |
tree | 190e9eb49c3da17fb98554bdfcf7e68b4e16aec1 /Doc | |
parent | bc7101dff008a5e901756114b9b66f2c592f98c3 (diff) | |
download | cpython-b3c9bca242cdf3e0dff1545860624366ff1afad4.zip cpython-b3c9bca242cdf3e0dff1545860624366ff1afad4.tar.gz cpython-b3c9bca242cdf3e0dff1545860624366ff1afad4.tar.bz2 |
Misc. revisions to LaTeX2HTML support.
Diffstat (limited to 'Doc')
-rw-r--r-- | Doc/manual.perl | 7 | ||||
-rw-r--r-- | Doc/perl/manual.perl | 7 | ||||
-rw-r--r-- | Doc/perl/python.perl | 19 | ||||
-rw-r--r-- | Doc/python.perl | 19 |
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>" . " ($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>" . " ($text)</p>" . $_; } |