Merge branch 'master' into misc-fixes

style/mu/econ.dtx

@@ -28,7 +28,7 @@
   tableOdd={HTML}{F5ECEB},
   tableEven={HTML}{EBD8D5}}
 %    \end{macrocode}
-% The bibliography support is enabled. The |authoryear| citations
+% The bibliography support is enabled. The |iso-authoryear| citations
 % are used and the bibliography is sorted by name, title, and year.
 %    \begin{macrocode}
 \thesis@bibliography@setup{

style/mu/fi.dtx

@@ -24,7 +24,7 @@
   tableOdd={HTML}{FFF9E5},
   tableEven={HTML}{FFECB3}}
 %    \end{macrocode}
-% The bibliography support is enabled. The |numeric| citations are
+% The bibliography support is enabled. The |iso-numeric| citations are
 % used and the bibliography is sorted in citation order.
 %    \begin{macrocode}
 \thesis@bibliography@setup{
@@ -94,12 +94,11 @@
     \ifx\thesis@type\thesis@proposal
       \thesis@blocks@toc
     \else
-      \thesis@blocks@assignment
       \thesis@blocks@declaration
-      \thesis@blocks@clearRight
+      \thesis@blocks@thanks
+      \thesis@blocks@clear
         \thesis@blocks@abstract
         \thesis@blocks@keywords
-      \thesis@blocks@thanks
       \thesis@blocks@tables
     \fi}
 \def\thesis@blocks@postamble{%

style/mu/fsps.dtx

@@ -24,7 +24,7 @@
   tableOdd={HTML}{EBEFF5},
   tableEven={HTML}{D1DAEB}}
 %    \end{macrocode}
-% The bibliography support is enabled. The |authoryear| citations
+% The bibliography support is enabled. The |iso-authoryear| citations
 % are used and the bibliography is sorted by name, title, and year.
 %    \begin{macrocode}
 \thesis@bibliography@setup{

style/mu/fss.dtx

@@ -23,7 +23,7 @@
   tableOdd={HTML}{E3F1EE},
   tableEven={HTML}{C5E3DF}}
 %    \end{macrocode}
-% The bibliography support is enabled. The |authoryear| citations
+% The bibliography support is enabled. The |iso-authoryear| citations
 % are used and the bibliography is sorted by name, title, and year.
 %    \begin{macrocode}
 \thesis@bibliography@setup{

style/mu/law.dtx

@@ -13,7 +13,7 @@
 % h_dokumentu.pdf}}.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fithesis/style/mu/fithesis-mu-law}[2021/02/21]
+\ProvidesPackage{fithesis/style/mu/fithesis-mu-law}[2021/03/26]
 %    \end{macrocode}
 % The file defines the color scheme of the respective faculty. Note
 % the the color definitions are in RGB, which makes the resulting
@@ -25,11 +25,14 @@
   tableOdd={HTML}{F2EBF5},
   tableEven={HTML}{E5CCED}}
 %    \end{macrocode}
-% The bibliography support is enabled. The |authoryear| citations
+% The bibliography support is enabled. The |iso-authortitle| citations
 % are used and the bibliography is sorted by name, year, and title.
+% \changes{v1.0.0}{2021/03/26}{^^A
+%   The Faculty of Law at the Masaryk University in Brno uses the ISO~690
+%   author-title citation and reference style. [VN]}
 %    \begin{macrocode}
 \thesis@bibliography@setup{%
-  style=iso-authoryear,
+  style=iso-authortitle,
   sorting=nyt}
 \thesis@bibliography@load
 %    \end{macrocode}
@@ -128,10 +131,10 @@
   \thesis@blocks@frontMatter
     \thesis@blocks@seal
     \thesis@blocks@declaration
-    \thesis@blocks@clearRight
+    \thesis@blocks@clear
       \thesis@blocks@abstract
       \thesis@blocks@keywords
-    \thesis@blocks@clearRight
+    \thesis@blocks@clear
       \thesis@blocks@abstractEn
       \thesis@blocks@keywordsEn
     \thesis@blocks@thanks

style/mu/med.dtx

@@ -15,7 +15,7 @@
 % akulte_MU.pdf}}.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fithesis/style/mu/fithesis-mu-med}[2021/02/26]
+\ProvidesPackage{fithesis/style/mu/fithesis-mu-med}[2021/03/26]
 %    \end{macrocode}
 % The file defines the color scheme of the respective faculty. Note
 % the the color definitions are in RGB, which makes the resulting
@@ -27,14 +27,50 @@
   tableOdd={HTML}{FFF5F6},
   tableEven={HTML}{FFDEDF}}
 %    \end{macrocode}
-% The bibliography support is enabled. The |authoryear| citations
+% The bibliography support is enabled. The |authortitle| citations
 % are used and the bibliography is sorted by year, name, and title.
 %    \begin{macrocode}
 \thesis@bibliography@setup{%
-  style=iso-authoryear,
+  style=authortitle,
   sorting=ynt}
 \thesis@bibliography@load
 %    \end{macrocode}
