diff --git a/Doc/myformat.perl b/Doc/myformat.perl index 171c1ddec25..da9dbd1a84f 100644 --- a/Doc/myformat.perl +++ b/Doc/myformat.perl @@ -156,6 +156,10 @@ sub do_cmd_strong{ $INDEX_SUBITEM = ""; +sub get_indexsubitem{ + $INDEX_SUBITEM ? " $INDEX_SUBITEM" : ''; +} + sub do_cmd_setindexsubitem{ local($_) = @_; s/$any_next_pair_pr_rx//; @@ -283,8 +287,8 @@ sub do_cmd_nodename{ &do_cmd_label(@_); } sub init_myformat{ # XXX need some way for this to be called after &initialise; ??? -# $anchor_mark = ''; -# $icons{'anchor_mark'} = ''; + $anchor_mark = ''; + $icons{'anchor_mark'} = ''; # <<2>>...<<2>> $any_next_pair_rx3 = "$O(\\d+)$C([\\s\\S]*)$O\\3$C"; $any_next_pair_rx5 = "$O(\\d+)$C([\\s\\S]*)$O\\5$C"; @@ -299,10 +303,6 @@ sub init_myformat{ &init_myformat; -sub get_indexsubitem{ - $INDEX_SUBITEM ? " $INDEX_SUBITEM" : ''; -} - # similar to make_index_entry(), but includes the string in the result # instead of the dummy filler. # @@ -320,12 +320,28 @@ sub make_str_index_entry{ "$str<\/a>"; } -# Changed from the stock version to indent {verbatim} sections: +# Changed from the stock version to indent {verbatim} sections, +# and make them smaller, to better match the LaTeX version: + +# (Used with LaTeX2HTML 96.1*) sub replace_verbatim { # Modifies $_ - s/$verbatim_mark(verbatim)(\d+)/

$verbatim{$2}<\/pre><\/dl>/go;
+    s/$verbatim_mark(verbatim)(\d+)/

$verbatim{$2}<\/pre><\/font><\/dl>/go;
     s/$verbatim_mark(rawhtml)(\d+)/$verbatim{$2}/ego;	# Raw HTML
 }
+  
+# (Used with LaTeX2HTML 98.1)
+sub replace_verbatim_hook{
+    # Modifies $_
+    s/$math_verbatim_rx/&put_comment("MATH: ".$verbatim{$1})/eg;
+#    s/$verbatim_mark(verbatim\*?)(\d+)#/
\n$verbatim{$2}\n<\/PRE>/go;
+    s/$verbatim_mark(\w*[vV]erbatim\*?)(\d+)#/\n

$verbatim{$2}<\/font><\/dl>\n/go; +# s/$verbatim_mark(rawhtml)(\d+)#/$verbatim{$2}/eg; # Raw HTML + # Raw HTML, but replacements may have protected characters + s/$verbatim_mark(rawhtml)(\d+)#/&unprotect_raw_html($verbatim{$2})/eg; + s/$verbatim_mark$keepcomments(\d+)#/$verbatim{$2}/ego; # Raw TeX + s/$unfinished_mark$keepcomments(\d+)#/$verbatim{$2}/ego; # Raw TeX +} sub do_env_cfuncdesc{ local($_) = @_; @@ -511,8 +527,10 @@ sub do_env_tableii{ } local($th1,$th2,$th3) = &setup_column_alignments($2); $globals{"lineifont"} = $font; - "\n $th1$h1\n $th2$h2$'\n" - . "
"; + "" + . "\n $th1$h1" + . "\n $th2$h2$'" + . "\n
"; } sub do_cmd_lineii{ @@ -542,9 +560,11 @@ sub do_env_tableiii{ } local($th1,$th2,$th3) = &setup_column_alignments($2); $globals{"lineifont"} = $font; - "\n $th1$h1\n $th2$h2" - . "\n $th3$h3$'\n" - . "
"; + "" + . "\n $th1$h1" + . "\n $th2$h2" + . "\n $th3$h3$'" + . "\n
"; } sub do_cmd_lineiii{