From 2c6568affba942c29b9741469a2882363009a093 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 22 Mar 2020 20:49:26 +0000 Subject: fithesis (22mar20) git-svn-id: svn://tug.org/texlive/trunk@54483 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/fithesis/fithesis3.cls | 12 ++--- .../tex/latex/fithesis/locale/fithesis-czech.def | 3 +- .../tex/latex/fithesis/locale/fithesis-slovak.def | 3 +- .../fithesis/locale/mu/econ/fithesis-slovak.def | 2 +- .../latex/fithesis/locale/mu/fi/fithesis-czech.def | 4 +- .../fithesis/locale/mu/ped/fithesis-czech.def | 6 +-- .../fithesis/locale/mu/phil/fithesis-slovak.def | 2 +- .../latex/fithesis/logo/mu/fithesis-base-color.pdf | Bin 15158 -> 15158 bytes .../tex/latex/fithesis/logo/mu/fithesis-base.pdf | Bin 15988 -> 15988 bytes .../latex/fithesis/logo/mu/fithesis-econ-color.pdf | Bin 12402 -> 12402 bytes .../tex/latex/fithesis/logo/mu/fithesis-econ.pdf | Bin 12932 -> 12932 bytes .../latex/fithesis/logo/mu/fithesis-fi-color.pdf | Bin 11804 -> 11804 bytes .../tex/latex/fithesis/logo/mu/fithesis-fi.pdf | Bin 11626 -> 11626 bytes .../latex/fithesis/logo/mu/fithesis-fsps-color.pdf | Bin 11296 -> 11296 bytes .../tex/latex/fithesis/logo/mu/fithesis-fsps.pdf | Bin 11730 -> 11730 bytes .../latex/fithesis/logo/mu/fithesis-fss-color.pdf | Bin 10854 -> 10854 bytes .../tex/latex/fithesis/logo/mu/fithesis-fss.pdf | Bin 11590 -> 11590 bytes .../latex/fithesis/logo/mu/fithesis-law-color.pdf | Bin 17676 -> 17676 bytes .../tex/latex/fithesis/logo/mu/fithesis-law.pdf | Bin 18435 -> 18435 bytes .../latex/fithesis/logo/mu/fithesis-med-color.pdf | Bin 10052 -> 10052 bytes .../tex/latex/fithesis/logo/mu/fithesis-med.pdf | Bin 10590 -> 10590 bytes .../latex/fithesis/logo/mu/fithesis-ped-color.pdf | Bin 9997 -> 9997 bytes .../tex/latex/fithesis/logo/mu/fithesis-ped.pdf | Bin 10492 -> 10492 bytes .../latex/fithesis/logo/mu/fithesis-phil-color.pdf | Bin 11692 -> 11692 bytes .../tex/latex/fithesis/logo/mu/fithesis-phil.pdf | Bin 12180 -> 12180 bytes .../latex/fithesis/logo/mu/fithesis-sci-color.pdf | Bin 24423 -> 24425 bytes .../tex/latex/fithesis/logo/mu/fithesis-sci.pdf | Bin 25494 -> 25494 bytes .../tex/latex/fithesis/style/mu/fithesis-base.sty | 14 +++++- .../tex/latex/fithesis/style/mu/fithesis-econ.sty | 55 +++++++++++++-------- .../tex/latex/fithesis/style/mu/fithesis-law.sty | 2 + .../tex/latex/fithesis/style/mu/fithesis-med.sty | 18 +++---- .../tex/latex/fithesis/style/mu/fithesis-phil.sty | 20 +++----- 32 files changed, 76 insertions(+), 65 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 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 <>% \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 index 5853942a284..7baf9515e30 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 b6649dbd768..369019148db 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 818d0afe664..1e778690f37 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 b1ae627cb00..bcc7608cf64 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 be2433713cd..860a1365ba1 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 661a07bdf84..ea3cf0e29c1 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 8a11fa4be2a..9f9735cb4d4 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 a3bda1186aa..04e45863878 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 a0cb7ef2433..ed95130f0c0 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 992d5326821..e7b7b168914 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 353ce6d4e51..32a31baeba8 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 cd31a533869..a72c729e96a 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 16030f27a1e..9b29dc714e8 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 eed37dfaa01..b0c5cbb593e 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 5cc1052e9a1..6eae00a5a05 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 16700f89cc0..c197909ce2b 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 2575420b58a..ae0a78ef654 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 f1163fd06f1..c0d8892e5c1 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 f36e77d2c4b..a940c11280e 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 8eaa5b9fc45..032d99538ce 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 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 -- cgit v1.2.3