From 2f462671171174cc0d68fd4a2bbd57b3aa0e796d Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@lrde.epita.fr>
Date: Tue, 29 Nov 2011 18:09:49 +0100
Subject: [PATCH] Use latexmk to build tl.tex.

* doc/tl/Makefile.am: Rewrite using latexmk instead of texi2dvi.
Also define the SpotVersion when calling latexmk, not in tl.tex.
* doc/tl/tl.tex: Assume SpotVersion is defined outside the file.
---
 doc/tl/Makefile.am | 14 +++++++++-----
 doc/tl/tl.tex      |  9 ++++++---
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/doc/tl/Makefile.am b/doc/tl/Makefile.am
index c4d3df8a1..7c9f79ea0 100644
--- a/doc/tl/Makefile.am
+++ b/doc/tl/Makefile.am
@@ -20,14 +20,18 @@
 
 
 all: $(srcdir)/tl.pdf
-TEXI2PDF = texi2dvi --pdf
-TEXI2PDF_FLAGS =  --tidy --build-dir=tmp.t2d --batch
+LATEXMK = latexmk -pdf -ps- -dvi- -e '$$bibtex_use=2' \
+          -pdflatex='pdflatex %O "\def\SpotVersion{$(VERSION)}\input{%S}"'
 
 dist_pdf_DATA = $(srcdir)/tl.pdf
 
 $(srcdir)/tl.pdf: $(srcdir)/tl.tex $(srcdir)/tl.bib
-	$(TEXI2PDF) $(TEXI2PDF_FLAGS) -o $@ $<
+	$(LATEXMK) $(srcdir)/tl.tex
+	test '$(srcdir)' = '.' || cp $@ $(srcdir)/$@
 
-.PHONY: mostlyclean-local
+pvc:
+	$(LATEXMK) -pvc $(srcdir)/tl.tex
+
+.PHONY: mostlyclean-local pvc
 mostlyclean-local:
-	rm -rf tmp.t2d
+	$(LATEXMK) -c $(srcdir)/tl.tex
diff --git a/doc/tl/tl.tex b/doc/tl/tl.tex
index ed6cc45c2..074bbad41 100644
--- a/doc/tl/tl.tex
+++ b/doc/tl/tl.tex
@@ -114,9 +114,11 @@
 \makeindex
 \newcommand{\Index}[1]{\index{#1}#1}
 
-
-% @SpotVersion@
-\def\SpotVersion{0.7.1a}
+% Make sure we can compile this file even without use the version
+% supplied by the Makefile.
+\ifdefined\SpotVersion\else
+ \def\SpotVersion{\textbf{UNKNOWN VERSION}}
+\fi
 
 %% ----------------------- %%
 %% Texinfo like commands.  %%
@@ -752,6 +754,7 @@ The following rules are all valid with the two arguments swapped, except the one
   \eword \CONCAT f &\equiv f\\
   &&
   b_1 \ANDALT b_2 &\equiv b_1\AND b_2 &
+  &&
   b:f &\stackrel{\dag}{\equiv} b\AND f\\
 \end{align*}