Adjusted for 16:9 aspect ratio, improved Git demonstration

For EWASS, they recommended a 16:9 aspect ratio. This is becoming the
standard and after some tests, I saw felt that it does indeed show
better on modern monitors while also giving more horizontal space. The
slides are now changed to this aspect ratio and everything was
slightly modified to show nicely in it.

Also, an extra step was added to the Git demonstration steps to show
how progress on the project branch happens independently of progress
on the template.

2 files changed, 69 insertions, 32 deletions

diff --git a/tex/git-branch.tex b/tex/git-branch.tex
index 98234d3..982313d 100644
--- a/tex/git-branch.tex
+++ b/tex/git-branch.tex
@@ -1,56 +1,82 @@
-\begin{columns}
+\begin{columns}[t]
   \column{5cm}
   \vspace{-0.4cm}
 
   \begin{tikzpicture}
 
-    \draw [white] (0,0) -- (0,8.3);
+    \draw [white] (0,0) -- (0,7.4);
 
     %% Template branch.
     \ifdefined\tofuture
-    \draw[->, line width=2mm] (0,0) -- (0,8.2);
+      \draw[->, line width=2mm] (0,0) -- (0,7.3);
     \else
-    \draw[->, line width=2mm] (0,0) -- (0,6.5);
+      \ifdefined\tempevolve
+        \draw[->, line width=2mm] (0,0) -- (0,5.5);
+      \else
+        \draw[->, line width=2mm] (0,0) -- (0,2.3);
+      \fi
     \fi
 
     %% Project branch.
-    \ifdefined\projbranch
+    \ifdefined\projinit
       \draw[line width=2mm] (0,1.5) -- (1,2);
       \ifdefined\tofuture
-        \draw[->, line width=2mm] (0.95,1.92) -- (0.95,8);
+        \draw[->, line width=2mm] (0.95,1.92) -- (0.95,7.3);
       \else
-        \draw[->, line width=2mm] (0.95,1.92) -- (0.95,7);
+        \ifdefined\mergewithtemp
+          \draw[->, line width=2mm] (0.95,1.92) -- (0.95,5.7);
+        \else
+          \ifdefined\projwork
+            \draw[->, line width=2mm] (0.95,1.92) -- (0.95,5);
+          \else
+            \draw[->, line width=2mm] (0.95,1.92) -- (0.95,3);
+          \fi
+        \fi
       \fi
     \fi
 
     %% Merge link
-    \ifdefined\mergebranch
-    \draw[line width=2mm] (0,5.5) -- (0.95,6.05);
+    \ifdefined\mergewithtemp
+    \draw[line width=2mm] (0,4.5) -- (0.95,5.05);
     \fi
 
+    %% COMMITS: Note that commits have to come after the branches,
+    %% otherwise the black lines are going to be over the commit
+    %% circles.
+
     %% Template commits.
     \ifdefined\tofuture
-      \foreach \y in {0.55,...,7.55}
+      \foreach \y in {0.55,...,7}
       \draw [fill=green!80!blue, opacity=0.5] (0,\y) circle [radius=2.1mm];
     \else
-      \foreach \y in {0.55,...,6.5}
-      \draw [fill=green!80!blue, opacity=0.5] (0,\y) circle [radius=2.1mm];
+      \ifdefined\tempevolve
+        \foreach \y in {0.55,...,5}
+        \draw [fill=green!80!blue, opacity=0.5] (0,\y) circle [radius=2.1mm];
+      \else
+        \foreach \y in {0.55,...,2.5}
+        \draw [fill=green!80!blue, opacity=0.5] (0,\y) circle [radius=2.1mm];
+      \fi
     \fi
 
     %% Project commits.
-    \ifdefined\projbranch
+    \ifdefined\projinit
       \draw[anchor=north] (1,1.7) node {Project};
 
       \ifdefined\tofuture
-        \foreach \y in {2,...,7.55}
+        \foreach \y in {2,...,6}
         \draw [fill=red!60!green, opacity=0.5] (0.95,\y) circle [radius=2.1mm];
       \else
