From 54e783e19c67f1aaf6a8435b9a17f992bb764ff7 Mon Sep 17 00:00:00 2001
From: Marc Beninca <cnam@marc-beninca.fr>
Date: Sun, 18 Oct 2020 00:24:08 +0200
Subject: [PATCH] languages

---
 cnam/travaux/thesis/build.py                  |  4 +--
 cnam/travaux/thesis/common.tex                | 26 +++++++++++++++++
 cnam/travaux/thesis/presentation/main.tex     |  2 ++
 cnam/travaux/thesis/presentation/settings.tex |  1 -
 cnam/travaux/thesis/thesis/main.tex           |  3 ++
 cnam/travaux/thesis/thesis/settings.tex       | 28 -------------------
 .../{summary.en.tex => summary.english.tex}   |  0
 .../{summary.fr.tex => summary.french.tex}    |  0
 8 files changed, 33 insertions(+), 31 deletions(-)
 rename cnam/travaux/thesis/thesis/{summary.en.tex => summary.english.tex} (100%)
 rename cnam/travaux/thesis/thesis/{summary.fr.tex => summary.french.tex} (100%)

diff --git a/cnam/travaux/thesis/build.py b/cnam/travaux/thesis/build.py
index 1428ffc..3fb71eb 100755
--- a/cnam/travaux/thesis/build.py
+++ b/cnam/travaux/thesis/build.py
@@ -11,8 +11,8 @@ AUTHOR_LONG = f'Marc {AUTHOR_NAME}'
 MAIN = 'main'
 TMP = 'tmp'
 
-ENGLISH = 'en'
-FRENCH = 'fr'
+ENGLISH = 'english'
+FRENCH = 'french'
 LANGUAGES = [ENGLISH, FRENCH]
 
 DOCUMENTS = [
diff --git a/cnam/travaux/thesis/common.tex b/cnam/travaux/thesis/common.tex
index 22f4d8f..e1d1891 100644
--- a/cnam/travaux/thesis/common.tex
+++ b/cnam/travaux/thesis/common.tex
@@ -1,2 +1,28 @@
+% set languages
+\usepackage{polyglossia}
+% recommended
+\usepackage{csquotes}
+\setmainlanguage{\mainlanguage}
+\setotherlanguages{\otherlanguages}
+
+% imports
+
 \input{settings}
 \input{variables}
+
+% handle multiple languages
+
+\newcommand{\ifstreq}[4]{\expandafter\ifstrequal\expandafter{#1}{#2}{#3}{#4}}
+
+\def\todo{TODO}
+
+\newcommand{\ml}[2]{%
+\ifstreq{\mainlanguage}{english}{\ifstrempty{#1}{\todo}{#1}}{%
+\ifstreq{\mainlanguage}{french}{\ifstrempty{#2}{\todo}{#2}}{%
+ERROR%
+}}%
+}
+
+\newcommand{\en}[1]{\textenglish{#1}}
+
+\newcommand{\fr}[1]{\textfrench{#1}}
diff --git a/cnam/travaux/thesis/presentation/main.tex b/cnam/travaux/thesis/presentation/main.tex
index 278fa1c..6fe88a3 100644
--- a/cnam/travaux/thesis/presentation/main.tex
+++ b/cnam/travaux/thesis/presentation/main.tex
@@ -1,3 +1,5 @@
+\documentclass[aspectratio=1610]{beamer}
+
 \input{../common}
 
 \input{toc}
diff --git a/cnam/travaux/thesis/presentation/settings.tex b/cnam/travaux/thesis/presentation/settings.tex
index 6bd2871..972b42c 100644
--- a/cnam/travaux/thesis/presentation/settings.tex
+++ b/cnam/travaux/thesis/presentation/settings.tex
@@ -1,4 +1,3 @@
-\documentclass[aspectratio=1610]{beamer}
 \usetheme{Berkeley}
 \usecolortheme{seahorse}
 \usebackgroundtemplate{\includegraphics[width=\paperwidth]{../../paper}}
diff --git a/cnam/travaux/thesis/thesis/main.tex b/cnam/travaux/thesis/thesis/main.tex
index 515d192..c1e60ca 100644
--- a/cnam/travaux/thesis/thesis/main.tex
+++ b/cnam/travaux/thesis/thesis/main.tex
@@ -1,3 +1,6 @@
+% set default size and document class
+\documentclass[12pt]{report}
+
 \input{../common}
 
 \begin{document}
diff --git a/cnam/travaux/thesis/thesis/settings.tex b/cnam/travaux/thesis/thesis/settings.tex
index a2ffa80..35defc5 100644
--- a/cnam/travaux/thesis/thesis/settings.tex
+++ b/cnam/travaux/thesis/thesis/settings.tex
@@ -1,6 +1,3 @@
-% set default size and document class
-\documentclass[12pt]{report}
-
 % acronyms, glossary
 \usepackage[acronym,toc]{glossaries}
 \makeglossaries
@@ -45,13 +42,6 @@ bmargin=20mm,lmargin=20mm,rmargin=20mm,tmargin=20mm]{geometry}
 % lists of figures, tables
 \usepackage{tocbibind}
 
-% set languages
-\usepackage{polyglossia}
-% recommended
-\usepackage{csquotes}
-\setmainlanguage{\mainlanguage}
-\setotherlanguages{\otherlanguages}
-
 % references after polyglossia
 \usepackage[sorting=anyt]{biblatex}
 \bibliography{\name}
@@ -69,21 +59,3 @@ bmargin=20mm,lmargin=20mm,rmargin=20mm,tmargin=20mm]{geometry}
 %\setlength{\parsep}{0em}
 %\setlength{\parskip}{0em}
 }{\end{itemize}}
-
-
-% handle multiple languages
-
-\newcommand{\ifstreq}[4]{\expandafter\ifstrequal\expandafter{#1}{#2}{#3}{#4}}
-
-\def\todo{TODO}
-
-\newcommand{\ml}[2]{%
-\ifstreq{\mainlanguage}{en}{\ifstrempty{#1}{\todo}{#1}}{%
-\ifstreq{\mainlanguage}{fr}{\ifstrempty{#2}{\todo}{#2}}{%
-ERROR%
-}}%
-}
-
-\newcommand{\en}[1]{\textenglish{#1}}
-
-\newcommand{\fr}[1]{\textfrench{#1}}
diff --git a/cnam/travaux/thesis/thesis/summary.en.tex b/cnam/travaux/thesis/thesis/summary.english.tex
similarity index 100%
rename from cnam/travaux/thesis/thesis/summary.en.tex
rename to cnam/travaux/thesis/thesis/summary.english.tex
diff --git a/cnam/travaux/thesis/thesis/summary.fr.tex b/cnam/travaux/thesis/thesis/summary.french.tex
similarity index 100%
rename from cnam/travaux/thesis/thesis/summary.fr.tex
rename to cnam/travaux/thesis/thesis/summary.french.tex