texlive[64584] Master/texmf-dist: univie-ling (2oct22)

commits+karl at tug.org commits+karl at tug.org
Sun Oct 2 22:19:41 CEST 2022


Revision: 64584
          http://tug.org/svn/texlive?view=revision&revision=64584
Author:   karl
Date:     2022-10-02 22:19:41 +0200 (Sun, 02 Oct 2022)
Log Message:
-----------
univie-ling (2oct22)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/univie-ling/README
    trunk/Master/texmf-dist/doc/latex/univie-ling/templates/template-expose-deutsch.pdf
    trunk/Master/texmf-dist/doc/latex/univie-ling/templates/template-expose-english.pdf
    trunk/Master/texmf-dist/doc/latex/univie-ling/templates/template-handout-deutsch.pdf
    trunk/Master/texmf-dist/doc/latex/univie-ling/templates/template-handout-english.pdf
    trunk/Master/texmf-dist/doc/latex/univie-ling/templates/template-paper-deutsch.pdf
    trunk/Master/texmf-dist/doc/latex/univie-ling/templates/template-paper-english.pdf
    trunk/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-deutsch.pdf
    trunk/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-english.pdf
    trunk/Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-article.pdf
    trunk/Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-article.tex
    trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.pdf
    trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.tex
    trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling-handout.pdf
    trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling-handout.tex
    trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.pdf
    trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.tex
    trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.pdf
    trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.tex
    trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.pdf
    trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.tex
    trunk/Master/texmf-dist/tex/latex/univie-ling/univie-ling-expose.cls
    trunk/Master/texmf-dist/tex/latex/univie-ling/univie-ling-handout.cls
    trunk/Master/texmf-dist/tex/latex/univie-ling/univie-ling-paper.cls
    trunk/Master/texmf-dist/tex/latex/univie-ling/univie-ling-thesis.cls
    trunk/Master/texmf-dist/tex/latex/univie-ling/univie-ling-wlg-logo.pdf
    trunk/Master/texmf-dist/tex/latex/univie-ling/univie-ling-wlg.cls
    trunk/Master/texmf-dist/tex/latex/univie-ling/univie-ling.bbx
    trunk/Master/texmf-dist/tex/latex/univie-ling/univie-ling.cbx

Added Paths:
-----------
    trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling.pdf
    trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling.tex

Modified: trunk/Master/texmf-dist/doc/latex/univie-ling/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/univie-ling/README	2022-10-02 20:19:11 UTC (rev 64583)
+++ trunk/Master/texmf-dist/doc/latex/univie-ling/README	2022-10-02 20:19:41 UTC (rev 64584)
@@ -44,6 +44,8 @@
 * 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 @@
 
 == 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:

Modified: trunk/Master/texmf-dist/doc/latex/univie-ling/templates/template-expose-deutsch.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/univie-ling/templates/template-expose-english.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/univie-ling/templates/template-handout-deutsch.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/univie-ling/templates/template-handout-english.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/univie-ling/templates/template-paper-deutsch.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/univie-ling/templates/template-paper-english.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-deutsch.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-english.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-article.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-article.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-article.tex	2022-10-02 20:19:11 UTC (rev 64583)
+++ trunk/Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-article.tex	2022-10-02 20:19:41 UTC (rev 64584)
@@ -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}

Modified: trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.tex	2022-10-02 20:19:11 UTC (rev 64583)
+++ trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.tex	2022-10-02 20:19:41 UTC (rev 64584)
@@ -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\xFCrgen Spitzm\xFCller%
 \thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{J\xFCrgen Spitzm\xFCller}}
 
-\date{Version 1.20, 2022/09/08}
+\date{Version 2.0, 2022/10/02}
 
 \maketitle
 
@@ -102,11 +102,11 @@
  \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,6 +329,7 @@
 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}
@@ -335,10 +336,18 @@
 	\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.

Modified: trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling-handout.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling-handout.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling-handout.tex	2022-10-02 20:19:11 UTC (rev 64583)
+++ trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling-handout.tex	2022-10-02 20:19:41 UTC (rev 64584)
@@ -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\xFCrgen Spitzm\xFCller%
 \thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{J\xFCrgen Spitzm\xFCller}}
 
-\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 @@
  \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,6 +373,7 @@
 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}
@@ -379,10 +380,18 @@
 	\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.

Modified: trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.tex	2022-10-02 20:19:11 UTC (rev 64583)
+++ trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.tex	2022-10-02 20:19:41 UTC (rev 64584)
@@ -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\xFCrgen Spitzm\xFCller%
 		\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{J\xFCrgen Spitzm\xFCller}}
 
-\date{Version 1.20, 2022/09/08}
+\date{Version 2.0, 2022/10/02}
 
 \maketitle
 
@@ -99,11 +99,11 @@
  \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,6 +361,7 @@
 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}
@@ -367,11 +368,19 @@
 	\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.

Modified: trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.tex	2022-10-02 20:19:11 UTC (rev 64583)
+++ trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.tex	2022-10-02 20:19:41 UTC (rev 64584)
@@ -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\xFCrgen Spitzm\xFCller%
 		\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{J\xFCrgen Spitzm\xFCller}}
 
-\date{Version 1.20, 2022/09/08}
+\date{Version 2.0, 2022/10/02}
 
 \maketitle
 
@@ -82,7 +82,7 @@
 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 @@
  \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 @@
  \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,6 +392,7 @@
 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}
@@ -398,10 +399,18 @@
 	\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.

Modified: trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.tex	2022-10-02 20:19:11 UTC (rev 64583)
+++ trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.tex	2022-10-02 20:19:41 UTC (rev 64584)
@@ -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\xFCrgen Spitzm\xFCller%
 		\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{J\xFCrgen Spitzm\xFCller}}
 
-\date{Version 1.20, 2022/09/08}
+\date{Version 2.0, 2022/10/02}
 
 \maketitle
 
@@ -93,7 +93,7 @@
 
 \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 @@
  \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 @@
 
 \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.

Added: trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling.pdf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling.pdf	2022-10-02 20:19:11 UTC (rev 64583)
+++ trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling.pdf	2022-10-02 20:19:41 UTC (rev 64584)

Property changes on: trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling.tex	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling.tex	2022-10-02 20:19:41 UTC (rev 64584)
@@ -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\xFCrgen Spitzm\xFCller%
+\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{J\xFCrgen Spitzm\xFCller}}
+
+\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\xE9s}) that are required in the context of the public presentation of a dissertation project (\emph{F\xD6P}) 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}


Property changes on: trunk/Master/texmf-dist/doc/latex/univie-ling/univie-ling.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/univie-ling/univie-ling-expose.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/univie-ling/univie-ling-expose.cls	2022-10-02 20:19:11 UTC (rev 64583)
+++ trunk/Master/texmf-dist/tex/latex/univie-ling/univie-ling-expose.cls	2022-10-02 20:19:41 UTC (rev 64584)
@@ -32,7 +32,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \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)]
 
 
 %% ============================================================
@@ -39,179 +39,139 @@
 %% CLASS OPTIONS
 %% ============================================================
 
-\RequirePackage{xkeyval}
+\newif\if at uve@biblatex\@uve at biblatextrue
+\newif\if at uve@apa\@uve at apafalse
+\newif\if at uve@captionp\@uve at captionptrue
+\newif\if at uve@draftmark\@uve at draftmarkfalse
+\newif\if at uve@draftmarkfp\@uve at draftmarkfpfalse
+\newif\if at uve@refsp\@uve at refsptrue
+\newif\if at uve@covington\@uve at covingtontrue
+\newif\if at uve@microtype\@uve at microtypetrue
+\newif\if at uve@polyglossia\@uve at polyglossiafalse
+\newif\if at uve@psfonts\@uve at psfontstrue
+\newif\if at uve@otffonts\@uve at otffontsfalse
+\newif\if at uve@usefontenc\@uve at usefontenctrue
+\def\uve at fontenc{T1}
 
-\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 at boolkey+{uvt}{all}[true]{%
-    \ifKV at uvt@all
-        \biblatextrue
-        \captionptrue
-        \refsptrue
-        \covingtontrue
-        \microtypetrue
-    \else
-        \biblatexfalse
-        \captionpfalse
-        \refspfalse
-        \covingtonfalse
-        \microtypefalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-expose}{unknown 'all' value}%
+% 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 at biblatextrue
+                \@uve at captionptrue
+                \@uve at refsptrue
+                \@uve at covingtontrue
+                \@uve at microtypetrue
+             }{
+                \@uve at biblatexfalse
+                \@uve at captionpfalse
+                \@uve at refspfalse
+                \@uve at covingtonfalse
+                \@uve at microtypefalse
+             }
+          },
+	all.usage:n = preamble,
+	% apa=<true|false>
+	% Load APA style
+	apa.legacy_if_set:n = @uve at apa,
+	apa.usage:n = preamble,
+	% biblatex=<true|false>
+	% Load biblatex
+	biblatex.legacy_if_set:n = @uve at biblatex,
+	biblatex.usage:n = preamble,
+	% caption=<true|false>
+	% Load caption
+	caption.legacy_if_set:n = @uve at captionp,
+	caption.usage:n = preamble,
+	% covington=<true|false>
+	% Load covington
+	covington.legacy_if_set:n = @uve at covington,
+	covington.usage:n = preamble,
+	% fontenc=<value|none>
+	% customize font encoding
+	fontenc.code:n = 
+	  { \str_if_eq:NNTF { #1 } { none } {
+	       \@uve at usefontencfalse
+             }{
+               \def\uve at fontenc{#1}
+             }
+          },
+	fontenc.usage:n = preamble,
+	% microtype=<true|false>
+	% Load microtype
+	microtype.legacy_if_set:n = @uve at microtype,
+	microtype.usage:n = preamble,
+	% polyglossia=<true|false>
+	% Load polyglossia
+	polyglossia.legacy_if_set:n = @uve at polyglossia,
+	polyglossia.code:n = 
+	  { \bool_if:nT {#1} {
+	       \@uve at psfontsfalse
+               \@uve at otffontstrue
+             }
+          },
+	polyglossia.usage:n = preamble,
+	% ref=<true|false>
+	% Load varioref and prettyref
+	ref.legacy_if_set:n = @uve at refsp,
+	ref.usage:n = preamble,
+	% draftmark=<true|false|firstpage>
+	% Print draftmark
+	draftmark .choice:,
+	% true
+	draftmark / true .code:n = 
+	  { \@uve at draftmarktrue
+            \@uve at draftmarkfpfalse
+          },
+        % false
+	draftmark / false .code:n = 
+	  { \@uve at draftmarkfalse
+            \@uve at draftmarkfpfalse
+          },
+        % firstpage
+	draftmark / firstpage .code:n = 
+	  { \@uve at draftmarktrue
+            \@uve at 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 at psfontstrue
+            \@uve at otffontsfalse
+          },
+        % otf: use OpenType fonts (fontspec)
+	fonts / otf .code:n = 
+	  { \@uve at psfontsfalse
+            \@uve at otffontstrue
+          },
+        % none: Use no font package
+	fonts / none .code:n = 
+	  { \@uve at psfontsfalse
+            \@uve at otffontsfalse
+          },
 }
+\ExplSyntaxOff
 
-% biblatex=<true|false>
-% Load biblatex
-\define at boolkey+{uvt}{biblatex}[true]{%
-    \ifKV at uvt@biblatex
-        \biblatextrue
-    \else
-        \biblatexfalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-expose}{unknown biblatex value}%
-}
+% Process
 
-% apa=<true|false>
-% Load APA style
-\define at boolkey+{uvt}{apa}[true]{%
-    \ifKV at uvt@apa
-        \apatrue
-    \else
-        \apafalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-expose}{unknown apa value}%
+\IfFormatAtLeastTF{2022-06-01}
+{
+  \ProcessKeyOptions[uve]
+}{
+  \RequirePackage{l3keys2e}
+  \ProcessKeysOptions{uve}
 }
 
-% caption=<true|false>
-% Load caption
-\define at boolkey+{uvt}{caption}[true]{%
-    \ifKV at uvt@caption
-        \captionptrue
-    \else
-        \captionpfalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-expose}{unknown caption value}%
-}
 
