Unverified Commit b0557438 authored by xvrabcov's avatar xvrabcov Committed by GitHub
Browse files

Merge pull request #31 from xvrabcov/misc-fixes

Added \thesis@xpatch command
parents acabb9f6 cb47f288
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -465,6 +465,8 @@
%   \item\textsf{inputenc} -- Used to enable the input UTF-8
%     encoding. This package does not get loaded under
%     the \Hologo{XeTeX} and \Hologo{LuaTeX} engines.
%   \item\textsf{xpatch} -- Used to redefine parts of code
%     in macros without redefining the whole macro.
% \end{itemize}
% The \texttt{hyperref} package is also conditionally loaded during
% the expansion of the |\thesis@load| macro (see Section
@@ -479,6 +481,7 @@
\ifxetex\else\ifluatex\else
  \RequirePackage[utf8]{inputenc}
\fi\fi
\RequirePackage{xpatch}
%    \end{macrocode}
% \section{Public API}
% \label{sec:public-api}
@@ -1856,6 +1859,16 @@
  \expandafter\thesis@patch@versions\expandafter,\relax,}
%    \end{macrocode}
% \end{macro}
% \begin{macro}{\thesis@xpatch}
% The |\thesis@xpatch| macro is used to to replace code in a searched
% macro by the replacement code via \textit{xpatchcmd} If the 
% \textit{xpatchcmd} fails, a class error is written to the output.
%    \begin{macrocode}
\long\def\thesis@xpatch#1#2#3{%
    \xpatchcmd{#1}{#2}{#3}{}%
      {\ClassError{fithesis4}{The command #1 does not contain searched text}}}
%    \end{macrocode}
% \end{macro}
% \iffalse
%</class>
% ^^A Old fithesis classes
+4 −9
Original line number Diff line number Diff line
@@ -38,15 +38,12 @@
%    \end{macrocode}
% Each footnote is uniquely numbered across the entire document as
% per the formal requirements of the faculty.
% \changes{v1.0.0}{2021/03/22}{Added \textsf{regexpatch} package to
%   redefine the layout of titlePage. [TV]}
%    \begin{macrocode}
\thesis@require{xpatch}
\thesis@require{chngcntr}
\counterwithout{footnote}{chapter}
%    \end{macrocode}
% The style file configures the upper part of the title page headers
% to include the name of the name of the department and the study field
% to include the name of the department and the study field
% which are by default in the bottom part of the title page.
% \changes{v1.0.0}{2021/04/23}{^^A
%   The style files for the Faculty of Law at the Masaryk University
@@ -56,7 +53,7 @@
%   layout as per the faculty requirements. Department name and
%   field are in the upper part of the titlePage. [TV]}
%    \begin{macrocode}
\xpatchcmd{\thesis@blocks@titlePage}
\thesis@xpatch{\thesis@blocks@titlePage}
{{\sf\thesis@titlePage@large\thesis@@{advisorTitle}: \thesis@advisor}%
   \par\vspace{0.75cm}%
   \ifthesis@blocks@titlePage@department@
@@ -73,10 +70,9 @@
	\thesis@field@name}%
   \fi
   \par\vfill
}
{}{}{}
}{}

\xpatchcmd{\thesis@blocks@titlePage}
\thesis@xpatch{\thesis@blocks@titlePage}
{{\sf\thesis@titlePage@large\thesis@@upper{facultyName}}%
 \par\vspace{1.75cm}%
}
@@ -87,7 +83,6 @@
 {\sf\thesis@titlePage@large\thesis@department@name}
 \par\vspace{1.75cm}%
}
{}{}
%    \end{macrocode}
% \begin{macro}{\thesis@blocks@frontMatter}
% The |\thesis@blocks@frontMatter| macro sets up the style
+7 −8
Original line number Diff line number Diff line
@@ -84,15 +84,16 @@
% 16\,cm in accordance with the formal requirements of the faculty.
% This leads to overfull lines and is against the good conscience
% of the author of this style.
% \changes{v1.0.0}{2021/03/22}{Added \textsf{xpatch} package to
%   redefine layout of titlePage. [TV]}
%    \begin{macrocode}
\thesis@require{tikz}
\thesis@require{geometry}
\thesis@require{setspace}
	\thesis@require{xpatch}
\geometry{top=25mm,bottom=20mm,left=25mm,right=25mm,includeheadfoot}
%    \end{macrocode}
% The style file configures the upper part of the title page headers
% to include the the name of the department and the study programme
% which are by default in the bottom part of the title page. Upon failure
% of the \textit{xpatchcmd}, \cs{thesis@xpatchError} is called.
% \changes{v0.3.49}{2018/02/11}{Removed an extraneous \cs{vskip} in
%   the style files for the Masaryk University in Brno. [VN]}
% \changes{v1.0.0}{2021/02/26}{^^A
@@ -109,7 +110,7 @@
%   in Brno no longer redefine the \cs{thesis@blocks@cover} macro.
%   [TV]}
%    \begin{macrocode}
\xpatchcmd{\thesis@blocks@titlePage}
\thesis@xpatch{\thesis@blocks@titlePage}
{{\sf\thesis@titlePage@large\thesis@@{advisorTitle}: \thesis@advisor}%
   \par\vspace{0.75cm}%
   \ifthesis@blocks@titlePage@department@
@@ -126,10 +127,9 @@
	\thesis@field@name}%
   \fi
   \par\vfill
}
{}{}{}
}{}

\xpatchcmd{\thesis@blocks@titlePage}
\thesis@xpatch{\thesis@blocks@titlePage}
{{\sf\thesis@titlePage@large\thesis@@upper{facultyName}}%
 \par\vspace{1.75cm}%
}
@@ -140,7 +140,6 @@
 {\sf\thesis@titlePage@large\thesis@department@name}
 \par\vspace{1.75cm}%
}
{}{}
%    \end{macrocode}
% \begin{macro}{\thesis@blocks@frontMatter}
% The |\thesis@blocks@frontMatter| macro sets up the style of the