From 1d5955a4091146f84e3f059505328b51eeffd29d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Novotn=C3=BD?= <witiko@mail.muni.cz> Date: Wed, 24 May 2017 01:09:03 +0200 Subject: [PATCH] `\ifthesis@czech` and `\ifthesis@english` are no longer dynamic. --- fithesis.dtx | 14 ++++++++++++++ style/mu/sci.dtx | 11 +++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/fithesis.dtx b/fithesis.dtx index a8ff457..83d3445 100644 --- a/fithesis.dtx +++ b/fithesis.dtx @@ -1437,6 +1437,20 @@ \RequirePackage[base]{babel}} \fi % \end{macrocode} +% Fix the value of the |\ifthesis@english| macro. +% \changes{v0.3.45}{2017/05/23}{Updated the \cs{ifthesis@english} +% macro, so that it no longer dynamically reacts on changes of +% the locale. Instead, it is now based on the main locale during +% the expansion of |\thesisload|.} +% \begin{macrocode} +\ifthesis@english + \expandafter\expandafter\expandafter\let\expandafter\expandafter + \csname ifthesis@english\endcsname\csname iftrue\endcsname +\else + \expandafter\expandafter\expandafter\let\expandafter\expandafter + \csname ifthesis@english\endcsname\csname iffalse\endcsname +\fi +% \end{macrocode} % Consequently, the style files are loaded. If the user specified an % explicit empty string as the value of |\thesis@style|, do nothing. % \begin{macrocode} diff --git a/style/mu/sci.dtx b/style/mu/sci.dtx index d654c03..ad8bcfc 100644 --- a/style/mu/sci.dtx +++ b/style/mu/sci.dtx @@ -47,7 +47,7 @@ % \begin{macro}{\ifthesis@czech} % The |\ifthesis@czech| \ldots |\else| \ldots |\fi| conditional is made % available for testing, whether or not the current locale is Czech. -% \changes{v0.3.45}{2017/05/21}{Defined the +% \changes{v0.3.45}{2017/05/23}{Defined the % \cs{ifthesis@czech} macro in % \texttt{style/mu/fithesis-sci.sty}. The patch was submitted by % Juraj Pálenik. [VN]} @@ -64,6 +64,13 @@ \else false% \fi\endcsname} +\ifthesis@czech + \expandafter\expandafter\expandafter\let\expandafter\expandafter + \csname ifthesis@czech\endcsname\csname iftrue\endcsname +\else + \expandafter\expandafter\expandafter\let\expandafter\expandafter + \csname ifthesis@czech\endcsname\csname iffalse\endcsname +\fi % \end{macrocode} % \end{macro} % The file loads the following packages: @@ -179,7 +186,7 @@ % \end{macrocode} % \end{macro}\begin{macro}{\thesis@blocks@bibEntryEn} % The |\thesis@blocks@bibEntryEn| macro typesets a bibliographical -% entry in English unless the current main locale is English. +% entry in English unless the current locale is English. % \begin{macrocode} \def\thesis@blocks@bibEntryEn{% \ifthesis@english\else -- GitLab