summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-08-17 20:59:00 +0000
committerKarl Berry <karl@freefriends.org>2022-08-17 20:59:00 +0000
commitf29912f3443a41d78db3d58717d880a2fd780c7b (patch)
treef6bc7cea83cb2c163cee11d71fd2ecb0afcfdcdc /Master/texmf-dist/source
parent58d65b42a5472ce637fb9923099ac6805cbd0309 (diff)
fithesis (17aug22)
git-svn-id: svn://tug.org/texlive/trunk@64135 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/latex/fithesis/LICENSE.tex2
-rw-r--r--Master/texmf-dist/source/latex/fithesis/VERSION.tex2
-rw-r--r--Master/texmf-dist/source/latex/fithesis/fithesis.dtx2
-rw-r--r--Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx110
-rw-r--r--Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx24
5 files changed, 116 insertions, 24 deletions
diff --git a/Master/texmf-dist/source/latex/fithesis/LICENSE.tex b/Master/texmf-dist/source/latex/fithesis/LICENSE.tex
index a29d47f5a45..43ab5443ee8 100644
--- a/Master/texmf-dist/source/latex/fithesis/LICENSE.tex
+++ b/Master/texmf-dist/source/latex/fithesis/LICENSE.tex
@@ -1,7 +1,7 @@
\input docstrip.tex
\preamble
-Copyright 1998--2021 Daniel Marek (DM), Jan Pavlovič (JP),
+Copyright 1998--2022 Daniel Marek (DM), Jan Pavlovič (JP),
Vít Novotný (VN), Tereza Vrabcová (TV),
Petr Sojka (PS)
http://www.fi.muni.cz/tech/unix/tex/fithesis.xhtml
diff --git a/Master/texmf-dist/source/latex/fithesis/VERSION.tex b/Master/texmf-dist/source/latex/fithesis/VERSION.tex
index 0dfaee26216..5ecb9fe3098 100644
--- a/Master/texmf-dist/source/latex/fithesis/VERSION.tex
+++ b/Master/texmf-dist/source/latex/fithesis/VERSION.tex
@@ -1 +1 @@
-2021/10/17 v1.0.2 fithesis4 MU thesis class
+2022/08/17 v1.1.0 fithesis4 MU thesis class
diff --git a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx
index 53632b0a041..4c7577def5d 100644
--- a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx
+++ b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx
@@ -57,7 +57,7 @@
\gdef\thesis@version@number{#1}
\gdef\thesis@version@date{#2}
\gdef\thesis@version{#2 #1 fithesis4 MU thesis class}}
-\thesis@versiondef{v1.0.2}{2021/10/17}}
+\thesis@versiondef{v1.1.0}{2022/08/17}}
% {\newwrite\f\openout\f=VERSION\write\f{\thesis@version}\closeout\f}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
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 a6c43b158d3..32a93f115b6 100644
--- a/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx
+++ b/Master/texmf-dist/source/latex/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}[2021/05/23]
+\ProvidesPackage{fithesis/style/mu/fithesis-mu-base}[2022/08/15]
\NeedsTeXFormat{LaTeX2e}
% \end{macrocode}
% The file recognizes the following options: \begin{itemize}
@@ -65,6 +65,22 @@
\DeclareOption{palatino}{\thesis@palatino@true}
\DeclareOption{nopalatino}{\thesis@palatino@false}
% \end{macrocode}
+% \item\texttt{neuehaas}, \texttt{noneuehaas} -- The sans serif
+% text font family is going to be either set to Neue Haas
+% (TeX Gyre Heros) or left untouched, respectively. The
+% \DescribeMacro{\ifthesis@neuehaas@}|\ifthesis@|^^A
+% \discretionary{}{}{}|neuehaas@| conditional is set to either
+% \texttt{true} or \texttt{false}, respectively. The Neue Haas
+% font is a sans serif font chosen to represent the Masaryk
+% University in Brno as per its Graphic manual.
+% \changes{v1.1.0}{2022/08/15}{^^A
+% Added the \texttt{neuehas} and \texttt{noneuehaas} package options
+% for the Masaryk University in Brno. [TV]}
+% \begin{macrocode}
+\newif\ifthesis@neuehaas@
+\DeclareOption{neuehaas}{\thesis@neuehaas@true}
+\DeclareOption{noneuehaas}{\thesis@neuehaas@false}
+% \end{macrocode}
% \item\texttt{color}, \texttt{monochrome} -- Certain
% typographical elements either are or aren't going to be
% typeset in color, respectively. The
@@ -76,6 +92,18 @@
\DeclareOption{monochrome}{\thesis@color@false}
\DeclareOption{color}{\thesis@color@true}
% \end{macrocode}
+% \item\texttt{colorbold}, \texttt{nocolorbold} -- The bold text either
+% is or isn't colored (black is used instead). The
+% \DescribeMacro{\ifthesis@colorbold}|\ifthesis@colorbold@| conditional
+% is set to either \texttt{true} or \texttt{false}, respectively.
+% \changes{v1.1.0}{2022/08/15}{^^A
+% Added the \texttt{colorbold} and \texttt{nocolorbold} package
+% options for the Masaryk University in Brno. [TV]}
+% \begin{macrocode}
+\newif\ifthesis@colorbold@
+\DeclareOption{colorbold}{\thesis@colorbold@true}
+\DeclareOption{nocolorbold}{\thesis@colorbold@false}
+% \end{macrocode}
% \item\texttt{microtype}, \texttt{nomicrotype} -- The
% microtypographic extension of modern \TeX\ engines -- such as
% \hologo{pdfTeX}, \Hologo{XeTeX}, or \Hologo{LuaTeX} -- is or isn't
@@ -88,6 +116,19 @@
\DeclareOption{microtype}{\thesis@microtype@true}
\DeclareOption{nomicrotype}{\thesis@microtype@false}
% \end{macrocode}
+% \item\texttt{sansbold}, \texttt{nosansbold} -- The \cs{bfseries}
+% command for switching to the bold typeface is or isn't going to use
+% the sans-serif type face, respectively. The
+% \DescribeMacro{\ifthesis@sansbold@}|\ifthesis@sansbold@| conditional
+% is set to either \texttt{true} or \texttt{false}, respectively.
+% \changes{v1.1.0}{2022/08/02}{^^A
+% Added the \texttt{sansbold} and \texttt{nosansbold} package options
+% for the Masaryk University in Brno. [VN]}
+% \begin{macrocode}
+\newif\ifthesis@sansbold@
+\DeclareOption{sansbold}{\thesis@sansbold@true}
+\DeclareOption{nosansbold}{\thesis@sansbold@false}
+% \end{macrocode}
% \item\texttt{table}, \texttt{oldtable} -- If the
% |\ifthesis@color@| conditional is \texttt{true}, then the
% definitions of the \texttt{tabular}, \texttt{tabularx}, and
@@ -156,20 +197,26 @@
% \DescribeMacro{\ifthesis@digital@}|\ifthesis@digital@|
% conditional is set to \texttt{true} or \texttt{false},
% respectively.
+% \changes{v1.1.0}{2022/08/15}{^^A
+% Added the \texttt{colorbold} and \texttt{nocolorbold} package
+% options for the Masaryk University in Brno. [TV]}
% \begin{macrocode}
\newif\ifthesis@digital@
\DeclareOption{digital}{%
- \ExecuteOptions{color,cover}%
+ \ExecuteOptions{color,cover,colorbold}%
\thesis@digital@true}
\DeclareOption{printed}{%
- \ExecuteOptions{monochrome,nocover}%
+ \ExecuteOptions{monochrome,nocover,nocolorbold}%
\thesis@digital@false}
% \end{macrocode}
% \end{itemize}
% These are the default options:
+% \changes{v1.1.0}{2022/08/02}{^^A
+% Added the \texttt{sansbold} and \texttt{nosansbold} package options
+% for the Masaryk University in Brno. [VN]}
% \begin{macrocode}
\ExecuteOptions{%
- printed,12pt,twoside,final,microtype,palatino,oldtable,lot,lof}
+ printed,12pt,twoside,final,microtype,sansbold,palatino,neuehaas,oldtable,lot,lof}
\ProcessOptions*
% \end{macrocode}
% The file uses English locale strings within the macros.
@@ -260,19 +307,26 @@
% \changes{v1.0.0}{2018/11/18}{^^A
% The \TeX{} Gyre Heros is used as the main sans serif font
% instead of Latin Modern. [VN]}
+% \changes{v1.1.0}{2022/08/15}{^^A
+% Added the \texttt{neuehas} and \texttt{noneuehaas} package options
+% for the Masaryk University in Brno. [TV]}
% \begin{macrocode}
\ifthesis@xeluatex
\ifthesis@palatino@
\thesis@require{fontspec}
\thesis@require{unicode-math}
\setmainfont[Ligatures=TeX]{TeX Gyre Pagella}
- \setsansfont[Ligatures=TeX,Scale=MatchLowercase]{TeX Gyre Heros}
\setmathfont[math-style=ISO,bold-style=ISO]{texgyrepagella-math.otf}
\fi
+ \ifthesis@neuehaas@
+ \thesis@require{fontspec}
+ \setsansfont[Ligatures=TeX,Scale=MatchLowercase]{TeX Gyre Heros}
+ \fi
% \end{macrocode}
% The following packages get only loaded, when the document is not
-% being typeset using the \Hologo{XeTeX} or \Hologo{LuaTeX} engine
-% and the |\ifthesis@palatino@| conditional is \texttt{true}:
+% being typeset using the \Hologo{XeTeX} or \Hologo{LuaTeX} engine,
+% the |\ifthesis@palatino@| conditional is \texttt{true}, and the
+% |\ifthesis@neuehaas@| conditional is \texttt{true}:
% \begin{itemize}
% \item\textsf{cmap} -- Places an explicit \texttt{ToUnicode}
% map in the resulting PDF file, allowing for the extraction of
@@ -298,6 +352,9 @@
\thesis@require{lmodern}
\thesis@require{mathpazo}
\thesis@require{tgpagella}
+ \RequirePackage[T1]{fontenc}
+ \fi
+ \ifthesis@neuehaas@
\thesis@require[scale=0.863]{tgheros}
\RequirePackage[T1]{fontenc}
\fi
@@ -572,14 +629,21 @@
% and to the secondary color in the style files of the Masaryk
% University in Brno, Czech Republic. [VN]}
% The |\bfseries| macro is redefined to switch to the sans serif
-% type face in the secondary color. The original definition of
-% |\bfseries| is stored in the
+% type face (conditional on \cs{ifthesis@sansbold@}) in the secondary color.
+% The original definition of |\bfseries| is stored in the
% \DescribeMacro{\thesis@bfseries@old}|\thesis@bfseries@old|
% macro.
+% \changes{v1.1.0}{2022/08/02}{^^A
+% Added the \texttt{sansbold} and \texttt{nosansbold} package options
+% for the Masaryk University in Brno. [VN]}
+% \changes{v1.1.0}{2022/08/15}{^^A
+% Added the \texttt{colorbold} and \texttt{nocolorbold} package
+% options for the Masaryk University in Brno. [TV]}
% \begin{macrocode}
\let\thesis@bfseries@old\bfseries
\def\bfseries{%
- \sffamily\color{thesis@color@secondary}\thesis@bfseries@old}
+ \ifthesis@sansbold@\sffamily\fi
+ \ifthesis@colorbold@\color{thesis@color@secondary}\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|
@@ -773,7 +837,14 @@
\vspace{0.75cm}%
{\sf\thesis@titlePage@large\thesis@@upper{facultyName}\par}%
\vfill
- {\bf\thesis@titlePage@Huge\thesis@TeXtitle\par}%
+% \end{macrocode}
+% \changes{v1.1.0}{2022/08/17}{^^A
+% Typeset thesis title on cover and title pages in sans serif typeface. [VN]}
+% \begin{macrocode}
+ \begingroup
+ \thesis@colorbold@true
+ {\sffamily\bfseries\thesis@titlePage@Huge\thesis@TeXtitle\par}%
+ \endgroup
\vspace{1.5cm}%
{\sf\thesis@titlePage@Large\thesis@@{typeName}\par}%
\vspace{1.5cm}%
@@ -871,10 +942,17 @@
\par\vspace{0.75cm}%
{\sf\thesis@titlePage@large\thesis@@upper{facultyName}\par}%
\vfill
- {\bf\thesis@titlePage@Huge\thesis@TeXtitle\par}%
+ \begingroup
+ \thesis@colorbold@true
+ {\sffamily\bfseries\thesis@titlePage@Huge\thesis@TeXtitle\par}%
+ \endgroup
\vspace{1.5cm}%
{\sf\thesis@titlePage@Large\thesis@@{typeName}\par}%
\vspace{1.5cm}%
+% \end{macrocode}
+% \changes{v1.1.0}{2022/08/17}{^^A
+% Typeset thesis title on cover and title pages in sans serif typeface. [VN]}
+% \begin{macrocode}
{\sf\thesis@titlePage@LARGE\thesis@upper{author}\par}%
\vfill\vfill
{\sf\thesis@titlePage@large\thesis@@{advisorTitle}: \thesis@advisor\par}%
@@ -1618,12 +1696,14 @@
\if@twoside
\oddsidemargin 0.75in
\evensidemargin 0.4in
- \marginparwidth 0pt
\else
\oddsidemargin 0.75in
\evensidemargin 0.75in
- \marginparwidth 0pt
\fi
+% \end{macrocode}
+% \changes{v1.1.0}{2022/04/19}{Add space for margin notes. [VN]}
+% \begin{macrocode}
+\marginparwidth 2.75cm
\marginparsep 10pt
\topmargin 0.4in
@@ -1781,7 +1861,7 @@
\reset@font\normalsize\bfseries}}
\def\subsubsection{\@startsection{subsubsection}{3}{\z@}{%
-3.25ex plus-1ex minus-.2ex}{1.5ex plus.2ex}{%
- \reset@font\normalsize}}
+ \reset@font\normalsize\bfseries}}
\def\paragraph{\@startsection{paragraph}{4}{\z@}{%
3.25ex plus1ex minus.2ex}{-1em}{%
\reset@font\normalsize\bfseries}}
diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx
index a05cacf39ca..fc210098b30 100644
--- a/Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx
+++ b/Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx
@@ -10,13 +10,19 @@
% \changes{v1.0.0}{2021/03/19}{Updated urls to show the most recent
% requirements and recommendations used in preparation of the
% template. [TV]}
+% \changes{v1.1.0}{2022/04/19}{Updated urls to show the most recent
+% requirements and recommendations used in preparation of the
+% template. [VN]}
% published at the website of the faculty\footnote{See \url{https:^^A
% //is.muni.cz/auth/do/econ/uredni_deska/predpisy_ESF/smernice/sme^^A
-% rnice_dekana/94383996/} and \url{https://is.muni.cz/auth/do/econ^^A
-% /uredni_deska/predpisy_ESF/smernice/smernice_dekana/104768134/}}.
+% rnice/smernice_dekana/prehled/2019/smernice_c_9_2019_o_tvorbe_od^^A
+% evzdavani_zverejnovani_a_hodnoceni_bc_zaverecnych_a/SmerniceDeka^^A
+% na2019_c.9__2_FINALk_vydani.pdf} and \url{https://is.muni.cz/aut^^A
+% h/do/econ/uredni_deska/predpisy_ESF/smernice/smernice_dekana/104^^A
+% 768134/}}.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fithesis/style/mu/fithesis-mu-econ}[2021/04/24]
+\ProvidesPackage{fithesis/style/mu/fithesis-mu-econ}[2022/08/17]
% \end{macrocode}
% The file defines the color scheme of the respective faculty. Note
% the the color definitions are in RGB, which makes the resulting
@@ -85,10 +91,15 @@
% to the definition within the \texttt{style/mu/base.sty} file, this
% macro does not include the title of the thesis, and typesets the
% name of the author at the bottom of the page.
+% \changes{v1.1.0}{2022/08/17}{^^A
+% Typeset thesis title on cover and title pages in sans serif typeface. [VN]}
% \begin{macrocode}
\thesis@xpatch\thesis@blocks@cover{%
\vfill
- {\bf\thesis@titlePage@Huge\thesis@TeXtitle\par}%
+ \begingroup
+ \thesis@colorbold@true
+ {\sffamily\bfseries\thesis@titlePage@Huge\thesis@TeXtitle\par}%
+ \endgroup
\vspace{1.5cm}%
{\sf\thesis@titlePage@Large\thesis@@{typeName}\par}%
\vspace{1.5cm}%
@@ -280,9 +291,9 @@
\thesis@blocks@bibEntryEn
\thesis@blocks@abstractEn
\thesis@blocks@declaration
+ \thesis@blocks@assignment
\thesis@blocks@thanks
- \thesis@blocks@toc
- \thesis@blocks@tables}
+ \thesis@blocks@toc}
% \end{macrocode}
% All blocks within the autolayout postamble that are not defined
% within this file are defined in the \texttt{style/mu/base.sty}
@@ -293,5 +304,6 @@
\def\thesis@blocks@postamble{%
\ifx\thesis@doctoral\thesis@type\thesis@blocks@summary\else\fi
\thesis@blocks@bibliography
+ \thesis@blocks@tables
}
% \end{macrocode}