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

Merge pull request #44 from xvrabcov/feature/fix-leading 

Fix leading and the definition&documentation of \thesis@xpatch
parents d8ef1636 4abf8e7c

fithesis.dtx

+10 −6
Original line number Diff line number Diff line
@@ -462,6 +462,7 @@ 
%   \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.

%   \changes{v1.0.0}{2021/04/30}{Added \cs{thesis@xpatch} command. [TV]}

%   \item\textsf{xpatch} -- Used to redefine parts of code

%     in macros without redefining the whole macro.

% \end{itemize}
@@ -1832,7 +1833,7 @@ 
  }}

%    \end{macrocode}

% \begin{macro}{\thesis@patch}

% The |\thesis@patch|\oarg{versions}\oarg{patch} macro expands

% The |\thesis@patch|\marg{versions}\marg{patch} macro expands

% \textit{patch}, if |\thesis@version|\texttt{\discretionary{@}^^A

% {@}{@}}|number| (defined at the top of the file

% \texttt{fithesis4.cls}) matches any of the comma-delimited
@@ -1857,13 +1858,16 @@ 
%    \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.

% \changes{v1.0.0}{2021/04/30}{Added \cs{thesis@xpatch} command. [TV]}

% The |\thesis@xpatch|\marg{command}\marg{search}\marg{replace} macro

% is used to to replace \textit{search} with \textit{replace} in the definition

% of \textit{command}. If the replacement 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}}}

    {\ClassError{fithesis4}{%

       Command \string#1 does not contain the searched text}{}}}

%    \end{macrocode}

% \end{macro}

% \iffalse

style/mu/base.dtx

+31 −31
Original line number Diff line number Diff line
@@ -769,17 +769,17 @@ 
      \colorlet{thesis@color@secondary}{black}%

      \thispagestyle{empty}%

      \begin{center}%

        \thesis@blocks@universityLogo@monochrome

        \par\vspace{0.75cm}%

        {\sf\thesis@titlePage@large\thesis@@upper{facultyName}}%

        \par\vfill

	{\bf\thesis@titlePage@Huge\thesis@TeXtitle}%

	\par\vspace{1.5cm}

        {\sf\thesis@titlePage@Large\thesis@@{typeName}}%

	\par\vspace{1.5cm}

	{\sf\thesis@titlePage@LARGE\thesis@upper{author}}%

        \par\vfill\vfill\vfill\vfill

        \sf\thesis@titlePage@large\thesis@place, \thesis@@{semester}%

        \thesis@blocks@universityLogo@monochrome\par

        \vspace{0.75cm}%

        {\sf\thesis@titlePage@large\thesis@@upper{facultyName}\par}%

        \vfill

        {\bf\thesis@titlePage@Huge\thesis@TeXtitle\par}%

        \vspace{1.5cm}%

        {\sf\thesis@titlePage@Large\thesis@@{typeName}\par}%

        \vspace{1.5cm}%

        {\sf\thesis@titlePage@LARGE\thesis@upper{author}\par}%

        \vfill\vfill\vfill\vfill

        {\sf\thesis@titlePage@large\thesis@place, \thesis@@{semester}\par}%

      \end{center}%

    \end{alwayssingle}%

  \fi}
@@ -869,28 +869,28 @@ 
    \begin{center}%

      \thesis@blocks@universityLogo@color

      \par\vspace{0.75cm}%

      {\sf\thesis@titlePage@large\thesis@@upper{facultyName}}%

      \par\vfill

      {\bf\thesis@titlePage@Huge\thesis@TeXtitle}%

      \par\vspace{1.5cm}%

      {\sf\thesis@titlePage@Large\thesis@@{typeName}}

      \par\vspace{1.5cm}

      {\sf\thesis@titlePage@LARGE\thesis@upper{author}}%

      \par\vfill\vfill

      {\sf\thesis@titlePage@large\thesis@@{advisorTitle}: \thesis@advisor}%

      \par\vspace{0.75cm}%

      {\sf\thesis@titlePage@large\thesis@@upper{facultyName}\par}%

      \vfill

      {\bf\thesis@titlePage@Huge\thesis@TeXtitle\par}%

      \vspace{1.5cm}%

      {\sf\thesis@titlePage@Large\thesis@@{typeName}\par}%

      \vspace{1.5cm}%

      {\sf\thesis@titlePage@LARGE\thesis@upper{author}\par}%

      \vfill\vfill

      {\sf\thesis@titlePage@large\thesis@@{advisorTitle}: \thesis@advisor\par}%

      \vspace{0.75cm}%

      \ifthesis@blocks@titlePage@department@

        {\sf\thesis@titlePage@large\thesis@department@name}

        {\sf\thesis@titlePage@large\thesis@department@name\par}%

      \fi

      \ifthesis@blocks@titlePage@programme@

	\par\vspace{0.25cm}%

        {\sf\thesis@titlePage@large\thesis@@{bib@programme}: \thesis@programme}\par

        \vspace{0.25cm}%

        {\sf\thesis@titlePage@large\thesis@@{bib@programme}: \thesis@programme\par}%

      \fi

      \ifthesis@blocks@titlePage@field@

	\par\vspace{0.25cm}%

        {\sf\thesis@titlePage@large\thesis@@{fieldTitle}: \thesis@field@name}%

        \vspace{0.25cm}%

        {\sf\thesis@titlePage@large\thesis@@{fieldTitle}: \thesis@field@name\par}%

      \fi

      \par\vfill

      \vfill

      {\sf\thesis@titlePage@large\thesis@place, \thesis@@{semester}%

%    \end{macrocode}

% If this is a rigorous thesis or a PhD thesis proposal, create
@@ -906,7 +906,7 @@ 
          \thesis@blocks@advisorSignature

        \else\ifx\thesis@type\thesis@proposal

          \thesis@blocks@advisorSignature

        \fi\fi}%

        \fi\fi\par}%

    \end{center}%

  \end{alwayssingle}}

