Index: doc/LaTeXmacros/common.tex
===================================================================
--- doc/LaTeXmacros/common.tex	(revision e76bd39e8180f90ceda3cbab1ae87e29d3273deb)
+++ doc/LaTeXmacros/common.tex	(revision 85521c73420335b3b110dad2b1932c2810001b61)
@@ -11,6 +11,6 @@
 %% Created On       : Sat Apr  9 10:06:17 2016
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Mon Aug 28 20:18:42 2017
-%% Update Count     : 355
+%% Last Modified On : Wed Jan 31 23:10:28 2018
+%% Update Count     : 364
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -165,11 +165,11 @@
         {\ETC\xspace}%
 }%
-\newcommand{\ETAL}{\abbrevFont{et\:al}}
-\newcommand{\etal}{%
-	\@ifnextchar{.}{\ETAL}%
-		{\abbrevFont{\ETAL}.\xspace}%
+\newcommand{\ETAL}{\abbrevFont{et}\hspace{2pt}\abbrevFont{al}}
+\newcommand*{\etal}{%
+	\@ifnextchar{.}{\protect\ETAL}%
+		{\abbrevFont{\protect\ETAL}.\xspace}%
 }%
 \newcommand{\VIZ}{\abbrevFont{viz}}
-\newcommand{\viz}{%
+\newcommand*{\viz}{%
 	\@ifnextchar{.}{\VIZ}%
 		{\abbrevFont{\VIZ}.\xspace}%
Index: doc/bibliography/pl.bib
===================================================================
--- doc/bibliography/pl.bib	(revision e76bd39e8180f90ceda3cbab1ae87e29d3273deb)
+++ doc/bibliography/pl.bib	(revision 85521c73420335b3b110dad2b1932c2810001b61)
@@ -1034,5 +1034,5 @@
 }
 
-@manual{cforall,
+@manual{cforall-refrat,
     keywords	= {polymorphism},
     contributer	= {gjditchfield@plg},
Index: doc/papers/OOPSLA17/Makefile
===================================================================
--- doc/papers/OOPSLA17/Makefile	(revision e76bd39e8180f90ceda3cbab1ae87e29d3273deb)
+++ doc/papers/OOPSLA17/Makefile	(revision 85521c73420335b3b110dad2b1932c2810001b61)
@@ -9,5 +9,5 @@
 
 MAKEFLAGS = --no-print-directory --silent #
-VPATH = ${Figures} evaluation
+VPATH = ${Build} ${Figures} evaluation
 
 ## Define the text source files.
@@ -36,4 +36,6 @@
 # Directives #
 
+.PHONY : all clean					# not file names
+
 all : ${DOCUMENT}
 
@@ -49,5 +51,5 @@
 	dvips ${Build}/$< -o $@
 
-${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${basename ${DOCUMENT}}.tex ../../bibliography/pl.bib
+${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ../../bibliography/pl.bib
 	# Must have *.aux file containing citations for bibtex
 	if [ ! -r ${basename $@}.aux ] ; then ${LaTeX} ${basename $@}.tex ; fi
Index: doc/papers/concurrency/Makefile
===================================================================
--- doc/papers/concurrency/Makefile	(revision e76bd39e8180f90ceda3cbab1ae87e29d3273deb)
+++ doc/papers/concurrency/Makefile	(revision 85521c73420335b3b110dad2b1932c2810001b61)
@@ -9,5 +9,5 @@
 
 MAKEFLAGS = --no-print-directory --silent #
-VPATH = ${Figures}
+VPATH = ${Build} ${Figures}
 
 ## Define the text source files.
@@ -58,5 +58,5 @@
 	dvips ${Build}/$< -o $@
 
-${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${basename ${DOCUMENT}}.tex \
+${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
 		${Macros}/common.tex ${Macros}/indexstyle annex/local.bib ../../bibliography/pl.bib
 	# Must have *.aux file containing citations for bibtex
Index: doc/papers/general/Makefile
===================================================================
--- doc/papers/general/Makefile	(revision e76bd39e8180f90ceda3cbab1ae87e29d3273deb)
+++ doc/papers/general/Makefile	(revision 85521c73420335b3b110dad2b1932c2810001b61)
@@ -9,5 +9,5 @@
 
 MAKEFLAGS = --no-print-directory --silent #
-VPATH = ${Figures} evaluation
+VPATH = ${Build} ${Figures} evaluation
 
 ## Define the text source files.
@@ -51,5 +51,5 @@
 	dvips ${Build}/$< -o $@
 
-${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${basename ${DOCUMENT}}.tex \
+${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
 		${Macros}/common.tex ${Macros}/indexstyle ../../bibliography/pl.bib
 	# Must have *.aux file containing citations for bibtex
Index: doc/refrat/Makefile
===================================================================
--- doc/refrat/Makefile	(revision e76bd39e8180f90ceda3cbab1ae87e29d3273deb)
+++ doc/refrat/Makefile	(revision 85521c73420335b3b110dad2b1932c2810001b61)
@@ -9,5 +9,5 @@
 
 MAKEFLAGS = --no-print-directory --silent #
-VPATH = ${Figures}
+VPATH = ${Build} ${Figures}
 
 ## Define the text source files.
@@ -52,5 +52,5 @@
 	dvips ${Build}/$< -o $@
 
-${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${basename ${DOCUMENT}}.tex \
+${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
 		${Macros}/common.tex ${Macros}/lstlang.sty ${Macros}/indexstyle ../bibliography/pl.bib
 	# Conditionally create an empty *.ind (index) file for inclusion until makeindex is run.
Index: doc/theses/aaron_moss/comp_II/.gitignore
===================================================================
--- doc/theses/aaron_moss/comp_II/.gitignore	(revision e76bd39e8180f90ceda3cbab1ae87e29d3273deb)
+++ doc/theses/aaron_moss/comp_II/.gitignore	(revision 85521c73420335b3b110dad2b1932c2810001b61)
@@ -1,14 +1,4 @@
 # generated by latex
-*.aux
-*.bbl
-*.blg
-*.brf
-*.dvi
-*.idx
-*.ilg
-*.ind
-*.log
-*.out
+build/*
 *.pdf
 *.ps
-*.toc
Index: doc/theses/aaron_moss/comp_II/Makefile
===================================================================
--- doc/theses/aaron_moss/comp_II/Makefile	(revision e76bd39e8180f90ceda3cbab1ae87e29d3273deb)
+++ doc/theses/aaron_moss/comp_II/Makefile	(revision 85521c73420335b3b110dad2b1932c2810001b61)
@@ -1,7 +1,13 @@
-## Define the appropriate configuration variables.
+## Define the configuration variables.
 
-TeXLIB = .:../LaTeXmacros:../LaTeXmacros/listings:../LaTeXmacros/enumitem:../bibliography/:
-LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error
+Build = build
+Figures = figures
+Macros = ../../../LaTeXmacros
+TeXLIB = .:${Macros}:${Build}:../../../bibliography:
+LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error -output-directory=${Build}
 BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex
+
+MAKEFLAGS = --no-print-directory --silent #
+VPATH = ${Build} ${Figures}
 
 ## Define the text source files.
@@ -29,9 +35,10 @@
 # Directives #
 
+.PHONY : all clean					# not file names
+
 all : ${DOCUMENT}
 
 clean :
-	rm -f *.bbl *.aux *.dvi *.idx *.ilg *.ind *.brf *.out *.log *.toc *.blg *.pstex_t *.cf \
-		${FIGURES} ${PICTURES} ${PROGRAMS} ${GRAPHS} ${basename ${DOCUMENT}}.ps ${DOCUMENT}
+	@rm -frv ${DOCUMENT} ${basename ${DOCUMENT}}.ps ${Build}
 
 # File Dependencies #
@@ -41,36 +48,31 @@
 
 ${basename ${DOCUMENT}}.ps : ${basename ${DOCUMENT}}.dvi
-	dvips $< -o $@
+	dvips ${Build}/$< -o $@
 
-${basename ${DOCUMENT}}.dvi : Makefile ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${basename ${DOCUMENT}}.tex \
-		../LaTeXmacros/common.tex ../LaTeXmacros/indexstyle ../bibliography/cfa.bib
-	# Conditionally create an empty *.ind (index) file for inclusion until makeindex is run.
-	if [ ! -r ${basename $@}.ind ] ; then touch ${basename $@}.ind ; fi
+${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
+		${Macros}/common.tex ${Macros}/indexstyle ../../../bibliography/pl.bib
 	# Must have *.aux file containing citations for bibtex
 	if [ ! -r ${basename $@}.aux ] ; then ${LaTeX} ${basename $@}.tex ; fi
-	-${BibTeX} ${basename $@}
-	# Some citations reference others so run steps again to resolve these citations
+	-${BibTeX} ${Build}/${basename $@}
+	# Some citations reference others so run again to resolve these citations
 	${LaTeX} ${basename $@}.tex
-	-${BibTeX} ${basename $@}
-	# Make index from *.aux entries and input index at end of document
-	makeindex -s ../LaTeXmacros/indexstyle ${basename $@}.idx
+	-${BibTeX} ${Build}/${basename $@}
+	# Run again to finish citations
 	${LaTeX} ${basename $@}.tex
-	# Run again to get index title into table of contents
-	${LaTeX} ${basename $@}.tex
-
-predefined :
-	sed -f predefined.sed ${basename ${DOCUMENT}}.tex > ${basename $@}.cf
 
 ## Define the default recipes.
 
+${Build}:
+	mkdir -p ${Build}
+
 %.tex : %.fig
-	fig2dev -L eepic $< > $@
+	fig2dev -L eepic $< > ${Build}/$@
 
 %.ps : %.fig
-	fig2dev -L ps $< > $@
+	fig2dev -L ps $< > ${Build}/$@
 
 %.pstex : %.fig
-	fig2dev -L pstex $< > $@
-	fig2dev -L pstex_t -p $@ $< > $@_t
+	fig2dev -L pstex $< > ${Build}/$@
+	fig2dev -L pstex_t -p ${Build}/$@ $< > ${Build}/$@_t
 
 # Local Variables: #
Index: doc/theses/aaron_moss/comp_II/comp_II.tex
===================================================================
--- doc/theses/aaron_moss/comp_II/comp_II.tex	(revision e76bd39e8180f90ceda3cbab1ae87e29d3273deb)
+++ doc/theses/aaron_moss/comp_II/comp_II.tex	(revision 85521c73420335b3b110dad2b1932c2810001b61)
@@ -1,10 +1,2 @@
-% inline code ©...© (copyright symbol) emacs: C-q M-)
-% red highlighting ®...® (registered trademark symbol) emacs: C-q M-.
-% blue highlighting ß...ß (sharp s symbol) emacs: C-q M-_
-% green highlighting ¢...¢ (cent symbol) emacs: C-q M-"
-% LaTex escape §...§ (section symbol) emacs: C-q M-'
-% keyword escape ¶...¶ (pilcrow symbol) emacs: C-q M-^
-% math escape $...$ (dollar symbol)
-
 \documentclass[twoside,11pt]{article}
 
@@ -27,6 +19,4 @@
 \usepackage{mathptmx}                                   % better math font with "times"
 \usepackage[usenames]{color}
-\usepackage[pagewise]{lineno}
-\renewcommand{\linenumberfont}{\scriptsize\sffamily}
 \input{common}                                          % bespoke macros used in the document
 \usepackage[dvips,plainpages=false,pdfpagelabels,pdfpagemode=UseNone,colorlinks=true,pagebackref=true,linkcolor=blue,citecolor=blue,urlcolor=blue,pagebackref=true,breaklinks=true]{hyperref}
@@ -34,6 +24,24 @@
 \renewcommand{\UrlFont}{\small\sf}
 
+\usepackage[pagewise]{lineno}
+\renewcommand{\linenumberfont}{\scriptsize\sffamily}
+
+% Default underscore is too low and wide. Cannot use lstlisting "literate" as replacing underscore
+% removes it as a variable-name character so keywords in variables are highlighted. MUST APPEAR
+% AFTER HYPERREF.
+\renewcommand{\textunderscore}{\leavevmode\makebox[1.2ex][c]{\rule{1ex}{0.075ex}}}
+
 \setlength{\topmargin}{-0.45in}							% move running title into header
 \setlength{\headsep}{0.25in}
+
+\CFAStyle												% use default CFA format-style
+
+% inline code ©...© (copyright symbol) emacs: C-q M-)
+% red highlighting ®...® (registered trademark symbol) emacs: C-q M-.
+% blue highlighting ß...ß (sharp s symbol) emacs: C-q M-_
+% green highlighting ¢...¢ (cent symbol) emacs: C-q M-"
+% LaTex escape §...§ (section symbol) emacs: C-q M-'
+% keyword escape ¶...¶ (pilcrow symbol) emacs: C-q M-^
+% math escape $...$ (dollar symbol)
 
 \usepackage{caption}
@@ -622,5 +630,5 @@
 \addcontentsline{toc}{section}{\refname}
 \bibliographystyle{plain}
-\bibliography{cfa}
+\bibliography{pl}
 
 %\addcontentsline{toc}{section}{\indexname} % add index name to table of contents
Index: doc/theses/rob_schluntz/.gitignore
===================================================================
--- doc/theses/rob_schluntz/.gitignore	(revision e76bd39e8180f90ceda3cbab1ae87e29d3273deb)
+++ doc/theses/rob_schluntz/.gitignore	(revision 85521c73420335b3b110dad2b1932c2810001b61)
@@ -1,17 +1,5 @@
 # generated by latex
-*.aux
-*.bbl
-*.blg
-*.brf
-*.dvi
-*.idx
-*.ilg
-*.ind
-*.log
-*.out
+build/*
 *.pdf
 *.ps
-*.toc
-*.lof
-*.lot
-*.synctex.gz
+
Index: doc/theses/rob_schluntz/Makefile
===================================================================
--- doc/theses/rob_schluntz/Makefile	(revision e76bd39e8180f90ceda3cbab1ae87e29d3273deb)
+++ doc/theses/rob_schluntz/Makefile	(revision 85521c73420335b3b110dad2b1932c2810001b61)
@@ -1,17 +1,25 @@
-TeXLIB = .:../LaTeXmacros:../bibliography/:
-LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && pdflatex -halt-on-error
+Build = build
+Macros = ../../LaTeXmacros
+TeXLIB = .:${Macros}:${Build}:../../bibliography:
+LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && pdflatex -halt-on-error -output-directory=${Build}
 BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex
+
+VPATH = ${Build}
 
 all : thesis.pdf
 
-thesis.pdf : Makefile ../LaTeXmacros/common.tex cfa-format.tex thesis.tex intro.tex ctordtor.tex tuples.tex variadic.tex conclusions.tex
+thesis.pdf : Makefile ${Build} ${Macros}/common.tex cfa-format.tex thesis.tex intro.tex ctordtor.tex tuples.tex variadic.tex conclusions.tex
 	${LaTeX} thesis
-	${BibTeX} thesis
+	${BibTeX} ${Build}/thesis
 	${LaTeX} thesis
 	${LaTeX} thesis
+	cp -p ${Build}/thesis.pdf .
 	pdf2ps thesis.pdf thesis.ps
 
+${Build}:
+	mkdir -p ${Build}
+
 clean :
-	rm -f *.aux *.bbl *.blg *.lof *.log *.lot *.out *.toc
+	@rm -frv ${Build}
 
 spotless : clean
Index: doc/theses/rob_schluntz/intro.tex
===================================================================
--- doc/theses/rob_schluntz/intro.tex	(revision e76bd39e8180f90ceda3cbab1ae87e29d3273deb)
+++ doc/theses/rob_schluntz/intro.tex	(revision 85521c73420335b3b110dad2b1932c2810001b61)
@@ -290,5 +290,5 @@
 \end{cfacode}
 Every if- and iteration-statement in C compares the condition with @0@, and every increment and decrement operator is semantically equivalent to adding or subtracting the value @1@ and storing the result.
-Due to these rewrite rules, the values @0@ and @1@ have the types \zero and \one in \CFA, which allow for overloading various operations that connect to @0@ and @1@ \footnote{In the original design of \CFA, @0@ and @1@ were overloadable names \cite[p.~7]{cforall}.}.
+Due to these rewrite rules, the values @0@ and @1@ have the types \zero and \one in \CFA, which allow for overloading various operations that connect to @0@ and @1@ \footnote{In the original design of \CFA, @0@ and @1@ were overloadable names \cite[p.~7]{cforall-refrat}.}.
 The types \zero and \one have special built-in implicit conversions to the various integral types, and a conversion to pointer types for @0@, which allows standard C code involving @0@ and @1@ to work as normal.
 \begin{cfacode}
Index: doc/theses/rob_schluntz/thesis.tex
===================================================================
--- doc/theses/rob_schluntz/thesis.tex	(revision e76bd39e8180f90ceda3cbab1ae87e29d3273deb)
+++ doc/theses/rob_schluntz/thesis.tex	(revision 85521c73420335b3b110dad2b1932c2810001b61)
@@ -288,5 +288,5 @@
 \addcontentsline{toc}{chapter}{\textbf{References}}
 
-\bibliography{cfa,thesis}
+\bibliography{pl,thesis}
 % Tip 5: You can create multiple .bib files to organize your references.
 % Just list them all in the \bibliogaphy command, separated by commas (no spaces).
Index: doc/theses/thierry_delisle/Makefile
===================================================================
--- doc/theses/thierry_delisle/Makefile	(revision e76bd39e8180f90ceda3cbab1ae87e29d3273deb)
+++ doc/theses/thierry_delisle/Makefile	(revision 85521c73420335b3b110dad2b1932c2810001b61)
@@ -1,7 +1,13 @@
-## Define the appropriate configuration variables.
+## Define the configuration variables.
 
-TeXLIB = .:./style:./text:./annex:./build:../../LaTeXmacros:../../LaTeXmacros/listings:../../LaTeXmacros/enumitem:~/bibliographies:/usr/local/bibliographies:
-LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error -output-directory=build -interaction=nonstopmode
+Build = build
+Figures = figures
+Macros = ../../LaTeXmacros
+TeXLIB = .:style:text:annex:${Macros}:${Build}:../../bibliography:
+LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error -output-directory=${Build}
 BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex -terse
+
+MAKEFLAGS = --no-print-directory --silent #
+VPATH = ${Build} ${Figures}
 
 ## Define the text source files.
@@ -24,15 +30,15 @@
 }
 
-FIGURES = ${addprefix build/, ${addsuffix .tex, \
-	monitor \
-	ext_monitor \
-	int_monitor \
-	dependency \
-}}
+FIGURES = ${addsuffix .tex, \
+monitor \
+ext_monitor \
+int_monitor \
+dependency \
+}
 
-PICTURES = ${addprefix build/, ${addsuffix .pstex, \
-	system \
-	monitor_structs \
-}}
+PICTURES = ${addsuffix .pstex, \
+system \
+monitor_structs \
+}
 
 PROGRAMS = ${addsuffix .tex, \
@@ -48,77 +54,47 @@
 # Directives #
 
+.PHONY : all clean					# not file names
+
 all : ${DOCUMENT}
 
 clean :
-	@rm -fv ${DOCUMENT} \
-	build/*.acn     \
-	build/*.acr     \
-	build/*.alg     \
-	build/*.aux     \
-	build/*.bbl     \
-	build/*.blg     \
-	build/*.brf     \
-	build/*.cf      \
-	build/*.dvi     \
-	build/*.glg     \
-	build/*.glo     \
-	build/*.gls     \
-	build/*.ist     \
-	build/*.idx     \
-	build/*.ilg     \
-	build/*.ind     \
-	build/*.log     \
-	build/*.out     \
-	build/*.ps      \
-	build/*.pstex   \
-	build/*.pstex_t \
-	build/*.tex     \
-	build/*.toc     \
-	build/*.lof     \
-	build/*.lol     \
-	build/*.lot     \
-	figures/*.tex   \
-	*.png           \
-
+	@rm -frv ${DOCUMENT} ${basename ${DOCUMENT}}.ps ${Build}
 
 # File Dependencies #
 
-${DOCUMENT} : build/${basename ${DOCUMENT}}.ps
+${DOCUMENT} : ${basename ${DOCUMENT}}.ps
 	ps2pdf $<
 
-build/${basename ${DOCUMENT}}.ps : build/${basename ${DOCUMENT}}.dvi
-	dvips $< -o $@
+${basename ${DOCUMENT}}.ps : ${basename ${DOCUMENT}}.dvi
+	dvips ${Build}/$< -o $@
 
-build/${basename ${DOCUMENT}}.dvi : Makefile ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${basename ${DOCUMENT}}.tex ../../LaTeXmacros/common.tex ../../LaTeXmacros/indexstyle annex/local.bib
-
-	@ if [ ! -r ${basename $@}.ind ] ; then touch ${basename $@}.ind ; fi 				# Conditionally create an empty *.ind (index) file for inclusion until makeindex is run.
-	@ echo "Citation lookup"											# Must have *.aux file containing citations for bibtex
-	@ if [ ! -r ${basename $@}.aux ] ; then ${LaTeX} ${basename ${notdir $@}}.tex ; fi
-	@ echo "Citation Pass 1"
-	@ -${BibTeX} ${basename $@}											# Some citations reference others so run steps again to resolve these citations
-	@ echo "Citation Pass 2"
-	@ ${LaTeX} ${basename ${notdir $@}}.tex
-	@ -${BibTeX} ${basename $@}
-	@ echo "Glossary"
-	@ makeglossaries -q -s ${basename $@}.ist ${basename $@}						# Make index from *.aux entries and input index at end of document
-	@ echo ".dvi generation"
-	@ -build/bump_ver.sh
-	@ ${LaTeX} ${basename ${notdir $@}}.tex									# Run again to get index title into table of contents
-
-
-predefined :
-	sed -f predefined.sed ${basename ${DOCUMENT}}.tex > ${basename $@}.cf
+${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
+		${Macros}/common.tex ${Macros}/indexstyle annex/local.bib ../../bibliography/pl.bib
+	# Must have *.aux file containing citations for bibtex
+	if [ ! -r ${basename $@}.aux ] ; then ${LaTeX} ${basename $@}.tex ; fi
+	-${BibTeX} ${Build}/${basename $@}
+	# Some citations reference others so run again to resolve these citations
+	${LaTeX} ${basename $@}.tex
+	-${BibTeX} ${Build}/${basename $@}
+	# Make index from *.aux entries and input index at end of document
+	makeglossaries -q -s ${Build}/${basename $@}.ist ${Build}/${basename $@}
+	-version.sh
+	# Run again to finish citations
+	${LaTeX} ${basename $@}.tex
 
 ## Define the default recipes.
 
-build/%.tex : figures/%.fig
-	fig2dev -L eepic $< > $@
+${Build}:
+	mkdir -p ${Build}
 
-build/%.ps : figures/%.fig
-	fig2dev -L ps $< > $@
+%.tex : %.fig
+	fig2dev -L eepic $< > ${Build}/$@
 
-build/%.pstex : figures/%.fig
-	fig2dev -L pstex $< > $@
-	fig2dev -L pstex_t -p $@ $< > $@_t
+%.ps : %.fig
+	fig2dev -L ps $< > ${Build}/$@
+
+%.pstex : %.fig
+	fig2dev -L pstex $< > ${Build}/$@
+	fig2dev -L pstex_t -p ${Build}/$@ $< > ${Build}/$@_t
 
 #-----------------------------------------------------------------------------------
@@ -145,6 +121,4 @@
 			"\end{document}" > $@
 
-
-
 # Local Variables: #
 # compile-command: "make" #
Index: doc/theses/thierry_delisle/build/bump_ver.sh
===================================================================
--- doc/theses/thierry_delisle/build/bump_ver.sh	(revision e76bd39e8180f90ceda3cbab1ae87e29d3273deb)
+++ 	(revision )
@@ -1,6 +1,0 @@
-#!/bin/bash
-if [ ! -f version ]; then
-    echo "0.0.0" > version
-fi
-
-sed -r 's/([0-9]+\.[0-9]+.)([0-9]+)/echo "\1\$((\2+1))" > version/ge' version > /dev/null
Index: doc/theses/thierry_delisle/version
===================================================================
--- doc/theses/thierry_delisle/version	(revision e76bd39e8180f90ceda3cbab1ae87e29d3273deb)
+++ doc/theses/thierry_delisle/version	(revision 85521c73420335b3b110dad2b1932c2810001b61)
@@ -1,1 +1,1 @@
-0.11.403
+0.11.409
Index: doc/theses/thierry_delisle/version.sh
===================================================================
--- doc/theses/thierry_delisle/version.sh	(revision 85521c73420335b3b110dad2b1932c2810001b61)
+++ doc/theses/thierry_delisle/version.sh	(revision 85521c73420335b3b110dad2b1932c2810001b61)
@@ -0,0 +1,6 @@
+#!/bin/bash
+if [ ! -f version ]; then
+    echo "0.0.0" > version
+fi
+
+sed -r 's/([0-9]+\.[0-9]+.)([0-9]+)/echo "\1\$((\2+1))" > version/ge' version > /dev/null
Index: doc/user/Makefile
===================================================================
--- doc/user/Makefile	(revision e76bd39e8180f90ceda3cbab1ae87e29d3273deb)
+++ doc/user/Makefile	(revision 85521c73420335b3b110dad2b1932c2810001b61)
@@ -9,5 +9,5 @@
 
 MAKEFLAGS = --no-print-directory --silent #
-VPATH = ${Figures}
+VPATH = ${Build} ${Figures}
 
 ## Define the text source files.
@@ -56,5 +56,5 @@
 	dvips ${Build}/$< -o $@
 
-${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${basename ${DOCUMENT}}.tex \
+${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
 		${Macros}/common.tex ${Macros}/lstlang.sty ${Macros}/indexstyle ../bibliography/pl.bib
 	# Conditionally create an empty *.ind (index) file for inclusion until makeindex is run.
Index: doc/user/user.tex
===================================================================
--- doc/user/user.tex	(revision e76bd39e8180f90ceda3cbab1ae87e29d3273deb)
+++ doc/user/user.tex	(revision 85521c73420335b3b110dad2b1932c2810001b61)
@@ -11,6 +11,6 @@
 %% Created On       : Wed Apr  6 14:53:29 2016
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Wed Jan 31 07:59:24 2018
-%% Update Count     : 3146
+%% Last Modified On : Wed Jan 31 22:29:25 2018
+%% Update Count     : 3147
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
