From 0ecf26fc7d2f24570b4c04a668c437b8656a40a7 Mon Sep 17 00:00:00 2001 From: Werner Fink Date: Mon, 24 Sep 2012 12:50:37 -0700 Subject: [PATCH] Change how pdf doc's are created Currently the pdf docs are done with sgml -> sgmltool -> tex -> latex -> dvi -> dvips -> ps -> ps2pdf -> pdf or tex -> latex -> dvi -> dvips -> ps -> ps2pdf -> pdf with this patch we do sgml -> sgmltool -> tex -> pdflatex -> pdf or tex -> pdflatex -> pdf --- doc/Makefile | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 1df60813..b92957ed 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -6,7 +6,7 @@ PSFILES=ip-cref.ps ip-tunnels.ps api-ip6-flowlabels.ps ss.ps nstat.ps arpd.ps rt LATEX=latex DVIPS=dvips -SGML2DVI=sgml2latex --output=dvi +SGML2DVI=sgml2latex SGML2HTML=sgml2html -s 0 LPR=lpr -Zsduplex SHELL=bash @@ -31,8 +31,11 @@ pdf: $(PDFFILES) print: $(PSFILES) $(LPR) $(PSFILES) +%.tex: %.sgml + $(SGML2DVI) --output=tex $< + %.dvi: %.sgml - $(SGML2DVI) $< + $(SGML2DVI) --output=dvi $< %.dvi: %.tex @set -e; pass=2; echo "Running LaTeX $<"; \ @@ -44,10 +47,17 @@ print: $(PSFILES) echo "Re-running LaTeX $<, $${pass}d pass"; pass=$$[$$pass + 1]; \ done -#%.pdf: %.tex -# pdflatex $< -%.pdf: %.ps - ps2pdf $< +%.pdf: %.tex + @set -e; pass=2; echo "Running pdfLaTeX $<"; \ + while [ `pdflatex $< &1 | \ + grep -c '^\(LaTeX Warning: Label(s) may\|No file \|! Emergency stop\)'` -ge 1 ]; do \ + if [ $$pass -gt 3 ]; then \ + echo "Seems, something is wrong. Try by hands." ; exit 1 ; \ + fi; \ + echo "Re-running pdfLaTeX $<, $${pass}d pass"; pass=$$[$$pass + 1]; \ + done +#%.pdf: %.ps +# ps2pdf $< %.ps: %.dvi $(DVIPS) $< -o $@