fithesis (3dec15)

git-svn-id: svn://tug.org/texlive/trunk@39009 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 47 insertions, 18 deletions

diff --git a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx
index a021a9f62a9..a43090d1a51 100644
--- a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx
+++ b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx
@@ -51,11 +51,21 @@
 %<*class>
 \NeedsTeXFormat{LaTeX2e}
 % Define `\thesis@version` and store it in the `VERSION.tex` file \fi
-\def\thesis@version{2015/11/30 v0.3.27 fithesis3 MU thesis class}
+\def\thesis@version{2015/12/03 v0.3.28 fithesis3 MU thesis class}
 % {\newwrite\f\openout\f=VERSION\write\f{\thesis@version}\closeout\f}
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
+% \changes{v0.3.28:2}{2015/12/03}{If the thesis locale and the
+%   document locale is the same (the default behaviour), the
+%   \cs{thesis@selectLocale} macro is applied globally at the
+%   beginning of the document. As a result, the \textsf{csquotes}
+%   style is automatically set for the entire document. [VN]}
+% \changes{v0.3.28:1}{2015/12/02}{The \texttt{draft} option has no
+%   longer an effect on the \textsf{microtype} package. The
+%   \cs{thesis@require} command now also takes an optional
+%   argument and the \cs{thesis@requireWithOption} command has
+%   become \cs{thesis@requireIfExists}. [VN]}
 % \changes{v0.3.27:5}{2015/11/30}{The PDF bookmarks are no longer
 %   garbled, when the \Hologo{LuaTeX} engine is used. [VN]}
 % \changes{v0.3.27:4}{2015/11/30}{\cs{thesis@english@declaration}
@@ -1176,12 +1186,31 @@
     \thesis@loadedtrue
     \makeatletter%
 %    \end{macrocode}
-% First, the main locale file is loaded using the
-% |\thesis@requireLocale| macro. If the user specified an explicit
-% empty string as the value of |\thesis@locale|, do nothing.
+% First, the name of the main locale file is fully expanded and
+% loaded using the |\thesis@requireLocale| macro. If the user
+% specified an explicit empty string as the value of
+% |\thesis@locale|, do nothing.
 %    \begin{macrocode}
       \ifx\thesis@locale\empty\else
+        \edef\thesis@locale{\thesis@locale}
         \thesis@requireLocale{\thesis@locale}
+%    \end{macrocode}
+% If the \textsf{babel} or \textsf{polyglossia} locale is identical
+% to the thesis locale, the |\thesis@selectLocale| macro will be
+% used to globally set up the \textsf{csquotes} style appropriate for
+% the given locale.
+%    \begin{macrocode}
+        \ifx\languagename\empty\else
+          \begingroup
+          \edef\@doclocale{\languagename}%
+          \ifx\@doclocale\thesis@locale
+            \endgroup
+            \AtBeginDocument{%
+              \thesis@selectLocale{\thesis@locale}}%
+          \else
+            \endgroup
+          \fi
+        \fi
       \fi
 %    \end{macrocode}
 % Consequently, the style files are loaded. If the user specified an
@@ -1242,20 +1271,20 @@
   \thesis@exists{#1}{\input{#1}}}
 %    \end{macrocode}
 % \end{macro}\begin{macro}{\thesis@require}
-% The |\thesis@require| \marg{package} expands to
-% |\RequirePackage|\marg{package}, if the specified
+% The |\thesis@require|\oarg{options}\marg{package} expands to
+% |\RequirePackage|\oarg{options}\marg{package}, if the specified
 % \textit{package} has not yet been loaded.
 %    \begin{macrocode}
-\def\thesis@require#1{%
-  \@ifpackageloaded{#1}{}{\RequirePackage{#1}}}
+\newcommand\thesis@require[2][]{%
+  \@ifpackageloaded{#2}{}{\RequirePackage[#1]{#2}}}
 %    \end{macrocode}
-% \end{macro}\begin{macro}{\thesis@requireWithOptions}
-% The |\thesis@requireWithOptions|\marg{package} expands to
-% |\RequirePackageWithOptions|\marg{package}, if the specified
-% \textit{package} exists and has not yet been loaded.
+% \end{macro}\begin{macro}{\thesis@requireIfExists}
+% The |\thesis@requireIfExists|\oarg{options}\marg{package} expands
+% to |\thesis@require|\oarg{options}\marg{package}, if the
+% specified \textit{package} exists and has not yet been loaded.
 %    \begin{macrocode}
-\def\thesis@requireWithOptions#1{\thesis@exists{#1.sty}{%
-  \@ifpackageloaded{#1}{}{\RequirePackageWithOptions{#1}}}}
+\newcommand\thesis@requireIfExists[2][]{%
+  \thesis@exists{#2.sty}{\thesis@require[#1]{#2}}}
 %    \end{macrocode}
 % \end{macro}\begin{macro}{\thesis@requireStyle}
 % If inheritance is enabled for style files, then the
@@ -1272,11 +1301,11 @@
 %    \begin{macrocode}
 \def\thesis@requireStyle#1{%
   \ifthesis@style@inheritance%
-    \thesis@requireWithOptions{\thesis@stylepath fithesis-base}%
-    \thesis@requireWithOptions{\thesis@stylepath\thesis@university%
+    \thesis@requireIfExists{\thesis@stylepath fithesis-base}%
+    \thesis@requireIfExists{\thesis@stylepath\thesis@university%
       /fithesis-base}
   \fi%
-  \thesis@requireWithOptions{\thesis@stylepath#1}}
+  \thesis@requireIfExists{\thesis@stylepath#1}}
 %    \end{macrocode}
 % \end{macro}\begin{macro}{\thesis@requireLocale}
 % If inheritance is enabled for style files, then the
diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx
index 244ef9c683b..2ed2a361ebf 100644
--- a/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx
+++ b/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx
@@ -160,7 +160,7 @@
 % \textsf{microtype} package gets loaded.
 %    \begin{macrocode}
 \ifthesis@microtype@
-  \thesis@require{microtype}
+  \thesis@require[final,babel]{microtype}
 \fi
 %    \end{macrocode}
 % Using the |\ifxetex| and |\ifluatex| conditionals, a compound