diff options
author | Norbert Preining <norbert@preining.info> | 2024-03-10 03:02:47 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2024-03-10 03:02:47 +0000 |
commit | 0977b5581b838e81912bc5f34fff3672359e236a (patch) | |
tree | f2d20c9064dde8c70e3ce03f325ed705fce2d793 /macros/latex/contrib/fithesis/style/mu | |
parent | bb1788335b7c394ee980b7b6f12b81f5223bbd63 (diff) |
CTAN sync 202403100302
Diffstat (limited to 'macros/latex/contrib/fithesis/style/mu')
-rw-r--r-- | macros/latex/contrib/fithesis/style/mu/base.dtx | 51 | ||||
-rw-r--r-- | macros/latex/contrib/fithesis/style/mu/econ.dtx | 14 | ||||
-rw-r--r-- | macros/latex/contrib/fithesis/style/mu/fsps.dtx | 14 | ||||
-rw-r--r-- | macros/latex/contrib/fithesis/style/mu/law.dtx | 6 | ||||
-rw-r--r-- | macros/latex/contrib/fithesis/style/mu/med.dtx | 6 | ||||
-rw-r--r-- | macros/latex/contrib/fithesis/style/mu/sci.dtx | 16 |
6 files changed, 86 insertions, 21 deletions
diff --git a/macros/latex/contrib/fithesis/style/mu/base.dtx b/macros/latex/contrib/fithesis/style/mu/base.dtx index 32a93f115b..28dcb21d54 100644 --- a/macros/latex/contrib/fithesis/style/mu/base.dtx +++ b/macros/latex/contrib/fithesis/style/mu/base.dtx @@ -9,7 +9,7 @@ % after \texttt{style/fithesis-base.sty}, regardless of the value % of the |\thesis@style| macro. % \begin{macrocode} -\ProvidesPackage{fithesis/style/mu/fithesis-mu-base}[2022/08/15] +\ProvidesPackage{fithesis/style/mu/fithesis-mu-base}[2024/03/06] \NeedsTeXFormat{LaTeX2e} % \end{macrocode} % The file recognizes the following options: \begin{itemize} @@ -275,7 +275,7 @@ % \textsf{microtype} package gets loaded. % \begin{macrocode} \ifthesis@microtype@ - \thesis@require[final,babel]{microtype} + \thesis@require[final,babel,nopatch=item]{microtype} \fi % \end{macrocode} % Using the |\ifxetex| and |\ifluatex| conditionals, a compound @@ -639,11 +639,15 @@ % \changes{v1.1.0}{2022/08/15}{^^A % Added the \texttt{colorbold} and \texttt{nocolorbold} package % options for the Masaryk University in Brno. [TV]} +% \changes{v1.1.1}{2024/03/06}{^^A +% Only apply the \texttt{colorbold} package option if the \texttt{color} +% package option is also enabled. [VN]} % \begin{macrocode} \let\thesis@bfseries@old\bfseries \def\bfseries{% \ifthesis@sansbold@\sffamily\fi - \ifthesis@colorbold@\color{thesis@color@secondary}\fi\thesis@bfseries@old} + \ifthesis@color@\ifthesis@colorbold@\color{thesis@color@secondary}\fi\fi + \thesis@bfseries@old} % \end{macrocode} % The file defines several blocks to be used in the redefinitions % of the |\thesis@blocks@preamble| and |\thesis@blocks@postamble| @@ -952,6 +956,7 @@ % \end{macrocode} % \changes{v1.1.0}{2022/08/17}{^^A % Typeset thesis title on cover and title pages in sans serif typeface. [VN]} +% \changes{v1.1.1}{2023/03/06}{The field of study shows only if not empty. [TV]} % \begin{macrocode} {\sf\thesis@titlePage@LARGE\thesis@upper{author}\par}% \vfill\vfill @@ -965,8 +970,10 @@ {\sf\thesis@titlePage@large\thesis@@{bib@programme}: \thesis@programme\par}% \fi \ifthesis@blocks@titlePage@field@ + \ifx\thesis@field\empty\else \vspace{0.25cm}% {\sf\thesis@titlePage@large\thesis@@{fieldTitle}: \thesis@field@name\par}% + \fi \fi \vfill {\sf\thesis@titlePage@large\thesis@place, \thesis@@{semester}% @@ -1099,12 +1106,14 @@ % macros so they by default start on the same page as the % the previous element and are in the lower part of the page. % [TV]} +% \changes{v1.1.1}{2024/03/06}{Typeset \cs{thesis@TeXkeywords}, +% not \cs{thesis@keywords}. [VN]} % \begin{macrocode} \def\thesis@blocks@keywords{% \begin{alwayssingle}% {\let\thesis@blocks@clear\relax% \chapter*{\vspace*{\fill}\thesis@@{keywordsTitle}}}% - \noindent\leavevmode\thesis@keywords + \noindent\leavevmode\thesis@TeXkeywords \end{alwayssingle}} % \end{macrocode} % \end{macro}\begin{macro}{\thesis@blocks@keywordsEn} @@ -1114,6 +1123,8 @@ % \changes{v0.3.46}{2017/06/02}{Simplified the definition of % \cs{thesis@blocks@keywordsEn} in % \texttt{style/mu/fithesis-base.sty}. [VN]} +% \changes{v1.1.1}{2024/03/06}{Typeset \cs{thesis@TeXkeywords}, +% not \cs{thesis@keywords}. [VN]} % \begin{macrocode} \def\thesis@blocks@keywordsEn{% \ifthesis@english\else @@ -1121,7 +1132,7 @@ \begin{alwayssingle}% {\let\thesis@blocks@clear\relax% \chapter*{\vspace*{\fill}\thesis@english@keywordsTitle}}% - \noindent\leavevmode\thesis@keywordsEn + \noindent\leavevmode\thesis@TeXkeywordsEn \end{alwayssingle}}% \fi} % \end{macrocode} @@ -1227,6 +1238,15 @@ \pagestyle{thesisheadings} \parindent 1.5em\relax} % \end{macrocode} +% \end{macro}\begin{macro}{\thesis@blocks@bibEntry@pagetotal} +% The |\thesis@blocks@bibEntry@pageTotal| macro typeset the total number of +% pages in the thesis in the format required by the bibliographic entry. +% \changes{v1.1.1}{2024/03/06}{Add the \cs{thesis@blocks@bibEntry@pagetotal} +% command for the Masaryk University in Brno. [TV, VN]} +% \begin{macrocode} +\def\thesis@blocks@bibEntry@pagetotal{% + \thesis@pages@preamble{} + \thesis@pages} +% \end{macrocode} % \end{macro}\begin{macro}{\thesis@blocks@bibEntry} % The |\thesis@blocks@bibEntry| macro typesets a bibliographical % entry. Along with the macros required by the locale file @@ -1240,6 +1260,8 @@ % \changes{v1.0.0}{2021/03/04}{The \cs{thesis@blocks@bibEntry} command % was expanded to more closely resemble Faculty of Science's bibEntry. % The \cs{thesis@blocks@bibEntryEn} was added. [TV]} +% \changes{v1.1.1}{2024/03/06}{If the \cs{thesis@field} key is empty string, +% the bibEntry field of study row does not appear. [TV]} % \begin{macrocode} \def\thesis@blocks@bibEntry{% \thesis@blocks@clear @@ -1281,18 +1303,22 @@ & \thesis@title \\ \textbf{\thesis@@{bib@programme}:} & \thesis@programme \\ - \textbf{\thesis@@{bib@field}:} - & \thesis@field \\ + \ifx\thesis@field\empty\else + \textbf{\thesis@@{bib@field}:}% + & \thesis@field \\\fi \textbf{\thesis@@{bib@advisor}:} & \thesis@advisor \\ \textbf{\thesis@@{bib@academicYear}:} & \thesis@academicYear \\ \textbf{\thesis@@{bib@pages}:} - & \thesis@pages@preamble{} + \thesis@pages \\ + & \thesis@blocks@bibEntry@pagetotal \\ \textbf{\thesis@@{bib@keywords}:} & \thesis@TeXkeywords \\ \end{thesis@newtable@old}}} - +% \end{macrocode} +% \changes{v1.1.1}{2024/03/06}{If the \cs{thesis@fieldEn} key is empty string, +% the bibEntryEn field of study row does not appear. [TV]} +% \begin{macrocode} \def\thesis@blocks@bibEntryEn{% \ifthesis@english\else \thesis@blocks@clear @@ -1333,14 +1359,15 @@ & \thesis@titleEn \\ \textbf{\thesis@english@bib@programme:} & \thesis@programmeEn \\ - \textbf{\thesis@english@bib@field:} - & \thesis@fieldEn \\ + \ifx\thesis@fieldEn\empty\else + \textbf{\thesis@english@bib@field:}% + & \thesis@fieldEn@name \\\fi \textbf{\thesis@english@bib@advisor:} & \thesis@advisor \\ \textbf{\thesis@english@bib@academicYear:} & \thesis@academicYear \\ \textbf{\thesis@english@bib@pages:} - & \thesis@pages@preamble{} + \thesis@pages \\ + & \thesis@blocks@bibEntry@pagetotal \\ \textbf{\thesis@english@bib@keywords:} & \thesis@TeXkeywordsEn \\ \end{thesis@newtable@old}} diff --git a/macros/latex/contrib/fithesis/style/mu/econ.dtx b/macros/latex/contrib/fithesis/style/mu/econ.dtx index fc210098b3..5e87042cbf 100644 --- a/macros/latex/contrib/fithesis/style/mu/econ.dtx +++ b/macros/latex/contrib/fithesis/style/mu/econ.dtx @@ -22,7 +22,7 @@ % 768134/}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-mu-econ}[2022/08/17] +\ProvidesPackage{fithesis/style/mu/fithesis-mu-econ}[2024/03/06] % \end{macrocode} % The file defines the color scheme of the respective faculty. Note % the the color definitions are in RGB, which makes the resulting @@ -86,7 +86,17 @@ % \begin{macrocode} \thesis@blocks@titlePage@field@false % \end{macrocode} -% \begin{macro}{\thesis@blocks@cover} +% \begin{macro}{\thesis@blocks@bibEntry@pagetotal} +% The |\thesis@blocks@bibEntry@pageTotal| macro typeset the total number of +% pages in the thesis in the format required by the bibliographic entry. +% The format is just the total number of pages, as mandated by the formal +% requirements of the faculty. +% \changes{v1.1.1}{2024/03/06}{Add the \cs{thesis@blocks@bibEntry@pagetotal} +% command for the Masaryk University in Brno. [TV, VN]} +% \begin{macrocode} +\def\thesis@blocks@bibEntry@pagetotal{\thesis@pages} +% \end{macrocode} +% \end{macro}\begin{macro}{\thesis@blocks@cover} % The |\thesis@blocks@cover| macro typesets the cover page. Compared % to the definition within the \texttt{style/mu/base.sty} file, this % macro does not include the title of the thesis, and typesets the diff --git a/macros/latex/contrib/fithesis/style/mu/fsps.dtx b/macros/latex/contrib/fithesis/style/mu/fsps.dtx index 30437fc417..e4950b2902 100644 --- a/macros/latex/contrib/fithesis/style/mu/fsps.dtx +++ b/macros/latex/contrib/fithesis/style/mu/fsps.dtx @@ -12,7 +12,7 @@ % y_vypracovani_ZP_bc-mgr-rig.pdf}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-mu-fsps}[2021/07/18] +\ProvidesPackage{fithesis/style/mu/fithesis-mu-fsps}[2024/03/06] % \end{macrocode} % The file defines the color scheme of the respective faculty. Note % the the color definitions are in RGB, which makes the resulting @@ -58,7 +58,17 @@ % at the Masaryk University in Brno no longer % redefine the \cs{thesis@blocks@titlePage@footer} macro, which % is no longer defined. [VN]} -% \begin{macro}{\thesis@blocks@frontMatter} +% \begin{macro}{\thesis@blocks@bibEntry@pagetotal} +% The |\thesis@blocks@bibEntry@pageTotal| macro typeset the total number of +% pages in the thesis in the format required by the bibliographic entry. +% The format is just the total number of pages, as mandated by the formal +% requirements of the faculty. +% \changes{v1.1.1}{2024/03/06}{Add the \cs{thesis@blocks@bibEntry@pagetotal} +% command for the Masaryk University in Brno. [TV, VN]} +% \begin{macrocode} +\def\thesis@blocks@bibEntry@pagetotal{\thesis@pages} +% \end{macrocode} +% \end{macro}\begin{macro}{\thesis@blocks@frontMatter} % The |\thesis@blocks@frontMatter| macro sets up the style of the % front matter of the thesis. The leading is adjusted in % accordance with the requirements of the faculty. diff --git a/macros/latex/contrib/fithesis/style/mu/law.dtx b/macros/latex/contrib/fithesis/style/mu/law.dtx index e7355d3634..06dbc8eb87 100644 --- a/macros/latex/contrib/fithesis/style/mu/law.dtx +++ b/macros/latex/contrib/fithesis/style/mu/law.dtx @@ -13,7 +13,7 @@ % h_dokumentu.pdf}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-mu-law}[2021/07/18] +\ProvidesPackage{fithesis/style/mu/fithesis-mu-law}[2024/03/06] % \end{macrocode} % The file defines the color scheme of the respective faculty. Note % the the color definitions are in RGB, which makes the resulting @@ -54,6 +54,8 @@ % \changes{v1.0.0}{2021/03/22}{Added redefinition of the titlePage % layout as per the faculty requirements. Department name and % field are in the upper part of the titlePage. [TV]} +% \changes{v1.1.1}{2024/03/06}{Updated the study field redefinition to +% match the base definition. [TV]} % \begin{macrocode} \thesis@blocks@titlePage@programme@false @@ -69,9 +71,11 @@ \thesis@programme\par}% \fi \ifthesis@blocks@titlePage@field@ + \ifx\thesis@field\empty\else \vspace{0.25cm}% {\sf\thesis@titlePage@large\thesis@@{fieldTitle}: \thesis@field@name\par}% + \fi \fi \vfill }{} diff --git a/macros/latex/contrib/fithesis/style/mu/med.dtx b/macros/latex/contrib/fithesis/style/mu/med.dtx index e3503425f8..5e3416c921 100644 --- a/macros/latex/contrib/fithesis/style/mu/med.dtx +++ b/macros/latex/contrib/fithesis/style/mu/med.dtx @@ -15,7 +15,7 @@ % akulte_MU.pdf}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-mu-med}[2021/07/18] +\ProvidesPackage{fithesis/style/mu/fithesis-mu-med}[2024/03/06] % \end{macrocode} % The file defines the color scheme of the respective faculty. Note % the the color definitions are in RGB, which makes the resulting @@ -112,6 +112,8 @@ % \changes{v1.0.0}{2021/05/06}{Added conditional redefinition for the % study field. [TV]} % \begin{macrocode} +% \changes{v1.1.1}{2024/03/06}{Updated the study field redefinition to +% match the base definition. [TV]} \thesis@blocks@titlePage@field@false \thesis@xpatch\thesis@blocks@titlePage{% @@ -126,9 +128,11 @@ \thesis@programme\par}% \fi \ifthesis@blocks@titlePage@field@ + \ifx\thesis@field\empty\else \vspace{0.25cm}% {\sf\thesis@titlePage@large\thesis@@{fieldTitle}: \thesis@field@name\par}% + \fi \fi \vfill }{} diff --git a/macros/latex/contrib/fithesis/style/mu/sci.dtx b/macros/latex/contrib/fithesis/style/mu/sci.dtx index b66d576af3..64764dfd7e 100644 --- a/macros/latex/contrib/fithesis/style/mu/sci.dtx +++ b/macros/latex/contrib/fithesis/style/mu/sci.dtx @@ -12,7 +12,7 @@ % _-_Pokyny_pro_vypracovani_bc._dipl._a_rigor.praci.pdf}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-mu-sci}[2021/07/18] +\ProvidesPackage{fithesis/style/mu/fithesis-mu-sci}[2024/03/06] % \end{macrocode} % The file defines the color scheme of the respective faculty. Note % the the color definitions are in RGB, which makes the resulting @@ -72,10 +72,19 @@ % \begin{macrocode} \thesis@blocks@titlePage@field@false \thesis@blocks@titlePage@programme@false - \thesis@blocks@assignment@hideIfDigital@false % \end{macrocode} -% \begin{macro}{\thesis@blocks@frontMatter} +% \begin{macro}{\thesis@blocks@bibEntry@pagetotal} +% The |\thesis@blocks@bibEntry@pageTotal| macro typeset the total number of +% pages in the thesis in the format required by the bibliographic entry. +% The format is just the total number of pages, as mandated by the formal +% requirements of the faculty. +% \changes{v1.1.1}{2024/03/06}{Add the \cs{thesis@blocks@bibEntry@pagetotal} +% command for the Masaryk University in Brno. [TV, VN]} +% \begin{macrocode} +\def\thesis@blocks@bibEntry@pagetotal{\thesis@pages} +% \end{macrocode} +% \end{macro}\begin{macro}{\thesis@blocks@frontMatter} % The |\thesis@blocks@frontMatter| macro sets up the style % of the front matter front matter of the thesis. The front matter % is typeset without any visible numbering, as mandated by the @@ -91,6 +100,7 @@ \setcounter{page}{1} \pagenumbering{arabic}} % \end{macrocode} +% \end{macro}\begin{macro}{\thesis@blocks@mainMatter} % The |\thesis@blocks@mainMatter| macro sets up the style % of the main matter of the thesis. The page numbering doesn't % reset at the beginning of the main thesis in accordance with the |