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.

1 files changed, 5 insertions, 50 deletions

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}