-% ref=<true|false>
-% Load varioref and prettyref
-\define at boolkey+{uvt}{ref}[true]{%
-    \ifKV at uvt@ref
-        \refsptrue
-    \else
-        \refspfalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-expose}{unknown ref value}%
-}
-
-% covington=<true|false>
-% Load covington
-\define at boolkey+{uvt}{covington}[true]{%
-    \ifKV at uvt@covington
-        \covingtontrue
-    \else
-        \covingtonfalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-expose}{unknown covington value}%
-}
-
-% draftmark=<true|false>
-% Print draftmark
-\define at 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}%
-}
-
-% microtype=<true|false>
-% Load microtype
-\define at boolkey+{uvt}{microtype}[true]{%
-    \ifKV at uvt@microtype
-        \microtypetrue
-    \else
-        \microtypefalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-expose}{unknown microtype value}%
-}
-
-% polyglossia=<true|false>
-% Load polyglossia
-\define at boolkey+{uvt}{polyglossia}[true]{%
-    \ifKV at uvt@polyglossia
-        \polyglossiatrue
-        \psfontsfalse
-        \otffontstrue
-        \nofontsfalse
-    \else
-        \polyglossiafalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-expose}{unknown polyglossia value}%
-}
-
-% fonts=<ps|otf|none>
-\define at 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'}%
-}
-
-% fontenc=<value|false>
-% customize font encoding
-\newif\ifuniv at usefontenc\univ at usefontenctrue
-\def\univ at fontenc{T1}
-\define at choicekey*+{uvt}{fontenc}[\val\nr]{none}{%
-    \ifcase\nr\relax% none:
-        \univ at usefontencfalse
-    \fi
-}{%
-    \def\univ at fontenc{#1}%
-}
-
-% Process
-\ProcessOptionsX<uvt>
-
 %% ============================================================
 %% BASE CLASS:
 %% ============================================================
@@ -232,33 +192,34 @@
 %% 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}
 
 
 %% ============================================================
@@ -265,10 +226,10 @@
 %% FONTS AND EMPHASIZING:
 %% ============================================================
 
-\ifpsfonts
+\if at uve@psfonts
 
-\ifuniv at usefontenc
-  \RequirePackage[\univ at fontenc]{fontenc}
+\if at uve@usefontenc
+  \RequirePackage[\uve at fontenc]{fontenc}
 \fi
 
 % Times
@@ -286,7 +247,7 @@
 
 \fi
 
-\ifotffonts
+\if at 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 at uve@microtype
+  \RequirePackage{microtype}
 \fi
 
 % Smart quotes
@@ -415,8 +376,8 @@
 
 % Month name
 \RequirePackage[ngerman,english]{datetime2}
