From 982d5e88b736a798b356bf5cabe5e6c9b115f182 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 18 Aug 2022 03:00:59 +0000 Subject: CTAN sync 202208180300 --- macros/latex/contrib/fithesis/LICENSE.tex | 2 +- macros/latex/contrib/fithesis/VERSION.tex | 2 +- macros/latex/contrib/fithesis/fithesis.dtx | 2 +- macros/latex/contrib/fithesis/fithesis.pdf | Bin 766216 -> 767427 bytes .../fithesis/logo/mu/fithesis-base-color.pdf | Bin 15062 -> 15062 bytes .../fithesis/logo/mu/fithesis-base-czech-color.pdf | Bin 3841 -> 3841 bytes .../fithesis/logo/mu/fithesis-base-czech.pdf | Bin 3837 -> 3837 bytes .../logo/mu/fithesis-base-english-color.pdf | Bin 3771 -> 3771 bytes .../fithesis/logo/mu/fithesis-base-english.pdf | Bin 3767 -> 3767 bytes .../contrib/fithesis/logo/mu/fithesis-base.pdf | Bin 15892 -> 15892 bytes .../fithesis/logo/mu/fithesis-econ-color.pdf | Bin 12305 -> 12305 bytes .../fithesis/logo/mu/fithesis-econ-czech-color.pdf | Bin 4605 -> 4605 bytes .../fithesis/logo/mu/fithesis-econ-czech.pdf | Bin 4600 -> 4600 bytes .../logo/mu/fithesis-econ-english-color.pdf | 16 +-- .../fithesis/logo/mu/fithesis-econ-english.pdf | 16 +-- .../contrib/fithesis/logo/mu/fithesis-econ.pdf | Bin 12838 -> 12838 bytes .../contrib/fithesis/logo/mu/fithesis-fi-color.pdf | Bin 11709 -> 11709 bytes .../fithesis/logo/mu/fithesis-fi-czech-color.pdf | Bin 3702 -> 3702 bytes .../contrib/fithesis/logo/mu/fithesis-fi-czech.pdf | Bin 3697 -> 3697 bytes .../fithesis/logo/mu/fithesis-fi-english-color.pdf | 16 +-- .../fithesis/logo/mu/fithesis-fi-english.pdf | Bin 2721 -> 2727 bytes .../latex/contrib/fithesis/logo/mu/fithesis-fi.pdf | Bin 11529 -> 11529 bytes .../fithesis/logo/mu/fithesis-fsps-color.pdf | Bin 11199 -> 11199 bytes .../fithesis/logo/mu/fithesis-fsps-czech-color.pdf | Bin 4657 -> 4657 bytes .../fithesis/logo/mu/fithesis-fsps-czech.pdf | Bin 4652 -> 4652 bytes .../logo/mu/fithesis-fsps-english-color.pdf | Bin 3307 -> 3307 bytes .../fithesis/logo/mu/fithesis-fsps-english.pdf | Bin 3303 -> 3303 bytes .../contrib/fithesis/logo/mu/fithesis-fsps.pdf | Bin 11634 -> 11634 bytes .../fithesis/logo/mu/fithesis-fss-color.pdf | Bin 10758 -> 10758 bytes .../fithesis/logo/mu/fithesis-fss-czech-color.pdf | Bin 4507 -> 4507 bytes .../fithesis/logo/mu/fithesis-fss-czech.pdf | Bin 4502 -> 4502 bytes .../logo/mu/fithesis-fss-english-color.pdf | Bin 3097 -> 3097 bytes .../fithesis/logo/mu/fithesis-fss-english.pdf | Bin 3091 -> 3091 bytes .../contrib/fithesis/logo/mu/fithesis-fss.pdf | Bin 11492 -> 11492 bytes .../fithesis/logo/mu/fithesis-law-color.pdf | Bin 17579 -> 17579 bytes .../fithesis/logo/mu/fithesis-law-czech-color.pdf | Bin 3786 -> 3786 bytes .../fithesis/logo/mu/fithesis-law-czech.pdf | Bin 3780 -> 3780 bytes .../logo/mu/fithesis-law-english-color.pdf | 16 +-- .../fithesis/logo/mu/fithesis-law-english.pdf | 16 +-- .../contrib/fithesis/logo/mu/fithesis-law.pdf | Bin 18339 -> 18339 bytes .../fithesis/logo/mu/fithesis-med-color.pdf | Bin 9955 -> 9955 bytes .../fithesis/logo/mu/fithesis-med-czech-color.pdf | Bin 3782 -> 3782 bytes .../fithesis/logo/mu/fithesis-med-czech.pdf | Bin 3776 -> 3776 bytes .../logo/mu/fithesis-med-english-color.pdf | Bin 2852 -> 2852 bytes .../fithesis/logo/mu/fithesis-med-english.pdf | Bin 2849 -> 2849 bytes .../contrib/fithesis/logo/mu/fithesis-med.pdf | Bin 10494 -> 10494 bytes .../fithesis/logo/mu/fithesis-ped-color.pdf | Bin 9901 -> 9901 bytes .../fithesis/logo/mu/fithesis-ped-czech-color.pdf | Bin 4119 -> 4119 bytes .../fithesis/logo/mu/fithesis-ped-czech.pdf | Bin 4113 -> 4113 bytes .../logo/mu/fithesis-ped-english-color.pdf | 16 +-- .../fithesis/logo/mu/fithesis-ped-english.pdf | Bin 2894 -> 2894 bytes .../contrib/fithesis/logo/mu/fithesis-ped.pdf | Bin 10396 -> 10396 bytes .../fithesis/logo/mu/fithesis-pharm-color.pdf | Bin 41114 -> 41114 bytes .../logo/mu/fithesis-pharm-czech-color.pdf | Bin 4008 -> 4008 bytes .../fithesis/logo/mu/fithesis-pharm-czech.pdf | Bin 4002 -> 4002 bytes .../logo/mu/fithesis-pharm-english-color.pdf | Bin 3073 -> 3073 bytes .../fithesis/logo/mu/fithesis-pharm-english.pdf | Bin 3069 -> 3069 bytes .../contrib/fithesis/logo/mu/fithesis-pharm.pdf | Bin 41093 -> 41093 bytes .../fithesis/logo/mu/fithesis-phil-color.pdf | Bin 11596 -> 11596 bytes .../fithesis/logo/mu/fithesis-phil-czech-color.pdf | Bin 3802 -> 3802 bytes .../fithesis/logo/mu/fithesis-phil-czech.pdf | Bin 3797 -> 3797 bytes .../logo/mu/fithesis-phil-english-color.pdf | Bin 3128 -> 3128 bytes .../fithesis/logo/mu/fithesis-phil-english.pdf | 16 +-- .../contrib/fithesis/logo/mu/fithesis-phil.pdf | Bin 12083 -> 12083 bytes .../fithesis/logo/mu/fithesis-sci-color.pdf | Bin 24328 -> 24328 bytes .../fithesis/logo/mu/fithesis-sci-czech-color.pdf | Bin 4398 -> 4398 bytes .../fithesis/logo/mu/fithesis-sci-czech.pdf | Bin 4393 -> 4393 bytes .../logo/mu/fithesis-sci-english-color.pdf | Bin 3068 -> 3068 bytes .../fithesis/logo/mu/fithesis-sci-english.pdf | Bin 3063 -> 3063 bytes .../contrib/fithesis/logo/mu/fithesis-sci.pdf | Bin 25396 -> 25396 bytes macros/latex/contrib/fithesis/style/mu/base.dtx | 110 ++++++++++++++++++--- macros/latex/contrib/fithesis/style/mu/econ.dtx | 24 +++-- 72 files changed, 172 insertions(+), 80 deletions(-) (limited to 'macros/latex/contrib/fithesis') diff --git a/macros/latex/contrib/fithesis/LICENSE.tex b/macros/latex/contrib/fithesis/LICENSE.tex index a29d47f5a4..43ab5443ee 100644 --- a/macros/latex/contrib/fithesis/LICENSE.tex +++ b/macros/latex/contrib/fithesis/LICENSE.tex @@ -1,7 +1,7 @@ \input docstrip.tex \preamble -Copyright 1998--2021 Daniel Marek (DM), Jan Pavlovič (JP), +Copyright 1998--2022 Daniel Marek (DM), Jan Pavlovič (JP), Vít Novotný (VN), Tereza Vrabcová (TV), Petr Sojka (PS) http://www.fi.muni.cz/tech/unix/tex/fithesis.xhtml diff --git a/macros/latex/contrib/fithesis/VERSION.tex b/macros/latex/contrib/fithesis/VERSION.tex index 0dfaee2621..5ecb9fe309 100644 --- a/macros/latex/contrib/fithesis/VERSION.tex +++ b/macros/latex/contrib/fithesis/VERSION.tex @@ -1 +1 @@ -2021/10/17 v1.0.2 fithesis4 MU thesis class +2022/08/17 v1.1.0 fithesis4 MU thesis class diff --git a/macros/latex/contrib/fithesis/fithesis.dtx b/macros/latex/contrib/fithesis/fithesis.dtx index 53632b0a04..4c7577def5 100644 --- a/macros/latex/contrib/fithesis/fithesis.dtx +++ b/macros/latex/contrib/fithesis/fithesis.dtx @@ -57,7 +57,7 @@ \gdef\thesis@version@number{#1} \gdef\thesis@version@date{#2} \gdef\thesis@version{#2 #1 fithesis4 MU thesis class}} -\thesis@versiondef{v1.0.2}{2021/10/17}} +\thesis@versiondef{v1.1.0}{2022/08/17}} % {\newwrite\f\openout\f=VERSION\write\f{\thesis@version}\closeout\f} % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/macros/latex/contrib/fithesis/fithesis.pdf b/macros/latex/contrib/fithesis/fithesis.pdf index e176e1d46e..c72c0af797 100644 Binary files a/macros/latex/contrib/fithesis/fithesis.pdf and b/macros/latex/contrib/fithesis/fithesis.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-base-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-base-color.pdf index 257f197708..43135ead46 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-base-color.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-base-color.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-base-czech-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-base-czech-color.pdf index db17792996..bc5823d0e8 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-base-czech-color.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-base-czech-color.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-base-czech.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-base-czech.pdf index 735d952686..83cec1ce23 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-base-czech.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-base-czech.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-base-english-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-base-english-color.pdf index 09691f37d8..4d5385285b 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-base-english-color.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-base-english-color.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-base-english.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-base-english.pdf index 0509a96a9c..3061e57bfc 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-base-english.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-base-english.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-base.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-base.pdf index fd398ee22f..ea01c3b512 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-base.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-base.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-econ-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-econ-color.pdf index d9edafa223..8617af782c 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-econ-color.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-econ-color.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-econ-czech-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-econ-czech-color.pdf index f80ea85a60..39256d3c5b 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-econ-czech-color.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-econ-czech-color.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-econ-czech.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-econ-czech.pdf index a641af60b9..9d8020156d 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-econ-czech.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-econ-czech.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-econ-english-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-econ-english-color.pdf index e55fa24662..fa524253d2 100644 --- a/macros/latex/contrib/fithesis/logo/mu/fithesis-econ-english-color.pdf +++ b/macros/latex/contrib/fithesis/logo/mu/fithesis-econ-english-color.pdf @@ -36,11 +36,11 @@ endobj - -2021-10-17T20:47:16Z -2021-10-17T20:47:16Z + +2022-08-17T15:05:58Z +2022-08-17T15:05:58Z cairo 1.16.0 (https://cairographics.org) - + Untitled @@ -50,9 +50,9 @@ endobj endstream endobj 2 0 obj -<>endobj xref 0 8 @@ -66,7 +66,7 @@ xref 0000001274 00000 n trailer << /Size 8 /Root 1 0 R /Info 2 0 R -/ID [<40DA1DA992658F4FF4BFC98AEAF5041F><40DA1DA992658F4FF4BFC98AEAF5041F>] +/ID [<660B38A5A05ADA673B06E3355040D3D5><660B38A5A05ADA673B06E3355040D3D5>] >> startxref 2722 diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-econ-english.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-econ-english.pdf index 381a5fae09..a953347882 100644 --- a/macros/latex/contrib/fithesis/logo/mu/fithesis-econ-english.pdf +++ b/macros/latex/contrib/fithesis/logo/mu/fithesis-econ-english.pdf @@ -38,11 +38,11 @@ endobj - -2021-10-17T20:47:21Z -2021-10-17T20:47:21Z + +2022-08-17T15:06:04Z +2022-08-17T15:06:04Z cairo 1.16.0 (https://cairographics.org) - + Untitled @@ -52,9 +52,9 @@ endobj endstream endobj 2 0 obj -<>endobj xref 0 8 @@ -68,7 +68,7 @@ xref 0000001268 00000 n trailer << /Size 8 /Root 1 0 R /Info 2 0 R -/ID [<561CF86F93CEDC183EB3DEB7DCEDC00A><561CF86F93CEDC183EB3DEB7DCEDC00A>] +/ID [] >> startxref 2716 diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-econ.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-econ.pdf index d62468248d..f1deab1806 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-econ.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-econ.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-fi-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-fi-color.pdf index 9b6e0f0c0f..af71e19dea 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-fi-color.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-fi-color.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-fi-czech-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-fi-czech-color.pdf index 8584123929..7003ff247d 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-fi-czech-color.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-fi-czech-color.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-fi-czech.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-fi-czech.pdf index 482cc07f7b..fa2fe2d9f7 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-fi-czech.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-fi-czech.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-fi-english-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-fi-english-color.pdf index daaa98c007..947dc85730 100644 --- a/macros/latex/contrib/fithesis/logo/mu/fithesis-fi-english-color.pdf +++ b/macros/latex/contrib/fithesis/logo/mu/fithesis-fi-english-color.pdf @@ -39,11 +39,11 @@ endobj - -2021-10-17T20:47:17Z -2021-10-17T20:47:17Z + +2022-08-17T15:05:58Z +2022-08-17T15:05:58Z cairo 1.16.0 (https://cairographics.org) - + Untitled @@ -53,9 +53,9 @@ endobj endstream endobj 2 0 obj -<>endobj xref 0 8 @@ -69,7 +69,7 @@ xref 0000000973 00000 n trailer << /Size 8 /Root 1 0 R /Info 2 0 R -/ID [<31196CD0E4DB25BDCE8DAC5BF33AA38D><31196CD0E4DB25BDCE8DAC5BF33AA38D>] +/ID [] >> startxref 2421 diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-fi-english.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-fi-english.pdf index 23be564898..8c0d1dc516 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-fi-english.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-fi-english.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-fi.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-fi.pdf index af68121d87..03fa6d1d9a 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-fi.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-fi.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-fsps-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-fsps-color.pdf index d0a3949eab..e3d3c03c67 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-fsps-color.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-fsps-color.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-fsps-czech-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-fsps-czech-color.pdf index dedb28198e..fa22e7fce9 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-fsps-czech-color.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-fsps-czech-color.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-fsps-czech.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-fsps-czech.pdf index c86c207e3d..b326e87f3f 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-fsps-czech.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-fsps-czech.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-fsps-english-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-fsps-english-color.pdf index c8673b5246..0731b92362 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-fsps-english-color.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-fsps-english-color.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-fsps-english.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-fsps-english.pdf index 739be37c73..e85675eafa 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-fsps-english.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-fsps-english.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-fsps.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-fsps.pdf index 720f54e9de..6b5bf20b31 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-fsps.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-fsps.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-fss-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-fss-color.pdf index f89cba1709..e769534337 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-fss-color.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-fss-color.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-fss-czech-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-fss-czech-color.pdf index 007775a16b..0ca4cb825c 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-fss-czech-color.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-fss-czech-color.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-fss-czech.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-fss-czech.pdf index 564a3b8b64..379493a7b1 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-fss-czech.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-fss-czech.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-fss-english-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-fss-english-color.pdf index 5d7fc27007..cbca657876 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-fss-english-color.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-fss-english-color.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-fss-english.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-fss-english.pdf index c38a7b9032..cd14ec64de 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-fss-english.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-fss-english.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-fss.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-fss.pdf index 88123ca498..0e63613601 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-fss.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-fss.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-law-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-law-color.pdf index e0c41d60ca..28ecf2c00f 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-law-color.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-law-color.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-law-czech-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-law-czech-color.pdf index 5d322deffa..cfb4d8cab3 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-law-czech-color.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-law-czech-color.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-law-czech.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-law-czech.pdf index 8644f89765..0dd6948142 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-law-czech.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-law-czech.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-law-english-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-law-english-color.pdf index 851f77bf59..daa79ae614 100644 --- a/macros/latex/contrib/fithesis/logo/mu/fithesis-law-english-color.pdf +++ b/macros/latex/contrib/fithesis/logo/mu/fithesis-law-english-color.pdf @@ -38,11 +38,11 @@ endobj - -2021-10-17T20:47:18Z -2021-10-17T20:47:18Z + +2022-08-17T15:06:00Z +2022-08-17T15:06:00Z cairo 1.16.0 (https://cairographics.org) - + Untitled @@ -52,9 +52,9 @@ endobj endstream endobj 2 0 obj -<>endobj xref 0 8 @@ -68,7 +68,7 @@ xref 0000001049 00000 n trailer << /Size 8 /Root 1 0 R /Info 2 0 R -/ID [<55332FD948AF9B42F387E093B1930D59><55332FD948AF9B42F387E093B1930D59>] +/ID [<0B1DB7955D964F8AEC39ECBF7B4D9022><0B1DB7955D964F8AEC39ECBF7B4D9022>] >> startxref 2497 diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-law-english.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-law-english.pdf index c21da08678..ce2e36457b 100644 --- a/macros/latex/contrib/fithesis/logo/mu/fithesis-law-english.pdf +++ b/macros/latex/contrib/fithesis/logo/mu/fithesis-law-english.pdf @@ -42,11 +42,11 @@ endobj - -2021-10-17T20:47:23Z -2021-10-17T20:47:23Z + +2022-08-17T15:06:06Z +2022-08-17T15:06:06Z cairo 1.16.0 (https://cairographics.org) - + Untitled @@ -56,9 +56,9 @@ endobj endstream endobj 2 0 obj -<>endobj xref 0 8 @@ -72,7 +72,7 @@ xref 0000001045 00000 n trailer << /Size 8 /Root 1 0 R /Info 2 0 R -/ID [<21FD358098839F82AC496F160C142ED4><21FD358098839F82AC496F160C142ED4>] +/ID [<04AB7B86740730EB31A6A5F3388E4916><04AB7B86740730EB31A6A5F3388E4916>] >> startxref 2493 diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-law.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-law.pdf index d8b514082f..6dacbe3383 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-law.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-law.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-med-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-med-color.pdf index 9bd2d504af..a3102a7f15 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-med-color.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-med-color.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-med-czech-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-med-czech-color.pdf index cfafe11228..2c761c990f 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-med-czech-color.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-med-czech-color.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-med-czech.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-med-czech.pdf index 76785f033f..b368fc55d9 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-med-czech.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-med-czech.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-med-english-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-med-english-color.pdf index 319583eebb..2026c78e18 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-med-english-color.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-med-english-color.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-med-english.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-med-english.pdf index cc5ae85028..4dbb67d7c3 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-med-english.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-med-english.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-med.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-med.pdf index 272e62aa36..d5698a8402 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-med.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-med.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-ped-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-ped-color.pdf index df3714c2e8..dca9d8a142 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-ped-color.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-ped-color.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-ped-czech-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-ped-czech-color.pdf index 928e399668..dbbdd7d542 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-ped-czech-color.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-ped-czech-color.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-ped-czech.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-ped-czech.pdf index 608f3ed3e3..6a796a0950 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-ped-czech.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-ped-czech.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-ped-english-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-ped-english-color.pdf index 6b0a967117..fb5795833d 100644 --- a/macros/latex/contrib/fithesis/logo/mu/fithesis-ped-english-color.pdf +++ b/macros/latex/contrib/fithesis/logo/mu/fithesis-ped-english-color.pdf @@ -37,11 +37,11 @@ endobj - -2021-10-17T20:47:19Z -2021-10-17T20:47:19Z + +2022-08-17T15:06:01Z +2022-08-17T15:06:01Z cairo 1.16.0 (https://cairographics.org) - + Untitled @@ -51,9 +51,9 @@ endobj endstream endobj 2 0 obj -<>endobj xref 0 8 @@ -67,7 +67,7 @@ xref 0000001143 00000 n trailer << /Size 8 /Root 1 0 R /Info 2 0 R -/ID [<3D23766A4C9CE113BE0885DB676F8FD4><3D23766A4C9CE113BE0885DB676F8FD4>] +/ID [] >> startxref 2591 diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-ped-english.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-ped-english.pdf index e21f13c40d..17c9dae174 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-ped-english.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-ped-english.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-ped.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-ped.pdf index fb9a5ecfc6..3d06753a53 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-ped.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-ped.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-pharm-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-pharm-color.pdf index 6283436cc2..4c0fd43fe8 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-pharm-color.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-pharm-color.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-pharm-czech-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-pharm-czech-color.pdf index 53cc5e2ec7..c1edf583b1 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-pharm-czech-color.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-pharm-czech-color.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-pharm-czech.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-pharm-czech.pdf index 4fe8f626ed..cde89d49ca 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-pharm-czech.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-pharm-czech.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-pharm-english-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-pharm-english-color.pdf index d390a724e1..06908796cf 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-pharm-english-color.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-pharm-english-color.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-pharm-english.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-pharm-english.pdf index ae0341515c..54421c014f 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-pharm-english.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-pharm-english.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-pharm.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-pharm.pdf index fde9998208..8bc4582e3c 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-pharm.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-pharm.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-phil-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-phil-color.pdf index 3df1faa654..5f5ddcdff8 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-phil-color.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-phil-color.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-phil-czech-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-phil-czech-color.pdf index 33d878816b..efbd0ec8b1 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-phil-czech-color.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-phil-czech-color.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-phil-czech.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-phil-czech.pdf index f6b15e0a0c..d572ab8f88 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-phil-czech.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-phil-czech.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-phil-english-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-phil-english-color.pdf index 0d62d0db44..2546fd8495 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-phil-english-color.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-phil-english-color.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-phil-english.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-phil-english.pdf index f2df1f8b07..daab3c116c 100644 --- a/macros/latex/contrib/fithesis/logo/mu/fithesis-phil-english.pdf +++ b/macros/latex/contrib/fithesis/logo/mu/fithesis-phil-english.pdf @@ -38,11 +38,11 @@ endobj - -2021-10-17T20:47:25Z -2021-10-17T20:47:25Z + +2022-08-17T15:06:08Z +2022-08-17T15:06:08Z cairo 1.16.0 (https://cairographics.org) - + Untitled @@ -52,9 +52,9 @@ endobj endstream endobj 2 0 obj -<>endobj xref 0 8 @@ -68,7 +68,7 @@ xref 0000001364 00000 n trailer << /Size 8 /Root 1 0 R /Info 2 0 R -/ID [<80B8898B86BD65AA05E219B06B1C67C8><80B8898B86BD65AA05E219B06B1C67C8>] +/ID [<2507C723F062AB2F461DA5C72F251773><2507C723F062AB2F461DA5C72F251773>] >> startxref 2812 diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-phil.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-phil.pdf index c3364b3249..65c096d7a8 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-phil.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-phil.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-sci-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-sci-color.pdf index b021508c51..6d5e66175e 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-sci-color.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-sci-color.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-sci-czech-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-sci-czech-color.pdf index cf28aaa69c..9e7b9ee7af 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-sci-czech-color.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-sci-czech-color.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-sci-czech.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-sci-czech.pdf index 44efaf8bb7..178514d1d2 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-sci-czech.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-sci-czech.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-sci-english-color.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-sci-english-color.pdf index 7e919ea306..e7ca4deb51 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-sci-english-color.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-sci-english-color.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-sci-english.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-sci-english.pdf index 9115eba1c4..6bfafe6b7f 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-sci-english.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-sci-english.pdf differ diff --git a/macros/latex/contrib/fithesis/logo/mu/fithesis-sci.pdf b/macros/latex/contrib/fithesis/logo/mu/fithesis-sci.pdf index 81801bfc2c..bf5685d5d3 100644 Binary files a/macros/latex/contrib/fithesis/logo/mu/fithesis-sci.pdf and b/macros/latex/contrib/fithesis/logo/mu/fithesis-sci.pdf differ diff --git a/macros/latex/contrib/fithesis/style/mu/base.dtx b/macros/latex/contrib/fithesis/style/mu/base.dtx index a6c43b158d..32a93f115b 100644 --- a/macros/latex/contrib/fithesis/style/mu/base.dtx +++ b/macros/latex/contrib/fithesis/style/mu/base.dtx @@ -9,7 +9,7 @@ % after \texttt{style/fithesis-base.sty}, regardless of the value % of the |\thesis@style| macro. % \begin{macrocode} -\ProvidesPackage{fithesis/style/mu/fithesis-mu-base}[2021/05/23] +\ProvidesPackage{fithesis/style/mu/fithesis-mu-base}[2022/08/15] \NeedsTeXFormat{LaTeX2e} % \end{macrocode} % The file recognizes the following options: \begin{itemize} @@ -65,6 +65,22 @@ \DeclareOption{palatino}{\thesis@palatino@true} \DeclareOption{nopalatino}{\thesis@palatino@false} % \end{macrocode} +% \item\texttt{neuehaas}, \texttt{noneuehaas} -- The sans serif +% text font family is going to be either set to Neue Haas +% (TeX Gyre Heros) or left untouched, respectively. The +% \DescribeMacro{\ifthesis@neuehaas@}|\ifthesis@|^^A +% \discretionary{}{}{}|neuehaas@| conditional is set to either +% \texttt{true} or \texttt{false}, respectively. The Neue Haas +% font is a sans serif font chosen to represent the Masaryk +% University in Brno as per its Graphic manual. +% \changes{v1.1.0}{2022/08/15}{^^A +% Added the \texttt{neuehas} and \texttt{noneuehaas} package options +% for the Masaryk University in Brno. [TV]} +% \begin{macrocode} +\newif\ifthesis@neuehaas@ +\DeclareOption{neuehaas}{\thesis@neuehaas@true} +\DeclareOption{noneuehaas}{\thesis@neuehaas@false} +% \end{macrocode} % \item\texttt{color}, \texttt{monochrome} -- Certain % typographical elements either are or aren't going to be % typeset in color, respectively. The @@ -76,6 +92,18 @@ \DeclareOption{monochrome}{\thesis@color@false} \DeclareOption{color}{\thesis@color@true} % \end{macrocode} +% \item\texttt{colorbold}, \texttt{nocolorbold} -- The bold text either +% is or isn't colored (black is used instead). The +% \DescribeMacro{\ifthesis@colorbold}|\ifthesis@colorbold@| conditional +% is set to either \texttt{true} or \texttt{false}, respectively. +% \changes{v1.1.0}{2022/08/15}{^^A +% Added the \texttt{colorbold} and \texttt{nocolorbold} package +% options for the Masaryk University in Brno. [TV]} +% \begin{macrocode} +\newif\ifthesis@colorbold@ +\DeclareOption{colorbold}{\thesis@colorbold@true} +\DeclareOption{nocolorbold}{\thesis@colorbold@false} +% \end{macrocode} % \item\texttt{microtype}, \texttt{nomicrotype} -- The % microtypographic extension of modern \TeX\ engines -- such as % \hologo{pdfTeX}, \Hologo{XeTeX}, or \Hologo{LuaTeX} -- is or isn't @@ -88,6 +116,19 @@ \DeclareOption{microtype}{\thesis@microtype@true} \DeclareOption{nomicrotype}{\thesis@microtype@false} % \end{macrocode} +% \item\texttt{sansbold}, \texttt{nosansbold} -- The \cs{bfseries} +% command for switching to the bold typeface is or isn't going to use +% the sans-serif type face, respectively. The +% \DescribeMacro{\ifthesis@sansbold@}|\ifthesis@sansbold@| conditional +% is set to either \texttt{true} or \texttt{false}, respectively. +% \changes{v1.1.0}{2022/08/02}{^^A +% Added the \texttt{sansbold} and \texttt{nosansbold} package options +% for the Masaryk University in Brno. [VN]} +% \begin{macrocode} +\newif\ifthesis@sansbold@ +\DeclareOption{sansbold}{\thesis@sansbold@true} +\DeclareOption{nosansbold}{\thesis@sansbold@false} +% \end{macrocode} % \item\texttt{table}, \texttt{oldtable} -- If the % |\ifthesis@color@| conditional is \texttt{true}, then the % definitions of the \texttt{tabular}, \texttt{tabularx}, and @@ -156,20 +197,26 @@ % \DescribeMacro{\ifthesis@digital@}|\ifthesis@digital@| % conditional is set to \texttt{true} or \texttt{false}, % respectively. +% \changes{v1.1.0}{2022/08/15}{^^A +% Added the \texttt{colorbold} and \texttt{nocolorbold} package +% options for the Masaryk University in Brno. [TV]} % \begin{macrocode} \newif\ifthesis@digital@ \DeclareOption{digital}{% - \ExecuteOptions{color,cover}% + \ExecuteOptions{color,cover,colorbold}% \thesis@digital@true} \DeclareOption{printed}{% - \ExecuteOptions{monochrome,nocover}% + \ExecuteOptions{monochrome,nocover,nocolorbold}% \thesis@digital@false} % \end{macrocode} % \end{itemize} % These are the default options: +% \changes{v1.1.0}{2022/08/02}{^^A +% Added the \texttt{sansbold} and \texttt{nosansbold} package options +% for the Masaryk University in Brno. [VN]} % \begin{macrocode} \ExecuteOptions{% - printed,12pt,twoside,final,microtype,palatino,oldtable,lot,lof} + printed,12pt,twoside,final,microtype,sansbold,palatino,neuehaas,oldtable,lot,lof} \ProcessOptions* % \end{macrocode} % The file uses English locale strings within the macros. @@ -260,19 +307,26 @@ % \changes{v1.0.0}{2018/11/18}{^^A % The \TeX{} Gyre Heros is used as the main sans serif font % instead of Latin Modern. [VN]} +% \changes{v1.1.0}{2022/08/15}{^^A +% Added the \texttt{neuehas} and \texttt{noneuehaas} package options +% for the Masaryk University in Brno. [TV]} % \begin{macrocode} \ifthesis@xeluatex \ifthesis@palatino@ \thesis@require{fontspec} \thesis@require{unicode-math} \setmainfont[Ligatures=TeX]{TeX Gyre Pagella} - \setsansfont[Ligatures=TeX,Scale=MatchLowercase]{TeX Gyre Heros} \setmathfont[math-style=ISO,bold-style=ISO]{texgyrepagella-math.otf} \fi + \ifthesis@neuehaas@ + \thesis@require{fontspec} + \setsansfont[Ligatures=TeX,Scale=MatchLowercase]{TeX Gyre Heros} + \fi % \end{macrocode} % The following packages get only loaded, when the document is not -% being typeset using the \Hologo{XeTeX} or \Hologo{LuaTeX} engine -% and the |\ifthesis@palatino@| conditional is \texttt{true}: +% being typeset using the \Hologo{XeTeX} or \Hologo{LuaTeX} engine, +% the |\ifthesis@palatino@| conditional is \texttt{true}, and the +% |\ifthesis@neuehaas@| conditional is \texttt{true}: % \begin{itemize} % \item\textsf{cmap} -- Places an explicit \texttt{ToUnicode} % map in the resulting PDF file, allowing for the extraction of @@ -298,6 +352,9 @@ \thesis@require{lmodern} \thesis@require{mathpazo} \thesis@require{tgpagella} + \RequirePackage[T1]{fontenc} + \fi + \ifthesis@neuehaas@ \thesis@require[scale=0.863]{tgheros} \RequirePackage[T1]{fontenc} \fi @@ -572,14 +629,21 @@ % and to the secondary color in the style files of the Masaryk % University in Brno, Czech Republic. [VN]} % The |\bfseries| macro is redefined to switch to the sans serif -% type face in the secondary color. The original definition of -% |\bfseries| is stored in the +% type face (conditional on \cs{ifthesis@sansbold@}) in the secondary color. +% The original definition of |\bfseries| is stored in the % \DescribeMacro{\thesis@bfseries@old}|\thesis@bfseries@old| % macro. +% \changes{v1.1.0}{2022/08/02}{^^A +% Added the \texttt{sansbold} and \texttt{nosansbold} package options +% for the Masaryk University in Brno. [VN]} +% \changes{v1.1.0}{2022/08/15}{^^A +% Added the \texttt{colorbold} and \texttt{nocolorbold} package +% options for the Masaryk University in Brno. [TV]} % \begin{macrocode} \let\thesis@bfseries@old\bfseries \def\bfseries{% - \sffamily\color{thesis@color@secondary}\thesis@bfseries@old} + \ifthesis@sansbold@\sffamily\fi + \ifthesis@colorbold@\color{thesis@color@secondary}\fi\thesis@bfseries@old} % \end{macrocode} % The file defines several blocks to be used in the redefinitions % of the |\thesis@blocks@preamble| and |\thesis@blocks@postamble| @@ -773,7 +837,14 @@ \vspace{0.75cm}% {\sf\thesis@titlePage@large\thesis@@upper{facultyName}\par}% \vfill - {\bf\thesis@titlePage@Huge\thesis@TeXtitle\par}% +% \end{macrocode} +% \changes{v1.1.0}{2022/08/17}{^^A +% Typeset thesis title on cover and title pages in sans serif typeface. [VN]} +% \begin{macrocode} + \begingroup + \thesis@colorbold@true + {\sffamily\bfseries\thesis@titlePage@Huge\thesis@TeXtitle\par}% + \endgroup \vspace{1.5cm}% {\sf\thesis@titlePage@Large\thesis@@{typeName}\par}% \vspace{1.5cm}% @@ -871,10 +942,17 @@ \par\vspace{0.75cm}% {\sf\thesis@titlePage@large\thesis@@upper{facultyName}\par}% \vfill - {\bf\thesis@titlePage@Huge\thesis@TeXtitle\par}% + \begingroup + \thesis@colorbold@true + {\sffamily\bfseries\thesis@titlePage@Huge\thesis@TeXtitle\par}% + \endgroup \vspace{1.5cm}% {\sf\thesis@titlePage@Large\thesis@@{typeName}\par}% \vspace{1.5cm}% +% \end{macrocode} +% \changes{v1.1.0}{2022/08/17}{^^A +% Typeset thesis title on cover and title pages in sans serif typeface. [VN]} +% \begin{macrocode} {\sf\thesis@titlePage@LARGE\thesis@upper{author}\par}% \vfill\vfill {\sf\thesis@titlePage@large\thesis@@{advisorTitle}: \thesis@advisor\par}% @@ -1618,12 +1696,14 @@ \if@twoside \oddsidemargin 0.75in \evensidemargin 0.4in - \marginparwidth 0pt \else \oddsidemargin 0.75in \evensidemargin 0.75in - \marginparwidth 0pt \fi +% \end{macrocode} +% \changes{v1.1.0}{2022/04/19}{Add space for margin notes. [VN]} +% \begin{macrocode} +\marginparwidth 2.75cm \marginparsep 10pt \topmargin 0.4in @@ -1781,7 +1861,7 @@ \reset@font\normalsize\bfseries}} \def\subsubsection{\@startsection{subsubsection}{3}{\z@}{% -3.25ex plus-1ex minus-.2ex}{1.5ex plus.2ex}{% - \reset@font\normalsize}} + \reset@font\normalsize\bfseries}} \def\paragraph{\@startsection{paragraph}{4}{\z@}{% 3.25ex plus1ex minus.2ex}{-1em}{% \reset@font\normalsize\bfseries}} diff --git a/macros/latex/contrib/fithesis/style/mu/econ.dtx b/macros/latex/contrib/fithesis/style/mu/econ.dtx index a05cacf39c..fc210098b3 100644 --- a/macros/latex/contrib/fithesis/style/mu/econ.dtx +++ b/macros/latex/contrib/fithesis/style/mu/econ.dtx @@ -10,13 +10,19 @@ % \changes{v1.0.0}{2021/03/19}{Updated urls to show the most recent % requirements and recommendations used in preparation of the % template. [TV]} +% \changes{v1.1.0}{2022/04/19}{Updated urls to show the most recent +% requirements and recommendations used in preparation of the +% template. [VN]} % published at the website of the faculty\footnote{See \url{https:^^A % //is.muni.cz/auth/do/econ/uredni_deska/predpisy_ESF/smernice/sme^^A -% rnice_dekana/94383996/} and \url{https://is.muni.cz/auth/do/econ^^A -% /uredni_deska/predpisy_ESF/smernice/smernice_dekana/104768134/}}. +% rnice/smernice_dekana/prehled/2019/smernice_c_9_2019_o_tvorbe_od^^A +% evzdavani_zverejnovani_a_hodnoceni_bc_zaverecnych_a/SmerniceDeka^^A +% na2019_c.9__2_FINALk_vydani.pdf} and \url{https://is.muni.cz/aut^^A +% h/do/econ/uredni_deska/predpisy_ESF/smernice/smernice_dekana/104^^A +% 768134/}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-mu-econ}[2021/04/24] +\ProvidesPackage{fithesis/style/mu/fithesis-mu-econ}[2022/08/17] % \end{macrocode} % The file defines the color scheme of the respective faculty. Note % the the color definitions are in RGB, which makes the resulting @@ -85,10 +91,15 @@ % to the definition within the \texttt{style/mu/base.sty} file, this % macro does not include the title of the thesis, and typesets the % name of the author at the bottom of the page. +% \changes{v1.1.0}{2022/08/17}{^^A +% Typeset thesis title on cover and title pages in sans serif typeface. [VN]} % \begin{macrocode} \thesis@xpatch\thesis@blocks@cover{% \vfill - {\bf\thesis@titlePage@Huge\thesis@TeXtitle\par}% + \begingroup + \thesis@colorbold@true + {\sffamily\bfseries\thesis@titlePage@Huge\thesis@TeXtitle\par}% + \endgroup \vspace{1.5cm}% {\sf\thesis@titlePage@Large\thesis@@{typeName}\par}% \vspace{1.5cm}% @@ -280,9 +291,9 @@ \thesis@blocks@bibEntryEn \thesis@blocks@abstractEn \thesis@blocks@declaration + \thesis@blocks@assignment \thesis@blocks@thanks - \thesis@blocks@toc - \thesis@blocks@tables} + \thesis@blocks@toc} % \end{macrocode} % All blocks within the autolayout postamble that are not defined % within this file are defined in the \texttt{style/mu/base.sty} @@ -293,5 +304,6 @@ \def\thesis@blocks@postamble{% \ifx\thesis@doctoral\thesis@type\thesis@blocks@summary\else\fi \thesis@blocks@bibliography + \thesis@blocks@tables } % \end{macrocode} -- cgit v1.2.3