fix image sizes

presentation/presentation.tex

@@ -83,9 +83,9 @@
 		\item Zeiger wird mit jedem Commit vorwärts bewegt
 	\end{itemize}
 	\center
-	\begin{figure}
-		\includegraphics{../grafiken/ex4-graph}
-	\end{figure}
+	\begin{image}
+		\img{../grafiken/ex4-graph}
+	\end{image}
 \end{frame}
 
 %
@@ -99,9 +99,9 @@
 		\item Referenz auf objekte durch Hash des Zielobjekts
 	\end{itemize}
 	\center
-	\begin{figure}
-		\includegraphics{../grafiken/git-object}
-	\end{figure}
+	\begin{image}
+		\img{../grafiken/git-object}
+	\end{image}
 \end{frame}
 
 \subsection{Konsequenz}
@@ -205,11 +205,10 @@
 			\uncover<2>{\cmd{git commit -m} \str{pep8} & \cmt{Änderungen commiten} \\}
 		\end{commandline}
 	\end{Beispiel}
-	\center
-	\begin{figure}
-		\only<1>{\includegraphics{../grafiken/ex1-graph-precommit}}
-		\only<2>{\includegraphics{../grafiken/ex1-graph}}
-	\end{figure}
+	\begin{images}
+		\only<1>{\img{../grafiken/ex1-graph-precommit}}
+		\only<2>{\img{../grafiken/ex1-graph}}
+	\end{images}
 \end{frame}
 
 %
@@ -297,10 +296,10 @@
 			\visible<2->{\cmd{git commit -m} \str{presort input}} & \\
 		\end{commandline}
 		\center
-		\begin{figure}
-			\only<1>{\includegraphics{../grafiken/ex2-graph-precommit}}
-			\only<2>{\includegraphics{../grafiken/ex2-graph}}
-		\end{figure}
+		\begin{images}[0.4]
+			\only<1>{\img{../grafiken/ex2-graph-precommit}}
+			\only<2>{\img{../grafiken/ex2-graph}}
+		\end{images}
 	\end{Beispiel}
 \end{frame}
 
@@ -327,10 +326,10 @@
 		\item Erzeugt keinen Merge Commit (!)
 	\end{itemize}
 	\center
-	\begin{figure}
-		\only<1>{\includegraphics{../grafiken/merge-fast-forward-premerge}}
-		\only<2>{\includegraphics{../grafiken/merge-fast-forward}}
-	\end{figure}
+	\begin{images}
+		\only<1>{\img{../grafiken/merge-fast-forward-premerge}}
+		\only<2>{\img{../grafiken/merge-fast-forward}}
+	\end{images}
 \end{frame}
 
 
@@ -346,10 +345,10 @@
 		\item \code{tree} des commits enthält gemerget Version
 	\end{itemize}
 	\center
-	\begin{figure}
-		\only<1>{\includegraphics{../grafiken/merge-three-way-premerge}}
-		\only<2>{\includegraphics{../grafiken/merge-three-way}}
-	\end{figure}
+	\begin{images}
+		\only<1>{\img{../grafiken/merge-three-way-premerge}}
+		\only<2>{\img{../grafiken/merge-three-way}}
+	\end{images}
 \end{frame}
 
 \subsection{Beispiel merge}
@@ -361,10 +360,10 @@
 		\end{commandline}
 	\end{Beispiel}
 	\center
-	\begin{figure}
-		\only<1>{\includegraphics{../grafiken/ex3-graph-premerge}}
-		\only<2>{\includegraphics{../grafiken/ex3-graph}}
-	\end{figure}
+	\begin{images}[0.4]
+		\only<1>{\img{../grafiken/ex3-graph-premerge}}
+		\only<2>{\img{../grafiken/ex3-graph}}
+	\end{images}
 \end{frame}
 
 %
@@ -416,11 +415,11 @@
 			\visible<3->{\cmd{git merge} alice/master} & \\
 		\end{commandline}
 		\center
-		\begin{figure}
-			\only<1>{\includegraphics{../grafiken/ex4-graph-prefetch}}
-			\only<2>{\includegraphics{../grafiken/ex4-graph-premerge}}
-			\only<3>{\includegraphics{../grafiken/ex4-graph}}
-		\end{figure}
+		\begin{images}[0.4]
+			\only<1>{\img{../grafiken/ex4-graph-prefetch}}
+			\only<2>{\img{../grafiken/ex4-graph-premerge}}
+			\only<3>{\img{../grafiken/ex4-graph}}
+		\end{images}
 	\end{Beispiel}
 \end{frame}
 
@@ -460,9 +459,9 @@
 \begin{frame}
 	\frametitle{\secname}
 	\center\small
-	\begin{figure}
-		\includegraphics[width=0.8\textwidth]{github-repo.png}
-	\end{figure}
+	\begin{image}
+		\img{github-repo.png}
+	\end{image}
 		GitHub Projekt Seite\\(\url{https:/github.com/git/git})
 \end{frame}
 
@@ -475,9 +474,9 @@
 	\frametitle{\subsecname}
 	GitHub nutzt zum Beitragen primär Forks und Pullrequests
 	\center
-	\begin{figure}
-		\includegraphics{../grafiken/github-workflow}
-	\end{figure}
+	\begin{image}[0.9]
+		\img{../grafiken/github-workflow}
+	\end{image}
 \end{frame}
 
 \section{Fazit}

presentation/theme.tex

@@ -39,6 +39,26 @@
 }
 \setbeamertemplate{footline}{\footline}
 
+\def\imageheight{0.3\textheight}
+\newenvironment{images}[1][0.5]%
+	{
+		\def\imageheight{#1\textheight}
+		\begin{overlayarea}{\textwidth}{\imageheight}
+		\center
+	}%
+	{\end{overlayarea}}
+
+\newenvironment{image}[1][0.5]%
+	{
+		\def\imageheight{#1\textheight}
+		\center
+	}%
+	{\par}
+
+\newcommand\img[2][\imageheight]{
+	\includegraphics[keepaspectratio=true,width=\textwidth, height=#1]{#2}
+}
+
 \renewcommand\titlepage{
 	\begin{center}
 		\vfill