Scale element in includegraphics for roughly similar-sized figures

Until now, when the figures were built directly from EPS
('\newcommand{\makepdf}{}' was commented), they would take the full
line-width becoming a little too large! I noticed this after letting arXiv
build the PDF.

With this commit, the 'includetikz' tool takes a second argument to be a
parameter given to 'includegraphics' (which is scale in this case).

3 files changed, 11 insertions, 9 deletions

diff --git a/paper.tex b/paper.tex
index 2f3300a..5507292 100644
--- a/paper.tex
+++ b/paper.tex
@@ -282,8 +282,8 @@ Figure \ref{fig:datalineage} (bottom) is the data lineage graph that produced it
 
 \begin{figure*}[t]
   \begin{center}
-    \includetikz{figure-tools-per-year}
-    \includetikz{figure-data-lineage}
+    \includetikz{figure-tools-per-year}{width=0.95\linewidth}
+    \includetikz{figure-data-lineage}{width=0.85\linewidth}
   \end{center}
   \vspace{-3mm}
   \caption{\label{fig:datalineage}
@@ -351,7 +351,7 @@ If changed, Make will \emph{only} re-execute the dependent recipe and all its de
 This fast and cheap testing encourages experimentation (without necessarily knowing the implementation details, e.g., by co-authors or future readers), and ensures self-consistency.
 
 \begin{figure*}[t]
-  \begin{center} \includetikz{figure-branching}\end{center}
+  \begin{center} \includetikz{figure-branching}{scale=1}\end{center}
   \vspace{-3mm}
   \caption{\label{fig:branching} Maneage is a Git branch. Projects using Maneage are branched off it and apply their customizations.
     (a) A hypothetical project's history prior to publication.
diff --git a/tex/src/figure-data-lineage.tex b/tex/src/figure-data-lineage.tex
index 21c84f3..f5aa77c 100644
--- a/tex/src/figure-data-lineage.tex
+++ b/tex/src/figure-data-lineage.tex
@@ -34,10 +34,12 @@
   %% Use small fonts
   \footnotesize
 
-  %% These white lines are only added to fix the vertical position of
-  %% the figure so it doesn't change as we add more boxes.
-  \draw [white] (-7.5,0) -- (7.4,0);
-  \draw [white] (0,-4.7) -- (0,5.7);
+  %% These white lines are only relevant when we want to add boxes in
+  %% multiple figures (for example to build slides). They are used to fix
+  %% the vertical position of the boxs in the figure so it doesn't change
+  %% as we add more boxes.
+  \draw [white] (-7.6,0) -- (7.5,0);
+  \draw [white] (0,-4.5) -- (0,4.9);
 
   %% top-make.mk
   \node [at={(-0.05cm,2mm)},
diff --git a/tex/src/preamble-pgfplots.tex b/tex/src/preamble-pgfplots.tex
index eabdeb7..05e73b7 100644
--- a/tex/src/preamble-pgfplots.tex
+++ b/tex/src/preamble-pgfplots.tex
@@ -79,12 +79,12 @@
 %% from. Without this, TiKZ will use numbers based on the order of
 %% figures. These numbers can be hard to manage and they will also depend
 %% on order in the final PDF, so it will be very buggy to manage them.
-\newcommand{\includetikz}[1]{%
+\newcommand{\includetikz}[2]{%
   \ifdefined\makepdf%
     \tikzsetnextfilename{#1}%
     \input{tex/src/#1.tex}%
   \else
-    \includegraphics[width=\linewidth]{tex/tikz/#1.eps}
+    \includegraphics[#2]{tex/tikz/#1.eps}
   \fi
 }