From 94ebb71f0b5f9e7c7f7f287a21f5f97643d83fa6 Mon Sep 17 00:00:00 2001
From: Laurent Modolo <laurent.modolo@ens-lyon.fr>
Date: Fri, 7 Jul 2017 14:47:39 +0200
Subject: [PATCH] change lualatex to pdflatex
---
Makefile | 2 +-
header.tex | 1 +
img/{subversion_logo.jpg => subversion_logo.png} | Bin
presentation.tex | 12 ++++++------
4 files changed, 8 insertions(+), 7 deletions(-)
rename img/{subversion_logo.jpg => subversion_logo.png} (100%)
diff --git a/Makefile b/Makefile
index c2d1c39..34f33f7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
all: presentation.pdf
presentation.pdf: presentation.tex header.tex
- latex -shell-escape presentation.tex
+ pdflatex -shell-escape presentation.tex
clean:
rm presentation.{aux,bcf,dvi,log,nav,out,run.xml,snm,toc}
diff --git a/header.tex b/header.tex
index 1c4b3fc..9b2f10f 100644
--- a/header.tex
+++ b/header.tex
@@ -17,6 +17,7 @@
\usepackage{array} % Pour générer des tableaux
\setbeamertemplate{footline}[default]
\usepackage{multirow}
+\usepackage{graphicx}
%% symbol in math mode
\newcommand\NN{\mathbb{N}}
\newcommand\ZZ{\mathbb{Z}}
diff --git a/img/subversion_logo.jpg b/img/subversion_logo.png
similarity index 100%
rename from img/subversion_logo.jpg
rename to img/subversion_logo.png
diff --git a/presentation.tex b/presentation.tex
index d970719..63525a3 100644
--- a/presentation.tex
+++ b/presentation.tex
@@ -32,13 +32,13 @@ time so that you can recall specific versions later.
\end{itemize}
\begin{columns}
\begin{column}{0.3\textwidth}
- \includegraphics[width=1.1\textwidth]{./img/subversion_logo.jpg}
+ \includegraphics[width=\textwidth]{./img/subversion_logo.png}
\end{column}
\begin{column}{0.3\textwidth}
- \includegraphics[width=1.1\textwidth]{./img/git_logo.jpg}
+ \includegraphics[width=\textwidth]{./img/git_logo.jpg}
\end{column}
\begin{column}{0.3\textwidth}
- \includegraphics[width=0.6\textwidth]{./img/mercurial_logo.jpg}
+ \includegraphics[width=0.7\textwidth]{./img/mercurial_logo.jpg}
\end{column}
\end{columns}
\end{frame}
@@ -50,7 +50,7 @@ time so that you can recall specific versions later.
{\bf Local}\\
\vspace{-2em}
\begin{center}
- \includegraphics[width=0.6\textwidth]{./img/vcs_local}\\
+ \includegraphics[width=0.6\textwidth]{./img/vcs_local.png}\\
\begin{itemize}
\item can be done manually, but error prone
\item need to collaborate with other developers
@@ -61,7 +61,7 @@ time so that you can recall specific versions later.
{\bf Centralized}\\
\vspace{-2em}
\begin{center}
- \includegraphics[width=0.6\textwidth]{./img/vcs_centralized}\\
+ \includegraphics[width=0.6\textwidth]{./img/vcs_centralized.png}\\
\begin{itemize}
\item In case of failure of the central serveur or network, we lose access
to the version database
@@ -72,7 +72,7 @@ time so that you can recall specific versions later.
{\bf Distributed}\\
\vspace{-2em}
\begin{center}
- \includegraphics[width=0.6\textwidth]{./img/vcs_distributed}\\
+ \includegraphics[width=0.6\textwidth]{./img/vcs_distributed.png}\\
\end{center}
}
\end{frame}
--
GitLab