+% The AMA citation style is defined using |authortitle| as the basis.
+% The following code has been adapted from
+% \url{https://tex.stackexchange.com/a/233423/70941}.
+% \changes{v1.0.0}{2021/03/26}{^^A
+%   The Faculty of Medicine at the Masaryk University in Brno uses the
+%   AMA citation and reference style. [VN]}
+%    \begin{macrocode}
+\DeclareNameAlias{sortname}{last-first}
+\renewcommand*{\revsdnamepunct}{}
+\DeclareFieldFormat[%
+  article,inbook,incollection,inproceedings,patent,thesis,unpublished]%
+  {title}{{#1\isdot}}
+\renewbibmacro{in:}{}
+\DeclareFieldFormat{pages}{#1}
+\renewcommand*{\bibpagespunct}{\addcolon}
+\DeclareFieldFormat{journaltitle}{#1\addperiod}
+\DeclareFieldFormat{booktitle}{{#1}}
+\DeclareFieldFormat{title}{{#1}}
+\renewbibmacro*{journal+issuetitle}{%
+  \usebibmacro{journal}%
+  \setunit*{\addspace}%
+  \iffieldundef{series}
+  {}
+  {\newunit
+    \printfield{series}%
+    \setunit{\addspace}}%
+  \usebibmacro{issue+date}%
+  \setunit{\addsemicolon\addspace}%
+  \usebibmacro{volume+number+eid}%
+  \setunit{\addcolon\space}%
+  \usebibmacro{issue}%
+  \newunit%
+}
+\renewbibmacro*{issue+date}{\printfield{year}}
+\renewcommand*{\finalnamedelim}{\multinamedelim}
+%    \end{macrocode}
 % The file loads the following packages:
 % \begin{itemize}
 %   \item\textsf{tikz} -- Used for dimension arithmetic.
@@ -154,10 +190,10 @@
   \thesis@blocks@frontMatter
     \thesis@blocks@seal
     \thesis@blocks@declaration
-    \thesis@blocks@clearRight
+    \thesis@blocks@clear
       \thesis@blocks@abstract
       \thesis@blocks@keywords
-    \thesis@blocks@clearRight
+    \thesis@blocks@clear
       \thesis@blocks@abstractEn
       \thesis@blocks@keywordsEn
     \thesis@blocks@thanks

style/mu/ped.dtx

@@ -14,7 +14,7 @@
 % /08/standard_zaverecnych_praci_katedra_pedagogiky-opravene3_08.pdf}}.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fithesis/style/mu/fithesis-mu-ped}[2021/02/26]
+\ProvidesPackage{fithesis/style/mu/fithesis-mu-ped}[2021/03/26]
 %    \end{macrocode}
 % The file defines the color scheme of the respective faculty. Note
 % the the color definitions are in RGB, which makes the resulting
@@ -26,11 +26,14 @@
   tableOdd={HTML}{FFF1E0},
   tableEven={HTML}{FFDEB7}}
 %    \end{macrocode}
-% The bibliography support is enabled. The |numeric| citations are
+% The bibliography support is enabled. The |apa| citations are
 % used and the bibliography is sorted by name, title, and year.
+% \changes{v1.0.0}{2021/03/26}{^^A
+%   The Faculty of Education at the Masaryk University in Brno
+%   uses the APA citation and reference style. [VN]}
 %    \begin{macrocode}
 \thesis@bibliography@setup{
-  style=iso-numeric,
+  style=apa,
   sorting=nty}
 \thesis@bibliography@load
 %    \end{macrocode}

style/mu/phil.dtx

@@ -25,8 +25,8 @@
   tableOdd={HTML}{EBF6FA},
   tableEven={HTML}{D0EBF5}}
 %    \end{macrocode}
-% The bibliography support is enabled. The |numeric| citations are
-% used and the bibliography is sorted by name, title, and year.
+% The bibliography support is enabled. The |iso-authoryear| citations
+% are used and the bibliography is sorted by name, title, and year.
 %    \begin{macrocode}
 \thesis@bibliography@setup{
   style=iso-authoryear,

style/mu/sci.dtx

@@ -24,8 +24,8 @@
   tableOdd={HTML}{EDF7F1},
   tableEven={HTML}{CCEDD8}}
 %    \end{macrocode}
-% The bibliography support is enabled. The |numeric| citations are
-% used and the bibliography is sorted in citation order.
+% The bibliography support is enabled. The |iso-numeric| citations
+% are used and the bibliography is sorted in citation order.
 %    \begin{macrocode}
 \thesis@bibliography@setup{
   style=iso-numeric,
@@ -109,7 +109,7 @@
       \thesis@blocks@seal
       \thesis@blocks@bibEntry
       \thesis@blocks@bibEntryEn
-      \thesis@blocks@clearRight
+      \thesis@blocks@clear
         \thesis@blocks@abstract
       \thesis@blocks@clearRight
 	\thesis@blocks@abstractEn