Merge branch 'master' into xelatex/Togo

slides/modules_EOLE_envole/tronc-commun-2/personnalisation-creole-templates-pratique.tex

@@ -20,7 +20,7 @@
   \framesubtitle{Gérer le service vnstat}
   \begin{enumerate}
     \item Créer un dictionnaire dans le répertoire /usr/share/eole/creole/dicos/local,
-    \item ajouter l’entête \emph{<?xml version="1.0" encoding="utf-8"?>},
+    \item ajouter l’entête \mintinline{xml}{<?xml version="1.0" encoding="utf-8"?>},
     \item ajouter une balise \emph{creole},
     \item ajouter une balise \emph{files} dans la balise \emph{creole},
     \item ajouter une balise \emph{service} dans la balise \emph{files},

slides/style/preambule.tex

@@ -10,6 +10,7 @@
 %\usepackage{colortbtl}
 \usepackage{graphicx}
 \usepackage{verbatim}            % Pour l'insertion de fichier en mode verbatim
+\usepackage{minted}
 \usepackage{ucs}
 \usepackage{tabto}
 \usepackage{tikz}

templates/main-beamer.tex

@@ -20,7 +20,11 @@
 \skbinput[from=(((content)))]{style/preambule}
 
 \newlength{\logospacing}
+((* if intitutes|length > 1 *))
 \setlength{\logospacing}{(\textwidth - 2cm*(((logos_count))))/(((logos_count - 1)))} 
+((* else *))
+\setlength{\logospacing}{0 cm}
+((* endif *))
 
 \logo{
 ((* for institute in institutes *))

templates/preambule.tex

@@ -1,44 +0,0 @@
-%\usertheme{Madrid}
-\setbeamercovered{transparent}
-\setcounter{tocdepth}{2}
-\usepackage[french]{babel}
-%\usepackage[utf8,utf8x]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage{xunicode} %Unicode extras!
-\usepackage{xltxtra}  %Fixes
-\setmainfont{CaviarDreams}
-\usepackage{multicol}
-%\usepackage{colortbtl}
-\usepackage{graphicx}
-\usepackage{verbatim}            % Pour l'insertion de fichier en mode verbatim
-\usepackage{ucs}
-\usepackage{tabto}
-\usepackage{xcolor}
-\usepackage{hyperref}
-\usepackage{hyperxmp}
-\hypersetup{%
- colorlinks=true,linkcolor=blue,urlcolor=blue,pdfpagemode=UseNone,
- pdftitle={(((title)))},
- pdfkeywords={},
- pdfauthor={(((author)))},
- pdflang={fr-FR},
- pdfcopyright={Copyright © 2011-2014 Cadoles}, % Nécessite XeTeX
- pdflicenseurl={http://creativecommons.org/licenses/by-nc-sa/2.0/fr/},
-}
-%\usecolortheme{crane}
-\definecolor{UniBlue}{RGB}{83,121,180}
-\definecolor{CleanWhite}{RGB}{255,255,255}
-\setbeamercolor{title}{fg=UniBlue}
-\setbeamercolor{frametitle}{fg=CleanWhite}
-\setbeamercolor{structure}{fg=UniBlue}
-\newcommand{\eolesmall}{
- \begin{minipage}[c]{0.10\textwidth}
-  \includegraphics[width=1cm]{beamer-skel/img/logo-eole.png}
- \end{minipage}
-}
-\newcommand{\eolebig}{\includegraphics[width=2cm]{beamer-skel/img/logo-eole.png}}
-\newcommand{\eolefull}{\includegraphics{beamer-skel/img/logo-eole.png}}
-%\setmonofont[Scale=0.86]{Andale Mono}
-%\usepackage{colortab}
-
-\setbeamertemplate{background}{\includegraphics[width=128mm]{beamer-skel/img/banner01.png}}