%    \end{macrocode}

style/mu/econ.dtx

+16 −18
Original line number Diff line number Diff line
@@ -86,24 +86,22 @@ 
% macro does not include the title of the thesis, and typesets the

% name of the author at the bottom of the page.

%    \begin{macrocode}

\def\thesis@blocks@cover{%

  \ifthesis@cover@

    \thesis@blocks@clear

    \begin{alwayssingle}

      \colorlet{thesis@color@secondary}{black}%

      \thispagestyle{empty}

      \begin{center}

        \thesis@blocks@universityLogo@monochrome

	\par\vspace{0.75cm}%

	{\sf\thesis@titlePage@large\thesis@@upper{facultyName}}%

	\par\vfill

	{\bf\thesis@titlePage@Huge\thesis@@{typeName}}%

\thesis@xpatch\thesis@blocks@cover{%

  \vfill

  {\bf\thesis@titlePage@Huge\thesis@TeXtitle\par}%

  \vspace{1.5cm}%

  {\sf\thesis@titlePage@Large\thesis@@{typeName}\par}%

  \vspace{1.5cm}%

  {\sf\thesis@titlePage@LARGE\thesis@upper{author}\par}%

  \vfill\vfill\vfill\vfill

  {\sf\thesis@titlePage@large\thesis@place, \thesis@@{semester}\par}%

}{%

  \vfill

  {\bf\thesis@titlePage@Huge\thesis@@{typeName}\par}%

  \vfill

  {\sf\thesis@titlePage@large\thesis@place

	 \ \sf\thesis@year\hfill\thesis@author}

      \end{center}

    \end{alwayssingle}

  \fi}

   \ \sf\thesis@year\hfill\thesis@author\par}%

}

%    \end{macrocode}

% \end{macro}

% \begin{macro}{\thesis@blocks@frontMatter}

style/mu/law.dtx

+19 −19
Original line number Diff line number Diff line
@@ -57,35 +57,35 @@ 
%    \begin{macrocode}

\thesis@blocks@titlePage@programme@false



\thesis@xpatch{\thesis@blocks@titlePage}

