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/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 +- 32 files changed, 133 insertions(+), 53 deletions(-) (limited to 'Master/texmf-dist/tex/latex/fithesis') 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