Skip to content
Snippets Groups Projects
Unverified Commit 324c5ae3 authored by Vít Starý Novotný's avatar Vít Starý Novotný
Browse files

Rename files after breaking changes in LaTeX2e kernel

Following commit 7510875, LaTeX2e no longer identifies packages by
pathnames, but by filenames. This breaks the inheritance mechanism
of fithesis and required copying university identifier from directory
names to LaTeX package filenames. More information is available at
https://github.com/latex3/latex2e/issues/510.
parent 37b9f213
No related branches found
No related tags found
No related merge requests found
......@@ -56,7 +56,7 @@
\gdef\thesis@version@number{#1}
\gdef\thesis@version@date{#2}
\gdef\thesis@version{#2 #1 fithesis3 MU thesis class}}
\thesis@versiondef{v0.3.51}{2020/03/09}}
\thesis@versiondef{v1.0.0-dev}{2021/02/21}}
% {\newwrite\f\openout\f=VERSION\write\f{\thesis@version}\closeout\f}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
......@@ -896,13 +896,15 @@
% \subsubsection{The \texttt{style} key}
% The \marg{\texttt{style}=filename} pair sets the filename of the
% style file to be used to \textit{filename}. The \textit{filename}
% is stored within the |\thesis@style| macro, whose
% implicit value is |\thesis@university/fithesis-\thesis@faculty|.
% is stored within the |\thesis@style| macro, whose implicit value is
% |\thesis@university/fithesis-\thesis@university-\thesis@faculty|.
% When the \textit{filename} is an empty token string, no style
% files will be loaded during the main routine (see Section
% \ref{sec:thesisload}).
% \changes{v1.0.0}{2021/02/21}{File were renamed after
% breaking changes in package loading after PR 438 in \LaTeXe. [VN]}
% \begin{macrocode}
\def\thesis@style{\thesis@university/fithesis-\thesis@faculty}
\def\thesis@style{\thesis@university/fithesis-\thesis@university-\thesis@faculty}
\define@key{thesis}{style}{%
\def\thesis@style{#1}}
% \end{macrocode}
......@@ -1656,9 +1658,11 @@
% If inheritance is enabled for style files, then the
% |\thesis@requireStyle|\marg{style} macro sequentially
% loads each of the following files, provided they exist:
% \changes{v1.0.0}{2021/02/21}{File were renamed after
% breaking changes in package loading after PR 438 in \LaTeXe. [VN]}
% \begin{enumerate}
% \item|\thesis@stylepath fithesis-base.sty|
% \item|\thesis@stylepath\thesis@university/fithesis-base.sty|
% \item|\thesis@stylepath\thesis@university/fithesis-\thesis@university-base.sty|
% \item|\thesis@stylepath| \textit{style}|.sty|
% \end{enumerate}If inheritance is disabled for style files, then
% only the last listed file is loaded. The \texttt{fithesis-}
......@@ -1669,7 +1673,7 @@
\ifthesis@style@inheritance
\thesis@requireIfExists{\thesis@stylepath fithesis-base}%
\thesis@requireIfExists{\thesis@stylepath\thesis@university
/fithesis-base}
/fithesis-\thesis@university-base}
\fi
\thesis@requireIfExists{\thesis@stylepath#1}}
% \end{macrocode}
......
LOGS=base.log fi.log sci.log phil.log ped.log fss.log law.log \
econ.log med.log fsps.log
OUTPUT=fithesis-base.sty fithesis-1[012].clo fithesis-fi.sty \
fithesis-sci.sty fithesis-phil.sty fithesis-ped.sty \
fithesis-fss.sty fithesis-law.sty fithesis-econ.sty \
fithesis-med.sty fithesis-fsps.sty
OUTPUT=fithesis-mu-base.sty fithesis-mu-1[012].clo fithesis-mu-fi.sty \
fithesis-mu-sci.sty fithesis-mu-phil.sty fithesis-mu-ped.sty \
fithesis-mu-fss.sty fithesis-mu-law.sty fithesis-mu-econ.sty \
fithesis-mu-med.sty fithesis-mu-fsps.sty
# These targets create all the locale files.
all: explode
......
% \iffalse
%<*base>
% \fi\file{style/mu/fithesis-base.sty}\label{sec:fithesis-mu-base}
% \changes{v1.0.0}{2021/02/21}{File were renamed after
% breaking changes in package loading after PR 438 in \LaTeXe. [VN]}
% This is the base style file for theses written at the Masaryk
% University in Brno. When inheritance is enabled for style files,
% this file is always the second style file to be loaded right
% after \texttt{style/fithesis-base.sty}, regardless of the value
% of the |\thesis@style| macro.
% \begin{macrocode}
\ProvidesPackage{fithesis/style/mu/fithesis-base}[2018/12/25]
\ProvidesPackage{fithesis/style/mu/fithesis-mu-base}[2021/02/21]
\NeedsTeXFormat{LaTeX2e}
% \end{macrocode}
% The file recognizes the following options: \begin{itemize}
......@@ -1081,8 +1083,8 @@
% The rest of the file comprises redefinitions of \LaTeX\ commands
% and private \texttt{rapport3} class macros altering the layout of
% the resulting document. Depending on the type size of 10, 11 or
% 12 points, either the \texttt{fithesis-10.clo},
% \texttt{fithesis-11.clo} or \texttt{fithesis-12.clo} file is
% 12 points, either the \texttt{fithesis-mu-10.clo},
% \texttt{fithesis-mu-11.clo} or \texttt{fithesis-mu-12.clo} file is
% loaded from the |\thesis@stylepath| |mu| directory, respectively.
% \begin{macrocode}
% Table of contents will contain sectioning commands up to
......@@ -1092,7 +1094,11 @@
% Sections up to \subsection will be numbered.
\setcounter{secnumdepth}{2}
% Load the `fithesis-1*.clo` size option.
% \end{macrocode}
% \changes{v1.0.0}{2021/02/21}{File were renamed after
% 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
% Define the running heading style.
......@@ -1215,13 +1221,15 @@
% \end{macrocode}\iffalse
%</base>
% \fi\file{style/mu/fithesis-10.clo}
% \changes{v1.0.0}{2021/02/21}{File were renamed after
% breaking changes in package loading after PR 438 in \LaTeXe. [VN]}
% This file is conditionally loaded by the
% \texttt{style/mu/base.sty} file to redefine the page geometry to
% match the type size of 10 points.
% \begin{macrocode}
%<*opt>
%<*10pt>
\ProvidesFile{fithesis/style/mu/fithesis-10.clo}[2016/05/15]
\ProvidesFile{fithesis/style/mu/fithesis-mu-10.clo}[2021/02/21]
\renewcommand{\normalsize}{\fontsize\@xpt{12}\selectfont
\abovedisplayskip 10\p@ plus2\p@ minus5\p@
......@@ -1259,12 +1267,14 @@
%</10pt>
% \end{macrocode}
% \file{style/mu/fithesis-11.clo}
% \changes{v1.0.0}{2021/02/21}{File were renamed after
% breaking changes in package loading after PR 438 in \LaTeXe. [VN]}
% This file is conditionally loaded by the
% \texttt{style/mu/base.sty} file to redefine the page geometry to
% match the type size of 11 points.
% \begin{macrocode}
%<*11pt>
\ProvidesFile{fithesis/style/mu/fithesis-11.clo}[2016/05/15]
\ProvidesFile{fithesis/style/mu/fithesis-mu-11.clo}[2021/02/21]
\renewcommand{\normalsize}{\fontsize\@xipt{14}\selectfont
\abovedisplayskip 11\p@ plus3\p@ minus6\p@
......@@ -1302,6 +1312,8 @@
%</11pt>
% \end{macrocode}
% \file{style/mu/fithesis-12.clo}
% \changes{v1.0.0}{2021/02/21}{File were renamed after
% breaking changes in package loading after PR 438 in \LaTeXe. [VN]}
% This file is conditionally loaded by the
% \texttt{style/mu/base.sty} file to redefine the page geometry to
% match the type size of 12 points. The type dimensions defined by
......@@ -1333,7 +1345,7 @@
% should remain constant regardless of the font size setting.
% \begin{macrocode}
%<*12pt>
\ProvidesFile{fithesis/style/mu/fithesis-12.clo}[2016/05/15]
\ProvidesFile{fithesis/style/mu/fithesis-mu-12.clo}[2021/02/21]
%</12pt>
\def\thesis@titlePage@normalsize{\fontsize\@xiipt{14.5}%
......
\input ../../LICENSE
\generate{\file{fithesis-base.sty}{\from{base.dtx}{base}}
\file{fithesis-10.clo}{\from{base.dtx}{opt,10pt}}
\file{fithesis-11.clo}{\from{base.dtx}{opt,11pt}}
\file{fithesis-12.clo}{\from{base.dtx}{opt,12pt}}}
\generate{\file{fithesis-mu-base.sty}{\from{base.dtx}{base}}
\file{fithesis-mu-10.clo}{\from{base.dtx}{opt,10pt}}
\file{fithesis-mu-11.clo}{\from{base.dtx}{opt,11pt}}
\file{fithesis-mu-12.clo}{\from{base.dtx}{opt,12pt}}}
\endbatchfile
% \file{style/mu/fithesis-econ.sty}
% \changes{v1.0.0}{2021/02/21}{File were renamed after
% breaking changes in package loading after PR 438 in \LaTeXe. [VN]}
% This is the style file for the theses written at the Faculty of
% Economics and Administration at the Masaryk University in Brno.
% It has been prepared in accordance with the formal requirements
......@@ -11,7 +13,7 @@
% zaverecnych_pracich_2017.docx}}.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{fithesis/style/mu/fithesis-econ}[2018/06/11]
\ProvidesPackage{fithesis/style/mu/fithesis-mu-econ}[2021/02/21]
% \end{macrocode}
% The file defines the color scheme of the respective faculty. Note
% the the color definitions are in RGB, which makes the resulting
......
\input ../../LICENSE
\generate{\file{fithesis-econ.sty}{\from{econ.dtx}{}}}
\generate{\file{fithesis-mu-econ.sty}{\from{econ.dtx}{}}}
\endbatchfile
% \file{style/mu/fithesis-fi.sty}
% \changes{v1.0.0}{2021/02/21}{File were renamed after
% breaking changes in package loading after PR 438 in \LaTeXe. [VN]}
% This is the style file for the theses written at the Faculty of
% Informatics at the Masaryk University in Brno. It has been
% prepared in accordance with the formal requirements published at
......@@ -8,7 +10,7 @@
% \url{http://www.fi.muni.cz/docs/BP_DP_na_FI.pdf}.}.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{fithesis/style/mu/fithesis-fi}[2016/04/18]
\ProvidesPackage{fithesis/style/mu/fithesis-mu-fi}[2021/02/21]
% \end{macrocode}
% The file defines the color scheme of the respective faculty. Note
% the the color definitions are in RGB, which makes the resulting
......
\input ../../LICENSE
\generate{\file{fithesis-fi.sty}{\from{fi.dtx}{}}}
\generate{\file{fithesis-mu-fi.sty}{\from{fi.dtx}{}}}
\endbatchfile
% \file{style/mu/fithesis-fsps.sty}
% \changes{v1.0.0}{2021/02/21}{File were renamed after
% breaking changes in package loading after PR 438 in \LaTeXe. [VN]}
% This is the style file for the theses written at the Faculty of
% Sports Studies at the Masaryk University in Brno. It has been
% prepared in accordance with the formal requirements published at
......@@ -7,7 +9,7 @@
% 5-2013.pdf}}.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{fithesis/style/mu/fithesis-fsps}[2018/02/11]
\ProvidesPackage{fithesis/style/mu/fithesis-mu-fsps}[2021/02/21]
% \end{macrocode}
% The file defines the color scheme of the respective faculty. Note
% the the color definitions are in RGB, which makes the resulting
......
\input ../../LICENSE
\generate{\file{fithesis-fsps.sty}{\from{fsps.dtx}{}}}
\generate{\file{fithesis-mu-fsps.sty}{\from{fsps.dtx}{}}}
\endbatchfile
% \file{style/mu/fithesis-fss.sty}
% \changes{v1.0.0}{2021/02/21}{File were renamed after
% breaking changes in package loading after PR 438 in \LaTeXe. [VN]}
% This is the style file for the theses written at the Faculty of
% Social Studies at the Masaryk University in Brno. Since there
% exists no faculty-wide formal requirement or recommendation,^^A
......@@ -15,7 +17,7 @@
% modification by the individual departments.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{fithesis/style/mu/fithesis-fss}[2016/04/18]
\ProvidesPackage{fithesis/style/mu/fithesis-mu-fss}[2021/02/21]
% \end{macrocode}
% The file defines the color scheme of the respective faculty. Note
% the the color definitions are in RGB, which makes the resulting
......
\input ../../LICENSE
\generate{\file{fithesis-fss.sty}{\from{fss.dtx}{}}}
\generate{\file{fithesis-mu-fss.sty}{\from{fss.dtx}{}}}
\endbatchfile
% \file{style/mu/fithesis-law.sty}
% \changes{v1.0.0}{2021/02/21}{File were renamed after
% breaking changes in package loading after PR 438 in \LaTeXe. [VN]}
% This is the style file for the theses written at the Faculty of
% Law at the Masaryk University in Brno. It has been prepared in
% accordance with the formal requirements published at the
......@@ -7,7 +9,7 @@
% .cz/do/law/ud/predp/smer/S-04-2013_O_citacich_dokumentu.pdf}}.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{fithesis/style/mu/fithesis-law}[2017/05/21]
\ProvidesPackage{fithesis/style/mu/fithesis-mu-law}[2021/02/21]
% \end{macrocode}
% The file defines the color scheme of the respective faculty. Note
% the the color definitions are in RGB, which makes the resulting
......
\input ../../LICENSE
\generate{\file{fithesis-law.sty}{\from{law.dtx}{}}}
\generate{\file{fithesis-mu-law.sty}{\from{law.dtx}{}}}
\endbatchfile
% \file{style/mu/fithesis-med.sty}
% \changes{v1.0.0}{2021/02/21}{File were renamed after
% breaking changes in package loading after PR 438 in \LaTeXe. [VN]}
% This is the style file for the theses written at the Faculty of
% Medicine at the Masaryk University in Brno. It has been prepared
% in accordance with the formal requirements published at the
......@@ -7,7 +9,7 @@
% ZITOSTI_ZAVERECNE_PRACE.doc}}.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{fithesis/style/mu/fithesis-med}[2018/06/11]
\ProvidesPackage{fithesis/style/mu/fithesis-mu-med}[2021/02/21]
% \end{macrocode}
% The file defines the color scheme of the respective faculty. Note
% the the color definitions are in RGB, which makes the resulting
......
\input ../../LICENSE
\generate{\file{fithesis-med.sty}{\from{med.dtx}{}}}
\generate{\file{fithesis-mu-med.sty}{\from{med.dtx}{}}}
\endbatchfile
% \file{style/mu/fithesis-ped.sty}
% \changes{v1.0.0}{2021/02/21}{File were renamed after
% breaking changes in package loading after PR 438 in \LaTeXe. [VN]}
% This is the style file for the theses written at the Faculty of
% Education at the Masaryk University in Brno. It has been prepared
% in accordance with the formal requirements published at the
......@@ -7,7 +9,7 @@
% \url{http://moodlinka.ics.muni.cz/course/view.php?id=632}}.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{fithesis/style/mu/fithesis-ped}[2016/04/18]
\ProvidesPackage{fithesis/style/mu/fithesis-mu-ped}[2021/02/21]
% \end{macrocode}
% The file defines the color scheme of the respective faculty. Note
% the the color definitions are in RGB, which makes the resulting
......
\input ../../LICENSE
\generate{\file{fithesis-ped.sty}{\from{ped.dtx}{}}}
\generate{\file{fithesis-mu-ped.sty}{\from{ped.dtx}{}}}
\endbatchfile
% \file{style/mu/fithesis-phil.sty}
% \changes{v1.0.0}{2021/02/21}{File were renamed after
% breaking changes in package loading after PR 438 in \LaTeXe. [VN]}
% This is the style file for the theses written at the Faculty of
% Arts at the Masaryk University in Brno. It has been prepared in
% accordance with the formal requirements published at the website
......@@ -6,7 +8,7 @@
% racoviste/SO/vzory_praci/Vzor_bakalarske_prace.pdf}}.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{fithesis/style/mu/fithesis-phil}[2016/04/18]
\ProvidesPackage{fithesis/style/mu/fithesis-mu-phil}[2021/02/21]
% \end{macrocode}
% The file defines the color scheme of the respective faculty. Note
% the the color definitions are in RGB, which makes the resulting
......
\input ../../LICENSE
\generate{\file{fithesis-phil.sty}{\from{phil.dtx}{}}}
\generate{\file{fithesis-mu-phil.sty}{\from{phil.dtx}{}}}
\endbatchfile
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment