From 4e3e134fe75ee96dbdd43c875124f2be877bb601 Mon Sep 17 00:00:00 2001
From: witiko <witiko@gmail.com>
Date: Sat, 2 May 2015 15:13:21 +0200
Subject: [PATCH] Added the `\thesis@color@setup` API along with related macros
to allow MUNI style files to set up colors of various typo elements.
---
fithesis3/style/mu/base.dtx | 111 +++++++++++++++++++++++++++------
fithesis3/style/mu/econ.dtx | 15 ++++-
fithesis3/style/mu/fi.dtx | 13 +++-
fithesis3/style/mu/fsps.dtx | 11 ++++
fithesis3/style/mu/fss.dtx | 11 ++++
fithesis3/style/mu/law.dtx | 11 ++++
fithesis3/style/mu/med.dtx | 15 ++++-
fithesis3/style/mu/ped.dtx | 11 ++++
fithesis3/style/mu/phil.dtx | 11 ++++
fithesis3/style/mu/sci.dtx | 49 ++++++++++-----
fithesis3/test/econ-tables.tex | 15 +++++
fithesis3/test/fi-tables.tex | 15 +++++
fithesis3/test/fsps-tables.tex | 15 +++++
fithesis3/test/fss-tables.tex | 15 +++++
fithesis3/test/law-tables.tex | 15 +++++
fithesis3/test/med-tables.tex | 15 +++++
fithesis3/test/ped-tables.tex | 15 +++++
fithesis3/test/phil-tables.tex | 15 +++++
fithesis3/test/sci-czech.tex | 9 +++
fithesis3/test/sci-english.tex | 9 +++
fithesis3/test/sci-slovak.tex | 9 +++
21 files changed, 364 insertions(+), 41 deletions(-)
create mode 100644 fithesis3/test/econ-tables.tex
create mode 100644 fithesis3/test/fi-tables.tex
create mode 100644 fithesis3/test/fsps-tables.tex
create mode 100644 fithesis3/test/fss-tables.tex
create mode 100644 fithesis3/test/law-tables.tex
create mode 100644 fithesis3/test/med-tables.tex
create mode 100644 fithesis3/test/ped-tables.tex
create mode 100644 fithesis3/test/phil-tables.tex
create mode 100644 fithesis3/test/sci-czech.tex
create mode 100644 fithesis3/test/sci-english.tex
create mode 100644 fithesis3/test/sci-slovak.tex
diff --git a/fithesis3/style/mu/base.dtx b/fithesis3/style/mu/base.dtx
index 4d0f0d9..81ffcdb 100644
--- a/fithesis3/style/mu/base.dtx
+++ b/fithesis3/style/mu/base.dtx
@@ -23,7 +23,7 @@
% prior the beginning of the next chapter to ensure that it
% starts on an left-hand (even-numbered) page.
%
-% The \DescribeMacro{\ifthesis@twoside}|\ifthesis@twoside|
+% The \DescribeMacro{\ifthesis@twoside@}|\ifthesis@twoside@|
% conditional is set to \textit{false} or \textit{true},
% respectively. This value can be tested in the subsequently
% loaded style files.
@@ -33,7 +33,7 @@
% \item\texttt{draft}, \texttt{final} -- Overful lines are or
% aren't marked within the document, respectively.
% \item\texttt{monochrome}, \texttt{color} -- The
-% \DescribeMacro{\ifthesis@color}|\ifthesis@color| conditional
+% \DescribeMacro{\ifthesis@color@}|\ifthesis@color@| conditional
% is set to \textit{false} or \textit{true}, respectively.
% This value can be tested in the subsequently loaded style
% files.
@@ -48,6 +48,11 @@
% \item\texttt{cover}, \texttt{nocover} -- The
% \DescribeMacro{\thesis@blocks@cover}|\thesis@blocks@cover|
% is or isn't going to expand to the thesis cover.
+%
+% The \DescribeMacro{\ifthesis@cover@}|\ifthesis@cover@|
+% conditional is set to \textit{false} or \textit{true},
+% respectively. This value can be tested in the subsequently
+% loaded style files.
% \end{itemize}
% The defaults are \texttt{12pt}, \texttt{twoside}, \texttt{final},
% \texttt{monochrome}, \texttt{nolof}, \texttt{nolot} and
@@ -56,25 +61,25 @@
\DeclareOption{10pt}{\def\thesis@ptsize{0}}
\DeclareOption{11pt}{\def\thesis@ptsize{1}}
\DeclareOption{12pt}{\def\thesis@ptsize{2}}
-\newif\ifthesis@twoside
+\newif\ifthesis@twoside@
\DeclareOption{oneside}{%
- \thesis@twosidefalse\@twosidefalse\@mparswitchfalse}
+ \thesis@twoside@false\@twosidefalse\@mparswitchfalse}
\DeclareOption{twoside}{%
- \thesis@twosidetrue \@twosidetrue \@mparswitchtrue}
+ \thesis@twoside@true \@twosidetrue \@mparswitchtrue}
\DeclareOption{onecolumn}{\@twocolumnfalse}
\DeclareOption{twocolumn}{\@twocolumntrue}
\DeclareOption{draft}{\setlength\overfullrule{5pt}}
\DeclareOption{final}{\setlength\overfullrule{0pt}}
-\newif\ifthesis@color\thesis@colorfalse
-\DeclareOption{monochrome}{\thesis@colorfalse}
-\DeclareOption{color}{\thesis@colortrue}
+\newif\ifthesis@color@
+\DeclareOption{monochrome}{\thesis@color@false}
+\DeclareOption{color}{\thesis@color@true}
\DeclareOption{nolot}{\def\thesis@blocks@lot{}}
\DeclareOption{lot}{\let\thesis@blocks@lot\listoftables}
\DeclareOption{nolof}{\def\thesis@blocks@lof{}}
\DeclareOption{lof}{\let\thesis@blocks@lof\listoffigures}
-\newif\ifthesis@cover
-\DeclareOption{nocover}{\thesis@coverfalse}
-\DeclareOption{cover}{\thesis@covertrue}
+\newif\ifthesis@cover@
+\DeclareOption{nocover}{\thesis@cover@false}
+\DeclareOption{cover}{\thesis@cover@true}
% Options executed by default
\ExecuteOptions{12pt,twoside,final,monochrome,lot,lof,nocover}
@@ -84,6 +89,7 @@
% \item\textsf{fontenc} -- The font encoding is set to Cork.
% \item\textsf{mathpazo} -- The virtual \texttt{mathpazo} fonts
% will be used for math.
+% \item\textsf{colorx} -- Adds support for color manipulation.
% \item\textsf{tgpagella} -- Changes the default roman font family
% to \TeX\ Gyre Pagella.
% \item\textsf{cmap} -- Places an an explicit \texttt{ToUnicode}
@@ -96,22 +102,89 @@
% assignment.
% \item\textsf{hyperref} -- Adds support for injecting metadata
% into the resulting PDF document.
+% \item\textsf{keyval} -- Adds support for parsing
+% comma-delimited lists of key-value pairs.
% \end{itemize}
% In addition to that, the \textsf{hyperref} package is configured
-% to support both roman and arabic page numbering in one document.
+% to support both roman and arabic page numbering in one document
+% and to decorate hyperlinks with an underline instead of a
+% rectangular box.
% \begin{macrocode}
\RequirePackage[resetfonts]{cmap}
\RequirePackage[T1]{fontenc}
+\RequirePackage[usenames,dvipsnames,svgnames,table]{xcolor}
\thesis@require{mathpazo}
\thesis@require{tgpagella}
\thesis@require{graphicx}
\thesis@require{pdfpages}
\thesis@require{hyperref}
+\thesis@require{keyval}
\hypersetup{
+ pdfborderstyle={/S/U/W 1}, % Less obtrusive borders
plainpages=false, % Multiple page numbering support
pdfpagelabels % Generate pdf page labels
}
% \end{macrocode}
+% \begin{macro}{\thesis@tabular}\begin{macro}{\thesis@endtabular}
+% \begin{macro}{\thesis@tabularx}\begin{macro}{\thesis@endtabularx}
+% The file defines the |thesis@tabular| and |thesis@tabularx|
+% environments, which can be used to typeset the |tabular| and
+% |tabularx| tables decorated with the colors specified within the
+% |\thesis@color@tableOdd| and |\thesis@color@tableEven| private
+% macros, if the \texttt{color} option is specified. In order to
+% use the |thesis@tabularx| environment, the user must manually
+% include the \textsf{tabularx} package.
+% \begin{macrocode}
+\newenvironment{thesis@tabular}{%
+ \ifthesis@color@%
+ \rowcolors{1}{\thesis@color@tableOdd}{\thesis@color@tableEven}%
+ \fi\tabular}{\endtabular}
+\newenvironment{thesis@tabularx}{%
+ \ifthesis@color@%
+ \rowcolors{1}{\thesis@color@tableOdd}{\thesis@color@tableEven}%
+ \fi\tabularx}{\endtabularx}
+% \end{macrocode}
+% \end{macro}\end{macro}\end{macro}\end{macro}
+% \begin{macro}{\thesis@color@setup}
+% The file defines the |\thesis@color@setup|\marg{colors} command,
+% where \textit{colors} is a comma-delimited list of key-value
+% pairs as defined by the \textsf{keyval} package. The command can
+% be invoked either by the subsequently loaded style files or by
+% the user to define which colors will be used, when the
+% \texttt{color} option is specified.
+% \begin{macrocode}
+\def\thesis@color@setup#1{%
+ \setkeys{thesis@color}{#1}}
+% \end{macrocode}
+% \end{macro}
+% The following key-value pairs are supported:
+% \begin{enumerate}
+% \item\marg{\texttt{links}=color} -- Sets the color of hyperref
+% links to \textit{color}. The default color is specified by
+% the \textsf{hyperref} package.
+% \item\marg{\texttt{tableOdd}=color} -- Sets the color of the
+% odd table rows within the \texttt{thesis@tabular} and
+% \texttt{thesis@tabularx} environments to \textit{color}. The
+% \textit{color} is stored within the
+% \DescribeMacro{\thesis@color@tableOdd}%
+% |\thesis@color@tableOdd| private macro.
+% \item\marg{\texttt{tableEven}=color} -- Sets the color of the
+% even table rows within the \texttt{thesis@tabular} and
+% \texttt{thesis@tabularx} environments to \textit{color}. The
+% \textit{color} is stored within the
+% \DescribeMacro{\thesis@color@tableEven}%
+% |\thesis@color@tableEven| private macro.
+% \end{enumerate}
+% \begin{macrocode}
+\define@key{thesis@color}{links}{%
+ \hypersetup{linkbordercolor=#1}}
+\def\thesis@color@tableOdd{white}
+\define@key{thesis@color}{tableOdd}{%
+ \def\thesis@color@tableOdd{#1}}
+\def\thesis@color@tableEven{white}
+\define@key{thesis@color}{tableEven}{%
+ \def\thesis@color@tableEven{#1}}
+% \end{macrocode}
% The file defines several blocks to be used in the redefinitions
% of the |\thesis@preamble| and |\thesis@postable| private macros
% by the subsequently loaded style files.
@@ -133,7 +206,7 @@
% double-sided typesetting is enabled.
% \begin{macrocode}
\def\thesis@blocks@clear{%
- \ifthesis@twoside%
+ \ifthesis@twoside@%
\clearpage%
\thispagestyle{empty}%
\cleardoublepage%
@@ -147,7 +220,7 @@
% double-sided typesetting is enabled.
% \begin{macrocode}
\def\thesis@blocks@clearRight{%
- \ifthesis@twoside%
+ \ifthesis@twoside@%
\clearpage%
\ifodd\value{page}%
\thispagestyle{empty}%
@@ -176,9 +249,9 @@
% certain parts of the cover page.
% \begin{macrocode}
\def\thesis@blocks@cover{%
- \ifthesis@cover%
+ \ifthesis@cover@%
\thesis@blocks@clear%
- \ifthesis@twoside\@twosidefalse\fi % Temporarily disable twoside
+ \ifthesis@twoside@\@twosidefalse\fi % Temporarily disable twoside
\begin{alwayssingle}%
\thispagestyle{empty}%
\begin{center}%
@@ -192,7 +265,7 @@
\thesis@blocks@cover@footer%
\end{center}%
\end{alwayssingle}%
- \ifthesis@twoside\@twosidetrue\fi % Re-enable twoside
+ \ifthesis@twoside@\@twosidetrue\fi % Re-enable twoside
\fi}
% \end{macrocode}
% The output of the |\thesis@blocks@cover@header| private macro is
@@ -271,7 +344,7 @@
\begin{center}%
\thesis@blocks@titlePage@header%
{\edef\thesis@logopath@color{%
- \thesis@logopath\ifthesis@color color/\fi}
+ \thesis@logopath\ifthesis@color@ color/\fi}
\includegraphics[width=40mm]{%
\thesis@logopath@color\thesis@facultyLogo}\\[0.4in]}%
\let\footnotesize\small%
@@ -453,7 +526,7 @@
\ifx\thesis@assignmentFiles\undefined%
\begin{alwayssingle}%
\thispagestyle{empty}
- \addtocounter{page}{-\ifthesis@twoside2\else1\fi}
+ \addtocounter{page}{-\ifthesis@twoside@2\else1\fi}
\noindent\textit{\thesis@@{assignment}}%
\end{alwayssingle}%
\else%
diff --git a/fithesis3/style/mu/econ.dtx b/fithesis3/style/mu/econ.dtx
index b128d91..3e440dc 100644
--- a/fithesis3/style/mu/econ.dtx
+++ b/fithesis3/style/mu/econ.dtx
@@ -9,6 +9,17 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{fithesis3/style/mu/fithesis3-econ}[2015/04/26]
% \end{macrocode}
+% The file redefines the colors used within the |thesis@tabular|
+% and |thesis@tabularx| environments and with the hyperlinks.
+% \begin{macrocode}
+\definecolor{thesis@color@faculty}{HTML}{7C211E}
+\definecolor{thesis@color@facultylight}{HTML}{DAC1BF}
+\definecolor{thesis@color@facultyxlight}{HTML}{EFE4E3}
+\thesis@color@setup{%
+ links=thesis@color@faculty,%
+ tableOdd=thesis@color@facultyxlight,%
+ tableEven=thesis@color@facultylight}
+% \end{macrocode}
% In addition to the main locale, the file also requires the
% English locale.
% \begin{macrocode}
@@ -34,7 +45,7 @@
% cover.
% \begin{macrocode}
\def\thesis@blocks@cover{%
- \ifthesis@cover
+ \ifthesis@cover@
\thesis@blocks@clear
\begin{alwayssingle}
\thispagestyle{empty}
@@ -93,7 +104,7 @@
\def\thesis@blocks@frontMatter{%
\thesis@blocks@clear
% In case of double-sided typesetting, change the geometry
- \ifthesis@twoside
+ \ifthesis@twoside@
\geometry{top=25mm,bottom=20mm,left=35mm,
right=15mm, includeheadfoot}
\fi\pagestyle{empty}
diff --git a/fithesis3/style/mu/fi.dtx b/fithesis3/style/mu/fi.dtx
index 738215d..367bfc0 100644
--- a/fithesis3/style/mu/fi.dtx
+++ b/fithesis3/style/mu/fi.dtx
@@ -6,7 +6,18 @@
% \url{https://www.fi.muni.cz/docs/BP_DP_na_FI.pdf}}.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fithesis3/style/mu/fithesis3-fi}[2015/04/12]
+\ProvidesPackage{fithesis3/style/mu/fithesis3-fi}[2015/05/02]
+% \end{macrocode}
+% The file redefines the colors used within the |thesis@tabular|
+% and |thesis@tabularx| environments and with the hyperlinks.
+% \begin{macrocode}
+\definecolor{thesis@color@faculty}{HTML}{FFD451}
+\definecolor{thesis@color@facultylight}{HTML}{FFECB3}
+\definecolor{thesis@color@facultyxlight}{HTML}{FFF9E5}
+\thesis@color@setup{%
+ links=thesis@color@faculty,%
+ tableOdd=thesis@color@facultyxlight,%
+ tableEven=thesis@color@facultylight}
% \end{macrocode}
% \begin{macro}{\thesis@blocks@titlePage}
% The style file redefines the cover and title page footers to
diff --git a/fithesis3/style/mu/fsps.dtx b/fithesis3/style/mu/fsps.dtx
index a7aa3eb..1b214ae 100644
--- a/fithesis3/style/mu/fsps.dtx
+++ b/fithesis3/style/mu/fsps.dtx
@@ -8,6 +8,17 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{fithesis3/style/mu/fithesis3-fss}[2015/04/26]
% \end{macrocode}
+% The file redefines the colors used within the |thesis@tabular|
+% and |thesis@tabularx| environments and with the hyperlinks.
+% \begin{macrocode}
+\definecolor{thesis@color@faculty}{HTML}{0042BA}
+\definecolor{thesis@color@facultylight}{HTML}{BBC7DD}
+\definecolor{thesis@color@facultyxlight}{HTML}{E4E9F1}
+\thesis@color@setup{%
+ links=thesis@color@facultylight,%
+ tableOdd=thesis@color@facultyxlight,%
+ tableEven=thesis@color@facultylight}
+% \end{macrocode}
% The style file configures the title page header to include the
% field name.
% \begin{macrocode}
diff --git a/fithesis3/style/mu/fss.dtx b/fithesis3/style/mu/fss.dtx
index 224a6ef..b0f6c8b 100644
--- a/fithesis3/style/mu/fss.dtx
+++ b/fithesis3/style/mu/fss.dtx
@@ -17,6 +17,17 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{fithesis3/style/mu/fithesis3-fss}[2015/04/26]
% \end{macrocode}
+% The file redefines the colors used within the |thesis@tabular|
+% and |thesis@tabularx| environments and with the hyperlinks.
+% \begin{macrocode}
+\definecolor{thesis@color@faculty}{HTML}{007B69}
+\definecolor{thesis@color@facultylight}{HTML}{B8DAD5}
+\definecolor{thesis@color@facultyxlight}{HTML}{E3F1EE}
+\thesis@color@setup{%
+ links=thesis@color@faculty,%
+ tableOdd=thesis@color@facultyxlight,%
+ tableEven=thesis@color@facultylight}
+% \end{macrocode}
% In addition to the main locale, the file also requires the
% English locale.
% \begin{macrocode}
diff --git a/fithesis3/style/mu/law.dtx b/fithesis3/style/mu/law.dtx
index 2b043c0..de86b70 100644
--- a/fithesis3/style/mu/law.dtx
+++ b/fithesis3/style/mu/law.dtx
@@ -8,6 +8,17 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{fithesis3/style/mu/fithesis3-law}[2015/04/26]
% \end{macrocode}
+% The file redefines the colors used within the |thesis@tabular|
+% and |thesis@tabularx| environments and with the hyperlinks.
+% \begin{macrocode}
+\definecolor{thesis@color@faculty}{HTML}{80379B}
+\definecolor{thesis@color@facultylight}{HTML}{D3BADC}
+\definecolor{thesis@color@facultyxlight}{HTML}{F0E7F3}
+\thesis@color@setup{%
+ links=thesis@color@faculty,%
+ tableOdd=thesis@color@facultyxlight,%
+ tableEven=thesis@color@facultylight}
+% \end{macrocode}
% In addition to the main locale, the file also requires the
% English locale.
% \begin{macrocode}
diff --git a/fithesis3/style/mu/med.dtx b/fithesis3/style/mu/med.dtx
index 4e60bad..82dc472 100644
--- a/fithesis3/style/mu/med.dtx
+++ b/fithesis3/style/mu/med.dtx
@@ -9,6 +9,17 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{fithesis3/style/mu/fithesis3-med}[2015/04/27]
% \end{macrocode}
+% The file redefines the colors used within the |thesis@tabular|
+% and |thesis@tabularx| environments and with the hyperlinks.
+% \begin{macrocode}
+\definecolor{thesis@color@faculty}{HTML}{F2532D}
+\definecolor{thesis@color@facultylight}{HTML}{FFBFC2}
+\definecolor{thesis@color@facultyxlight}{HTML}{FFE3E5}
+\thesis@color@setup{%
+ links=thesis@color@faculty,%
+ tableOdd=thesis@color@facultyxlight,%
+ tableEven=thesis@color@facultylight}
+% \end{macrocode}
% In addition to the main locale, the file also requires the
% English locale.
% \begin{macrocode}
@@ -36,7 +47,7 @@
% cover.
% \begin{macrocode}
\def\thesis@blocks@cover{%
- \ifthesis@cover
+ \ifthesis@cover@
\thesis@blocks@clear
\begin{alwayssingle}
\thispagestyle{empty}
@@ -95,7 +106,7 @@
\def\thesis@blocks@frontMatter{%
\thesis@blocks@clear
% In case of double-sided typesetting, change the geometry
- \ifthesis@twoside
+ \ifthesis@twoside@
\geometry{top=25mm,bottom=20mm,left=35mm,
right=15mm, includeheadfoot}
\fi\pagestyle{empty}
diff --git a/fithesis3/style/mu/ped.dtx b/fithesis3/style/mu/ped.dtx
index 330acb2..8c7ccee 100644
--- a/fithesis3/style/mu/ped.dtx
+++ b/fithesis3/style/mu/ped.dtx
@@ -8,6 +8,17 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{fithesis3/style/mu/fithesis3-ped}[2015/04/26]
% \end{macrocode}
+% The file redefines the colors used within the |thesis@tabular|
+% and |thesis@tabularx| environments and with the hyperlinks.
+% \begin{macrocode}
+\definecolor{thesis@color@faculty}{HTML}{FFA02F}
+\definecolor{thesis@color@facultylight}{HTML}{FFDEB7}
+\definecolor{thesis@color@facultyxlight}{HTML}{FFF1E0}
+\thesis@color@setup{%
+ links=thesis@color@faculty,%
+ tableOdd=thesis@color@facultyxlight,%
+ tableEven=thesis@color@facultylight}
+% \end{macrocode}
% In addition to the main locale, the file also requires the
% English locale.
% \begin{macrocode}
diff --git a/fithesis3/style/mu/phil.dtx b/fithesis3/style/mu/phil.dtx
index a0fcf0d..d0222f5 100644
--- a/fithesis3/style/mu/phil.dtx
+++ b/fithesis3/style/mu/phil.dtx
@@ -8,6 +8,17 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{fithesis3/style/mu/fithesis3-phil}[2015/04/26]
% \end{macrocode}
+% The file redefines the colors used within the |thesis@tabular|
+% and |thesis@tabularx| environments and with the hyperlinks.
+% \begin{macrocode}
+\definecolor{thesis@color@faculty}{HTML}{00A1DE}
+\definecolor{thesis@color@facultylight}{HTML}{B8E4F5}
+\definecolor{thesis@color@facultyxlight}{HTML}{E0F3FA}
+\thesis@color@setup{%
+ links=thesis@color@faculty,%
+ tableOdd=thesis@color@facultyxlight,%
+ tableEven=thesis@color@facultylight}
+% \end{macrocode}
% The style file configures the title page header to include the
% department and the field name.
% \begin{macrocode}
diff --git a/fithesis3/style/mu/sci.dtx b/fithesis3/style/mu/sci.dtx
index d492718..6554389 100644
--- a/fithesis3/style/mu/sci.dtx
+++ b/fithesis3/style/mu/sci.dtx
@@ -6,7 +6,18 @@
% \url{http://www.sci.muni.cz/NW/predpisy/od/OD-2014-05.pdf}}.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fithesis3/style/mu/fithesis3-sci}[2015/04/12]
+\ProvidesPackage{fithesis3/style/mu/fithesis3-sci}[2015/05/02]
+% \end{macrocode}
+% The file redefines the colors used within the |thesis@tabular|
+% and |thesis@tabularx| environments and with the hyperlinks.
+% \begin{macrocode}
+\definecolor{thesis@color@faculty}{HTML}{00AF3F}
+\definecolor{thesis@color@facultylight}{HTML}{B8E8C9}
+\definecolor{thesis@color@facultyxlight}{HTML}{E0F5E8}
+\thesis@color@setup{%
+ links=thesis@color@faculty,%
+ tableOdd=thesis@color@facultyxlight,%
+ tableEven=thesis@color@facultylight}
% \end{macrocode}
% In addition to the main locale, the file also requires the
% Czech and English locales.
@@ -93,11 +104,13 @@
% Typeset the table
\renewcommand{\arraystretch}{2}
\begin{tabular}{@{}p{\@left}@{\hskip\@skip}p{\@right}@{}}
- \textbf{\thesis@czech@bib@author:} & \vtop{%
- \hbox{\strut\thesis@author}%
- \hbox{\strut\thesis@czech@facultyName,
- \thesis@czech@universityName}%
- \hbox{\strut\thesis@department}} \\
+ \textbf{\thesis@czech@bib@author:} &
+ \noindent\parbox[t]{\@right}{
+ \thesis@author\\
+ \thesis@czech@facultyName,
+ \thesis@czech@universityName\\
+ \thesis@department
+ }\\
\textbf{\thesis@czech@bib@thesisTitle:}
& \thesis@title \\
\textbf{\thesis@czech@bib@programme:}
@@ -193,11 +206,13 @@
% Typeset the table
\renewcommand{\arraystretch}{2}
\begin{tabular}{@{}p{\@left}@{\hskip\@skip}p{\@right}@{}}
- \textbf{\thesis@english@bib@author:} & \vtop{%
- \hbox{\strut\thesis@author}%
- \hbox{\strut\thesis@english@facultyName,
- \thesis@english@universityName}%
- \hbox{\strut\thesis@departmentEn}} \\
+ \textbf{\thesis@english@bib@author:} &
+ \noindent\parbox[t]{\@right}{
+ \thesis@author\\
+ \thesis@english@facultyName,
+ \thesis@english@universityName\\
+ \thesis@departmentEn
+ }\\
\textbf{\thesis@english@bib@thesisTitle:}
& \thesis@titleEn \\
\textbf{\thesis@english@bib@programme:}
@@ -237,9 +252,9 @@
% cover.
% \begin{macrocode}
\def\thesis@blocks@cover{%
- \ifthesis@cover
+ \ifthesis@cover@
\thesis@blocks@clear
- \ifthesis@twoside\@twosidefalse\fi % Temporarily disable twoside
+ \ifthesis@twoside@\@twosidefalse\fi % Temporarily disable twoside
\begin{alwayssingle}
\thispagestyle{empty}
\begin{center}
@@ -253,7 +268,7 @@
\ \thesis@year\hfill\thesis@author}
\end{center}
\end{alwayssingle}
- \ifthesis@twoside\@twosidetrue\fi % Re-enable twoside
+ \ifthesis@twoside@\@twosidetrue\fi % Re-enable twoside
\fi}
% \end{macrocode}
% \end{macro}\begin{macro}{\thesis@blocks@titlePage}
@@ -261,9 +276,9 @@
% title page.
% \begin{macrocode}
\def\thesis@blocks@titlePage{{%
- \edef\thesis@logopath@color{\thesis@logopath\ifthesis@color color/\fi}
+ \edef\thesis@logopath@color{\thesis@logopath\ifthesis@color@ color/\fi}
\thesis@blocks@clear
- \ifthesis@twoside\@twosidefalse\fi % Temporarily disable twoside
+ \ifthesis@twoside@\@twosidefalse\fi % Temporarily disable twoside
\begin{alwayssingle}
\thispagestyle{empty}
% The top of the page
@@ -300,7 +315,7 @@
\fi%
\thesis@place\ \thesis@year}
\end{alwayssingle}
- \ifthesis@twoside\@twosidetrue\fi}} % Re-enable twoside
+ \ifthesis@twoside@\@twosidetrue\fi}} % Re-enable twoside
% \end{macrocode}
% \end{macro}
% The style file defines the autolayout preamble as the cover and
diff --git a/fithesis3/test/econ-tables.tex b/fithesis3/test/econ-tables.tex
new file mode 100644
index 0000000..68640ab
--- /dev/null
+++ b/fithesis3/test/econ-tables.tex
@@ -0,0 +1,15 @@
+\documentclass[color]{../fithesis3}
+\usepackage[english]{babel}
+\usepackage{tabularx}
+\thesissetup{
+ basepath=..,
+ faculty=econ
+}
+\begin{document}
+ \begin{thesis@tabular}{cc}
+ a&b\\c&d
+ \end{thesis@tabular}
+ \begin{thesis@tabularx}{\textwidth}{cc}
+ a&b\\c&d
+ \end{thesis@tabularx}
+\end{document}
diff --git a/fithesis3/test/fi-tables.tex b/fithesis3/test/fi-tables.tex
new file mode 100644
index 0000000..314101b
--- /dev/null
+++ b/fithesis3/test/fi-tables.tex
@@ -0,0 +1,15 @@
+\documentclass[color]{../fithesis3}
+\usepackage[english]{babel}
+\usepackage{tabularx}
+\thesissetup{
+ basepath=..,
+ faculty=fi
+}
+\begin{document}
+ \begin{thesis@tabular}{cc}
+ a&b\\c&d
+ \end{thesis@tabular}
+ \begin{thesis@tabularx}{\textwidth}{cc}
+ a&b\\c&d
+ \end{thesis@tabularx}
+\end{document}
diff --git a/fithesis3/test/fsps-tables.tex b/fithesis3/test/fsps-tables.tex
new file mode 100644
index 0000000..b869b54
--- /dev/null
+++ b/fithesis3/test/fsps-tables.tex
@@ -0,0 +1,15 @@
+\documentclass[color]{../fithesis3}
+\usepackage[english]{babel}
+\usepackage{tabularx}
+\thesissetup{
+ basepath=..,
+ faculty=fsps
+}
+\begin{document}
+ \begin{thesis@tabular}{cc}
+ a&b\\c&d
+ \end{thesis@tabular}
+ \begin{thesis@tabularx}{\textwidth}{cc}
+ a&b\\c&d
+ \end{thesis@tabularx}
+\end{document}
diff --git a/fithesis3/test/fss-tables.tex b/fithesis3/test/fss-tables.tex
new file mode 100644
index 0000000..379feca
--- /dev/null
+++ b/fithesis3/test/fss-tables.tex
@@ -0,0 +1,15 @@
+\documentclass[color]{../fithesis3}
+\usepackage[english]{babel}
+\usepackage{tabularx}
+\thesissetup{
+ basepath=..,
+ faculty=fss
+}
+\begin{document}
+ \begin{thesis@tabular}{cc}
+ a&b\\c&d
+ \end{thesis@tabular}
+ \begin{thesis@tabularx}{\textwidth}{cc}
+ a&b\\c&d
+ \end{thesis@tabularx}
+\end{document}
diff --git a/fithesis3/test/law-tables.tex b/fithesis3/test/law-tables.tex
new file mode 100644
index 0000000..e36c33c
--- /dev/null
+++ b/fithesis3/test/law-tables.tex
@@ -0,0 +1,15 @@
+\documentclass[color]{../fithesis3}
+\usepackage[english]{babel}
+\usepackage{tabularx}
+\thesissetup{
+ basepath=..,
+ faculty=law
+}
+\begin{document}
+ \begin{thesis@tabular}{cc}
+ a&b\\c&d
+ \end{thesis@tabular}
+ \begin{thesis@tabularx}{\textwidth}{cc}
+ a&b\\c&d
+ \end{thesis@tabularx}
+\end{document}
diff --git a/fithesis3/test/med-tables.tex b/fithesis3/test/med-tables.tex
new file mode 100644
index 0000000..bf51d5f
--- /dev/null
+++ b/fithesis3/test/med-tables.tex
@@ -0,0 +1,15 @@
+\documentclass[color]{../fithesis3}
+\usepackage[english]{babel}
+\usepackage{tabularx}
+\thesissetup{
+ basepath=..,
+ faculty=med
+}
+\begin{document}
+ \begin{thesis@tabular}{cc}
+ a&b\\c&d
+ \end{thesis@tabular}
+ \begin{thesis@tabularx}{\textwidth}{cc}
+ a&b\\c&d
+ \end{thesis@tabularx}
+\end{document}
diff --git a/fithesis3/test/ped-tables.tex b/fithesis3/test/ped-tables.tex
new file mode 100644
index 0000000..7ccc86d
--- /dev/null
+++ b/fithesis3/test/ped-tables.tex
@@ -0,0 +1,15 @@
+\documentclass[color]{../fithesis3}
+\usepackage[english]{babel}
+\usepackage{tabularx}
+\thesissetup{
+ basepath=..,
+ faculty=ped
+}
+\begin{document}
+ \begin{thesis@tabular}{cc}
+ a&b\\c&d
+ \end{thesis@tabular}
+ \begin{thesis@tabularx}{\textwidth}{cc}
+ a&b\\c&d
+ \end{thesis@tabularx}
+\end{document}
diff --git a/fithesis3/test/phil-tables.tex b/fithesis3/test/phil-tables.tex
new file mode 100644
index 0000000..a1ab21f
--- /dev/null
+++ b/fithesis3/test/phil-tables.tex
@@ -0,0 +1,15 @@
+\documentclass[color]{../fithesis3}
+\usepackage[english]{babel}
+\usepackage{tabularx}
+\thesissetup{
+ basepath=..,
+ faculty=phil
+}
+\begin{document}
+ \begin{thesis@tabular}{cc}
+ a&b\\c&d
+ \end{thesis@tabular}
+ \begin{thesis@tabularx}{\textwidth}{cc}
+ a&b\\c&d
+ \end{thesis@tabularx}
+\end{document}
diff --git a/fithesis3/test/sci-czech.tex b/fithesis3/test/sci-czech.tex
new file mode 100644
index 0000000..75f608b
--- /dev/null
+++ b/fithesis3/test/sci-czech.tex
@@ -0,0 +1,9 @@
+\documentclass[monochrome]{../fithesis3}
+\usepackage[czech]{babel}
+\thesissetup{
+ basepath=..,
+ faculty=sci
+}
+\begin{document}
+ foo bar
+\end{document}
\ No newline at end of file
diff --git a/fithesis3/test/sci-english.tex b/fithesis3/test/sci-english.tex
new file mode 100644
index 0000000..4b552ac
--- /dev/null
+++ b/fithesis3/test/sci-english.tex
@@ -0,0 +1,9 @@
+\documentclass[monochrome]{../fithesis3}
+\usepackage[english]{babel}
+\thesissetup{
+ basepath=..,
+ faculty=sci
+}
+\begin{document}
+ foo bar
+\end{document}
\ No newline at end of file
diff --git a/fithesis3/test/sci-slovak.tex b/fithesis3/test/sci-slovak.tex
new file mode 100644
index 0000000..708708b
--- /dev/null
+++ b/fithesis3/test/sci-slovak.tex
@@ -0,0 +1,9 @@
+\documentclass[monochrome]{../fithesis3}
+\usepackage[slovak]{babel}
+\thesissetup{
+ basepath=..,
+ faculty=sci
+}
+\begin{document}
+ foo bar
+\end{document}
\ No newline at end of file
--
GitLab