diff options
author | Karl Berry <karl@freefriends.org> | 2020-03-22 20:49:26 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-03-22 20:49:26 +0000 |
commit | 2c6568affba942c29b9741469a2882363009a093 (patch) | |
tree | a2838fa0e2e30c332f7852c9a418789fea3c1545 /Master | |
parent | f64715886f780dbe1414b1b35a55b6177de54022 (diff) |
fithesis (22mar20)
git-svn-id: svn://tug.org/texlive/trunk@54483 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
57 files changed, 317 insertions, 163 deletions
diff --git a/Master/texmf-dist/doc/latex/fithesis/README.md b/Master/texmf-dist/doc/latex/fithesis/README.md new file mode 100644 index 00000000000..c5c5d379839 --- /dev/null +++ b/Master/texmf-dist/doc/latex/fithesis/README.md @@ -0,0 +1,97 @@ +# About # + +`Fithesis3` is a document class for the typesetting of theses at +the Masaryk University (Brno, Czech Republic). The class has been +designed for easy extensibility by style and locale files of other +academic institutions. + +# Requirements # + +To install the package, you are going to need a POSIX.2-compliant +environment as well as the following tools: + + * GNU `make` + * `epstopdf` + +Aside from these tools, the installation requires a correctly +configured TeX distribution containing the pdfTeX, XeTeX and LuaTeX +engines as well as the LaTeX packages required for the typesetting +of the technical documentation within the `fithesis.dtx` file and +the guide files within the `guide/` subdirectory. + +For running the test suite using the `make tests` command, the +following tools are also required: + + * `faketime` + * `comparepdf` + * `pdftk` + +# Installation # + +To install the package, execute the following command from within +the current directory: + + make base + make install-base to=[[TDS]] nohash=true + +where `[[TDS]]` is a path in the TeX directory structure to which +you are going to install the package (such as `/usr/share/texmf`). + +After successfully running the commands, update the file name +database of your TeX distribution, if necessary: + + * In MiKTeX: + - Using the GUI: In the Start Menu go to the MiKTeX entry and + open either the settings or the admin settings depending on + whether you are installing the package into a single-user + private directory tree or into a shared directory tree on a + multi-user system, respectively. The "MiKTeX Options" window + will open. Switch to the "General" tab and click the "Refresh + FNDB" button. + - Using the command prompt: Execute either `initexmf -u` or + `initexmf -u --admin` depending on whether you are installing + the package into a single-user private directory tree or into + a shared shared directory tree on a multi-user system. + * In TeX Live and MacTeX: + - Execute `texhash` with superuser privileges (`sudo texhash`). + +You may now also wish to typeset and install the user and technical +documentation of the package. You can do that by running: + + make docs + make install-docs to=[[TDS]] nohash=true + +where `[[TDS]]` is again a path in the TeX directory structure to +which you are going to install the documentation and will likely be +the same as before. + +After successfully running the commands, update the file name +database of your TeX distribution, if necessary. + +# Uninstallation # + +To uninstall the package, execute the following command from within +the current directory: + + make uninstall from=[[TDS]] + +where `[[TDS]]` is a path in the TeX directory structure to which +you are going to install the package (such as `/usr/share/texmf`). + +After successfully running the commands, update the file name +database of your TeX distribution, if necessary: + + * In MiKTeX: + - Using the GUI: In the Start Menu go to the MiKTeX entry and + open either the settings or the admin settings depending on + whether you are installing the package into a single-user + private directory tree or into a shared directory tree on a + multi-user system, respectively. The "MiKTeX Options" window + will open. Switch to the "General" tab and click the "Refresh + FNDB" button. + - Using the command prompt: Execute either `initexmf -u` or + `initexmf -u --admin` depending on whether you are installing + the package into a single-user private directory tree or into + a shared shared directory tree on a multi-user system. + * In TeX Live and MacTeX: + - Execute `texhash` with superuser privileges (`sudo texhash`). diff --git a/Master/texmf-dist/doc/latex/fithesis/fithesis.pdf b/Master/texmf-dist/doc/latex/fithesis/fithesis.pdf Binary files differindex f165b907a0a..237917e00b6 100644 --- a/Master/texmf-dist/doc/latex/fithesis/fithesis.pdf +++ b/Master/texmf-dist/doc/latex/fithesis/fithesis.pdf diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/econ.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/econ.pdf Binary files differindex 9fe48dc1cde..e545f46a106 100644 --- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/econ.pdf +++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/econ.pdf diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fi.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fi.pdf Binary files differindex a4a4760c705..b8288cfdc68 100644 --- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fi.pdf +++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fi.pdf diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fsps.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fsps.pdf Binary files differindex 0cc929e5b9a..8147db1af03 100644 --- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fsps.pdf +++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fsps.pdf diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fss.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fss.pdf Binary files differindex a6050db64f4..e695f136204 100644 --- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fss.pdf +++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fss.pdf diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/law.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/law.pdf Binary files differindex 73e98bce8b0..c474ad77a3b 100644 --- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/law.pdf +++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/law.pdf diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/med.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/med.pdf Binary files differindex 2b2a6d893dc..e5ce50080a8 100644 --- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/med.pdf +++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/med.pdf diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/ped.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/ped.pdf Binary files differindex 54ece83241e..f0d94206c43 100644 --- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/ped.pdf +++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/ped.pdf diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/phil.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/phil.pdf Binary files differindex 230ae529c08..811e001cc4a 100644 --- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/phil.pdf +++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/phil.pdf diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/sci.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/sci.pdf Binary files differindex 26b54aad5e9..e29b623cd6c 100644 --- a/Master/texmf-dist/doc/latex/fithesis/guide/mu/sci.pdf +++ b/Master/texmf-dist/doc/latex/fithesis/guide/mu/sci.pdf diff --git a/Master/texmf-dist/source/latex/fithesis/VERSION.tex b/Master/texmf-dist/source/latex/fithesis/VERSION.tex new file mode 100644 index 00000000000..d0cfdde1f4a --- /dev/null +++ b/Master/texmf-dist/source/latex/fithesis/VERSION.tex @@ -0,0 +1 @@ +2020/03/09 v0.3.51 fithesis3 MU thesis class diff --git a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx index 4f0321875a7..bfda069bcfe 100644 --- a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx +++ b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx @@ -56,7 +56,7 @@ \gdef\thesis@version@number{#1} \gdef\thesis@version@date{#2} \gdef\thesis@version{#2 #1 fithesis3 MU thesis class}} -\thesis@versiondef{v0.3.50}{2018/03/25}} +\thesis@versiondef{v0.3.51}{2020/03/09}} % {\newwrite\f\openout\f=VERSION\write\f{\thesis@version}\closeout\f} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1337,7 +1337,7 @@ \let\thesis@blocks@preamble\relax \let\thesis@blocks@mainMatter\relax -% \end{macro} +% \end{macrocode} % Before expanding |\thesis@blocks@postamble| inside a \TeX{} % group, the |\thesis@postamble| macro defines the % \cs{thesis@pages@postamble} macro, writes the definition to the @@ -1742,16 +1742,10 @@ % \begin{macrocode} \def\thesis@lower#1{{% \let\ea\expandafter - \ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\lowercase\ea\ea\ea - \ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea{\ea\ea\ea\ea\ea\ea\ea\ea\ea - \ea\ea\ea\ea\ea\ea\@gobble\ea\ea\ea\string\ea\csname\csname the% - sis@#1\endcsname\endcsname}}} + \ea\MakeLowercase\ea{\csname thesis@#1\endcsname}}} \def\thesis@upper#1{{% \let\ea\expandafter - \ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\uppercase\ea\ea\ea - \ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea{\ea\ea\ea\ea\ea\ea\ea\ea\ea - \ea\ea\ea\ea\ea\ea\@gobble\ea\ea\ea\string\ea\csname\csname the% - sis@#1\endcsname\endcsname}}} + \ea\MakeUppercase\ea{\csname thesis@#1\endcsname}}} % \end{macrocode} % The \DescribeMacro{\thesis@@lower}|\thesis@@lower| % and \DescribeMacro{\thesis@@upper}|\thesis@@upper| diff --git a/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx b/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx index 9a2f0275689..884570b3e5a 100644 --- a/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx +++ b/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx @@ -75,7 +75,8 @@ \thesis@year}} % Různé -\gdef\thesis@czech@authorSignature{Podpis autora} +\gdef\thesis@czech@authorSignature{% + Podpis autor\ifthesis@woman ky\else a\fi} \gdef\thesis@czech@fieldTitle{Obor} \gdef\thesis@czech@advisorTitle{Vedoucí práce} \gdef\thesis@czech@authorTitle{Autor} @@ -361,10 +362,10 @@ \gdef\thesis@czech@assignment{% \ifthesis@digital@ Na tomto místě se v~tištěné práci nachází oficiální podepsané - zadání práce a prohlášení autora školního díla. + zadání práce a~prohlášení autora školního díla. \else Místo tohoto listu vložte kopie oficiálního podepsaného zadání - práce a prohlášení autora školního díla. + práce a~prohlášení autora školního díla. \fi} \gdef\thesis@czech@declaration{% Prohlašuji, že tato \thesis@lower{czech@typeName} je mým @@ -466,10 +467,10 @@ \gdef\thesis@czech@declaration{% Prohlašuji, že jsem \thesis@lower{czech@typeName@% akuzativ} vypracoval\thesis@czech@gender@koncovka\ samostatně, - s~využitím pouze citovaných pramenů, dalších informací a zdrojů + s~využitím pouze citovaných pramenů, dalších informací a~zdrojů v~souladu s~Disciplinárním řádem pro studenty Pedagogické fakulty - Masarykovy univerzity a se zákonem č.\ 121/2000 Sb., o~právu - autorském, o~právech souvisejících s~právem autorským a o~změně + Masarykovy univerzity a~se zákonem č.\ 121/2000 Sb., o~právu + autorském, o~právech souvisejících s~právem autorským a~o~změně některých zákonů (autorský zákon), ve znění pozdějších předpisů.} %</mu/ped> diff --git a/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx b/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx index 607e0ce683c..dd6a87af1f1 100644 --- a/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx +++ b/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx @@ -75,7 +75,8 @@ \thesis@year}} % Rôzne -\gdef\thesis@slovak@authorSignature{Podpis autora} +\gdef\thesis@slovak@authorSignature{% + Podpis autor\ifthesis@woman ky\else a\fi} \gdef\thesis@slovak@fieldTitle{Odbor} \gdef\thesis@slovak@advisorTitle{Vedúci práce} \gdef\thesis@slovak@authorTitle{Autor} @@ -322,7 +323,7 @@ \thesis@extra@advisorSkGenitiv\ a~uved\ifthesis@woman la\else iol\fi\ v~nej všetky odborné zdroje v~súlade s~právnymi predpismi, vnútornými - předpismi Masarykovej univerzity a~vnútornými aktmi riadenia + predpismi Masarykovej univerzity a~vnútornými aktmi riadenia Masarykovej univerzity a~Ekonomicko-správnej fakulty MU.} % \end{macrocode}\iffalse %</mu/econ> @@ -415,7 +416,7 @@ \else <<Neznáme oddělenie (\thesis@department)>>% \fi} -\gdef\thesis@czech@declaration{% +\gdef\thesis@slovak@declaration{% \ifx\thesis@department\thesis@departments@kisk Vyhlasujem, že som predkladanú prácu spracoval% \thesis@slovak@gender@koncovka\ samostatne~a použil% 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 2bf55b0e17d..3c34a6cb0ee 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx @@ -7,7 +7,7 @@ % after \texttt{style/fithesis-base.sty}, regardless of the value % of the |\thesis@style| macro. % \begin{macrocode} -\ProvidesPackage{fithesis/style/mu/fithesis-base}[2017/06/02] +\ProvidesPackage{fithesis/style/mu/fithesis-base}[2018/12/25] \NeedsTeXFormat{LaTeX2e} % \end{macrocode} % The file recognizes the following options: \begin{itemize} @@ -361,7 +361,6 @@ \def\thesis@bibliography@setup#1{% \setkeys{thesis@bibliography}{#1}} % \end{macrocode} -% \end{macro} % The following key-value pairs are supported: % \begin{enumerate} % \item\marg{\texttt{style}=style} -- Stores \texttt{style} in @@ -383,6 +382,26 @@ \def\thesis@bibliography@sorting{#1}% \fi} % \end{macrocode} +% \changes{v0.3.51}{2018/06/15}{^^A +% Added the \texttt{bibliography} extra field to the style files +% of the Masaryk University in Brno, Czech Republic} +% The following extra data field is defined for the macro: +% \begin{itemize} +% \item|bibliography| -- the comma-delimited list of key-value +% pairs accepted by |\thesis@bibliography@setup|. If the data +% field was specified, it is immediately passed to +% |\thesis@bibliography@setup| and it overrides any defaults +% specified in faculty style files. +% \end{itemize} +% \begin{macrocode} +\thesis@def@extra[]{bibliography} +\ifx\thesis@extra@bibliography + \thesis@placeholder@extra@bibliography\else + \expandafter\thesis@bibliography@setup\expandafter{% + \thesis@extra@bibliography}% +\fi +% \end{macrocode} +% \end{macro} % \begin{macro}{\thesis@bibliography@load} % When |\ifthesis@bibliography@| is true and % |\ifthesis@bibliography@loaded@| is false, the @@ -448,12 +467,20 @@ % \end{macrocode} % \end{macro} ^^A The nested \ifthesis@bibliography@included@ def % \end{macro} ^^A The \thesis@bibliography@load macro definition -% The \textsf{hyperref} package is configured to support both roman -% and arabic page numbering in one document and to decorate -% hyperlinks with an underline instead of a rectangular box. +% In the digital version, the \textsf{hyperref} package is configured to +% decorate hyperlinks with an underline instead of a rectangular box. +% In the printed version, the \textsf{hyperref} package is configured to +% hide links. +% \changes{v0.3.51}{2018/12/25}{^^A +% In the printed version, the \textsf{hyperref} package is configured to +% hide links. [VN]} % \begin{macrocode} \thesis@require{hyperref} -\hypersetup{pdfborderstyle={/S/U/W 1}} % Less obtrusive borders +\ifthesis@digital@ + \hypersetup{pdfborderstyle={/S/U/W 1}} +\else + \hypersetup{hidelinks} +\fi % \end{macrocode} % Clubs and widows are set to be infinitely bad. % \begin{macrocode} 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 822cbd86211..da1bef6fcc7 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx @@ -5,12 +5,13 @@ % \changes{v0.3.46}{2017/06/02}{The documentation now points to the % 2/2017 dean's directive for the Faculty of Economics and % Administration, Masaryk University, Brno. [VN]} -% published at the website of the faculty\footnote{See \url{ht^^A -% tps://is.muni.cz/auth/do/econ/predpisy/smernice/prehled/6715^^A -% 9928/SmerniceDekana2017-c.2-o_zaverecnych_pracich_2017.pdf}}. +% published at the website of the faculty\footnote{See \url{htt^^A +% ps://is.muni.cz/auth/do/econ/uredni_deska/predpisy_ESF/smerni^^A +% ce/smernice_dekana/prehled/67159928/SmerniceDekana2017-c.9-o_^^A +% zaverecnych_pracich_2017.docx}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-econ}[2018/02/11] +\ProvidesPackage{fithesis/style/mu/fithesis-econ}[2018/06/11] % \end{macrocode} % The file defines the color scheme of the respective faculty. Note % the the color definitions are in RGB, which makes the resulting @@ -126,11 +127,9 @@ % \begin{macrocode} \def\thesis@blocks@frontMatter{% \thesis@blocks@clear - % In case of double-sided typesetting, change the geometry - \ifthesis@twoside@ - \newgeometry{top=25mm,bottom=20mm,left=35mm, - right=15mm, includeheadfoot} - \fi\pagestyle{empty} + \newgeometry{top=25mm,bottom=20mm,left=35mm, + right=15mm, includeheadfoot} + \pagestyle{empty} \parindent 1.5em \setcounter{page}{1} \pagenumbering{arabic}} @@ -143,11 +142,9 @@ % \begin{macrocode} \def\thesis@blocks@mainMatter{% \thesis@blocks@clear - % In case of double-sided typesetting, change the geometry - \ifthesis@twoside@ - \newgeometry{top=25mm,bottom=20mm,left=35mm, - right=15mm, includeheadfoot} - \fi\pagestyle{thesisheadings} + \newgeometry{top=25mm,bottom=20mm,left=35mm, + right=15mm, includeheadfoot} + \pagestyle{thesisheadings} \parindent 1.5em\relax} % \end{macrocode} % \end{macro}\begin{macro}{\thesis@blocks@tables} @@ -295,19 +292,39 @@ % in \texttt{style/mu/fithesis-econ.sty} in accordance with the % example documents. The patch was submitted by Jana Ratajská. % [VN]} +% \changes{v0.3.51}{2020/03/09}{The \cs{thesis@blocks@bibEntry} +% command now accomodates long titles and other information that +% may span multiple lines. [VN]} % \begin{macrocode} \def\thesis@blocks@bibEntry{% \thesis@blocks@clear - \noindent\begin{thesis@newtable@old}{@{}>{\bfseries}ll@{}} - \thesis@@{bib@author}: & \thesis@author \\ - \thesis@@{bib@thesisTitle}: & \thesis@title \\ - \ifthesis@english\else - \thesis@@{bib@thesisTitleEn}: & \thesis@titleEn \\ - \fi - \thesis@@{bib@department}: & \thesis@department \\ - \thesis@@{bib@advisor}: & \thesis@advisor \\ - \thesis@@{bib@year}: & \thesis@year \\ - \end{thesis@newtable@old}} + {\let\@A\relax\newlength{\@A} + \settowidth{\@A}{{\bf\thesis@@{bib@author}}} + \@B=\@A + \settowidth{\@A}{{\bf\thesis@@{bib@thesisTitle}}} + \ifdim\@A>\@B\@B=\@A\fi + \ifthesis@english\else + \settowidth{\@A}{{\bf\thesis@@{bib@thesisTitleEn}}} + \ifdim\@A>\@B\@B=\@A\fi + \fi + \settowidth{\@A}{{\bf\thesis@@{bib@department}}} + \ifdim\@A>\@B\@B=\@A\fi + \settowidth{\@A}{{\bf\thesis@@{bib@advisor}}} + \ifdim\@A>\@B\@B=\@A\fi + \settowidth{\@A}{{\bf\thesis@@{bib@year}}} + \ifdim\@A>\@B\@B=\@A\fi + \noindent\begin{thesis@newtable@old}{@{}>{\bfseries}% + p{\dimexpr(\@B + \tabcolsep)}% + p{\dimexpr(\textwidth - \@B - 2\tabcolsep)}@{}} + \thesis@@{bib@author}: & \thesis@author \\ + \thesis@@{bib@thesisTitle}: & \thesis@title \\ + \ifthesis@english\else + \thesis@@{bib@thesisTitleEn}: & \thesis@titleEn \\ + \fi + \thesis@@{bib@department}: & \thesis@department \\ + \thesis@@{bib@advisor}: & \thesis@advisor \\ + \thesis@@{bib@year}: & \thesis@year \\ + \end{thesis@newtable@old}}} % \end{macrocode} % \end{macro} % Note that there is no direct support for the seminar paper and diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/fi.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/fi.dtx index e1fc1e28c93..28a15307439 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/fi.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/fi.dtx @@ -3,7 +3,9 @@ % Informatics at the Masaryk University in Brno. It has been % prepared in accordance with the formal requirements published at % the website of the faculty\footnote{See -% \url{http://www.fi.muni.cz/docs/BP_DP_na_FI.pdf}}. +% \url{https://is.muni.cz/do/fi/uredni_deska/predpisy/smernice/^^A +% Smernice_dekana_1_2018_zaverecne_prace.pdfa.pdf}, and +% \url{http://www.fi.muni.cz/docs/BP_DP_na_FI.pdf}.}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{fithesis/style/mu/fithesis-fi}[2016/04/18] diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.dtx index 02c8c2da1b6..9efba78442f 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.dtx @@ -2,8 +2,9 @@ % This is the style file for the theses written at the Faculty of % Sports Studies at the Masaryk University in Brno. It has been % prepared in accordance with the formal requirements published at -% the website of the faculty\footnote{See \url{https://is.muni.cz/^^A -% auth/do/fsps/studijni/info-stud/SZZ/pokyny_ZP_13-5-2013.pdf}}. +% the website of the faculty\footnote{See \url{https://is.muni.^^A +% cz/auth/do/fsps/studijni/info-stud/SZZ/44862261/pokyny_ZP_13-^^A +% 5-2013.pdf}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{fithesis/style/mu/fithesis-fsps}[2018/02/11] diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/fss.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/fss.dtx index bea5704bce9..820f180eea0 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/fss.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/fss.dtx @@ -1,19 +1,18 @@ % \file{style/mu/fithesis-fss.sty} % This is the style file for the theses written at the Faculty of -% Social Studies at the Masaryk University in Brno. Because of the -% inexistence of faculty-wide formal requirements and -% recommendations with each department defining their own with -% varying degrees of -% rigour\footnote{\raggedright See -% \url{http://psych.fss.muni.cz/node/351}, -% \url{http://medzur.fss.muni.cz/informace-pro-studenty/pravidla^^A -% -pro-diplomky/soubory/Pravidla pro zaverecne prace na KMSZ - v^^A -% er. 2-83.doc}, \url{http://soc.fss.muni.cz/?q=node/44}, \url{h^^A -% ttp://polit.fss.muni.cz/informace-pro-studenty/pol/}, \url{htt^^A -% p://humenv.fss.muni.cz/studium/bakalarske-studium/pravidla-pro^^A -% -vypracovani-bakalarske-prace}}, this style is a mere skeleton, -% which is unlikely to satisfy the exact requirements of any -% department and will require modification by the user. +% Social Studies at the Masaryk University in Brno. Since there +% exists no faculty-wide formal requirement or recommendation,^^A +% \footnote{See \url{https://medzur.fss.muni.cz/informace-pro-st^^A +% udenty/bakalarske-a-diplomove-prace}, \url{https://is.muni.cz/^^A +% do/fss/kspsp/mvplzszz/dp_pokyny.html}, \url{https://psych.fss.^^A +% muni.cz/media/3054818/pokyny_pro_psani_zaverecnych_praci.pdf}, +% \url{http://mve.fss.muni.cz/cs/studium/studijni-agenda/pokyny-^^A +% ke-szz}, \url{https://humenv.fss.muni.cz/mgr/zaverecne-prace}, +% and \url{https://medzur.fss.muni.cz/media/11356/pravidla_pro_z^^A +% averecne_prace_na_kmszu_verze_2013.pdf}.} +% this style is just a skeleton, which is unlikely to satisfy the +% exact requirements of any department and will require +% modification by the individual departments. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{fithesis/style/mu/fithesis-fss}[2016/04/18] diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/law.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/law.dtx index 9c7cb865f82..fb02d5dde02 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/law.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/law.dtx @@ -3,7 +3,8 @@ % Law at the Masaryk University in Brno. It has been prepared in % accordance with the formal requirements published at the % website of the faculty\footnote{See \url{http://is.muni.cz/d^^A -% o/law/ud/predp/smer/S-07-2012.pdf}}. +% o/law/ud/predp/smer/S-07-2012.pdf}, and \url{https://is.muni^^A +% .cz/do/law/ud/predp/smer/S-04-2013_O_citacich_dokumentu.pdf}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{fithesis/style/mu/fithesis-law}[2017/05/21] @@ -26,6 +27,12 @@ sorting=nyt} \thesis@bibliography@load % \end{macrocode} +% Each footnote is uniquely numbered across the entire document as +% per the formal requirements of the faculty. +% \begin{macrocode} +\thesis@require{chngcntr} +\counterwithout{footnote}{chapter} +% \end{macrocode} % The style file configures the cover and title page headers to % include only the faculty name and the department name. % Along with the macros required by the locale file interface, diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/med.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/med.dtx index 323f3de9028..812e4c7273d 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/med.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/med.dtx @@ -7,7 +7,7 @@ % ZITOSTI_ZAVERECNE_PRACE.doc}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-med}[2018/02/11] +\ProvidesPackage{fithesis/style/mu/fithesis-med}[2018/06/11] % \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,11 +112,9 @@ % \begin{macrocode} \def\thesis@blocks@frontMatter{% \thesis@blocks@clear - % In case of double-sided typesetting, change the geometry - \ifthesis@twoside@ - \newgeometry{top=25mm,bottom=20mm,left=35mm, - right=15mm, includeheadfoot} - \fi\pagestyle{empty} + \newgeometry{top=25mm,bottom=20mm,left=35mm, + right=15mm, includeheadfoot} + \pagestyle{empty} \parindent 1.5em \setcounter{page}{1} \pagenumbering{roman}} @@ -128,11 +126,9 @@ % \begin{macrocode} \def\thesis@blocks@mainMatter{% \thesis@blocks@clear - % In case of double-sided typesetting, change the geometry - \ifthesis@twoside@ - \newgeometry{top=25mm,bottom=20mm,left=35mm, - right=15mm, includeheadfoot} - \fi\setcounter{page}{1} + \newgeometry{top=25mm,bottom=20mm,left=35mm, + right=15mm, includeheadfoot} + \setcounter{page}{1} \pagenumbering{arabic} \pagestyle{thesisheadings} \parindent 1.5em diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/ped.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/ped.dtx index f7a58bb0918..49c2b643cb1 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/ped.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/ped.dtx @@ -2,8 +2,9 @@ % This is the style file for the theses written at the Faculty of % Education at the Masaryk University in Brno. It has been prepared % in accordance with the formal requirements published at the -% of the faculty\footnote{See \url{https://is.muni.cz/auth/do/^^A -% ped/VPAN/46952359/53057289}}. +% of the faculty\footnote{See \url{https://is.muni.cz/do/ped/VPA^^A +% N/pokdek/c._1_2015_K_realizaci_zaverecnych_praci.pdf}, and +% \url{http://moodlinka.ics.muni.cz/course/view.php?id=632}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{fithesis/style/mu/fithesis-ped}[2016/04/18] diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/phil.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/phil.dtx index 8f02f5d4e50..2c95f139672 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/phil.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/phil.dtx @@ -2,8 +2,8 @@ % This is the style file for the theses written at the Faculty of % Arts at the Masaryk University in Brno. It has been prepared in % accordance with the formal requirements published at the website -% of the faculty\footnote{See \url{http://is.muni.cz/auth/do/^^A -% 1421/4581421/Vzor_bakalarske_prace.pdf}}. +% of the faculty\footnote{See \url{https://is.muni.cz/do/phil/P^^A +% racoviste/SO/vzory_praci/Vzor_bakalarske_prace.pdf}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{fithesis/style/mu/fithesis-phil}[2016/04/18] @@ -22,7 +22,7 @@ % used and the bibliography is sorted by name, title, and year. % \begin{macrocode} \thesis@bibliography@setup{ - style=iso-numeric, + style=iso-authoryear, sorting=nty} \thesis@bibliography@load % \end{macrocode} @@ -55,21 +55,18 @@ \fi % \end{macrocode} % \begin{macro}{\thesis@blocks@titlePage} -% In the case of a KISK thesis, the style file redefines the cover -% and title page footers to include the thesis advisor's name. +% The style file redefines the cover and title page footers to include the +% thesis advisor's name. +% \changes{v0.3.51} {2018/11/05}{Always typeset the name of the advisor +% on the title page for the Faculty of Arts at the Masaryk University +% in Brno, Czech Republic. [VN]} % \begin{macrocode} -\ifx\thesis@department\thesis@departments@kisk - \def\thesis@blocks@titlePage@content{% - {\thesis@titlePage@Huge\bf\thesis@TeXtitle\par\vfil}\vskip 0.8in - {\thesis@titlePage@large\sc\thesis@@{typeName}\\[0.3in]} - {\thesis@titlePage@Large\bf\thesis@author} - % If this is a KISK thesis, typeset the name of the thesis - % advisor. - \ifx\thesis@department\thesis@departments@kisk - {\thesis@titlePage@large\\[0.3in] - {\bf\thesis@@{advisorTitle}:} \thesis@advisor} - \fi}% -\fi +\def\thesis@blocks@titlePage@content{% + {\thesis@titlePage@Huge\bf\thesis@TeXtitle\par\vfil}\vskip 0.8in + {\thesis@titlePage@large\sc\thesis@@{typeName}\\[0.3in]} + {\thesis@titlePage@Large\bf\thesis@author} + {\thesis@titlePage@large\\[0.3in] + {\bf\thesis@@{advisorTitle}:} \thesis@advisor}} % \end{macrocode} % \end{macro} % Note that there is no direct support for the seminar paper and diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx index ca1630a0f34..db7059fbec5 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx @@ -3,7 +3,9 @@ % Science at the Masaryk University in Brno. It has been % prepared in accordance with the formal requirements published at % the website of the faculty\footnote{See -% \url{http://www.sci.muni.cz/NW/predpisy/od/OD-2014-05.pdf}}. +% \url{http://www.sci.muni.cz/NW/predpisy/od/OD-2014-05.pdf}, and +% \url{http://www.sci.muni.cz/cz/BcMgrStudium/Legislativa/Sablon^^A +% y}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{fithesis/style/mu/fithesis-sci}[2017/06/02] diff --git a/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls b/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls index 354890efebb..3d157e19d51 100644 --- a/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls +++ b/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls @@ -54,7 +54,7 @@ \gdef\thesis@version@number{#1} \gdef\thesis@version@date{#2} \gdef\thesis@version{#2 #1 fithesis3 MU thesis class}} -\thesis@versiondef{v0.3.50}{2018/03/25}} +\thesis@versiondef{v0.3.51}{2020/03/09}} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ProvidesClass{fithesis3}[\thesis@version] @@ -538,16 +538,10 @@ \def\thesis@@#1{\thesis@{\thesis@locale @#1}} \def\thesis@lower#1{{% \let\ea\expandafter - \ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\lowercase\ea\ea\ea - \ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea{\ea\ea\ea\ea\ea\ea\ea\ea\ea - \ea\ea\ea\ea\ea\ea\@gobble\ea\ea\ea\string\ea\csname\csname the% - sis@#1\endcsname\endcsname}}} + \ea\MakeLowercase\ea{\csname thesis@#1\endcsname}}} \def\thesis@upper#1{{% \let\ea\expandafter - \ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\uppercase\ea\ea\ea - \ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea{\ea\ea\ea\ea\ea\ea\ea\ea\ea - \ea\ea\ea\ea\ea\ea\@gobble\ea\ea\ea\string\ea\csname\csname the% - sis@#1\endcsname\endcsname}}} + \ea\MakeUppercase\ea{\csname thesis@#1\endcsname}}} \def\thesis@@lower#1{\thesis@lower{\thesis@locale @#1}} \def\thesis@@upper#1{\thesis@upper{\thesis@locale @#1}} \def\thesis@head#1 #2{% diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-czech.def b/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-czech.def index c8b7efe7587..797b90a8773 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-czech.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-czech.def @@ -100,7 +100,8 @@ \fi\fi\fi\fi\fi\fi \thesis@year}} -\gdef\thesis@czech@authorSignature{Podpis autora} +\gdef\thesis@czech@authorSignature{% + Podpis autor\ifthesis@woman ky\else a\fi} \gdef\thesis@czech@fieldTitle{Obor} \gdef\thesis@czech@advisorTitle{Vedoucí práce} \gdef\thesis@czech@authorTitle{Autor} diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-slovak.def b/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-slovak.def index 4ac794817f5..22fddc4938c 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-slovak.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-slovak.def @@ -100,7 +100,8 @@ \fi\fi\fi\fi\fi\fi \thesis@year}} -\gdef\thesis@slovak@authorSignature{Podpis autora} +\gdef\thesis@slovak@authorSignature{% + Podpis autor\ifthesis@woman ky\else a\fi} \gdef\thesis@slovak@fieldTitle{Odbor} \gdef\thesis@slovak@advisorTitle{Vedúci práce} \gdef\thesis@slovak@authorTitle{Autor} diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-slovak.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-slovak.def index 4bb14767cee..d6e724bac26 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-slovak.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/econ/fithesis-slovak.def @@ -65,7 +65,7 @@ \thesis@extra@advisorSkGenitiv\ a~uved\ifthesis@woman la\else iol\fi\ v~nej všetky odborné zdroje v~súlade s~právnymi predpismi, vnútornými - předpismi Masarykovej univerzity a~vnútornými aktmi riadenia + predpismi Masarykovej univerzity a~vnútornými aktmi riadenia Masarykovej univerzity a~Ekonomicko-správnej fakulty MU.} \endinput diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fi/fithesis-czech.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fi/fithesis-czech.def index 8d1cb8203b6..45a4073c85a 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fi/fithesis-czech.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fi/fithesis-czech.def @@ -55,10 +55,10 @@ \gdef\thesis@czech@assignment{% \ifthesis@digital@ Na tomto místě se v~tištěné práci nachází oficiální podepsané - zadání práce a prohlášení autora školního díla. + zadání práce a~prohlášení autora školního díla. \else Místo tohoto listu vložte kopie oficiálního podepsaného zadání - práce a prohlášení autora školního díla. + práce a~prohlášení autora školního díla. \fi} \gdef\thesis@czech@declaration{% Prohlašuji, že tato \thesis@lower{czech@typeName} je mým diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/ped/fithesis-czech.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/ped/fithesis-czech.def index 9a93a67c7f0..3c463ece42c 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/ped/fithesis-czech.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/ped/fithesis-czech.def @@ -56,10 +56,10 @@ \gdef\thesis@czech@declaration{% Prohlašuji, že jsem \thesis@lower{czech@typeName@% akuzativ} vypracoval\thesis@czech@gender@koncovka\ samostatně, - s~využitím pouze citovaných pramenů, dalších informací a zdrojů + s~využitím pouze citovaných pramenů, dalších informací a~zdrojů v~souladu s~Disciplinárním řádem pro studenty Pedagogické fakulty - Masarykovy univerzity a se zákonem č.\ 121/2000 Sb., o~právu - autorském, o~právech souvisejících s~právem autorským a o~změně + Masarykovy univerzity a~se zákonem č.\ 121/2000 Sb., o~právu + autorském, o~právech souvisejících s~právem autorským a~o~změně některých zákonů (autorský zákon), ve znění pozdějších předpisů.} \endinput diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/phil/fithesis-slovak.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/phil/fithesis-slovak.def index 888989cf08e..80c5d218499 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/phil/fithesis-slovak.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/phil/fithesis-slovak.def @@ -59,7 +59,7 @@ \else <<Neznáme oddělenie (\thesis@department)>>% \fi} -\gdef\thesis@czech@declaration{% +\gdef\thesis@slovak@declaration{% \ifx\thesis@department\thesis@departments@kisk Vyhlasujem, že som predkladanú prácu spracoval% \thesis@slovak@gender@koncovka\ samostatne~a použil% diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base-color.pdf Binary files differindex 5853942a284..7baf9515e30 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base-color.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base-color.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base.pdf Binary files differindex b6649dbd768..369019148db 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ-color.pdf Binary files differindex 818d0afe664..1e778690f37 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ-color.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ-color.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ.pdf Binary files differindex b1ae627cb00..bcc7608cf64 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi-color.pdf Binary files differindex be2433713cd..860a1365ba1 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi-color.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi-color.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi.pdf Binary files differindex 661a07bdf84..ea3cf0e29c1 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps-color.pdf Binary files differindex 8a11fa4be2a..9f9735cb4d4 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps-color.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps-color.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps.pdf Binary files differindex a3bda1186aa..04e45863878 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss-color.pdf Binary files differindex a0cb7ef2433..ed95130f0c0 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss-color.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss-color.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss.pdf Binary files differindex 992d5326821..e7b7b168914 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law-color.pdf Binary files differindex 353ce6d4e51..32a31baeba8 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law-color.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law-color.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law.pdf Binary files differindex cd31a533869..a72c729e96a 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med-color.pdf Binary files differindex 16030f27a1e..9b29dc714e8 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med-color.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med-color.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med.pdf Binary files differindex eed37dfaa01..b0c5cbb593e 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped-color.pdf Binary files differindex 5cc1052e9a1..6eae00a5a05 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped-color.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped-color.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped.pdf Binary files differindex 16700f89cc0..c197909ce2b 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil-color.pdf Binary files differindex 2575420b58a..ae0a78ef654 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil-color.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil-color.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil.pdf Binary files differindex f1163fd06f1..c0d8892e5c1 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci-color.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci-color.pdf Binary files differindex f36e77d2c4b..a940c11280e 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci-color.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci-color.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci.pdf b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci.pdf Binary files differindex 8eaa5b9fc45..032d99538ce 100644 --- a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci.pdf +++ b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci.pdf diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-base.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-base.sty index f1d72a64b69..d001ceff63f 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-base.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-base.sty @@ -49,7 +49,7 @@ %% %% The names of the source files used are shown above. %% -\ProvidesPackage{fithesis/style/mu/fithesis-base}[2017/06/02] +\ProvidesPackage{fithesis/style/mu/fithesis-base}[2018/12/25] \NeedsTeXFormat{LaTeX2e} \DeclareOption{10pt}{\def\thesis@ptsize{0}} \DeclareOption{11pt}{\def\thesis@ptsize{1}} @@ -179,6 +179,12 @@ \ifx\thesis@bibliography@sorting\undefined \def\thesis@bibliography@sorting{#1}% \fi} +\thesis@def@extra[]{bibliography} +\ifx\thesis@extra@bibliography + \thesis@placeholder@extra@bibliography\else + \expandafter\thesis@bibliography@setup\expandafter{% + \thesis@extra@bibliography}% +\fi \newif\ifthesis@bibliography@loaded@ \thesis@bibliography@loaded@false \newif\ifthesis@bibliography@included@ @@ -215,7 +221,11 @@ \fi \fi} \thesis@require{hyperref} -\hypersetup{pdfborderstyle={/S/U/W 1}} % Less obtrusive borders +\ifthesis@digital@ + \hypersetup{pdfborderstyle={/S/U/W 1}} +\else + \hypersetup{hidelinks} +\fi \widowpenalty 10000 \clubpenalty 10000 \def\thesis@color@setup#1{% diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-econ.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-econ.sty index 6bd4f59787b..cb591b7ccec 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-econ.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-econ.sty @@ -50,7 +50,7 @@ %% The names of the source files used are shown above. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-econ}[2018/02/11] +\ProvidesPackage{fithesis/style/mu/fithesis-econ}[2018/06/11] \thesis@color@setup{ links={HTML}{F27995}, tableEmph={HTML}{E8B88B}, @@ -108,21 +108,17 @@ \end{minipage}}\\[4em]\thesis@place, \thesis@year}} \def\thesis@blocks@frontMatter{% \thesis@blocks@clear - % In case of double-sided typesetting, change the geometry - \ifthesis@twoside@ - \newgeometry{top=25mm,bottom=20mm,left=35mm, - right=15mm, includeheadfoot} - \fi\pagestyle{empty} + \newgeometry{top=25mm,bottom=20mm,left=35mm, + right=15mm, includeheadfoot} + \pagestyle{empty} \parindent 1.5em \setcounter{page}{1} \pagenumbering{arabic}} \def\thesis@blocks@mainMatter{% \thesis@blocks@clear - % In case of double-sided typesetting, change the geometry - \ifthesis@twoside@ - \newgeometry{top=25mm,bottom=20mm,left=35mm, - right=15mm, includeheadfoot} - \fi\pagestyle{thesisheadings} + \newgeometry{top=25mm,bottom=20mm,left=35mm, + right=15mm, includeheadfoot} + \pagestyle{thesisheadings} \parindent 1.5em\relax} \def\thesis@blocks@tables{% \thesis@blocks@lot @@ -196,16 +192,33 @@ \fi} \def\thesis@blocks@bibEntry{% \thesis@blocks@clear - \noindent\begin{thesis@newtable@old}{@{}>{\bfseries}ll@{}} - \thesis@@{bib@author}: & \thesis@author \\ - \thesis@@{bib@thesisTitle}: & \thesis@title \\ - \ifthesis@english\else - \thesis@@{bib@thesisTitleEn}: & \thesis@titleEn \\ - \fi - \thesis@@{bib@department}: & \thesis@department \\ - \thesis@@{bib@advisor}: & \thesis@advisor \\ - \thesis@@{bib@year}: & \thesis@year \\ - \end{thesis@newtable@old}} + {\let\@A\relax\newlength{\@A} + \settowidth{\@A}{{\bf\thesis@@{bib@author}}} + \@B=\@A + \settowidth{\@A}{{\bf\thesis@@{bib@thesisTitle}}} + \ifdim\@A>\@B\@B=\@A\fi + \ifthesis@english\else + \settowidth{\@A}{{\bf\thesis@@{bib@thesisTitleEn}}} + \ifdim\@A>\@B\@B=\@A\fi + \fi + \settowidth{\@A}{{\bf\thesis@@{bib@department}}} + \ifdim\@A>\@B\@B=\@A\fi + \settowidth{\@A}{{\bf\thesis@@{bib@advisor}}} + \ifdim\@A>\@B\@B=\@A\fi + \settowidth{\@A}{{\bf\thesis@@{bib@year}}} + \ifdim\@A>\@B\@B=\@A\fi + \noindent\begin{thesis@newtable@old}{@{}>{\bfseries}% + p{\dimexpr(\@B + \tabcolsep)}% + p{\dimexpr(\textwidth - \@B - 2\tabcolsep)}@{}} + \thesis@@{bib@author}: & \thesis@author \\ + \thesis@@{bib@thesisTitle}: & \thesis@title \\ + \ifthesis@english\else + \thesis@@{bib@thesisTitleEn}: & \thesis@titleEn \\ + \fi + \thesis@@{bib@department}: & \thesis@department \\ + \thesis@@{bib@advisor}: & \thesis@advisor \\ + \thesis@@{bib@year}: & \thesis@year \\ + \end{thesis@newtable@old}}} \def\thesis@blocks@preamble{% \thesis@blocks@coverMatter \thesis@blocks@cover diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-law.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-law.sty index a89c3a0f71d..fe255d63990 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-law.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-law.sty @@ -60,6 +60,8 @@ style=iso-authoryear, sorting=nyt} \thesis@bibliography@load +\thesis@require{chngcntr} +\counterwithout{footnote}{chapter} \def\thesis@blocks@cover@header{% {\sc\thesis@titlePage@Large\thesis@@{facultyLongName}\\% \thesis@titlePage@large\thesis@department@name\\\vskip 2em}} diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-med.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-med.sty index a18a543302c..3e67da4e738 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-med.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-med.sty @@ -50,7 +50,7 @@ %% The names of the source files used are shown above. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-med}[2018/02/11] +\ProvidesPackage{fithesis/style/mu/fithesis-med}[2018/06/11] \thesis@color@setup{ links={HTML}{F58E76}, tableEmph={HTML}{FF9D85}, @@ -108,21 +108,17 @@ \end{minipage}}\\[4em]\thesis@place, \thesis@@{semester}}} \def\thesis@blocks@frontMatter{% \thesis@blocks@clear - % In case of double-sided typesetting, change the geometry - \ifthesis@twoside@ - \newgeometry{top=25mm,bottom=20mm,left=35mm, - right=15mm, includeheadfoot} - \fi\pagestyle{empty} + \newgeometry{top=25mm,bottom=20mm,left=35mm, + right=15mm, includeheadfoot} + \pagestyle{empty} \parindent 1.5em \setcounter{page}{1} \pagenumbering{roman}} \def\thesis@blocks@mainMatter{% \thesis@blocks@clear - % In case of double-sided typesetting, change the geometry - \ifthesis@twoside@ - \newgeometry{top=25mm,bottom=20mm,left=35mm, - right=15mm, includeheadfoot} - \fi\setcounter{page}{1} + \newgeometry{top=25mm,bottom=20mm,left=35mm, + right=15mm, includeheadfoot} + \setcounter{page}{1} \pagenumbering{arabic} \pagestyle{thesisheadings} \parindent 1.5em diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-phil.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-phil.sty index 5bbc70c4a3c..2ee57074d5b 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-phil.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-phil.sty @@ -57,7 +57,7 @@ tableOdd={HTML}{EBF6FA}, tableEven={HTML}{D0EBF5}} \thesis@bibliography@setup{ - style=iso-numeric, + style=iso-authoryear, sorting=nty} \thesis@bibliography@load \thesis@blocks@titlePage@department@true @@ -67,18 +67,12 @@ \def\thesis@department@name{\thesis@@{departmentName}} \def\thesis@departmentEn@name{\thesis@english@departmentName} \fi -\ifx\thesis@department\thesis@departments@kisk - \def\thesis@blocks@titlePage@content{% - {\thesis@titlePage@Huge\bf\thesis@TeXtitle\par\vfil}\vskip 0.8in - {\thesis@titlePage@large\sc\thesis@@{typeName}\\[0.3in]} - {\thesis@titlePage@Large\bf\thesis@author} - % If this is a KISK thesis, typeset the name of the thesis - % advisor. - \ifx\thesis@department\thesis@departments@kisk - {\thesis@titlePage@large\\[0.3in] - {\bf\thesis@@{advisorTitle}:} \thesis@advisor} - \fi}% -\fi +\def\thesis@blocks@titlePage@content{% + {\thesis@titlePage@Huge\bf\thesis@TeXtitle\par\vfil}\vskip 0.8in + {\thesis@titlePage@large\sc\thesis@@{typeName}\\[0.3in]} + {\thesis@titlePage@Large\bf\thesis@author} + {\thesis@titlePage@large\\[0.3in] + {\bf\thesis@@{advisorTitle}:} \thesis@advisor}} \def\thesis@blocks@preamble{% \thesis@blocks@coverMatter \thesis@blocks@cover |