From b20dcfedf170dc0f6f731e5efaefdfedc91c6980 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Novotn=C3=BD?= <witiko@mail.muni.cz>
Date: Fri, 2 Jun 2017 22:59:52 +0200
Subject: [PATCH] =?UTF-8?q?Defined=20`\thesis@blocks@bibEntry`=20for=20mu/?=
=?UTF-8?q?econ=20by=20example=20documents.=20The=20patch=20was=20submitte?=
=?UTF-8?q?d=20by=20Jana=20Ratajsk=C3=A1.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
locale/czech.dtx | 33 +++++++++++++++++++++++++++------
locale/english.dtx | 34 +++++++++++++++++++++++++++-------
locale/slovak.dtx | 33 +++++++++++++++++++++++++++------
style/mu/econ.dtx | 39 ++++++++++++++++++++++++++++++++++++++-
4 files changed, 119 insertions(+), 20 deletions(-)
diff --git a/locale/czech.dtx b/locale/czech.dtx
index 8aee8e6..a36490d 100644
--- a/locale/czech.dtx
+++ b/locale/czech.dtx
@@ -137,7 +137,7 @@
% \iffalse
%<*mu>
% \fi\begin{macrocode}
-\ProvidesFile{fithesis/locale/mu/fithesis-czech.def}[2016/03/22]
+\ProvidesFile{fithesis/locale/mu/fithesis-czech.def}[2017/06/02]
% Zástupné texty
\gdef\thesis@czech@universityName{Masarykova univerzita}
@@ -150,6 +150,16 @@
% Bibliografický záznam
\gdef\thesis@czech@bib@title{Bibliografický záznam}
\gdef\thesis@czech@bib@pages{str}
+% \end{macrocode}
+% \changes{v0.3.46}{2017/06/02}{Lifted the \texttt{bib@author},
+% \texttt{bib@thesisTitle}, and \texttt{bib@advisor} strings from
+% \texttt{locale/mu/sci/*.def} to \texttt{locale/mu/*.def},
+% so that they can be shared with \texttt{locale/mu/econ/*.def}.
+% [VN]}
+% \begin{macrocode}
+\global\let\thesis@czech@bib@author\thesis@czech@authorTitle
+\gdef\thesis@czech@bib@thesisTitle{Název práce}
+\global\let\thesis@czech@bib@advisor\thesis@czech@advisorTitle
% Různé
\gdef\thesis@czech@idTitle{UÄŚO}
@@ -231,7 +241,10 @@
% It replaces the \texttt{facultyName} and \texttt{abstractTitle}
% placeholders with the correct values. The locale file also
% redefines the \texttt{declaration} string in accordance with
-% the requirements of the faculty.
+% the requirements of the faculty and defines the private macros
+% required by the |\thesis@blocks@|\discretionary{}{}{}|bibEntry|
+% block defined within the \texttt{style/mu/fithesis-econ.sty}
+% style file.
% \iffalse
%<*mu/econ>
% \fi\begin{macrocode}
@@ -240,6 +253,17 @@
% Zástupné texty
\gdef\thesis@czech@facultyName{Ekonomicko-správnà fakulta}
+% Bibliografický záznam
+% \end{macrocode}
+% \changes{v0.3.46}{2017/06/02}{Defined strings required by
+% \cs{thesis@blocks@bibEntry} from
+% \texttt{style/mu/fithesis-econ.sty} in
+% \texttt{locale/mu/econ/*.def}. [VN]}
+% \begin{macrocode}
+\gdef\thesis@czech@bib@thesisTitleEn{Název práce v angličtině}
+\gdef\thesis@czech@bib@department{Katedra}
+\gdef\thesis@czech@bib@year{Rok obhajoby}
+
% Různé
% \end{macrocode}
% \changes{v0.3.46}{2017/06/02}{Updated the
@@ -424,7 +448,7 @@
% \iffalse
%<*mu/sci>
% \fi\begin{macrocode}
-\ProvidesFile{fithesis/locale/mu/sci/fithesis-czech.def}[2017/05/15]
+\ProvidesFile{fithesis/locale/mu/sci/fithesis-czech.def}[2017/06/02]
% Zástupné texty
\gdef\thesis@czech@facultyName{PĹ™ĂrodovÄ›decká fakulta}
@@ -438,11 +462,8 @@
citovány.}
% Bibliografický záznam
-\global\let\thesis@czech@bib@author\thesis@czech@authorTitle
-\gdef\thesis@czech@bib@thesisTitle{Název práce}
\gdef\thesis@czech@bib@programme{StudijnĂ program}
\global\let\thesis@czech@bib@field\thesis@czech@fieldTitle
-\global\let\thesis@czech@bib@advisor\thesis@czech@advisorTitle
\gdef\thesis@czech@bib@academicYear{AkademickĂ˝ rok}
\gdef\thesis@czech@bib@pages{PoÄŤet stran}
\global\let\thesis@czech@bib@keywords\thesis@czech@keywordsTitle
diff --git a/locale/english.dtx b/locale/english.dtx
index aedff90..934547a 100644
--- a/locale/english.dtx
+++ b/locale/english.dtx
@@ -104,7 +104,7 @@
% \iffalse
%<*mu>
% \fi\begin{macrocode}
-\ProvidesFile{fithesis/locale/mu/fithesis-english.def}[2016/03/22]
+\ProvidesFile{fithesis/locale/mu/fithesis-english.def}[2017/06/02]
\gdef\thesis@english@universityName{Masaryk University}
\gdef\thesis@english@declaration{%
Hereby I declare that this paper is my original authorial work,
@@ -115,6 +115,16 @@
% Bibliographic entry
\gdef\thesis@english@bib@title{Bibliographic record}
\gdef\thesis@english@bib@pages{p}
+% \end{macrocode}
+% \changes{v0.3.46}{2017/06/02}{Lifted the \texttt{bib@author},
+% \texttt{bib@thesisTitle}, and \texttt{bib@advisor} strings from
+% \texttt{locale/mu/sci/*.def} to \texttt{locale/mu/*.def},
+% so that they can be shared with \texttt{locale/mu/econ/*.def}.
+% [VN]}
+% \begin{macrocode}
+\global\let\thesis@english@bib@author\thesis@english@authorTitle
+\gdef\thesis@english@bib@thesisTitle{Title of Thesis}
+\gdef\thesis@english@bib@advisor{Supervisor}
% Miscellaneous
\gdef\thesis@english@idTitle{UÄŚO}
@@ -181,16 +191,29 @@
% This is the English locale file specific to the Faculty of
% Economics and Administration at the Masaryk University in Brno.
% It replaces the \texttt{facultyName} and \texttt{abstractTitle}
-% placeholders with the correct values.
+% placeholders with the correct value. The locale file also defines
+% the private macros required by the
+% |\thesis@blocks@|\discretionary{}{}{}|bibEntry| block defined
+% within the \texttt{style/mu/fithesis-econ.sty} style file.
% \iffalse
%<*mu/econ>
% \fi\begin{macrocode}
-\ProvidesFile{fithesis/locale/mu/econ/fithesis-english.def}[2015/06/26]
+\ProvidesFile{fithesis/locale/mu/econ/fithesis-english.def}[2017/06/02]
% Placeholders
\gdef\thesis@english@facultyName{Faculty of Economics
and Administration}
+% Bibliographic entry
+% \end{macrocode}
+% \changes{v0.3.46}{2017/06/02}{Defined strings required by
+% \cs{thesis@blocks@bibEntry} from
+% \texttt{style/mu/fithesis-econ.sty} in
+% \texttt{locale/mu/econ/*.def}. [VN]}
+% \begin{macrocode}
+\gdef\thesis@english@bib@department{Department}
+\gdef\thesis@english@bib@year{Year of Defense}
+
% Miscellaneous
% \end{macrocode}
% \changes{v0.3.46}{2017/06/02}{Updated the
@@ -311,7 +334,7 @@
% \iffalse
%<*mu/sci>
% \fi\begin{macrocode}
-\ProvidesFile{fithesis/locale/mu/sci/fithesis-english.def}[2016/03/23]
+\ProvidesFile{fithesis/locale/mu/sci/fithesis-english.def}[2017/06/02]
% Placeholders
\gdef\thesis@english@facultyName{Faculty of Science}
@@ -320,11 +343,8 @@
\global\let\thesis@english@advisorTitleEn=\thesis@english@bib@advisor
% Bibliographic entry
-\global\let\thesis@english@bib@author\thesis@english@authorTitle
-\gdef\thesis@english@bib@thesisTitle{Title of Thesis}
\gdef\thesis@english@bib@programme{Degree Programme}
\global\let\thesis@english@bib@field\thesis@english@fieldTitle
-\gdef\thesis@english@bib@advisor{Supervisor}
\gdef\thesis@english@bib@academicYear{Academic Year}
\gdef\thesis@english@bib@pages{Number of Pages}
\global\let\thesis@english@bib@keywords\thesis@english@keywordsTitle
diff --git a/locale/slovak.dtx b/locale/slovak.dtx
index 5b7f3b6..0d24fe4 100644
--- a/locale/slovak.dtx
+++ b/locale/slovak.dtx
@@ -137,7 +137,7 @@
% \iffalse
%<*mu>
% \fi\begin{macrocode}
-\ProvidesFile{fithesis/locale/mu/fithesis-slovak.def}[2016/03/22]
+\ProvidesFile{fithesis/locale/mu/fithesis-slovak.def}[2017/06/02]
% Zástupné texty
\gdef\thesis@slovak@universityName{Masarykova univerzita}
@@ -150,6 +150,16 @@
% Bibliografický záznam
\gdef\thesis@slovak@bib@title{Bibliografický záznam}
\gdef\thesis@slovak@bib@pages{str}
+% \end{macrocode}
+% \changes{v0.3.46}{2017/06/02}{Lifted the \texttt{bib@author},
+% \texttt{bib@thesisTitle}, and \texttt{bib@advisor} strings from
+% \texttt{locale/mu/sci/*.def} to \texttt{locale/mu/*.def},
+% so that they can be shared with \texttt{locale/mu/econ/*.def}.
+% [VN]}
+% \begin{macrocode}
+\global\let\thesis@slovak@bib@author\thesis@slovak@authorTitle
+\gdef\thesis@slovak@bib@thesisTitle{Názov práce}
+\global\let\thesis@slovak@bib@advisor\thesis@slovak@advisorTitle
% RĂ´zne
\gdef\thesis@slovak@idTitle{UÄŚO}
@@ -232,7 +242,10 @@
% It replaces the \texttt{facultyName} and \texttt{abstractTitle}
% placeholders with the correct values. The locale file also
% redefines the \texttt{declaration} string in accordance with
-% the requirements of the faculty.
+% the requirements of the faculty and defines the private macros
+% required by the |\thesis@blocks@|\discretionary{}{}{}|bibEntry|
+% block defined within the \texttt{style/mu/fithesis-econ.sty}
+% style file.
% \iffalse
%<*mu/econ>
% \fi\begin{macrocode}
@@ -241,6 +254,17 @@
% Zástupné texty
\gdef\thesis@slovak@facultyName{Ekonomicko-správna fakulta}
+% Bibliografický záznam
+% \end{macrocode}
+% \changes{v0.3.46}{2017/06/02}{Defined strings required by
+% \cs{thesis@blocks@bibEntry} from
+% \texttt{style/mu/fithesis-econ.sty} in
+% \texttt{locale/mu/econ/*.def}. [VN]}
+% \begin{macrocode}
+\gdef\thesis@slovak@bib@thesisTitleEn{Názov práce v angličtine}
+\gdef\thesis@slovak@bib@department{Katedra}
+\gdef\thesis@slovak@bib@year{Rok obhajoby}
+
% RĂ´zne
% \end{macrocode}
% \changes{v0.3.46}{2017/06/02}{Updated the
@@ -410,7 +434,7 @@
% \iffalse
%<*mu/ped>
% \fi\begin{macrocode}
-\ProvidesFile{fithesis/locale/mu/ped/fithesis-slovak.def}[2016/03/22]
+\ProvidesFile{fithesis/locale/mu/ped/fithesis-slovak.def}[2017/06/02]
% Zástupné texty
\gdef\thesis@slovak@facultyName{Pedagogická fakulta}
@@ -438,11 +462,8 @@
\gdef\thesis@slovak@facultyName{PrĂrodovedecká fakulta}
% Bibliografický záznam
-\global\let\thesis@slovak@bib@author\thesis@slovak@authorTitle
-\gdef\thesis@slovak@bib@thesisTitle{Názov práce}
\gdef\thesis@slovak@bib@programme{Ĺ tudijnĂ˝ program}
\global\let\thesis@slovak@bib@field\thesis@slovak@fieldTitle
-\global\let\thesis@slovak@bib@advisor\thesis@slovak@advisorTitle
\gdef\thesis@slovak@bib@academicYear{AkademickĂ˝ rok}
\gdef\thesis@slovak@bib@pages{Počet strán}
\global\let\thesis@slovak@bib@keywords\thesis@slovak@keywordsTitle
diff --git a/style/mu/econ.dtx b/style/mu/econ.dtx
index 675d882..fc95908 100644
--- a/style/mu/econ.dtx
+++ b/style/mu/econ.dtx
@@ -240,7 +240,7 @@
\thesis@blocks@frontMatter
\thesis@blocks@titlePage
\thesis@blocks@assignment
- \thesis@clear
+ \thesis@blocks@bibEntry
\thesis@blocks@abstract
\thesis@blocks@abstractEn
\thesis@blocks@keywords
@@ -257,3 +257,40 @@
\thesis@blocks@bibliography
\thesis@blocks@tables}
% \end{macrocode}
+% \begin{macro}{\thesis@blocks@bibEntry}
+% The |\thesis@blocks@bibEntry| macro typesets a bibliographical
+% entry. Along with the macros required by the locale file
+% interface, the locale files need to define the following macros:
+% \begin{itemize}
+% \item|\thesis@|\textit{locale}|@bib@author| -- The label of the
+% author name entry
+% \item|\thesis@|\textit{locale}|@bib@title| -- The label of the
+% title name entry
+% \item|\thesis@|\textit{locale}|@bib@titleEn| -- The label of the
+% English title name entry (\cs{thesis@english@bib@titleEn}
+% does not need to be defined)
+% \item|\thesis@|\textit{locale}|@bib@department| -- The label of
+% the department name entry
+% \item|\thesis@|\textit{locale}|@bib@advisor| -- The label of
+% the advisor name entry
+% \item|\thesis@|\textit{locale}|@bib@year| -- The label of the
+% year entry
+% \end{itemize}
+% \changes{v0.3.46}{2017/06/02}{Defined \cs{thesis@blocks@bibEntry}
+% in \texttt{style/mu/fithesis-econ.sty} in accordance with the
+% example documents. The patch was submitted by Jana Ratajská.
+% [VN]}
+% \begin{macrocode}
+\def\thesis@blocks@bibEntry{%
+ \thesis@blocks@clear
+ \noindent\begin{thesis@newtable@old}{@{}>{\bfseries}ll@{}}
+ \thesis@@{bib@author}: & \thesis@author \\
+ \thesis@@{bib@thesisTitle}: & \thesis@title \\
+ \ifthesis@english\else
+ \thesis@@{bib@thesisTitleEn}: & \thesis@titleEn \\
+ \fi
+ \thesis@@{bib@department}: & \thesis@department \\
+ \thesis@@{bib@advisor}: & \thesis@advisor \\
+ \thesis@@{bib@year}: & \thesis@year \\
+ \end{thesis@newtable@old}}
+% \end{macrocode}
--
GitLab