diff -u -r sgml-tools-1.0.9/lib/SGMLTools/Html2Html.pm sgml-tools-1.0.9-neu/lib/SGMLTools/Html2Html.pm --- sgml-tools-1.0.9/lib/SGMLTools/Html2Html.pm Fri Mar 20 12:26:44 1998 +++ sgml-tools-1.0.9-neu/lib/SGMLTools/Html2Html.pm Sun Aug 15 00:26:15 1999 @@ -254,7 +254,7 @@ my $next = $use_imgs ? qq($nextlabel) : qq($nextlabel); - $next = qq($next) + $next = qq() if ($myfilenum < $filecount); $next = join "", $next, "\n"; $outfh->print($next); @@ -264,7 +264,7 @@ ? qq($prevlabel) : qq($prevlabel); $prev = join "", qq($prev) + qq(.$fileext" REL="prev">$prev) if ($myfilenum >= 3); $prev = join "", $prev, "\n"; $outfh->print($prev); @@ -274,7 +274,7 @@ ? qq($toclabel) : qq($toclabel); $toc = join "", qq($toc) + §ion_num($secnr, 0), qq(" REL="contents">$toc) if ($outfh->fileno != STDOUT->fileno); $toc = join "", $toc, "\n"; $outfh->print($toc); @@ -340,7 +340,7 @@ if ($outfh->fileno != STDOUT->fileno); $outfh->print($toc,"\n"); - $outfh->print("\n\n"); + $outfh->print("\n\n"); &browse_links($outfh, $filenum, 1); } diff -u -r sgml-tools-1.0.9/lib/dist/fmt_latex2e.pl sgml-tools-1.0.9-neu/lib/dist/fmt_latex2e.pl --- sgml-tools-1.0.9/lib/dist/fmt_latex2e.pl Tue Oct 13 13:48:02 1998 +++ sgml-tools-1.0.9-neu/lib/dist/fmt_latex2e.pl Sun Aug 15 00:27:04 1999 @@ -16,6 +16,14 @@ use File::Copy; +# ps2pdf available? +my $values = [ "dvi", "tex", "ps" ]; +my $pdfdir; +foreach $pdfdir (split (":", $ENV{'PATH'})) +{ + $values = [ "dvi", "tex", "ps", "pdf" ] if -x "$pdfdir/ps2pdf"; +} + my $latex2e = {}; $latex2e->{NAME} = "latex2e"; $latex2e->{HELP} = <{OPTIONS} = [ { option => "output", type => "l", - 'values' => [ "dvi", "tex", "ps" ], short => "o" }, + 'values' => $values, short => "o" }, { option => "bibtex", type => "f", short => "b" }, { option => "makeindex", type => "f", short => "m" }, { option => "pagenumber", type => "i", short => "n" }, @@ -166,7 +174,9 @@ $global->{papersize} ne "a4" || $latex2e->{pagenumber} != 1 || $global->{pass} ne "" || - $latex2e->{makeindex}) + $latex2e->{makeindex} || + $latex2e->{output} eq "pdf" || + $latex2e->{output} eq "ps") { my $langlit = ISO2English ($global->{language}); $langlit = ($langlit eq 'english') ? "" : ",$langlit"; @@ -178,7 +188,17 @@ { s/\\documentclass\[.*\]/\\documentclass\[$replace\]/; $_ = $_ . "\\makeindex\n" if ($latex2e->{makeindex}); - } + } + if ($latex2e->{output} eq "ps" || + $latex2e->{output} eq "pdf") + { + $_ = $_ . "\\usepackage{times}\n" + if (/^\\documentclass/); + $_ = $_ . "\\usepackage\[ps2pdf\]{hyperref}\n" + if (/^\\usepackage{epsfig}/); + $_ = "\\def\\htmlurl#1#2{\\href{#1}{#2}}\n" + if (/^\\def\\htmlurl/); + } if (/%end-preamble/) { if ($latex2e->{pagenumber}) @@ -236,8 +256,15 @@ return 0; } `dvips -q -t $global->{papersize} -o $filename.ps $filename.dvi`; - $global->{debug} || unlink ("$filename.dvi", "$filename.tex"); - + + if ($latex2e->{output} eq "ps") + { + $global->{debug} || unlink ("$filename.dvi", "$filename.tex", "$filename.out"); + return 0; + } + + `ps2pdf -sPAPERSIZE=$global->{papersize} $filename.ps`; + $global->{debug} || unlink ("$filename.dvi", "$filename.tex", "$filename.ps", "$filename.out"); return 0; }; diff -u -r sgml-tools-1.0.9/lib/dist/sgmltool/html/mapping sgml-tools-1.0.9-neu/lib/dist/sgmltool/html/mapping --- sgml-tools-1.0.9/lib/dist/sgmltool/html/mapping Tue Feb 10 21:16:42 1998 +++ sgml-tools-1.0.9-neu/lib/dist/sgmltool/html/mapping Sun Aug 15 00:26:15 1999 @@ -66,8 +66,8 @@ + "

Comment

" + - + "

\n" - "\n
" + + + "

\n" + "\n
" + + "

Appendix

" + diff -u -r sgml-tools-1.0.9/lib/dist/sgmltool/latex2e/mapping sgml-tools-1.0.9-neu/lib/dist/sgmltool/latex2e/mapping --- sgml-tools-1.0.9/lib/dist/sgmltool/latex2e/mapping Fri Jun 26 21:39:17 1998 +++ sgml-tools-1.0.9-neu/lib/dist/sgmltool/latex2e/mapping Sun Aug 15 00:30:22 1999 @@ -13,6 +13,7 @@ "\\usepackage{babel}\n" "\\usepackage{epsfig}\n" "\\usepackage{[OPTS]}\n" + "\\def\\htmlurl#1#2{#2}\n" "\\def\\addbibtoc{\n" "\\addcontentsline{toc}{section}{\\numberline{\\mbox{}}\\relax\\bibname}\n" "}%end-preamble\n" + @@ -28,6 +29,7 @@ "\\usepackage{babel}\n" "\\usepackage{epsfig}\n" "\\usepackage{[OPTS]}\n" + "\\def\\htmlurl#1#2{#2}\n" "\\def\\addbibtoc{\n" "\\addcontentsline{toc}{chapter}{\\numberline{\\mbox{}}\\relax\\bibname}\n" "}\n" @@ -44,6 +46,7 @@ "\\usepackage{babel}\n" "\\usepackage{epsfig}\n" "\\usepackage{[OPTS]}\n" + "\\def\\htmlurl#1#2{#2}\n" "\\def\\addbibtoc{\n" "\\addcontentsline{toc}{chapter}{\\numberline{\\mbox{}}\\relax\\bibname}\n" "}\n" @@ -258,7 +261,7 @@ "\\nameurl{[URL]}{[NAME]}" - "\\onlynameurl{[NAME]}" + "\\htmlurl{[URL]}{[NAME]}" @@ -294,8 +297,8 @@ + "\\begin{tscreen}" + + "\\end{tscreen}" + - + "\\begin{quotation}" + - + "\\end{quotation}" + + + "\\begin{quote}" + + + "\\end{quote}" + % theorems and such