From 01c382d12b96590dbb146ae67a085504f4db4900 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 19 Jul 2021 20:09:28 +0000 Subject: fithesis (19jul21) git-svn-id: svn://tug.org/texlive/trunk@59989 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/fithesis/style/mu/base.dtx | 2 +- .../source/latex/fithesis/style/mu/econ.dtx | 2 +- .../source/latex/fithesis/style/mu/fsps.dtx | 27 +++++++++++---- .../source/latex/fithesis/style/mu/law.dtx | 20 ++++++++--- .../source/latex/fithesis/style/mu/med.dtx | 23 +++++++++---- .../source/latex/fithesis/style/mu/sci.dtx | 39 +++++++++++++++++++--- 6 files changed, 89 insertions(+), 24 deletions(-) (limited to 'Master/texmf-dist/source/latex/fithesis/style') diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx index f5cf38721cf..6a17ea26fa5 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/base.dtx @@ -1303,7 +1303,7 @@ % breaking changes in package loading after PR 438 in \LaTeXe. [VN]} % \begin{macrocode} % Load the `fithesis-mu-1*.clo` size option. -\input\thesis@stylepath mu/fithesis-1\thesis@ptsize.clo\relax +\input\thesis@stylepath mu/fithesis-mu-1\thesis@ptsize.clo\relax % Define the running heading style. \def\ps@thesisheadings{% diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx index ae3b199a775..a05cacf39ca 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/econ.dtx @@ -123,7 +123,7 @@ % \end{macro}\begin{macro}{\thesis@blocks@mainMatter} % The |\thesis@blocks@mainMatter| macro sets up the style % of the main matter of the thesis. The page numbering doesn't -% reset at the beginning of the main thesis as per the formal +% reset at the beginning of the main matter as per the formal % requirements. % \begin{macrocode} \def\thesis@blocks@mainMatter{% diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.dtx index 7082d5220b9..30437fc417d 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/fsps.dtx @@ -12,7 +12,7 @@ % y_vypracovani_ZP_bc-mgr-rig.pdf}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-mu-fsps}[2021/04/24] +\ProvidesPackage{fithesis/style/mu/fithesis-mu-fsps}[2021/07/18] % \end{macrocode} % The file defines the color scheme of the respective faculty. Note % the the color definitions are in RGB, which makes the resulting @@ -62,24 +62,30 @@ % The |\thesis@blocks@frontMatter| macro sets up the style of the % front matter of the thesis. The leading is adjusted in % accordance with the requirements of the faculty. +% \changes{v1.0.1}{2021/07/18}{^^A +% Display page numbers for the Faculty of Sports Studies starting +% with the table of contents. [VN]} % \begin{macrocode} \def\thesis@blocks@frontMatter{% \thesis@blocks@clear - \pagestyle{plain} + \pagestyle{empty} \parindent 1.5em \setcounter{page}{1} - \pagenumbering{roman} + \pagenumbering{arabic} \onehalfspacing} % \end{macrocode} % \end{macro}\begin{macro}{\thesis@blocks@mainMatter} % The |\thesis@blocks@mainMatter| macro sets up the style % of the main matter of the thesis. The leading is adjusted in -% accordance with the requirements of the faculty. +% accordance with the requirements of the faculty. The page +% numbering doesn't reset at the beginning of the main thesis in +% accordance with the formal requirements of the faculty. +% \changes{v1.0.1}{2021/07/18}{^^A +% Display page numbers for the Faculty of Sports Studies starting +% with the table of contents. [VN]} % \begin{macrocode} \def\thesis@blocks@mainMatter{% \thesis@blocks@clear - \setcounter{page}{1} - \pagenumbering{arabic} \pagestyle{thesisheadings} \parindent 1.5em \onehalfspacing} @@ -160,7 +166,14 @@ \thesis@blocks@bibEntryEn \thesis@blocks@abstractEn \thesis@blocks@thanks - \thesis@blocks@tables} +% \end{macrocode} +% \changes{v1.0.1}{2021/07/18}{^^A +% Display page numbers for the Faculty of Sports Studies starting +% with the table of contents. [VN]} +% \begin{macrocode} + \thesis@blocks@clear + \pagestyle{plain} + \thesis@blocks@tables} \def\thesis@blocks@postamble{% \thesis@blocks@bibliography} % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/law.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/law.dtx index 38aa08c95c4..e7355d36340 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/law.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/law.dtx @@ -13,7 +13,7 @@ % h_dokumentu.pdf}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-mu-law}[2021/04/24] +\ProvidesPackage{fithesis/style/mu/fithesis-mu-law}[2021/07/18] % \end{macrocode} % The file defines the color scheme of the respective faculty. Note % the the color definitions are in RGB, which makes the resulting @@ -91,11 +91,15 @@ % \begin{macro}{\thesis@blocks@frontMatter} % The |\thesis@blocks@frontMatter| macro sets up the style % of the front matter of the thesis. The page numbering is arabic -% in accordance with the formal requirements of the faculty. +% in accordance with the formal requirements of the faculty and +% it is hidden. +% \changes{v1.0.1}{2021/07/18}{^^A +% Display page numbers for the Faculty of Law starting with +% the declaration. [VN]} % \begin{macrocode} \def\thesis@blocks@frontMatter{% \thesis@blocks@clear - \pagestyle{plain} + \pagestyle{empty} \parindent 1.5em \setcounter{page}{1} \pagenumbering{arabic}} @@ -135,7 +139,15 @@ \thesis@blocks@frontMatter \thesis@blocks@titlePage \thesis@blocks@seal - \thesis@blocks@declaration +% \end{macrocode} +% \changes{v1.0.1}{2021/07/18}{^^A +% Display page numbers for the Faculty of Law starting with +% the declaration. [VN]} +% \begin{macrocode} + \thesis@blocks@clear + \pagestyle{plain} + \setcounter{page}{1} + \thesis@blocks@declaration \thesis@blocks@clear \thesis@blocks@abstract \thesis@blocks@keywords diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/med.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/med.dtx index aa514412e52..e3503425f82 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/med.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/med.dtx @@ -15,7 +15,7 @@ % akulte_MU.pdf}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-mu-med}[2021/04/24] +\ProvidesPackage{fithesis/style/mu/fithesis-mu-med}[2021/07/18] % \end{macrocode} % The file defines the color scheme of the respective faculty. Note % the the color definitions are in RGB, which makes the resulting @@ -159,19 +159,22 @@ \pagestyle{empty} \parindent 1.5em \setcounter{page}{1} - \pagenumbering{roman}} + \pagenumbering{arabic}} % \end{macrocode} % \end{macro}\begin{macro}{\thesis@blocks@mainMatter} % The |\thesis@blocks@mainMatter| macro sets up the style % of the main matter of the thesis. The leading is adjusted in -% accordance with the requirements of the faculty. +% accordance with the requirements of the faculty. The page +% numbering doesn't reset at the beginning of the main thesis in +% accordance with the formal requirements of the faculty. +% \changes{v1.0.1}{2021/07/18}{^^A +% Display page numbers for the Faculty of Medicine starting with +% the declaration. [VN]} % \begin{macrocode} \def\thesis@blocks@mainMatter{% \thesis@blocks@clear \newgeometry{top=25mm,bottom=20mm,left=35mm, right=15mm, includeheadfoot} - \setcounter{page}{1} - \pagenumbering{arabic} \pagestyle{thesisheadings} \parindent 1.5em \onehalfspacing} @@ -200,7 +203,15 @@ \thesis@blocks@frontMatter \thesis@blocks@titlePage \thesis@blocks@seal - \thesis@blocks@declaration +% \end{macrocode} +% \changes{v1.0.1}{2021/07/18}{^^A +% Display page numbers for the Faculty of Medicine starting with +% the declaration. [VN]} +% \begin{macrocode} + \thesis@blocks@clear + \pagestyle{plain} + \setcounter{page}{1} + \thesis@blocks@declaration \thesis@blocks@clear \thesis@blocks@abstract \thesis@blocks@keywords diff --git a/Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx b/Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx index 106fec51971..b66d576af32 100644 --- a/Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx +++ b/Master/texmf-dist/source/latex/fithesis/style/mu/sci.dtx @@ -12,7 +12,7 @@ % _-_Pokyny_pro_vypracovani_bc._dipl._a_rigor.praci.pdf}}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fithesis/style/mu/fithesis-mu-sci}[2021/04/24] +\ProvidesPackage{fithesis/style/mu/fithesis-mu-sci}[2021/07/18] % \end{macrocode} % The file defines the color scheme of the respective faculty. Note % the the color definitions are in RGB, which makes the resulting @@ -80,13 +80,29 @@ % of the front matter front matter of the thesis. The front matter % is typeset without any visible numbering, as mandated by the % formal requirements of the faculty. +% \changes{v1.0.1}{2021/07/18}{^^A +% Display page numbers for the Faculty of Science starting with +% the table of contents. [VN]} % \begin{macrocode} \def\thesis@blocks@frontMatter{% \thesis@blocks@clear \pagestyle{empty} \parindent 1.5em \setcounter{page}{1} - \pagenumbering{roman}} + \pagenumbering{arabic}} +% \end{macrocode} +% The |\thesis@blocks@mainMatter| macro sets up the style +% of the main matter of the thesis. The page numbering doesn't +% reset at the beginning of the main thesis in accordance with the +% formal requirements of the faculty. +% \changes{v1.0.1}{2021/07/18}{^^A +% Display page numbers for the Faculty of Science starting with +% the table of contents. [VN]} +% \begin{macrocode} +\def\thesis@blocks@mainMatter{% + \thesis@blocks@clear + \pagestyle{thesisheadings} + \parindent 1.5em\relax} % \end{macrocode} % \end{macro} % \changes{v1.0.0}{2018/11/18}{^^A @@ -117,9 +133,15 @@ \thesis@blocks@titlePage \thesis@blocks@seal \ifx\thesis@type\thesis@proposal - \thesis@blocks@toc +% \end{macrocode} +% \changes{v1.0.1}{2021/07/18}{^^A +% Display page numbers for the Faculty of Science starting with +% the table of contents. [VN]} +% \begin{macrocode} + \thesis@blocks@clear + \pagestyle{plain} + \thesis@blocks@toc \else - \thesis@blocks@seal \thesis@blocks@bibEntry \thesis@blocks@bibEntryEn \thesis@blocks@clear @@ -129,7 +151,14 @@ \thesis@blocks@assignment \thesis@blocks@thanks \thesis@blocks@declaration - \thesis@blocks@tables +% \end{macrocode} +% \changes{v1.0.1}{2021/07/18}{^^A +% Display page numbers for the Faculty of Science starting with +% the table of contents. [VN]} +% \begin{macrocode} + \thesis@blocks@clear + \pagestyle{plain} + \thesis@blocks@tables \fi} \def\thesis@blocks@postamble{% \thesis@blocks@bibliography} -- cgit v1.2.3