From 5f70b2c1fb388056ec31bb162ff177ff3b7b49fa Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 15 May 2016 22:10:27 +0000 Subject: fithesis (15may16) git-svn-id: svn://tug.org/texlive/trunk@41162 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/fithesis/fithesis.dtx | 84 ++++++++++++++-------- 1 file changed, 56 insertions(+), 28 deletions(-) (limited to 'Master/texmf-dist/source/latex/fithesis/fithesis.dtx') diff --git a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx index 8bda3d900a5..da915e5f875 100644 --- a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx +++ b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx @@ -56,11 +56,21 @@ \gdef\thesis@version@number{#1} \gdef\thesis@version@date{#2} \gdef\thesis@version{#2 #1 fithesis3 MU thesis class}} -\thesis@versiondef{v0.3.37}{2016/04/12}} +\thesis@versiondef{v0.3.38}{2016/05/15}} % {\newwrite\f\openout\f=VERSION\write\f{\thesis@version}\closeout\f} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % +% \changes{v0.3.38:2}{2016/05/15}{Fixed \cs{thesis@pages} not +% taking \cs{thesis@preamble} into account. Fixed the chapter +% number being printed regardless of secnumdepth by the style +% files of the Masaryk University in Brno. Fixed +% \cs{thesis@blocks@assignment} being typeset in Czech only +% by the style file of the Faculty of Science at the Masaryk +% University in Brno.} +% \changes{v0.3.38:1}{2016/04/18}{The \texttt{bib} key was added +% on the \textsf{fithesis3} class level and is supported by the +% style files of the Masaryk University in Brno.} % \changes{v0.3.37} {2016/04/12}{The \cs{tableofcontents} in the % style files of the Masaryk University in Brno now correctly % handles all tocdepth values. The expansion of \cs{part} also no @@ -1182,6 +1192,23 @@ \def\thesis@assignmentFiles{#1}} % \end{macrocode} % \end{macro} +% When the |\thesis@assignmentFiles| macro is defined and +% non-empty, the style files should take that as a cue that the +% user wishes to typeset the thesis assignment. +% \begin{macro}{\thesis@bibFiles} +% \subsubsection{The \texttt{bib} key} +% The \marg{\texttt{bib}=list} pair sets the comma-delimited +% list of paths to the BIB files containing the bibliography +% databases to \textit{list}. The \textit{list} is stored within +% the |\thesis@bibFiles| macro. +% \begin{macrocode} +\define@key{thesis}{bib}{% + \def\thesis@bibFiles{#1}} +% \end{macrocode} +% \end{macro} +% When the |\thesis@bibFiles| macro is defined and non-empty, the +% style files should take that as a cue that the user wishes to +% typeset the bibliography. % \begin{macro}{\ifthesis@auto} % \subsubsection{The \texttt{autoLayout} key} % The \marg{\texttt{autoLayout}=bool} pair either enables, @@ -1267,7 +1294,7 @@ % the same effect. % \begin{macrocode} \newif\ifthesis@loaded\thesis@loadedfalse -\AtEndPreamble{\thesisload} +\BeforeBeginEnvironment{document}{\thesisload} \def\thesis@load{\thesisload} \def\thesisload{% \ifthesis@loaded\else @@ -1282,6 +1309,7 @@ \ifx\thesis@locale\empty\else \edef\thesis@locale{\thesis@locale} \thesis@requireLocale{\thesis@locale} + \fi % \end{macrocode} % Coerce LuaTeX into defining |\l@|\textit{locale} for % \textit{locale}s with known hyphenation patterns, unless @@ -1294,24 +1322,6 @@ \RequirePackage[base]{babel}} \fi % \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 % explicit empty string as the value of |\thesis@style|, do nothing. % \begin{macrocode} @@ -1319,6 +1329,23 @@ \thesis@requireStyle{\thesis@style} \fi % \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 +% \end{macrocode} % With the placeholder strings loaded from the locale files, we % can now inject metadata into the resulting PDF file. To this % end, the \textsf{hyperref} package is conditionally included with @@ -1341,11 +1368,15 @@ % \end{macrocode} % If autolayout is enabled, the |\thesis@preamble| and % |\thesis@postamble| macros are scheduled for expansion at the -% beginning and at the end of the document, respectively. +% beginning and at the end of the document, respectively. The +% definition of the |\thesis@pages| macro is also scheduled to be +% written to the auxiliary file at the end of the document. % \begin{macrocode} \ifthesis@auto \AtBeginDocument{\thesis@preamble} - \AtEndDocument{\thesis@postamble} + \AtEndDocument{% + \thesis@postamble + \write\@auxout{\noexpand\gdef\noexpand\thesis@pages{\thepage}}} \fi \makeatother \fi} @@ -1524,7 +1555,6 @@ % the total number of pages within the document. During the first % \TeX\ compilation, the macro expands to \texttt{??}. % \begin{macrocode} -\AtEndDocument{\write\@auxout{\noexpand\gdef\noexpand\thesis@pages{\thepage}}} \ifx\thesis@pages\undefined\def\thesis@pages{??}\fi % \end{macrocode} % \DescribeMacro{\thesis@selectLocale}|\thesis@selectLocale|\marg{locale} @@ -1539,14 +1569,12 @@ % locale, \textsf{csquotes}, and hyphenation settings return back to % what the user has specified after the localized blocks of % typographic material. -% -% If not loaded by the user, the \textsf{csquotes} package gets -% loaded at the end of the preamble. % \begin{macrocode} -\AtEndPreamble{\thesis@require{csquotes}} \def\thesis@selectLocale#1{% \edef\thesis@locale{#1}% - \csq@setstyle{\thesis@@{csquotesStyle}}% + \ltx@ifpackageloaded{csquotes}{% + \csq@setstyle{\thesis@@{csquotesStyle}}% + }{}% \ltx@ifpackageloaded{polyglossia}{% \selectlanguage{\thesis@locale} }{% -- cgit v1.2.3