-        \ifdefined\mergebranch
-          \foreach \y in {2,...,6.5}
-          \draw [fill=red!60!green, opacity=0.5] (0.95,\y) circle [radius=2.1mm];
-        \else
+        \ifdefined\mergewithtemp
           \foreach \y in {2,...,5}
           \draw [fill=red!60!green, opacity=0.5] (0.95,\y) circle [radius=2.1mm];
+        \else
+          \ifdefined\projwork
+            \foreach \y in {2,...,4.9}
+            \draw [fill=red!60!green, opacity=0.5] (0.95,\y) circle [radius=2.1mm];
+          \else
+            \foreach \y in {2,...,2.9}
+            \draw [fill=red!60!green, opacity=0.5] (0.95,\y) circle [radius=2.1mm];
+          \fi
         \fi
       \fi
     \fi
@@ -59,32 +85,42 @@
 
     %% Happy scientist
     \ifdefined\githappy
-    \node [inner sep=0pt] at (3.5,6) {\includegraphics[width=2cm]{img/happy.jpg}};
-    \node [inner sep=0pt] at (4.15,7.3) {\includegraphics[width=0.2cm]{img/checkmark.png}};
-    \draw[anchor=east] (2.4,7) node {\footnotesize\texttt{5cfe2eab}};
-    \draw[anchor=south] (4.5,7) node [rotate=20] {\tiny\texttt{5cfe2eab}};
+    \node [inner sep=0pt] at (3.5,4) {\includegraphics[width=2cm]{img/happy.jpg}};
+    \node [inner sep=0pt] at (4.15,5.3) {\includegraphics[width=0.2cm]{img/checkmark.png}};
+    \draw[anchor=east] (2.4,6) node {\footnotesize\texttt{5cfe2eab}};
+    \draw[anchor=south] (4.5,5) node [rotate=20] {\tiny\texttt{5cfe2eab}};
     \fi
 
   \end{tikzpicture}
 
-  \column{6cm}
+  \column{8cm}
+  \vspace{-5mm}
   \begin{itemize}
-    \setlength\itemsep{0.6cm}
+    \setlength\itemsep{0.3cm}
   \item Template's history is recorded.
-    \ifdefined\projbranch
-  \item New projects: a branch in the history.
+    \ifdefined\projinit
+  \item New project: a branch from the template.
     \fi
-    \ifdefined\mergebranch
-  \item Low-level updates in the template can always be imported into
-    a project.
+    \ifdefined\projwork
+  \item Research progresses in the project branch.
+    \fi
+    \ifdefined\tempevolve
+  \item Template will evolve (improved infrastructure).
+    \fi
+    \ifdefined\mergewithtemp
+  \item Template can always be imported/merged into project.
     \fi
     \ifdefined\tofuture
   \item The template and project will \alert{evolve}.
     \fi
     \ifdefined\githappy
+  \item During research this \alert{encourages creative tests}\\
+    (previous research states can easily be retrieved).
+  \item \alert{Coauthors} can work on same project in parallel
+    \\(separate project branches).
   \item Upon publication, the \alert{Git hash} is enough to verify the
     integrity of the result.
-  \item During research this encourages creative tests on any step.
+
     \fi
   \end{itemize}
 \end{columns}
diff --git a/tex/project-graph.tex b/tex/project-graph.tex
index 2a0dc66..1ed5b73 100644
--- a/tex/project-graph.tex
+++ b/tex/project-graph.tex
@@ -1,6 +1,7 @@
 \small
 \Wider[5em]{
-
+\centering
+\vspace{-3mm}
 \begin{tikzpicture}[>=stealth, thick, black!50, text=black,
     every new ->/.style={shorten >=1pt},
     hv path/.style={to path={-| (\tikztotarget)}},
@@ -8,7 +9,7 @@
 
   %% This white line is only added to fix the vertical position of the
   %% figure so it doesn't change as we add more boxes.
-  \draw [white] (0,-4.2) -- (0,4.2);
+  \draw [white] (0,-4.3) -- (0,3.8);
   \draw [white] (-0.5,0) -- (12,0);
 
   %% Box showing containers.