Better implementation of the make-demo graph, added preamble

Some minor modifications were made in the graph showing the
organization of the analysis with Make. Also, a `tex/preamble.tex' was
defined to simplify the main source.

22 files changed, 95 insertions, 52 deletions

diff --git a/Makefile b/Makefile
index c935bda..55ef6b2 100644
--- a/Makefile
+++ b/Makefile
@@ -16,8 +16,7 @@
 # along with this Makefile.  If not, see <https://www.gnu.org/licenses/>.
 
 # PDF slides:
-reproducible-paper.pdf: reproducible-paper.tex \
-                        tex/project-graph.tex tex/git-branch.tex
+reproducible-paper.pdf: reproducible-paper.tex tex/*.tex
         # We'll run pdflatex two times so the page numbers and
         # internal links also work.
 	if [ -d .git ]; then v=$$(git describe --dirty --always --long); \
diff --git a/img/make-demo-1-empty.pdf b/img/make-demo-1-empty.pdf
new file mode 100644
index 0000000..3a4669b
--- /dev/null
+++ b/img/make-demo-1-empty.pdf
diff --git a/img/make-demo-1-raw.pdf b/img/make-demo-1-raw.pdf
deleted file mode 100644
index ec9530b..0000000
--- a/img/make-demo-1-raw.pdf
+++ /dev/null
diff --git a/img/make-demo-10-texsources.pdf b/img/make-demo-10-texsources.pdf
index 9a57969..c854ba6 100644
--- a/img/make-demo-10-texsources.pdf
+++ b/img/make-demo-10-texsources.pdf
diff --git a/img/make-demo-11-downloadtex.pdf b/img/make-demo-11-downloadtex.pdf
index 4277da7..a36b45e 100644
--- a/img/make-demo-11-downloadtex.pdf
+++ b/img/make-demo-11-downloadtex.pdf
diff --git a/img/make-demo-12-analysis1tex.pdf b/img/make-demo-12-analysis1tex.pdf
index 46c75cb..69c3487 100644
--- a/img/make-demo-12-analysis1tex.pdf
+++ b/img/make-demo-12-analysis1tex.pdf
diff --git a/img/make-demo-13-analysis2tex.pdf b/img/make-demo-13-analysis2tex.pdf
index 38188d8..e93637f 100644
--- a/img/make-demo-13-analysis2tex.pdf
+++ b/img/make-demo-13-analysis2tex.pdf
diff --git a/img/make-demo-14-analysis3tex.pdf b/img/make-demo-14-analysis3tex.pdf
index a71a3ca..d5d49aa 100644
--- a/img/make-demo-14-analysis3tex.pdf
+++ b/img/make-demo-14-analysis3tex.pdf
diff --git a/img/make-demo-15-initializetex.pdf b/img/make-demo-15-initializetex.pdf
index bc2570a..46a3389 100644
--- a/img/make-demo-15-initializetex.pdf
+++ b/img/make-demo-15-initializetex.pdf
diff --git a/img/make-demo-16-projectex.pdf b/img/make-demo-16-projectex.pdf
deleted file mode 100644
index 0d46859..0000000
--- a/img/make-demo-16-projectex.pdf
+++ /dev/null
diff --git a/img/make-demo-16-projecttex.pdf b/img/make-demo-16-projecttex.pdf
new file mode 100644
index 0000000..e399b7c
--- /dev/null
+++ b/img/make-demo-16-projecttex.pdf
diff --git a/img/make-demo-17-paper.pdf b/img/make-demo-17-paper.pdf
index 888b299..7c474ec 100644
--- a/img/make-demo-17-paper.pdf
+++ b/img/make-demo-17-paper.pdf
diff --git a/img/make-demo-2-input1.pdf b/img/make-demo-2-input1.pdf
index 9b342fd..f820ed9 100644
--- a/img/make-demo-2-input1.pdf
+++ b/img/make-demo-2-input1.pdf
diff --git a/img/make-demo-3-out1a.pdf b/img/make-demo-3-out1a.pdf
index 92189ad..af903de 100644
--- a/img/make-demo-3-out1a.pdf
+++ b/img/make-demo-3-out1a.pdf
diff --git a/img/make-demo-4-out3a.pdf b/img/make-demo-4-out3a.pdf
index 0f25649..0fc659e 100644
--- a/img/make-demo-4-out3a.pdf
+++ b/img/make-demo-4-out3a.pdf
diff --git a/img/make-demo-5-out2a.pdf b/img/make-demo-5-out2a.pdf
index 52f0599..e2d606e 100644
--- a/img/make-demo-5-out2a.pdf
+++ b/img/make-demo-5-out2a.pdf
diff --git a/img/make-demo-6-out3b.pdf b/img/make-demo-6-out3b.pdf
index c429d6b..ea63f6e 100644
--- a/img/make-demo-6-out3b.pdf
+++ b/img/make-demo-6-out3b.pdf
diff --git a/img/make-demo-7-input2.pdf b/img/make-demo-7-input2.pdf
index aff99d9..21c9a7e 100644
--- a/img/make-demo-7-input2.pdf
+++ b/img/make-demo-7-input2.pdf
diff --git a/img/make-demo-8-out1b.pdf b/img/make-demo-8-out1b.pdf
index fe6f123..120d8d2 100644
--- a/img/make-demo-8-out1b.pdf
+++ b/img/make-demo-8-out1b.pdf
diff --git a/img/make-demo-9-out2b.pdf b/img/make-demo-9-out2b.pdf
index b25a4ea..6b5e6a0 100644
--- a/img/make-demo-9-out2b.pdf
+++ b/img/make-demo-9-out2b.pdf
diff --git a/reproducible-paper.tex b/reproducible-paper.tex
index 8cebe7b..709d169 100644
--- a/reproducible-paper.tex
+++ b/reproducible-paper.tex
@@ -20,6 +20,7 @@
 
 % Read the current Git commit information
 \include{git-commit}
+\include{tex/preamble}
 
 %% Beamer settings.
 %\setbeamertemplate{footline}[frame number]
@@ -63,53 +64,7 @@
   \vspace{1cm}
 }
 
-%% For a wider writing width.
-\newcommand\Wider[2][3em]{%
-\makebox[\linewidth][c]{%
-  \begin{minipage}{\dimexpr\textwidth+#1\relax}
-  \raggedright#2
-  \end{minipage}%
-  }%
-}
 
-%% TiKZ
-\usepackage{tikz}
-\usetikzlibrary{graphs}
-\usetikzlibrary{positioning}
-\tikzset{ bbox/.style={
-  rectangle,
-  minimum width=2.5cm,
-  rounded corners=2mm,
-  very thick,draw=black!50,
-  top color=white,
-  bottom color=black!20 } }
-
-\tikzset{ rbox/.style={
-    rectangle,
-    dotted,
-    minimum width=2.5cm,
-    rounded corners=2mm,
-    very thick,draw=red!50!black!50,
-    top color=white,
-    bottom color=red!50!black!20 } }
-
-\tikzset{ gbox/.style={
-    rectangle,
-    minimum width=2.5cm,
-    very thick,
-    draw=green!50!black!50,
-    top color=white,
-    bottom color=green!50!black!20 } }
-
-%% For the make demo
-\newcommand{\makedemoslide}[2] {
-  \begin{frame}{#2}
-    \begin{center}\includegraphics[width=0.8\linewidth]{#1}\end{center}
-    \footnotesize \textcolor{green!50!black}{Green boxes} are \emph{source}
-    files (hand-written), \textcolor{blue}{Blue boxes} are \emph{built}
-    files (automatically generated).
-  \end{frame}
-  }
 
 
 
@@ -892,10 +847,10 @@
 
 
   %% Make demo.
-  \makedemoslide{img/make-demo-1-raw.pdf}
-                {Source files (containing instructions and configuration parameters).}
+  \makedemoslide{img/make-demo-1-empty.pdf}
+                {Makefiles (\texttt{\*.mk}) keep contextually separate parts of the project, all imported into \texttt{top-make.mk}}
   \makedemoslide{img/make-demo-2-input1.pdf}
-                {First built/output file (downloaded dataset).}
+                {First built/output file (downloaded dataset), managed in \texttt{download.mk}.}
   \makedemoslide{img/make-demo-3-out1a.pdf}
                 {Downloaded file is used to build analysis-1's first output.}
   \makedemoslide{img/make-demo-4-out3a.pdf}
@@ -1015,7 +970,7 @@
                   \texttt{analysis3.tex}.}
   \makedemoslide{img/make-demo-15-initializetex.pdf}
                 {General project information are stored in \texttt{initialize.tex}.}
-  \makedemoslide{img/make-demo-16-projectex.pdf}
+  \makedemoslide{img/make-demo-16-projecttex.pdf}
                 {All the \TeX{} macros are loaded into the single
                   \texttt{project.tex} (after the analysis is complete).}
   \makedemoslide{img/make-demo-17-paper.pdf}
diff --git a/tex/preamble.tex b/tex/preamble.tex
new file mode 100644
index 0000000..91466be
--- /dev/null
+++ b/tex/preamble.tex
@@ -0,0 +1,89 @@
+%% For a wider writing width.
+\newcommand\Wider[2][3em]{%
+\makebox[\linewidth][c]{%
+  \begin{minipage}{\dimexpr\textwidth+#1\relax}
+  \raggedright#2
+  \end{minipage}%
+  }%
+}
+
+%% TiKZ
+\usepackage{tikz}
+\usetikzlibrary{graphs}
+\usetikzlibrary{positioning}
+\tikzset{ bbox/.style={
+  rectangle,
+  minimum width=2.5cm,
+  rounded corners=2mm,
+  very thick,draw=black!50,
+  top color=white,
+  bottom color=black!20 } }
+
+\tikzset{ rbox/.style={
+    rectangle,
+    dotted,
+    minimum width=2.5cm,
+    rounded corners=2mm,
+    very thick,draw=red!50!black!50,
+    top color=white,
+    bottom color=red!50!black!20 } }
+
+\tikzset{ gbox/.style={
+    rectangle,
+    minimum width=2.5cm,
+    very thick,
+    draw=green!50!black!50,
+    top color=white,
+    bottom color=green!50!black!20 } }
+
+%% For the make demo
+\newcommand{\makedemoslide}[2] {
+  \begin{frame}{#2}
+    \begin{center}\includegraphics[width=0.8\linewidth]{#1}\end{center}
+    \footnotesize \textcolor{green!50!black}{Green boxes} are \emph{source}
+    files (hand-written), \textcolor{blue}{Blue boxes} are \emph{built}
+    files (automatically generated).
+  \end{frame}
+}
+
+%% Nodes in make-demo graph
+\tikzset{node-terminal/.style={
+  rectangle,
+  very thick,
+  draw=blue!50,
+  text centered,
+  top color=white,
+  minimum size=6mm,
+  text width=2.1cm,
+  rounded corners=3mm,
+  bottom color=blue!20,
+  font=\ttfamily}}
+
+\tikzset{node-nonterminal/.style={
+  rectangle,
+  very thick,
+  text centered,
+  top color=white,
+  text width=2.1cm,
+  minimum size=6mm,
+  draw=green!50!black!50,
+  bottom color=green!80!black!50,
+  font=\ttfamily}}
+
+\tikzset{node-makefile/.style={
+  thick,
+  rectangle,
+  anchor=south,
+  minimum width=2.6cm,
+  minimum height=5cm,
+  draw=green!50!black!50,
+  rounded corners=2mm,
+  fill=black!10!green!12!white,
+}}
+
+\tikzset{node-point/.style={
+  circle,
+  black!50,
+  inner sep=0pt,
+  minimum size=0pt,
+  fill=white}}