From a2db5cca70fc872753c91de5b95bc542ee8240c8 Mon Sep 17 00:00:00 2001 From: Benjamin Bohard Date: Fri, 7 Aug 2020 11:09:11 +0200 Subject: [PATCH] Gestion des logos en titre et pied de page --- figures/logos/missing.png | Bin 0 -> 4770 bytes .../modules_EOLE_envole/tronc_commun_1.tex | 10 +++++++- .../modules_EOLE_envole/tronc_commun_2.tex | 10 +++++++- setup_main_tex_file.py | 24 ++++++++++++++++-- slides/licences/license-cc-by-sa-2.0.tex | 1 - slides/style/preambule.tex | 8 +----- templates/main-beamer.tex | 14 ++++++++-- 7 files changed, 53 insertions(+), 14 deletions(-) create mode 100644 figures/logos/missing.png diff --git a/figures/logos/missing.png b/figures/logos/missing.png new file mode 100644 index 0000000000000000000000000000000000000000..f7979502213487fdaa90be4a74018f822b1ef508 GIT binary patch literal 4770 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 literal 0 HcmV?d00001 diff --git a/presentations/modules_EOLE_envole/tronc_commun_1.tex b/presentations/modules_EOLE_envole/tronc_commun_1.tex index 38825e1..3338fd4 100644 --- a/presentations/modules_EOLE_envole/tronc_commun_1.tex +++ b/presentations/modules_EOLE_envole/tronc_commun_1.tex @@ -18,12 +18,20 @@ \skbinput[from=sli]{style/preambule} +\newlength{\logospacing} +\setlength{\logospacing}{(\textwidth - 2cm*2)/1} + +\logo{ + \skbfigure[width=2cm]{logos/MENJ.jpg}~ \hspace{\logospacing} + \skbfigure[width=2cm]{logos/Cadoles.png}~ +} + \title[]{Formation tronc commun niveau 1} \subtitle{XXX CLIENT XXX} \author[Equipe Auteur]{Cadoles} -\institute[Cadoles]{\skbfigure[width=2cm]{cadoles/logo_01.png}} +\institute[Cadoles]{\skbfigure[width=2cm]{logos/Cadoles.png}} \date{{\small \today}} diff --git a/presentations/modules_EOLE_envole/tronc_commun_2.tex b/presentations/modules_EOLE_envole/tronc_commun_2.tex index aa1e965..0670f36 100644 --- a/presentations/modules_EOLE_envole/tronc_commun_2.tex +++ b/presentations/modules_EOLE_envole/tronc_commun_2.tex @@ -18,12 +18,20 @@ \skbinput[from=sli]{style/preambule} +\newlength{\logospacing} +\setlength{\logospacing}{(\textwidth - 2cm*2)/1} + +\logo{ + \skbfigure[width=2cm]{logos/MENJ.jpg}~ \hspace{\logospacing} + \skbfigure[width=2cm]{logos/Cadoles.png}~ +} + \title[]{Formation tronc commun niveau 2} \subtitle{XXX CLIENT XXX} \author[Equipe Auteur]{Cadoles} -\institute[Cadoles]{\skbfigure[width=2cm]{cadoles/logo_01.png}} +\institute[Cadoles]{\skbfigure[width=2cm]{logos/Cadoles.png}} \date{{\small \today}} diff --git a/setup_main_tex_file.py b/setup_main_tex_file.py index 64aba7c..7b4c2ec 100755 --- a/setup_main_tex_file.py +++ b/setup_main_tex_file.py @@ -5,7 +5,7 @@ import argparse import re import random import time -from os import path, makedirs +from os import path, makedirs, listdir from jinja2 import Environment, FileSystemLoader LICENSES = {'CC-by-sa-2.0': 'license-cc-by-sa-2.0', @@ -49,6 +49,20 @@ def main(): """ init function """ + def get_institutes_logos(institutes_list=None): + if not institutes_list: + return [] + institutes_logos = [] + known_logos = {path.splitext(path.basename(l))[0]:l for l in listdir('./figures/logos')} + for institute in institutes_list: + if institute in known_logos: + institutes_logos.append(known_logos[institute]) + else: + print(f'Unknown institute {institute}') + print(f'Replacing with missing.png') + institutes_logos.append('missing.png') + return institutes_logos + root = '../' if args.directory: root = root + re.sub(r'[\w-]+/?', '../', args.directory) @@ -80,6 +94,9 @@ def main(): else: client = client + institutes = get_institutes_logos(args.institutes) + logos_count = len(institutes) + 1 + directory = args.directory if not directory: directory = '' @@ -95,7 +112,9 @@ def main(): 'title': title, 'author': author, 'client': client, - 'license': license} + 'license': license, + 'institutes': institutes, + 'logos_count': logos_count} master = TEMPLATES[document_class]['master'] master_dir = path.join('presentations', directory) programme_dir = path.join(master_dir, 'programme') @@ -189,6 +208,7 @@ def main(): parser_init.add_argument('-t', '--title', help="Titre de la formation") parser_init.add_argument('-l', '--license', help="Termes de mise à disposition de la formation") parser_init.add_argument('-d', '--directory', help="Sous-répertoires où créer le fichier", required=True) + parser_init.add_argument('-i', '--institutes', nargs='*', help="Instituts dont les logos sont requis") parser_init.set_defaults(func=init) parser_update = subparsers.add_parser('update', help='Mise à jour des fichiers inclus') parser_update.add_argument('-m', '--master', help="Emplacement du fichier maître", required=True) diff --git a/slides/licences/license-cc-by-sa-2.0.tex b/slides/licences/license-cc-by-sa-2.0.tex index 7758b94..a113619 100644 --- a/slides/licences/license-cc-by-sa-2.0.tex +++ b/slides/licences/license-cc-by-sa-2.0.tex @@ -12,5 +12,4 @@ ou écrivez à Creative Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA. \end{block} -\pnote{test des notes standard} \end{frame} diff --git a/slides/style/preambule.tex b/slides/style/preambule.tex index 69d6556..4732051 100644 --- a/slides/style/preambule.tex +++ b/slides/style/preambule.tex @@ -16,6 +16,7 @@ \usepackage{xcolor} \usepackage{hyperref} \usepackage{hyperxmp} +\usepackage{calc} %\usepackage{pdfpcnotes} % Indisponible dans les paquets, installation manuelle requise \hypersetup{% @@ -47,8 +48,6 @@ {\skbinput[from=fig]{cadoles/simple_dash}} -\institute[Cadoles]{\skbfigure[width=2cm]{cadoles/logo-01.png}} -\institute[MENJ]{\skbfigure[width=2cm]{en/logo_MENJ.jpg}} \date{{\small \today}} @@ -84,11 +83,6 @@ \end{frame} } -\logo{ - \skbfigure[width=2cm]{en/logo_MENJ.jpg}~ \hspace{220pt} - \skbfigure[width=2cm]{cadoles/logo_01.png}~ -} - \addtobeamertemplate{frametitle}{% \begin{tikzpicture}[remember picture,overlay] \node[anchor=north west,yshift=2pt,text opacity=0.5, scale=0.8] at (current page.north west) {\insertsubsection}; diff --git a/templates/main-beamer.tex b/templates/main-beamer.tex index 576d592..04f6ed2 100644 --- a/templates/main-beamer.tex +++ b/templates/main-beamer.tex @@ -16,15 +16,25 @@ \newcommand{\pdftitle}{(((title)))} \newcommand{\pdfkeywords}{EOLE} + \skbinput[from=(((content)))]{style/preambule} +\newlength{\logospacing} +\setlength{\logospacing}{(\textwidth - 2cm*(((logos_count))))/(((logos_count - 1)))} + +\logo{ +((* for institute in institutes *)) + \skbfigure[width=2cm]{logos/(((institute)))}~ \hspace{\logospacing} +((* endfor *)) + \skbfigure[width=2cm]{logos/Cadoles.png}~ +} + \title[]{(((title)))} \subtitle{(((client)))} \author[Equipe Auteur]{(((author)))} -\institute[Cadoles]{\skbfigure[width=2cm]{cadoles/logo_01.png}} - +\institute[Cadoles]{\skbfigure[width=2cm]{logos/Cadoles.png}} \date{{\small \today}}