diff --git a/cnam/thesis/settings.tex b/cnam/thesis/settings.tex index 8c184d6..0c56780 100644 --- a/cnam/thesis/settings.tex +++ b/cnam/thesis/settings.tex @@ -32,7 +32,6 @@ % return text, according to variable mainlanguage % 1: english text % 2: french text -% FIXME english→\ENGLISH, french→\FRENCH \newcommand{\ml}[2]{% \ifstreq{\mainlanguage}{english}{\ifstrempty{#1}{\todo}{#1}}{% \ifstreq{\mainlanguage}{french}{\ifstrempty{#2}{\todo}{#2}}{% @@ -77,14 +76,14 @@ ERROR% % return key words (part a) % 1: language \newcommand{\kwa}[1]{% -\ifstreq{#1}{\ENGLISH}{\kwaen}{}% -\ifstreq{#1}{\FRENCH}{\kwafr}{}% +\ifstreq{#1}{english}{\kwaen}{}% +\ifstreq{#1}{french}{\kwafr}{}% } % return key words (part b) % 1: language \newcommand{\kwb}[1]{% -\ifstreq{#1}{\ENGLISH}{\kwben}{}% -\ifstreq{#1}{\FRENCH}{\kwbfr}{}% +\ifstreq{#1}{english}{\kwben}{}% +\ifstreq{#1}{french}{\kwbfr}{}% } % final variable kw diff --git a/cnam/thesis/thesis/summaries.tex b/cnam/thesis/thesis/summaries.tex index 0b39787..f24f48a 100644 --- a/cnam/thesis/thesis/summaries.tex +++ b/cnam/thesis/thesis/summaries.tex @@ -6,36 +6,36 @@ \hr \textbf{% -\ifstreq{#1}{\ENGLISH}{SUMMARY}{% -\ifstreq{#1}{\FRENCH}{RÉSUMÉ}{% +\ifstreq{#1}{english}{SUMMARY}{% +\ifstreq{#1}{french}{RÉSUMÉ}{% }}% } \end{center} -\ifstreq{#1}{\ENGLISH}{% +\ifstreq{#1}{english}{% Line 1.\\ Line 2.\\ Line 3.}{% -\ifstreq{#1}{\FRENCH}{% +\ifstreq{#1}{french}{% Ligne 1.\\ Ligne 2.\\ Ligne 3.}{% }} -\ifstreq{#1}{\ENGLISH}{% +\ifstreq{#1}{english}{% Line 4.\\ Line 5.\\ Line 6…}{% -\ifstreq{#1}{\FRENCH}{% +\ifstreq{#1}{french}{% Ligne 4.\\ Ligne 5.\\ Ligne 6…}{% }} \textbf{% -\ifstreq{#1}{\ENGLISH}{Key words:}{% -\ifstreq{#1}{\FRENCH}{Mots clés :}{% +\ifstreq{#1}{english}{Key words:}{% +\ifstreq{#1}{french}{Mots clés :}{% }} \kwa{#1},\\\kwb{#1}.% }