From 31b06222a4dc67bedcda468e5fc1da14fd94dcf4 Mon Sep 17 00:00:00 2001
From: witiko <witiko@gmail.com>
Date: Sun, 26 Apr 2015 21:21:34 +0200
Subject: [PATCH] Added the style file of the Faculty of Law.
---
fithesis.dtx | 4 +++
locale/czech.dtx | 27 ++++++++++-----
locale/english.dtx | 11 +++---
locale/slovak.dtx | 24 +++++++++----
style/mu/Makefile | 4 +--
style/mu/base.dtx | 60 +++++++++++++++++++++++---------
style/mu/fss.dtx | 5 ++-
style/mu/law.dtx | 82 ++++++++++++++++++++++++++++++++++++++++++++
style/mu/law.ins | 3 ++
test/law-czech.tex | 9 +++++
test/law-english.tex | 9 +++++
test/law-slovak.tex | 9 +++++
12 files changed, 208 insertions(+), 39 deletions(-)
create mode 100644 style/mu/law.dtx
create mode 100644 style/mu/law.ins
create mode 100644 test/law-czech.tex
create mode 100644 test/law-english.tex
create mode 100644 test/law-slovak.tex
diff --git a/fithesis.dtx b/fithesis.dtx
index 14859c0..98cd505 100644
--- a/fithesis.dtx
+++ b/fithesis.dtx
@@ -1191,6 +1191,8 @@
% placeholder acknowledgement text
% \item|\thesis@|\textit{locale}|@declaration| -- The declaration
% text
+% \item|\thesis@|\textit{locale}|@fieldTitle| -- The title of
+% the field of study entry
% \item|\thesis@|\textit{locale}|@advisorTitle| -- The title of
% the advisor
% \item|\thesis@|\textit{locale}|@abstractTitle| -- The title of
@@ -1269,3 +1271,5 @@
% \input{style/mu/ped.dtx}
% \subsubsection{The style files of the Faculty of Social Studies}
% \input{style/mu/fss.dtx}
+% \subsubsection{The style files of the Faculty of Law}
+% \input{style/mu/law.dtx}
diff --git a/locale/czech.dtx b/locale/czech.dtx
index 7bdce73..1bbe019 100644
--- a/locale/czech.dtx
+++ b/locale/czech.dtx
@@ -36,6 +36,7 @@
\def\thesis@czech@declaration{Text prohlášenà ...}
% Různé
+\def\thesis@czech@fieldTitle{Obor}
\def\thesis@czech@advisorTitle{Vedoucà práce}
\def\thesis@czech@abstractTitle{ShrnutĂ}
\def\thesis@czech@keywordsTitle{KlĂÄŤová slova}
@@ -44,7 +45,7 @@
\def\thesis@czech@winter{Jaro}
\def\thesis@czech@summer{Podzim}
\def\thesis@czech@semester{%
- \thesis@{slovak@\thesis@season}\ \thesis@year}
+ \thesis@{czech@\thesis@season}\ \thesis@year}
\def\thesis@czech@typeName{%
\ifx\thesis@type\thesis@bachelors%
Bakalářská práce%
@@ -93,12 +94,21 @@
% \fi\file{locale/mu/law/czech.def}
% This is the Czech locale file specific to the Faculty of Law at
% University in Brno. It replaces the \texttt{facultyName}
-% placeholder with the correct value.
+% placeholder with the correct value and replaces the
+% \texttt{abstractTitle} and \texttt{placeholders@abstract}
+% strings in accordance with the requirements of the faculty.
% \iffalse
%<*mu/law>
% \fi\begin{macrocode}
-\ProvidesFile{fithesis3/locale/mu/law/czech.def}[2015/04/18]
-\def\thesis@czech@facultyName{Právnická fakulta}
+\ProvidesFile{fithesis3/locale/mu/law/czech.def}[2015/04/26]
+
+% RĹŻzne
+\def\thesis@czech@abstractTitle{Abstrakt}
+
+% Zástupné texty
+\def\thesis@czech@placeholders@abstract{Text abstraktu}
+\def\thesis@czech@facultyName{Právnická fakulta Masarykovy
+ univerzity}
% \end{macrocode}\iffalse
%</mu/law>
% \fi\file{locale/mu/fsps/czech.def}
@@ -115,7 +125,8 @@
% \fi\file{locale/mu/fss/czech.def}
% This is the Czech locale file specific to the Faculty of Social
% Studies at the Masaryk University in Brno. It replaces the
-% \texttt{facultyName} placeholder with the correct value.
+% \texttt{facultyName} and \texttt{placeholders@assignment}
+% strings with the correct value.
% \iffalse
%<*mu/fss>
% \fi\begin{macrocode}
@@ -163,7 +174,7 @@
% requirements of the faculty. The file also defines the
% \texttt{advisorSignature} string required by the
% |\thesis@blocks@titlePage| block defined within the
-% \texttt{style/mu/fi.sty} style file.
+% \texttt{style/mu/fithesis3-fi.sty} style file.
% \iffalse
%<*mu/fi>
% \fi\begin{macrocode}
@@ -237,7 +248,7 @@
% correct value. The file also defines the
% \texttt{bib@title} and \texttt{bib@pages} strings required by the
% |\thesis@blocks@bibEntry| block defined within the
-% \texttt{style/mu/ped.sty} style file.
+% \texttt{style/mu/fithesis3-ped.sty} style file.
% \iffalse
%<*mu/ped>
% \fi\begin{macrocode}
@@ -256,7 +267,7 @@
% Science at the Masaryk University in Brno.
% It defines the private macros required by the
% |\thesis@blocks@bibEntry| block defined within the
-% \texttt{style/mu/sci.sty} style file.
+% \texttt{style/mu/fithesis3-sci.sty} style file.
% It also replaces the \texttt{facultyName} and
% \texttt{placeholders@department} placeholders with the
% correct value and redefines the \texttt{abstractTitle},
diff --git a/locale/english.dtx b/locale/english.dtx
index fff4578..1a9f63c 100644
--- a/locale/english.dtx
+++ b/locale/english.dtx
@@ -26,6 +26,7 @@
\def\thesis@english@declaration{Declaration text ...}
% Miscellaneous
+\def\thesis@english@fieldTitle{Field of study}
\def\thesis@english@advisorTitle{Advisor}
\def\thesis@english@abstractTitle{Abstract}
\def\thesis@english@keywordsTitle{Keywords}
@@ -74,7 +75,8 @@
%<*mu/law>
% \fi\begin{macrocode}
\ProvidesFile{fithesis3/locale/mu/law/english.def}[2015/04/18]
-\def\thesis@english@facultyName{Faculty of Law}
+\def\thesis@english@facultyName{The Faculty of Law of the Masaryk
+ University}
% \end{macrocode}\iffalse
%</mu/law>
% \fi\file{locale/mu/fsps/english.def}
@@ -91,7 +93,8 @@
% \fi\file{locale/mu/fss/english.def}
% This is the English locale file specific to the Faculty of Social
% Studies at the Masaryk University in Brno. It replaces the
-% \texttt{facultyName} placeholder with the correct value.
+% \texttt{facultyName} and \texttt{placeholders@assignment}
+% strings with the correct value.
% \iffalse
%<*mu/fss>
% \fi\begin{macrocode}
@@ -138,7 +141,7 @@
% string in accordance with the requirements of the faculty.
% The file also defines the \texttt{advisorSignature} string
% required by the |\thesis@blocks@titlePage| block defined
-% within the \texttt{style/mu/fi.sty} style file.
+% within the \texttt{style/mu/fithesis3-fi.sty} style file.
% \iffalse
%<*mu/fi>
% \fi\begin{macrocode}
@@ -190,7 +193,7 @@
% Science at the Masaryk University in Brno.
% It defines the private macros required by the
% |\thesis@blocks@bibEntryEn| block defined within the
-% \texttt{style/mu/sci.sty} style file.
+% \texttt{style/mu/fithesis3-sci.sty} style file.
% It also replaces the \texttt{facultyName} placeholder with the
% correct value and redefines the \texttt{advisorTitle} string in
% accordance with the formal requirements of the faculty.
diff --git a/locale/slovak.dtx b/locale/slovak.dtx
index 60cd4a5..e056a43 100644
--- a/locale/slovak.dtx
+++ b/locale/slovak.dtx
@@ -34,6 +34,7 @@
\def\thesis@slovak@declaration{Text prehlásenie ...}
% RĂ´zne
+\def\thesis@slovak@fieldTitle{Odbor}
\def\thesis@slovak@advisorTitle{Vedúci práce}
\def\thesis@slovak@abstractTitle{Zhrnutie}
\def\thesis@slovak@keywordsTitle{Kľúčové slová}
@@ -91,12 +92,22 @@
% \fi\file{locale/mu/law/slovak.def}
% This is the Slovak locale file specific to the Faculty of Law at
% the Masaryk University in Brno. It replaces the
-% \texttt{facultyName} placeholder with the correct value.
+% \texttt{facultyName} placeholder with the correct value and
+% replaces the \texttt{abstractTitle} and
+% \texttt{placeholders@abstract} strings in accordance with the
+% requirements of the faculty.
% \iffalse
%<*mu/law>
% \fi\begin{macrocode}
-\ProvidesFile{fithesis3/locale/mu/law/slovak.def}[2015/04/18]
-\def\thesis@slovak@facultyName{Právnická fakulta}
+\ProvidesFile{fithesis3/locale/mu/law/slovak.def}[2015/04/26]
+
+% RĂ´zne
+\def\thesis@slovak@abstractTitle{Abstrakt}
+
+% Zástupné texty
+\def\thesis@slovak@placeholders@abstract{Text abstraktu}
+\def\thesis@slovak@facultyName{Právnická fakulta Masarykovej
+ univerzity}
% \end{macrocode}\iffalse
%</mu/law>
% \fi\file{locale/mu/fsps/slovak.def}
@@ -113,7 +124,8 @@
% \fi\file{locale/mu/fss/slovak.def}
% This is the Slovak locale file specific to the Faculty of Social
% Studies at the Masaryk University in Brno. It replaces the
-% \texttt{facultyName} placeholder with the correct value.
+% \texttt{facultyName} and \texttt{placeholders@assignment}
+% strings with the correct value.
% \iffalse
%<*mu/fss>
% \fi\begin{macrocode}
@@ -160,7 +172,7 @@
% requirements of the faculty. The file also defines the
% \texttt{advisorSignature} string required by the
% |\thesis@blocks@titlePage| block defined within the
-% \texttt{style/mu/fi.sty} style file.
+% \texttt{style/mu/fithesis3-fi.sty} style file.
% \iffalse
%<*mu/fi>
% \fi\begin{macrocode}
@@ -236,7 +248,7 @@
% correct value. The file also defines the
% \texttt{bib@title} and \texttt{bib@pages} strings required by the
% |\thesis@blocks@bibEntry| block defined within the
-% \texttt{style/mu/ped.sty} style file.
+% \texttt{style/mu/fithesis3-ped.sty} style file.
% \iffalse
%<*mu/ped>
% \fi\begin{macrocode}
diff --git a/style/mu/Makefile b/style/mu/Makefile
index 28023b6..3bae949 100644
--- a/style/mu/Makefile
+++ b/style/mu/Makefile
@@ -1,5 +1,5 @@
-LOGS=base.log fi.log sci.log phil.log ped.log fss.log
-OUTPUT=fithesis3-base.sty fithesis3-1[012].clo fithesis3-fi.sty fithesis3-sci.sty fithesis3-phil.sty fithesis3-ped.sty fithesis3-fss.sty
+LOGS=base.log fi.log sci.log phil.log ped.log fss.log law.log
+OUTPUT=fithesis3-base.sty fithesis3-1[012].clo fithesis3-fi.sty fithesis3-sci.sty fithesis3-phil.sty fithesis3-ped.sty fithesis3-fss.sty fithesis3-law.sty
.PHONY: explode implode all
all: explode
diff --git a/style/mu/base.dtx b/style/mu/base.dtx
index 1d5f2e4..8c7a6e0 100644
--- a/style/mu/base.dtx
+++ b/style/mu/base.dtx
@@ -121,6 +121,7 @@
% of the front matter of the thesis.
% \begin{macrocode}
\def\thesis@blocks@frontMatter{%
+ \thesis@blocks@clear
\pagestyle{plain}
\parindent 1.5em
\setcounter{page}{1}
@@ -180,6 +181,14 @@
% The output of the |\thesis@blocks@cover@header| private macro is
% controlled by the following conditional expressions:
% \begin{enumerate}
+% \item|\ifthesis@blocks@cover@university@| -- This
+% conditional expression determines, whether the university
+% name is going to be included in the header of the cover.
+% The default value of this conditional expression is true.
+% \item|\ifthesis@blocks@cover@faculty@| -- This
+% conditional expression determines, whether the faculty
+% name is going to be included in the header of the cover.
+% The default value of this conditional expression is true.
% \item|\ifthesis@blocks@cover@department@| -- This
% conditional expression determines, whether the department
% name is going to be included in the header of the cover.
@@ -194,19 +203,26 @@
% |\thesis@blocks@cover@header| private macro without altering its
% definition.
% \begin{macrocode}
+\newif\ifthesis@blocks@cover@university@
+\thesis@blocks@cover@university@true
+\newif\ifthesis@blocks@cover@faculty@
+\thesis@blocks@cover@faculty@true
\newif\ifthesis@blocks@cover@department@
\thesis@blocks@cover@department@false
\newif\ifthesis@blocks@cover@field@
\thesis@blocks@cover@field@false
\def\thesis@blocks@cover@header{%
- {\sc\thesis@titlePage@LARGE\thesis@@{universityName}\\%
- \thesis@titlePage@Large\thesis@@{facultyName}\\%
- \ifthesis@blocks@cover@department@%
- \vskip 0.3em\thesis@titlePage@large\thesis@department%
+ {\sc\ifthesis@blocks@cover@university@%
+ \thesis@titlePage@LARGE\thesis@@{universityName}\\%
+ \fi\ifthesis@blocks@cover@faculty@%
+ \thesis@titlePage@Large\thesis@@{facultyName}\\%
+ \fi\ifthesis@blocks@cover@department@%
+ \thesis@titlePage@large\thesis@department\\%
\fi}
\ifthesis@blocks@cover@field@%
- {\thesis@titlePage@large\vskip 0.2em\thesis@field}
+ {\thesis@titlePage@large\vskip 2em%
+ {\bf\thesis@@{fieldTitle}:} \thesis@field}%
\fi\vskip 2em}
\def\thesis@blocks@cover@content{%
{\thesis@titlePage@Huge\bf\thesis@TeXtitle\par\vfil}%
@@ -252,6 +268,16 @@
% The output of the |\thesis@blocks@titlePage@header| private macro is
% controlled by the following conditional expressions:
% \begin{enumerate}
+% \item|\ifthesis@blocks@titlePage@university@| -- This
+% conditional expression determines, whether the university
+% name is going to be included in the header of the title
+% page. The default value of this conditional expression is
+% true.
+% \item|\ifthesis@blocks@titlePage@faculty@| -- This
+% conditional expression determines, whether the faculty of
+% study is going to be included in the header of the title
+% page.
+% The default value of this conditional expression is true.
% \item|\ifthesis@blocks@titlePage@department@| -- This
% conditional expression determines, whether the department
% name is going to be included in the header of the title
@@ -268,19 +294,26 @@
% |\thesis@blocks@titlePage@header| private macro without altering
% its definition.
% \begin{macrocode}
+\newif\ifthesis@blocks@titlePage@university@
+\thesis@blocks@titlePage@university@true
+\newif\ifthesis@blocks@titlePage@faculty@
+\thesis@blocks@titlePage@faculty@true
\newif\ifthesis@blocks@titlePage@department@
\thesis@blocks@titlePage@department@false
\newif\ifthesis@blocks@titlePage@field@
\thesis@blocks@titlePage@field@false
\def\thesis@blocks@titlePage@header{%
- {\sc\thesis@titlePage@LARGE\thesis@@{universityName}\\%
- \thesis@titlePage@Large\thesis@@{facultyName}\\%
- \ifthesis@blocks@titlePage@department@%
- \vskip 0.3em\thesis@titlePage@large\thesis@department\\%
+ {\sc\ifthesis@blocks@titlePage@university@%
+ \thesis@titlePage@LARGE\thesis@@{universityName}\\%
+ \fi\ifthesis@blocks@titlePage@faculty@%
+ \thesis@titlePage@Large\thesis@@{facultyName}\\%
+ \fi\ifthesis@blocks@titlePage@department@%
+ \thesis@titlePage@large\thesis@department\\%
\fi}
\ifthesis@blocks@titlePage@field@%
- {\thesis@titlePage@large\vskip 0.2em\thesis@field}
+ {\thesis@titlePage@large\vskip 2em%
+ {\bf\thesis@@{fieldTitle}:} \thesis@field}%
\fi\vskip 2em}
\let\thesis@blocks@titlePage@content=\thesis@blocks@cover@content
\let\thesis@blocks@titlePage@footer=\thesis@blocks@cover@footer
@@ -320,9 +353,8 @@
\ifx\thesis@thanks\undefined\else%
\thesis@blocks@clear%
\begin{alwayssingle}%
- \chapter*{\thesis@@{thanksTitle}}%
+ \chapter*{\vspace*{\fill}\thesis@@{thanksTitle}}%
\thesis@thanks%
- \par\vfill%
\end{alwayssingle}%
\fi}
% \end{macrocode}
@@ -409,10 +441,6 @@
\thesis@blocks@clear
\fi}
% \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.
-%
% \end{macro}\begin{macro}{\thesis@blocks@mainMatter}
% The |\thesis@blocks@mainMatter| private macro sets up the style
% of the main matter of the thesis.
diff --git a/style/mu/fss.dtx b/style/mu/fss.dtx
index 9c3bb51..224a6ef 100644
--- a/style/mu/fss.dtx
+++ b/style/mu/fss.dtx
@@ -4,7 +4,7 @@
% inexistence of faculty-wide formal requirements and
% recommendations with each department defining their own with
% varying degrees of
-% rigour\footnote{\url{http://psych.fss.muni.cz/node/351},
+% rigour\footnote{See \url{http://psych.fss.muni.cz/node/351},
% \url{http://medzur.fss.muni.cz/informace-pro-studenty/pravidla^^A
% -pro-diplomky/soubory/Pravidla pro zaverecne prace na KMSZ - v^^A
% er. 2-83.doc}, \url{http://soc.fss.muni.cz/?q=node/44}, \url{h^^A
@@ -26,8 +26,7 @@
% the title page followed by the abstracts, keywords, assignment,
% declaration, acknowledgement, table of contents and
% list of tables and figures as a part of the front matter. All
-% blocks beside |\thesis@blocks@bibEntry| are defined in the
-% \texttt{style/mu/base.sty} file.
+% blocks are defined in the \texttt{style/mu/base.sty} file.
% \begin{macrocode}
\def\thesis@preamble{%
\thesis@blocks@cover%
diff --git a/style/mu/law.dtx b/style/mu/law.dtx
new file mode 100644
index 0000000..2b043c0
--- /dev/null
+++ b/style/mu/law.dtx
@@ -0,0 +1,82 @@
+% \file{style/mu/fithesis3-law.sty}
+% 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
+% website of the faculty\footnote{See \url{https://is.muni.cz/d^^A
+% o/law/ud/predp/smer/S-07-2012.pdf}}.
+% \begin{macrocode}
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{fithesis3/style/mu/fithesis3-law}[2015/04/26]
+% \end{macrocode}
+% In addition to the main locale, the file also requires the
+% English locale.
+% \begin{macrocode}
+\thesis@requireLocale{english}
+% \end{macrocode}
+% The style file configures the cover header to include only the
+% faculty name and the department name and the title page header to
+% include only the faculty name, the department name and the name
+% of the field of study.
+% \begin{macrocode}
+\thesis@blocks@cover@university@false
+\thesis@blocks@cover@department@true
+\thesis@blocks@cover@field@false
+\thesis@blocks@titlePage@university@false
+\thesis@blocks@titlePage@department@true
+\thesis@blocks@titlePage@field@true
+% \end{macrocode}
+% \begin{macro}{\thesis@blocks@frontMatter}
+% The |\thesis@blocks@frontMatter| private macro sets up the style
+% of the front matter of the thesis. The page numbering is arabic
+% as per the formal requirements.
+% \begin{macrocode}
+\def\thesis@blocks@frontMatter{%
+ \thesis@blocks@clear
+ \pagestyle{plain}
+ \parindent 1.5em
+ \setcounter{page}{1}
+ \pagenumbering{arabic}}
+% \end{macrocode}
+% \end{macro}\begin{macro}{\thesis@blocks@mainMatter}
+% The |\thesis@blocks@mainMatter| private 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
+% requirements.
+% \begin{macrocode}
+\def\thesis@blocks@mainMatter{%
+ \thesis@blocks@clear
+ \pagestyle{thesisheadings}
+ \parindent 1.5em\relax}
+% \end{macrocode}
+% \end{macro}
+% The style file configures the title page header to include the
+% department name.
+% \begin{macrocode}
+\thesis@blocks@titlePage@department@true
+% \end{macrocode}
+% The style file defines the autolayout preamble as the cover and
+% the title page followed by the declaration, abstracts, keywords,
+% acknowledgement, table of contents and list of tables and figures
+% as a part of the front matter. All blocks are defined in the
+% \texttt{style/mu/base.sty} file.
+% \begin{macrocode}
+\def\thesis@preamble{%
+ \thesis@blocks@cover%
+ \thesis@blocks@titlePage%
+ \thesis@blocks@frontMatter%
+ \thesis@blocks@declaration%
+ \thesis@blocks@abstract%
+ \thesis@blocks@abstractEn%
+ \thesis@blocks@keywords%
+ \thesis@blocks@keywordsEn%
+ \thesis@blocks@thanks%
+ \thesis@blocks@tables%
+ \thesis@blocks@mainMatter}
+% \end{macrocode}
+% The style file defines the autolayout postamble as the
+% assignment. This block is defined in the
+% \texttt{style/mu/base.sty} file.
+% \begin{macrocode}
+\def\thesis@postamble{%
+ \thesis@blocks@assignment}
+% \end{macrocode}
diff --git a/style/mu/law.ins b/style/mu/law.ins
new file mode 100644
index 0000000..956107a
--- /dev/null
+++ b/style/mu/law.ins
@@ -0,0 +1,3 @@
+\input ../../docstrip.cfg
+\generate{\file{fithesis3-law.sty}{\from{law.dtx}{}}}
+\endbatchfile
diff --git a/test/law-czech.tex b/test/law-czech.tex
new file mode 100644
index 0000000..ffae491
--- /dev/null
+++ b/test/law-czech.tex
@@ -0,0 +1,9 @@
+\documentclass[monochrome]{../fithesis3}
+\usepackage[czech]{babel}
+\thesissetup{
+ basepath=..,
+ faculty=law
+}
+\begin{document}
+ foo bar
+\end{document}
\ No newline at end of file
diff --git a/test/law-english.tex b/test/law-english.tex
new file mode 100644
index 0000000..463b387
--- /dev/null
+++ b/test/law-english.tex
@@ -0,0 +1,9 @@
+\documentclass[monochrome]{../fithesis3}
+\usepackage[english]{babel}
+\thesissetup{
+ basepath=..,
+ faculty=law
+}
+\begin{document}
+ foo bar
+\end{document}
\ No newline at end of file
diff --git a/test/law-slovak.tex b/test/law-slovak.tex
new file mode 100644
index 0000000..919a2c8
--- /dev/null
+++ b/test/law-slovak.tex
@@ -0,0 +1,9 @@
+\documentclass[monochrome]{../fithesis3}
+\usepackage[slovak]{babel}
+\thesissetup{
+ basepath=..,
+ faculty=law
+}
+\begin{document}
+ foo bar
+\end{document}
\ No newline at end of file
--
GitLab