-\DeclareTranslation{German}{monthyear}{\DTMgermanmonthname{\@dtm at month} \@dtm at year}
-\DeclareTranslation{English}{monthyear}{\DTMenglishmonthname{\@dtm at month} \@dtm at year}
+\deftranslation[to=German]{monthyear}{\DTMgermanmonthname{\@dtm at month} \@dtm at year}
+\deftranslation[to=English]{monthyear}{\DTMenglishmonthname{\@dtm at month} \@dtm at 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 at save@quote\quote
+\renewcommand*{\quote}{\@uve at save@quote\small}
 
 % Quotation (smaller)
-\newcommand*{\OriginalQuotation}{}
-\let\OriginalQuotation\quotation
-\renewcommand*{\quotation}{\OriginalQuotation\small}
+\let\@uve at save@quotation\quotation
+\renewcommand*{\quotation}{\@uve at save@quotation\small}
 
 % Description (normal italic)
 \setkomafont{descriptionlabel}{\normalfont\itshape}
 
-\ifcovington
-\RequirePackage{covington}
-\renewcommand{\p at equation}[1]{(#1)}
+\if at uve@covington
+  \RequirePackage{covington}
+  \renewcommand{\p at equation}[1]{(#1)}
 \fi
 
 %% =============================================================
@@ -619,11 +578,11 @@
 %% captionlabel bold
 \setkomafont{captionlabel}{\bfseries}
 
-\ifcaptionp
-\RequirePackage[format=plain,
-	    justification=RaggedRight,
-	    singlelinecheck=false
-	   ]{caption}
+\if at uve@captionp
+   \RequirePackage[format=plain,
+	           justification=RaggedRight,
+	           singlelinecheck=false
+	          ]{caption}
 \fi
 
 %% =============================================================
@@ -630,8 +589,8 @@
 %% POLYGLOSSIA:
 %% =============================================================
 
-\ifpolyglossia
-  \ifcaptionp
+\if at uve@polyglossia
+  \if at uve@captionp
     \RequirePackage{ragged2e}
   \fi
   \RequirePackage{polyglossia}
@@ -642,9 +601,9 @@
 %% =============================================================
 
 % Biblatex
-\ifbiblatex
+\if at uve@biblatex
 
-\ifapa
+\if at 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 at apa condition
 \fi
 
-% End of biblatex condition
+% End of @uve at 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 at 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 at uve@draftmark
 
-\ifdraftmarkfp
+\if at 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

Modified: trunk/Master/texmf-dist/tex/latex/univie-ling/univie-ling-handout.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/univie-ling/univie-ling-handout.cls	2022-10-02 20:19:11 UTC (rev 64583)
+++ trunk/Master/texmf-dist/tex/latex/univie-ling/univie-ling-handout.cls	2022-10-02 20:19:41 UTC (rev 64584)
@@ -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}[2022/10/02 v.2.0 Univie Ling handout class (JSp)]
 
-\ProvidesClass{univie-ling-handout}[%
-    \filedate\space v\fileversion\space 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 at boolkey+{uvt}{all}[true]{%
-    \ifKV at 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 at boolkey+{uvt}{biblatex}[true]{%
-    \ifKV at uvt@biblatex
-        \biblatextrue
-    \else
-        \biblatexfalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-handout}{unknown biblatex value}%
-}
-
-% apa=<true|false>
-% Load APA style
-\define at boolkey+{uvt}{apa}[true]{%
-    \ifKV at uvt@apa
-        \apatrue
-    \else
-        \apafalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-handout}{unknown apa value}%
-}
-
-% caption=<true|false>
-% Load caption
-\define at boolkey+{uvt}{caption}[true]{%
-    \ifKV at uvt@caption
-        \captionptrue
-    \else
-        \captionpfalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-handout}{unknown caption value}%
-}
-
-% draftmark=<true|false>
-% Print draftmark
-\define at 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 at boolkey+{uvt}{ref}[true]{%
-    \ifKV at uvt@ref
-        \refsptrue
-    \else
-        \refspfalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-handout}{unknown ref value}%
-}
-
-% covington=<true|false>
-% Load covington
-\define at boolkey+{uvt}{covington}[true]{%
-    \ifKV at uvt@covington
-        \covingtontrue
-    \else
-        \covingtonfalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-handout}{unknown covington value}%
-}
-
-% microtype=<true|false>
-% Load microtype
-\define at boolkey+{uvt}{microtype}[true]{%
-    \ifKV at uvt@microtype
-        \microtypetrue
-    \else
-        \microtypefalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-handout}{unknown microtype value}%
-}
-
-% polyglossia=<true|false>
-% Load polyglossia
-\define at boolkey+{uvt}{polyglossia}[true]{%
-    \ifKV at uvt@polyglossia
-        \polyglossiatrue
-        \psfontsfalse
-        \otffontstrue
-        \nofontsfalse
-    \else
-        \polyglossiafalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-handout}{unknown polyglossia value}%
-}
-
-% fonts=<ps|otf|none>
-\define at 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 at fontsize{11}
-\define at key{uvt}{fontsize}{%
-    \def\univ at fontsize{#1}
-}
-
-% Paper size
-\def\univ at papersize{a4}
-\define at key{uvt}{papersize}{%
-    \def\univ at papersize{#1}
-}
-
-% landscape=<true|false>
-\newif\iflandscape\landscapefalse
-\define at boolkey+{uvt}{landscape}[true]{%
-    \ifKV at uvt@landscape
-        \landscapetrue
-    \else
-        \landscapefalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-handout}{unknown landscape value}%
-}
-
-
-% pplogo=<true|false>
-\newif\ifnopplogo\nopplogofalse
-\define at boolkey+{uvt}{pplogo}[true]{%
-    \ifKV at uvt@pplogo
-        \nopplogofalse
-    \else
-        \nopplogotrue
-    \fi
-}{%
-    \ClassWarning{univie-ling-handout}{unknown pplogo value}%
-}
-
+\newif\if at uvh@apa\@uvh at apafalse
+\newif\if at uvh@biblatex\@uvh at biblatextrue
+\newif\if at uvh@breakevent\@uvh at breakeventfalse
+\newif\if at uvh@captionp\@uvh at captionptrue
+\newif\if at uvh@covington\@uvh at covingtontrue
+\newif\if at uvh@draftmark\@uvh at draftmarkfalse
+\newif\if at uvh@draftmarkfp\@uvh at draftmarkfpfalse
+\newif\if at uvh@foldmarks\@uvh at foldmarksfalse
+\newif\if at uvh@landscape\@uvh at landscapefalse
+\newif\if at uvh@lastpage\@uvh at lastpagefalse
+\newif\if at uvh@microtype\@uvh at microtypetrue
+\newif\if at uvh@otffonts\@uvh at otffontsfalse
+\newif\if at uvh@pageonfirst\@uvh at pageonfirsttrue
+\newif\if at uvh@polyglossia\@uvh at polyglossiafalse
+\newif\if at uvh@pplogo\@uvh at pplogotrue
+\newif\if at uvh@psfonts\@uvh at psfontstrue
+\newif\if at uvh@punchmark\@uvh at punchmarkfalse
+\newif\if at uvh@refsp\@uvh at refsptrue
+\newif\if at uvh@swaphead\@uvh at swapheadfalse
+\newif\if at uvh@usefontenc\@uvh at usefontenctrue
+\newif\if at uvh@usewidesubtitle\@uvh at usewidesubtitlefalse
+\def\uvh at fontenc{T1}
+\def\uvh at fontsize{11}
+\def\uvh at papersize{a4}
 % Colored logo (default)
-\def\univ at printlogo{\includegraphics[width=74mm]{univielogo}}
-\def\univ at printsmalllogo{\includegraphics[height=14mm]{univielogo}}
-
-% Monochrome logo
-\define at boolkey+{uvt}{bwlogo}[true]{%
-    \ifKV at uvt@bwlogo
-        \def\univ at printlogo{\includegraphics[width=74mm]{univielogo-sw}}
-        \def\univ at printsmalllogo{\includegraphics[height=14mm]{univielogo-sw}}
-    \else
-        \def\univ at printlogo{\includegraphics[width=74mm]{univielogo}}
-        \def\univ at printsmalllogo{\includegraphics[height=14mm]{univielogo}}
-    \fi
-}{%
-    \ClassWarning{univie-ling-handout}{unknown bwlogo value}%
-}
-
-% Swap title and event in header
-\newif\ifswaphead\swapheadfalse
-\define at boolkey+{uvt}{swaphead}[true]{%
-    \ifKV at uvt@swaphead
-        \swapheadtrue
-    \else
-        \swapheadfalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-handout}{unknown swaphead value}%
-}
-
-% Output total page number
-\newif\iflastpage\lastpagefalse
-\define at boolkey+{uvt}{totalpages}[true]{%
-    \ifKV at uvt@totalpages
-        \lastpagetrue
-    \else
-        \lastpagefalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-handout}{unknown totalpages value}%
-}
-
-% Suppress pagination on first page?
-\newif\ifpageonfirst\pageonfirsttrue
-\define at boolkey+{uvt}{firstpagination}[true]{%
-    \ifKV at 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 at boolkey+{uvt}{breakevent}[true]{%
-    \ifKV at 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 at boolkey+{uvt}{widesubtitle}[true]{%
-    \ifKV at uvt@breakevent
-        \widestitletrue
-    \else
-        \widestitlefalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-handout}{unknown widesubtitle value}%
-}
-
+\def\uvh at printlogo{\includegraphics[width=74mm]{univielogo}}
+\def\uvh at printsmalllogo{\includegraphics[height=14mm]{univielogo}}
 % German CD (default)
-\def\cdgerman{
-	\def\univ at name{\univ at name@de}
-	\def\univ at shortname{\univ at shortname@de}
-	\def\univ at university{Universit\"at Wien}
-	\def\univ at department{\univ at department@de}
-	\def\univ at location{\univ at location@de}
-	\def\univ at country{\univ at country@de}
-	\def\univ at function{\univ at function@de}
-	\def\univ at secfunction{\univ at secfunction@de}
-	\def\univ at phoneprefix{T}
-	\def\univ at faxprefix{F}
-	\def\univ at emailprefix{}
-	\def\univ at urlprefix{}
-	\def\univ at pageprefix{Seite}
-	\def\univ at headerdeptsep{\ $\cdot$\ }
-	\def\univ at headernamesep{,\ }
+\def\uvh at cd@german{
+	\def\uvh at name{\uvh at name@de}
+	\def\uvh at shortname{\uvh at shortname@de}
+	\def\uvh at university{Universit\"at Wien}
+	\def\uvh at department{\uvh at department@de}
+	\def\uvh at location{\uvh at location@de}
+	\def\uvh at country{\uvh at country@de}
+	\def\uvh at function{\uvh at function@de}
+	\def\uvh at secfunction{\uvh at secfunction@de}
+	\def\uvh at phoneprefix{T}
+	\def\uvh at faxprefix{F}
+	\def\uvh at emailprefix{}
+	\def\uvh at urlprefix{}
+	\def\uvh at pageprefix{Seite}
+	\def\uvh at headerdeptsep{\ $\cdot$\ }
+	\def\uvh at headernamesep{,\ }
 	\def\and{\\}
 }
-\cdgerman
-
-\define at choicekey*+{uvt}{cd}[\val\nr]{german,english}{%
-    \ifcase\nr\relax% german
-    	\cdgerman
-    \or% english
-	\def\univ at name{\univ at name@en}
-	\def\univ at shortname{\univ at shortname@en}
-	\def\univ at university{University of Vienna}
-	\def\univ at department{\univ at department@en}
-	\def\univ at location{\univ at location@en}
-	\def\univ at country{\univ at country@en}
-	\def\univ at function{\univ at function@en}
-	\def\univ at secfunction{\univ at secfunction@en}
-	\def\univ at phoneprefix{T}
-	\def\univ at faxprefix{F}
-	\def\univ at emailprefix{}
-	\def\univ at urlprefix{}
-	\def\univ at pageprefix{Page}
-	\def\univ at headerdeptsep{\ $\cdot$\ }
-	\def\univ at headernamesep{,\ }
-	\def\univ at secnamesep{,\ }
-    \fi
-}{%
-    \ClassWarning{univie-ling-handout}{unknown cd value '#1'}%
+\def\uvh at cd@english{%
+	\def\uvh at name{\uvh at name@en}
+	\def\uvh at shortname{\uvh at shortname@en}
+	\def\uvh at university{University of Vienna}
+	\def\uvh at department{\uvh at department@en}
+	\def\uvh at location{\uvh at location@en}
+	\def\uvh at country{\uvh at country@en}
+	\def\uvh at function{\uvh at function@en}
+	\def\uvh at secfunction{\uvh at secfunction@en}
+	\def\uvh at phoneprefix{T}
+	\def\uvh at faxprefix{F}
+	\def\uvh at emailprefix{}
+	\def\uvh at urlprefix{}
+	\def\uvh at pageprefix{Page}
+	\def\uvh at headerdeptsep{\ $\cdot$\ }
+	\def\uvh at headernamesep{,\ }
+	\def\uvh at secnamesep{,\ }
 }
+\uvh at cd@german
 
-
-% Output punch marks?
-\newif\ifuniv at punchmark\univ at punchmarkfalse
-\define at boolkey+{uvt}{punchmarks}[true]{%
-    \ifKV at uvt@punchmarks
-        \univ at punchmarktrue
-    \else
-        \univ at punchmarkfalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-handout}{unknown punchmarks value}%
+% 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 at biblatextrue
+                \@uvh at captionptrue
+                \@uvh at refsptrue
+                \@uvh at covingtontrue
+                \@uvh at microtypetrue
+             }{
+                \@uvh at biblatexfalse
+                \@uvh at captionpfalse
+                \@uvh at refspfalse
+                \@uvh at covingtonfalse
+                \@uvh at microtypefalse
+             }
+          },
+	all.usage:n = preamble,
+	% apa=<true|false>
+	% Load APA style
+	apa.legacy_if_set:n = @uvh at apa,
+	apa.usage:n = preamble,
+	% biblatex=<true|false>
+	% Load biblatex
+	biblatex.legacy_if_set:n = @uvh at 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 at breakevent,
+	breakevent.usage:n = preamble,
+	% bwlogo=<true|false>
+	% Print monochrome logo?
+	bwlogo.code:n = 
+	  { \bool_if:nTF {#1} {
+	       \def\uvh at printlogo{\includegraphics[width=74mm]{univielogo-sw}}
+               \def\uvh at printsmalllogo{\includegraphics[height=14mm]{univielogo-sw}}
+             }{
+               \def\uvh at printlogo{\includegraphics[width=74mm]{univielogo}}
+               \def\uvh at printsmalllogo{\includegraphics[height=14mm]{univielogo}}
+             }
+          },
+	bwlogo.usage:n = preamble,
+	% caption=<true|false>
+	% Load caption
+	caption.legacy_if_set:n = @uvh at captionp,
+	caption.usage:n = preamble,
+	% covington=<true|false>
+	% Load covington
+	covington.legacy_if_set:n = @uvh at covington,
+	covington.usage:n = preamble,
+	% firstpagination=<true|false>
+	% Suppress pagination on first page?
+	firstpagination.legacy_if_set:n = @uvh at pageonfirst,
+	firstpagination.usage:n = preamble,
+	% foldmarks=<true|false>
+	% Output fold marks?
+	foldmarks.legacy_if_set:n = @uvh at foldmarks,
+	foldmarks.usage:n = preamble,
+	% fontenc=<value|none>
+	% customize font encoding
+	fontenc.code:n = 
+	  { \str_if_eq:NNTF { #1 } { none } {
+	       \@uvh at usefontencfalse
+             }{
+               \def\uvh at fontenc{#1}
+             }
+          },
+	fontenc.usage:n = preamble,
+	% fontsize=<size>
+	% Set base font size
+	fontsize.tl_set:N = \uvh at fontsize,
+	fontsize.usage:n = preamble,
+	% landscape=<true|false>
+	% Set landscape
+	landscape.legacy_if_set:n = @uvh at landscape,
+	landscape.usage:n = preamble,
+	% microtype=<true|false>
+	% Load microtype
+	microtype.legacy_if_set:n = @uvh at microtype,
+	microtype.usage:n = preamble,
+	% papersize=<size>
+	% Set paper size
+	papersize.tl_set:N = \uvh at papersize,
+	papersize.usage:n = preamble,
+	% polyglossia=<true|false>
+	% Load polyglossia
+	polyglossia.legacy_if_set:n = @uvh at polyglossia,
+	polyglossia.code:n = 
+	  { \bool_if:nT {#1} {
+	       \@uvh at psfontsfalse
+               \@uvh at otffontstrue
+             }
+          },
+	polyglossia.usage:n = preamble,
+	% pplogo=<true|false>
+	% Print logo on page 2ff.
+	pplogo.legacy_if_set:n = @uvh at pplogo,
+	pplogo.usage:n = preamble,
+	% punchmarks=<true|false>
+	% Output punch marks?
+	punchmarks.legacy_if_set:n = @uvh at punchmark,
+	punchmarks.usage:n = preamble,
+	% ref=<true|false>
+	% Load varioref and prettyref
+	ref.legacy_if_set:n = @uvh at refsp,
+	ref.usage:n = preamble,
+	% swaphead=<true|false>
+	% Swap title and event in header
+	swaphead.legacy_if_set:n = @uvh at swaphead,
+	swaphead.usage:n = preamble,
+	% totalpages=<true|false>
+	% Output total page number
+	totalpages.legacy_if_set:n = @uvh at 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 at usewidesubtitle,
+	widesubtitle.usage:n = preamble,
+	% cd=<german|english>
+        % CD Language
+	cd .choice:,
+	% german
+	cd / german .code:n = { \uvh at cd@german },
+        % english
+	cd / english .code:n = { \uvh at cd@english },
+	% draftmark=<true|false|firstpage>
+	% Print draftmark
+	draftmark .choice:,
+	% true
+	draftmark / true .code:n = 
+	  { \@uvh at draftmarktrue
+            \@uvh at draftmarkfpfalse
+          },
+        % false
+	draftmark / false .code:n = 
+	  { \@uvh at draftmarkfalse
+            \@uvh at draftmarkfpfalse
+          },
+        % firstpage
+	draftmark / firstpage .code:n = 
+	  { \@uvh at draftmarktrue
+            \@uvh at 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 at psfontstrue
+            \@uvh at otffontsfalse
+          },
+        % otf: use OpenType fonts (fontspec)
+	fonts / otf .code:n = 
+	  { \@uvh at psfontsfalse
+            \@uvh at otffontstrue
+          },
+        % none: Use no font package
+	fonts / none .code:n = 
+	  { \@uvh at psfontsfalse
+            \@uvh at otffontsfalse
+          },
 }
+\ExplSyntaxOff
 
-% Output fold marks?
-\newif\ifuniv at foldmarks\univ at foldmarksfalse
-\define at boolkey+{uvt}{foldmarks}[true]{%
-    \ifKV at uvt@foldmarks
-        \univ at foldmarkstrue
-    \else
-        \univ at foldmarksfalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-handout}{unknown foldmarks value}%
-}
+% Process
 
-
-% fontenc=<value|false>
-% customize font encoding
-\newif\ifuniv at usefontenc\univ at usefontenctrue
-\def\univ at fontenc{T1}
-\define at choicekey*+{uvt}{fontenc}[\val\nr]{none}{%
-    \ifcase\nr\relax% none:
-        \univ at usefontencfalse
-    \fi
-}{%
-    \def\univ at 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 at fontsize,oneside,final}{scrartcl}
-\iflandscape
+\PassOptionsToClass{fontsize=\uvh at fontsize,oneside,final}{scrartcl}
+\if at uvh@landscape
   \PassOptionsToClass{landscape}{scrartcl}
 \fi
 \LoadClass{scrartcl}[1997/04/16]
@@ -431,7 +315,7 @@
 \AtEndOfClass{\pagestyle{headings}}
 
 % Use lastpage package if total pages is required
-\iflastpage
+\if at uvh@lastpage
   \AtEndOfClass{\RequirePackage{lastpage}}
 \fi
 
@@ -438,22 +322,22 @@
 % We need graphicx for the logo
 \RequirePackage{graphicx}
 
-\ifpsfonts
-	\ifuniv at usefontenc
-	    \RequirePackage[\univ at fontenc]{fontenc}
-	\fi
-	% Source Pro fonts
-	\usepackage[default,osf]{sourceserifpro}
-	\usepackage[osf]{sourcesanspro}
-	\usepackage{sourcecodepro}
+\if at uvh@psfonts
+  \if at uvh@usefontenc
+    \RequirePackage[\uvh at 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 at 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 at font@event{\fontsize{11}{13pt}\selectfont\mdseries\sffamily}
-\def\univ at font@title{\fontsize{18}{21pt}\selectfont\bfseries\sffamily}
-\def\univ at font@subtitle{\fontsize{13}{16pt}\selectfont\bfseries\sffamily}
-\def\univ at font@sections{\fontsize{13}{16pt}\selectfont\bfseries\sffamily}
-\def\univ at font@department{\fontsize{10}{12pt}\selectfont\bfseries\sffamily}
-\def\univ at font@header{\fontsize{8}{10pt}\selectfont\mdseries\sffamily}
-\def\univ at font@footer{\fontsize{8}{10pt}\selectfont\sffamily}
-\def\univ at font@headertitle{\fontsize{8}{10pt}\selectfont\sffamily}
-\def\univ at font@eventlocdate{\fontsize{11}{13pt}\selectfont\mdseries\sffamily}
+\def\uvh at font@event{\fontsize{11}{13pt}\selectfont\mdseries\sffamily}
+\def\uvh at font@title{\fontsize{18}{21pt}\selectfont\bfseries\sffamily}
+\def\uvh at font@subtitle{\fontsize{13}{16pt}\selectfont\bfseries\sffamily}
+\def\uvh at font@sections{\fontsize{13}{16pt}\selectfont\bfseries\sffamily}
+\def\uvh at font@department{\fontsize{10}{12pt}\selectfont\bfseries\sffamily}
+\def\uvh at font@header{\fontsize{8}{10pt}\selectfont\mdseries\sffamily}
+\def\uvh at font@footer{\fontsize{8}{10pt}\selectfont\sffamily}
+\def\uvh at font@headertitle{\fontsize{8}{10pt}\selectfont\sffamily}
+\def\uvh at font@eventlocdate{\fontsize{11}{13pt}\selectfont\mdseries\sffamily}
 
 \setkomafont{part}{\fontsize{16}{18pt}\bfseries}
 \setkomafont{partnumber}{\usekomafont{part}}
-\setkomafont{sectioning}{\univ at font@sections}
+\setkomafont{sectioning}{\uvh at font@sections}
 \setkomafont{descriptionlabel}{\normalfont\mdseries}
 \setkomafont{captionlabel}{\normalfont\bfseries}
 
@@ -499,10 +383,10 @@
 \setlength\aftertitle{18pt}
 
 % Boxes
-\newsavebox{\univ at box@logo}
+\newsavebox{\uvh at 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}
 
 
 %% ============================================================
@@ -509,95 +393,95 @@
 %% 1 Personal data
 %% ============================================================
 
-% a.) department
-\def\univ at department@de{\empty}
-\def\univ at department@en{\empty}
+% a.) Department
+\def\uvh at department@de{\empty}
+\def\uvh at department@en{\empty}
 \newcommand*\hoDept[2][\@empty]%
 {%
-  \ifx\@empty#1\def\univ at department@en{#2}
-  \else\def\univ at department@en{#1}\fi
-  \def\univ at department@de{#2}
+  \ifx\@empty#1\def\uvh at department@en{#2}
+  \else\def\uvh at department@en{#1}\fi
+  \def\uvh at department@de{#2}
 }
 
 % b.) Name & function
-\def\univ at name@de{}
-\def\univ at name@en{}
+\def\uvh at name@de{}
+\def\uvh at name@en{}
 \newcommand*\hoName[2][\@empty]%
 {%
-  \ifx\@empty#1\def\univ at name@en{#2}
-  \else\def\univ at name@en{#1}\fi
-  \def\univ at name@de{#2}
+  \ifx\@empty#1\def\uvh at name@en{#2}
+  \else\def\uvh at name@en{#1}\fi
+  \def\uvh at name@de{#2}
 }
-\def\univ at shortname@de{}
-\def\univ at shortname@en{}
+\def\uvh at shortname@de{}
+\def\uvh at shortname@en{}
 \newcommand*\hoShortName[2][\@empty]%
 {%
-  \ifx\@empty#1\def\univ at shortname@en{#2}
-  \else\def\univ at shortname@en{#1}\fi
-  \def\univ at shortname@de{#2}
+  \ifx\@empty#1\def\uvh at shortname@en{#2}
+  \else\def\uvh at shortname@en{#1}\fi
+  \def\uvh at shortname@de{#2}
 }
 %
-\def\univ at function@de{}
-\def\univ at function@en{}
+\def\uvh at function@de{}
+\def\uvh at function@en{}
 \newcommand*\hoFunction[2][\@empty]%
 {%
-  \ifx\@empty#1\def\univ at function@en{#2}
-  \else\def\univ at function@en{#1}\fi
-  \def\univ at function@de{#2}
+  \ifx\@empty#1\def\uvh at function@en{#2}
+  \else\def\uvh at function@en{#1}\fi
+  \def\uvh at function@de{#2}
 }
 
 % c.) A collaborator's name & function
-\def\univ at secname{}
-\newcommand*\hoSecName[1]{\def\univ at secname{#1}}
-\def\univ at shortsecname{}
-\newcommand*\hoShortSecName[1]{\def\univ at shortsecname{#1}}
+\def\uvh at secname{}
+\newcommand*\hoSecName[1]{\def\uvh at secname{#1}}
+\def\uvh at shortsecname{}
+\newcommand*\hoShortSecName[1]{\def\uvh at shortsecname{#1}}
 %
-\def\univ at secfunction@de{}
-\def\univ at secfunction@en{}
+\def\uvh at secfunction@de{}
+\def\uvh at secfunction@en{}
 \newcommand*\hoSecFunction[2][\@empty]%
 {%
-  \ifx\@empty#1\def\univ at secfunction@en{#2}
-  \else\def\univ at secfunction@en{#1}\fi
-  \def\univ at secfunction@de{#2}
+  \ifx\@empty#1\def\uvh at secfunction@en{#2}
+  \else\def\uvh at secfunction@en{#1}\fi
+  \def\uvh at secfunction@de{#2}
 }
 
 % d.) Department address
-\def\univ at street{}
-\newcommand*\hoStreet[1]{\def\univ at street{#1}}
+\def\uvh at street{}
+\newcommand*\hoStreet[1]{\def\uvh at street{#1}}
 %
-\def\univ at postcode{}
-\newcommand*\hoPostCode[1]{\def\univ at postcode{#1}}
+\def\uvh at postcode{}
+\newcommand*\hoPostCode[1]{\def\uvh at postcode{#1}}
 %
-\def\univ at location@de{}
-\def\univ at location@en{}
+\def\uvh at location@de{}
+\def\uvh at location@en{}
 \newcommand*\hoLoc[2][\@empty]%
 {%
-  \ifx\@empty#1\def\univ at location@en{#2}
-  \else\def\univ at location@en{#1}\fi
-  \def\univ at location@de{#2}
+  \ifx\@empty#1\def\uvh at location@en{#2}
+  \else\def\uvh at location@en{#1}\fi
+  \def\uvh at location@de{#2}
 }
 %
-\def\univ at country@de{}
-\def\univ at country@en{}
+\def\uvh at country@de{}
+\def\uvh at country@en{}
 \newcommand*\hoCountry[2][\@empty]%
 {%
-  \ifx\@empty#1\def\univ at country@en{#2}
-  \else\def\univ at country@en{#1}\fi
-  \def\univ at country@de{#2}
+  \ifx\@empty#1\def\uvh at country@en{#2}
+  \else\def\uvh at country@en{#1}\fi
+  \def\uvh at country@de{#2}
 }
 
 % e.) Contact
-\def\univ at phone{}
-\newcommand*\hoPhone[1]{\def\univ at phone{#1}}
+\def\uvh at phone{}
+\newcommand*\hoPhone[1]{\def\uvh at phone{#1}}
 %
-\def\univ at fax{}
-\newcommand*\hoFax[1]{\def\univ at fax{#1}}
+\def\uvh at fax{}
+\newcommand*\hoFax[1]{\def\uvh at fax{#1}}
 %
-\def\univ at email{}
-\newcommand*\hoEMail[1]{\def\univ at email{#1}}
+\def\uvh at email{}
+\newcommand*\hoEMail[1]{\def\uvh at email{#1}}
 %
-\def\univ at url{}
-\newcommand*\hoUrl[1]{\def\univ at url{#1}}
+\def\uvh at url{}
+\newcommand*\hoUrl[1]{\def\uvh at url{#1}}
 
 
 %% ============================================================
@@ -605,121 +489,121 @@
 %% ============================================================
 
 % a.) Handout title
-\def\univ at title{}
-\def\univ at title@header{~}
+\def\uvh at title{}
+\def\uvh at title@header{~}
 \newcommand{\hoTitle}[2][\@empty]%
 {%
-  \ifx\@empty#1\def\univ at title@header{#2}
-  \else\def\univ at title@header{#1}\fi
-  \def\univ at title{#2}
+  \ifx\@empty#1\def\uvh at title@header{#2}
+  \else\def\uvh at title@header{#1}\fi
+  \def\uvh at title{#2}
   \thispagestyle{firstpage}%
 }
-\def\univ at titleprefix{}
+\def\uvh at titleprefix{}
 \newcommand{\hoTitlePrefix}[1]
 {%
-  \def\univ at titleprefix{#1}%
+  \def\uvh at titleprefix{#1}%
 }
 
 % b.) Handout subtitle
-\def\univ at subtitle{}
-\def\univ at widesubtitle{}
+\def\uvh at subtitle{}
+\def\uvh at widesubtitle{}
 \newcommand{\hoSubtitle}{\@ifstar{\@@hoSubtitle}{\@hoSubtitle}}
 % Starred version: wide subtitle
 \newcommand{\@hoSubtitle}[1]
 {%
-  \ifwidestitle
-    \def\univ at widesubtitle{#1}%
+  \if at uvh@usewidesubtitle
+    \def\uvh at widesubtitle{#1}%
   \else
-    \def\univ at subtitle{#1}%
+    \def\uvh at subtitle{#1}%
   \fi
 }
 % Unstarred version: normal (narrow) subtitle
 \newcommand{\@@hoSubtitle}[1]
 {%
-  \def\univ at widesubtitle{#1}%
+  \def\uvh at widesubtitle{#1}%
 }
 
 % c.) Event title 
-\def\univ at event{}
-\def\univ at event@header{~}
+\def\uvh at event{}
+\def\uvh at event@header{~}
 \newcommand*{\hoEvent}[2][\@empty]{%
-  \ifx\@empty#1\def\univ at event@header{#2}
-  \else\def\univ at event@header{#1}\fi
-  \def\univ at event{#2}
+  \ifx\@empty#1\def\uvh at event@header{#2}
+  \else\def\uvh at event@header{#1}\fi
+  \def\uvh at event{#2}
 }
 
 % d.) Event location
-\def\univ at eventlocation{}
-\def\univ at eventlocation@header{}
+\def\uvh at eventlocation{}
+\def\uvh at eventlocation@header{}
 \newcommand*{\hoEventLoc}[2][\@empty]{%
-  \ifx\@empty#1\def\univ at eventlocation@header{#2}
-  \else\def\univ at eventlocation@header{#1}\fi
-  \def\univ at eventlocation{#2}
+  \ifx\@empty#1\def\uvh at eventlocation@header{#2}
+  \else\def\uvh at eventlocation@header{#1}\fi
+  \def\uvh at eventlocation{#2}
 }
 
 % e.) Event date
-\def\univ at eventdate{}
-\def\univ at eventdate@header{}
+\def\uvh at eventdate{}
+\def\uvh at eventdate@header{}
 \newcommand*{\hoEventDate}[2][\@empty]{%
-  \ifx\@empty#1\def\univ at eventdate@header{#2}
-  \else\def\univ at eventdate@header{#1}\fi
-  \def\univ at eventdate{#2}
+  \ifx\@empty#1\def\uvh at eventdate@header{#2}
+  \else\def\uvh at eventdate@header{#1}\fi
+  \def\uvh at eventdate{#2}
 }
 
 % The maketitle routine
 \renewcommand\maketitle{%
-  \newif\ifuniv at eventline\univ at eventlinefalse%
-  \ifx\univ at event\empty\else\univ at eventlinetrue\fi%
-  \ifx\univ at eventdate\empty\else\univ at eventlinetrue\fi%
-  \ifx\univ at eventlocation\empty\else\univ at eventlinetrue\fi%
+  \newif\ifuvh at eventline\uvh at eventlinefalse%
+  \ifx\uvh at event\empty\else\uvh at eventlinetrue\fi%
+  \ifx\uvh at eventdate\empty\else\uvh at eventlinetrue\fi%
+  \ifx\uvh at eventlocation\empty\else\uvh at eventlinetrue\fi%
   \vspace*{\beforetitling}%
   \hspace*{\titleoffset}%
   \begin{minipage}[t]{0.63\columnwidth}%
     \raggedright%
-    \ifx\univ at event\empty%
+    \ifx\uvh at event\empty%
     \else
-      \vspace*{\beforeevent}\bgroup\univ at font@event\univ at event\egroup\ifx\univ at eventlocation\empty\else\par\fi%
+      \vspace*{\beforeevent}\bgroup\uvh at font@event\uvh at event\egroup\ifx\uvh at eventlocation\empty\else\par\fi%
     \fi%
-    \ifx\univ at eventlocation\empty%
+    \ifx\uvh at eventlocation\empty%
     \else
-      \bgroup\univ at font@eventlocdate\univ at eventlocation\egroup%
+      \bgroup\uvh at font@eventlocdate\uvh at eventlocation\egroup%
     \fi%
-    \ifx\univ at eventdate\empty%
+    \ifx\uvh at eventdate\empty%
     \else%
-      \bgroup\univ at font@eventlocdate{} (\univ at eventdate)\egroup%
+      \bgroup\uvh at font@eventlocdate{} (\uvh at eventdate)\egroup%
     \fi%
-    \ifuniv at eventline\par\fi
-    \ifx\univ at title\empty%
+    \ifuvh at eventline\par\fi
+    \ifx\uvh at title\empty%
     \else
       \vspace{\beforetitle}%
-      \ifx\univ at titleprefix\empty%
-        \parbox{\textwidth}{\raggedright\univ at font@title\univ at title}\par%
-        \ifx\univ at subtitle\empty%
+      \ifx\uvh at titleprefix\empty%
+        \parbox{\textwidth}{\raggedright\uvh at font@title\uvh at title}\par%
+        \ifx\uvh at subtitle\empty%
         \else
-           \vspace{\beforesubtitle}\noindent\bgroup\raggedright\univ at font@subtitle\univ at subtitle\par\egroup%
+           \vspace{\beforesubtitle}\noindent\bgroup\raggedright\uvh at font@subtitle\uvh at subtitle\par\egroup%
         \fi
       \else%
         \vspace{.15\baselineskip}%
         \begin{minipage}{\textwidth}
            \begin{tabularx}{\columnwidth}{@{}l@{\enskip}>{\raggedright\arraybackslash}X}
-              \univ at font@title\univ at titleprefix & \univ at font@title\univ at title \tabularnewline
-              \ifx\univ at subtitle\empty%
+              \uvh at font@title\uvh at titleprefix & \uvh at font@title\uvh at title \tabularnewline
+              \ifx\uvh at subtitle\empty%
               \else
                  \noalign{\vspace{\beforesubtitle}}%
-                 & \univ at font@subtitle\univ at subtitle \tabularnewline
+                 & \uvh at font@subtitle\uvh at subtitle \tabularnewline
               \fi
            \end{tabularx}%
         \end{minipage}%
       \fi
       \@ifundefined{hypersetup}{}{%
-          \hypersetup{pdftitle=\ifx\univ at titleprefix\empty\else\univ at titleprefix~\fi\univ at title,
-                      pdfauthor=\univ at name,
+          \hypersetup{pdftitle=\ifx\uvh at titleprefix\empty\else\uvh at titleprefix~\fi\uvh at title,
+                      pdfauthor=\uvh at name,
                       pdfcreator={LaTeX2e via LyX}}}%
     \fi%
   \end{minipage}\par%
-  \ifx\univ at widesubtitle\empty%
+  \ifx\uvh at widesubtitle\empty%
   \else%
-    \vspace{\beforesubtitle}\bgroup\noindent\raggedright\univ at font@subtitle\univ at widesubtitle\par\egroup%
+    \vspace{\beforesubtitle}\bgroup\noindent\raggedright\uvh at font@subtitle\uvh at widesubtitle\par\egroup%
   \fi%
   \vspace{\aftertitle}%
   \@afterindentfalse\@afterheading%
@@ -726,14 +610,14 @@
 }
 
 % Easy way to change bibliography heading
-\def\univ at bibheading{\refname}
-\newcommand*\Bibheading[1]{\def\univ at bibheading{#1}}
+\def\uvh at bibheading{\refname}
+\newcommand*\Bibheading[1]{\def\uvh at bibheading{#1}}
 
 % Adjust logo positioning for landscape
 \newlength\lsoffset
-\iflandscape
-\setlength\lsoffset{8cm}
-\addtolength\headeroffset{\lsoffset}
+\if at 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,36 +645,36 @@
 % First page
 
 \def\ps at firstpage{
-  \sbox{\univ at box@logo}{\univ at printlogo}
-  \def\univ at thelogo{\parbox{74mm}{\usebox{\univ at box@logo}}}
+  \sbox{\uvh at box@logo}{\uvh at printlogo}
+  \def\uvh at thelogo{\parbox{74mm}{\usebox{\uvh at box@logo}}}
   \headheight30mm\headsep2.5mm\footskip8mm
   \def\@oddhead{%
     \unitlength1mm
     \hspace*{\headeroffset}
     \begin{picture}(0,0)
-       \put(84.5,19){\univ at thelogo}
+       \put(84.5,19){\uvh at thelogo}
        \put(107,8){%
          \parbox[t]{51.5mm}
           {\normalsize\parbox[t]{\linewidth}{%
              \begin{flushleft}%
-               \if\univ at department\empty\else\vspace*{8pt}\univ at font@department\univ at department\umbruch[3pt]\umbruch\fi%
-               \univ at font@header\univ at name%
-               \if\univ at function\empty\else\umbruch\univ at function\fi%
-               \if\univ at street\empty\else\umbruch\univ at street\fi%
-               \if\univ at location\empty\else\umbruch\univ at postcode~\univ at location\fi%
+               \if\uvh at department\empty\else\vspace*{8pt}\uvh at font@department\uvh at department\umbruch[3pt]\umbruch\fi%
+               \uvh at font@header\uvh at name%
+               \if\uvh at function\empty\else\umbruch\uvh at function\fi%
+               \if\uvh at street\empty\else\umbruch\uvh at street\fi%
+               \if\uvh at location\empty\else\umbruch\uvh at postcode~\uvh at location\fi%
                \vspace{10pt}%
-               \if\univ at phone\empty\else\umbruch\ifx\univ at phoneprefix\empty\else\univ at phoneprefix\ \fi\univ at phone\fi%
-               \if\univ at fax\empty\else\umbruch\ifx\univ at faxprefix\empty\else\univ at faxprefix\ \fi\univ at fax\fi%
-               \if\univ at email\empty\else\umbruch\ifx\univ at emailprefix\empty\else\univ at emailprefix\ \fi\univ at email\fi%
-               \ifx\univ at url\empty\else\umbruch\ifx\univ at urlprefix\empty\else\univ at urlprefix\ \fi\univ at url\fi%
+               \if\uvh at phone\empty\else\umbruch\ifx\uvh at phoneprefix\empty\else\uvh at phoneprefix\ \fi\uvh at phone\fi%
+               \if\uvh at fax\empty\else\umbruch\ifx\uvh at faxprefix\empty\else\uvh at faxprefix\ \fi\uvh at fax\fi%
+               \if\uvh at email\empty\else\umbruch\ifx\uvh at emailprefix\empty\else\uvh at emailprefix\ \fi\uvh at email\fi%
+               \ifx\uvh at url\empty\else\umbruch\ifx\uvh at urlprefix\empty\else\uvh at urlprefix\ \fi\uvh at url\fi%
              \end{flushleft}%
            }%
          }%
       }
-      \ifuniv at punchmark
+      \if at uvh@punchmark
         \put(-27,-112){\line(1,0){4}}
       \fi
-      \ifuniv at foldmarks
+      \if at uvh@foldmarks
         \put(-33,-56){\line(1,0){3}}
         \put(-33,-168){\line(1,0){3}}
       \fi
@@ -796,8 +681,8 @@
     \end{picture}
    \hfill%
   }
-  \ifpageonfirst
-    \def\@oddfoot{\hfill\univ at font@footer\raggedright\univ at pageprefix~\thepage\iflastpage /\pageref{LastPage}\fi}
+  \if at uvh@pageonfirst
+    \def\@oddfoot{\hfill\uvh at font@footer\raggedright\uvh at pageprefix~\thepage\if at uvh@lastpage /\pageref{LastPage}\fi}
   \else
     \def\@oddfoot{}
   \fi
@@ -808,37 +693,37 @@
 %
 % Pages > 1
 
-\newif\ifnoevent\noeventfalse
+\newif\if at uvh@noevent\@uvh at noeventfalse
 
 \def\heventtitlesep{}
 
 \def\ps at headings{%
-  \let\orig at and\and%
+  \let\uvh at save@and\and%
   \def\and{$\cdot$\ }%
-  \ifnopplogo\else\sbox{\univ at box@logo}{\univ at printsmalllogo}\fi
-  \def\univ at thelogo{\parbox{90mm}{\usebox{\univ at box@logo}}}
+  \if at uvh@pplogo\sbox{\uvh at box@logo}{\uvh at printsmalllogo}\fi
+  \def\uvh at thelogo{\parbox{90mm}{\usebox{\uvh at box@logo}}}
   \headheight30mm\headsep2.5mm\footskip8mm
-  \def\titleline{\ifx\univ at title@header\empty\else\univ at font@headertitle%
-                 \ifx\univ at titleprefix\empty\else\univ at titleprefix~\fi%
-                 \univ at title@header\linebreak\fi}%
-  \ifx\univ at eventlocation@header\empty\ifx\univ at eventdate@header\empty\noeventtrue\fi\fi%
+  \def\titleline{\ifx\uvh at title@header\empty\else\uvh at font@headertitle%
+                 \ifx\uvh at titleprefix\empty\else\uvh at titleprefix~\fi%
+                 \uvh at title@header\linebreak\fi}%
+  \ifx\uvh at eventlocation@header\empty\ifx\uvh at eventdate@header\empty\@uvh at noeventtrue\fi\fi%
   \def\eventline{%
-      \univ at font@header\univ at event@header\ifx\univ at eventdate@header\empty\else\ifbreakevent\linebreak\else\ \fi%
-      \ifnoevent\else(\ifx\univ at eventlocation@header\empty\else\univ at eventlocation@header, \fi\univ at eventdate@header)\fi\linebreak\fi%
+      \uvh at font@header\uvh at event@header\ifx\uvh at eventdate@header\empty\else\if at uvh@breakevent\linebreak\else\ \fi%
+      \if at uvh@noevent\else(\ifx\uvh at eventlocation@header\empty\else\uvh at eventlocation@header, \fi\uvh at eventdate@header)\fi\linebreak\fi%
   }
   \def\@oddhead{%
     \unitlength1mm
     \hspace{\headeroffset}
     \begin{picture}(0,0)
-       \put(106.2,15){\univ at thelogo}
+       \put(106.2,15){\uvh at thelogo}
        \put(-8,25){%
          \hspace*{-\lsoffset}%
          \parbox[t]{120mm}
           {\normalsize\parbox[t]{100mm}{%
             \begin{flushleft}%
-              \univ at font@header\if\hfuzz\univ at shortname\hfuzz\univ at name\else\univ at shortname\fi
-               \if\univ at department\empty\else\univ at headerdeptsep\univ at department\fi\linebreak
-              \ifswaphead
+              \uvh at font@header\if\hfuzz\uvh at shortname\hfuzz\uvh at name\else\uvh at shortname\fi
+               \if\uvh at department\empty\else\uvh at headerdeptsep\uvh at department\fi\linebreak
+              \if at uvh@swaphead
                 \eventline%
                 \heventtitlesep%
                 \titleline%
@@ -853,10 +738,10 @@
     \end{picture}
     \hfill%
   }
-  \def\@oddfoot{\hfill\univ at font@footer\raggedright\univ at pageprefix~\thepage\iflastpage /\pageref{LastPage}\fi}
+  \def\@oddfoot{\hfill\uvh at font@footer\raggedright\uvh at pageprefix~\thepage\if at uvh@lastpage /\pageref{LastPage}\fi}
   \def\@evenhead{\@oddhead}
   \def\@evenfoot{\@oddfoot}
-  \let\and\orig at and%
+  \let\and\uvh at save@and%
 }
 
 
@@ -867,11 +752,11 @@
 %% captionlabel bold
 \setkomafont{captionlabel}{\bfseries}
 
-\ifcaptionp
-\RequirePackage[format=plain,
-	    justification=RaggedRight,
-	    singlelinecheck=false
-	   ]{caption}
+\if at uvh@captionp
+    \RequirePackage[format=plain,
+	            justification=RaggedRight,
+	            singlelinecheck=false
+	           ]{caption}
 \fi
 
 %% =============================================================
@@ -878,11 +763,13 @@
 %% POLYGLOSSIA:
 %% =============================================================
 
-\ifpolyglossia
-  \ifcaptionp
+\if at uvh@polyglossia
+  \if at uvh@captionp
     \RequirePackage{ragged2e}
   \fi
   \RequirePackage{polyglossia}
+\else
+  \RequirePackage{babel}[1997/01/23]
 \fi
 
 %% =============================================================
@@ -890,9 +777,9 @@
 %% =============================================================
 
 % Biblatex
-\ifbiblatex
+\if at uvh@biblatex
 
-\ifapa
+\if at 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 at apa condition
 \fi
 
-\DeclarePrintbibliographyDefaults{title=\univ at bibheading}
+\DeclarePrintbibliographyDefaults{title=\uvh at bibheading}
 
-% End of biblatex condition
+% End of @uvh at biblatex condition
 \fi
 
 % Smaller
@@ -968,7 +855,7 @@
 
 % Custom heading
 \AtBeginDocument{%
-  \renewcommand*\bib at heading{\section*{\univ at bibheading}}
+  \renewcommand*\bib at heading{\section*{\uvh at bibheading}}
 }
 
 
@@ -984,13 +871,20 @@
 %
 \RequirePackage{array}
 \RequirePackage{ifthen}
-\RequirePackage{babel}[1997/01/23]
 
 % Micro-typographic polishment
-\ifmicrotype
+\if at uvh@microtype
    \RequirePackage{microtype}
 \fi
 
+% Quote (smaller)
+\let\@uvh at save@quote\quote
+\renewcommand*{\quote}{\@uvh at save@quote\small}
+
+% Quotation (smaller)
+\let\@uvh at save@quotation\quotation
+\renewcommand*{\quotation}{\@uvh at 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 at equation}[1]{(#1)}
+\if at uvh@covington
+  \RequirePackage{covington}
+  \renewcommand{\p at equation}[1]{(#1)}
 \fi
 
 
@@ -1022,7 +913,7 @@
 %% X-REFS:
 %% =============================================================
 
-\ifrefsp
+\if at 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 at uvh@draftmark
 
-\ifdraftmarkfp
+\if at 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

Modified: trunk/Master/texmf-dist/tex/latex/univie-ling/univie-ling-paper.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/univie-ling/univie-ling-paper.cls	2022-10-02 20:19:11 UTC (rev 64583)
+++ trunk/Master/texmf-dist/tex/latex/univie-ling/univie-ling-paper.cls	2022-10-02 20:19:41 UTC (rev 64584)
@@ -32,7 +32,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \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)]
 
 
 %% ============================================================
@@ -39,180 +39,140 @@
 %% CLASS OPTIONS
 %% ============================================================
 
-\RequirePackage{xkeyval}
+\newif\if at uvp@biblatex\@uvp at biblatextrue
+\newif\if at uvp@apa\@uvp at apafalse
+\newif\if at uvp@captionp\@uvp at captionptrue
+\newif\if at uvp@draftmark\@uvp at draftmarkfalse
+\newif\if at uvp@draftmarkfp\@uvp at draftmarkfpfalse
+\newif\if at uvp@refsp\@uvp at refsptrue
+\newif\if at uvp@covington\@uvp at covingtontrue
+\newif\if at uvp@microtype\@uvp at microtypetrue
+\newif\if at uvp@multiauthors\@uvp at multiauthorsfalse
+\newif\if at uvp@polyglossia\@uvp at polyglossiafalse
+\newif\if at uvp@psfonts\@uvp at psfontstrue
+\newif\if at uvp@otffonts\@uvp at otffontsfalse
+\newif\if at uvp@usefontenc\@uvp at usefontenctrue
+\def\uvp at fontenc{T1}
 
-\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 at boolkey+{uvt}{all}[true]{%
-    \ifKV at uvt@all
-        \biblatextrue
-        \captionptrue
-        \refsptrue
-        \covingtontrue
-        \microtypetrue
-    \else
-        \biblatexfalse
-        \captionpfalse
-        \refspfalse
-        \covingtonfalse
-        \microtypefalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-paper}{unknown 'all' value}%
+% 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 at biblatextrue
+                \@uvp at captionptrue
+                \@uvp at refsptrue
+                \@uvp at covingtontrue
+                \@uvp at microtypetrue
+             }{
+                \@uvp at biblatexfalse
+                \@uvp at captionpfalse
+                \@uvp at refspfalse
+                \@uvp at covingtonfalse
+                \@uvp at microtypefalse
+             }
+          },
+	all.usage:n = preamble,
+	% apa=<true|false>
+	% Load APA style
+	apa.legacy_if_set:n = @uvp at apa,
+	apa.usage:n = preamble,
+	% biblatex=<true|false>
+	% Load biblatex
+	biblatex.legacy_if_set:n = @uvp at biblatex,
+	biblatex.usage:n = preamble,
+	% caption=<true|false>
+	% Load caption
+	caption.legacy_if_set:n = @uvp at captionp,
+	caption.usage:n = preamble,
+	% covington=<true|false>
+	% Load covington
+	covington.legacy_if_set:n = @uvp at covington,
+	covington.usage:n = preamble,
+	% fontenc=<value|none>
+	% customize font encoding
+	fontenc.code:n = 
+	  { \str_if_eq:NNTF { #1 } { none } {
+	       \@uvp at usefontencfalse
+             }{
+               \def\uvp at fontenc{#1}
+             }
+          },
+	fontenc.usage:n = preamble,
+	% microtype=<true|false>
+	% Load microtype
+	microtype.legacy_if_set:n = @uvp at microtype,
+	microtype.usage:n = preamble,
+	% polyglossia=<true|false>
+	% Load polyglossia
+	polyglossia.legacy_if_set:n = @uvp at polyglossia,
+	polyglossia.code:n = 
+	  { \bool_if:nT {#1} {
+	       \@uvp at psfontsfalse
+               \@uvp at otffontstrue
+             }
+          },
+	polyglossia.usage:n = preamble,
+	% ref=<true|false>
+	% Load varioref and prettyref
+	ref.legacy_if_set:n = @uvp at refsp,
+	ref.usage:n = preamble,
+	% draftmark=<true|false|firstpage>
+	% Print draftmark
+	draftmark .choice:,
+	% true
+	draftmark / true .code:n = 
+	  { \@uvp at draftmarktrue
+            \@uvp at draftmarkfpfalse
+          },
+        % false
+	draftmark / false .code:n = 
+	  { \@uvp at draftmarkfalse
+            \@uvp at draftmarkfpfalse
+          },
+        % firstpage
+	draftmark / firstpage .code:n = 
+	  { \@uvp at draftmarktrue
+            \@uvp at 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 at psfontstrue
+            \@uvp at otffontsfalse
+          },
+        % otf: use OpenType fonts (fontspec)
+	fonts / otf .code:n = 
+	  { \@uvp at psfontsfalse
+            \@uvp at otffontstrue
+          },
+        % none: Use no font package
+	fonts / none .code:n = 
+	  { \@uvp at psfontsfalse
+            \@uvp at otffontsfalse
+          },
 }
+\ExplSyntaxOff
 
-% biblatex=<true|false>
-% Load biblatex
-\define at boolkey+{uvt}{biblatex}[true]{%
-    \ifKV at uvt@biblatex
-        \biblatextrue
-    \else
-        \biblatexfalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-paper}{unknown biblatex value}%
-}
+% Process
 
-% apa=<true|false>
-% Load APA style
-\define at boolkey+{uvt}{apa}[true]{%
-    \ifKV at uvt@apa
-        \apatrue
-    \else
-        \apafalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-paper}{unknown apa value}%
+\IfFormatAtLeastTF{2022-06-01}
+{
+  \ProcessKeyOptions[uvp]
+}{
+  \RequirePackage{l3keys2e}
+  \ProcessKeysOptions{uvp}
 }
 
-% caption=<true|false>
-% Load caption
-\define at boolkey+{uvt}{caption}[true]{%
-    \ifKV at uvt@caption
-        \captionptrue
-    \else
-        \captionpfalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-paper}{unknown caption value}%
-}
 
-% draftmark=<true|false>
-% Print draftmark
-\define at 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 at boolkey+{uvt}{ref}[true]{%
-    \ifKV at uvt@ref
-        \refsptrue
-    \else
-        \refspfalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-paper}{unknown ref value}%
-}
-
-% covington=<true|false>
-% Load covington
-\define at boolkey+{uvt}{covington}[true]{%
-    \ifKV at uvt@covington
-        \covingtontrue
-    \else
-        \covingtonfalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-paper}{unknown covington value}%
-}
-
-% microtype=<true|false>
-% Load microtype
-\define at boolkey+{uvt}{microtype}[true]{%
-    \ifKV at uvt@microtype
-        \microtypetrue
-    \else
-        \microtypefalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-paper}{unknown microtype value}%
-}
-
-% polyglossia=<true|false>
-% Load polyglossia
-\define at boolkey+{uvt}{polyglossia}[true]{%
-    \ifKV at uvt@polyglossia
-        \polyglossiatrue
-        \psfontsfalse
-        \otffontstrue
-        \nofontsfalse
-    \else
-        \polyglossiafalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-paper}{unknown polyglossia value}%
-}
-
-% fonts=<ps|otf|none>
-\define at 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'}%
-}
-
-% fontenc=<value|false>
-% customize font encoding
-\newif\ifuniv at usefontenc\univ at usefontenctrue
-\def\univ at fontenc{T1}
-\define at choicekey*+{uvt}{fontenc}[\val\nr]{none}{%
-    \ifcase\nr\relax% none:
-        \univ at usefontencfalse
-    \fi
-}{%
-    \def\univ at fontenc{#1}%
-}
-
-% Process
-\ProcessOptionsX<uvt>
-
 %% ============================================================
 %% BASE CLASS:
 %% ============================================================
@@ -233,45 +193,46 @@
 %% 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}
 
 
 %% ============================================================
@@ -278,32 +239,32 @@
 %% FONTS AND EMPHASIZING:
 %% ============================================================
 
-\ifpsfonts
+\if at uvp@psfonts
 
-\ifuniv at usefontenc
-  \RequirePackage[\univ at fontenc]{fontenc}
-\fi
+  \if at uvp@usefontenc
+    \RequirePackage[\uvp at 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 at uvp@otffonts
+  \RequirePackage{fontspec}
+  \setmainfont{Palatino}
+  \setsansfont{Arial}
+  \setmonofont{SourceCodePro}
 \fi
 
 % Hyperlinks
@@ -310,10 +271,7 @@
 \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 at skip}
@@ -343,7 +301,7 @@
     }{}
     \def\lectype{\csuse{lectype@#1}}%
     \def\lectypeverb{\csuse{lectypeverb@#1}}%
-    \iftoggle{customtexttype}{}{\def\@texttype{\csuse{texttype@#1}}}
+    \if at uvp@customtexttype\else\def\@texttype{\csuse{texttype@#1}}\fi%
   }%
 }
 
@@ -359,8 +317,8 @@
 }
 
 \def\@texttype{Seminararbeit}
-\newtoggle{customtexttype}
-\newcommand\texttype[1]{\def\@texttype{#1}\toggletrue{customtexttype}}
+\newif\if at uvp@customtexttype\@uvp at customtexttypefalse
+\newcommand\texttype[1]{\def\@texttype{#1}\@uvp at customtexttypetrue}
 \def\@course{}
 \newcommand\course[2]{\setkeys{lec}{lectype=#1}\def\@course{#2}}
 \def\@instructor{}
@@ -423,7 +381,7 @@
 %% LAYOUT
 %% ============================================================
 
-\usepackage{setspace}
+\RequirePackage{setspace}
 \onehalfspacing
 
 % Header and pagination:
@@ -446,8 +404,8 @@
 \raggedbottom
 
 % Micro-typographic polishment
-\ifmicrotype
-\usepackage{microtype}
+\if at uvp@microtype
+   \RequirePackage{microtype}
 \fi
 
 % Smart quotes
@@ -466,7 +424,7 @@
   \else
     \def\and{%
       \end{tabular}%
-      \global\multiauthorstrue%
+      \global\@uvp at multiauthorstrue%
       \hskip 1em \@plus.17fil%
       \begin{tabular}[t]{c}%
     }%
@@ -539,7 +497,7 @@
         }%
         \vskip 2em
         {%
-          \GetTranslation{author}\par
+          \translate{author}\par
           \usekomafont{author}{%
             \lineskip 0.75em%
             \begin{tabular}[t]{c}
@@ -550,7 +508,7 @@
             \end{tabular}%
             \hskip 1em \@plus.17fil%
             \begin{tabular}[t]{c}%
-             \GetTranslation{matnr}:~
+             \translate{matnr}:~
           }%
           \usekomafont{date}{%
             \begin{tabular}[t]{c}
@@ -560,7 +518,7 @@
               \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 @@
           }%
         }%
         \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 @@
       \hline
     }%
 \clearpage
-\section*{\GetTranslation{erkl}}
+\section*{\translate{erkl}}
 
-\ifmultiauthors
-\GetTranslation{selbst1p}
+\if at uvp@multiauthors
+  \translate{selbst1p}
 \else
-\GetTranslation{selbst1s}
+  \translate{selbst1s}
 \fi
 
-\GetTranslation{selbst2}
+\translate{selbst2}
 
-\ifmultiauthors
-\GetTranslation{selbst3p}
+\if at 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 @@
 \def\labelitemi{--}
 
 % Quote (smaller)
-\newcommand*{\OriginalQuote}{}
-\let\OriginalQuote\quote
-\renewcommand*{\quote}{\OriginalQuote\small}
+\let\@uvp at save@quote\quote
+\renewcommand*{\quote}{\@uvp at save@quote\small}
 
 % Quotation (smaller)
-\newcommand*{\OriginalQuotation}{}
-\let\OriginalQuotation\quotation
-\renewcommand*{\quotation}{\OriginalQuotation\small}
+\let\@uvp at save@quotation\quotation
+\renewcommand*{\quotation}{\@uvp at save@quotation\small}
 
 % Description (normal italic)
 \setkomafont{descriptionlabel}{\normalfont\itshape}
 
-\ifcovington
-\RequirePackage{covington}
-\renewcommand{\p at equation}[1]{(#1)}
+\if at uvp@covington
+  \RequirePackage{covington}
+  \renewcommand{\p at equation}[1]{(#1)}
 \fi
 
 %% =============================================================
@@ -732,11 +688,11 @@
 %% captionlabel bold
 \setkomafont{captionlabel}{\bfseries}
 
-\ifcaptionp
-\RequirePackage[format=plain,
-	    justification=RaggedRight,
-	    singlelinecheck=false
-	   ]{caption}
+\if at uvp@captionp
+    \RequirePackage[format=plain,
+	            justification=RaggedRight,
+	            singlelinecheck=false
+	           ]{caption}
 \fi
 
 %% =============================================================
@@ -743,8 +699,8 @@
 %% POLYGLOSSIA:
 %% =============================================================
 
-\ifpolyglossia
-  \ifcaptionp
+\if at uvp@polyglossia
+  \if at uvp@captionp
     \RequirePackage{ragged2e}
   \fi
   \RequirePackage{polyglossia}
@@ -755,9 +711,9 @@
 %% =============================================================
 
 % Biblatex
-\ifbiblatex
+\if at uvp@biblatex
 
-\ifapa
+\if at uvp@apa
 % Load biblatex with apa style
 \RequirePackage[%
   style=apa,
@@ -820,10 +776,10 @@
 % Change cite command for integrated csquotes env.
 \SetCiteCommand{\parencite}
 
-% End of apa condition
+% End of @uvp at apa condition
 \fi
 
-% End of biblatex condition
+% End of @uvp at biblatex condition
 \fi
 
 %% =============================================================
@@ -842,7 +798,7 @@
 %% X-REFS:
 %% =============================================================
 
-\ifrefsp
+\if at uvp@refsp
 
 \AtBeginDocument{%
  % Varioref:
@@ -852,19 +808,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
@@ -874,9 +830,9 @@
 %% DRAFT:
 %% =============================================================
 
-\ifdraftmark
+\if at uvp@draftmark
 
-\ifdraftmarkfp
+\if at uvp@draftmarkfp
   \RequirePackage[firstpageonly]{draftwatermark}
 \else
   \RequirePackage{draftwatermark}
@@ -887,7 +843,7 @@
   vpos=10pt,
   anchor=ct,
   fontsize=14pt,
-  text={\GetTranslation{draft} (\today)}
+  text={\translate{draft} (\today)}
 }
 
 \fi

Modified: trunk/Master/texmf-dist/tex/latex/univie-ling/univie-ling-thesis.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/univie-ling/univie-ling-thesis.cls	2022-10-02 20:19:11 UTC (rev 64583)
+++ trunk/Master/texmf-dist/tex/latex/univie-ling/univie-ling-thesis.cls	2022-10-02 20:19:41 UTC (rev 64584)
@@ -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
+\newif\if at uvt@apa\@uvt at apafalse
+\newif\if at uvt@biblatex\@uvt at biblatextrue
+\newif\if at uvt@captionp\@uvt at captionptrue
+\newif\if at uvt@covington\@uvt at covingtontrue
+\newif\if at uvt@draftmark\@uvt at draftmarkfalse
+\newif\if at uvt@draftmarkfp\@uvt at draftmarkfpfalse
+\newif\if at uvt@fdegree\@uvt at fdegreefalse
+\newif\if at uvt@microtype\@uvt at microtypetrue
+\newif\if at uvt@multiauthors\@uvt at multiauthorsfalse
+\newif\if at uvt@otffonts\@uvt at otffontsfalse
+\newif\if at uvt@pdfa\@uvt at pdfafalse
+\newif\if at uvt@polyglossia\@uvt at polyglossiafalse
+\newif\if at uvt@psfonts\@uvt at psfontstrue
+\newif\if at uvt@refsp\@uvt at refsptrue
+\newif\if at uvt@usefontenc\@uvt at usefontenctrue
+\def\uvt at fontenc{T1}
 
-% all=<true|false>
-% Load all packages
-\define at boolkey+{uvt}{all}[true]{%
-    \ifKV at uvt@all
-        \biblatextrue
-        \captionptrue
-        \refsptrue
-        \covingtontrue
-        \microtypetrue
-    \else
-        \biblatexfalse
-        \captionpfalse
-        \refspfalse
-        \covingtonfalse
-        \microtypefalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-thesis}{unknown 'all' value}%
+% 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 at biblatextrue
+                \@uvt at captionptrue
+                \@uvt at refsptrue
+                \@uvt at covingtontrue
+                \@uvt at microtypetrue
+             }{
+                \@uvt at biblatexfalse
+                \@uvt at captionpfalse
+                \@uvt at refspfalse
+                \@uvt at covingtonfalse
+                \@uvt at microtypefalse
+             }
+          },
+	all.usage:n = preamble,
+	% apa=<true|false>
+	% Load APA style
+	apa.legacy_if_set:n = @uvt at apa,
+	apa.usage:n = preamble,
+	% biblatex=<true|false>
+	% Load biblatex
+	biblatex.legacy_if_set:n = @uvt at biblatex,
+	biblatex.usage:n = preamble,
+	% caption=<true|false>
+	% Load caption
+	caption.legacy_if_set:n = @uvt at captionp,
+	caption.usage:n = preamble,
+	% covington=<true|false>
+	% Load covington
+	covington.legacy_if_set:n = @uvt at covington,
+	covington.usage:n = preamble,
+	% fdegree=<true|false>
+	% Female degree forms
+	fdegree.legacy_if_set:n = @uvt at fdegree,
+	fdegree.usage:n = preamble,
+	% fontenc=<value|none>
+	% customize font encoding
+	fontenc.code:n = 
+	  { \str_if_eq:NNTF { #1 } { none } {
+	       \@uvt at usefontencfalse
+             }{
+               \def\uvt at fontenc{#1}
+             }
+          },
+	fontenc.usage:n = preamble,
+	% microtype=<true|false>
+	% Load microtype
+	microtype.legacy_if_set:n = @uvt at microtype,
+	microtype.usage:n = preamble,
+	% pdfa=<true|false>
+	% PDF/A
+	pdfa.legacy_if_set:n = @uvt at pdfa,
+	pdfa.usage:n = preamble,
+	% polyglossia=<true|false>
+	% Load polyglossia
+	polyglossia.legacy_if_set:n = @uvt at polyglossia,
+	polyglossia.code:n = 
+	  { \bool_if:nT {#1} {
+	       \@uvt at psfontsfalse
+               \@uvt at otffontstrue
+             }
+          },
+	polyglossia.usage:n = preamble,
+	% ref=<true|false>
+	% Load varioref and prettyref
+	ref.legacy_if_set:n = @uvt at refsp,
+	ref.usage:n = preamble,
+	% draftmark=<true|false|firstpage>
+	% Print draftmark
+	draftmark .choice:,
+	% true
+	draftmark / true .code:n = 
+	  { \@uvt at draftmarktrue
+            \@uvt at draftmarkfpfalse
+          },
+        % false
+	draftmark / false .code:n = 
+	  { \@uvt at draftmarkfalse
+            \@uvt at draftmarkfpfalse
+          },
+        % firstpage
+	draftmark / firstpage .code:n = 
+	  { \@uvt at draftmarktrue
+            \@uvt at 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 at psfontstrue
+            \@uvt at otffontsfalse
+          },
+        % otf: use OpenType fonts (fontspec)
+	fonts / otf .code:n = 
+	  { \@uvt at psfontsfalse
+            \@uvt at otffontstrue
+          },
+        % none: Use no font package
+	fonts / none .code:n = 
+	  { \@uvt at psfontsfalse
+            \@uvt at otffontsfalse
+          },
 }
+\ExplSyntaxOff
 
-% biblatex=<true|false>
-% Load biblatex
-\define at boolkey+{uvt}{biblatex}[true]{%
-    \ifKV at uvt@biblatex
-        \biblatextrue
-    \else
-        \biblatexfalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-thesis}{unknown biblatex value}%
-}
+% Process
 
-% apa=<true|false>
-% Load APA style
-\define at boolkey+{uvt}{apa}[true]{%
-    \ifKV at uvt@apa
-        \apatrue
-    \else
-        \apafalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-thesis}{unknown apa value}%
+\IfFormatAtLeastTF{2022-06-01}
+{
+  \ProcessKeyOptions[uvt]
+}{
+  \RequirePackage{l3keys2e}
+  \ProcessKeysOptions{uvt}
 }
 
-% caption=<true|false>
-% Load caption
-\define at boolkey+{uvt}{caption}[true]{%
-    \ifKV at uvt@caption
-        \captionptrue
-    \else
-        \captionpfalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-thesis}{unknown caption value}%
-}
-
-% ref=<true|false>
-% Load varioref and prettyref
-\define at boolkey+{uvt}{ref}[true]{%
-    \ifKV at uvt@ref
-        \refsptrue
-    \else
-        \refspfalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-thesis}{unknown ref value}%
-}
-
-% covington=<true|false>
-% Load covington
-\define at boolkey+{uvt}{covington}[true]{%
-    \ifKV at uvt@covington
-        \covingtontrue
-    \else
-        \covingtonfalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-thesis}{unknown covington value}%
-}
-
-% microtype=<true|false>
-% Load microtype
-\define at boolkey+{uvt}{microtype}[true]{%
-    \ifKV at uvt@microtype
-        \microtypetrue
-    \else
-        \microtypefalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-thesis}{unknown microtype value}%
-}
-
-% fdegree=<true|false>
-% Female degree forms
-\define at boolkey+{uvt}{fdegree}[true]{%
-    \ifKV at uvt@fdegree
-        \fdegreetrue
-    \else
-        \fdegreefalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-thesis}{unknown fdegree value}%
-}
-
-% draftmark=<true|false>
-% Print draftmark
-\define at 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 at boolkey+{uvt}{polyglossia}[true]{%
-    \ifKV at uvt@polyglossia
-        \polyglossiatrue
-        \psfontsfalse
-        \otffontstrue
-        \nofontsfalse
-    \else
-        \polyglossiafalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-thesis}{unknown polyglossia value}%
-}
-
-% pdfa=<true|false>
-% PDF/A
-\define at boolkey+{uvt}{pdfa}[true]{%
-    \ifKV at uvt@pdfa
-        \pdfatrue
-    \else
-        \pdfafalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-thesis}{unknown pdfa value}%
-}
-
-% fonts=<ps|otf|none>
-\define at 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'}%
-}
-
-% fontenc=<value|false>
-% customize font encoding
-\newif\ifuniv at usefontenc\univ at usefontenctrue
-\def\univ at fontenc{T1}
-\define at choicekey*+{uvt}{fontenc}[\val\nr]{none}{%
-    \ifcase\nr\relax% none:
-        \univ at usefontencfalse
-    \fi
-}{%
-    \def\univ at fontenc{#1}%
-}
-
-% 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
+\if at uvt@psfonts
+  \RequirePackage[T1]{fontenc}
+  \if at uvt@usefontenc
+    \RequirePackage[\uvt at fontenc]{fontenc}
+  \fi
 
-\RequirePackage[T1]{fontenc}\ifuniv at usefontenc
-  \RequirePackage[\univ at 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 at uvt@otffonts
+  \RequirePackage{fontspec}
+  \setmainfont{Palatino}
+  \setsansfont{Arial}
+  \setmonofont{SourceCodePro}
 \fi
 
 % Hyperlinks
@@ -363,7 +311,7 @@
     \def\@thesistype at en{\csuse{thesistype@#1 at en}}
     \def\@dirtype{\csuse{dirtype@#1}}
     \def\@dirtype at en{\csuse{dirtype@#1 at en}}
-    \iffdegree
+    \if at uvt@fdegree
         \def\@degree{\csuse{degree@#1 at f}}
     \else
         \def\@degree{\csuse{degree@#1}}
@@ -476,7 +424,7 @@
 \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 @@
 \raggedbottom
 
 % Micro-typographic polishment
-\ifmicrotype
-\usepackage{microtype}
+\if at uvt@microtype
+  \RequirePackage{microtype}
 \fi
 
 % Smart quotes
@@ -515,7 +463,7 @@
   \else
     \def\and{%
       \end{tabular}%
-      \global\multiauthorstrue%
+      \global\@uvt at multiauthorstrue%
       \hskip 1em \@plus.17fil%
       \begin{tabular}[t]{c}%
     }%
@@ -577,7 +525,7 @@
          \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 @@
     }%
 \clearpage
 \thispagestyle{plain}%
-\section*{\GetTranslation{erkl}}
+\section*{\translate{erkl}}
 
-\ifmultiauthors
-\GetTranslation{selbst1p}
+\if at uvt@multiauthors
+  \translate{selbst1p}
 \else
-\GetTranslation{selbst1s}
+  \translate{selbst1s}
 \fi
 
-\GetTranslation{selbst2}
+\translate{selbst2}
 
-\ifmultiauthors
-\GetTranslation{selbst3p}
+\if at 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 @@
 \def\labelitemi{--}
 
 % Quote (smaller)
-\newcommand*{\OriginalQuote}{}
-\let\OriginalQuote\quote
-\renewcommand*{\quote}{\OriginalQuote\small}
+\let\@uvt at save@quote\quote
+\renewcommand*{\quote}{\@uvt at save@quote\small}
 
 % Quotation (smaller)
-\newcommand*{\OriginalQuotation}{}
-\let\OriginalQuotation\quotation
-\renewcommand*{\quotation}{\OriginalQuotation\small}
+\let\@uvt at save@quotation\quotation
+\renewcommand*{\quotation}{\@uvt at save@quotation\small}
 
 % Description (normal italic)
 \setkomafont{descriptionlabel}{\normalfont\itshape}
 
-\ifcovington
-\RequirePackage{covington}
-\renewcommand{\p at equation}[1]{(#1)}
+\if at uvt@covington
+  \RequirePackage{covington}
+  \renewcommand{\p at equation}[1]{(#1)}
 \fi
 
 %% =============================================================
@@ -758,11 +704,11 @@
 %% captionlabel bold
 \setkomafont{captionlabel}{\bfseries}
 
-\ifcaptionp
-\RequirePackage[format=plain,
-	    justification=RaggedRight,
-	    singlelinecheck=false
-	   ]{caption}
+\if at uvt@captionp
+   \RequirePackage[format=plain,
+	           justification=RaggedRight,
+	           singlelinecheck=false
+	          ]{caption}
 \fi
 
 
@@ -770,7 +716,7 @@
 %% PDF-A:
 %% =============================================================
 
-\ifpdfa
+\if at uvt@pdfa
   \RequirePackage[a-1b]{pdfx}
   \hypersetup{pdfborder={0 0 0}}
 \fi
@@ -779,8 +725,8 @@
 %% POLYGLOSSIA:
 %% =============================================================
 
-\ifpolyglossia
-  \ifcaptionp
+\if at uvt@polyglossia
+  \if at uvt@captionp
     \RequirePackage{ragged2e}
   \fi
   \RequirePackage{polyglossia}
@@ -791,9 +737,9 @@
 %% =============================================================
 
 % Biblatex
-\ifbiblatex
+\if at uvt@biblatex
 
-\ifapa
+\if at uvt@apa
 % Load biblatex with apa style
 \RequirePackage[%
   style=apa,
@@ -856,10 +802,10 @@
 % Change cite command for integrated csquotes env.
 \SetCiteCommand{\parencite}
 
-% End of apa condition
+% End of @uvt at apa condition
 \fi
 
-% End of biblatex condition
+% End of @uvt at biblatex condition
 \fi
 
 %% =============================================================
@@ -868,9 +814,9 @@
 
 \let\origtableofcontents\tableofcontents
 \renewcommand*\tableofcontents{%
-\thispagestyle{plain}
-\origtableofcontents
-\clearpage
+  \thispagestyle{plain}
+  \origtableofcontents
+  \clearpage
 }
 
 
@@ -878,7 +824,7 @@
 %% X-REFS:
 %% =============================================================
 
-\ifrefsp
+\if at uvt@refsp
 
 \AtBeginDocument{%
  % Varioref:
@@ -888,19 +834,20 @@
     \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 @@
 %% DRAFT:
 %% =============================================================
 
-\ifdraftmark
+\if at uvt@draftmark
 
-\ifdraftmarkfp
-  \RequirePackage[firstpageonly]{draftwatermark}
-\else
-  \RequirePackage{draftwatermark}
-\fi
+  \if at 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
 

Modified: trunk/Master/texmf-dist/tex/latex/univie-ling/univie-ling-wlg-logo.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/tex/latex/univie-ling/univie-ling-wlg.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/univie-ling/univie-ling-wlg.cls	2022-10-02 20:19:11 UTC (rev 64583)
+++ trunk/Master/texmf-dist/tex/latex/univie-ling/univie-ling-wlg.cls	2022-10-02 20:19:41 UTC (rev 64584)
@@ -33,7 +33,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \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)]
 
 
 %% ============================================================
@@ -40,91 +40,69 @@
 %% CLASS OPTIONS:
 %% ============================================================
 
-\RequirePackage{xkeyval}
+\newif\if at wlg@biblatex\@wlg at biblatexfalse
+\newif\if at wlg@covington\@wlg at covingtontrue
+\newif\if at wlg@expert\@wlg at expertfalse
+\newif\if at wlg@titlepage\@wlg at titlepagefalse
+\newif\if at wlg@specialprint\@wlg at specialprintfalse
 
-\newif\ifbiblatex\biblatexfalse
-\newif\ifcovington\covingtontrue
-\newif\ifexpert\expertfalse
-
-% biblatex=<true|false>
-% Load biblatex
-\define at boolkey+{wlg}{biblatex}[true]{%
-    \ifKV at wlg@biblatex
-        \biblatextrue
-    \else
-        \biblatexfalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-wlg}{unknown biblatex value}%
+% 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 at biblatex,
+	biblatex.usage:n = preamble,
+	% covington=<true|false>
+	% Load covington
+	covington.legacy_if_set:n = @wlg at covington,
+	covington.usage:n = preamble,
+	% expertfonts=<true|false>
+	% Load MinionPro
+	expertfonts.legacy_if_set:n = @wlg at expert,
+	expertfonts.usage:n = preamble,
+	% preprint=<true|false>
+	preprint.legacy_if_set:n = @wlg at preprint,
+	preprint.usage:n = preamble,
+	% peerrev=<true|false>
+	peerrev.legacy_if_set:n = @wlg at peerrev,
+	peerrev.usage:n = preamble,
+	% titlepage=<none|specialprint|issue>
+	titlepage .choice:,
+	% none
+	titlepage / none .code:n = 
+	  { \@wlg at titlepagefalse
+            \@wlg at specialprintfalse
+          },
+        % specialprint
+	titlepage / specialprint .code:n = 
+	  { \@wlg at titlepagetrue
+            \@wlg at specialprinttrue
+          },
+        % issue
+	titlepage / issue .code:n = 
+	  { \@wlg at titlepagetrue
+            \@wlg at specialprintfalse
+          },
 }
-\DeclareOptionX{biblatex}{\setkeys{wlg}{biblatex=#1}}
+\ExplSyntaxOff
 
-% covington=<true|false>
-% Load covington
-\define at boolkey+{wlg}{covington}[true]{%
-    \ifKV at wlg@covington
-        \covingtontrue
-    \else
-        \covingtonfalse
-    \fi
-}{%
-    \ClassWarning{univie-ling-wlg}{unknown covington value}%
+\IfFormatAtLeastTF{2022-06-01}
+{
+  \ProcessKeyOptions[wlg]
+}{
+  \RequirePackage{l3keys2e}
+  \ProcessKeysOptions{wlg}
 }
-\DeclareOptionX{covington}{\setkeys{wlg}{covington=#1}}
 
 
-% expertfonts=<true|false>
-% Load MinionPro
-\define at boolkey+{wlg}{expertf}[true]{%
-    \ifKV at 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 at 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}}
+%% ============================================================
+%% BASE CLASS:
+%% ============================================================
 
-% preprint=<true|false>
-\define at boolkey+{wlg}{preprint}[true]{%
-}{%
-    \ClassWarning{univie-ling-wlg}{unknown preprint value}%
-}
-\DeclareOptionX{preprint}{\setkeys{wlg}{preprint=#1}}
-
-% peerrev=<true|false>
-\define at boolkey+{wlg}{peerrev}[true]{%
-}{%
-    \ClassWarning{univie-ling-wlg}{unknown peerrev value}%
-}
-\DeclareOptionX{peerrev}{\setkeys{wlg}{peerrev=#1}}
-
-\DeclareOption*{%
-\PassOptionsToClass{\CurrentOption}{scrartcl}%
-}
-
-\ProcessOptionsX
-
-
 \LoadClass{scrartcl}[2003/04/22]
 
 \KOMAoptions{%
@@ -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 at 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}}%
+  \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}
+\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 at wlg@peerrev
+\if at 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 at wlg@specialprint\else
+  \RequirePackage{etoc}
+  \etocstandardlines
+  \etocsetstyle{chapter}
+    {}
+    {\normalsize\mdseries\rmfamily}
+    {\etocname{}\dotfill\etocpage\par\vspace{12pt}}
+    {}
+  \setcounter{tocdepth}{0}
+\fi
 
 
 %% ============================================================
@@ -363,7 +351,7 @@
 \renewcommand{\sectionmark}[1]{\markright{\thesection.\ #1}}
 \RequirePackage{scrlayer-scrpage}
 \renewcommand{\headfont}{\small\rmfamily}
-\clearscrheadings
+\clearmainofpairofpagestyles
 \ohead{\pagemark}
 \automark{section}
 \KOMAoptions{headsepline=true}
@@ -370,11 +358,11 @@
 \pagestyle{scrheadings}
 
 % Macrotypographic sectioning
-\newif\if at mainmatter\@mainmattertrue
-\newif\if at frontmatter\@frontmatterfalse
+\newif\if at wlg@mainmatter\@wlg at mainmattertrue
+\newif\if at wlg@frontmatter\@wlg at frontmatterfalse
 \newcommand*\frontmatter{%
   \if at twoside\cleardoubleoddpage\else\clearpage\fi
-  \@mainmatterfalse\@frontmattertrue\pagenumbering{roman}%
+  \@wlg at mainmatterfalse\@wlg at frontmattertrue\pagenumbering{roman}%
   \edef\computelastpage{%
     \romannumeral\numexpr\getpagerefnumber{LastFrontPage}-1\relax}%
   \edef\startpageref{%
@@ -383,13 +371,13 @@
 \newcommand*\mainmatter{%
   \if at twoside\cleardoubleoddpage\else\clearpage\fi%
   \immediate\write\@auxout{\noexpand\newlabel{LastFrontPage}{{}{\arabic{page}}}}%
-  \@mainmattertrue\@frontmatterfalse%
+  \@wlg at mainmattertrue\@wlg at frontmatterfalse%
   \pagenumbering{arabic}%
   \def\computelastpage{\pageref{TotPages}}%
   \def\startpageref{\thestartpage}%
 }
 \newcommand*\backmatter{%
-  \if at openright\cleardoubleoddpage\else\clearpage\fi\@mainmatterfalse\@frontmatterfalse%
+  \if at openright\cleardoubleoddpage\else\clearpage\fi\@wlg at mainmatterfalse\@wlg at 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 at 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 @@
 }
 
 % 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 @@
 \def\@pubyear{}
 \newcommand\issue[2]{\def\@issue{#1}\def\@pubyear{#2}}
 
-\newif\iftitlepageneeded\titlepageneededtrue
-\newif\ifstartpageset\startpagesetfalse
+\newif\if at wlg@titlepageneeded\@wlg at titlepageneededtrue
+\newif\if at wlg@startpageset\@wlg at startpagesetfalse
 
 \def\ljobname{\jobname}
 
@@ -497,12 +489,12 @@
   \else
     \def\and{\texorpdfstring{\unskip\slash}{| }}%
   \fi
-  \iftitlepage
+  \if at wlg@titlepage
     \@maketitlepage[#1]%
   \fi
-  \ifstartpageset\else
+  \if at wlg@startpageset\else
    \setcounter{page}{\thestartpage}
-   \global\startpagesettrue
+   \global\@wlg at startpagesettrue
   \fi
   \rehead{\@@author}
   \lohead{\@@title}
@@ -568,8 +560,10 @@
 }%
 
 \newcommand{\@maketitlepage}[1][1]{%
-   \iftitlepageneeded
+   \if at wlg@titlepageneeded
     \begin{titlepage}
+      \pagenumbering{alph}
+      \thispagestyle{empty}%
       \setcounter{page}{%
         #1%
       }%
@@ -593,7 +587,7 @@
           {\usekomafont{subject}{\@subject\par}}%
           \vskip 3em
         \fi
-        \ifspecialprint
+        \if at wlg@specialprint
 		{\usekomafont{title}{\@title\par}}%
 		\vskip 1em
 		{\ifx\@subtitle\@empty\else\usekomafont{subtitle}{\@subtitle\par}\fi}%
@@ -604,10 +598,10 @@
 		  }%
 		}%
 		  \vfill
-		  {\usekomafont{date}{\ifKV at wlg@preprint\translate{preprintfrom}%
+		  {\usekomafont{date}{\if at wlg@preprint\translate{preprintfrom}%
 		                      \else\translate{specialprint}\fi\ \emph{Wiener Linguistische Gazette}
 		                      (\versal{WLG})
-		 \@issue\ (\@pubyear)\ifKV at wlg@preprint\else: \startpageref--\lastpageref\fi\par}}
+		 \@issue\ (\@pubyear)\if at wlg@preprint\else: \startpageref--\lastpageref\fi\par}}
 		{\ifx\@issuetitle\@empty\else
 			\vskip 1em
 			\usekomafont{date}{\translate{specialissue} \itshape\@issuetitle
@@ -687,7 +681,7 @@
     ~\vfill
     \impressum
     \clearpage
-    \ifspecialprint\else
+    \if at wlg@specialprint\else
      \ifx\@issuetitle\@empty\else
        \thispagestyle{plain}
        \tableofcontents
@@ -694,7 +688,7 @@
        \clearpage
      \fi
     \fi
-    \global\titlepageneededfalse%
+    \global\@wlg at titlepageneededfalse%
    \fi%
 }
 
@@ -746,7 +740,7 @@
      \translate{lingdep}\par
      \translate{univie}\par
      \translate{issue} \@issue\ (\@pubyear):
-        \ifKV at wlg@preprint\translate{preprint}%
+        \if at wlg@preprint\translate{preprint}%
            \else\thepage--\lastpageref\fi%
     }%
     \vskip \z@ \@plus 1em
@@ -758,6 +752,7 @@
   \end{flushright}%
   \par
   \vskip 2em
+  \pagenumbering{arabic}
 }%
 
 % Rewrite \include for local LastPage counter
@@ -781,7 +776,7 @@
       \immediate\openout\@partaux #1.aux
       \immediate\write\@partaux{\relax}%
     \fi
-    \ifbiblatex
+    \if at wlg@biblatex
        \newrefsection
     \fi
     \@input@{#1.tex}%
@@ -836,11 +831,12 @@
 
 % 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 @@
 \renewcommand*{\dictumrule}{}
 
 \newcommand\motto[2][]{%
-\dictum[#1]{#2}
-\medskip
-\@afterindentfalse
-\@afterheading
+  \dictum[#1]{#2}%
+  \medskip%
+  \@afterindentfalse%
+  \@afterheading%
 }
 
 % Lists
@@ -904,14 +900,12 @@
 \def\labelitemi{--}
 
 % Quote (smaller)
-\newcommand*{\OriginalQuote}{}
-\let\OriginalQuote\quote
-\renewcommand*{\quote}{\OriginalQuote\small}
+\let\@wlg at save@quote\quote
+\renewcommand*{\quote}{\@wlg at save@quote\small}
 
 % Quotation (smaller)
-\newcommand*{\OriginalQuotation}{}
-\let\OriginalQuotation\quotation
-\renewcommand*{\quotation}{\OriginalQuotation\small}
+\let\@wlg at save@quotation\quotation
+\renewcommand*{\quotation}{\@wlg at save@quotation\small}
 
 % Description (KOMA) (normal italic)
 \setkomafont{descriptionlabel}{\normalfont\itshape}
@@ -920,9 +914,9 @@
 \let\olddots\ldots
 \renewcommand*{\ldots}{\olddots\unkern}
 
-\ifcovington
-\RequirePackage{covington}
-\renewcommand{\p at equation}[1]{(#1)}
+\if at wlg@covington
+  \RequirePackage{covington}
+  \renewcommand{\p at equation}[1]{(#1)}
 \fi
 
 
@@ -951,18 +945,18 @@
 %% =============================================================
 
 % Biblatex
-\ifbiblatex
-\RequirePackage[%
-  style=univie-ling,
-  sorting=nyvt,
-  autolang=hyphen]
-{biblatex}
+\if at 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 @@
 % 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 at 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}}
 }
 
 %% =============================================================

Modified: trunk/Master/texmf-dist/tex/latex/univie-ling/univie-ling.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/univie-ling/univie-ling.bbx	2022-10-02 20:19:11 UTC (rev 64583)
+++ trunk/Master/texmf-dist/tex/latex/univie-ling/univie-ling.bbx	2022-10-02 20:19:41 UTC (rev 64584)
@@ -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}

Modified: trunk/Master/texmf-dist/tex/latex/univie-ling/univie-ling.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/univie-ling/univie-ling.cbx	2022-10-02 20:19:11 UTC (rev 64583)
+++ trunk/Master/texmf-dist/tex/latex/univie-ling/univie-ling.cbx	2022-10-02 20:19:41 UTC (rev 64584)
@@ -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}
 



More information about the tex-live-commits mailing list.