From 6257b52105585a7cdd3a20b33339c06c9ac4cb86 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 6 Jun 2016 23:02:55 +0000 Subject: fithesis (6jun16) git-svn-id: svn://tug.org/texlive/trunk@41303 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/fithesis/fithesis.pdf | Bin 612865 -> 616222 bytes .../doc/latex/fithesis/guide/mu/econ.pdf | Bin 389693 -> 389815 bytes .../texmf-dist/doc/latex/fithesis/guide/mu/fi.pdf | Bin 373985 -> 374103 bytes .../doc/latex/fithesis/guide/mu/fsps.pdf | Bin 367099 -> 367238 bytes .../texmf-dist/doc/latex/fithesis/guide/mu/fss.pdf | Bin 369692 -> 369839 bytes .../texmf-dist/doc/latex/fithesis/guide/mu/law.pdf | Bin 377351 -> 377481 bytes .../texmf-dist/doc/latex/fithesis/guide/mu/med.pdf | Bin 366724 -> 366574 bytes .../texmf-dist/doc/latex/fithesis/guide/mu/ped.pdf | Bin 369943 -> 369863 bytes .../doc/latex/fithesis/guide/mu/phil.pdf | Bin 367311 -> 367483 bytes .../texmf-dist/doc/latex/fithesis/guide/mu/sci.pdf | Bin 407472 -> 407385 bytes .../texmf-dist/source/latex/fithesis/fithesis.dtx | 42 +++++-- .../source/latex/fithesis/locale/czech.dtx | 40 +++++-- .../source/latex/fithesis/locale/english.dtx | 41 +++++-- .../source/latex/fithesis/locale/slovak.dtx | 41 +++++-- .../source/latex/fithesis/style/mu/base.dtx | 122 +++++++++++++++------ .../source/latex/fithesis/style/mu/sci.dtx | 7 +- Master/texmf-dist/tex/latex/fithesis/fithesis3.cls | 5 +- .../tex/latex/fithesis/locale/fithesis-czech.def | 12 +- .../tex/latex/fithesis/locale/fithesis-english.def | 12 +- .../tex/latex/fithesis/locale/fithesis-slovak.def | 12 +- .../latex/fithesis/locale/mu/fi/fithesis-czech.def | 13 ++- .../fithesis/locale/mu/fi/fithesis-english.def | 13 ++- .../fithesis/locale/mu/fi/fithesis-slovak.def | 13 ++- .../fithesis/locale/mu/fss/fithesis-czech.def | 15 ++- .../fithesis/locale/mu/fss/fithesis-english.def | 16 ++- .../fithesis/locale/mu/fss/fithesis-slovak.def | 16 ++- .../latex/fithesis/logo/mu/fithesis-base-color.pdf | Bin 15999 -> 15999 bytes .../tex/latex/fithesis/logo/mu/fithesis-base.pdf | Bin 15988 -> 15988 bytes .../latex/fithesis/logo/mu/fithesis-econ-color.pdf | Bin 34491 -> 34491 bytes .../tex/latex/fithesis/logo/mu/fithesis-econ.pdf | Bin 12932 -> 12932 bytes .../latex/fithesis/logo/mu/fithesis-fi-color.pdf | Bin 11808 -> 11808 bytes .../tex/latex/fithesis/logo/mu/fithesis-fi.pdf | Bin 11624 -> 11624 bytes .../latex/fithesis/logo/mu/fithesis-fsps-color.pdf | Bin 12560 -> 12560 bytes .../tex/latex/fithesis/logo/mu/fithesis-fsps.pdf | Bin 11730 -> 11730 bytes .../latex/fithesis/logo/mu/fithesis-fss-color.pdf | Bin 11933 -> 11933 bytes .../tex/latex/fithesis/logo/mu/fithesis-fss.pdf | Bin 11590 -> 11590 bytes .../latex/fithesis/logo/mu/fithesis-law-color.pdf | Bin 18971 -> 18971 bytes .../tex/latex/fithesis/logo/mu/fithesis-law.pdf | Bin 18435 -> 18435 bytes .../latex/fithesis/logo/mu/fithesis-med-color.pdf | Bin 11116 -> 11116 bytes .../tex/latex/fithesis/logo/mu/fithesis-med.pdf | Bin 10590 -> 10590 bytes .../latex/fithesis/logo/mu/fithesis-ped-color.pdf | Bin 11027 -> 11027 bytes .../tex/latex/fithesis/logo/mu/fithesis-ped.pdf | Bin 10492 -> 10492 bytes .../latex/fithesis/logo/mu/fithesis-phil-color.pdf | Bin 12736 -> 12736 bytes .../tex/latex/fithesis/logo/mu/fithesis-phil.pdf | Bin 12180 -> 12180 bytes .../latex/fithesis/logo/mu/fithesis-sci-color.pdf | Bin 25965 -> 25965 bytes .../tex/latex/fithesis/logo/mu/fithesis-sci.pdf | Bin 25494 -> 25494 bytes .../tex/latex/fithesis/style/mu/fithesis-base.sty | 56 +++++++--- .../tex/latex/fithesis/style/mu/fithesis-sci.sty | 3 +- 48 files changed, 343 insertions(+), 136 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/fithesis/fithesis.pdf b/Master/texmf-dist/doc/latex/fithesis/fithesis.pdf index 486904e03c8..d4413a4b078 100644 Binary files a/Master/texmf-dist/doc/latex/fithesis/fithesis.pdf and b/Master/texmf-dist/doc/latex/fithesis/fithesis.pdf differ diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/econ.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/econ.pdf index f7be55af433..1bae9dae6a7 100644 Binary files a/Master/texmf-dist/doc/latex/fithesis/guide/mu/econ.pdf and b/Master/texmf-dist/doc/latex/fithesis/guide/mu/econ.pdf differ diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fi.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fi.pdf index 3db9e713655..e3850c3bb70 100644 Binary files a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fi.pdf and b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fi.pdf differ diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fsps.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fsps.pdf index 34a18d589fc..7ae3d03a5ea 100644 Binary files a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fsps.pdf and b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fsps.pdf differ diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fss.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fss.pdf index afa56975c6c..1cbf1e8a62a 100644 Binary files a/Master/texmf-dist/doc/latex/fithesis/guide/mu/fss.pdf and b/Master/texmf-dist/doc/latex/fithesis/guide/mu/fss.pdf differ diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/law.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/law.pdf index 03408bf5558..e0ccd94eb1f 100644 Binary files a/Master/texmf-dist/doc/latex/fithesis/guide/mu/law.pdf and b/Master/texmf-dist/doc/latex/fithesis/guide/mu/law.pdf differ diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/med.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/med.pdf index b6328a90be0..4e0de5f025d 100644 Binary files a/Master/texmf-dist/doc/latex/fithesis/guide/mu/med.pdf and b/Master/texmf-dist/doc/latex/fithesis/guide/mu/med.pdf differ diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/ped.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/ped.pdf index 241ad9ac249..eb2e91dc7f0 100644 Binary files a/Master/texmf-dist/doc/latex/fithesis/guide/mu/ped.pdf and b/Master/texmf-dist/doc/latex/fithesis/guide/mu/ped.pdf differ diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/phil.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/phil.pdf index 529711bbf00..5a97b948302 100644 Binary files a/Master/texmf-dist/doc/latex/fithesis/guide/mu/phil.pdf and b/Master/texmf-dist/doc/latex/fithesis/guide/mu/phil.pdf differ diff --git a/Master/texmf-dist/doc/latex/fithesis/guide/mu/sci.pdf b/Master/texmf-dist/doc/latex/fithesis/guide/mu/sci.pdf index efb155f4e80..ec61ee01d5a 100644 Binary files a/Master/texmf-dist/doc/latex/fithesis/guide/mu/sci.pdf and b/Master/texmf-dist/doc/latex/fithesis/guide/mu/sci.pdf differ diff --git a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx index da915e5f875..7a82aced31f 100644 --- a/Master/texmf-dist/source/latex/fithesis/fithesis.dtx +++ b/Master/texmf-dist/source/latex/fithesis/fithesis.dtx @@ -56,48 +56,63 @@ \gdef\thesis@version@number{#1} \gdef\thesis@version@date{#2} \gdef\thesis@version{#2 #1 fithesis3 MU thesis class}} -\thesis@versiondef{v0.3.38}{2016/05/15}} +\thesis@versiondef{v0.3.40}{2016/06/06}} % {\newwrite\f\openout\f=VERSION\write\f{\thesis@version}\closeout\f} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % +% \changes{v0.3.40} {2016/06/06}{Fixed \cs{thesis@pages} not +% working properly when the \texttt{autoLayout} key is set to +% \texttt{false}. Added a section on the \textsf{markdown} +% package to the example documents of the Masaryk University in +% Brno. Added the \cs{ifthesis@blocks@assignment@hideIfDigital@} +% conditional to the \texttt{style/mu/fithesis-base.sty} style +% file. [VN]} +% \changes{v0.3.39:2}{2016/05/26}{The \texttt{assignment} key no +% longer affects the page numbers and takes into account the +% \texttt{digital} and \texttt{printed} class options in the +% style files of the Masaryk University in Brno. [VN]} +% \changes{v0.3.39:1}{2016/05/26}{The +% \cs{thesis@blocks@bibliography} now uses an emergency stretch +% of 3\,em in the style files of the Masaryk University in Brno. +% [VN]} % \changes{v0.3.38:2}{2016/05/15}{Fixed \cs{thesis@pages} not -% taking \cs{thesis@preamble} into account. Fixed the chapter +% taking \cs{thesis@postamble} 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.} +% University in Brno. [VN]} % \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.} +% style files of the Masaryk University in Brno. [VN]} % \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 % longer results in a \textsf{hyperref}-related error in the -% style files of the Masaryk University in Brno.} +% style files of the Masaryk University in Brno. [VN]} % \changes{v0.3.36} {2016/03/26}{The \cs{thesis@load} macro has -% been lifted to the public API as \cs{thesisload}.} +% been lifted to the public API as \cs{thesisload}. [VN]} % \changes{v0.3.35:3}{2016/03/23}{Fixed \cs{l@}\textit{locale} -% being possibly undefined in a LuaLaTeX run.} +% being possibly undefined in a LuaLaTeX run. [VN]} % \changes{v0.3.35:2}{2016/03/22}{Added support for seminar papers % on the \textsf{fithesis3} class level. The style files for the % faculties of the Masaryk University in Brno do not provide any -% special handling of this thesis type yet.} +% special handling of this thesis type yet. [VN]} % \changes{v0.3.35:1}{2016/03/22}{Added support for the Division of % Information and Library Studies of the Faculty of Arts at the % Masaryk University in Brno. This support is enabled by -% specifying \cs{thesis@department} to be \texttt{kisk}.} +% specifying \cs{thesis@department} to be \texttt{kisk}. [VN]} % \changes{v0.3.34} {2016/02/24}{Added visual tests of output % PDFs. The \texttt{test/} directory is now also uses the % \textit{university}\texttt{/}\textit{faculty} path scheme -% employed by the rest of the package.} -% \changes{v0.3.33} {2016/02/19}{Added \cs{thesis@patch}.} +% employed by the rest of the package. [VN]} +% \changes{v0.3.33} {2016/02/19}{Added \cs{thesis@patch}. [VN]} % \changes{v0.3.32} {2016/02/18}{Fixed a regression from % v0.3.27:2 -- The margins in \cs{thesis@blocks@mainMatter} were % corrected in the style files of the Faculty of Economics and % Administration and the Faculty of Medicine at the Masaryk -% University in Brno.} +% University in Brno. [VN]} % \changes{v0.3.31:3}{2016/01/13}{The % \texttt{style/mu/fithesis-sci.sty} style file redefines % \cs{thesis@blocks}\texttt{\discretionary{@}{@}{@}declaration} @@ -1377,6 +1392,9 @@ \AtEndDocument{% \thesis@postamble \write\@auxout{\noexpand\gdef\noexpand\thesis@pages{\thepage}}} + \else + \AtEndDocument{% + \write\@auxout{\noexpand\gdef\noexpand\thesis@pages{\thepage}}} \fi \makeatother \fi} diff --git a/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx b/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx index ff39c373c4c..bd67af3ecd7 100644 --- a/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx +++ b/Master/texmf-dist/source/latex/fithesis/locale/czech.dtx @@ -2,7 +2,7 @@ % This is the base file of the Czech locale.\iffalse %<*base> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/fithesis-czech.def}[2016/03/22] +\ProvidesFile{fithesis/locale/fithesis-czech.def}[2016/05/25] % \end{macrocode} % The locale file defines all the private macros mandated by the % locale file interface. @@ -25,8 +25,14 @@ % Zástupné texty \gdef\thesis@czech@universityName{Název univerzity} \gdef\thesis@czech@facultyName{Název fakulty} -\gdef\thesis@czech@assignment{Místo tohoto listu vložte kopii - oficiálního podepsaného zadání práce.} +\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. + \else + Místo tohoto listu vložte kopii oficiálního podepsaného zadání + práce. + \fi} \gdef\thesis@czech@declaration{Text prohlášení ...} % Časové údaje @@ -148,14 +154,19 @@ % \iffalse %<*mu/fss> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/fss/fithesis-czech.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/fss/fithesis-czech.def}[2016/05/25] % Zástupné texty \gdef\thesis@czech@facultyName{Fakulta sociálních studií} -\gdef\thesis@czech@assignment{Místo tohoto listu - vložte kopie oficiálního podepsaného zadání práce nebo - prohlášení autora školního díla nebo obojí~v závislosti na - požadavcích příslušné katedry.} +\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, prohlášení autora školního díla nebo obojí. + \else + Místo tohoto listu vložte kopie oficiálního podepsaného zadání + práce nebo prohlášení autora školního díla nebo obojí~v + závislosti na požadavcích příslušné katedry. + \fi} % \end{macrocode}\iffalse % @@ -205,13 +216,18 @@ % \iffalse %<*mu/fi> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/fi/fithesis-czech.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/fi/fithesis-czech.def}[2016/05/25] % Zástupné texty \gdef\thesis@czech@facultyName{Fakulta informatiky} -\gdef\thesis@czech@assignment{Místo tohoto listu - vložte kopie oficiálního podepsaného zadání práce a - prohlášení autora školního díla.} +\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. + \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. + \fi} \gdef\thesis@czech@declaration{% Prohlašuji, že tato \thesis@lower{czech@typeName} je mým původním autorským dílem, které jsem vypracoval% diff --git a/Master/texmf-dist/source/latex/fithesis/locale/english.dtx b/Master/texmf-dist/source/latex/fithesis/locale/english.dtx index 96ce9bdd6c6..703b34db837 100644 --- a/Master/texmf-dist/source/latex/fithesis/locale/english.dtx +++ b/Master/texmf-dist/source/latex/fithesis/locale/english.dtx @@ -2,7 +2,7 @@ % This is the base file of the English locale.\iffalse %<*base> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/fithesis-english.def}[2016/03/22] +\ProvidesFile{fithesis/locale/fithesis-english.def}[2016/05/25] % \end{macrocode} % The locale file defines all the private macros mandated by the % locale file interface. @@ -11,8 +11,14 @@ % Placeholders \gdef\thesis@english@universityName{University name} \gdef\thesis@english@facultyName{Faculty name} -\gdef\thesis@english@assignment{Replace this page with a copy - of the official signed thesis assignment.} +\gdef\thesis@english@assignment{% + \ifthesis@digital@ + This is where a copy of the official signed thesis assignment + is located in the printed version of the document. + \else + Replace this page with a copy of the official signed thesis + assignment. + \fi} \gdef\thesis@english@declaration{Declaration text ...} % Csquotes style @@ -114,14 +120,20 @@ % \iffalse %<*mu/fss> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/fss/fithesis-english.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/fss/fithesis-english.def}[2016/05/25] % Placeholders \gdef\thesis@english@facultyName{Faculty of Social Studies} -\gdef\thesis@english@assignment{Replace this page with a copy - of the official signed thesis assignment or the copy of the - Statement of an Author or both, depending on the requirements of - the respective department.} +\gdef\thesis@english@assignment{% + \ifthesis@digital@ + This is where a copy of the official signed thesis assignment + or a copy of the Statement of an Author or both are located + in the printed version of the document. + \else + Replace this page with a copy of the official signed thesis + assignment or a copy of the Statement of an Author or both, + depending on the requirements of the respective department. + \fi} % \end{macrocode}\iffalse % % \fi\file{locale/mu/econ/fithesis-english.def} @@ -172,13 +184,22 @@ % \iffalse %<*mu/fi> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/fi/fithesis-english.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/fi/fithesis-english.def}[2016/05/25] % Placeholders \gdef\thesis@english@facultyName{Faculty of Informatics} \gdef\thesis@english@assignment{Replace this page with a copy - of the official signed thesis assignment and the copy of the + of the official signed thesis assignment and a copy of the Statement of an Author.} +\gdef\thesis@english@assignment{% + \ifthesis@digital@ + This is where a copy of the official signed thesis assignment + and a copy of the Statement of an Author is located in the + printed version of the document. + \else + Replace this page with a copy of the official signed thesis + assignment and a copy of the Statement of an Author. + \fi} % Others \gdef\thesis@english@advisorSignature{Signature of Thesis diff --git a/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx b/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx index 8fc9056f053..32c5f67f6e1 100644 --- a/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx +++ b/Master/texmf-dist/source/latex/fithesis/locale/slovak.dtx @@ -2,7 +2,7 @@ % This is the base file of the Slovak locale.\iffalse %<*base> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/fithesis-slovak.def}[2016/03/22] +\ProvidesFile{fithesis/locale/fithesis-slovak.def}[2016/05/25] % \end{macrocode} % The locale file defines all the private macros mandated by the % locale file interface. @@ -25,8 +25,14 @@ % Zástupné texty \gdef\thesis@slovak@universityName{Názov univerzity} \gdef\thesis@slovak@facultyName{Názov fakulty} -\gdef\thesis@slovak@assignment{Namiesto tejto stránky vložte kópiu - oficiálneho podpísaného zadania práce.} +\gdef\thesis@slovak@assignment{% + \ifthesis@digital@ + Na tomto mieste sa v~tlačenej práci nachádza oficiálne + podpísané zadanie práce. + \else + Namiesto tejto stránky vložte kópiu oficiálneho podpísaného + zadania práce. + \fi} \gdef\thesis@slovak@declaration{Text prehlásenie ...} % Časové údaje @@ -148,14 +154,20 @@ % \iffalse %<*mu/fss> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/fss/fithesis-slovak.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/fss/fithesis-slovak.def}[2016/05/25] % Zástupné texty \gdef\thesis@slovak@facultyName{Fakulta sociálnych štúdií} -\gdef\thesis@slovak@assignment{Namiesto tejto stránky vložte kópiu - oficiálneho podpísaného zadania práce alebo prehlásenie autora - školského diela alebo obidve~v závislosti na požiadavkách - príslušnej katedry.} +\gdef\thesis@slovak@assignment{% + \ifthesis@digital@ + Na tomto mieste sa v~tlačenej práci nachádza oficiálne + podpísané zadanie práce alebo prehlásenie autora školského + diela alebo obidve. + \else + Namiesto tejto stránky vložte kópiu oficiálneho podpísaného + zadania práce alebo prehlásenie autora školského diela alebo + obidve~v závislosti na požiadavkách príslušnej katedry. + \fi} % \end{macrocode}\iffalse % % \fi\file{locale/mu/econ/fithesis-slovak.def} @@ -206,13 +218,18 @@ % \iffalse %<*mu/fi> % \fi\begin{macrocode} -\ProvidesFile{fithesis/locale/mu/fi/fithesis-slovak.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/fi/fithesis-slovak.def}[2016/05/25] % Zástupné texty \gdef\thesis@slovak@facultyName{Fakulta informatiky} -\gdef\thesis@slovak@assignment{Namiesto tejto stránky vložte kópiu - oficiálneho podpísaného zadania práce a prehlásenie autora - školského diela.} +\gdef\thesis@slovak@assignment{% + \ifthesis@digital@ + Na tomto mieste sa v~tlačenej práci nachádza oficiálne + podpísané zadanie práce a prehlásenie autora školského diela. + \else + Namiesto tejto stránky vložte kópiu oficiálneho podpísaného + zadania práce a prehlásenie autora školského diela. + \fi} \gdef\thesis@slovak@declaration{% Prehlasujem, že táto \thesis@lower{slovak@typeName} je mojím pôvodným autorským dielom, ktoré som vypracoval% 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 a5526be5fe8..08b7f3352f2 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}[2016/04/18] +\ProvidesPackage{fithesis/style/mu/fithesis-base}[2016/06/06] \NeedsTeXFormat{LaTeX2e} % \end{macrocode} % The file recognizes the following options: \begin{itemize} @@ -150,10 +150,18 @@ % \end{macrocode} % \item\texttt{digital}, \texttt{printed} -- These macrooptions % set the options that are appropriate for either the printed or -% for the digital version of the document, respectively. +% for the digital version of the document, respectively. The +% \DescribeMacro{\ifthesis@digital@}|\ifthesis@digital@| +% conditional is set to \texttt{true} or \texttt{false}, +% respectively. % \begin{macrocode} -\DeclareOption{digital}{\ExecuteOptions{color,cover}} -\DeclareOption{printed}{\ExecuteOptions{monochrome,nocover}} +\newif\ifthesis@digital@ +\DeclareOption{digital}{% + \ExecuteOptions{color,cover}% + \thesis@digital@true} +\DeclareOption{printed}{% + \ExecuteOptions{monochrome,nocover}% + \thesis@digital@false} % \end{macrocode} % \end{itemize} % These are the default options: @@ -889,52 +897,93 @@ \end{alwayssingle}}% \fi} % \end{macrocode} +% \end{macro}\begin{macro}{\thesis@rewind} +% The |\thesis@rewind| macro rewinds the page numbers by either one +% or two pages, depending on whether one-side or two-side +% typesetting is enabled, respectively. +% \begin{macrocode} +\def\thesis@rewind{% + \addtocounter{page}{-\ifthesis@twoside@2\else1\fi}} +% \end{macrocode} % \end{macro}\begin{macro}{\thesis@blocks@assignment} -% The |\thesis@blocks@assignment| macro either: -% \begin{itemize} -% \item Produces no output, when the expansion of -% |\thesis@|\discretionary{}{}{}|assignmentFiles| yields an empty -% token list or when the |\ifthesis@blocks@assignment@| -% conditional is \texttt{false}. -% \item Typesets a placeholder page to be replaced with the -% official thesis assignment, when |\thesis@assignmentFiles| -% is undefined and the |\ifthesis@blocks|\discretionary{}{}^^A -% {}|@assignment@| conditional is \texttt{true}. -% \item Injects the PDF file(s) specified within the -% |\thesis@assignmentFiles| macro, when |\thesis@assignmentFiles| -% is defined, its expansion yields a non-empty token list and -% the |\ifthesis@blocks@assignment@| conditional is -% \texttt{true}. -% \end{itemize} -% The default value of the \DescribeMacro{\ifthesis@blocks@assig^^A -% nment@}|\ifthesis@blocks@assignment@| conditional is +% The |\thesis@blocks@assignment| macro produces a different output +% depending on the values of the |\thesis@assignmentFiles|. +% |\ifthesis@blocks@assignment@|, +% |\ifthesis@blocks@assignment@hideIfDigital@|, and +% |\ifthesis@digital| macros. +% +% The default value of the +% \DescribeMacro{\ifthesis@blocks@assignment@}^^A +% |\ifthesis@blocks@assignment@| and +% \DescribeMacro{\ifthesis@blocks@assignment@hideIfDigital}^^A +% |\ifthesis@blocks@assignment@hideIfDigital@| conditionals is % \texttt{true}. % \begin{macrocode} \newif\ifthesis@blocks@assignment@ \thesis@blocks@assignment@true +\newif\ifthesis@blocks@assignment@hideIfDigital@ +\thesis@blocks@assignment@hideIfDigital@true \def\thesis@blocks@assignment{% +% \end{macrocode} +% If the |\ifthesis@blocks@assignment@| conditional is +% \textsf{true} and the |\thesis@assignmentFiles| macro is +% undefined, then typeset a placeholder page. +% \begin{macrocode} \ifthesis@blocks@assignment@ \ifx\thesis@assignmentFiles\undefined - % Typeset a placeholder page. + % Rewind the pages and typeset a placeholder page. \thesis@blocks@clear \begin{alwayssingle}% - \thispagestyle{empty}% - \addtocounter{page}{-\ifthesis@twoside@2\else1\fi}% + \thispagestyle{empty}\thesis@rewind \noindent\textit{\thesis@@{assignment}}% \end{alwayssingle}% \else +% \end{macrocode} +% Locally define \DescribeMacro{\@inject}|\@inject| as our routine +% for injecting lists of PDF documents. +% \begin{macrocode} {\edef\@pdfList{\thesis@assignmentFiles}% + \let\ea\expandafter + % Injects the specified PDF documents. + \def\@inject##1,{\thesis@blocks@clear + \def\@args{##1}\def\@relax{\relax}% + \ifx\@args\@relax\else + % Trim leading spaces. + \edef\@trimmed{\romannumeral-`\.##1}% + % Rewind the pages and include the PDF. + \thesis@rewind\includepdf[pages=-]\@trimmed + \ea\@inject\fi}% +% \end{macrocode} +% If the |\ifthesis@blocks@assignment@| conditional is +% \textsf{true} and the |\thesis@assignmentFiles| macro is neither +% undefined nor empty, then typeset a placeholder page, if the +% |\ifthesis@digital@| conditional is \textsf{true} and the +% |\ifthesis@blocks@assignmane@hideIfDigital@| conditional is +% \textsf{true} +% \begin{macrocode} \ifx\@pdfList\empty\else - \let\ea\expandafter - % Inject the specified PDF documents. - \def\@inject##1,{\thesis@blocks@clear - \def\@args{##1}\def\@relax{\relax}% - \ifx\@args\@relax\else - % Trim leading spaces. - \edef\@trimmed{\romannumeral-`\.##1}% - \includepdf[pages=-]\@trimmed - \ea\@inject\fi}% - \ea\@inject\@pdfList,\relax,% + \ifthesis@digital@ + \ifthesis@blocks@assignment@hideIfDigital@ + \thesis@blocks@clear + \begin{alwayssingle}% + \thispagestyle{empty}\thesis@rewind + \noindent\textit{\thesis@@{assignment}}% + \end{alwayssingle}% +% \end{macrocode} +% If the |\ifthesis@blocks@assignment@| conditional is +% \textsf{true} and the |\thesis@assignmentFiles| macro is neither +% undefined nor empty, then inject the PDF documents specified in +% the |\thesis@assignmentFiles|, if the |\ifthesis@digital@| +% conditional is \textsf{false} or the +% |\ifthesis@blocks@assignment@hideIfDigital@| conditional is +% \textsf{false}. +% \begin{macrocode} + \else + \ea\@inject\@pdfList,\relax,% + \fi + \else + \ea\@inject\@pdfList,\relax,% + \fi \fi}% \fi \fi} @@ -980,7 +1029,8 @@ \ifthesis@bibliography@loaded@ \ifthesis@bibliography@included@\else \thesis@blocks@clear - \printbibliography[heading=bibintoc]% + {\emergencystretch=3em% + \printbibliography[heading=bibintoc]}% \fi \fi} % \end{macrocode} 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 2cf808fd63f..e0bbdbe4b88 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx @@ -6,7 +6,7 @@ % \url{http://www.sci.muni.cz/NW/predpisy/od/OD-2014-05.pdf}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-sci}[2016/05/15] +\ProvidesPackage{fithesis/style/mu/fithesis-sci}[2016/06/06] % \end{macrocode} % The file defines the color scheme of the respective faculty. % \begin{macrocode} @@ -46,6 +46,11 @@ \thesis@blocks@assignment@false \fi\fi % \end{macrocode} +% Enable the inclusion of the scanned assignment inside the digital +% version of the document. +% \begin{macrocode} +\thesis@blocks@assignment@hideIfDigital@false +% \end{macrocode} % \begin{macro}{\thesis@blocks@bibEntry} % The |\thesis@blocks@bibEntry| macro typesets a % bibliographical entry. Along with the macros required by the diff --git a/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls b/Master/texmf-dist/tex/latex/fithesis/fithesis3.cls index aacc189264f..128c6f267a9 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.38}{2016/05/15}} +\thesis@versiondef{v0.3.40}{2016/06/06}} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ProvidesClass{fithesis3}[\thesis@version] @@ -383,6 +383,9 @@ \AtEndDocument{% \thesis@postamble \write\@auxout{\noexpand\gdef\noexpand\thesis@pages{\thepage}}} + \else + \AtEndDocument{% + \write\@auxout{\noexpand\gdef\noexpand\thesis@pages{\thepage}}} \fi \makeatother \fi} 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 fd0a246cff1..aa1b3b0d5ae 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-czech.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-czech.def @@ -49,7 +49,7 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/fithesis-czech.def}[2016/03/22] +\ProvidesFile{fithesis/locale/fithesis-czech.def}[2016/05/25] \gdef\thesis@czech@gender@koncovka{% \ifthesis@woman a\fi} @@ -58,8 +58,14 @@ \gdef\thesis@czech@universityName{Název univerzity} \gdef\thesis@czech@facultyName{Název fakulty} -\gdef\thesis@czech@assignment{Místo tohoto listu vložte kopii - oficiálního podepsaného zadání práce.} +\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. + \else + Místo tohoto listu vložte kopii oficiálního podepsaného zadání + práce. + \fi} \gdef\thesis@czech@declaration{Text prohlášení ...} \gdef\thesis@czech@spring{jaro} diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-english.def b/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-english.def index 65fc75a587e..c1e81e7a420 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-english.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-english.def @@ -49,12 +49,18 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/fithesis-english.def}[2016/03/22] +\ProvidesFile{fithesis/locale/fithesis-english.def}[2016/05/25] \gdef\thesis@english@universityName{University name} \gdef\thesis@english@facultyName{Faculty name} -\gdef\thesis@english@assignment{Replace this page with a copy - of the official signed thesis assignment.} +\gdef\thesis@english@assignment{% + \ifthesis@digital@ + This is where a copy of the official signed thesis assignment + is located in the printed version of the document. + \else + Replace this page with a copy of the official signed thesis + assignment. + \fi} \gdef\thesis@english@declaration{Declaration text ...} \gdef\thesis@english@csquotesStyle{english} 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 a8a27b90f78..db60aa97ef6 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-slovak.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/fithesis-slovak.def @@ -49,7 +49,7 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/fithesis-slovak.def}[2016/03/22] +\ProvidesFile{fithesis/locale/fithesis-slovak.def}[2016/05/25] \gdef\thesis@slovak@gender@koncovka{% \ifthesis@woman a\fi} @@ -58,8 +58,14 @@ \gdef\thesis@slovak@universityName{Názov univerzity} \gdef\thesis@slovak@facultyName{Názov fakulty} -\gdef\thesis@slovak@assignment{Namiesto tejto stránky vložte kópiu - oficiálneho podpísaného zadania práce.} +\gdef\thesis@slovak@assignment{% + \ifthesis@digital@ + Na tomto mieste sa v~tlačenej práci nachádza oficiálne + podpísané zadanie práce. + \else + Namiesto tejto stránky vložte kópiu oficiálneho podpísaného + zadania práce. + \fi} \gdef\thesis@slovak@declaration{Text prehlásenie ...} \gdef\thesis@slovak@spring{jar} 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 259e84d0cf1..02b60c4f773 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 @@ -49,12 +49,17 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/fi/fithesis-czech.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/fi/fithesis-czech.def}[2016/05/25] \gdef\thesis@czech@facultyName{Fakulta informatiky} -\gdef\thesis@czech@assignment{Místo tohoto listu - vložte kopie oficiálního podepsaného zadání práce a - prohlášení autora školního díla.} +\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. + \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. + \fi} \gdef\thesis@czech@declaration{% Prohlašuji, že tato \thesis@lower{czech@typeName} je mým původním autorským dílem, které jsem vypracoval% diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fi/fithesis-english.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fi/fithesis-english.def index 2eb227bdc93..f2a905af95f 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fi/fithesis-english.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fi/fithesis-english.def @@ -49,12 +49,21 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/fi/fithesis-english.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/fi/fithesis-english.def}[2016/05/25] \gdef\thesis@english@facultyName{Faculty of Informatics} \gdef\thesis@english@assignment{Replace this page with a copy - of the official signed thesis assignment and the copy of the + of the official signed thesis assignment and a copy of the Statement of an Author.} +\gdef\thesis@english@assignment{% + \ifthesis@digital@ + This is where a copy of the official signed thesis assignment + and a copy of the Statement of an Author is located in the + printed version of the document. + \else + Replace this page with a copy of the official signed thesis + assignment and a copy of the Statement of an Author. + \fi} \gdef\thesis@english@advisorSignature{Signature of Thesis \thesis@english@advisorTitle} diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fi/fithesis-slovak.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fi/fithesis-slovak.def index 496578e6234..2100eee3ed4 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fi/fithesis-slovak.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fi/fithesis-slovak.def @@ -50,12 +50,17 @@ %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/fi/fithesis-slovak.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/fi/fithesis-slovak.def}[2016/05/25] \gdef\thesis@slovak@facultyName{Fakulta informatiky} -\gdef\thesis@slovak@assignment{Namiesto tejto stránky vložte kópiu - oficiálneho podpísaného zadania práce a prehlásenie autora - školského diela.} +\gdef\thesis@slovak@assignment{% + \ifthesis@digital@ + Na tomto mieste sa v~tlačenej práci nachádza oficiálne + podpísané zadanie práce a prehlásenie autora školského diela. + \else + Namiesto tejto stránky vložte kópiu oficiálneho podpísaného + zadania práce a prehlásenie autora školského diela. + \fi} \gdef\thesis@slovak@declaration{% Prehlasujem, že táto \thesis@lower{slovak@typeName} je mojím pôvodným autorským dielom, ktoré som vypracoval% diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fss/fithesis-czech.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fss/fithesis-czech.def index 96f67fbb06f..ae5d1868901 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fss/fithesis-czech.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fss/fithesis-czech.def @@ -49,13 +49,18 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/fss/fithesis-czech.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/fss/fithesis-czech.def}[2016/05/25] \gdef\thesis@czech@facultyName{Fakulta sociálních studií} -\gdef\thesis@czech@assignment{Místo tohoto listu - vložte kopie oficiálního podepsaného zadání práce nebo - prohlášení autora školního díla nebo obojí~v závislosti na - požadavcích příslušné katedry.} +\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, prohlášení autora školního díla nebo obojí. + \else + Místo tohoto listu vložte kopie oficiálního podepsaného zadání + práce nebo prohlášení autora školního díla nebo obojí~v + závislosti na požadavcích příslušné katedry. + \fi} \endinput %% diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fss/fithesis-english.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fss/fithesis-english.def index 41b2c41b23d..2fafd9ee974 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fss/fithesis-english.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fss/fithesis-english.def @@ -49,13 +49,19 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/fss/fithesis-english.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/fss/fithesis-english.def}[2016/05/25] \gdef\thesis@english@facultyName{Faculty of Social Studies} -\gdef\thesis@english@assignment{Replace this page with a copy - of the official signed thesis assignment or the copy of the - Statement of an Author or both, depending on the requirements of - the respective department.} +\gdef\thesis@english@assignment{% + \ifthesis@digital@ + This is where a copy of the official signed thesis assignment + or a copy of the Statement of an Author or both are located + in the printed version of the document. + \else + Replace this page with a copy of the official signed thesis + assignment or a copy of the Statement of an Author or both, + depending on the requirements of the respective department. + \fi} \endinput %% %% End of file `mu/fss/fithesis-english.def'. diff --git a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fss/fithesis-slovak.def b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fss/fithesis-slovak.def index 93432e54554..cd7af0e44cf 100644 --- a/Master/texmf-dist/tex/latex/fithesis/locale/mu/fss/fithesis-slovak.def +++ b/Master/texmf-dist/tex/latex/fithesis/locale/mu/fss/fithesis-slovak.def @@ -49,13 +49,19 @@ %% %% The names of the source files used are shown above. %% -\ProvidesFile{fithesis/locale/mu/fss/fithesis-slovak.def}[2015/06/26] +\ProvidesFile{fithesis/locale/mu/fss/fithesis-slovak.def}[2016/05/25] \gdef\thesis@slovak@facultyName{Fakulta sociálnych štúdií} -\gdef\thesis@slovak@assignment{Namiesto tejto stránky vložte kópiu - oficiálneho podpísaného zadania práce alebo prehlásenie autora - školského diela alebo obidve~v závislosti na požiadavkách - príslušnej katedry.} +\gdef\thesis@slovak@assignment{% + \ifthesis@digital@ + Na tomto mieste sa v~tlačenej práci nachádza oficiálne + podpísané zadanie práce alebo prehlásenie autora školského + diela alebo obidve. + \else + Namiesto tejto stránky vložte kópiu oficiálneho podpísaného + zadania práce alebo prehlásenie autora školského diela alebo + obidve~v závislosti na požiadavkách príslušnej katedry. + \fi} \endinput %% 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 index da7401e8844..1483351028e 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base-color.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base-color.pdf differ 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 index f186ad21381..cc8e7dad5f1 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-base.pdf differ 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 index d4b7541a27c..6f710680150 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ-color.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ-color.pdf differ 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 index 8202e405b12..6fdabecc471 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-econ.pdf differ 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 index 5569990b707..22a3080a990 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi-color.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi-color.pdf differ 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 index 424d6338f1e..c6346d3d934 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fi.pdf differ 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 index 237ef2db4f0..ba5decdd950 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps-color.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps-color.pdf differ 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 index 8ab56beb27e..b464a283471 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fsps.pdf differ 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 index 73d1e284959..3e269bab111 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss-color.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss-color.pdf differ 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 index 6fd5f7fc6b4..eda13b56c76 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-fss.pdf differ 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 index 471be6856f5..885f656f85f 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law-color.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law-color.pdf differ 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 index 6a4a3d443aa..7d18c552f3c 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-law.pdf differ 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 index fbdaeceb62c..e213e3bd3af 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med-color.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med-color.pdf differ 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 index ebdfdaa2784..863d239467a 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-med.pdf differ 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 index 545653e483e..bec3f002a3a 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped-color.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped-color.pdf differ 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 index aaeee131b53..1349b43a9d8 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-ped.pdf differ 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 index 6a71b57cfe4..b4cb70a893f 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil-color.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil-color.pdf differ 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 index 288cde8881e..8608f6923d6 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-phil.pdf differ 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 index fb15b14b77b..7c1fb39b2b3 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci-color.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci-color.pdf differ 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 index d4a4b328b49..70dfbc61736 100644 Binary files a/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci.pdf and b/Master/texmf-dist/tex/latex/fithesis/logo/mu/fithesis-sci.pdf differ 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 ccb1c020c46..4d73c932634 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}[2016/04/18] +\ProvidesPackage{fithesis/style/mu/fithesis-base}[2016/06/06] \NeedsTeXFormat{LaTeX2e} \DeclareOption{10pt}{\def\thesis@ptsize{0}} \DeclareOption{11pt}{\def\thesis@ptsize{1}} @@ -82,8 +82,13 @@ \newif\ifthesis@cover@ \DeclareOption{nocover}{\thesis@cover@false} \DeclareOption{cover}{\thesis@cover@true} -\DeclareOption{digital}{\ExecuteOptions{color,cover}} -\DeclareOption{printed}{\ExecuteOptions{monochrome,nocover}} +\newif\ifthesis@digital@ +\DeclareOption{digital}{% + \ExecuteOptions{color,cover}% + \thesis@digital@true} +\DeclareOption{printed}{% + \ExecuteOptions{monochrome,nocover}% + \thesis@digital@false} \ExecuteOptions{% printed,12pt,twoside,final,microtype,palatino,oldtable,lot,lof} \ProcessOptions* @@ -416,31 +421,47 @@ \par\vfil\null \end{alwayssingle}}% \fi} +\def\thesis@rewind{% + \addtocounter{page}{-\ifthesis@twoside@2\else1\fi}} \newif\ifthesis@blocks@assignment@ \thesis@blocks@assignment@true +\newif\ifthesis@blocks@assignment@hideIfDigital@ +\thesis@blocks@assignment@hideIfDigital@true \def\thesis@blocks@assignment{% \ifthesis@blocks@assignment@ \ifx\thesis@assignmentFiles\undefined - % Typeset a placeholder page. + % Rewind the pages and typeset a placeholder page. \thesis@blocks@clear \begin{alwayssingle}% - \thispagestyle{empty}% - \addtocounter{page}{-\ifthesis@twoside@2\else1\fi}% + \thispagestyle{empty}\thesis@rewind \noindent\textit{\thesis@@{assignment}}% \end{alwayssingle}% \else {\edef\@pdfList{\thesis@assignmentFiles}% + \let\ea\expandafter + % Injects the specified PDF documents. + \def\@inject##1,{\thesis@blocks@clear + \def\@args{##1}\def\@relax{\relax}% + \ifx\@args\@relax\else + % Trim leading spaces. + \edef\@trimmed{\romannumeral-`\.##1}% + % Rewind the pages and include the PDF. + \thesis@rewind\includepdf[pages=-]\@trimmed + \ea\@inject\fi}% \ifx\@pdfList\empty\else - \let\ea\expandafter - % Inject the specified PDF documents. - \def\@inject##1,{\thesis@blocks@clear - \def\@args{##1}\def\@relax{\relax}% - \ifx\@args\@relax\else - % Trim leading spaces. - \edef\@trimmed{\romannumeral-`\.##1}% - \includepdf[pages=-]\@trimmed - \ea\@inject\fi}% - \ea\@inject\@pdfList,\relax,% + \ifthesis@digital@ + \ifthesis@blocks@assignment@hideIfDigital@ + \thesis@blocks@clear + \begin{alwayssingle}% + \thispagestyle{empty}\thesis@rewind + \noindent\textit{\thesis@@{assignment}}% + \end{alwayssingle}% + \else + \ea\@inject\@pdfList,\relax,% + \fi + \else + \ea\@inject\@pdfList,\relax,% + \fi \fi}% \fi \fi} @@ -462,7 +483,8 @@ \ifthesis@bibliography@loaded@ \ifthesis@bibliography@included@\else \thesis@blocks@clear - \printbibliography[heading=bibintoc]% + {\emergencystretch=3em% + \printbibliography[heading=bibintoc]}% \fi \fi} \setcounter{tocdepth}{2} diff --git a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-sci.sty b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-sci.sty index 0252d38f26e..3b3fefce043 100644 --- a/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-sci.sty +++ b/Master/texmf-dist/tex/latex/fithesis/style/mu/fithesis-sci.sty @@ -50,7 +50,7 @@ %% The names of the source files used are shown above. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-sci}[2016/05/15] +\ProvidesPackage{fithesis/style/mu/fithesis-sci}[2016/06/06] \thesis@color@setup{ links={HTML}{20E366}, tableEmph={HTML}{8EDEAA}, @@ -67,6 +67,7 @@ \ifx\thesis@type\thesis@masters\else \thesis@blocks@assignment@false \fi\fi +\thesis@blocks@assignment@hideIfDigital@false \def\thesis@blocks@bibEntry{% \begin{alwayssingle}% {% Start the new chapter without clearing the right page -- cgit v1.2.3