{{\sf\thesis@titlePage@large\thesis@@{advisorTitle}: \thesis@advisor}%

   \par\vspace{0.75cm}%

\thesis@xpatch\thesis@blocks@titlePage{%

  {\sf\thesis@titlePage@large\thesis@@{advisorTitle}: \thesis@advisor\par}%

   \vspace{0.75cm}%

   \ifthesis@blocks@titlePage@department@

     {\sf\thesis@titlePage@large\thesis@department@name}

     {\sf\thesis@titlePage@large\thesis@department@name\par}%

   \fi

   \ifthesis@blocks@titlePage@programme@

     \par\vspace{0.25cm}%

     \vspace{0.25cm}%

     {\sf\thesis@titlePage@large\thesis@@{bib@programme}: 

	\thesis@programme}\par

      \thesis@programme\par}%

   \fi

   \ifthesis@blocks@titlePage@field@

     \par\vspace{0.25cm}%

     \vspace{0.25cm}%

     {\sf\thesis@titlePage@large\thesis@@{fieldTitle}: 

	\thesis@field@name}%

      \thesis@field@name\par}%

   \fi

   \par\vfill

   \vfill

}{}



\thesis@xpatch{\thesis@blocks@titlePage}

{{\sf\thesis@titlePage@large\thesis@@upper{facultyName}}%

 \par\vfill

}

{{\sf\thesis@titlePage@large\thesis@@upper{facultyName}}%

 \par\vspace{0.5cm}%

 {\sf\thesis@titlePage@large\thesis@field}%

 \par\vspace{0.25cm}%

 {\sf\thesis@titlePage@large\thesis@department@name}

 \par\vspace{1cm}%

\thesis@xpatch\thesis@blocks@titlePage{%

  {\sf\thesis@titlePage@large\thesis@@upper{facultyName}\par}%

  \vfill

}{%

  {\sf\thesis@titlePage@large\thesis@@upper{facultyName}\par}%

  \vspace{0.5cm}%

  {\sf\thesis@titlePage@large\thesis@field\par}%

  \vspace{0.25cm}%

  {\sf\thesis@titlePage@large\thesis@department@name\par}%

  \vspace{1cm}%

}

%    \end{macrocode}

% \begin{macro}{\thesis@blocks@frontMatter}

style/mu/med.dtx

+20 −20
Original line number Diff line number Diff line
@@ -114,35 +114,35 @@ 
%    \begin{macrocode}

\thesis@blocks@titlePage@field@false



\thesis@xpatch{\thesis@blocks@titlePage}

{{\sf\thesis@titlePage@large\thesis@@{advisorTitle}: \thesis@advisor}%

   \par\vspace{0.75cm}%

\thesis@xpatch\thesis@blocks@titlePage{%

  {\sf\thesis@titlePage@large\thesis@@{advisorTitle}: \thesis@advisor\par}%

   \vspace{0.75cm}%

   \ifthesis@blocks@titlePage@department@

     {\sf\thesis@titlePage@large\thesis@department@name}

     {\sf\thesis@titlePage@large\thesis@department@name\par}%

   \fi

   \ifthesis@blocks@titlePage@programme@

     \par\vspace{0.25cm}%

     \vspace{0.25cm}%

     {\sf\thesis@titlePage@large\thesis@@{bib@programme}:

	\thesis@programme}\par

      \thesis@programme\par}%

   \fi

   \ifthesis@blocks@titlePage@field@

     \par\vspace{0.25cm}%

     \vspace{0.25cm}%

     {\sf\thesis@titlePage@large\thesis@@{fieldTitle}: 

	\thesis@field@name}%

      \thesis@field@name\par}%

   \fi

   \par\vfill

   \vfill

}{}



\thesis@xpatch{\thesis@blocks@titlePage}

{{\sf\thesis@titlePage@large\thesis@@upper{facultyName}}%

 \par\vfill

}

{{\sf\thesis@titlePage@large\thesis@@upper{facultyName}}%

 \par\vspace{0.5cm}%

 {\sf\thesis@titlePage@large\thesis@programme}%

 \par\vspace{0.25cm}%

 {\sf\thesis@titlePage@large\thesis@department@name}

 \par\vspace{1cm}%

\thesis@xpatch\thesis@blocks@titlePage{%

  {\sf\thesis@titlePage@large\thesis@@upper{facultyName}\par}%

  \vfill

}{%

  {\sf\thesis@titlePage@large\thesis@@upper{facultyName}\par}%

  \vspace{0.5cm}%

  {\sf\thesis@titlePage@large\thesis@programme\par}%

  \vspace{0.25cm}%

  {\sf\thesis@titlePage@large\thesis@department@name\par}%

  \vspace{1cm}%

}

%    \end{macrocode}

% \begin{macro}{\thesis@blocks@frontMatter}

style/mu/sci.dtx

+1 −1

File changed.

Contains only whitespace changes.