summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/univie-ling
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/univie-ling')
-rw-r--r--macros/latex/contrib/univie-ling/README14
-rw-r--r--macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx2
-rw-r--r--macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx2
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.pdfbin116016 -> 132481 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-expose-english.pdfbin106622 -> 127717 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-handout-deutsch.pdfbin200629 -> 200629 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-handout-english.pdfbin200633 -> 200633 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.pdfbin155796 -> 171999 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-paper-english.pdfbin151605 -> 167017 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdfbin173919 -> 189870 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.pdfbin170180 -> 186018 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdfbin249650 -> 372059 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.tex23
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdfbin457216 -> 457719 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex17
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-handout.pdfbin447007 -> 447447 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-handout.tex19
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdfbin453044 -> 453762 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex17
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdfbin458319 -> 458697 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex21
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdfbin341316 -> 342852 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex18
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling.pdfbin0 -> 364169 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling.tex105
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls451
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-handout.cls1027
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls508
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls543
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-wlg-logo.pdfbin93530 -> 93497 bytes
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls371
31 files changed, 1526 insertions, 1612 deletions
diff --git a/macros/latex/contrib/univie-ling/README b/macros/latex/contrib/univie-ling/README
index 9fb510ca88..39360949f0 100644
--- a/macros/latex/contrib/univie-ling/README
+++ b/macros/latex/contrib/univie-ling/README
@@ -44,6 +44,8 @@ The package consists of the following files:
* univie-ling.bbx: Biblatex bibliography style
* univie-ling.cbx: Biblatex citation style
+* univie-ling.pdf: documentation of the whole bundle
+* univie-ling.tex: documentation source of the whole bundle
* univie-ling-expose.pdf: documentation of the expose class
* univie-ling-expose.tex: documentation source of the expose class
* univie-ling-handout.pdf: documentation of the handout class
@@ -88,6 +90,18 @@ also have a look at the example files.
== CHANGES ==
+V. 2.0 (2022-10-02):
+ - Add general documentation (univie-ling.pdf).
+ - univie-ling-handout:
+ - univie-ling-expose:
+ - univie-ling-paper:
+ - univie-ling-thesis:
+ - univie-ling-wlg:
+ * Fix and properly localize some varioref definitions.
+ * Various small cleanups (addressing warnings).
+ * Use l3keys rather than xkeyval for option handling.
+ * Use translator rather than translations for l7n in all classes.
+
V. 1.20 (2022-09-08):
- univie-ling-handout:
- univie-ling-expose:
diff --git a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx
index d358da5d49..297bf740f1 100644
--- a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx
+++ b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx
@@ -37,7 +37,7 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ProvidesFile{univie-ling.bbx}[2022/06/18 v1.19 biblatex bibliography style]
+\ProvidesFile{univie-ling.bbx}[2022/10/02 v.2.0 biblatex bibliography style]
% Load base style (authoryear-comp)
\RequireBibliographyStyle{authoryear-comp}
diff --git a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx
index 4b6647d6e3..e4937b0fa3 100644
--- a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx
+++ b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx
@@ -35,7 +35,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ProvidesFile{univie-ling.cbx}[2022/06/18 v1.19 biblatex citation style]
+\ProvidesFile{univie-ling.cbx}[2022/10/02 v.2.0 biblatex citation style]
\RequireCitationStyle{authoryear-comp}
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.pdf
index f5bb410014..12cb21db93 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-expose-english.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-expose-english.pdf
index 69ab2f9b91..dac6d7b74a 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-expose-english.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-expose-english.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-handout-deutsch.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-handout-deutsch.pdf
index ade6bf052c..72b734d553 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-handout-deutsch.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-handout-deutsch.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-handout-english.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-handout-english.pdf
index 195af0858b..aa429549f5 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-handout-english.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-handout-english.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.pdf
index 2d6e8e8b44..83b8b152df 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-paper-english.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-paper-english.pdf
index 87a9785ff2..e6c62d407c 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-paper-english.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-paper-english.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf
index 9569ba5659..ba8f0ab19e 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.pdf
index 2c95c63b6d..e780fe4f91 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf
index e517aeab34..a41185e64c 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.tex b/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.tex
index 7dfaefb9a0..7c506ba36f 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.tex
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.tex
@@ -13,11 +13,14 @@
\usepackage[utf8]{inputenc}
% Supported languages: naustrian, ngerman, english
-\RequirePackage[naustrian]{babel}
+\RequirePackage[ngerman,naustrian]{babel}
% This is just for the dummy text
% Remove this and the \blind... macros for real documents
\usepackage{blindtext}
+% Custom blindtext (Austrian not supported by blindtext package)
+\newcommand*{\blindtextAT}{\foreignlanguage{ngerman}{\blindtext}}
+\newcommand*{\blindlistAT}{\foreignlanguage{ngerman}{\blindlistlist[3]{itemize}}}
%
% EDITORIAL SETTINGS
@@ -49,7 +52,7 @@
\begin{abstract}
% dummy text
-\blindtext[1]
+\blindtextAT
\end{abstract}
\keywords{Applied Linguistics, Discourse Analysis, Sociolinguistics, Text Analysis}
@@ -58,22 +61,22 @@
\motto[Quelle]{Ein schickes Motto}
-\blindtext
+\blindtextAT
\begin{displayquote}
% dummy text
-\blindtext
+\blindtextAT
\end{displayquote}
% dummy text
-\blindtext
+\blindtextAT
-% dummy text
-\blindlistlist[3]{itemize}
+% dummy list
+\blindlistAT
% dummy text
-\blindtext
+\blindtextAT
-% dummy text
-\blindlistlist[3]{enumerate}
+% dummy list
+\blindlistAT
\end{document}
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf
index cc7a758023..9f6d69016b 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex
index 3c77e4dfbb..82941e94cd 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex
@@ -30,7 +30,7 @@
% macros
\newcommand*\uvlt{\textsf{univie-ling-expose}}
-\providecommand{\LyX}{L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\@}
+\providecommand{\LyX}{\texorpdfstring{L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\@}{LyX}}
% improve layout
\tolerance 1414
@@ -63,7 +63,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 1.20, 2022/09/08}
+\date{Version 2.0, 2022/10/02}
\maketitle
@@ -102,11 +102,11 @@ The following class and packages are required and loaded by \uvlt:
\item \textsf{csquotes}: Context sensitive quotations.
\item \textsf{datetime2}: Date localization.
\item \textsf{graphicx}: Graphic support.
+ \item \textsf{l3keys}: Key-value interface for class options.
\item \textsf{scrlayer-scrpage}: Page layout settings.
\item \textsf{setspace}: Line spacing adjustments.
- \item \textsf{translations}: Localization machinery.
+ \item \textsf{translator}: Localization machinery.
\item \textsf{url}: Support for typesetting URLs.
- \item \textsf{xkeyval}: Key-value interface for class options.
\end{itemize}
The following packages are required for specific features and loaded by default. However, the loading can be individually and generally omitted (see sec.~\ref{coptions}):
\begin{itemize}
@@ -329,16 +329,25 @@ Please also refer to the template files included in the package for some further
A layout for \LyX\footnote{See \url{https://www.lyx.org}.}\ can be retrieved from \url{https://github.com/jspitz/univie-ling/raw/master/lyx/layouts/univie-ling-expose.layout}.
Templates are provided as well:
+\begin{flushleft}
\begin{itemize}
\item English template:\\
\url{https://github.com/jspitz/univie-ling/raw/master/lyx/templates/template-univie-ling-expose-english.lyx}
\item German template:\\
\url{https://github.com/jspitz/univie-ling/raw/master/lyx/templates/template-univie-ling-expose-deutsch.lyx}
\end{itemize}
+\end{flushleft}
\section{Release History}
\begin{description}
+ \item 2022/10/02 (v.\,2.0)
+ \begin{itemize}
+ \item Use \textsf{l3keys} rather than \textsf{xkeyval} for key-value option handling.
+ \item Fix some \textsf{varioref} definitions.
+ \item Use \textsf{translator} instead of \textsf{translations} for localization.
+ \item Various small class cleanups.
+ \end{itemize}
\item 2022/09/08 (v.\,1.20)
\begin{itemize}
\item Load \textsf{varioref} AtBeginDocument.
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-handout.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-handout.pdf
index 937fb794b4..e308a78e55 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-handout.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-handout.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-handout.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-handout.tex
index 148689b2d8..1dbba9f736 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-handout.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-handout.tex
@@ -30,7 +30,7 @@
% macros
\newcommand*\uvlt{\textsf{univie-ling-handout}}
-\providecommand{\LyX}{L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\@}
+\providecommand{\LyX}{\texorpdfstring{L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\@}{LyX}}
% improve layout
\tolerance 1414
@@ -63,7 +63,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 1.20, 2022/09/08}
+\date{Version 2.0, 2022/10/02}
\maketitle
@@ -71,7 +71,7 @@
\noindent The \uvlt\ class provides a \LaTeXe\ class suitable for handouts that accompany presentations in classes or at conferences.
The class adheres to the corporate design of the University of Vienna (although no dedicated specs for handouts
are provided there).%
-\footnote{\url{https://communications.univie.ac.at/fileadmin/user_upload/d_oeffentlichkeitsarbeit/Dokumente/UniversitaetWien_CD_Manual_Mai_2022_interaktiv.pdf}.}
+\footnote{\raggedright\url{https://communications.univie.ac.at/fileadmin/user_upload/d_oeffentlichkeitsarbeit/Dokumente/UniversitaetWien_CD_Manual_Mai_2022_interaktiv.pdf}.}
Therefore, although this class has been written for students in the Department of Linguistics, it might also be useful for other fields
and for students and researchers alike.
This manual documents the class.
@@ -98,9 +98,9 @@ The following class and packages are required and loaded by \uvlt:
\item \textsf{csquotes}: Context sensitive quotations.
\item \textsf{graphicx}: Graphic support.
\item \textsf{geometry}: Page layout settings.
- \item \textsf{translations}: Localization machinery.
+ \item \textsf{l3keys}: Key-value interface for class options.
+ \item \textsf{translator}: Localization machinery.
\item \textsf{url}: Support for typesetting URLs.
- \item \textsf{xkeyval}: Key-value interface for class options.
\end{itemize}
The following packages are required for specific features and loaded by default. However, the loading can be individually and generally omitted (see sec.~\ref{coptions}):
\begin{itemize}
@@ -373,16 +373,25 @@ Please also refer to the template files included in the package for some further
A layout for \LyX\footnote{See \url{https://www.lyx.org}.}\ can be retrieved from \url{https://github.com/jspitz/univie-ling/raw/master/lyx/layouts/univie-ling-handout.layout}.
Templates are provided as well:
+\begin{flushleft}
\begin{itemize}
\item English template:\\
\url{https://github.com/jspitz/univie-ling/raw/master/lyx/templates/template-univie-ling-handout-english.lyx}
\item German template:\\
\url{https://github.com/jspitz/univie-ling/raw/master/lyx/templates/template-univie-ling-handout-deutsch.lyx}
\end{itemize}
+\end{flushleft}
\section{Release History}
\begin{description}
+ \item 2022/10/02 (v.\,2.0)
+ \begin{itemize}
+ \item Use \textsf{l3keys} rather than \textsf{xkeyval} for key-value option handling.
+ \item Fix some \textsf{varioref} definitions.
+ \item Use \textsf{translator} instead of \textsf{translations} for localization.
+ \item Various small class cleanups.
+ \end{itemize}
\item 2022/09/08 (v.\,1.20)
\begin{itemize}
\item Load \textsf{varioref} AtBeginDocument.
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf
index 220e968900..7838dcbfef 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex
index a3cf0fa76c..bfd39d1995 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex
@@ -30,7 +30,7 @@
% macros
\newcommand*\uvlt{\textsf{univie-ling-paper}}
-\providecommand{\LyX}{L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\@}
+\providecommand{\LyX}{\texorpdfstring{L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\@}{LyX}}
% improve layout
\tolerance 1414
@@ -63,7 +63,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 1.20, 2022/09/08}
+\date{Version 2.0, 2022/10/02}
\maketitle
@@ -99,11 +99,11 @@ The following class and packages are required and loaded by \uvlt:
\item \textsf{scrartcl}: KOMA-Script article class (base class).
\item \textsf{csquotes}: Context sensitive quotations.
\item \textsf{graphicx}: Graphic support.
+ \item \textsf{l3keys}: Key-value interface for class options.
\item \textsf{scrlayer-scrpage}: Page layout settings.
\item \textsf{setspace}: Line spacing adjustments.
- \item \textsf{translations}: Localization machinery.
+ \item \textsf{translator}: Localization machinery.
\item \textsf{url}: Support for typesetting URLs.
- \item \textsf{xkeyval}: Key-value interface for class options.
\end{itemize}
The following packages are required for specific features and loaded by default. However, the loading can be individually and generally omitted (see sec.~\ref{coptions}):
\begin{itemize}
@@ -361,17 +361,26 @@ Please also refer to the template files included in the package for some further
A layout for \LyX\footnote{See \url{https://www.lyx.org}.}\ can be retrieved from \url{https://github.com/jspitz/univie-ling/raw/master/lyx/layouts/univie-ling-paper.layout}.
Templates are provided as well:
+\begin{flushleft}
\begin{itemize}
\item English template:\\
\url{https://github.com/jspitz/univie-ling/raw/master/lyx/templates/template-univie-ling-paper-english.lyx}
\item German template:\\
\url{https://github.com/jspitz/univie-ling/raw/master/lyx/templates/template-univie-ling-paper-deutsch.lyx}
\end{itemize}
+\end{flushleft}
\condbreak{2\baselineskip}
\section{Release History}
\begin{itemize}
+ \item 2022/10/02 (v.\,2.0)
+ \begin{itemize}
+ \item Use \textsf{l3keys} rather than \textsf{xkeyval} for key-value option handling.
+ \item Fix some \textsf{varioref} definitions.
+ \item Use \textsf{translator} instead of \textsf{translations} for localization.
+ \item Various small class cleanups.
+ \end{itemize}
\item 2022/09/08 (v.\,1.20)
\begin{itemize}
\item Load \textsf{varioref} AtBeginDocument.
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf
index 6b7068b4c1..096cdf536d 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex
index f8d5656e74..d181c6cc78 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex
@@ -30,7 +30,7 @@
% macros
\newcommand*\uvlt{\textsf{univie-ling-thesis}}
-\providecommand{\LyX}{L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\@}
+\providecommand{\LyX}{\texorpdfstring{L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\@}{LyX}}
% improve layout
\tolerance 1414
@@ -59,7 +59,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 1.20, 2022/09/08}
+\date{Version 2.0, 2022/10/02}
\maketitle
@@ -82,7 +82,7 @@ packages (such as \textsf{covington}) are pre-loaded. As documented later, howev
a bibliography style of your choice and load alternative packages.
The design matches as closely as necessary the standards set up by the university. This particularly concerns the
-title page, which follows the recommendations specified by the \emph{StudienServiceCenter}.\footnote{%
+title page, which follows the recommendations specified by the \emph{StudienServiceCenter}.\footnote{\raggedright%
See \url{http://ssc-philkultur.univie.ac.at/studium/masterstudien/abgabe-der-masterarbeit} for master's theses,
\url{http://ssc-philkultur.univie.ac.at/studium/doktoratsstudium-neu-792-xxx/dissertation} for doctoral theses <25.\,01.\,2017>.}
@@ -96,11 +96,11 @@ The following class and packages are required and loaded by \uvlt:
\item \textsf{csquotes}: Context sensitive quotations.
\item \textsf{geometry}: Page layout settings.
\item \textsf{graphicx}: Graphic support.
+ \item \textsf{l3keys}: Key-value interface for class options.
\item \textsf{scrlayer-scrpage}: Page header settings.
\item \textsf{setspace}: Line spacing adjustments.
- \item \textsf{translations}: Localization machinery.
+ \item \textsf{translator}: Localization machinery.
\item \textsf{url}: Support for typesetting URLs.
- \item \textsf{xkeyval}: Key-value interface for class options.
\end{itemize}
The following packages are required for specific features and loaded by default. However, the loading can be individually and generally omitted (see sec.~\ref{coptions}):
\begin{itemize}
@@ -278,7 +278,7 @@ the following data in the preamble.
\item{\jcsmacro{supervisor\{<name>\}}}: Title and name of your (main) supervisor.
\item{\jcsmacro{cosupervisor\{<name>\}}}: Title and name of your co-supervisor.
\end{description}
-The suitable degree (\emph{Angestrebter akademischer Grad}) is automatically set by the \jcsmacro{thesistype} command, but you can override it with the optional command \jcsmacro{degree\{<custom degree>\}}.
+The suitable degree (\emph{Angestrebter akademischer Grad} in German) is automatically set by the \jcsmacro{thesistype} command, but you can override it with the optional command \jcsmacro{degree\{<custom degree>\}}.
Note that female forms of degrees, where appropriate, are used if you use the class option \joption{fdegree=true} (see sec.~\ref{coptions}).
@@ -392,16 +392,25 @@ Furthermore, a step-by-step guide to PDF/A generation with PDFLaTeX and \textsf{
A layout for \LyX\footnote{See \url{https://www.lyx.org}.}\ can be retrieved from \url{https://github.com/jspitz/univie-ling/raw/master/lyx/layouts/univie-ling-thesis.layout}.
Templates are provided as well:
+\begin{flushleft}
\begin{itemize}
\item English template:\\
\url{https://github.com/jspitz/univie-ling/raw/master/lyx/templates/template-univie-ling-thesis-english.lyx}
\item German template:\\
\url{https://github.com/jspitz/univie-ling/raw/master/lyx/templates/template-univie-ling-thesis-deutsch.lyx}
\end{itemize}
+\end{flushleft}
\section{Release History}
\begin{itemize}
+ \item 2022/10/02 (v.\,2.0)
+ \begin{itemize}
+ \item Use \textsf{l3keys} rather than \textsf{xkeyval} for key-value option handling.
+ \item Fix some \textsf{varioref} definitions.
+ \item Use \textsf{translator} instead of \textsf{translations} for localization.
+ \item Various small class cleanups.
+ \end{itemize}
\item 2022/09/08 (v.\,1.20)
\begin{itemize}
\item Load \textsf{varioref} AtBeginDocument.
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
index 9109fa6a9c..b57238618d 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
index d9cd57e7d0..7805945596 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
@@ -30,7 +30,7 @@
% macros
\newcommand*\uvlt{\textsf{univie-ling-wlg}}
-\providecommand{\LyX}{L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\@}
+\providecommand{\LyX}{\texorpdfstring{L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\@}{LyX}}
% improve layout
\tolerance 1414
@@ -59,7 +59,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 1.20, 2022/09/08}
+\date{Version 2.0, 2022/10/02}
\maketitle
@@ -93,7 +93,7 @@ If you want to use \emph{MinionPro}, use the class option \joption{expertfonts=t
\section{Class Options}\label{coptions}
-The \uvlt\ class provides a range of key=value type options to control the font handling, package loading and some specific behavior.
+The \uvlt\ class provides a range of \texttt{key=value} type options to control the font handling, package loading and some specific behavior.
These are documented in this section.
\subsection{Font selection}
@@ -170,8 +170,8 @@ In general, the data for the editorial board should be set/changed in a local co
\setlength\itemsep{0pt}
\item{\jcsmacro{author\{<name>\}}}: Article author(s); multiple authors separated by \jfcsmacro{and}.
Author affiliations should be specified via the macro \jcsmacro{aff\{Affilitation\}} immediately behind the author name,
- using \jcsmacro{aff*[m|f]\{Affilitation\}} for the corresponding author (the optional argument, \joption{f} or \joption{m},
- specifies the gender)
+ using \jcsmacro{aff*[m|f|p]\{Affilitation\}} for the corresponding author (the optional argument, \joption{f} or \joption{m},
+ specifies the grammatical gender, \joption{p} indicates plural [multiple authors])
\item{\jcsmacro{title\{<title>\}}}: Title of the paper.
\item{\jcsmacro{subtitle\{<subtitle>\}}}: Subtitle.
\item{\jcsmacro{date\{<date>\}}}: Date of publication (optional; by default the date when the PDF file was processed is used).
@@ -233,9 +233,15 @@ A template is provided as well: \url{https://github.com/jspitz/univie-ling/raw/m
\raggedright
\begin{itemize}
+ \item 2022/10/02 (v.\,2.0)
+ \begin{itemize}
+ \item Use \textsf{l3keys} rather than \textsf{xkeyval} for key-value option handling.
+ \item Fix and properly localize some \textsf{varioref} definitions.
+ \item Various small class cleanups (addressing warnings).
+ \end{itemize}
\item 2022/09/08 (v.\,1.20)
\begin{itemize}
- \item Load \textsf{varioref} AtBeginDocument.
+ \item Load \textsf{varioref} \jfcsmacro{AtBeginDocument}.
\end{itemize}
\item 2022/05/11 (v.\,1.18) No change to this class.
\item 2022/02/05 (v.\,1.17) Allow to set fixed publication date via \jcsmacro{date} in titling.
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling.pdf
new file mode 100644
index 0000000000..5431d65c90
--- /dev/null
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling.tex b/macros/latex/contrib/univie-ling/doc/univie-ling.tex
new file mode 100644
index 0000000000..21698e7028
--- /dev/null
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling.tex
@@ -0,0 +1,105 @@
+\documentclass[english]{article}
+
+\usepackage[osf]{libertine}
+\usepackage[scaled=0.7]{beramono}
+\usepackage[T1]{fontenc}
+\usepackage[latin9]{inputenc}
+\usepackage[hyphens]{url}
+\usepackage[pdfusetitle,
+ bookmarks=true,bookmarksnumbered=false,bookmarksopen=false,
+ breaklinks=false,pdfborder={0 0 0},backref=false,colorlinks=false]
+ {hyperref}
+
+\usepackage[dvipsnames]{xcolor}
+\usepackage{MnSymbol}
+% macros
+\newcommand*\uvlt{\textsf{univie-ling}}
+\newcommand*\uvlc[1]{\textsf{univie-ling-#1}}
+\newcommand*\mlink[1]{\textcolor{Maroon}{\hyperref{#1}{}{}{\textbf{$\blacktriangleright$ Manual}}}}
+
+% improve layout
+\tolerance 1414
+\hbadness 1414
+\emergencystretch 1.5em
+\hfuzz 0.3pt
+\widowpenalty = 10000
+\vfuzz \hfuzz
+\raggedbottom
+
+% Conditiona pagebreak
+\def\condbreak#1{%
+ \vskip 0pt plus #1\pagebreak[3]\vskip 0pt plus -#1\relax}
+
+\usepackage{microtype}
+
+\usepackage{babel}
+
+
+\begin{document}
+
+\title{The \uvlt\ bundle}
+
+\author{\texorpdfstring{Jürgen Spitzmüller%
+\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
+
+\date{Version 2.0, 2022/10/02}
+
+\maketitle
+
+\section{Aim}
+
+The \uvlt\ bundle consists of a set of classes as well as of a \textsf{biblatex} bibliography and citation style for students and academics
+at the University of Vienna, Austria, Department of Linguistics (\url{https://linguistics.univie.ac.at}). The classes follow the corporate design
+of the university and institutional regulations, as far as these apply.
+
+The classes and styles are particularly suited for the field of Applied Linguistics and pre-load some packages
+that are considered useful in this disciplinary context. However, they might also be (and actually are) used
+for General and Historical Linguistics as well as for other fields of study at Vienna University.
+In this case, some settings might have to be adjusted.
+
+This manual briefly introduces these classes and styles. Please refer to the linked manual of the respective class for details.
+
+\section{Classes and Styles}
+
+\subsection{\uvlc{expose}}
+
+The \uvlc{expose} class provides a \LaTeXe\ class suitable for those research proposals (\emph{Exposés}) that are required in the context of the public presentation of a dissertation project (\emph{FÖP}) at the University of Vienna. \mlink{univie-ling-expose.pdf}
+
+\subsection{\uvlc{handout}}
+
+The \uvlc{handout} class provides a \LaTeXe\ class suitable for handouts that accompany presentations in classes or at conferences.
+The class adheres to the corporate design of the University of Vienna (although no dedicated specs for handouts
+are provided there).
+Therefore, although this class has been written for students in the Department of Linguistics, it might also be useful for other fields
+and for students and researchers alike. \mlink{univie-ling-handout.pdf}
+
+\subsection{\uvlc{paper}}
+
+The \uvlc{paper} class provides a \LaTeXe\ class suitable for papers ([\emph{Pro}]\emph{Seminar\-arbeiten}) in (Applied)
+Linguistics at the Department of Linguistics, University of Vienna. \mlink{univie-ling-paper.pdf}
+
+\subsection{\uvlc{thesis}}
+
+The \uvlc{thesis} class provides a \LaTeXe\ class suitable for Bachelor's, Master's, Diploma and Doctoral theses in
+(Applied) Linguistics at the Department of Linguistics, University of Vienna. \mlink{univie-ling-thesis.pdf}
+
+\subsection{\uvlc{wlg}}
+
+The \uvlc{wlg} class provides a \LaTeXe\ class suitable for articles in the journal \emph{Wiener Linguistische Gazette} (WLG),
+the house journal of the Department of Linguistics at the University of Vienna (\url{https://wlg.univie.ac.at}).
+\mlink{univie-ling-wlg.pdf}
+
+\subsection{Bibliography and Citation Styles}
+
+The bundle also includes a \textsf{biblatex} bibliography style (\texttt{univie-ling.bbx}) and a citation style
+(\texttt{univie-ling.cbx}) that implement the citation conventions common in Viennese (Applied) Linguistics.
+The style draws on the \emph{Unified Style Sheet for Linguistic Papers}.%
+\footnote{See \url{https://www.linguisticsociety.org/sites/default/files/style-sheet_0.pdf}.}
+Documentation is included in the documentation of the classes above.
+
+\section{Release History}
+
+Please refer to the \emph{Release History} sections in the manuals of the classes and to the \emph{CHANGES} section in the \hyperref{https://mirrors.ctan.org/macros/latex/contrib/univie-ling/README}{}{}{\textcolor{Maroon}{$\blacktriangleright$ README}}
+file.
+
+\end{document}
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
index e353bdeca0..102a7e0bcc 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
@@ -32,185 +32,145 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-expose}[2022/06/18 v1.19 Univie Linguistic Exposes (JSp)]
+\ProvidesPackage{univie-ling-expose}[2022/10/02 v.2.0 Univie Linguistic Exposes (JSp)]
%% ============================================================
%% CLASS OPTIONS
%% ============================================================
-\RequirePackage{xkeyval}
-
-\newif\ifbiblatex\biblatextrue
-\newif\ifapa\apafalse
-\newif\ifcaptionp\captionptrue
-\newif\ifdraftmark\draftmarkfalse
-\newif\ifdraftmarkfp\draftmarkfpfalse
-\newif\ifrefsp\refsptrue
-\newif\ifcovington\covingtontrue
-\newif\ifmicrotype\microtypetrue
-\newif\ifpolyglossia\polyglossiafalse
-\newif\ifpsfonts\psfontstrue
-\newif\ifotffonts\otffontsfalse
-\newif\ifnofonts\nofontsfalse
-
-% all=<true|false>
-% Load all packages
-\define@boolkey+{uvt}{all}[true]{%
- \ifKV@uvt@all
- \biblatextrue
- \captionptrue
- \refsptrue
- \covingtontrue
- \microtypetrue
- \else
- \biblatexfalse
- \captionpfalse
- \refspfalse
- \covingtonfalse
- \microtypefalse
- \fi
-}{%
- \ClassWarning{univie-ling-expose}{unknown 'all' value}%
-}
-
-% biblatex=<true|false>
-% Load biblatex
-\define@boolkey+{uvt}{biblatex}[true]{%
- \ifKV@uvt@biblatex
- \biblatextrue
- \else
- \biblatexfalse
- \fi
-}{%
- \ClassWarning{univie-ling-expose}{unknown biblatex value}%
-}
-
-% apa=<true|false>
-% Load APA style
-\define@boolkey+{uvt}{apa}[true]{%
- \ifKV@uvt@apa
- \apatrue
- \else
- \apafalse
- \fi
-}{%
- \ClassWarning{univie-ling-expose}{unknown apa value}%
-}
-
-% caption=<true|false>
-% Load caption
-\define@boolkey+{uvt}{caption}[true]{%
- \ifKV@uvt@caption
- \captionptrue
- \else
- \captionpfalse
- \fi
-}{%
- \ClassWarning{univie-ling-expose}{unknown caption value}%
-}
-
-% ref=<true|false>
-% Load varioref and prettyref
-\define@boolkey+{uvt}{ref}[true]{%
- \ifKV@uvt@ref
- \refsptrue
- \else
- \refspfalse
- \fi
-}{%
- \ClassWarning{univie-ling-expose}{unknown ref value}%
-}
-
-% covington=<true|false>
-% Load covington
-\define@boolkey+{uvt}{covington}[true]{%
- \ifKV@uvt@covington
- \covingtontrue
- \else
- \covingtonfalse
- \fi
-}{%
- \ClassWarning{univie-ling-expose}{unknown covington value}%
-}
-
-% draftmark=<true|false>
-% Print draftmark
-\define@choicekey*+{uvt}{draftmark}[\val\nr]{true,false,firstpage}{%
- \ifcase\nr\relax% true:
- \draftmarktrue
- \draftmarkfpfalse
- \or% false:
- \draftmarkfalse
- \draftmarkfpfalse
- \or% firstpage:
- \draftmarktrue
- \draftmarkfptrue
- \fi
-}{%
- \ClassWarning{univie-ling-expose}{unknown draft value}%
+\newif\if@uve@biblatex\@uve@biblatextrue
+\newif\if@uve@apa\@uve@apafalse
+\newif\if@uve@captionp\@uve@captionptrue
+\newif\if@uve@draftmark\@uve@draftmarkfalse
+\newif\if@uve@draftmarkfp\@uve@draftmarkfpfalse
+\newif\if@uve@refsp\@uve@refsptrue
+\newif\if@uve@covington\@uve@covingtontrue
+\newif\if@uve@microtype\@uve@microtypetrue
+\newif\if@uve@polyglossia\@uve@polyglossiafalse
+\newif\if@uve@psfonts\@uve@psfontstrue
+\newif\if@uve@otffonts\@uve@otffontsfalse
+\newif\if@uve@usefontenc\@uve@usefontenctrue
+\def\uve@fontenc{T1}
+
+% We use l3keys here since (1) LaTeX2e keys are rather
+% new and (2) do not provide for choice keys yet.
+\ExplSyntaxOn
+\keys_define:nn { uve }
+{
+ % all=<true|false>
+ % Load all (most) packages
+ all.code:n =
+ { \bool_if:nTF {#1} {
+ \@uve@biblatextrue
+ \@uve@captionptrue
+ \@uve@refsptrue
+ \@uve@covingtontrue
+ \@uve@microtypetrue
+ }{
+ \@uve@biblatexfalse
+ \@uve@captionpfalse
+ \@uve@refspfalse
+ \@uve@covingtonfalse
+ \@uve@microtypefalse
+ }
+ },
+ all.usage:n = preamble,
+ % apa=<true|false>
+ % Load APA style
+ apa.legacy_if_set:n = @uve@apa,
+ apa.usage:n = preamble,
+ % biblatex=<true|false>
+ % Load biblatex
+ biblatex.legacy_if_set:n = @uve@biblatex,
+ biblatex.usage:n = preamble,
+ % caption=<true|false>
+ % Load caption
+ caption.legacy_if_set:n = @uve@captionp,
+ caption.usage:n = preamble,
+ % covington=<true|false>
+ % Load covington
+ covington.legacy_if_set:n = @uve@covington,
+ covington.usage:n = preamble,
+ % fontenc=<value|none>
+ % customize font encoding
+ fontenc.code:n =
+ { \str_if_eq:NNTF { #1 } { none } {
+ \@uve@usefontencfalse
+ }{
+ \def\uve@fontenc{#1}
+ }
+ },
+ fontenc.usage:n = preamble,
+ % microtype=<true|false>
+ % Load microtype
+ microtype.legacy_if_set:n = @uve@microtype,
+ microtype.usage:n = preamble,
+ % polyglossia=<true|false>
+ % Load polyglossia
+ polyglossia.legacy_if_set:n = @uve@polyglossia,
+ polyglossia.code:n =
+ { \bool_if:nT {#1} {
+ \@uve@psfontsfalse
+ \@uve@otffontstrue
+ }
+ },
+ polyglossia.usage:n = preamble,
+ % ref=<true|false>
+ % Load varioref and prettyref
+ ref.legacy_if_set:n = @uve@refsp,
+ ref.usage:n = preamble,
+ % draftmark=<true|false|firstpage>
+ % Print draftmark
+ draftmark .choice:,
+ % true
+ draftmark / true .code:n =
+ { \@uve@draftmarktrue
+ \@uve@draftmarkfpfalse
+ },
+ % false
+ draftmark / false .code:n =
+ { \@uve@draftmarkfalse
+ \@uve@draftmarkfpfalse
+ },
+ % firstpage
+ draftmark / firstpage .code:n =
+ { \@uve@draftmarktrue
+ \@uve@draftmarkfptrue
+ },
+ % no val equals to true
+ draftmark .default:n = {true},
+ % fonts=<ps|otf|none>
+ % Select font scheme
+ fonts .choice:,
+ % ps: use PostScript fonts (classic LaTeX)
+ fonts / ps .code:n =
+ { \@uve@psfontstrue
+ \@uve@otffontsfalse
+ },
+ % otf: use OpenType fonts (fontspec)
+ fonts / otf .code:n =
+ { \@uve@psfontsfalse
+ \@uve@otffontstrue
+ },
+ % none: Use no font package
+ fonts / none .code:n =
+ { \@uve@psfontsfalse
+ \@uve@otffontsfalse
+ },
}
+\ExplSyntaxOff
-% microtype=<true|false>
-% Load microtype
-\define@boolkey+{uvt}{microtype}[true]{%
- \ifKV@uvt@microtype
- \microtypetrue
- \else
- \microtypefalse
- \fi
-}{%
- \ClassWarning{univie-ling-expose}{unknown microtype value}%
-}
-
-% polyglossia=<true|false>
-% Load polyglossia
-\define@boolkey+{uvt}{polyglossia}[true]{%
- \ifKV@uvt@polyglossia
- \polyglossiatrue
- \psfontsfalse
- \otffontstrue
- \nofontsfalse
- \else
- \polyglossiafalse
- \fi
-}{%
- \ClassWarning{univie-ling-expose}{unknown polyglossia value}%
-}
-
-% fonts=<ps|otf|none>
-\define@choicekey*+{uvt}{fonts}[\val\nr]{ps,otf,none}{%
- \ifcase\nr\relax% ps: use PostScript fonts (classic LaTeX)
- \psfontstrue
- \otffontsfalse
- \nofontsfalse
- \or% otf: use OpenType fonts (fontspec)
- \psfontsfalse
- \otffontstrue
- \nofontsfalse
- \or% none: Use no font package
- \psfontsfalse
- \otffontsfalse
- \nofontstrue
- \fi
-}{%
- \PackageWarning{univie-ling-expose}{unknown fonts value '#1'}%
-}
+% Process
-% fontenc=<value|false>
-% customize font encoding
-\newif\ifuniv@usefontenc\univ@usefontenctrue
-\def\univ@fontenc{T1}
-\define@choicekey*+{uvt}{fontenc}[\val\nr]{none}{%
- \ifcase\nr\relax% none:
- \univ@usefontencfalse
- \fi
-}{%
- \def\univ@fontenc{#1}%
+\IfFormatAtLeastTF{2022-06-01}
+{
+ \ProcessKeyOptions[uve]
+}{
+ \RequirePackage{l3keys2e}
+ \ProcessKeysOptions{uve}
}
-% Process
-\ProcessOptionsX<uvt>
%% ============================================================
%% BASE CLASS:
@@ -232,43 +192,44 @@
%% LOCALIZATION:
%% ============================================================
-\RequirePackage{translations}
-\DeclareTranslation{German}{draft}{ENTWURF}
-\DeclareTranslation{English}{draft}{DRAFT}
-\DeclareTranslation{German}{section}{Abschnitt}
-\DeclareTranslation{English}{section}{section}
-\DeclareTranslation{German}{footnote}{Anm.}
-\DeclareTranslation{English}{footnote}{fn.}
-\DeclareTranslation{German}{example}{Beispiel}
-\DeclareTranslation{English}{example}{example}
-\DeclareTranslation{German}{stkz}{Studienkennzahl lt. Studienblatt}
-\DeclareTranslation{English}{stkz}{Degree programme code as it appears on the student record sheet}
-\DeclareTranslation{German}{strt}{Studienrichtung lt. Studienblatt}
-\DeclareTranslation{English}{strt}{Degree programme as it appears on the student record sheet}
-\DeclareTranslation{German}{expo}{Expos\'e zum Dissertationsprojekt}
-\DeclareTranslation{English}{expo}{Research Proposal}
-\DeclareTranslation{German}{tpcaption}{Titel des Dissertationsprojekts}
-\DeclareTranslation{English}{tpcaption}{Title of the Dissertation Project}
-\DeclareTranslation{German}{author}{Verfasst von}
-\DeclareTranslation{English}{author}{Submitted by}
-\DeclareTranslation{German}{vienna}{Wien}
-\DeclareTranslation{English}{vienna}{Vienna}
-\DeclareTranslation{German}{supervisor}{Betreut von}
-\DeclareTranslation{English}{supervisor}{Supervisor}
-\DeclareTranslation{German}{cosupervisor}{Mitbetreut von}
-\DeclareTranslation{English}{cosupervisor}{Co-Supervisor}
-\DeclareTranslation{German}{beirat}{Beirat}
-\DeclareTranslation{English}{beirat}{Advisory board}
+\RequirePackage{translator}
+\languagealias{naustrian}{German}
+\deftranslation[to=German]{draft}{ENTWURF}
+\deftranslation[to=English]{draft}{DRAFT}
+\deftranslation[to=German]{section}{Abschnitt}
+\deftranslation[to=English]{section}{section}
+\deftranslation[to=German]{footnote}{Anm.}
+\deftranslation[to=English]{footnote}{fn.}
+\deftranslation[to=German]{example}{Beispiel}
+\deftranslation[to=English]{example}{example}
+\deftranslation[to=German]{stkz}{Studienkennzahl lt. Studienblatt}
+\deftranslation[to=English]{stkz}{Degree programme code as it appears on the student record sheet}
+\deftranslation[to=German]{strt}{Studienrichtung lt. Studienblatt}
+\deftranslation[to=English]{strt}{Degree programme as it appears on the student record sheet}
+\deftranslation[to=German]{expo}{Expos\'e zum Dissertationsprojekt}
+\deftranslation[to=English]{expo}{Research Proposal}
+\deftranslation[to=German]{tpcaption}{Titel des Dissertationsprojekts}
+\deftranslation[to=English]{tpcaption}{Title of the Dissertation Project}
+\deftranslation[to=German]{author}{Verfasst von}
+\deftranslation[to=English]{author}{Submitted by}
+\deftranslation[to=German]{vienna}{Wien}
+\deftranslation[to=English]{vienna}{Vienna}
+\deftranslation[to=German]{supervisor}{Betreut von}
+\deftranslation[to=English]{supervisor}{Supervisor}
+\deftranslation[to=German]{cosupervisor}{Mitbetreut von}
+\deftranslation[to=English]{cosupervisor}{Co-Supervisor}
+\deftranslation[to=German]{beirat}{Beirat}
+\deftranslation[to=English]{beirat}{Advisory board}
%% ============================================================
%% FONTS AND EMPHASIZING:
%% ============================================================
-\ifpsfonts
+\if@uve@psfonts
-\ifuniv@usefontenc
- \RequirePackage[\univ@fontenc]{fontenc}
+\if@uve@usefontenc
+ \RequirePackage[\uve@fontenc]{fontenc}
\fi
% Times
@@ -286,7 +247,7 @@
\fi
-\ifotffonts
+\if@uve@otffonts
\RequirePackage{fontspec}
\setmainfont{Times New Roman}
\setsansfont{Arial}
@@ -380,7 +341,7 @@
\renewcommand{\sectionmark}[1]{\markright{\thesection.\ #1}}
\RequirePackage{scrlayer-scrpage}
\renewcommand{\headfont}{\small\rmfamily}
-\clearscrheadings
+\clearmainofpairofpagestyles
\ihead{\headmark}
\ohead{\pagemark}
\automark{section}
@@ -398,8 +359,8 @@
\raggedbottom
% Micro-typographic polishment
-\ifmicrotype
-\usepackage{microtype}
+\if@uve@microtype
+ \RequirePackage{microtype}
\fi
% Smart quotes
@@ -415,8 +376,8 @@
% Month name
\RequirePackage[ngerman,english]{datetime2}
-\DeclareTranslation{German}{monthyear}{\DTMgermanmonthname{\@dtm@month} \@dtm@year}
-\DeclareTranslation{English}{monthyear}{\DTMenglishmonthname{\@dtm@month} \@dtm@year}
+\deftranslation[to=German]{monthyear}{\DTMgermanmonthname{\@dtm@month} \@dtm@year}
+\deftranslation[to=English]{monthyear}{\DTMenglishmonthname{\@dtm@month} \@dtm@year}
\renewcommand*\maketitle[1][1]{%
\newgeometry{top=2cm,bottom=2.5cm,left=2.5cm,right=2cm}
@@ -474,11 +435,11 @@
\end{flushright}
\vspace{2\baselineskip}
\begin{center}
- {\usekomafont{thesistype}\GetTranslation{expo}}
+ {\usekomafont{thesistype}\translate{expo}}
\end{center}
\vspace{2\baselineskip}
\begin{center}
- {\usekomafont{tpcaption}\GetTranslation{tpcaption}\par}
+ {\usekomafont{tpcaption}\translate{tpcaption}\par}
{\ifx\@title\@empty\else
\usekomafont{title}{\enquote{\@title%
\ifx\@subtitle\@empty\else\linebreak\@subtitle\fi}\par}%
@@ -486,7 +447,7 @@
}
\vskip 2em
{%
- {\usekomafont{tpcaption}\GetTranslation{author}\par}
+ {\usekomafont{tpcaption}\translate{author}\par}
\usekomafont{author}{%
\lineskip 0.75em%
\begin{tabular}[t]{c}
@@ -496,19 +457,19 @@
}%
\end{center}\par
\vfill
- {\usekomafont{date}{\GetTranslation{vienna}, \GetTranslation{monthyear}\par}}%
+ {\usekomafont{date}{\translate{vienna}, \translate{monthyear}\par}}%
\vskip 2em
\usekomafont{codes}{%
\begin{tabular}[t]{@{}>{\raggedright}p{0.4\columnwidth}>{\raggedright}p{0.1\columnwidth}>{\raggedright}p{0.4\columnwidth}}
- \GetTranslation{stkz}: & & \@studienkennzahl\tabularnewline
+ \translate{stkz}: & & \@studienkennzahl\tabularnewline
\noalign{\vskip6pt}
- \GetTranslation{strt}: & & \@studienrichtung\tabularnewline
+ \translate{strt}: & & \@studienrichtung\tabularnewline
\noalign{\vskip6pt}
- \GetTranslation{supervisor}: & & \@supervisor\tabularnewline%
+ \translate{supervisor}: & & \@supervisor\tabularnewline%
\noalign{\vskip6pt}
- \ifx\@cosupervisor\@empty\else\GetTranslation{cosupervisor}: & & \@cosupervisor\tabularnewline\fi
+ \ifx\@cosupervisor\@empty\else\translate{cosupervisor}: & & \@cosupervisor\tabularnewline\fi
\noalign{\vskip6pt}
- \ifx\@beirat\@empty\else\GetTranslation{beirat}: & & \@beirat\fi
+ \ifx\@beirat\@empty\else\translate{beirat}: & & \@beirat\fi
\end{tabular}\par
}
\par
@@ -595,21 +556,19 @@
\def\labelitemi{--}
% Quote (smaller)
-\newcommand*{\OriginalQuote}{}
-\let\OriginalQuote\quote
-\renewcommand*{\quote}{\OriginalQuote\small}
+\let\@uve@save@quote\quote
+\renewcommand*{\quote}{\@uve@save@quote\small}
% Quotation (smaller)
-\newcommand*{\OriginalQuotation}{}
-\let\OriginalQuotation\quotation
-\renewcommand*{\quotation}{\OriginalQuotation\small}
+\let\@uve@save@quotation\quotation
+\renewcommand*{\quotation}{\@uve@save@quotation\small}
% Description (normal italic)
\setkomafont{descriptionlabel}{\normalfont\itshape}
-\ifcovington
-\RequirePackage{covington}
-\renewcommand{\p@equation}[1]{(#1)}
+\if@uve@covington
+ \RequirePackage{covington}
+ \renewcommand{\p@equation}[1]{(#1)}
\fi
%% =============================================================
@@ -619,19 +578,19 @@
%% captionlabel bold
\setkomafont{captionlabel}{\bfseries}
-\ifcaptionp
-\RequirePackage[format=plain,
- justification=RaggedRight,
- singlelinecheck=false
- ]{caption}
+\if@uve@captionp
+ \RequirePackage[format=plain,
+ justification=RaggedRight,
+ singlelinecheck=false
+ ]{caption}
\fi
%% =============================================================
%% POLYGLOSSIA:
%% =============================================================
-\ifpolyglossia
- \ifcaptionp
+\if@uve@polyglossia
+ \if@uve@captionp
\RequirePackage{ragged2e}
\fi
\RequirePackage{polyglossia}
@@ -642,9 +601,9 @@
%% =============================================================
% Biblatex
-\ifbiblatex
+\if@uve@biblatex
-\ifapa
+\if@uve@apa
% Load biblatex with apa style
\RequirePackage[%
style=apa,
@@ -707,10 +666,10 @@
% Change cite command for integrated csquotes env.
\SetCiteCommand{\parencite}
-% End of apa condition
+% End of @uve@apa condition
\fi
-% End of biblatex condition
+% End of @uve@biblatex condition
\fi
%% =============================================================
@@ -719,9 +678,9 @@
\let\origtableofcontents\tableofcontents
\renewcommand*\tableofcontents{%
-\thispagestyle{plain}
-\origtableofcontents
-\clearpage
+ \thispagestyle{plain}
+ \origtableofcontents
+ \clearpage
}
@@ -729,7 +688,7 @@
%% X-REFS:
%% =============================================================
-\ifrefsp
+\if@uve@refsp
\AtBeginDocument{%
% Varioref:
@@ -739,19 +698,19 @@
\def\reftextfaceafter{auf der gegen\"uberliegenden Seite}%
\def\reftextbefore{auf der \reftextvario{vorhergehenden}{vorangegangenen} Seite}%
\def\reftextfacebefore{auf der gegen\"uberliegenden Seite}%
- \def\reftextfaraway[1]{auf S.~\pageref{##1}}%
- \def\reftextpagerange[2]{auf S.~\pageref{##1}--\pageref{##2}}%
+ \def\reftextfaraway#1{auf S.~\pageref{#1}}%
+ \def\reftextpagerange#1#2{auf S.~\pageref{#1}--\pageref{#2}}%
}%
% Prettyref:
% (varioref-Befehle mit eingebunden)
\RequirePackage{prettyref}
- \newrefformat{sec}{\GetTranslation{section}~\ref{#1}}
- \newrefformat{sub}{\GetTranslation{section}~\ref{#1}}
- \newrefformat{anm}{\GetTranslation{footnote}~\ref{#1}}
+ \newrefformat{sec}{\translate{section}~\ref{#1}}
+ \newrefformat{sub}{\translate{section}~\ref{#1}}
+ \newrefformat{anm}{\translate{footnote}~\ref{#1}}
\newrefformat{app}{\appendixname~\vref{#1}}
\newrefformat{tab}{\tablename~\vref{#1}}
\newrefformat{fig}{\figurename~\vref{#1}}
- \newrefformat{exa}{\GetTranslation{example}~\vref{#1}}
+ \newrefformat{exa}{\translate{example}~\vref{#1}}
}
\fi
@@ -761,9 +720,9 @@
%% DRAFT:
%% =============================================================
-\ifdraftmark
+\if@uve@draftmark
-\ifdraftmarkfp
+\if@uve@draftmarkfp
\RequirePackage[firstpageonly]{draftwatermark}
\else
\RequirePackage{draftwatermark}
@@ -774,7 +733,7 @@
vpos=10pt,
anchor=ct,
fontsize=14pt,
- text={\GetTranslation{draft} (\today)}
+ text={\translate{draft} (\today)}
}
\fi
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-handout.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-handout.cls
index 376a91cccd..293064b15d 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-handout.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-handout.cls
@@ -31,386 +31,270 @@
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\filedate{2022/06/18}
-\def\fileversion{1.19}
-\def\filename{univie-ling-handout.cls}
-\NeedsTeXFormat{LaTeX2e}[1997/06/01]
-\ProvidesClass{univie-ling-handout}[%
- \filedate\space v\fileversion\space Univie Ling handout class (JSp)]
+\NeedsTeXFormat{LaTeX2e}[1997/06/01]
+\ProvidesClass{univie-ling-handout}[2022/10/02 v.2.0 Univie Ling handout class (JSp)]
%% ============================================================
%% CLASS OPTIONS
%% ============================================================
-\RequirePackage{xkeyval}
-
-\newif\ifbiblatex\biblatextrue
-\newif\ifapa\apafalse
-\newif\ifcaptionp\captionptrue
-\newif\ifdraftmark\draftmarkfalse
-\newif\ifdraftmarkfp\draftmarkfpfalse
-\newif\ifrefsp\refsptrue
-\newif\ifcovington\covingtontrue
-\newif\ifmicrotype\microtypetrue
-\newif\ifpolyglossia\polyglossiafalse
-\newif\ifpsfonts\psfontstrue
-\newif\ifotffonts\otffontsfalse
-\newif\ifnofonts\nofontsfalse
-
-% all=<true|false>
-% Load all packages
-\define@boolkey+{uvt}{all}[true]{%
- \ifKV@uvt@all
- \biblatextrue
- \captionptrue
- \refsptrue
- \covingtontrue
- \microtypetrue
- \else
- \biblatexfalse
- \captionpfalse
- \refspfalse
- \covingtonfalse
- \microtypefalse
- \fi
-}{%
- \ClassWarning{univie-ling-handout}{unknown 'all' value}%
-}
-
-% biblatex=<true|false>
-% Load biblatex
-\define@boolkey+{uvt}{biblatex}[true]{%
- \ifKV@uvt@biblatex
- \biblatextrue
- \else
- \biblatexfalse
- \fi
-}{%
- \ClassWarning{univie-ling-handout}{unknown biblatex value}%
-}
-
-% apa=<true|false>
-% Load APA style
-\define@boolkey+{uvt}{apa}[true]{%
- \ifKV@uvt@apa
- \apatrue
- \else
- \apafalse
- \fi
-}{%
- \ClassWarning{univie-ling-handout}{unknown apa value}%
-}
-
-% caption=<true|false>
-% Load caption
-\define@boolkey+{uvt}{caption}[true]{%
- \ifKV@uvt@caption
- \captionptrue
- \else
- \captionpfalse
- \fi
-}{%
- \ClassWarning{univie-ling-handout}{unknown caption value}%
-}
-
-% draftmark=<true|false>
-% Print draftmark
-\define@choicekey*+{uvt}{draftmark}[\val\nr]{true,false,firstpage}{%
- \ifcase\nr\relax% true:
- \draftmarktrue
- \draftmarkfpfalse
- \or% false:
- \draftmarkfalse
- \draftmarkfpfalse
- \or% firstpage:
- \draftmarktrue
- \draftmarkfptrue
- \fi
-}{%
- \ClassWarning{univie-ling-handout}{unknown draft value}%
-}
-
-% ref=<true|false>
-% Load varioref and prettyref
-\define@boolkey+{uvt}{ref}[true]{%
- \ifKV@uvt@ref
- \refsptrue
- \else
- \refspfalse
- \fi
-}{%
- \ClassWarning{univie-ling-handout}{unknown ref value}%
-}
-
-% covington=<true|false>
-% Load covington
-\define@boolkey+{uvt}{covington}[true]{%
- \ifKV@uvt@covington
- \covingtontrue
- \else
- \covingtonfalse
- \fi
-}{%
- \ClassWarning{univie-ling-handout}{unknown covington value}%
-}
-
-% microtype=<true|false>
-% Load microtype
-\define@boolkey+{uvt}{microtype}[true]{%
- \ifKV@uvt@microtype
- \microtypetrue
- \else
- \microtypefalse
- \fi
-}{%
- \ClassWarning{univie-ling-handout}{unknown microtype value}%
-}
-
-% polyglossia=<true|false>
-% Load polyglossia
-\define@boolkey+{uvt}{polyglossia}[true]{%
- \ifKV@uvt@polyglossia
- \polyglossiatrue
- \psfontsfalse
- \otffontstrue
- \nofontsfalse
- \else
- \polyglossiafalse
- \fi
-}{%
- \ClassWarning{univie-ling-handout}{unknown polyglossia value}%
-}
-
-% fonts=<ps|otf|none>
-\define@choicekey*+{uvt}{fonts}[\val\nr]{ps,otf,none}{%
- \ifcase\nr\relax% ps: use PostScript fonts (classic LaTeX)
- \psfontstrue
- \otffontsfalse
- \nofontsfalse
- \or% otf: use OpenType fonts (fontspec)
- \psfontsfalse
- \otffontstrue
- \nofontsfalse
- \or% none: Use no font package
- \psfontsfalse
- \otffontsfalse
- \nofontstrue
- \fi
-}{%
- \ClassWarning{univie-ling-handout}{unknown fonts value '#1'}%
-}
-
-% fontsize=<ps|otf|none>
-\def\univ@fontsize{11}
-\define@key{uvt}{fontsize}{%
- \def\univ@fontsize{#1}
-}
-
-% Paper size
-\def\univ@papersize{a4}
-\define@key{uvt}{papersize}{%
- \def\univ@papersize{#1}
-}
-
-% landscape=<true|false>
-\newif\iflandscape\landscapefalse
-\define@boolkey+{uvt}{landscape}[true]{%
- \ifKV@uvt@landscape
- \landscapetrue
- \else
- \landscapefalse
- \fi
-}{%
- \ClassWarning{univie-ling-handout}{unknown landscape value}%
-}
-
-
-% pplogo=<true|false>
-\newif\ifnopplogo\nopplogofalse
-\define@boolkey+{uvt}{pplogo}[true]{%
- \ifKV@uvt@pplogo
- \nopplogofalse
- \else
- \nopplogotrue
- \fi
-}{%
- \ClassWarning{univie-ling-handout}{unknown pplogo value}%
-}
-
+\newif\if@uvh@apa\@uvh@apafalse
+\newif\if@uvh@biblatex\@uvh@biblatextrue
+\newif\if@uvh@breakevent\@uvh@breakeventfalse
+\newif\if@uvh@captionp\@uvh@captionptrue
+\newif\if@uvh@covington\@uvh@covingtontrue
+\newif\if@uvh@draftmark\@uvh@draftmarkfalse
+\newif\if@uvh@draftmarkfp\@uvh@draftmarkfpfalse
+\newif\if@uvh@foldmarks\@uvh@foldmarksfalse
+\newif\if@uvh@landscape\@uvh@landscapefalse
+\newif\if@uvh@lastpage\@uvh@lastpagefalse
+\newif\if@uvh@microtype\@uvh@microtypetrue
+\newif\if@uvh@otffonts\@uvh@otffontsfalse
+\newif\if@uvh@pageonfirst\@uvh@pageonfirsttrue
+\newif\if@uvh@polyglossia\@uvh@polyglossiafalse
+\newif\if@uvh@pplogo\@uvh@pplogotrue
+\newif\if@uvh@psfonts\@uvh@psfontstrue
+\newif\if@uvh@punchmark\@uvh@punchmarkfalse
+\newif\if@uvh@refsp\@uvh@refsptrue
+\newif\if@uvh@swaphead\@uvh@swapheadfalse
+\newif\if@uvh@usefontenc\@uvh@usefontenctrue
+\newif\if@uvh@usewidesubtitle\@uvh@usewidesubtitlefalse
+\def\uvh@fontenc{T1}
+\def\uvh@fontsize{11}
+\def\uvh@papersize{a4}
% Colored logo (default)
-\def\univ@printlogo{\includegraphics[width=74mm]{univielogo}}
-\def\univ@printsmalllogo{\includegraphics[height=14mm]{univielogo}}
-
-% Monochrome logo
-\define@boolkey+{uvt}{bwlogo}[true]{%
- \ifKV@uvt@bwlogo
- \def\univ@printlogo{\includegraphics[width=74mm]{univielogo-sw}}
- \def\univ@printsmalllogo{\includegraphics[height=14mm]{univielogo-sw}}
- \else
- \def\univ@printlogo{\includegraphics[width=74mm]{univielogo}}
- \def\univ@printsmalllogo{\includegraphics[height=14mm]{univielogo}}
- \fi
-}{%
- \ClassWarning{univie-ling-handout}{unknown bwlogo value}%
-}
-
-% Swap title and event in header
-\newif\ifswaphead\swapheadfalse
-\define@boolkey+{uvt}{swaphead}[true]{%
- \ifKV@uvt@swaphead
- \swapheadtrue
- \else
- \swapheadfalse
- \fi
-}{%
- \ClassWarning{univie-ling-handout}{unknown swaphead value}%
-}
-
-% Output total page number
-\newif\iflastpage\lastpagefalse
-\define@boolkey+{uvt}{totalpages}[true]{%
- \ifKV@uvt@totalpages
- \lastpagetrue
- \else
- \lastpagefalse
- \fi
-}{%
- \ClassWarning{univie-ling-handout}{unknown totalpages value}%
-}
-
-% Suppress pagination on first page?
-\newif\ifpageonfirst\pageonfirsttrue
-\define@boolkey+{uvt}{firstpagination}[true]{%
- \ifKV@uvt@firstpagination
- \pageonfirsttrue
- \else
- \pageonfirstfalse
- \fi
-}{%
- \ClassWarning{univie-ling-handout}{unknown firstpagination value}%
-}
-
-% Line break in heading between event and event spec (location, date etc.)
-\newif\ifbreakevent\breakeventfalse
-\define@boolkey+{uvt}{breakevent}[true]{%
- \ifKV@uvt@breakevent
- \breakeventtrue
- \else
- \breakeventfalse
- \fi
-}{%
- \ClassWarning{univie-ling-handout}{unknown breakevent value}%
-}
-
-% Print subtitle over the whole text width
-% (may conflict with address field)
-\newif\ifwidestitle\widestitlefalse
-\define@boolkey+{uvt}{widesubtitle}[true]{%
- \ifKV@uvt@breakevent
- \widestitletrue
- \else
- \widestitlefalse
- \fi
-}{%
- \ClassWarning{univie-ling-handout}{unknown widesubtitle value}%
-}
-
+\def\uvh@printlogo{\includegraphics[width=74mm]{univielogo}}
+\def\uvh@printsmalllogo{\includegraphics[height=14mm]{univielogo}}
% German CD (default)
-\def\cdgerman{
- \def\univ@name{\univ@name@de}
- \def\univ@shortname{\univ@shortname@de}
- \def\univ@university{Universit\"at Wien}
- \def\univ@department{\univ@department@de}
- \def\univ@location{\univ@location@de}
- \def\univ@country{\univ@country@de}
- \def\univ@function{\univ@function@de}
- \def\univ@secfunction{\univ@secfunction@de}
- \def\univ@phoneprefix{T}
- \def\univ@faxprefix{F}
- \def\univ@emailprefix{}
- \def\univ@urlprefix{}
- \def\univ@pageprefix{Seite}
- \def\univ@headerdeptsep{\ $\cdot$\ }
- \def\univ@headernamesep{,\ }
+\def\uvh@cd@german{
+ \def\uvh@name{\uvh@name@de}
+ \def\uvh@shortname{\uvh@shortname@de}
+ \def\uvh@university{Universit\"at Wien}
+ \def\uvh@department{\uvh@department@de}
+ \def\uvh@location{\uvh@location@de}
+ \def\uvh@country{\uvh@country@de}
+ \def\uvh@function{\uvh@function@de}
+ \def\uvh@secfunction{\uvh@secfunction@de}
+ \def\uvh@phoneprefix{T}
+ \def\uvh@faxprefix{F}
+ \def\uvh@emailprefix{}
+ \def\uvh@urlprefix{}
+ \def\uvh@pageprefix{Seite}
+ \def\uvh@headerdeptsep{\ $\cdot$\ }
+ \def\uvh@headernamesep{,\ }
\def\and{\\}
}
-\cdgerman
-
-\define@choicekey*+{uvt}{cd}[\val\nr]{german,english}{%
- \ifcase\nr\relax% german
- \cdgerman
- \or% english
- \def\univ@name{\univ@name@en}
- \def\univ@shortname{\univ@shortname@en}
- \def\univ@university{University of Vienna}
- \def\univ@department{\univ@department@en}
- \def\univ@location{\univ@location@en}
- \def\univ@country{\univ@country@en}
- \def\univ@function{\univ@function@en}
- \def\univ@secfunction{\univ@secfunction@en}
- \def\univ@phoneprefix{T}
- \def\univ@faxprefix{F}
- \def\univ@emailprefix{}
- \def\univ@urlprefix{}
- \def\univ@pageprefix{Page}
- \def\univ@headerdeptsep{\ $\cdot$\ }
- \def\univ@headernamesep{,\ }
- \def\univ@secnamesep{,\ }
- \fi
-}{%
- \ClassWarning{univie-ling-handout}{unknown cd value '#1'}%
-}
-
-
-% Output punch marks?
-\newif\ifuniv@punchmark\univ@punchmarkfalse
-\define@boolkey+{uvt}{punchmarks}[true]{%
- \ifKV@uvt@punchmarks
- \univ@punchmarktrue
- \else
- \univ@punchmarkfalse
- \fi
-}{%
- \ClassWarning{univie-ling-handout}{unknown punchmarks value}%
-}
-
-% Output fold marks?
-\newif\ifuniv@foldmarks\univ@foldmarksfalse
-\define@boolkey+{uvt}{foldmarks}[true]{%
- \ifKV@uvt@foldmarks
- \univ@foldmarkstrue
- \else
- \univ@foldmarksfalse
- \fi
-}{%
- \ClassWarning{univie-ling-handout}{unknown foldmarks value}%
-}
+\def\uvh@cd@english{%
+ \def\uvh@name{\uvh@name@en}
+ \def\uvh@shortname{\uvh@shortname@en}
+ \def\uvh@university{University of Vienna}
+ \def\uvh@department{\uvh@department@en}
+ \def\uvh@location{\uvh@location@en}
+ \def\uvh@country{\uvh@country@en}
+ \def\uvh@function{\uvh@function@en}
+ \def\uvh@secfunction{\uvh@secfunction@en}
+ \def\uvh@phoneprefix{T}
+ \def\uvh@faxprefix{F}
+ \def\uvh@emailprefix{}
+ \def\uvh@urlprefix{}
+ \def\uvh@pageprefix{Page}
+ \def\uvh@headerdeptsep{\ $\cdot$\ }
+ \def\uvh@headernamesep{,\ }
+ \def\uvh@secnamesep{,\ }
+}
+\uvh@cd@german
+
+% We use l3keys here since (1) LaTeX2e keys are rather
+% new and (2) do not provide for choice keys yet.
+\ExplSyntaxOn
+\keys_define:nn { uvh }
+{
+ % all=<true|false>
+ % Load all (most) packages
+ all.code:n =
+ { \bool_if:nTF {#1} {
+ \@uvh@biblatextrue
+ \@uvh@captionptrue
+ \@uvh@refsptrue
+ \@uvh@covingtontrue
+ \@uvh@microtypetrue
+ }{
+ \@uvh@biblatexfalse
+ \@uvh@captionpfalse
+ \@uvh@refspfalse
+ \@uvh@covingtonfalse
+ \@uvh@microtypefalse
+ }
+ },
+ all.usage:n = preamble,
+ % apa=<true|false>
+ % Load APA style
+ apa.legacy_if_set:n = @uvh@apa,
+ apa.usage:n = preamble,
+ % biblatex=<true|false>
+ % Load biblatex
+ biblatex.legacy_if_set:n = @uvh@biblatex,
+ biblatex.usage:n = preamble,
+ % breakevent=<true|false>
+ % Line break in heading between event and event spec (location, date etc.)
+ breakevent.legacy_if_set:n = @uvh@breakevent,
+ breakevent.usage:n = preamble,
+ % bwlogo=<true|false>
+ % Print monochrome logo?
+ bwlogo.code:n =
+ { \bool_if:nTF {#1} {
+ \def\uvh@printlogo{\includegraphics[width=74mm]{univielogo-sw}}
+ \def\uvh@printsmalllogo{\includegraphics[height=14mm]{univielogo-sw}}
+ }{
+ \def\uvh@printlogo{\includegraphics[width=74mm]{univielogo}}
+ \def\uvh@printsmalllogo{\includegraphics[height=14mm]{univielogo}}
+ }
+ },
+ bwlogo.usage:n = preamble,
+ % caption=<true|false>
+ % Load caption
+ caption.legacy_if_set:n = @uvh@captionp,
+ caption.usage:n = preamble,
+ % covington=<true|false>
+ % Load covington
+ covington.legacy_if_set:n = @uvh@covington,
+ covington.usage:n = preamble,
+ % firstpagination=<true|false>
+ % Suppress pagination on first page?
+ firstpagination.legacy_if_set:n = @uvh@pageonfirst,
+ firstpagination.usage:n = preamble,
+ % foldmarks=<true|false>
+ % Output fold marks?
+ foldmarks.legacy_if_set:n = @uvh@foldmarks,
+ foldmarks.usage:n = preamble,
+ % fontenc=<value|none>
+ % customize font encoding
+ fontenc.code:n =
+ { \str_if_eq:NNTF { #1 } { none } {
+ \@uvh@usefontencfalse
+ }{
+ \def\uvh@fontenc{#1}
+ }
+ },
+ fontenc.usage:n = preamble,
+ % fontsize=<size>
+ % Set base font size
+ fontsize.tl_set:N = \uvh@fontsize,
+ fontsize.usage:n = preamble,
+ % landscape=<true|false>
+ % Set landscape
+ landscape.legacy_if_set:n = @uvh@landscape,
+ landscape.usage:n = preamble,
+ % microtype=<true|false>
+ % Load microtype
+ microtype.legacy_if_set:n = @uvh@microtype,
+ microtype.usage:n = preamble,
+ % papersize=<size>
+ % Set paper size
+ papersize.tl_set:N = \uvh@papersize,
+ papersize.usage:n = preamble,
+ % polyglossia=<true|false>
+ % Load polyglossia
+ polyglossia.legacy_if_set:n = @uvh@polyglossia,
+ polyglossia.code:n =
+ { \bool_if:nT {#1} {
+ \@uvh@psfontsfalse
+ \@uvh@otffontstrue
+ }
+ },
+ polyglossia.usage:n = preamble,
+ % pplogo=<true|false>
+ % Print logo on page 2ff.
+ pplogo.legacy_if_set:n = @uvh@pplogo,
+ pplogo.usage:n = preamble,
+ % punchmarks=<true|false>
+ % Output punch marks?
+ punchmarks.legacy_if_set:n = @uvh@punchmark,
+ punchmarks.usage:n = preamble,
+ % ref=<true|false>
+ % Load varioref and prettyref
+ ref.legacy_if_set:n = @uvh@refsp,
+ ref.usage:n = preamble,
+ % swaphead=<true|false>
+ % Swap title and event in header
+ swaphead.legacy_if_set:n = @uvh@swaphead,
+ swaphead.usage:n = preamble,
+ % totalpages=<true|false>
+ % Output total page number
+ totalpages.legacy_if_set:n = @uvh@lastpage,
+ totalpages.usage:n = preamble,
+ % widesubtitle=<true|false>
+ % Print subtitle over the whole text width
+ % (may conflict with address field)
+ widesubtitle.legacy_if_set:n = @uvh@usewidesubtitle,
+ widesubtitle.usage:n = preamble,
+ % cd=<german|english>
+ % CD Language
+ cd .choice:,
+ % german
+ cd / german .code:n = { \uvh@cd@german },
+ % english
+ cd / english .code:n = { \uvh@cd@english },
+ % draftmark=<true|false|firstpage>
+ % Print draftmark
+ draftmark .choice:,
+ % true
+ draftmark / true .code:n =
+ { \@uvh@draftmarktrue
+ \@uvh@draftmarkfpfalse
+ },
+ % false
+ draftmark / false .code:n =
+ { \@uvh@draftmarkfalse
+ \@uvh@draftmarkfpfalse
+ },
+ % firstpage
+ draftmark / firstpage .code:n =
+ { \@uvh@draftmarktrue
+ \@uvh@draftmarkfptrue
+ },
+ % no val equals to true
+ draftmark .default:n = {true},
+ % fonts=<ps|otf|none>
+ % Select font scheme
+ fonts .choice:,
+ % ps: use PostScript fonts (classic LaTeX)
+ fonts / ps .code:n =
+ { \@uvh@psfontstrue
+ \@uvh@otffontsfalse
+ },
+ % otf: use OpenType fonts (fontspec)
+ fonts / otf .code:n =
+ { \@uvh@psfontsfalse
+ \@uvh@otffontstrue
+ },
+ % none: Use no font package
+ fonts / none .code:n =
+ { \@uvh@psfontsfalse
+ \@uvh@otffontsfalse
+ },
+}
+\ExplSyntaxOff
+% Process
-% fontenc=<value|false>
-% customize font encoding
-\newif\ifuniv@usefontenc\univ@usefontenctrue
-\def\univ@fontenc{T1}
-\define@choicekey*+{uvt}{fontenc}[\val\nr]{none}{%
- \ifcase\nr\relax% none:
- \univ@usefontencfalse
- \fi
-}{%
- \def\univ@fontenc{#1}%
+\IfFormatAtLeastTF{2022-06-01}
+{
+ \ProcessKeyOptions[uvh]
+}{
+ \RequirePackage{l3keys2e}
+ \ProcessKeysOptions{uvh}
}
-% Process
-\ProcessOptionsX<uvt>
-
%% ============================================================
%% LOAD REQUIRED BASE CLASS AND PACKAGES
%% ============================================================
% Base class: scrartcl (KOMA-Script)
-\PassOptionsToClass{fontsize=\univ@fontsize,oneside,final}{scrartcl}
-\iflandscape
+\PassOptionsToClass{fontsize=\uvh@fontsize,oneside,final}{scrartcl}
+\if@uvh@landscape
\PassOptionsToClass{landscape}{scrartcl}
\fi
\LoadClass{scrartcl}[1997/04/16]
@@ -431,29 +315,29 @@
\AtEndOfClass{\pagestyle{headings}}
% Use lastpage package if total pages is required
-\iflastpage
+\if@uvh@lastpage
\AtEndOfClass{\RequirePackage{lastpage}}
\fi
% We need graphicx for the logo
\RequirePackage{graphicx}
-\ifpsfonts
- \ifuniv@usefontenc
- \RequirePackage[\univ@fontenc]{fontenc}
- \fi
- % Source Pro fonts
- \usepackage[default,osf]{sourceserifpro}
- \usepackage[osf]{sourcesanspro}
- \usepackage{sourcecodepro}
+\if@uvh@psfonts
+ \if@uvh@usefontenc
+ \RequirePackage[\uvh@fontenc]{fontenc}
+ \fi
+ % Source Pro fonts
+ \RequirePackage[default,osf]{sourceserifpro}
+ \RequirePackage[osf]{sourcesanspro}
+ \RequirePackage{sourcecodepro}
\fi
-\ifotffonts
- \RequirePackage{fontspec}
- % Source Pro fonts
- \setmainfont{SourceSerifPro}[Numbers=OldStyle]
- \setsansfont{SourceSansPro}[Numbers=OldStyle]
- \setmonofont{SourceCodePro}
+\if@uvh@otffonts
+ \RequirePackage{fontspec}
+ % Source Pro fonts
+ \setmainfont{SourceSerifPro}[Numbers=OldStyle]
+ \setsansfont{SourceSansPro}[Numbers=OldStyle]
+ \setmonofont{SourceCodePro}
\fi
@@ -465,19 +349,19 @@
% 0 Predefinitions
% Font settings
-\def\univ@font@event{\fontsize{11}{13pt}\selectfont\mdseries\sffamily}
-\def\univ@font@title{\fontsize{18}{21pt}\selectfont\bfseries\sffamily}
-\def\univ@font@subtitle{\fontsize{13}{16pt}\selectfont\bfseries\sffamily}
-\def\univ@font@sections{\fontsize{13}{16pt}\selectfont\bfseries\sffamily}
-\def\univ@font@department{\fontsize{10}{12pt}\selectfont\bfseries\sffamily}
-\def\univ@font@header{\fontsize{8}{10pt}\selectfont\mdseries\sffamily}
-\def\univ@font@footer{\fontsize{8}{10pt}\selectfont\sffamily}
-\def\univ@font@headertitle{\fontsize{8}{10pt}\selectfont\sffamily}
-\def\univ@font@eventlocdate{\fontsize{11}{13pt}\selectfont\mdseries\sffamily}
+\def\uvh@font@event{\fontsize{11}{13pt}\selectfont\mdseries\sffamily}
+\def\uvh@font@title{\fontsize{18}{21pt}\selectfont\bfseries\sffamily}
+\def\uvh@font@subtitle{\fontsize{13}{16pt}\selectfont\bfseries\sffamily}
+\def\uvh@font@sections{\fontsize{13}{16pt}\selectfont\bfseries\sffamily}
+\def\uvh@font@department{\fontsize{10}{12pt}\selectfont\bfseries\sffamily}
+\def\uvh@font@header{\fontsize{8}{10pt}\selectfont\mdseries\sffamily}
+\def\uvh@font@footer{\fontsize{8}{10pt}\selectfont\sffamily}
+\def\uvh@font@headertitle{\fontsize{8}{10pt}\selectfont\sffamily}
+\def\uvh@font@eventlocdate{\fontsize{11}{13pt}\selectfont\mdseries\sffamily}
\setkomafont{part}{\fontsize{16}{18pt}\bfseries}
\setkomafont{partnumber}{\usekomafont{part}}
-\setkomafont{sectioning}{\univ@font@sections}
+\setkomafont{sectioning}{\uvh@font@sections}
\setkomafont{descriptionlabel}{\normalfont\mdseries}
\setkomafont{captionlabel}{\normalfont\bfseries}
@@ -499,105 +383,105 @@
\setlength\aftertitle{18pt}
% Boxes
-\newsavebox{\univ@box@logo}
+\newsavebox{\uvh@box@logo}
% Aux linebreak macro, since \\ is redefined by beamer article
-\newcommand\umbruch[1][]{\linebreak\ifx\@empty#1\else\vspace{#1}\fi}
+\newcommand*\umbruch[1][]{\linebreak\ifx\@empty#1\else\vspace{#1}\fi}
%% ============================================================
%% 1 Personal data
%% ============================================================
-% a.) department
-\def\univ@department@de{\empty}
-\def\univ@department@en{\empty}
+% a.) Department
+\def\uvh@department@de{\empty}
+\def\uvh@department@en{\empty}
\newcommand*\hoDept[2][\@empty]%
{%
- \ifx\@empty#1\def\univ@department@en{#2}
- \else\def\univ@department@en{#1}\fi
- \def\univ@department@de{#2}
+ \ifx\@empty#1\def\uvh@department@en{#2}
+ \else\def\uvh@department@en{#1}\fi
+ \def\uvh@department@de{#2}
}
% b.) Name & function
-\def\univ@name@de{}
-\def\univ@name@en{}
+\def\uvh@name@de{}
+\def\uvh@name@en{}
\newcommand*\hoName[2][\@empty]%
{%
- \ifx\@empty#1\def\univ@name@en{#2}
- \else\def\univ@name@en{#1}\fi
- \def\univ@name@de{#2}
+ \ifx\@empty#1\def\uvh@name@en{#2}
+ \else\def\uvh@name@en{#1}\fi
+ \def\uvh@name@de{#2}
}
-\def\univ@shortname@de{}
-\def\univ@shortname@en{}
+\def\uvh@shortname@de{}
+\def\uvh@shortname@en{}
\newcommand*\hoShortName[2][\@empty]%
{%
- \ifx\@empty#1\def\univ@shortname@en{#2}
- \else\def\univ@shortname@en{#1}\fi
- \def\univ@shortname@de{#2}
+ \ifx\@empty#1\def\uvh@shortname@en{#2}
+ \else\def\uvh@shortname@en{#1}\fi
+ \def\uvh@shortname@de{#2}
}
%
-\def\univ@function@de{}
-\def\univ@function@en{}
+\def\uvh@function@de{}
+\def\uvh@function@en{}
\newcommand*\hoFunction[2][\@empty]%
{%
- \ifx\@empty#1\def\univ@function@en{#2}
- \else\def\univ@function@en{#1}\fi
- \def\univ@function@de{#2}
+ \ifx\@empty#1\def\uvh@function@en{#2}
+ \else\def\uvh@function@en{#1}\fi
+ \def\uvh@function@de{#2}
}
% c.) A collaborator's name & function
-\def\univ@secname{}
-\newcommand*\hoSecName[1]{\def\univ@secname{#1}}
-\def\univ@shortsecname{}
-\newcommand*\hoShortSecName[1]{\def\univ@shortsecname{#1}}
+\def\uvh@secname{}
+\newcommand*\hoSecName[1]{\def\uvh@secname{#1}}
+\def\uvh@shortsecname{}
+\newcommand*\hoShortSecName[1]{\def\uvh@shortsecname{#1}}
%
-\def\univ@secfunction@de{}
-\def\univ@secfunction@en{}
+\def\uvh@secfunction@de{}
+\def\uvh@secfunction@en{}
\newcommand*\hoSecFunction[2][\@empty]%
{%
- \ifx\@empty#1\def\univ@secfunction@en{#2}
- \else\def\univ@secfunction@en{#1}\fi
- \def\univ@secfunction@de{#2}
+ \ifx\@empty#1\def\uvh@secfunction@en{#2}
+ \else\def\uvh@secfunction@en{#1}\fi
+ \def\uvh@secfunction@de{#2}
}
% d.) Department address
-\def\univ@street{}
-\newcommand*\hoStreet[1]{\def\univ@street{#1}}
+\def\uvh@street{}
+\newcommand*\hoStreet[1]{\def\uvh@street{#1}}
%
-\def\univ@postcode{}
-\newcommand*\hoPostCode[1]{\def\univ@postcode{#1}}
+\def\uvh@postcode{}
+\newcommand*\hoPostCode[1]{\def\uvh@postcode{#1}}
%
-\def\univ@location@de{}
-\def\univ@location@en{}
+\def\uvh@location@de{}
+\def\uvh@location@en{}
\newcommand*\hoLoc[2][\@empty]%
{%
- \ifx\@empty#1\def\univ@location@en{#2}
- \else\def\univ@location@en{#1}\fi
- \def\univ@location@de{#2}
+ \ifx\@empty#1\def\uvh@location@en{#2}
+ \else\def\uvh@location@en{#1}\fi
+ \def\uvh@location@de{#2}
}
%
-\def\univ@country@de{}
-\def\univ@country@en{}
+\def\uvh@country@de{}
+\def\uvh@country@en{}
\newcommand*\hoCountry[2][\@empty]%
{%
- \ifx\@empty#1\def\univ@country@en{#2}
- \else\def\univ@country@en{#1}\fi
- \def\univ@country@de{#2}
+ \ifx\@empty#1\def\uvh@country@en{#2}
+ \else\def\uvh@country@en{#1}\fi
+ \def\uvh@country@de{#2}
}
% e.) Contact
-\def\univ@phone{}
-\newcommand*\hoPhone[1]{\def\univ@phone{#1}}
+\def\uvh@phone{}
+\newcommand*\hoPhone[1]{\def\uvh@phone{#1}}
%
-\def\univ@fax{}
-\newcommand*\hoFax[1]{\def\univ@fax{#1}}
+\def\uvh@fax{}
+\newcommand*\hoFax[1]{\def\uvh@fax{#1}}
%
-\def\univ@email{}
-\newcommand*\hoEMail[1]{\def\univ@email{#1}}
+\def\uvh@email{}
+\newcommand*\hoEMail[1]{\def\uvh@email{#1}}
%
-\def\univ@url{}
-\newcommand*\hoUrl[1]{\def\univ@url{#1}}
+\def\uvh@url{}
+\newcommand*\hoUrl[1]{\def\uvh@url{#1}}
%% ============================================================
@@ -605,135 +489,135 @@
%% ============================================================
% a.) Handout title
-\def\univ@title{}
-\def\univ@title@header{~}
+\def\uvh@title{}
+\def\uvh@title@header{~}
\newcommand{\hoTitle}[2][\@empty]%
{%
- \ifx\@empty#1\def\univ@title@header{#2}
- \else\def\univ@title@header{#1}\fi
- \def\univ@title{#2}
+ \ifx\@empty#1\def\uvh@title@header{#2}
+ \else\def\uvh@title@header{#1}\fi
+ \def\uvh@title{#2}
\thispagestyle{firstpage}%
}
-\def\univ@titleprefix{}
+\def\uvh@titleprefix{}
\newcommand{\hoTitlePrefix}[1]
{%
- \def\univ@titleprefix{#1}%
+ \def\uvh@titleprefix{#1}%
}
% b.) Handout subtitle
-\def\univ@subtitle{}
-\def\univ@widesubtitle{}
+\def\uvh@subtitle{}
+\def\uvh@widesubtitle{}
\newcommand{\hoSubtitle}{\@ifstar{\@@hoSubtitle}{\@hoSubtitle}}
% Starred version: wide subtitle
\newcommand{\@hoSubtitle}[1]
{%
- \ifwidestitle
- \def\univ@widesubtitle{#1}%
+ \if@uvh@usewidesubtitle
+ \def\uvh@widesubtitle{#1}%
\else
- \def\univ@subtitle{#1}%
+ \def\uvh@subtitle{#1}%
\fi
}
% Unstarred version: normal (narrow) subtitle
\newcommand{\@@hoSubtitle}[1]
{%
- \def\univ@widesubtitle{#1}%
+ \def\uvh@widesubtitle{#1}%
}
% c.) Event title
-\def\univ@event{}
-\def\univ@event@header{~}
+\def\uvh@event{}
+\def\uvh@event@header{~}
\newcommand*{\hoEvent}[2][\@empty]{%
- \ifx\@empty#1\def\univ@event@header{#2}
- \else\def\univ@event@header{#1}\fi
- \def\univ@event{#2}
+ \ifx\@empty#1\def\uvh@event@header{#2}
+ \else\def\uvh@event@header{#1}\fi
+ \def\uvh@event{#2}
}
% d.) Event location
-\def\univ@eventlocation{}
-\def\univ@eventlocation@header{}
+\def\uvh@eventlocation{}
+\def\uvh@eventlocation@header{}
\newcommand*{\hoEventLoc}[2][\@empty]{%
- \ifx\@empty#1\def\univ@eventlocation@header{#2}
- \else\def\univ@eventlocation@header{#1}\fi
- \def\univ@eventlocation{#2}
+ \ifx\@empty#1\def\uvh@eventlocation@header{#2}
+ \else\def\uvh@eventlocation@header{#1}\fi
+ \def\uvh@eventlocation{#2}
}
% e.) Event date
-\def\univ@eventdate{}
-\def\univ@eventdate@header{}
+\def\uvh@eventdate{}
+\def\uvh@eventdate@header{}
\newcommand*{\hoEventDate}[2][\@empty]{%
- \ifx\@empty#1\def\univ@eventdate@header{#2}
- \else\def\univ@eventdate@header{#1}\fi
- \def\univ@eventdate{#2}
+ \ifx\@empty#1\def\uvh@eventdate@header{#2}
+ \else\def\uvh@eventdate@header{#1}\fi
+ \def\uvh@eventdate{#2}
}
% The maketitle routine
\renewcommand\maketitle{%
- \newif\ifuniv@eventline\univ@eventlinefalse%
- \ifx\univ@event\empty\else\univ@eventlinetrue\fi%
- \ifx\univ@eventdate\empty\else\univ@eventlinetrue\fi%
- \ifx\univ@eventlocation\empty\else\univ@eventlinetrue\fi%
+ \newif\ifuvh@eventline\uvh@eventlinefalse%
+ \ifx\uvh@event\empty\else\uvh@eventlinetrue\fi%
+ \ifx\uvh@eventdate\empty\else\uvh@eventlinetrue\fi%
+ \ifx\uvh@eventlocation\empty\else\uvh@eventlinetrue\fi%
\vspace*{\beforetitling}%
\hspace*{\titleoffset}%
\begin{minipage}[t]{0.63\columnwidth}%
\raggedright%
- \ifx\univ@event\empty%
+ \ifx\uvh@event\empty%
\else
- \vspace*{\beforeevent}\bgroup\univ@font@event\univ@event\egroup\ifx\univ@eventlocation\empty\else\par\fi%
+ \vspace*{\beforeevent}\bgroup\uvh@font@event\uvh@event\egroup\ifx\uvh@eventlocation\empty\else\par\fi%
\fi%
- \ifx\univ@eventlocation\empty%
+ \ifx\uvh@eventlocation\empty%
\else
- \bgroup\univ@font@eventlocdate\univ@eventlocation\egroup%
+ \bgroup\uvh@font@eventlocdate\uvh@eventlocation\egroup%
\fi%
- \ifx\univ@eventdate\empty%
+ \ifx\uvh@eventdate\empty%
\else%
- \bgroup\univ@font@eventlocdate{} (\univ@eventdate)\egroup%
+ \bgroup\uvh@font@eventlocdate{} (\uvh@eventdate)\egroup%
\fi%
- \ifuniv@eventline\par\fi
- \ifx\univ@title\empty%
+ \ifuvh@eventline\par\fi
+ \ifx\uvh@title\empty%
\else
\vspace{\beforetitle}%
- \ifx\univ@titleprefix\empty%
- \parbox{\textwidth}{\raggedright\univ@font@title\univ@title}\par%
- \ifx\univ@subtitle\empty%
+ \ifx\uvh@titleprefix\empty%
+ \parbox{\textwidth}{\raggedright\uvh@font@title\uvh@title}\par%
+ \ifx\uvh@subtitle\empty%
\else
- \vspace{\beforesubtitle}\noindent\bgroup\raggedright\univ@font@subtitle\univ@subtitle\par\egroup%
+ \vspace{\beforesubtitle}\noindent\bgroup\raggedright\uvh@font@subtitle\uvh@subtitle\par\egroup%
\fi
\else%
\vspace{.15\baselineskip}%
\begin{minipage}{\textwidth}
\begin{tabularx}{\columnwidth}{@{}l@{\enskip}>{\raggedright\arraybackslash}X}
- \univ@font@title\univ@titleprefix & \univ@font@title\univ@title \tabularnewline
- \ifx\univ@subtitle\empty%
+ \uvh@font@title\uvh@titleprefix & \uvh@font@title\uvh@title \tabularnewline
+ \ifx\uvh@subtitle\empty%
\else
\noalign{\vspace{\beforesubtitle}}%
- & \univ@font@subtitle\univ@subtitle \tabularnewline
+ & \uvh@font@subtitle\uvh@subtitle \tabularnewline
\fi
\end{tabularx}%
\end{minipage}%
\fi
\@ifundefined{hypersetup}{}{%
- \hypersetup{pdftitle=\ifx\univ@titleprefix\empty\else\univ@titleprefix~\fi\univ@title,
- pdfauthor=\univ@name,
+ \hypersetup{pdftitle=\ifx\uvh@titleprefix\empty\else\uvh@titleprefix~\fi\uvh@title,
+ pdfauthor=\uvh@name,
pdfcreator={LaTeX2e via LyX}}}%
\fi%
\end{minipage}\par%
- \ifx\univ@widesubtitle\empty%
+ \ifx\uvh@widesubtitle\empty%
\else%
- \vspace{\beforesubtitle}\bgroup\noindent\raggedright\univ@font@subtitle\univ@widesubtitle\par\egroup%
+ \vspace{\beforesubtitle}\bgroup\noindent\raggedright\uvh@font@subtitle\uvh@widesubtitle\par\egroup%
\fi%
\vspace{\aftertitle}%
\@afterindentfalse\@afterheading%
}
% Easy way to change bibliography heading
-\def\univ@bibheading{\refname}
-\newcommand*\Bibheading[1]{\def\univ@bibheading{#1}}
+\def\uvh@bibheading{\refname}
+\newcommand*\Bibheading[1]{\def\uvh@bibheading{#1}}
% Adjust logo positioning for landscape
\newlength\lsoffset
-\iflandscape
-\setlength\lsoffset{8cm}
-\addtolength\headeroffset{\lsoffset}
+\if@uvh@landscape
+ \setlength\lsoffset{8cm}
+ \addtolength\headeroffset{\lsoffset}
\fi
@@ -741,15 +625,16 @@
%% LOCALIZATION:
%% ============================================================
-\RequirePackage{translations}
-\DeclareTranslation{German}{draft}{ENTWURF}
-\DeclareTranslation{English}{draft}{DRAFT}
-\DeclareTranslation{German}{section}{Abschnitt}
-\DeclareTranslation{English}{section}{section}
-\DeclareTranslation{German}{footnote}{Anm.}
-\DeclareTranslation{English}{footnote}{fn.}
-\DeclareTranslation{German}{example}{Beispiel}
-\DeclareTranslation{English}{example}{example}
+\RequirePackage{translator}
+\languagealias{naustrian}{German}
+\deftranslation[to=German]{draft}{ENTWURF}
+\deftranslation[to=English]{draft}{DRAFT}
+\deftranslation[to=German]{section}{Abschnitt}
+\deftranslation[to=English]{section}{section}
+\deftranslation[to=German]{footnote}{Anm.}
+\deftranslation[to=English]{footnote}{fn.}
+\deftranslation[to=German]{example}{Beispiel}
+\deftranslation[to=English]{example}{example}
%% ============================================================
@@ -760,44 +645,44 @@
% First page
\def\ps@firstpage{
- \sbox{\univ@box@logo}{\univ@printlogo}
- \def\univ@thelogo{\parbox{74mm}{\usebox{\univ@box@logo}}}
+ \sbox{\uvh@box@logo}{\uvh@printlogo}
+ \def\uvh@thelogo{\parbox{74mm}{\usebox{\uvh@box@logo}}}
\headheight30mm\headsep2.5mm\footskip8mm
\def\@oddhead{%
\unitlength1mm
\hspace*{\headeroffset}
\begin{picture}(0,0)
- \put(84.5,19){\univ@thelogo}
+ \put(84.5,19){\uvh@thelogo}
\put(107,8){%
\parbox[t]{51.5mm}
{\normalsize\parbox[t]{\linewidth}{%
\begin{flushleft}%
- \if\univ@department\empty\else\vspace*{8pt}\univ@font@department\univ@department\umbruch[3pt]\umbruch\fi%
- \univ@font@header\univ@name%
- \if\univ@function\empty\else\umbruch\univ@function\fi%
- \if\univ@street\empty\else\umbruch\univ@street\fi%
- \if\univ@location\empty\else\umbruch\univ@postcode~\univ@location\fi%
+ \if\uvh@department\empty\else\vspace*{8pt}\uvh@font@department\uvh@department\umbruch[3pt]\umbruch\fi%
+ \uvh@font@header\uvh@name%
+ \if\uvh@function\empty\else\umbruch\uvh@function\fi%
+ \if\uvh@street\empty\else\umbruch\uvh@street\fi%
+ \if\uvh@location\empty\else\umbruch\uvh@postcode~\uvh@location\fi%
\vspace{10pt}%
- \if\univ@phone\empty\else\umbruch\ifx\univ@phoneprefix\empty\else\univ@phoneprefix\ \fi\univ@phone\fi%
- \if\univ@fax\empty\else\umbruch\ifx\univ@faxprefix\empty\else\univ@faxprefix\ \fi\univ@fax\fi%
- \if\univ@email\empty\else\umbruch\ifx\univ@emailprefix\empty\else\univ@emailprefix\ \fi\univ@email\fi%
- \ifx\univ@url\empty\else\umbruch\ifx\univ@urlprefix\empty\else\univ@urlprefix\ \fi\univ@url\fi%
+ \if\uvh@phone\empty\else\umbruch\ifx\uvh@phoneprefix\empty\else\uvh@phoneprefix\ \fi\uvh@phone\fi%
+ \if\uvh@fax\empty\else\umbruch\ifx\uvh@faxprefix\empty\else\uvh@faxprefix\ \fi\uvh@fax\fi%
+ \if\uvh@email\empty\else\umbruch\ifx\uvh@emailprefix\empty\else\uvh@emailprefix\ \fi\uvh@email\fi%
+ \ifx\uvh@url\empty\else\umbruch\ifx\uvh@urlprefix\empty\else\uvh@urlprefix\ \fi\uvh@url\fi%
\end{flushleft}%
}%
}%
}
- \ifuniv@punchmark
+ \if@uvh@punchmark
\put(-27,-112){\line(1,0){4}}
\fi
- \ifuniv@foldmarks
+ \if@uvh@foldmarks
\put(-33,-56){\line(1,0){3}}
\put(-33,-168){\line(1,0){3}}
\fi
\end{picture}
\hfill%
}
- \ifpageonfirst
- \def\@oddfoot{\hfill\univ@font@footer\raggedright\univ@pageprefix~\thepage\iflastpage /\pageref{LastPage}\fi}
+ \if@uvh@pageonfirst
+ \def\@oddfoot{\hfill\uvh@font@footer\raggedright\uvh@pageprefix~\thepage\if@uvh@lastpage /\pageref{LastPage}\fi}
\else
\def\@oddfoot{}
\fi
@@ -808,37 +693,37 @@
%
% Pages > 1
-\newif\ifnoevent\noeventfalse
+\newif\if@uvh@noevent\@uvh@noeventfalse
\def\heventtitlesep{}
\def\ps@headings{%
- \let\orig@and\and%
+ \let\uvh@save@and\and%
\def\and{$\cdot$\ }%
- \ifnopplogo\else\sbox{\univ@box@logo}{\univ@printsmalllogo}\fi
- \def\univ@thelogo{\parbox{90mm}{\usebox{\univ@box@logo}}}
+ \if@uvh@pplogo\sbox{\uvh@box@logo}{\uvh@printsmalllogo}\fi
+ \def\uvh@thelogo{\parbox{90mm}{\usebox{\uvh@box@logo}}}
\headheight30mm\headsep2.5mm\footskip8mm
- \def\titleline{\ifx\univ@title@header\empty\else\univ@font@headertitle%
- \ifx\univ@titleprefix\empty\else\univ@titleprefix~\fi%
- \univ@title@header\linebreak\fi}%
- \ifx\univ@eventlocation@header\empty\ifx\univ@eventdate@header\empty\noeventtrue\fi\fi%
+ \def\titleline{\ifx\uvh@title@header\empty\else\uvh@font@headertitle%
+ \ifx\uvh@titleprefix\empty\else\uvh@titleprefix~\fi%
+ \uvh@title@header\linebreak\fi}%
+ \ifx\uvh@eventlocation@header\empty\ifx\uvh@eventdate@header\empty\@uvh@noeventtrue\fi\fi%
\def\eventline{%
- \univ@font@header\univ@event@header\ifx\univ@eventdate@header\empty\else\ifbreakevent\linebreak\else\ \fi%
- \ifnoevent\else(\ifx\univ@eventlocation@header\empty\else\univ@eventlocation@header, \fi\univ@eventdate@header)\fi\linebreak\fi%
+ \uvh@font@header\uvh@event@header\ifx\uvh@eventdate@header\empty\else\if@uvh@breakevent\linebreak\else\ \fi%
+ \if@uvh@noevent\else(\ifx\uvh@eventlocation@header\empty\else\uvh@eventlocation@header, \fi\uvh@eventdate@header)\fi\linebreak\fi%
}
\def\@oddhead{%
\unitlength1mm
\hspace{\headeroffset}
\begin{picture}(0,0)
- \put(106.2,15){\univ@thelogo}
+ \put(106.2,15){\uvh@thelogo}
\put(-8,25){%
\hspace*{-\lsoffset}%
\parbox[t]{120mm}
{\normalsize\parbox[t]{100mm}{%
\begin{flushleft}%
- \univ@font@header\if\hfuzz\univ@shortname\hfuzz\univ@name\else\univ@shortname\fi
- \if\univ@department\empty\else\univ@headerdeptsep\univ@department\fi\linebreak
- \ifswaphead
+ \uvh@font@header\if\hfuzz\uvh@shortname\hfuzz\uvh@name\else\uvh@shortname\fi
+ \if\uvh@department\empty\else\uvh@headerdeptsep\uvh@department\fi\linebreak
+ \if@uvh@swaphead
\eventline%
\heventtitlesep%
\titleline%
@@ -853,10 +738,10 @@
\end{picture}
\hfill%
}
- \def\@oddfoot{\hfill\univ@font@footer\raggedright\univ@pageprefix~\thepage\iflastpage /\pageref{LastPage}\fi}
+ \def\@oddfoot{\hfill\uvh@font@footer\raggedright\uvh@pageprefix~\thepage\if@uvh@lastpage /\pageref{LastPage}\fi}
\def\@evenhead{\@oddhead}
\def\@evenfoot{\@oddfoot}
- \let\and\orig@and%
+ \let\and\uvh@save@and%
}
@@ -867,22 +752,24 @@
%% captionlabel bold
\setkomafont{captionlabel}{\bfseries}
-\ifcaptionp
-\RequirePackage[format=plain,
- justification=RaggedRight,
- singlelinecheck=false
- ]{caption}
+\if@uvh@captionp
+ \RequirePackage[format=plain,
+ justification=RaggedRight,
+ singlelinecheck=false
+ ]{caption}
\fi
%% =============================================================
%% POLYGLOSSIA:
%% =============================================================
-\ifpolyglossia
- \ifcaptionp
+\if@uvh@polyglossia
+ \if@uvh@captionp
\RequirePackage{ragged2e}
\fi
\RequirePackage{polyglossia}
+\else
+ \RequirePackage{babel}[1997/01/23]
\fi
%% =============================================================
@@ -890,9 +777,9 @@
%% =============================================================
% Biblatex
-\ifbiblatex
+\if@uvh@biblatex
-\ifapa
+\if@uvh@apa
% Load biblatex with apa style
\RequirePackage[%
style=apa,
@@ -955,12 +842,12 @@
% Change cite command for integrated csquotes env.
\AfterPackage*{csquotes}{\SetCiteCommand{\parencite}}
-% End of apa condition
+% End of @uvh@apa condition
\fi
-\DeclarePrintbibliographyDefaults{title=\univ@bibheading}
+\DeclarePrintbibliographyDefaults{title=\uvh@bibheading}
-% End of biblatex condition
+% End of @uvh@biblatex condition
\fi
% Smaller
@@ -968,7 +855,7 @@
% Custom heading
\AtBeginDocument{%
- \renewcommand*\bib@heading{\section*{\univ@bibheading}}
+ \renewcommand*\bib@heading{\section*{\uvh@bibheading}}
}
@@ -984,13 +871,20 @@
%
\RequirePackage{array}
\RequirePackage{ifthen}
-\RequirePackage{babel}[1997/01/23]
% Micro-typographic polishment
-\ifmicrotype
+\if@uvh@microtype
\RequirePackage{microtype}
\fi
+% Quote (smaller)
+\let\@uvh@save@quote\quote
+\renewcommand*{\quote}{\@uvh@save@quote\small}
+
+% Quotation (smaller)
+\let\@uvh@save@quotation\quotation
+\renewcommand*{\quotation}{\@uvh@save@quotation\small}
+
% Smart quotes
\RequirePackage{csquotes}
\ExecuteQuoteOptions{autostyle=tryonce,german=guillemets,austrian=guillemets,maxlevel=3}
@@ -1006,15 +900,12 @@
\newcommand{\urlprefix}{}
% URLs italic
-\@ifundefined{selectfont}{%
-\def\UrlFont{\it}}
-{\def\UrlFont{\rmfamily\itshape}%
-}
+\def\UrlFont{\rmfamily\itshape}
% Covington
-\ifcovington
-\RequirePackage{covington}
-\renewcommand{\p@equation}[1]{(#1)}
+\if@uvh@covington
+ \RequirePackage{covington}
+ \renewcommand{\p@equation}[1]{(#1)}
\fi
@@ -1022,7 +913,7 @@
%% X-REFS:
%% =============================================================
-\ifrefsp
+\if@uvh@refsp
\AtBeginDocument{%
% Varioref:
@@ -1032,19 +923,19 @@
\def\reftextfaceafter{auf der gegen\"uberliegenden Seite}%
\def\reftextbefore{auf der \reftextvario{vorhergehenden}{vorangegangenen} Seite}%
\def\reftextfacebefore{auf der gegen\"uberliegenden Seite}%
- \def\reftextfaraway[1]{auf S.~\pageref{##1}}%
- \def\reftextpagerange[2]{auf S.~\pageref{##1}--\pageref{##2}}%
+ \def\reftextfaraway#1{auf S.~\pageref{#1}}%
+ \def\reftextpagerange#1#2{auf S.~\pageref{#1}--\pageref{#2}}%
}%
% Prettyref:
% (varioref-Befehle mit eingebunden)
\RequirePackage{prettyref}
- \newrefformat{sec}{\GetTranslation{section}~\ref{#1}}
- \newrefformat{sub}{\GetTranslation{section}~\ref{#1}}
- \newrefformat{anm}{\GetTranslation{footnote}~\ref{#1}}
+ \newrefformat{sec}{\translate{section}~\ref{#1}}
+ \newrefformat{sub}{\translate{section}~\ref{#1}}
+ \newrefformat{anm}{\translate{footnote}~\ref{#1}}
\newrefformat{app}{\appendixname~\vref{#1}}
\newrefformat{tab}{\tablename~\vref{#1}}
\newrefformat{fig}{\figurename~\vref{#1}}
- \newrefformat{exa}{\GetTranslation{example}~\vref{#1}}
+ \newrefformat{exa}{\translate{example}~\vref{#1}}
}
\fi
@@ -1054,9 +945,9 @@
%% DRAFT:
%% =============================================================
-\ifdraftmark
+\if@uvh@draftmark
-\ifdraftmarkfp
+\if@uvh@draftmarkfp
\RequirePackage[firstpageonly]{draftwatermark}
\else
\RequirePackage{draftwatermark}
@@ -1067,7 +958,7 @@
vpos=10pt,
anchor=ct,
fontsize=14pt,
- text={\GetTranslation{draft} (\today)}
+ text={\translate{draft} (\today)}
}
\fi
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
index 885551b587..34f029b9ed 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
@@ -32,186 +32,146 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-paper}[2022/06/18 v1.19 Univie Linguistic Papers (JSp)]
+\ProvidesPackage{univie-ling-paper}[2022/10/02 v.2.0 Univie Linguistic Papers (JSp)]
%% ============================================================
%% CLASS OPTIONS
%% ============================================================
-\RequirePackage{xkeyval}
-
-\newif\ifbiblatex\biblatextrue
-\newif\ifapa\apafalse
-\newif\ifcaptionp\captionptrue
-\newif\ifdraftmark\draftmarkfalse
-\newif\ifdraftmarkfp\draftmarkfpfalse
-\newif\ifrefsp\refsptrue
-\newif\ifcovington\covingtontrue
-\newif\ifmicrotype\microtypetrue
-\newif\ifmultiauthors\multiauthorsfalse
-\newif\ifpolyglossia\polyglossiafalse
-\newif\ifpsfonts\psfontstrue
-\newif\ifotffonts\otffontsfalse
-\newif\ifnofonts\nofontsfalse
-
-% all=<true|false>
-% Load all packages
-\define@boolkey+{uvt}{all}[true]{%
- \ifKV@uvt@all
- \biblatextrue
- \captionptrue
- \refsptrue
- \covingtontrue
- \microtypetrue
- \else
- \biblatexfalse
- \captionpfalse
- \refspfalse
- \covingtonfalse
- \microtypefalse
- \fi
-}{%
- \ClassWarning{univie-ling-paper}{unknown 'all' value}%
+\newif\if@uvp@biblatex\@uvp@biblatextrue
+\newif\if@uvp@apa\@uvp@apafalse
+\newif\if@uvp@captionp\@uvp@captionptrue
+\newif\if@uvp@draftmark\@uvp@draftmarkfalse
+\newif\if@uvp@draftmarkfp\@uvp@draftmarkfpfalse
+\newif\if@uvp@refsp\@uvp@refsptrue
+\newif\if@uvp@covington\@uvp@covingtontrue
+\newif\if@uvp@microtype\@uvp@microtypetrue
+\newif\if@uvp@multiauthors\@uvp@multiauthorsfalse
+\newif\if@uvp@polyglossia\@uvp@polyglossiafalse
+\newif\if@uvp@psfonts\@uvp@psfontstrue
+\newif\if@uvp@otffonts\@uvp@otffontsfalse
+\newif\if@uvp@usefontenc\@uvp@usefontenctrue
+\def\uvp@fontenc{T1}
+
+% We use l3keys here since (1) LaTeX2e keys are rather
+% new and (2) do not provide for choice keys yet.
+\ExplSyntaxOn
+\keys_define:nn { uvp }
+{
+ % all=<true|false>
+ % Load all (most) packages
+ all.code:n =
+ { \bool_if:nTF {#1} {
+ \@uvp@biblatextrue
+ \@uvp@captionptrue
+ \@uvp@refsptrue
+ \@uvp@covingtontrue
+ \@uvp@microtypetrue
+ }{
+ \@uvp@biblatexfalse
+ \@uvp@captionpfalse
+ \@uvp@refspfalse
+ \@uvp@covingtonfalse
+ \@uvp@microtypefalse
+ }
+ },
+ all.usage:n = preamble,
+ % apa=<true|false>
+ % Load APA style
+ apa.legacy_if_set:n = @uvp@apa,
+ apa.usage:n = preamble,
+ % biblatex=<true|false>
+ % Load biblatex
+ biblatex.legacy_if_set:n = @uvp@biblatex,
+ biblatex.usage:n = preamble,
+ % caption=<true|false>
+ % Load caption
+ caption.legacy_if_set:n = @uvp@captionp,
+ caption.usage:n = preamble,
+ % covington=<true|false>
+ % Load covington
+ covington.legacy_if_set:n = @uvp@covington,
+ covington.usage:n = preamble,
+ % fontenc=<value|none>
+ % customize font encoding
+ fontenc.code:n =
+ { \str_if_eq:NNTF { #1 } { none } {
+ \@uvp@usefontencfalse
+ }{
+ \def\uvp@fontenc{#1}
+ }
+ },
+ fontenc.usage:n = preamble,
+ % microtype=<true|false>
+ % Load microtype
+ microtype.legacy_if_set:n = @uvp@microtype,
+ microtype.usage:n = preamble,
+ % polyglossia=<true|false>
+ % Load polyglossia
+ polyglossia.legacy_if_set:n = @uvp@polyglossia,
+ polyglossia.code:n =
+ { \bool_if:nT {#1} {
+ \@uvp@psfontsfalse
+ \@uvp@otffontstrue
+ }
+ },
+ polyglossia.usage:n = preamble,
+ % ref=<true|false>
+ % Load varioref and prettyref
+ ref.legacy_if_set:n = @uvp@refsp,
+ ref.usage:n = preamble,
+ % draftmark=<true|false|firstpage>
+ % Print draftmark
+ draftmark .choice:,
+ % true
+ draftmark / true .code:n =
+ { \@uvp@draftmarktrue
+ \@uvp@draftmarkfpfalse
+ },
+ % false
+ draftmark / false .code:n =
+ { \@uvp@draftmarkfalse
+ \@uvp@draftmarkfpfalse
+ },
+ % firstpage
+ draftmark / firstpage .code:n =
+ { \@uvp@draftmarktrue
+ \@uvp@draftmarkfptrue
+ },
+ % no val equals to true
+ draftmark .default:n = {true},
+ % fonts=<ps|otf|none>
+ % Select font scheme
+ fonts .choice:,
+ % ps: use PostScript fonts (classic LaTeX)
+ fonts / ps .code:n =
+ { \@uvp@psfontstrue
+ \@uvp@otffontsfalse
+ },
+ % otf: use OpenType fonts (fontspec)
+ fonts / otf .code:n =
+ { \@uvp@psfontsfalse
+ \@uvp@otffontstrue
+ },
+ % none: Use no font package
+ fonts / none .code:n =
+ { \@uvp@psfontsfalse
+ \@uvp@otffontsfalse
+ },
}
+\ExplSyntaxOff
-% biblatex=<true|false>
-% Load biblatex
-\define@boolkey+{uvt}{biblatex}[true]{%
- \ifKV@uvt@biblatex
- \biblatextrue
- \else
- \biblatexfalse
- \fi
-}{%
- \ClassWarning{univie-ling-paper}{unknown biblatex value}%
-}
-
-% apa=<true|false>
-% Load APA style
-\define@boolkey+{uvt}{apa}[true]{%
- \ifKV@uvt@apa
- \apatrue
- \else
- \apafalse
- \fi
-}{%
- \ClassWarning{univie-ling-paper}{unknown apa value}%
-}
-
-% caption=<true|false>
-% Load caption
-\define@boolkey+{uvt}{caption}[true]{%
- \ifKV@uvt@caption
- \captionptrue
- \else
- \captionpfalse
- \fi
-}{%
- \ClassWarning{univie-ling-paper}{unknown caption value}%
-}
-
-% draftmark=<true|false>
-% Print draftmark
-\define@choicekey*+{uvt}{draftmark}[\val\nr]{true,false,firstpage}{%
- \ifcase\nr\relax% true:
- \draftmarktrue
- \draftmarkfpfalse
- \or% false:
- \draftmarkfalse
- \draftmarkfpfalse
- \or% firstpage:
- \draftmarktrue
- \draftmarkfptrue
- \fi
-}{%
- \ClassWarning{univie-ling-paper}{unknown draft value}%
-}
-
-% ref=<true|false>
-% Load varioref and prettyref
-\define@boolkey+{uvt}{ref}[true]{%
- \ifKV@uvt@ref
- \refsptrue
- \else
- \refspfalse
- \fi
-}{%
- \ClassWarning{univie-ling-paper}{unknown ref value}%
-}
-
-% covington=<true|false>
-% Load covington
-\define@boolkey+{uvt}{covington}[true]{%
- \ifKV@uvt@covington
- \covingtontrue
- \else
- \covingtonfalse
- \fi
-}{%
- \ClassWarning{univie-ling-paper}{unknown covington value}%
-}
-
-% microtype=<true|false>
-% Load microtype
-\define@boolkey+{uvt}{microtype}[true]{%
- \ifKV@uvt@microtype
- \microtypetrue
- \else
- \microtypefalse
- \fi
-}{%
- \ClassWarning{univie-ling-paper}{unknown microtype value}%
-}
-
-% polyglossia=<true|false>
-% Load polyglossia
-\define@boolkey+{uvt}{polyglossia}[true]{%
- \ifKV@uvt@polyglossia
- \polyglossiatrue
- \psfontsfalse
- \otffontstrue
- \nofontsfalse
- \else
- \polyglossiafalse
- \fi
-}{%
- \ClassWarning{univie-ling-paper}{unknown polyglossia value}%
-}
+% Process
-% fonts=<ps|otf|none>
-\define@choicekey*+{uvt}{fonts}[\val\nr]{ps,otf,none}{%
- \ifcase\nr\relax% ps: use PostScript fonts (classic LaTeX)
- \psfontstrue
- \otffontsfalse
- \nofontsfalse
- \or% otf: use OpenType fonts (fontspec)
- \psfontsfalse
- \otffontstrue
- \nofontsfalse
- \or% none: Use no font package
- \psfontsfalse
- \otffontsfalse
- \nofontstrue
- \fi
-}{%
- \PackageWarning{univie-ling-paper}{unknown fonts value '#1'}%
+\IfFormatAtLeastTF{2022-06-01}
+{
+ \ProcessKeyOptions[uvp]
+}{
+ \RequirePackage{l3keys2e}
+ \ProcessKeysOptions{uvp}
}
-% fontenc=<value|false>
-% customize font encoding
-\newif\ifuniv@usefontenc\univ@usefontenctrue
-\def\univ@fontenc{T1}
-\define@choicekey*+{uvt}{fontenc}[\val\nr]{none}{%
- \ifcase\nr\relax% none:
- \univ@usefontencfalse
- \fi
-}{%
- \def\univ@fontenc{#1}%
-}
-
-% Process
-\ProcessOptionsX<uvt>
%% ============================================================
%% BASE CLASS:
@@ -233,87 +193,85 @@
%% LOCALIZATION:
%% ============================================================
-\RequirePackage{translations}
-\DeclareTranslation{German}{draft}{ENTWURF}
-\DeclareTranslation{English}{draft}{DRAFT}
-\DeclareTranslation{German}{subm}{Abgegeben am}
-\DeclareTranslation{English}{subm}{Submission date:}
-\DeclareTranslation{German}{submto}{bei}
-\DeclareTranslation{English}{submto}{Instructor:}
-\DeclareTranslation{German}{author}{Verfasst von}
-\DeclareTranslation{English}{author}{Author}
-\DeclareTranslation{German}{section}{Abschnitt}
-\DeclareTranslation{English}{section}{section}
-\DeclareTranslation{German}{footnote}{Anm.}
-\DeclareTranslation{English}{footnote}{fn.}
-\DeclareTranslation{German}{example}{Beispiel}
-\DeclareTranslation{English}{example}{example}
-\DeclareTranslation{German}{matnr}{Matrikelnummer}
-\DeclareTranslation{English}{matnr}{Matrikelnummer}
-\DeclareTranslation{German}{stkz}{Studienkennzahl}
-\DeclareTranslation{English}{stkz}{Studienkennzahl}
-\DeclareTranslation{German}{erkl}{Erkl\"arung}
-\DeclareTranslation{English}{erkl}{Declaration}
-\DeclareTranslation{German}{selbst1s}{Hiermit versichere ich, dass ich die vorliegende Arbeit selbst\"andig verfasst
+\RequirePackage{translator}
+\languagealias{naustrian}{German}
+\deftranslation[to=German]{draft}{ENTWURF}
+\deftranslation[to=English]{draft}{DRAFT}
+\deftranslation[to=German]{subm}{Abgegeben am}
+\deftranslation[to=English]{subm}{Submission date:}
+\deftranslation[to=German]{submto}{bei}
+\deftranslation[to=English]{submto}{Instructor:}
+\deftranslation[to=German]{author}{Verfasst von}
+\deftranslation[to=English]{author}{Author}
+\deftranslation[to=German]{section}{Abschnitt}
+\deftranslation[to=English]{section}{section}
+\deftranslation[to=German]{footnote}{Anm.}
+\deftranslation[to=English]{footnote}{fn.}
+\deftranslation[to=German]{example}{Beispiel}
+\deftranslation[to=English]{example}{example}
+\deftranslation[to=German]{matnr}{Matrikelnummer}
+\deftranslation[to=English]{matnr}{Matrikelnummer}
+\deftranslation[to=German]{stkz}{Studienkennzahl}
+\deftranslation[to=English]{stkz}{Studienkennzahl}
+\deftranslation[to=German]{erkl}{Erkl\"arung}
+\deftranslation[to=English]{erkl}{Declaration}
+\deftranslation[to=German]{selbst1s}{Hiermit versichere ich, dass ich die vorliegende Arbeit selbst\"andig verfasst
und keine anderen als die angegebenen Hilfsmittel benutzt habe.}
-\DeclareTranslation{German}{selbst1p}{Hiermit versichern wir, dass wir die vorliegende Arbeit selbst\"andig verfasst
+\deftranslation[to=German]{selbst1p}{Hiermit versichern wir, dass wir die vorliegende Arbeit selbst\"andig verfasst
und keine anderen als die angegebenen Hilfsmittel benutzt haben.}
-\DeclareTranslation{German}{selbst2}{Die Stellen der Arbeit, die anderen Quellen im Wortlaut oder dem Sinn nach entnommen wurden, sind durch Herkunftsangaben kenntlich gemacht.
+\deftranslation[to=German]{selbst2}{Die Stellen der Arbeit, die anderen Quellen im Wortlaut oder dem Sinn nach entnommen wurden, sind durch Herkunftsangaben kenntlich gemacht.
Dies gilt auch f\"ur Zeichnungen, Skizzen, bildliche Darstellungen sowie f\"ur Quellen aus dem Internet.}
-\DeclareTranslation{German}{selbst3s}{Ich versichere ferner, dass ich die vorliegende Arbeit weder ganz noch in Teilen bereits als
+\deftranslation[to=German]{selbst3s}{Ich versichere ferner, dass ich die vorliegende Arbeit weder ganz noch in Teilen bereits als
Pr\"ufungsleistung vorgelegt habe.}
-\DeclareTranslation{German}{selbst3p}{Wir versichern ferner, dass wir die vorliegende Arbeit weder ganz noch in Teilen bereits als
+\deftranslation[to=German]{selbst3p}{Wir versichern ferner, dass wir die vorliegende Arbeit weder ganz noch in Teilen bereits als
Pr\"ufungsleistung vorgelegt haben.}
-\DeclareTranslation{English}{selbst1s}{I hereby declare that this paper is entirely my own work and that I used no source material or aids other than those stipulated.}
-\DeclareTranslation{English}{selbst1p}{We hereby declare that this paper is entirely our own work and that we used no source material or aids other than those stipulated.}
-\DeclareTranslation{English}{selbst2}{No part of it has been copied from any work produced by any other person or copied from any other source without reference to the source.
+\deftranslation[to=English]{selbst1s}{I hereby declare that this paper is entirely my own work and that I used no source material or aids other than those stipulated.}
+\deftranslation[to=English]{selbst1p}{We hereby declare that this paper is entirely our own work and that we used no source material or aids other than those stipulated.}
+\deftranslation[to=English]{selbst2}{No part of it has been copied from any work produced by any other person or copied from any other source without reference to the source.
This includes all drawings, sketches, graphics and internet sources.}
-\DeclareTranslation{English}{selbst3s}{Furthermore, I declare that this paper has not been submitted as an examination already, neither as a whole nor in parts.}
-\DeclareTranslation{English}{selbst3p}{Furthermore, we declare that this paper has not been submitted as an examination already, neither as a whole nor in parts.}
-\DeclareTranslation{German}{wien}{Wien}
-\DeclareTranslation{English}{wien}{Vienna}
+\deftranslation[to=English]{selbst3s}{Furthermore, I declare that this paper has not been submitted as an examination already, neither as a whole nor in parts.}
+\deftranslation[to=English]{selbst3p}{Furthermore, we declare that this paper has not been submitted as an examination already, neither as a whole nor in parts.}
+\deftranslation[to=German]{wien}{Wien}
+\deftranslation[to=English]{wien}{Vienna}
%% ============================================================
%% FONTS AND EMPHASIZING:
%% ============================================================
-\ifpsfonts
+\if@uvp@psfonts
-\ifuniv@usefontenc
- \RequirePackage[\univ@fontenc]{fontenc}
-\fi
+ \if@uvp@usefontenc
+ \RequirePackage[\uvp@fontenc]{fontenc}
+ \fi
-% Palatino
-\RequirePackage[osf]{mathpazo}
+ % Palatino
+ \RequirePackage[osf]{mathpazo}
-% Arial or Helvetica
-\IfFileExists{uarial.sty}{%
-\RequirePackage{uarial}
-}{%
-\RequirePackage{helvet}
-}
+ % Arial or Helvetica
+ \IfFileExists{uarial.sty}{%
+ \RequirePackage{uarial}
+ }{%
+ \RequirePackage{helvet}
+ }
-% Source Code Pro (Courier)
-\RequirePackage[scale=.93]{sourcecodepro}
+ % Source Code Pro (Courier)
+ \RequirePackage[scale=.93]{sourcecodepro}
\fi
-\ifotffonts
-\RequirePackage{fontspec}
-\setmainfont{Palatino}
-\setsansfont{Arial}
-\setmonofont{SourceCodePro}
+\if@uvp@otffonts
+ \RequirePackage{fontspec}
+ \setmainfont{Palatino}
+ \setsansfont{Arial}
+ \setmonofont{SourceCodePro}
\fi
% Hyperlinks
\RequirePackage{url}
\newcommand{\urlprefix}{}
% URLs italic
-\@ifundefined{selectfont}{%
-\def\UrlFont{\it}}
-{\def\UrlFont{\rmfamily\itshape}
-}
+\def\UrlFont{\rmfamily\itshape}
% Fix for \slash-Makro, by Donald Arsenau
\def\slash{/\penalty\exhyphenpenalty\hskip\z@skip}
@@ -343,7 +301,7 @@ This includes all drawings, sketches, graphics and internet sources.}
}{}
\def\lectype{\csuse{lectype@#1}}%
\def\lectypeverb{\csuse{lectypeverb@#1}}%
- \iftoggle{customtexttype}{}{\def\@texttype{\csuse{texttype@#1}}}
+ \if@uvp@customtexttype\else\def\@texttype{\csuse{texttype@#1}}\fi%
}%
}
@@ -359,8 +317,8 @@ This includes all drawings, sketches, graphics and internet sources.}
}
\def\@texttype{Seminararbeit}
-\newtoggle{customtexttype}
-\newcommand\texttype[1]{\def\@texttype{#1}\toggletrue{customtexttype}}
+\newif\if@uvp@customtexttype\@uvp@customtexttypefalse
+\newcommand\texttype[1]{\def\@texttype{#1}\@uvp@customtexttypetrue}
\def\@course{}
\newcommand\course[2]{\setkeys{lec}{lectype=#1}\def\@course{#2}}
\def\@instructor{}
@@ -423,7 +381,7 @@ This includes all drawings, sketches, graphics and internet sources.}
%% LAYOUT
%% ============================================================
-\usepackage{setspace}
+\RequirePackage{setspace}
\onehalfspacing
% Header and pagination:
@@ -446,8 +404,8 @@ This includes all drawings, sketches, graphics and internet sources.}
\raggedbottom
% Micro-typographic polishment
-\ifmicrotype
-\usepackage{microtype}
+\if@uvp@microtype
+ \RequirePackage{microtype}
\fi
% Smart quotes
@@ -466,7 +424,7 @@ This includes all drawings, sketches, graphics and internet sources.}
\else
\def\and{%
\end{tabular}%
- \global\multiauthorstrue%
+ \global\@uvp@multiauthorstrue%
\hskip 1em \@plus.17fil%
\begin{tabular}[t]{c}%
}%
@@ -539,7 +497,7 @@ This includes all drawings, sketches, graphics and internet sources.}
}%
\vskip 2em
{%
- \GetTranslation{author}\par
+ \translate{author}\par
\usekomafont{author}{%
\lineskip 0.75em%
\begin{tabular}[t]{c}
@@ -550,7 +508,7 @@ This includes all drawings, sketches, graphics and internet sources.}
\end{tabular}%
\hskip 1em \@plus.17fil%
\begin{tabular}[t]{c}%
- \GetTranslation{matnr}:~
+ \translate{matnr}:~
}%
\usekomafont{date}{%
\begin{tabular}[t]{c}
@@ -560,7 +518,7 @@ This includes all drawings, sketches, graphics and internet sources.}
\end{tabular}%
\hskip 1em \@plus.17fil%
\begin{tabular}[t]{c}%
- \GetTranslation{stkz}:~
+ \translate{stkz}:~
}%
\lineskip 0.75em%
\begin{tabular}[t]{c}
@@ -569,8 +527,8 @@ This includes all drawings, sketches, graphics and internet sources.}
}%
}%
\vfill
- {\usekomafont{date}{\GetTranslation{subm} \@date \par}}%
- {\ifx\@instructor\@empty\else\usekomafont{date}{\GetTranslation{submto} \@instructor\par}\fi}%
+ {\usekomafont{date}{\translate{subm} \@date \par}}%
+ {\ifx\@instructor\@empty\else\usekomafont{date}{\translate{submto} \@instructor\par}\fi}%
\end{center}\par
\@thanks\let\@thanks\@empty
\null
@@ -643,26 +601,26 @@ This includes all drawings, sketches, graphics and internet sources.}
\hline
}%
\clearpage
-\section*{\GetTranslation{erkl}}
+\section*{\translate{erkl}}
-\ifmultiauthors
-\GetTranslation{selbst1p}
+\if@uvp@multiauthors
+ \translate{selbst1p}
\else
-\GetTranslation{selbst1s}
+ \translate{selbst1s}
\fi
-\GetTranslation{selbst2}
+\translate{selbst2}
-\ifmultiauthors
-\GetTranslation{selbst3p}
+\if@uvp@multiauthors
+ \translate{selbst3p}
\else
-\GetTranslation{selbst3s}
+ \translate{selbst3s}
\fi
\bigskip
\bgroup
\raggedleft
-\GetTranslation{wien}, \today
+\translate{wien}, \today
\vspace{15mm}
@@ -708,21 +666,19 @@ This includes all drawings, sketches, graphics and internet sources.}
\def\labelitemi{--}
% Quote (smaller)
-\newcommand*{\OriginalQuote}{}
-\let\OriginalQuote\quote
-\renewcommand*{\quote}{\OriginalQuote\small}
+\let\@uvp@save@quote\quote
+\renewcommand*{\quote}{\@uvp@save@quote\small}
% Quotation (smaller)
-\newcommand*{\OriginalQuotation}{}
-\let\OriginalQuotation\quotation
-\renewcommand*{\quotation}{\OriginalQuotation\small}
+\let\@uvp@save@quotation\quotation
+\renewcommand*{\quotation}{\@uvp@save@quotation\small}
% Description (normal italic)
\setkomafont{descriptionlabel}{\normalfont\itshape}
-\ifcovington
-\RequirePackage{covington}
-\renewcommand{\p@equation}[1]{(#1)}
+\if@uvp@covington
+ \RequirePackage{covington}
+ \renewcommand{\p@equation}[1]{(#1)}
\fi
%% =============================================================
@@ -732,19 +688,19 @@ This includes all drawings, sketches, graphics and internet sources.}
%% captionlabel bold
\setkomafont{captionlabel}{\bfseries}
-\ifcaptionp
-\RequirePackage[format=plain,
- justification=RaggedRight,
- singlelinecheck=false
- ]{caption}
+\if@uvp@captionp
+ \RequirePackage[format=plain,
+ justification=RaggedRight,
+ singlelinecheck=false
+ ]{caption}
\fi
%% =============================================================
%% POLYGLOSSIA:
%% =============================================================
-\ifpolyglossia
- \ifcaptionp
+\if@uvp@polyglossia
+ \if@uvp@captionp
\RequirePackage{ragged2e}
\fi
\RequirePackage{polyglossia}
@@ -755,9 +711,9 @@ This includes all drawings, sketches, graphics and internet sources.}
%% =============================================================
% Biblatex
-\ifbiblatex
+\if@uvp@biblatex
-\ifapa
+\if@uvp@apa
% Load biblatex with apa style
\RequirePackage[%
style=apa,
@@ -820,10 +776,10 @@ This includes all drawings, sketches, graphics and internet sources.}
% Change cite command for integrated csquotes env.
\SetCiteCommand{\parencite}
-% End of apa condition
+% End of @uvp@apa condition
\fi
-% End of biblatex condition
+% End of @uvp@biblatex condition
\fi
%% =============================================================
@@ -842,7 +798,7 @@ This includes all drawings, sketches, graphics and internet sources.}
%% X-REFS:
%% =============================================================
-\ifrefsp
+\if@uvp@refsp
\AtBeginDocument{%
% Varioref:
@@ -852,19 +808,19 @@ This includes all drawings, sketches, graphics and internet sources.}
\def\reftextfaceafter{auf der gegen\"uberliegenden Seite}%
\def\reftextbefore{auf der \reftextvario{vorhergehenden}{vorangegangenen} Seite}%
\def\reftextfacebefore{auf der gegen\"uberliegenden Seite}%
- \def\reftextfaraway[1]{auf S.~\pageref{##1}}%
- \def\reftextpagerange[2]{auf S.~\pageref{##1}--\pageref{##2}}%
+ \def\reftextfaraway#1{auf S.~\pageref{#1}}%
+ \def\reftextpagerange#1#2{auf S.~\pageref{#1}--\pageref{#2}}%
}%
% Prettyref:
% (varioref-Befehle mit eingebunden)
\RequirePackage{prettyref}
- \newrefformat{sec}{\GetTranslation{section}~\ref{#1}}
- \newrefformat{sub}{\GetTranslation{section}~\ref{#1}}
- \newrefformat{anm}{\GetTranslation{footnote}~\ref{#1}}
+ \newrefformat{sec}{\translate{section}~\ref{#1}}
+ \newrefformat{sub}{\translate{section}~\ref{#1}}
+ \newrefformat{anm}{\translate{footnote}~\ref{#1}}
\newrefformat{app}{\appendixname~\vref{#1}}
\newrefformat{tab}{\tablename~\vref{#1}}
\newrefformat{fig}{\figurename~\vref{#1}}
- \newrefformat{exa}{\GetTranslation{example}~\vref{#1}}
+ \newrefformat{exa}{\translate{example}~\vref{#1}}
}
\fi
@@ -874,9 +830,9 @@ This includes all drawings, sketches, graphics and internet sources.}
%% DRAFT:
%% =============================================================
-\ifdraftmark
+\if@uvp@draftmark
-\ifdraftmarkfp
+\if@uvp@draftmarkfp
\RequirePackage[firstpageonly]{draftwatermark}
\else
\RequirePackage{draftwatermark}
@@ -887,7 +843,7 @@ This includes all drawings, sketches, graphics and internet sources.}
vpos=10pt,
anchor=ct,
fontsize=14pt,
- text={\GetTranslation{draft} (\today)}
+ text={\translate{draft} (\today)}
}
\fi
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
index 220f115f53..8cc29a83ac 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
@@ -32,7 +32,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-thesis}[2022/06/18 v1.19 Univie Linguistic Theses (JSp)]
+\ProvidesPackage{univie-ling-thesis}[2022/10/02 v.2.0 Univie Linguistic Theses (JSp)]
%% ============================================================
@@ -41,204 +41,149 @@
\RequirePackage{xkeyval}
-\newif\ifbiblatex\biblatextrue
-\newif\ifapa\apafalse
-\newif\ifcaptionp\captionptrue
-\newif\ifdraftmark\draftmarkfalse
-\newif\ifdraftmarkfp\draftmarkfpfalse
-\newif\ifrefsp\refsptrue
-\newif\ifcovington\covingtontrue
-\newif\ifmicrotype\microtypetrue
-\newif\ifmultiauthors\multiauthorsfalse
-\newif\ifpolyglossia\polyglossiafalse
-\newif\ifpsfonts\psfontstrue
-\newif\ifotffonts\otffontsfalse
-\newif\ifnofonts\nofontsfalse
-\newif\iffdegree\fdegreefalse
-\newif\ifpdfa\pdfafalse
-
-% all=<true|false>
-% Load all packages
-\define@boolkey+{uvt}{all}[true]{%
- \ifKV@uvt@all
- \biblatextrue
- \captionptrue
- \refsptrue
- \covingtontrue
- \microtypetrue
- \else
- \biblatexfalse
- \captionpfalse
- \refspfalse
- \covingtonfalse
- \microtypefalse
- \fi
-}{%
- \ClassWarning{univie-ling-thesis}{unknown 'all' value}%
-}
-
-% biblatex=<true|false>
-% Load biblatex
-\define@boolkey+{uvt}{biblatex}[true]{%
- \ifKV@uvt@biblatex
- \biblatextrue
- \else
- \biblatexfalse
- \fi
-}{%
- \ClassWarning{univie-ling-thesis}{unknown biblatex value}%
+\newif\if@uvt@apa\@uvt@apafalse
+\newif\if@uvt@biblatex\@uvt@biblatextrue
+\newif\if@uvt@captionp\@uvt@captionptrue
+\newif\if@uvt@covington\@uvt@covingtontrue
+\newif\if@uvt@draftmark\@uvt@draftmarkfalse
+\newif\if@uvt@draftmarkfp\@uvt@draftmarkfpfalse
+\newif\if@uvt@fdegree\@uvt@fdegreefalse
+\newif\if@uvt@microtype\@uvt@microtypetrue
+\newif\if@uvt@multiauthors\@uvt@multiauthorsfalse
+\newif\if@uvt@otffonts\@uvt@otffontsfalse
+\newif\if@uvt@pdfa\@uvt@pdfafalse
+\newif\if@uvt@polyglossia\@uvt@polyglossiafalse
+\newif\if@uvt@psfonts\@uvt@psfontstrue
+\newif\if@uvt@refsp\@uvt@refsptrue
+\newif\if@uvt@usefontenc\@uvt@usefontenctrue
+\def\uvt@fontenc{T1}
+
+% We use l3keys here since (1) LaTeX2e keys are rather
+% new and (2) do not provide for choice keys yet.
+\ExplSyntaxOn
+\keys_define:nn { uvt }
+{
+ % all=<true|false>
+ % Load all (most) packages
+ all.code:n =
+ { \bool_if:nTF {#1} {
+ \@uvt@biblatextrue
+ \@uvt@captionptrue
+ \@uvt@refsptrue
+ \@uvt@covingtontrue
+ \@uvt@microtypetrue
+ }{
+ \@uvt@biblatexfalse
+ \@uvt@captionpfalse
+ \@uvt@refspfalse
+ \@uvt@covingtonfalse
+ \@uvt@microtypefalse
+ }
+ },
+ all.usage:n = preamble,
+ % apa=<true|false>
+ % Load APA style
+ apa.legacy_if_set:n = @uvt@apa,
+ apa.usage:n = preamble,
+ % biblatex=<true|false>
+ % Load biblatex
+ biblatex.legacy_if_set:n = @uvt@biblatex,
+ biblatex.usage:n = preamble,
+ % caption=<true|false>
+ % Load caption
+ caption.legacy_if_set:n = @uvt@captionp,
+ caption.usage:n = preamble,
+ % covington=<true|false>
+ % Load covington
+ covington.legacy_if_set:n = @uvt@covington,
+ covington.usage:n = preamble,
+ % fdegree=<true|false>
+ % Female degree forms
+ fdegree.legacy_if_set:n = @uvt@fdegree,
+ fdegree.usage:n = preamble,
+ % fontenc=<value|none>
+ % customize font encoding
+ fontenc.code:n =
+ { \str_if_eq:NNTF { #1 } { none } {
+ \@uvt@usefontencfalse
+ }{
+ \def\uvt@fontenc{#1}
+ }
+ },
+ fontenc.usage:n = preamble,
+ % microtype=<true|false>
+ % Load microtype
+ microtype.legacy_if_set:n = @uvt@microtype,
+ microtype.usage:n = preamble,
+ % pdfa=<true|false>
+ % PDF/A
+ pdfa.legacy_if_set:n = @uvt@pdfa,
+ pdfa.usage:n = preamble,
+ % polyglossia=<true|false>
+ % Load polyglossia
+ polyglossia.legacy_if_set:n = @uvt@polyglossia,
+ polyglossia.code:n =
+ { \bool_if:nT {#1} {
+ \@uvt@psfontsfalse
+ \@uvt@otffontstrue
+ }
+ },
+ polyglossia.usage:n = preamble,
+ % ref=<true|false>
+ % Load varioref and prettyref
+ ref.legacy_if_set:n = @uvt@refsp,
+ ref.usage:n = preamble,
+ % draftmark=<true|false|firstpage>
+ % Print draftmark
+ draftmark .choice:,
+ % true
+ draftmark / true .code:n =
+ { \@uvt@draftmarktrue
+ \@uvt@draftmarkfpfalse
+ },
+ % false
+ draftmark / false .code:n =
+ { \@uvt@draftmarkfalse
+ \@uvt@draftmarkfpfalse
+ },
+ % firstpage
+ draftmark / firstpage .code:n =
+ { \@uvt@draftmarktrue
+ \@uvt@draftmarkfptrue
+ },
+ % no val equals to true
+ draftmark .default:n = {true},
+ % fonts=<ps|otf|none>
+ % Select font scheme
+ fonts .choice:,
+ % ps: use PostScript fonts (classic LaTeX)
+ fonts / ps .code:n =
+ { \@uvt@psfontstrue
+ \@uvt@otffontsfalse
+ },
+ % otf: use OpenType fonts (fontspec)
+ fonts / otf .code:n =
+ { \@uvt@psfontsfalse
+ \@uvt@otffontstrue
+ },
+ % none: Use no font package
+ fonts / none .code:n =
+ { \@uvt@psfontsfalse
+ \@uvt@otffontsfalse
+ },
}
+\ExplSyntaxOff
-% apa=<true|false>
-% Load APA style
-\define@boolkey+{uvt}{apa}[true]{%
- \ifKV@uvt@apa
- \apatrue
- \else
- \apafalse
- \fi
-}{%
- \ClassWarning{univie-ling-thesis}{unknown apa value}%
-}
-
-% caption=<true|false>
-% Load caption
-\define@boolkey+{uvt}{caption}[true]{%
- \ifKV@uvt@caption
- \captionptrue
- \else
- \captionpfalse
- \fi
-}{%
- \ClassWarning{univie-ling-thesis}{unknown caption value}%
-}
-
-% ref=<true|false>
-% Load varioref and prettyref
-\define@boolkey+{uvt}{ref}[true]{%
- \ifKV@uvt@ref
- \refsptrue
- \else
- \refspfalse
- \fi
-}{%
- \ClassWarning{univie-ling-thesis}{unknown ref value}%
-}
-
-% covington=<true|false>
-% Load covington
-\define@boolkey+{uvt}{covington}[true]{%
- \ifKV@uvt@covington
- \covingtontrue
- \else
- \covingtonfalse
- \fi
-}{%
- \ClassWarning{univie-ling-thesis}{unknown covington value}%
-}
-
-% microtype=<true|false>
-% Load microtype
-\define@boolkey+{uvt}{microtype}[true]{%
- \ifKV@uvt@microtype
- \microtypetrue
- \else
- \microtypefalse
- \fi
-}{%
- \ClassWarning{univie-ling-thesis}{unknown microtype value}%
-}
-
-% fdegree=<true|false>
-% Female degree forms
-\define@boolkey+{uvt}{fdegree}[true]{%
- \ifKV@uvt@fdegree
- \fdegreetrue
- \else
- \fdegreefalse
- \fi
-}{%
- \ClassWarning{univie-ling-thesis}{unknown fdegree value}%
-}
-
-% draftmark=<true|false>
-% Print draftmark
-\define@choicekey*+{uvt}{draftmark}[\val\nr]{true,false,firstpage}{%
- \ifcase\nr\relax% true:
- \draftmarktrue
- \draftmarkfpfalse
- \or% false:
- \draftmarkfalse
- \draftmarkfpfalse
- \or% firstpage:
- \draftmarktrue
- \draftmarkfptrue
- \fi
-}{%
- \ClassWarning{univie-ling-thesis}{unknown draft value}%
-}
-
-% polyglossia=<true|false>
-% Load polyglossia
-\define@boolkey+{uvt}{polyglossia}[true]{%
- \ifKV@uvt@polyglossia
- \polyglossiatrue
- \psfontsfalse
- \otffontstrue
- \nofontsfalse
- \else
- \polyglossiafalse
- \fi
-}{%
- \ClassWarning{univie-ling-thesis}{unknown polyglossia value}%
-}
-
-% pdfa=<true|false>
-% PDF/A
-\define@boolkey+{uvt}{pdfa}[true]{%
- \ifKV@uvt@pdfa
- \pdfatrue
- \else
- \pdfafalse
- \fi
-}{%
- \ClassWarning{univie-ling-thesis}{unknown pdfa value}%
-}
-
-% fonts=<ps|otf|none>
-\define@choicekey*+{uvt}{fonts}[\val\nr]{ps,otf,none}{%
- \ifcase\nr\relax% ps: use PostScript fonts (classic LaTeX)
- \psfontstrue
- \otffontsfalse
- \nofontsfalse
- \or% otf: use OpenType fonts (fontspec)
- \psfontsfalse
- \otffontstrue
- \nofontsfalse
- \or% none: Use no font package
- \psfontsfalse
- \otffontsfalse
- \nofontstrue
- \fi
-}{%
- \PackageWarning{univie-ling-thesis}{unknown fonts value '#1'}%
-}
+% Process
-% fontenc=<value|false>
-% customize font encoding
-\newif\ifuniv@usefontenc\univ@usefontenctrue
-\def\univ@fontenc{T1}
-\define@choicekey*+{uvt}{fontenc}[\val\nr]{none}{%
- \ifcase\nr\relax% none:
- \univ@usefontencfalse
- \fi
-}{%
- \def\univ@fontenc{#1}%
+\IfFormatAtLeastTF{2022-06-01}
+{
+ \ProcessKeyOptions[uvt]
+}{
+ \RequirePackage{l3keys2e}
+ \ProcessKeysOptions{uvt}
}
-% Process
-\ProcessOptionsX<uvt>
-
%% ============================================================
%% BASE CLASS:
%% ============================================================
@@ -258,67 +203,70 @@
%% LOCALIZATION:
%% ============================================================
-\RequirePackage{translations}
-\DeclareTranslation{German}{draft}{ENTWURF}
-\DeclareTranslation{English}{draft}{DRAFT}
-\DeclareTranslation{German}{section}{Abschnitt}
-\DeclareTranslation{English}{section}{section}
-\DeclareTranslation{German}{footnote}{Anm.}
-\DeclareTranslation{English}{footnote}{fn.}
-\DeclareTranslation{German}{example}{Beispiel}
-\DeclareTranslation{English}{example}{example}
-\DeclareTranslation{German}{stkz}{Studienkennzahl}
-\DeclareTranslation{English}{stkz}{Studienkennzahl}
-\DeclareTranslation{German}{erkl}{Erkl\"arung}
-\DeclareTranslation{English}{erkl}{Declaration}
-\DeclareTranslation{German}{selbst1s}{Hiermit versichere ich, dass ich die vorliegende Arbeit selbst\"andig verfasst
+\RequirePackage{translator}
+\languagealias{naustrian}{German}
+\deftranslation[to=German]{draft}{ENTWURF}
+\deftranslation[to=English]{draft}{DRAFT}
+\deftranslation[to=German]{chapter}{Kapitel}
+\deftranslation[to=English]{chapter}{chapter}
+\deftranslation[to=German]{section}{Abschnitt}
+\deftranslation[to=English]{section}{section}
+\deftranslation[to=German]{footnote}{Anm.}
+\deftranslation[to=English]{footnote}{fn.}
+\deftranslation[to=German]{example}{Beispiel}
+\deftranslation[to=English]{example}{example}
+\deftranslation[to=German]{stkz}{Studienkennzahl}
+\deftranslation[to=English]{stkz}{Studienkennzahl}
+\deftranslation[to=German]{erkl}{Erkl\"arung}
+\deftranslation[to=English]{erkl}{Declaration}
+\deftranslation[to=German]{selbst1s}{Hiermit versichere ich, dass ich die vorliegende Arbeit selbst\"andig verfasst
und keine anderen als die angegebenen Hilfsmittel benutzt habe.}
-\DeclareTranslation{German}{selbst1p}{Hiermit versichern wir, dass wir die vorliegende Arbeit selbst\"andig verfasst
+\deftranslation[to=German]{selbst1p}{Hiermit versichern wir, dass wir die vorliegende Arbeit selbst\"andig verfasst
und keine anderen als die angegebenen Hilfsmittel benutzt haben.}
-\DeclareTranslation{German}{selbst2}{Die Stellen der Arbeit, die anderen Quellen im Wortlaut oder dem Sinn nach entnommen wurden, sind durch Herkunftsangaben kenntlich gemacht.
+\deftranslation[to=German]{selbst2}{Die Stellen der Arbeit, die anderen Quellen im Wortlaut oder dem Sinn nach entnommen wurden, sind durch Herkunftsangaben kenntlich gemacht.
Dies gilt auch f\"ur Zeichnungen, Skizzen, bildliche Darstellungen sowie f\"ur Quellen aus dem Internet.}
-\DeclareTranslation{German}{selbst3s}{Ich versichere ferner, dass ich die vorliegende Arbeit weder ganz noch in Teilen bereits als
+\deftranslation[to=German]{selbst3s}{Ich versichere ferner, dass ich die vorliegende Arbeit weder ganz noch in Teilen bereits als
Pr\"ufungsleistung vorgelegt habe.}
-\DeclareTranslation{German}{selbst3p}{Wir versichern ferner, dass wir die vorliegende Arbeit weder ganz noch in Teilen bereits als
+\deftranslation[to=German]{selbst3p}{Wir versichern ferner, dass wir die vorliegende Arbeit weder ganz noch in Teilen bereits als
Pr\"ufungsleistung vorgelegt haben.}
-\DeclareTranslation{English}{selbst1s}{I hereby declare that this paper is entirely my own work and that I used no source material or aids other than those stipulated.}
-\DeclareTranslation{English}{selbst1p}{We hereby declare that this paper is entirely our own work and that we used no source material or aids other than those stipulated.}
-\DeclareTranslation{English}{selbst2}{No part of it has been copied from any work produced by any other person or copied from any other source without reference to the source.
+\deftranslation[to=English]{selbst1s}{I hereby declare that this paper is entirely my own work and that I used no source material or aids other than those stipulated.}
+\deftranslation[to=English]{selbst1p}{We hereby declare that this paper is entirely our own work and that we used no source material or aids other than those stipulated.}
+\deftranslation[to=English]{selbst2}{No part of it has been copied from any work produced by any other person or copied from any other source without reference to the source.
This includes all drawings, sketches, graphics and internet sources.}
-\DeclareTranslation{English}{selbst3s}{Furthermore, I declare that this paper has not been submitted as an examination already, neither as a whole nor in parts.}
-\DeclareTranslation{English}{selbst3p}{Furthermore, we declare that this paper has not been submitted as an examination already, neither as a whole nor in parts.}
-\DeclareTranslation{German}{wien}{Wien}
-\DeclareTranslation{English}{wien}{Vienna}
+\deftranslation[to=English]{selbst3s}{Furthermore, I declare that this paper has not been submitted as an examination already, neither as a whole nor in parts.}
+\deftranslation[to=English]{selbst3p}{Furthermore, we declare that this paper has not been submitted as an examination already, neither as a whole nor in parts.}
+\deftranslation[to=German]{wien}{Wien}
+\deftranslation[to=English]{wien}{Vienna}
%% ============================================================
%% FONTS AND EMPHASIZING:
%% ============================================================
-\ifpsfonts
-
-\RequirePackage[T1]{fontenc}\ifuniv@usefontenc
- \RequirePackage[\univ@fontenc]{fontenc}
-\fi
+\if@uvt@psfonts
+ \RequirePackage[T1]{fontenc}
+ \if@uvt@usefontenc
+ \RequirePackage[\uvt@fontenc]{fontenc}
+ \fi
-% Palatino
-\RequirePackage[osf]{mathpazo}
+ % Palatino
+ \RequirePackage[osf]{mathpazo}
-% Arial or Helvetica
-\IfFileExists{uarial.sty}{%
-\RequirePackage{uarial}
-}{%
-\RequirePackage{helvet}
-}
+ % Arial or Helvetica
+ \IfFileExists{uarial.sty}{%
+ \RequirePackage{uarial}
+ }{%
+ \RequirePackage{helvet}
+ }
-% Source Code Pro (Courier)
-\RequirePackage[scale=.93]{sourcecodepro}
+ % Source Code Pro (Courier)
+ \RequirePackage[scale=.93]{sourcecodepro}
\fi
-\ifotffonts
-\RequirePackage{fontspec}
-\setmainfont{Palatino}
-\setsansfont{Arial}
-\setmonofont{SourceCodePro}
+\if@uvt@otffonts
+ \RequirePackage{fontspec}
+ \setmainfont{Palatino}
+ \setsansfont{Arial}
+ \setmonofont{SourceCodePro}
\fi
% Hyperlinks
@@ -363,7 +311,7 @@ This includes all drawings, sketches, graphics and internet sources.}
\def\@thesistype@en{\csuse{thesistype@#1@en}}
\def\@dirtype{\csuse{dirtype@#1}}
\def\@dirtype@en{\csuse{dirtype@#1@en}}
- \iffdegree
+ \if@uvt@fdegree
\def\@degree{\csuse{degree@#1@f}}
\else
\def\@degree{\csuse{degree@#1}}
@@ -476,7 +424,7 @@ This includes all drawings, sketches, graphics and internet sources.}
\renewcommand{\sectionmark}[1]{\markright{\thesection.\ #1}}
\RequirePackage{scrlayer-scrpage}
\renewcommand{\headfont}{\small\rmfamily}
-\clearscrheadings
+\clearmainofpairofpagestyles
\ihead{\headmark}
\ohead{\pagemark}
\automark{chapter}
@@ -494,8 +442,8 @@ This includes all drawings, sketches, graphics and internet sources.}
\raggedbottom
% Micro-typographic polishment
-\ifmicrotype
-\usepackage{microtype}
+\if@uvt@microtype
+ \RequirePackage{microtype}
\fi
% Smart quotes
@@ -515,7 +463,7 @@ This includes all drawings, sketches, graphics and internet sources.}
\else
\def\and{%
\end{tabular}%
- \global\multiauthorstrue%
+ \global\@uvt@multiauthorstrue%
\hskip 1em \@plus.17fil%
\begin{tabular}[t]{c}%
}%
@@ -577,7 +525,7 @@ This includes all drawings, sketches, graphics and internet sources.}
\fi
}%
{\ifx\@volume\@empty\else%
- \vskip 1em\usekomafont{baende}{Band \@volume\ von \@volumes\ Bänden\,/\,volume \@volume\ of \@volumes\ volumes}%
+ \vskip 1em\usekomafont{baende}{Band \@volume\ von \@volumes\ B\"anden\,/\,volume \@volume\ of \@volumes\ volumes}%
\fi%
}%
\vskip 2em
@@ -668,26 +616,26 @@ This includes all drawings, sketches, graphics and internet sources.}
}%
\clearpage
\thispagestyle{plain}%
-\section*{\GetTranslation{erkl}}
+\section*{\translate{erkl}}
-\ifmultiauthors
-\GetTranslation{selbst1p}
+\if@uvt@multiauthors
+ \translate{selbst1p}
\else
-\GetTranslation{selbst1s}
+ \translate{selbst1s}
\fi
-\GetTranslation{selbst2}
+\translate{selbst2}
-\ifmultiauthors
-\GetTranslation{selbst3p}
+\if@uvt@multiauthors
+ \translate{selbst3p}
\else
-\GetTranslation{selbst3s}
+ \translate{selbst3s}
\fi
\bigskip
\bgroup
\raggedleft
-\GetTranslation{wien}, \today
+\translate{wien}, \today
\vspace{15mm}
@@ -734,21 +682,19 @@ This includes all drawings, sketches, graphics and internet sources.}
\def\labelitemi{--}
% Quote (smaller)
-\newcommand*{\OriginalQuote}{}
-\let\OriginalQuote\quote
-\renewcommand*{\quote}{\OriginalQuote\small}
+\let\@uvt@save@quote\quote
+\renewcommand*{\quote}{\@uvt@save@quote\small}
% Quotation (smaller)
-\newcommand*{\OriginalQuotation}{}
-\let\OriginalQuotation\quotation
-\renewcommand*{\quotation}{\OriginalQuotation\small}
+\let\@uvt@save@quotation\quotation
+\renewcommand*{\quotation}{\@uvt@save@quotation\small}
% Description (normal italic)
\setkomafont{descriptionlabel}{\normalfont\itshape}
-\ifcovington
-\RequirePackage{covington}
-\renewcommand{\p@equation}[1]{(#1)}
+\if@uvt@covington
+ \RequirePackage{covington}
+ \renewcommand{\p@equation}[1]{(#1)}
\fi
%% =============================================================
@@ -758,11 +704,11 @@ This includes all drawings, sketches, graphics and internet sources.}
%% captionlabel bold
\setkomafont{captionlabel}{\bfseries}
-\ifcaptionp
-\RequirePackage[format=plain,
- justification=RaggedRight,
- singlelinecheck=false
- ]{caption}
+\if@uvt@captionp
+ \RequirePackage[format=plain,
+ justification=RaggedRight,
+ singlelinecheck=false
+ ]{caption}
\fi
@@ -770,7 +716,7 @@ This includes all drawings, sketches, graphics and internet sources.}
%% PDF-A:
%% =============================================================
-\ifpdfa
+\if@uvt@pdfa
\RequirePackage[a-1b]{pdfx}
\hypersetup{pdfborder={0 0 0}}
\fi
@@ -779,8 +725,8 @@ This includes all drawings, sketches, graphics and internet sources.}
%% POLYGLOSSIA:
%% =============================================================
-\ifpolyglossia
- \ifcaptionp
+\if@uvt@polyglossia
+ \if@uvt@captionp
\RequirePackage{ragged2e}
\fi
\RequirePackage{polyglossia}
@@ -791,9 +737,9 @@ This includes all drawings, sketches, graphics and internet sources.}
%% =============================================================
% Biblatex
-\ifbiblatex
+\if@uvt@biblatex
-\ifapa
+\if@uvt@apa
% Load biblatex with apa style
\RequirePackage[%
style=apa,
@@ -856,10 +802,10 @@ This includes all drawings, sketches, graphics and internet sources.}
% Change cite command for integrated csquotes env.
\SetCiteCommand{\parencite}
-% End of apa condition
+% End of @uvt@apa condition
\fi
-% End of biblatex condition
+% End of @uvt@biblatex condition
\fi
%% =============================================================
@@ -868,9 +814,9 @@ This includes all drawings, sketches, graphics and internet sources.}
\let\origtableofcontents\tableofcontents
\renewcommand*\tableofcontents{%
-\thispagestyle{plain}
-\origtableofcontents
-\clearpage
+ \thispagestyle{plain}
+ \origtableofcontents
+ \clearpage
}
@@ -878,7 +824,7 @@ This includes all drawings, sketches, graphics and internet sources.}
%% X-REFS:
%% =============================================================
-\ifrefsp
+\if@uvt@refsp
\AtBeginDocument{%
% Varioref:
@@ -888,19 +834,20 @@ This includes all drawings, sketches, graphics and internet sources.}
\def\reftextfaceafter{auf der gegen\"uberliegenden Seite}%
\def\reftextbefore{auf der \reftextvario{vorhergehenden}{vorangegangenen} Seite}%
\def\reftextfacebefore{auf der gegen\"uberliegenden Seite}%
- \def\reftextfaraway[1]{auf S.~\pageref{##1}}%
- \def\reftextpagerange[2]{auf S.~\pageref{##1}--\pageref{##2}}%
+ \def\reftextfaraway#1{auf S.~\pageref{#1}}%
+ \def\reftextpagerange#1#2{auf S.~\pageref{#1}--\pageref{#2}}%
}%
% Prettyref:
% (varioref-Befehle mit eingebunden)
\RequirePackage{prettyref}
- \newrefformat{sec}{\GetTranslation{section}~\ref{#1}}
- \newrefformat{sub}{\GetTranslation{section}~\ref{#1}}
- \newrefformat{anm}{\GetTranslation{footnote}~\ref{#1}}
+ \newrefformat{cha}{\translate{chapter}~\vref{#1}}
+ \newrefformat{sec}{\translate{section}~\ref{#1}}
+ \newrefformat{sub}{\translate{section}~\ref{#1}}
+ \newrefformat{anm}{\translate{footnote}~\ref{#1}}
\newrefformat{app}{\appendixname~\vref{#1}}
\newrefformat{tab}{\tablename~\vref{#1}}
\newrefformat{fig}{\figurename~\vref{#1}}
- \newrefformat{exa}{\GetTranslation{example}~\vref{#1}}
+ \newrefformat{exa}{\translate{example}~\vref{#1}}
}
\fi
@@ -910,21 +857,21 @@ This includes all drawings, sketches, graphics and internet sources.}
%% DRAFT:
%% =============================================================
-\ifdraftmark
+\if@uvt@draftmark
-\ifdraftmarkfp
- \RequirePackage[firstpageonly]{draftwatermark}
-\else
- \RequirePackage{draftwatermark}
-\fi
+ \if@uvt@draftmarkfp
+ \RequirePackage[firstpageonly]{draftwatermark}
+ \else
+ \RequirePackage{draftwatermark}
+ \fi
-\DraftwatermarkOptions{%
- angle=0,
- vpos=10pt,
- anchor=ct,
- fontsize=14pt,
- text={\GetTranslation{draft} (\today)}
-}
+ \DraftwatermarkOptions{%
+ angle=0,
+ vpos=10pt,
+ anchor=ct,
+ fontsize=14pt,
+ text={\translate{draft} (\today)}
+ }
\fi
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg-logo.pdf b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg-logo.pdf
index b6c55bdbd7..d21ada2764 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg-logo.pdf
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg-logo.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
index 3d5259d1cc..1be6bd1ccc 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
@@ -33,97 +33,75 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-wlg}[2022/05/30 v1.19 WLG journal layout (JSp)]
+\ProvidesPackage{univie-ling-wlg}[2022/10/02 v.2.0 Univie WLG journal layout (JSp)]
%% ============================================================
%% CLASS OPTIONS:
%% ============================================================
-\RequirePackage{xkeyval}
-
-\newif\ifbiblatex\biblatexfalse
-\newif\ifcovington\covingtontrue
-\newif\ifexpert\expertfalse
-
-% biblatex=<true|false>
-% Load biblatex
-\define@boolkey+{wlg}{biblatex}[true]{%
- \ifKV@wlg@biblatex
- \biblatextrue
- \else
- \biblatexfalse
- \fi
-}{%
- \ClassWarning{univie-ling-wlg}{unknown biblatex value}%
-}
-\DeclareOptionX{biblatex}{\setkeys{wlg}{biblatex=#1}}
-
-% covington=<true|false>
-% Load covington
-\define@boolkey+{wlg}{covington}[true]{%
- \ifKV@wlg@covington
- \covingtontrue
- \else
- \covingtonfalse
- \fi
-}{%
- \ClassWarning{univie-ling-wlg}{unknown covington value}%
-}
-\DeclareOptionX{covington}{\setkeys{wlg}{covington=#1}}
-
-
-% expertfonts=<true|false>
-% Load MinionPro
-\define@boolkey+{wlg}{expertf}[true]{%
- \ifKV@wlg@expertf
- \experttrue
- \else
- \expertfalse
- \fi
-}{%
- \ClassWarning{univie-ling-wlg}{unknown expertfonts value}%
-}
-\DeclareOptionX{expertfonts}{\setkeys{wlg}{expertf=#1}}
-
-% Titlepage?
-\newif\iftitlepage\titlepagefalse
-\newif\ifspecialprint\specialprintfalse
-\define@choicekey*+{wlg}{ttp}[\val\nr]{none,specialprint,issue}{%
- \ifcase\nr\relax% none
- \titlepagefalse
- \or% specialprint:
- \titlepagetrue
- \specialprinttrue
- \or% issue:
- \titlepagetrue
- \specialprintfalse
- \fi
-}{%
- \ClassWarning{univie-ling-wlg}{unknown titlepage value '#1'}%
-}
-\DeclareOptionX{titlepage}{\setkeys{wlg}{ttp=#1}}
-
-% preprint=<true|false>
-\define@boolkey+{wlg}{preprint}[true]{%
-}{%
- \ClassWarning{univie-ling-wlg}{unknown preprint value}%
+\newif\if@wlg@biblatex\@wlg@biblatexfalse
+\newif\if@wlg@covington\@wlg@covingtontrue
+\newif\if@wlg@expert\@wlg@expertfalse
+\newif\if@wlg@titlepage\@wlg@titlepagefalse
+\newif\if@wlg@specialprint\@wlg@specialprintfalse
+
+% We use l3keys here since (1) LaTeX2e keys are rather
+% new and (2) do not provide for choice keys yet.
+\ExplSyntaxOn
+\keys_define:nn { wlg }
+{
+ % biblatex=<true|false>
+ % Load biblatex
+ biblatex.legacy_if_set:n = @wlg@biblatex,
+ biblatex.usage:n = preamble,
+ % covington=<true|false>
+ % Load covington
+ covington.legacy_if_set:n = @wlg@covington,
+ covington.usage:n = preamble,
+ % expertfonts=<true|false>
+ % Load MinionPro
+ expertfonts.legacy_if_set:n = @wlg@expert,
+ expertfonts.usage:n = preamble,
+ % preprint=<true|false>
+ preprint.legacy_if_set:n = @wlg@preprint,
+ preprint.usage:n = preamble,
+ % peerrev=<true|false>
+ peerrev.legacy_if_set:n = @wlg@peerrev,
+ peerrev.usage:n = preamble,
+ % titlepage=<none|specialprint|issue>
+ titlepage .choice:,
+ % none
+ titlepage / none .code:n =
+ { \@wlg@titlepagefalse
+ \@wlg@specialprintfalse
+ },
+ % specialprint
+ titlepage / specialprint .code:n =
+ { \@wlg@titlepagetrue
+ \@wlg@specialprinttrue
+ },
+ % issue
+ titlepage / issue .code:n =
+ { \@wlg@titlepagetrue
+ \@wlg@specialprintfalse
+ },
+}
+\ExplSyntaxOff
+
+\IfFormatAtLeastTF{2022-06-01}
+{
+ \ProcessKeyOptions[wlg]
+}{
+ \RequirePackage{l3keys2e}
+ \ProcessKeysOptions{wlg}
}
-\DeclareOptionX{preprint}{\setkeys{wlg}{preprint=#1}}
-% peerrev=<true|false>
-\define@boolkey+{wlg}{peerrev}[true]{%
-}{%
- \ClassWarning{univie-ling-wlg}{unknown peerrev value}%
-}
-\DeclareOptionX{peerrev}{\setkeys{wlg}{peerrev=#1}}
-
-\DeclareOption*{%
-\PassOptionsToClass{\CurrentOption}{scrartcl}%
-}
-\ProcessOptionsX
+%% ============================================================
+%% BASE CLASS:
+%% ============================================================
\LoadClass{scrartcl}[2003/04/22]
@@ -140,9 +118,7 @@
abstract=on,
twoside=semi
}
-\iftitlepage
-\KOMAoptions{titlepage=true}
-\fi
+
\recalctypearea
@@ -162,17 +138,17 @@
%% ============================================================
% Roman Font:
-\ifexpert
-% Adobe Minion (Expert)
-\RequirePackage[footnotefigures]{MinionPro}
+\if@wlg@expert
+ % Adobe Minion (Expert)
+ \RequirePackage[footnotefigures]{MinionPro}
\else
-% Crimson
-\RequirePackage[osf]{cochineal}
-% Enable bold and slanted in IPA
-\AtBeginDocument{%
- \@ifpackageloaded{tipa}{%
- \DeclareFontFamilySubstitution{T3}{Cochineal-TOsF}{cmr}}{}
-}
+ % Crimson
+ \RequirePackage[osf]{cochineal}
+ % Enable bold and slanted in IPA
+ \AtBeginDocument{%
+ \@ifpackageloaded{tipa}{%
+ \DeclareFontFamilySubstitution{T3}{Cochineal-TOsF}{cmr}}{}
+ }
\fi
% Hyperlinks
@@ -204,6 +180,16 @@
\RequirePackage{translator}
\languagealias{naustrian}{German}
+\deftranslation[to=German]{chapter}{Kapitel}
+\deftranslation[to=English]{chapter}{chapter}
+\deftranslation[to=German]{section}{Abschnitt}
+\deftranslation[to=English]{section}{section}
+\deftranslation[to=German]{footnote}{Anm.}
+\deftranslation[to=English]{footnote}{fn.}
+\deftranslation[to=German]{example}{Beispiel}
+\deftranslation[to=English]{example}{example}
+\deftranslation[to=German]{argumentation}{Argumentation}
+\deftranslation[to=English]{argumentation}{argumentation}
\deftranslation[to=German]{issue}{Ausgabe}
\deftranslation[to=English]{issue}{Issue}
\deftranslation[to=German]{univie}{Universit\"at Wien}
@@ -263,20 +249,20 @@
\AtBeginDocument{%
-\addto\captionsngerman{\renewcommand*\contentsname{Inhalt}}%
-\addto\captionsnaustrian{\renewcommand*\contentsname{Inhalt}}%
-}
-\AtEndPreamble{
-% License
-\PassOptionsToPackage{%
- imagewidth=8em,
- imagedistance=1em,
- imagemodifier=-eu-88x31,
- hyphenation=RaggedRight,
- type={CC},
- modifier={by-nc-nd},
- version={4.0}}{doclicense}
-\RequirePackage{doclicense}
+ \addto\captionsngerman{\renewcommand*\contentsname{Inhalt}}%
+ \addto\captionsnaustrian{\renewcommand*\contentsname{Inhalt}}%
+}
+\AtEndPreamble{%
+ % License
+ \PassOptionsToPackage{%
+ imagewidth=8em,
+ imagedistance=1em,
+ imagemodifier=-eu-88x31,
+ hyphenation=RaggedRight,
+ type={CC},
+ modifier={by-nc-nd},
+ version={4.0}}{doclicense}
+ \RequirePackage{doclicense}
}
\newcommand\impressum{%
@@ -318,7 +304,7 @@
\item[\textbf{\textsc{nbn}:}] BI,078,1063
\end{labeling}
\vspace*{-.5em}
-\ifKV@wlg@peerrev
+\if@wlg@peerrev
\noindent\translate{peerrev}\par\vspace*{.5em}
\fi
\noindent\translate{appform}\par
@@ -344,14 +330,16 @@
%% TOC
%% ============================================================
-\RequirePackage{etoc}
-\etocstandardlines
-\etocsetstyle{chapter}
- {}
- {\normalsize\mdseries\rmfamily}
- {\etocname{}\dotfill\etocpage\par\vspace{12pt}}
- {}
-\setcounter{tocdepth}{0}
+\if@wlg@specialprint\else
+ \RequirePackage{etoc}
+ \etocstandardlines
+ \etocsetstyle{chapter}
+ {}
+ {\normalsize\mdseries\rmfamily}
+ {\etocname{}\dotfill\etocpage\par\vspace{12pt}}
+ {}
+ \setcounter{tocdepth}{0}
+\fi
%% ============================================================
@@ -363,18 +351,18 @@
\renewcommand{\sectionmark}[1]{\markright{\thesection.\ #1}}
\RequirePackage{scrlayer-scrpage}
\renewcommand{\headfont}{\small\rmfamily}
-\clearscrheadings
+\clearmainofpairofpagestyles
\ohead{\pagemark}
\automark{section}
\KOMAoptions{headsepline=true}
\pagestyle{scrheadings}
% Macrotypographic sectioning
-\newif\if@mainmatter\@mainmattertrue
-\newif\if@frontmatter\@frontmatterfalse
+\newif\if@wlg@mainmatter\@wlg@mainmattertrue
+\newif\if@wlg@frontmatter\@wlg@frontmatterfalse
\newcommand*\frontmatter{%
\if@twoside\cleardoubleoddpage\else\clearpage\fi
- \@mainmatterfalse\@frontmattertrue\pagenumbering{roman}%
+ \@wlg@mainmatterfalse\@wlg@frontmattertrue\pagenumbering{roman}%
\edef\computelastpage{%
\romannumeral\numexpr\getpagerefnumber{LastFrontPage}-1\relax}%
\edef\startpageref{%
@@ -383,13 +371,13 @@
\newcommand*\mainmatter{%
\if@twoside\cleardoubleoddpage\else\clearpage\fi%
\immediate\write\@auxout{\noexpand\newlabel{LastFrontPage}{{}{\arabic{page}}}}%
- \@mainmattertrue\@frontmatterfalse%
+ \@wlg@mainmattertrue\@wlg@frontmatterfalse%
\pagenumbering{arabic}%
\def\computelastpage{\pageref{TotPages}}%
\def\startpageref{\thestartpage}%
}
\newcommand*\backmatter{%
- \if@openright\cleardoubleoddpage\else\clearpage\fi\@mainmatterfalse\@frontmatterfalse%
+ \if@openright\cleardoubleoddpage\else\clearpage\fi\@wlg@mainmatterfalse\@wlg@frontmatterfalse%
\def\computelastpage{\pageref{TotPages}}%
\def\startpageref{\thestartpage}%
}
@@ -407,9 +395,9 @@
\AfterPackage*{inputenc}{%
\RequirePackage{csquotes}
\ExecuteQuoteOptions{autostyle=try,german=guillemets,austrian=guillemets,maxlevel=3}
- \ifbiblatex
- % Change cite command for integrated csquotes env.
- \SetCiteCommand{\parencite}
+ \if@wlg@biblatex
+ % Change cite command for integrated csquotes env.
+ \SetCiteCommand{\parencite}
\fi
\renewcommand{\mktextdel}[1]{[\,]}
}
@@ -431,12 +419,14 @@
\RequirePackage{xcolor}
\RequirePackage{graphicx}
-\RequirePackage{hyperref}
-\hypersetup{%
-bookmarksnumbered=true,
-breaklinks=true,
-colorlinks=false,
-pdfborder={0 0 0}
+\AtEndOfClass{%
+ \RequirePackage{hyperref}
+ \hypersetup{%
+ bookmarksnumbered=true,
+ breaklinks=true,
+ colorlinks=false,
+ pdfborder={0 0 0}
+ }%
}
\def\@author{}
@@ -451,8 +441,10 @@ pdfborder={0 0 0}
}
% Author affiliation (starred: corresponding author)
-\DeclareRobustCommand*\aff{%
- \@ifstar\@@aff\@aff
+\DeclareExpandableDocumentCommand{\aff}{som}{%
+ \texorpdfstring
+ {\IfBooleanTF{#1}{\@@aff}{\@aff}[#2]{#3}}
+ {}%
}
% Empty (will be redefined in the article title)
@@ -487,8 +479,8 @@ pdfborder={0 0 0}
\def\@pubyear{}
\newcommand\issue[2]{\def\@issue{#1}\def\@pubyear{#2}}
-\newif\iftitlepageneeded\titlepageneededtrue
-\newif\ifstartpageset\startpagesetfalse
+\newif\if@wlg@titlepageneeded\@wlg@titlepageneededtrue
+\newif\if@wlg@startpageset\@wlg@startpagesetfalse
\def\ljobname{\jobname}
@@ -497,12 +489,12 @@ pdfborder={0 0 0}
\else
\def\and{\texorpdfstring{\unskip\slash}{| }}%
\fi
- \iftitlepage
+ \if@wlg@titlepage
\@maketitlepage[#1]%
\fi
- \ifstartpageset\else
+ \if@wlg@startpageset\else
\setcounter{page}{\thestartpage}
- \global\startpagesettrue
+ \global\@wlg@startpagesettrue
\fi
\rehead{\@@author}
\lohead{\@@title}
@@ -568,8 +560,10 @@ pdfborder={0 0 0}
}%
\newcommand{\@maketitlepage}[1][1]{%
- \iftitlepageneeded
+ \if@wlg@titlepageneeded
\begin{titlepage}
+ \pagenumbering{alph}
+ \thispagestyle{empty}%
\setcounter{page}{%
#1%
}%
@@ -593,7 +587,7 @@ pdfborder={0 0 0}
{\usekomafont{subject}{\@subject\par}}%
\vskip 3em
\fi
- \ifspecialprint
+ \if@wlg@specialprint
{\usekomafont{title}{\@title\par}}%
\vskip 1em
{\ifx\@subtitle\@empty\else\usekomafont{subtitle}{\@subtitle\par}\fi}%
@@ -604,10 +598,10 @@ pdfborder={0 0 0}
}%
}%
\vfill
- {\usekomafont{date}{\ifKV@wlg@preprint\translate{preprintfrom}%
+ {\usekomafont{date}{\if@wlg@preprint\translate{preprintfrom}%
\else\translate{specialprint}\fi\ \emph{Wiener Linguistische Gazette}
(\versal{WLG})
- \@issue\ (\@pubyear)\ifKV@wlg@preprint\else: \startpageref--\lastpageref\fi\par}}
+ \@issue\ (\@pubyear)\if@wlg@preprint\else: \startpageref--\lastpageref\fi\par}}
{\ifx\@issuetitle\@empty\else
\vskip 1em
\usekomafont{date}{\translate{specialissue} \itshape\@issuetitle
@@ -687,14 +681,14 @@ pdfborder={0 0 0}
~\vfill
\impressum
\clearpage
- \ifspecialprint\else
+ \if@wlg@specialprint\else
\ifx\@issuetitle\@empty\else
\thispagestyle{plain}
\tableofcontents
\clearpage
\fi
\fi
- \global\titlepageneededfalse%
+ \global\@wlg@titlepageneededfalse%
\fi%
}
@@ -746,7 +740,7 @@ pdfborder={0 0 0}
\translate{lingdep}\par
\translate{univie}\par
\translate{issue} \@issue\ (\@pubyear):
- \ifKV@wlg@preprint\translate{preprint}%
+ \if@wlg@preprint\translate{preprint}%
\else\thepage--\lastpageref\fi%
}%
\vskip \z@ \@plus 1em
@@ -758,6 +752,7 @@ pdfborder={0 0 0}
\end{flushright}%
\par
\vskip 2em
+ \pagenumbering{arabic}
}%
% Rewrite \include for local LastPage counter
@@ -781,7 +776,7 @@ pdfborder={0 0 0}
\immediate\openout\@partaux #1.aux
\immediate\write\@partaux{\relax}%
\fi
- \ifbiblatex
+ \if@wlg@biblatex
\newrefsection
\fi
\@input@{#1.tex}%
@@ -836,11 +831,12 @@ pdfborder={0 0 0}
% Increase distance between text and footnotes
\renewcommand\footnoterule{%
-% Distance between text and footnote rule (1 line)
+ % Distance between text and footnote rule (1 line)
\kern-3\p@\hrule\@width.4\columnwidth%
\kern2.6\p@%
-% Distance between footnote rule and foot notes (0.2em)
- \vspace{0.2em}}%
+ % Distance between footnote rule and foot notes (0.2em)
+ \vspace{0.2em}%
+}%
% Fotenote mark not superscripted
\newlength{\footnumwidth}
@@ -891,10 +887,10 @@ pdfborder={0 0 0}
\renewcommand*{\dictumrule}{}
\newcommand\motto[2][]{%
-\dictum[#1]{#2}
-\medskip
-\@afterindentfalse
-\@afterheading
+ \dictum[#1]{#2}%
+ \medskip%
+ \@afterindentfalse%
+ \@afterheading%
}
% Lists
@@ -904,14 +900,12 @@ pdfborder={0 0 0}
\def\labelitemi{--}
% Quote (smaller)
-\newcommand*{\OriginalQuote}{}
-\let\OriginalQuote\quote
-\renewcommand*{\quote}{\OriginalQuote\small}
+\let\@wlg@save@quote\quote
+\renewcommand*{\quote}{\@wlg@save@quote\small}
% Quotation (smaller)
-\newcommand*{\OriginalQuotation}{}
-\let\OriginalQuotation\quotation
-\renewcommand*{\quotation}{\OriginalQuotation\small}
+\let\@wlg@save@quotation\quotation
+\renewcommand*{\quotation}{\@wlg@save@quotation\small}
% Description (KOMA) (normal italic)
\setkomafont{descriptionlabel}{\normalfont\itshape}
@@ -920,9 +914,9 @@ pdfborder={0 0 0}
\let\olddots\ldots
\renewcommand*{\ldots}{\olddots\unkern}
-\ifcovington
-\RequirePackage{covington}
-\renewcommand{\p@equation}[1]{(#1)}
+\if@wlg@covington
+ \RequirePackage{covington}
+ \renewcommand{\p@equation}[1]{(#1)}
\fi
@@ -951,18 +945,18 @@ pdfborder={0 0 0}
%% =============================================================
% Biblatex
-\ifbiblatex
-\RequirePackage[%
- style=univie-ling,
- sorting=nyvt,
- autolang=hyphen]
-{biblatex}
+\if@wlg@biblatex
+ \RequirePackage[%
+ style=univie-ling,
+ sorting=nyvt,
+ autolang=hyphen]
+ {biblatex}
\fi
\AtBeginDocument{%
-\@ifundefined{bibhang}{}{%
- \setlength{\bibhang}{\parindent}%
- \renewcommand{\bibfont}{\small}%
-}%
+ \@ifundefined{bibhang}{}{%
+ \setlength{\bibhang}{\parindent}%
+ \renewcommand{\bibfont}{\small}%
+ }%
}
%% =============================================================
@@ -972,23 +966,26 @@ pdfborder={0 0 0}
% Varioref:
\AtBeginDocument{%
\RequirePackage[ngerman]{varioref}
- \renewcommand\reftextafter{auf der \reftextvario{folgenden}{n\"achsten} Seite}%
- \renewcommand\reftextfaceafter{auf der \reftextvario{folgenden}{n\"achsten} Seite}%
- \renewcommand\reftextbefore{auf der \reftextvario{vorhergehenden}{vorangegangenen} Seite}%
- \renewcommand\reftextfacebefore{auf der \reftextvario{vorhergehenden}{vorangegangenen} Seite}%
- \renewcommand\reftextfaraway[1]{auf S.~\pageref{#1}}%
- \renewcommand\reftextpagerange[2]{auf S.~\pageref{#1}--\pageref{#2}}%
+ \vref@addto\extrasnaustrian{%
+ \def\reftextafter{auf der \reftextvario{folgenden}{n\"achsten} Seite}%
+ \def\reftextfaceafter{auf der gegen\"uberliegenden Seite}%
+ \def\reftextbefore{auf der \reftextvario{vorhergehenden}{vorangegangenen} Seite}%
+ \def\reftextfacebefore{auf der gegen\"uberliegenden Seite}%
+ \def\reftextfaraway#1{auf S.~\pageref{#1}}%
+ \def\reftextpagerange#1#2{auf S.~\pageref{#1}--\pageref{#2}}%
+ }%
% Prettyref:
% (varioref included)
\RequirePackage{prettyref}
- \newrefformat{cha}{Kapitel~\vref{#1}}
- \newrefformat{sec}{Abschnitt~\vref{#1}}
- \newrefformat{sub}{Abschnitt~\vref{#1}}
- \newrefformat{anm}{Anm.~\ref{#1}}
- \newrefformat{app}{Anhang~\vref{#1}}
- \newrefformat{tab}{Tabelle~\vref{#1}}
- \newrefformat{fig}{Abbildung~\vref{#1}}
- \newrefformat{exp}{Argumentation~\vref{#1}}
+ \newrefformat{cha}{\translate{chapter}~\vref{#1}}
+ \newrefformat{sec}{\translate{section}~\vref{#1}}
+ \newrefformat{sub}{\translate{section}~\vref{#1}}
+ \newrefformat{anm}{\translate{footnote}~\vref{#1}}
+ \newrefformat{app}{\appendixname~\vref{#1}}
+ \newrefformat{tab}{\tablename~\vref{#1}}
+ \newrefformat{fig}{\figurename~\vref{#1}}
+ \newrefformat{exp}{\translate{argumentation}~\vref{#1}}
+ \newrefformat{exa}{\translate{example}~\vref{#1}}
}
%% =============================================================