diff --git a/cnam/travaux/thesis/common.tex b/cnam/travaux/thesis/common.tex index e1d1891..903f7fc 100644 --- a/cnam/travaux/thesis/common.tex +++ b/cnam/travaux/thesis/common.tex @@ -8,7 +8,6 @@ % imports \input{settings} -\input{variables} % handle multiple languages diff --git a/cnam/travaux/thesis/presentation/settings.tex b/cnam/travaux/thesis/presentation/settings.tex index 972b42c..6368f08 100644 --- a/cnam/travaux/thesis/presentation/settings.tex +++ b/cnam/travaux/thesis/presentation/settings.tex @@ -1,3 +1,11 @@ +% variables +\logo{\includegraphics[height=7.5em]{../../cnam}} +\title[\titleshort]{\titlelong} +\subtitle{\titlesub} +\author[\authorshort]{\authorlong} +\institute[CNAM]{Conservatoire National des Arts et Métiers} +\date[\typeshort \dateshort]{\typelong\\\datelong} + \usetheme{Berkeley} \usecolortheme{seahorse} \usebackgroundtemplate{\includegraphics[width=\paperwidth]{../../paper}} diff --git a/cnam/travaux/thesis/presentation/variables.tex b/cnam/travaux/thesis/presentation/variables.tex deleted file mode 100644 index ea4c62f..0000000 --- a/cnam/travaux/thesis/presentation/variables.tex +++ /dev/null @@ -1,11 +0,0 @@ -\logo{\includegraphics[height=7.5em]{../../cnam}} - -\title[\titleshort]{\titlelong} - -\subtitle{\titlesub} - -\author[\authorshort]{\authorlong} - -\institute[CNAM]{Conservatoire National des Arts et Métiers} - -\date[\typeshort \dateshort]{\typelong\\\datelong} diff --git a/cnam/travaux/thesis/thesis/settings.tex b/cnam/travaux/thesis/thesis/settings.tex index 35defc5..ed7d6fe 100644 --- a/cnam/travaux/thesis/thesis/settings.tex +++ b/cnam/travaux/thesis/thesis/settings.tex @@ -1,3 +1,10 @@ +% variables +\def\first{\ml{First}{Prénom}} +\def\last{\ml{LAST}{NOM}} +\def\org{\ml{Organization}{Organisme}} +\def\role{\ml{Role}{Fonction}} +\def\tt{\ml{Title}{Civilité}} + % acronyms, glossary \usepackage[acronym,toc]{glossaries} \makeglossaries diff --git a/cnam/travaux/thesis/thesis/variables.tex b/cnam/travaux/thesis/thesis/variables.tex deleted file mode 100644 index 4fd5d82..0000000 --- a/cnam/travaux/thesis/thesis/variables.tex +++ /dev/null @@ -1,5 +0,0 @@ -\def\first{\ml{First}{Prénom}} -\def\last{\ml{LAST}{NOM}} -\def\org{\ml{Organization}{Organisme}} -\def\role{\ml{Role}{Fonction}} -\def\tt{\ml{Title}{Civilité}}