univie-ling (21oct22)

git-svn-id: svn://tug.org/texlive/trunk@64772 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 799 insertions, 718 deletions

diff --git a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-expose.cls b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-expose.cls
index 102a7e0bccb..570067b9c84 100644
--- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-expose.cls
+++ b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-expose.cls
@@ -32,7 +32,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-expose}[2022/10/02 v.2.0 Univie Linguistic Exposes (JSp)]
+\ProvidesPackage{univie-ling-expose}[2022/10/21 v.2.1 Univie Linguistic Exposes (JSp)]
 
 
 %% ============================================================
@@ -58,106 +58,108 @@
 \ExplSyntaxOn
 \keys_define:nn { uve }
 {
-	% all=<true|false>
-	% Load all (most) packages
-	all.code:n = 
-	  { \bool_if:nTF {#1} {
-	        \@uve@biblatextrue
-                \@uve@captionptrue
-                \@uve@refsptrue
-                \@uve@covingtontrue
-                \@uve@microtypetrue
-             }{
-                \@uve@biblatexfalse
-                \@uve@captionpfalse
-                \@uve@refspfalse
-                \@uve@covingtonfalse
-                \@uve@microtypefalse
-             }
-          },
-	all.usage:n = preamble,
-	% apa=<true|false>
-	% Load APA style
-	apa.legacy_if_set:n = @uve@apa,
-	apa.usage:n = preamble,
-	% biblatex=<true|false>
-	% Load biblatex
-	biblatex.legacy_if_set:n = @uve@biblatex,
-	biblatex.usage:n = preamble,
-	% caption=<true|false>
-	% Load caption
-	caption.legacy_if_set:n = @uve@captionp,
-	caption.usage:n = preamble,
-	% covington=<true|false>
-	% Load covington
-	covington.legacy_if_set:n = @uve@covington,
-	covington.usage:n = preamble,
-	% fontenc=<value|none>
-	% customize font encoding
-	fontenc.code:n = 
-	  { \str_if_eq:NNTF { #1 } { none } {
-	       \@uve@usefontencfalse
-             }{
-               \def\uve@fontenc{#1}
-             }
-          },
-	fontenc.usage:n = preamble,
-	% microtype=<true|false>
-	% Load microtype
-	microtype.legacy_if_set:n = @uve@microtype,
-	microtype.usage:n = preamble,
-	% polyglossia=<true|false>
-	% Load polyglossia
-	polyglossia.legacy_if_set:n = @uve@polyglossia,
-	polyglossia.code:n = 
-	  { \bool_if:nT {#1} {
-	       \@uve@psfontsfalse
-               \@uve@otffontstrue
-             }
-          },
-	polyglossia.usage:n = preamble,
-	% ref=<true|false>
-	% Load varioref and prettyref
-	ref.legacy_if_set:n = @uve@refsp,
-	ref.usage:n = preamble,
-	% draftmark=<true|false|firstpage>
-	% Print draftmark
-	draftmark .choice:,
-	% true
-	draftmark / true .code:n = 
-	  { \@uve@draftmarktrue
-            \@uve@draftmarkfpfalse
-          },
-        % false
-	draftmark / false .code:n = 
-	  { \@uve@draftmarkfalse
-            \@uve@draftmarkfpfalse
-          },
-        % firstpage
-	draftmark / firstpage .code:n = 
-	  { \@uve@draftmarktrue
-            \@uve@draftmarkfptrue
-          },
-        % no val equals to true
-        draftmark .default:n = {true},
-        % fonts=<ps|otf|none>
-        % Select font scheme
-	fonts .choice:,
-	% ps: use PostScript fonts (classic LaTeX)
-	fonts / ps .code:n = 
-	  { \@uve@psfontstrue
-            \@uve@otffontsfalse
-          },
-        % otf: use OpenType fonts (fontspec)
-	fonts / otf .code:n = 
-	  { \@uve@psfontsfalse
-            \@uve@otffontstrue
-          },
-        % none: Use no font package
-	fonts / none .code:n = 
-	  { \@uve@psfontsfalse
-            \@uve@otffontsfalse
-          },
+    % all=<true|false>
+    % Load all (most) packages
+    all.code:n = 
+      { \bool_if:nTF {#1} {
+            \@uve@biblatextrue
+            \@uve@captionptrue
+            \@uve@refsptrue
+            \@uve@covingtontrue
+            \@uve@microtypetrue
+         }{
+            \@uve@biblatexfalse
+            \@uve@captionpfalse
+            \@uve@refspfalse
+            \@uve@covingtonfalse
+            \@uve@microtypefalse
+         }
+      },
+    all.usage:n = preamble,
+    % apa=<true|false>
+    % Load APA style
+    apa.legacy_if_set:n = @uve@apa,
+    apa.usage:n = preamble,
+    % biblatex=<true|false>
+    % Load biblatex
+    biblatex.legacy_if_set:n = @uve@biblatex,
+    biblatex.usage:n = preamble,
+    % caption=<true|false>
+    % Load caption
+    caption.legacy_if_set:n = @uve@captionp,
+    caption.usage:n = preamble,
+    % covington=<true|false>
+    % Load covington
+    covington.legacy_if_set:n = @uve@covington,
+    covington.usage:n = preamble,
+    % fontenc=<value|none>
+    % customize font encoding
+    fontenc.code:n = 
+      { \str_if_eq:NNTF { #1 } { none } {
+           \@uve@usefontencfalse
+         }{
+           \def\uve@fontenc{#1}
+         }
+      },
+    fontenc.usage:n = preamble,
+    % microtype=<true|false>
+    % Load microtype
+    microtype.legacy_if_set:n = @uve@microtype,
+    microtype.usage:n = preamble,
+    % polyglossia=<true|false>
+    % Load polyglossia
+    polyglossia.code:n = 
+      { \bool_if:nTF {#1} {
+           \@uve@psfontsfalse
+           \@uve@otffontstrue
+           \@uve@polyglossiatrue
+         }{
+           \@uve@polyglossiafalse
+         }
+      },
+    polyglossia.usage:n = preamble,
+    % ref=<true|false>
+    % Load varioref and prettyref
+    ref.legacy_if_set:n = @uve@refsp,
+    ref.usage:n = preamble,
+    % draftmark=<true|false|firstpage>
+    % Print draftmark
+    draftmark .choice:,
+    % true
+    draftmark / true .code:n = 
+      { \@uve@draftmarktrue
+        \@uve@draftmarkfpfalse
+      },
+    % false
+    draftmark / false .code:n = 
+      { \@uve@draftmarkfalse
+        \@uve@draftmarkfpfalse
+      },
+    % firstpage
+    draftmark / firstpage .code:n = 
+      { \@uve@draftmarktrue
+        \@uve@draftmarkfptrue
+      },
+    % no val equals to true
+    draftmark .default:n = {true},
+    % fonts=<ps|otf|none>
+    % Select font scheme
+    fonts .choice:,
+    % ps: use PostScript fonts (classic LaTeX)
+    fonts / ps .code:n = 
+      { \@uve@psfontstrue
+        \@uve@otffontsfalse
+      },
+    % otf: use OpenType fonts (fontspec)
+    fonts / otf .code:n = 
+      { \@uve@psfontsfalse
+        \@uve@otffontstrue
+      },
+    % none: Use no font package
+    fonts / none .code:n = 
+      { \@uve@psfontsfalse
+        \@uve@otffontsfalse
+      },
 }
 \ExplSyntaxOff
 
@@ -177,13 +179,13 @@
 %% ============================================================
 
 \LoadClass[%
-	   a4paper,
-	   fontsize=12pt,
-	   captions=tableheading,
-	   listof=totoc,
-	   numbers=noenddot,
-	   titlepage=true,
-	   sectionentrydots=true
+       a4paper,
+       fontsize=12pt,
+       captions=tableheading,
+       listof=totoc,
+       numbers=noenddot,
+       titlepage=true,
+       sectionentrydots=true
 ]{scrartcl}[2003/04/22]
 
 \RequirePackage{array}
@@ -332,7 +334,7 @@
 
 \RequirePackage{geometry}
 
-\usepackage{setspace}
+\RequirePackage{setspace}
 \onehalfspacing
 
 % Header and pagination:
@@ -439,39 +441,39 @@
        \end{center}
       \vspace{2\baselineskip}
       \begin{center}
-	{\usekomafont{tpcaption}\translate{tpcaption}\par}
-	{\ifx\@title\@empty\else
+    {\usekomafont{tpcaption}\translate{tpcaption}\par}
+    {\ifx\@title\@empty\else
            \usekomafont{title}{\enquote{\@title%
             \ifx\@subtitle\@empty\else\linebreak\@subtitle\fi}\par}%
-         \fi
-        }
-        \vskip 2em
-        {%
-          {\usekomafont{tpcaption}\translate{author}\par}
-          \usekomafont{author}{%
-            \lineskip 0.75em%
-            \begin{tabular}[t]{c}
-              \@author
-            \end{tabular}\par
-          }%
-        }%
-       \end{center}\par
-        \vfill
-        {\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}}
-	\translate{stkz}: & & \@studienkennzahl\tabularnewline
-        \noalign{\vskip6pt}
-	\translate{strt}: & & \@studienrichtung\tabularnewline
-        \noalign{\vskip6pt}
-        \translate{supervisor}: & & \@supervisor\tabularnewline%
-        \noalign{\vskip6pt}
-        \ifx\@cosupervisor\@empty\else\translate{cosupervisor}: & & \@cosupervisor\tabularnewline\fi
-	\noalign{\vskip6pt}
-        \ifx\@beirat\@empty\else\translate{beirat}: & & \@beirat\fi
-	\end{tabular}\par
-	}
+     \fi
+    }
+    \vskip 2em
+    {%
+      {\usekomafont{tpcaption}\translate{author}\par}
+       \usekomafont{author}{%
+          \lineskip 0.75em%
+          \begin{tabular}[t]{c}
+            \@author
+          \end{tabular}\par
+       }%
+    }%
+    \end{center}\par
+    \vfill
+      {\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}}
+           \translate{stkz}: & & \@studienkennzahl\tabularnewline
+           \noalign{\vskip6pt}
+           \translate{strt}: & & \@studienrichtung\tabularnewline
+           \noalign{\vskip6pt}
+           \translate{supervisor}: & & \@supervisor\tabularnewline%
+           \noalign{\vskip6pt}
+           \ifx\@cosupervisor\@empty\else\translate{cosupervisor}: & & \@cosupervisor\tabularnewline\fi
+           \noalign{\vskip6pt}
+           \ifx\@beirat\@empty\else\translate{beirat}: & & \@beirat\fi
+         \end{tabular}\par
+      }
       \par
       \@thanks\let\@thanks\@empty
       \null
@@ -491,8 +493,8 @@
       \fi
       \ifx\titlepage@restore\relax\else\clearpage\titlepage@restore\fi
     \end{titlepage}
-  \setcounter{footnote}{0}%
-  \expandafter\ifnum \csname scr@v@3.12\endcsname>\scr@compatibility\relax
+    \setcounter{footnote}{0}%
+    \expandafter\ifnum \csname scr@v@3.12\endcsname>\scr@compatibility\relax
     \let\thanks\relax
     \let\maketitle\relax
     \let\@maketitle\relax
@@ -580,9 +582,9 @@
 
 \if@uve@captionp
    \RequirePackage[format=plain,
-	           justification=RaggedRight,
-	           singlelinecheck=false
-	          ]{caption}
+               justification=RaggedRight,
+               singlelinecheck=false
+              ]{caption}
 \fi
 
 %% =============================================================
diff --git a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-handout.cls b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-handout.cls
index 293064b15da..8327970b1f8 100644
--- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-handout.cls
+++ b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-handout.cls
@@ -33,7 +33,7 @@
 
 
 \NeedsTeXFormat{LaTeX2e}[1997/06/01]
-\ProvidesClass{univie-ling-handout}[2022/10/02 v.2.0 Univie Ling handout class (JSp)]
+\ProvidesClass{univie-ling-handout}[2022/10/21 v.2.1 Univie Ling handout class (JSp)]
 
 %% ============================================================
 %% CLASS OPTIONS
@@ -68,40 +68,40 @@
 \def\uvh@printsmalllogo{\includegraphics[height=14mm]{univielogo}}
 % German CD (default)
 \def\uvh@cd@german{
-	\def\uvh@name{\uvh@name@de}
-	\def\uvh@shortname{\uvh@shortname@de}
-	\def\uvh@university{Universit\"at Wien}
-	\def\uvh@department{\uvh@department@de}
-	\def\uvh@location{\uvh@location@de}
-	\def\uvh@country{\uvh@country@de}
-	\def\uvh@function{\uvh@function@de}
-	\def\uvh@secfunction{\uvh@secfunction@de}
-	\def\uvh@phoneprefix{T}
-	\def\uvh@faxprefix{F}
-	\def\uvh@emailprefix{}
-	\def\uvh@urlprefix{}
-	\def\uvh@pageprefix{Seite}
-	\def\uvh@headerdeptsep{\ $\cdot$\ }
-	\def\uvh@headernamesep{,\ }
-	\def\and{\\}
+    \def\uvh@name{\uvh@name@de}
+    \def\uvh@shortname{\uvh@shortname@de}
+    \def\uvh@university{Universit\"at Wien}
+    \def\uvh@department{\uvh@department@de}
+    \def\uvh@location{\uvh@location@de}
+    \def\uvh@country{\uvh@country@de}
+    \def\uvh@function{\uvh@function@de}
+    \def\uvh@secfunction{\uvh@secfunction@de}
+    \def\uvh@phoneprefix{T}
+    \def\uvh@faxprefix{F}
+    \def\uvh@emailprefix{}
+    \def\uvh@urlprefix{}
+    \def\uvh@pageprefix{Seite}
+    \def\uvh@headerdeptsep{\ $\cdot$\ }
+    \def\uvh@headernamesep{,\ }
+    \def\and{\\}
 }
 \def\uvh@cd@english{%
-	\def\uvh@name{\uvh@name@en}
-	\def\uvh@shortname{\uvh@shortname@en}
-	\def\uvh@university{University of Vienna}
-	\def\uvh@department{\uvh@department@en}
-	\def\uvh@location{\uvh@location@en}
-	\def\uvh@country{\uvh@country@en}
-	\def\uvh@function{\uvh@function@en}
-	\def\uvh@secfunction{\uvh@secfunction@en}
-	\def\uvh@phoneprefix{T}
-	\def\uvh@faxprefix{F}
-	\def\uvh@emailprefix{}
-	\def\uvh@urlprefix{}
-	\def\uvh@pageprefix{Page}
-	\def\uvh@headerdeptsep{\ $\cdot$\ }
-	\def\uvh@headernamesep{,\ }
-	\def\uvh@secnamesep{,\ }
+    \def\uvh@name{\uvh@name@en}
+    \def\uvh@shortname{\uvh@shortname@en}
+    \def\uvh@university{University of Vienna}
+    \def\uvh@department{\uvh@department@en}
+    \def\uvh@location{\uvh@location@en}
+    \def\uvh@country{\uvh@country@en}
+    \def\uvh@function{\uvh@function@en}
+    \def\uvh@secfunction{\uvh@secfunction@en}
+    \def\uvh@phoneprefix{T}
+    \def\uvh@faxprefix{F}
+    \def\uvh@emailprefix{}
+    \def\uvh@urlprefix{}
+    \def\uvh@pageprefix{Page}
+    \def\uvh@headerdeptsep{\ $\cdot$\ }
+    \def\uvh@headernamesep{,\ }
+    \def\uvh@secnamesep{,\ }
 }
 \uvh@cd@german
 
@@ -110,170 +110,172 @@
 \ExplSyntaxOn
 \keys_define:nn { uvh }
 {
-	% all=<true|false>
-	% Load all (most) packages
-	all.code:n = 
-	  { \bool_if:nTF {#1} {
-	        \@uvh@biblatextrue
-                \@uvh@captionptrue
-                \@uvh@refsptrue
-                \@uvh@covingtontrue
-                \@uvh@microtypetrue
-             }{
-                \@uvh@biblatexfalse
-                \@uvh@captionpfalse
-                \@uvh@refspfalse
-                \@uvh@covingtonfalse
-                \@uvh@microtypefalse
-             }
-          },
-	all.usage:n = preamble,
-	% apa=<true|false>
-	% Load APA style
-	apa.legacy_if_set:n = @uvh@apa,
-	apa.usage:n = preamble,
-	% biblatex=<true|false>
-	% Load biblatex
-	biblatex.legacy_if_set:n = @uvh@biblatex,
-	biblatex.usage:n = preamble,
-	% breakevent=<true|false>
-	% Line break in heading between event and event spec (location, date etc.)
-	breakevent.legacy_if_set:n = @uvh@breakevent,
-	breakevent.usage:n = preamble,
-	% bwlogo=<true|false>
-	% Print monochrome logo?
-	bwlogo.code:n = 
-	  { \bool_if:nTF {#1} {
-	       \def\uvh@printlogo{\includegraphics[width=74mm]{univielogo-sw}}
-               \def\uvh@printsmalllogo{\includegraphics[height=14mm]{univielogo-sw}}
-             }{
-               \def\uvh@printlogo{\includegraphics[width=74mm]{univielogo}}
-               \def\uvh@printsmalllogo{\includegraphics[height=14mm]{univielogo}}
-             }
-          },
-	bwlogo.usage:n = preamble,
-	% caption=<true|false>
-	% Load caption
-	caption.legacy_if_set:n = @uvh@captionp,
-	caption.usage:n = preamble,
-	% covington=<true|false>
-	% Load covington
-	covington.legacy_if_set:n = @uvh@covington,
-	covington.usage:n = preamble,
-	% firstpagination=<true|false>
-	% Suppress pagination on first page?
-	firstpagination.legacy_if_set:n = @uvh@pageonfirst,
-	firstpagination.usage:n = preamble,
-	% foldmarks=<true|false>
-	% Output fold marks?
-	foldmarks.legacy_if_set:n = @uvh@foldmarks,
-	foldmarks.usage:n = preamble,
-	% fontenc=<value|none>
-	% customize font encoding
-	fontenc.code:n = 
-	  { \str_if_eq:NNTF { #1 } { none } {
-	       \@uvh@usefontencfalse
-             }{
-               \def\uvh@fontenc{#1}
-             }
-          },
-	fontenc.usage:n = preamble,
-	% fontsize=<size>
-	% Set base font size
-	fontsize.tl_set:N = \uvh@fontsize,
-	fontsize.usage:n = preamble,
-	% landscape=<true|false>
-	% Set landscape
-	landscape.legacy_if_set:n = @uvh@landscape,
-	landscape.usage:n = preamble,
-	% microtype=<true|false>
-	% Load microtype
-	microtype.legacy_if_set:n = @uvh@microtype,
-	microtype.usage:n = preamble,
-	% papersize=<size>
-	% Set paper size
-	papersize.tl_set:N = \uvh@papersize,
-	papersize.usage:n = preamble,
-	% polyglossia=<true|false>
-	% Load polyglossia
-	polyglossia.legacy_if_set:n = @uvh@polyglossia,
-	polyglossia.code:n = 
-	  { \bool_if:nT {#1} {
-	       \@uvh@psfontsfalse
-               \@uvh@otffontstrue
-             }
-          },
-	polyglossia.usage:n = preamble,
-	% pplogo=<true|false>
-	% Print logo on page 2ff.
-	pplogo.legacy_if_set:n = @uvh@pplogo,
-	pplogo.usage:n = preamble,
-	% punchmarks=<true|false>
-	% Output punch marks?
-	punchmarks.legacy_if_set:n = @uvh@punchmark,
-	punchmarks.usage:n = preamble,
-	% ref=<true|false>
-	% Load varioref and prettyref
-	ref.legacy_if_set:n = @uvh@refsp,
-	ref.usage:n = preamble,
-	% swaphead=<true|false>
-	% Swap title and event in header
-	swaphead.legacy_if_set:n = @uvh@swaphead,
-	swaphead.usage:n = preamble,
-	% totalpages=<true|false>
-	% Output total page number
-	totalpages.legacy_if_set:n = @uvh@lastpage,
-	totalpages.usage:n = preamble,
-	% widesubtitle=<true|false>
-	% Print subtitle over the whole text width
-	% (may conflict with address field)
-	widesubtitle.legacy_if_set:n = @uvh@usewidesubtitle,
-	widesubtitle.usage:n = preamble,
-	% cd=<german|english>
-        % CD Language
-	cd .choice:,
-	% german
-	cd / german .code:n = { \uvh@cd@german },
-        % english
-	cd / english .code:n = { \uvh@cd@english },
-	% draftmark=<true|false|firstpage>
-	% Print draftmark
-	draftmark .choice:,
-	% true
-	draftmark / true .code:n = 
-	  { \@uvh@draftmarktrue
-            \@uvh@draftmarkfpfalse
-          },
-        % false
-	draftmark / false .code:n = 
-	  { \@uvh@draftmarkfalse
-            \@uvh@draftmarkfpfalse
-          },
-        % firstpage
-	draftmark / firstpage .code:n = 
-	  { \@uvh@draftmarktrue
-            \@uvh@draftmarkfptrue
-          },
-        % no val equals to true
-        draftmark .default:n = {true},
-        % fonts=<ps|otf|none>
-        % Select font scheme
-	fonts .choice:,
-	% ps: use PostScript fonts (classic LaTeX)
-	fonts / ps .code:n = 
-	  { \@uvh@psfontstrue
-            \@uvh@otffontsfalse
-          },
-        % otf: use OpenType fonts (fontspec)
-	fonts / otf .code:n = 
-	  { \@uvh@psfontsfalse
-            \@uvh@otffontstrue
-          },
-        % none: Use no font package
-	fonts / none .code:n = 
-	  { \@uvh@psfontsfalse
-            \@uvh@otffontsfalse
-          },
+    % all=<true|false>
+    % Load all (most) packages
+    all.code:n = 
+      { \bool_if:nTF {#1} {
+            \@uvh@biblatextrue
+            \@uvh@captionptrue
+            \@uvh@refsptrue
+            \@uvh@covingtontrue
+            \@uvh@microtypetrue
+         }{
+            \@uvh@biblatexfalse
+            \@uvh@captionpfalse
+            \@uvh@refspfalse
+            \@uvh@covingtonfalse
+            \@uvh@microtypefalse
+         }
+      },
+    all.usage:n = preamble,
+    % apa=<true|false>
+    % Load APA style
+    apa.legacy_if_set:n = @uvh@apa,
+    apa.usage:n = preamble,
+    % biblatex=<true|false>
+    % Load biblatex
+    biblatex.legacy_if_set:n = @uvh@biblatex,
+    biblatex.usage:n = preamble,
+    % breakevent=<true|false>
+    % Line break in heading between event and event spec (location, date etc.)
+    breakevent.legacy_if_set:n = @uvh@breakevent,
+    breakevent.usage:n = preamble,
+    % bwlogo=<true|false>
+    % Print monochrome logo?
+    bwlogo.code:n = 
+      { \bool_if:nTF {#1} {
+           \def\uvh@printlogo{\includegraphics[width=74mm]{univielogo-sw}}
+           \def\uvh@printsmalllogo{\includegraphics[height=14mm]{univielogo-sw}}
+         }{
+           \def\uvh@printlogo{\includegraphics[width=74mm]{univielogo}}
+           \def\uvh@printsmalllogo{\includegraphics[height=14mm]{univielogo}}
+         }
+      },
+    bwlogo.usage:n = preamble,
+    % caption=<true|false>
+    % Load caption
+    caption.legacy_if_set:n = @uvh@captionp,
+    caption.usage:n = preamble,
+    % covington=<true|false>
+    % Load covington
+    covington.legacy_if_set:n = @uvh@covington,
+    covington.usage:n = preamble,
+    % firstpagination=<true|false>
+    % Suppress pagination on first page?
+    firstpagination.legacy_if_set:n = @uvh@pageonfirst,
+    firstpagination.usage:n = preamble,
+    % foldmarks=<true|false>
+    % Output fold marks?
+    foldmarks.legacy_if_set:n = @uvh@foldmarks,
+    foldmarks.usage:n = preamble,
+    % fontenc=<value|none>
+    % customize font encoding
+    fontenc.code:n = 
+      { \str_if_eq:NNTF { #1 } { none } {
+           \@uvh@usefontencfalse
+         }{
+           \def\uvh@fontenc{#1}
+         }
+      },
+    fontenc.usage:n = preamble,
+    % fontsize=<size>
+    % Set base font size
+    fontsize.tl_set:N = \uvh@fontsize,
+    fontsize.usage:n = preamble,
+    % landscape=<true|false>
+    % Set landscape
+    landscape.legacy_if_set:n = @uvh@landscape,
+    landscape.usage:n = preamble,
+    % microtype=<true|false>
+    % Load microtype
+    microtype.legacy_if_set:n = @uvh@microtype,
+    microtype.usage:n = preamble,
+    % papersize=<size>
+    % Set paper size
+    papersize.tl_set:N = \uvh@papersize,
+    papersize.usage:n = preamble,
+    % polyglossia=<true|false>
+    % Load polyglossia
+    polyglossia.code:n = 
+      { \bool_if:nTF {#1} {
+           \@uvh@psfontsfalse
+           \@uvh@otffontstrue
+           \@uvh@polyglossiatrue
+        }{
+           \@uvh@polyglossiafalse
+        }
+      },
+    polyglossia.usage:n = preamble,
+    % pplogo=<true|false>
+    % Print logo on page 2ff.
+    pplogo.legacy_if_set:n = @uvh@pplogo,
+    pplogo.usage:n = preamble,
+    % punchmarks=<true|false>
+    % Output punch marks?
+    punchmarks.legacy_if_set:n = @uvh@punchmark,
+    punchmarks.usage:n = preamble,
+    % ref=<true|false>
+    % Load varioref and prettyref
+    ref.legacy_if_set:n = @uvh@refsp,
+    ref.usage:n = preamble,
+    % swaphead=<true|false>
+    % Swap title and event in header
+    swaphead.legacy_if_set:n = @uvh@swaphead,
+    swaphead.usage:n = preamble,
+    % totalpages=<true|false>
+    % Output total page number
+    totalpages.legacy_if_set:n = @uvh@lastpage,
+    totalpages.usage:n = preamble,
+    % widesubtitle=<true|false>
+    % Print subtitle over the whole text width
+    % (may conflict with address field)
+    widesubtitle.legacy_if_set:n = @uvh@usewidesubtitle,
+    widesubtitle.usage:n = preamble,
+    % cd=<german|english>
+    % CD Language
+    cd .choice:,
+    % german
+    cd / german .code:n = { \uvh@cd@german },
+    % english
+    cd / english .code:n = { \uvh@cd@english },
+    % draftmark=<true|false|firstpage>
+    % Print draftmark
+    draftmark .choice:,
+    % true
+    draftmark / true .code:n = 
+      { \@uvh@draftmarktrue
+        \@uvh@draftmarkfpfalse
+      },
+    % false
+    draftmark / false .code:n = 
+      { \@uvh@draftmarkfalse
+        \@uvh@draftmarkfpfalse
+      },
+    % firstpage
+    draftmark / firstpage .code:n = 
+      { \@uvh@draftmarktrue
+        \@uvh@draftmarkfptrue
+      },
+    % no val equals to true
+    draftmark .default:n = {true},
+    % fonts=<ps|otf|none>
+    % Select font scheme
+    fonts .choice:,
+    % ps: use PostScript fonts (classic LaTeX)
+    fonts / ps .code:n = 
+      { \@uvh@psfontstrue
+        \@uvh@otffontsfalse
+      },
+    % otf: use OpenType fonts (fontspec)
+    fonts / otf .code:n = 
+      { \@uvh@psfontsfalse
+        \@uvh@otffontstrue
+      },
+    % none: Use no font package
+    fonts / none .code:n = 
+      { \@uvh@psfontsfalse
+        \@uvh@otffontsfalse
+      },
 }
 \ExplSyntaxOff
 
@@ -754,9 +756,9 @@
 
 \if@uvh@captionp
     \RequirePackage[format=plain,
-	            justification=RaggedRight,
-	            singlelinecheck=false
-	           ]{caption}
+                justification=RaggedRight,
+                singlelinecheck=false
+               ]{caption}
 \fi
 
 %% =============================================================
diff --git a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-paper.cls b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-paper.cls
index 34f029b9edb..639c8d0423d 100644
--- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-paper.cls
+++ b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-paper.cls
@@ -32,7 +32,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-paper}[2022/10/02 v.2.0 Univie Linguistic Papers (JSp)]
+\ProvidesPackage{univie-ling-paper}[2022/10/21 v.2.1 Univie Linguistic Papers (JSp)]
 
 
 %% ============================================================
@@ -59,106 +59,108 @@
 \ExplSyntaxOn
 \keys_define:nn { uvp }
 {
-	% all=<true|false>
-	% Load all (most) packages
-	all.code:n = 
-	  { \bool_if:nTF {#1} {
-	        \@uvp@biblatextrue
-                \@uvp@captionptrue
-                \@uvp@refsptrue
-                \@uvp@covingtontrue
-                \@uvp@microtypetrue
-             }{
-                \@uvp@biblatexfalse
-                \@uvp@captionpfalse
-                \@uvp@refspfalse
-                \@uvp@covingtonfalse
-                \@uvp@microtypefalse
-             }
-          },
-	all.usage:n = preamble,
-	% apa=<true|false>
-	% Load APA style
-	apa.legacy_if_set:n = @uvp@apa,
-	apa.usage:n = preamble,
-	% biblatex=<true|false>
-	% Load biblatex
-	biblatex.legacy_if_set:n = @uvp@biblatex,
-	biblatex.usage:n = preamble,
-	% caption=<true|false>
-	% Load caption
-	caption.legacy_if_set:n = @uvp@captionp,
-	caption.usage:n = preamble,
-	% covington=<true|false>
-	% Load covington
-	covington.legacy_if_set:n = @uvp@covington,
-	covington.usage:n = preamble,
-	% fontenc=<value|none>
-	% customize font encoding
-	fontenc.code:n = 
-	  { \str_if_eq:NNTF { #1 } { none } {
-	       \@uvp@usefontencfalse
-             }{
-               \def\uvp@fontenc{#1}
-             }
-          },
-	fontenc.usage:n = preamble,
-	% microtype=<true|false>
-	% Load microtype
-	microtype.legacy_if_set:n = @uvp@microtype,
-	microtype.usage:n = preamble,
-	% polyglossia=<true|false>
-	% Load polyglossia
-	polyglossia.legacy_if_set:n = @uvp@polyglossia,
-	polyglossia.code:n = 
-	  { \bool_if:nT {#1} {
-	       \@uvp@psfontsfalse
-               \@uvp@otffontstrue
-             }
-          },
-	polyglossia.usage:n = preamble,
-	% ref=<true|false>
-	% Load varioref and prettyref
-	ref.legacy_if_set:n = @uvp@refsp,
-	ref.usage:n = preamble,
-	% draftmark=<true|false|firstpage>
-	% Print draftmark
-	draftmark .choice:,
-	% true
-	draftmark / true .code:n = 
-	  { \@uvp@draftmarktrue
-            \@uvp@draftmarkfpfalse
-          },
-        % false
-	draftmark / false .code:n = 
-	  { \@uvp@draftmarkfalse
-            \@uvp@draftmarkfpfalse
-          },
-        % firstpage
-	draftmark / firstpage .code:n = 
-	  { \@uvp@draftmarktrue
-            \@uvp@draftmarkfptrue
-          },
-        % no val equals to true
-        draftmark .default:n = {true},
-        % fonts=<ps|otf|none>
-        % Select font scheme
-	fonts .choice:,
-	% ps: use PostScript fonts (classic LaTeX)
-	fonts / ps .code:n = 
-	  { \@uvp@psfontstrue
-            \@uvp@otffontsfalse
-          },
-        % otf: use OpenType fonts (fontspec)
-	fonts / otf .code:n = 
-	  { \@uvp@psfontsfalse
-            \@uvp@otffontstrue
-          },
-        % none: Use no font package
-	fonts / none .code:n = 
-	  { \@uvp@psfontsfalse
-            \@uvp@otffontsfalse
-          },
+    % all=<true|false>
+    % Load all (most) packages
+    all.code:n = 
+      { \bool_if:nTF {#1} {
+            \@uvp@biblatextrue
+            \@uvp@captionptrue
+            \@uvp@refsptrue
+            \@uvp@covingtontrue
+            \@uvp@microtypetrue
+         }{
+            \@uvp@biblatexfalse
+            \@uvp@captionpfalse
+            \@uvp@refspfalse
+            \@uvp@covingtonfalse
+            \@uvp@microtypefalse
+         }
+      },
+    all.usage:n = preamble,
+    % apa=<true|false>
+    % Load APA style
+    apa.legacy_if_set:n = @uvp@apa,
+    apa.usage:n = preamble,
+    % biblatex=<true|false>
+    % Load biblatex
+    biblatex.legacy_if_set:n = @uvp@biblatex,
+    biblatex.usage:n = preamble,
+    % caption=<true|false>
+    % Load caption
+    caption.legacy_if_set:n = @uvp@captionp,
+    caption.usage:n = preamble,
+    % covington=<true|false>
+    % Load covington
+    covington.legacy_if_set:n = @uvp@covington,
+    covington.usage:n = preamble,
+    % fontenc=<value|none>
+    % customize font encoding
+    fontenc.code:n = 
+      { \str_if_eq:NNTF { #1 } { none } {
+           \@uvp@usefontencfalse
+         }{
+           \def\uvp@fontenc{#1}
+         }
+      },
+    fontenc.usage:n = preamble,
+    % microtype=<true|false>
+    % Load microtype
+    microtype.legacy_if_set:n = @uvp@microtype,
+    microtype.usage:n = preamble,
+    % polyglossia=<true|false>
+    % Load polyglossia
+    polyglossia.code:n = 
+      { \bool_if:nTF {#1} {
+           \@uvp@psfontsfalse
+           \@uvp@otffontstrue
+           \@uvp@polyglossiatrue
+        }{
+           \@uvp@polyglossiafalse
+        }
+      },
+    polyglossia.usage:n = preamble,
+    % ref=<true|false>
+    % Load varioref and prettyref
+    ref.legacy_if_set:n = @uvp@refsp,
+    ref.usage:n = preamble,
+    % draftmark=<true|false|firstpage>
+    % Print draftmark
+    draftmark .choice:,
+    % true
+    draftmark / true .code:n = 
+      { \@uvp@draftmarktrue
+        \@uvp@draftmarkfpfalse
+      },
+    % false
+    draftmark / false .code:n = 
+      { \@uvp@draftmarkfalse
+        \@uvp@draftmarkfpfalse
+      },
+    % firstpage
+    draftmark / firstpage .code:n = 
+      { \@uvp@draftmarktrue
+        \@uvp@draftmarkfptrue
+      },
+    % no val equals to true
+    draftmark .default:n = {true},
+    % fonts=<ps|otf|none>
+    % Select font scheme
+    fonts .choice:,
+    % ps: use PostScript fonts (classic LaTeX)
+    fonts / ps .code:n = 
+      { \@uvp@psfontstrue
+        \@uvp@otffontsfalse
+      },
+    % otf: use OpenType fonts (fontspec)
+    fonts / otf .code:n = 
+      { \@uvp@psfontsfalse
+        \@uvp@otffontstrue
+      },
+    % none: Use no font package
+    fonts / none .code:n = 
+      { \@uvp@psfontsfalse
+        \@uvp@otffontsfalse
+      },
 }
 \ExplSyntaxOff
 
@@ -178,14 +180,14 @@
 %% ============================================================
 
 \LoadClass[%
-	   a4paper,
-	   fontsize=12pt,
-	   BCOR=0mm,
-	   captions=tableheading,
-	   listof=totoc,
-	   numbers=noenddot,
-	   titlepage=true,
-	   sectionentrydots=true
+       a4paper,
+       fontsize=12pt,
+       BCOR=0mm,
+       captions=tableheading,
+       listof=totoc,
+       numbers=noenddot,
+       titlepage=true,
+       sectionentrydots=true
 ]{scrartcl}[2003/04/22]
 
 
@@ -690,9 +692,9 @@ This includes all drawings, sketches, graphics and internet sources.}
 
 \if@uvp@captionp
     \RequirePackage[format=plain,
-	            justification=RaggedRight,
-	            singlelinecheck=false
-	           ]{caption}
+                justification=RaggedRight,
+                singlelinecheck=false
+               ]{caption}
 \fi
 
 %% =============================================================
diff --git a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-thesis.cls b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-thesis.cls
index 8cc29a83ac1..016c21d1be4 100644
--- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-thesis.cls
+++ b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-thesis.cls
@@ -32,7 +32,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-thesis}[2022/10/02 v.2.0 Univie Linguistic Theses (JSp)]
+\ProvidesPackage{univie-ling-thesis}[2022/10/21 v.2.1 Univie Linguistic Theses (JSp)]
 
 
 %% ============================================================
@@ -63,114 +63,116 @@
 \ExplSyntaxOn
 \keys_define:nn { uvt }
 {
-	% all=<true|false>
-	% Load all (most) packages
-	all.code:n = 
-	  { \bool_if:nTF {#1} {
-	        \@uvt@biblatextrue
-                \@uvt@captionptrue
-                \@uvt@refsptrue
-                \@uvt@covingtontrue
-                \@uvt@microtypetrue
-             }{
-                \@uvt@biblatexfalse
-                \@uvt@captionpfalse
-                \@uvt@refspfalse
-                \@uvt@covingtonfalse
-                \@uvt@microtypefalse
-             }
-          },
-	all.usage:n = preamble,
-	% apa=<true|false>
-	% Load APA style
-	apa.legacy_if_set:n = @uvt@apa,
-	apa.usage:n = preamble,
-	% biblatex=<true|false>
-	% Load biblatex
-	biblatex.legacy_if_set:n = @uvt@biblatex,
-	biblatex.usage:n = preamble,
-	% caption=<true|false>
-	% Load caption
-	caption.legacy_if_set:n = @uvt@captionp,
-	caption.usage:n = preamble,
-	% covington=<true|false>
-	% Load covington
-	covington.legacy_if_set:n = @uvt@covington,
-	covington.usage:n = preamble,
-	% fdegree=<true|false>
-	% Female degree forms
-	fdegree.legacy_if_set:n = @uvt@fdegree,
-	fdegree.usage:n = preamble,
-	% fontenc=<value|none>
-	% customize font encoding
-	fontenc.code:n = 
-	  { \str_if_eq:NNTF { #1 } { none } {
-	       \@uvt@usefontencfalse
-             }{
-               \def\uvt@fontenc{#1}
-             }
-          },
-	fontenc.usage:n = preamble,
-	% microtype=<true|false>
-	% Load microtype
-	microtype.legacy_if_set:n = @uvt@microtype,
-	microtype.usage:n = preamble,
-	% pdfa=<true|false>
-	% PDF/A
-	pdfa.legacy_if_set:n = @uvt@pdfa,
-	pdfa.usage:n = preamble,
-	% polyglossia=<true|false>
-	% Load polyglossia
-	polyglossia.legacy_if_set:n = @uvt@polyglossia,
-	polyglossia.code:n = 
-	  { \bool_if:nT {#1} {
-	       \@uvt@psfontsfalse
-               \@uvt@otffontstrue
-             }
-          },
-	polyglossia.usage:n = preamble,
-	% ref=<true|false>
-	% Load varioref and prettyref
-	ref.legacy_if_set:n = @uvt@refsp,
-	ref.usage:n = preamble,
-	% draftmark=<true|false|firstpage>
-	% Print draftmark
-	draftmark .choice:,
-	% true
-	draftmark / true .code:n = 
-	  { \@uvt@draftmarktrue
+    % all=<true|false>
+    % Load all (most) packages
+    all.code:n = 
+      { \bool_if:nTF {#1} {
+            \@uvt@biblatextrue
+            \@uvt@captionptrue
+            \@uvt@refsptrue
+            \@uvt@covingtontrue
+            \@uvt@microtypetrue
+         }{
+            \@uvt@biblatexfalse
+            \@uvt@captionpfalse
+            \@uvt@refspfalse
+            \@uvt@covingtonfalse
+            \@uvt@microtypefalse
+         }
+      },
+    all.usage:n = preamble,
+    % apa=<true|false>
+    % Load APA style
+    apa.legacy_if_set:n = @uvt@apa,
+    apa.usage:n = preamble,
+    % biblatex=<true|false>
+    % Load biblatex
+    biblatex.legacy_if_set:n = @uvt@biblatex,
+    biblatex.usage:n = preamble,
+    % caption=<true|false>
+    % Load caption
+    caption.legacy_if_set:n = @uvt@captionp,
+    caption.usage:n = preamble,
+    % covington=<true|false>
+    % Load covington
+    covington.legacy_if_set:n = @uvt@covington,
+    covington.usage:n = preamble,
+    % fdegree=<true|false>
+    % Female degree forms
+    fdegree.legacy_if_set:n = @uvt@fdegree,
+    fdegree.usage:n = preamble,
+    % fontenc=<value|none>
+    % customize font encoding
+    fontenc.code:n = 
+      { \str_if_eq:NNTF { #1 } { none } {
+           \@uvt@usefontencfalse
+         }{
+           \def\uvt@fontenc{#1}
+         }
+      },
+    fontenc.usage:n = preamble,
+    % microtype=<true|false>
+    % Load microtype
+    microtype.legacy_if_set:n = @uvt@microtype,
+    microtype.usage:n = preamble,
+    % pdfa=<true|false>
+    % PDF/A
+    pdfa.legacy_if_set:n = @uvt@pdfa,
+    pdfa.usage:n = preamble,
+    % polyglossia=<true|false>
+    % Load polyglossia
+    polyglossia.code:n = 
+      { \bool_if:nTF {#1} {
+           \@uvt@psfontsfalse
+           \@uvt@otffontstrue
+           \@uvt@polyglossiatrue
+        }{
+           \@uvt@polyglossiafalse
+        }
+      },
+    polyglossia.usage:n = preamble,
+    % ref=<true|false>
+    % Load varioref and prettyref
+    ref.legacy_if_set:n = @uvt@refsp,
+    ref.usage:n = preamble,
+    % draftmark=<true|false|firstpage>
+    % Print draftmark
+    draftmark .choice:,
+    % true
+    draftmark / true .code:n = 
+      { \@uvt@draftmarktrue
+        \@uvt@draftmarkfpfalse
+      },
+    % false
+    draftmark / false .code:n = 
+      { \@uvt@draftmarkfalse
             \@uvt@draftmarkfpfalse
-          },
-        % false
-	draftmark / false .code:n = 
-	  { \@uvt@draftmarkfalse
-            \@uvt@draftmarkfpfalse
-          },
-        % firstpage
-	draftmark / firstpage .code:n = 
-	  { \@uvt@draftmarktrue
-            \@uvt@draftmarkfptrue
-          },
-        % no val equals to true
-        draftmark .default:n = {true},
-        % fonts=<ps|otf|none>
-        % Select font scheme
-	fonts .choice:,
-	% ps: use PostScript fonts (classic LaTeX)
-	fonts / ps .code:n = 
-	  { \@uvt@psfontstrue
-            \@uvt@otffontsfalse
-          },
-        % otf: use OpenType fonts (fontspec)
-	fonts / otf .code:n = 
-	  { \@uvt@psfontsfalse
-            \@uvt@otffontstrue
-          },
-        % none: Use no font package
-	fonts / none .code:n = 
-	  { \@uvt@psfontsfalse
-            \@uvt@otffontsfalse
-          },
+      },
+    % firstpage
+    draftmark / firstpage .code:n = 
+      { \@uvt@draftmarktrue
+        \@uvt@draftmarkfptrue
+      },
+    % no val equals to true
+    draftmark .default:n = {true},
+    % fonts=<ps|otf|none>
+    % Select font scheme
+    fonts .choice:,
+    % ps: use PostScript fonts (classic LaTeX)
+    fonts / ps .code:n = 
+      { \@uvt@psfontstrue
+        \@uvt@otffontsfalse
+      },
+    % otf: use OpenType fonts (fontspec)
+    fonts / otf .code:n = 
+      { \@uvt@psfontsfalse
+        \@uvt@otffontstrue
+      },
+    % none: Use no font package
+    fonts / none .code:n = 
+      { \@uvt@psfontsfalse
+        \@uvt@otffontsfalse
+      },
 }
 \ExplSyntaxOff
 
@@ -189,12 +191,12 @@
 %% ============================================================
 
 \LoadClass[%
-	   a4paper,
-	   captions=tableheading,
-	   listof=totoc,
-	   numbers=noenddot,
-	   titlepage=true,
-	   chapterentrydots=true
+       a4paper,
+       captions=tableheading,
+       listof=totoc,
+       numbers=noenddot,
+       titlepage=true,
+       chapterentrydots=true
 ]{scrreprt}[2003/04/22]
 
 \RequirePackage{array}
@@ -518,8 +520,8 @@ This includes all drawings, sketches, graphics and internet sources.}
        \end{center}
       \vspace{2\baselineskip}
       \begin{center}
-	{\usekomafont{tpcaption}Titel der \@thesistype\,/\,Title of the \@thesistype@en\par}
-	{\ifx\@title\@empty\else
+    {\usekomafont{tpcaption}Titel der \@thesistype\,/\,Title of the \@thesistype@en\par}
+    {\ifx\@title\@empty\else
            \usekomafont{title}{\enquote{\@title%
             \ifx\@subtitle\@empty\else\linebreak\@subtitle\fi}\par}%
          \fi
@@ -539,23 +541,23 @@ This includes all drawings, sketches, graphics and internet sources.}
           }%
         }%
         \vskip 2em
-	{\usekomafont{tpcaption}angestrebter akademischer Grad\,/\,in partial fulfilment of the requirements for the degree of\par}
+    {\usekomafont{tpcaption}angestrebter akademischer Grad\,/\,in partial fulfilment of the requirements for the degree of\par}
         \usekomafont{degree}{\@degree}
        \end{center}\par
         \vfill
         {\usekomafont{date}{Wien, \the\year\,/\,Vienna, \the\year\par}}%
         \vskip 2em
-	\usekomafont{codes}{%
-	\begin{tabular}[t]{@{}>{\raggedright}p{0.4\columnwidth}>{\raggedright}p{0.1\columnwidth}>{\raggedright}p{0.4\columnwidth}}
-	Studienkennzahl lt. Studienblatt/\newline degree programme code as it appears on the student record sheet: & & \@studienkennzahl\tabularnewline
+    \usekomafont{codes}{%
+    \begin{tabular}[t]{@{}>{\raggedright}p{0.4\columnwidth}>{\raggedright}p{0.1\columnwidth}>{\raggedright}p{0.4\columnwidth}}
+    Studienkennzahl lt. Studienblatt/\newline degree programme code as it appears on the student record sheet: & & \@studienkennzahl\tabularnewline
         \noalign{\vskip6pt}
-	\@dirtype\ lt. Studienblatt\slash\newline \@dirtype@en\ as it appears on the student record sheet: & & \@studienrichtung\tabularnewline
+    \@dirtype\ lt. Studienblatt\slash\newline \@dirtype@en\ as it appears on the student record sheet: & & \@studienrichtung\tabularnewline
         \noalign{\vskip6pt}
         Betreut von\,/\,Supervisor: & & \@supervisor\tabularnewline%
         \noalign{\vskip6pt}
         \ifx\@cosupervisor\@empty\else Mitbetreut von\,/\,Co-Supervisor: & & \@cosupervisor\fi
-	\end{tabular}\par
-	}
+    \end{tabular}\par
+    }
       \par
       \@thanks\let\@thanks\@empty
       \null
@@ -706,9 +708,9 @@ This includes all drawings, sketches, graphics and internet sources.}
 
 \if@uvt@captionp
    \RequirePackage[format=plain,
-	           justification=RaggedRight,
-	           singlelinecheck=false
-	          ]{caption}
+               justification=RaggedRight,
+               singlelinecheck=false
+              ]{caption}
 \fi
 
 
diff --git a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-wlg.cls b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-wlg.cls
index 1be6bd1ccc2..988bb4b5880 100644
--- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-wlg.cls
+++ b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-wlg.cls
@@ -33,7 +33,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-wlg}[2022/10/02 v.2.0 Univie WLG journal layout (JSp)]
+\ProvidesPackage{univie-ling-wlg}[2022/10/21 v.2.1 Univie WLG journal layout (JSp)]
 
 
 %% ============================================================
@@ -42,6 +42,8 @@
 
 \newif\if@wlg@biblatex\@wlg@biblatexfalse
 \newif\if@wlg@covington\@wlg@covingtontrue
+\newif\if@wlg@draftmark\@wlg@draftmarkfalse
+\newif\if@wlg@draftmarkfp\@wlg@draftmarkfpfalse
 \newif\if@wlg@expert\@wlg@expertfalse
 \newif\if@wlg@titlepage\@wlg@titlepagefalse
 \newif\if@wlg@specialprint\@wlg@specialprintfalse
@@ -51,41 +53,61 @@
 \ExplSyntaxOn
 \keys_define:nn { wlg }
 {
-	% biblatex=<true|false>
-	% Load biblatex
-	biblatex.legacy_if_set:n = @wlg@biblatex,
-	biblatex.usage:n = preamble,
-	% covington=<true|false>
-	% Load covington
-	covington.legacy_if_set:n = @wlg@covington,
-	covington.usage:n = preamble,
-	% expertfonts=<true|false>
-	% Load MinionPro
-	expertfonts.legacy_if_set:n = @wlg@expert,
-	expertfonts.usage:n = preamble,
-	% preprint=<true|false>
-	preprint.legacy_if_set:n = @wlg@preprint,
-	preprint.usage:n = preamble,
-	% peerrev=<true|false>
-	peerrev.legacy_if_set:n = @wlg@peerrev,
-	peerrev.usage:n = preamble,
-	% titlepage=<none|specialprint|issue>
-	titlepage .choice:,
-	% none
-	titlepage / none .code:n = 
-	  { \@wlg@titlepagefalse
-            \@wlg@specialprintfalse
-          },
-        % specialprint
-	titlepage / specialprint .code:n = 
-	  { \@wlg@titlepagetrue
-            \@wlg@specialprinttrue
-          },
-        % issue
-	titlepage / issue .code:n = 
-	  { \@wlg@titlepagetrue
-            \@wlg@specialprintfalse
-          },
+    % biblatex=<true|false>
+    % Load biblatex
+    biblatex.legacy_if_set:n = @wlg@biblatex,
+    biblatex.usage:n = preamble,
+    % covington=<true|false>
+    % Load covington
+    covington.legacy_if_set:n = @wlg@covington,
+    covington.usage:n = preamble,
+    % expertfonts=<true|false>
+    % Load MinionPro
+    expertfonts.legacy_if_set:n = @wlg@expert,
+    expertfonts.usage:n = preamble,
+    % preprint=<true|false>
+    preprint.legacy_if_set:n = @wlg@preprint,
+    preprint.usage:n = preamble,
+    % peerrev=<true|false>
+    peerrev.legacy_if_set:n = @wlg@peerrev,
+    peerrev.usage:n = preamble,
+    % titlepage=<none|specialprint|issue>
+    titlepage .choice:,
+    % none
+    titlepage / none .code:n = 
+      { \@wlg@titlepagefalse
+        \@wlg@specialprintfalse
+      },
+    % specialprint
+    titlepage / specialprint .code:n = 
+      { \@wlg@titlepagetrue
+        \@wlg@specialprinttrue
+      },
+    % issue
+    titlepage / issue .code:n = 
+      { \@wlg@titlepagetrue
+        \@wlg@specialprintfalse
+      },
+    % draftmark=<true|false|firstpage>
+    % Print draftmark
+    draftmark .choice:,
+    % true
+    draftmark / true .code:n = 
+      { \@wlg@draftmarktrue
+        \@wlg@draftmarkfpfalse
+      },
+    % false
+    draftmark / false .code:n = 
+      { \@wlg@draftmarkfalse
+        \@wlg@draftmarkfpfalse
+      },
+    % firstpage
+    draftmark / firstpage .code:n = 
+      { \@wlg@draftmarktrue
+        \@wlg@draftmarkfptrue
+      },
+    % no val equals to true
+    draftmark .default:n = {true},
 }
 \ExplSyntaxOff
 
@@ -106,17 +128,17 @@
 \LoadClass{scrartcl}[2003/04/22]
 
 \KOMAoptions{%
-	footlines=2,
-	paper=152mm:229mm,
-	DIV=calc,
-	fontsize=12pt,
-	footlines=2,
-	headings=small,
-	captions=tableheading,
-	listof=totoc,
-	numbers=noenddot,
-	abstract=on,
-	twoside=semi
+    footlines=2,
+    paper=152mm:229mm,
+    DIV=calc,
+    fontsize=12pt,
+    footlines=2,
+    headings=small,
+    captions=tableheading,
+    listof=totoc,
+    numbers=noenddot,
+    abstract=on,
+    twoside=semi
 }
 
 \recalctypearea
@@ -134,21 +156,46 @@
 \InputIfFileExists{univie-ling-wlg.cfg}
 
 %% ============================================================
+%% HELPERS:
+%% ============================================================
+
+\newif\if@wlg@inputeencloaded\@wlg@inputeencloadedfalse
+\newcommand*\AfterInputencOrAtEndPreamble[1]{%
+    \AfterPackage*{inputenc}{%
+       #1%
+      \@wlg@inputeencloadedtrue
+    }
+    \AtEndPreamble{%
+       \if@wlg@inputeencloaded\else
+          #1%
+       \fi%
+   }%
+}
+
+%% ============================================================
 %% FONTS UND MICROTYPOGRAPHY:
 %% ============================================================
 
-% Roman Font:
+
 \if@wlg@expert
-  % Adobe Minion (Expert)
+  % Roman Font: Adobe Minion (Expert)
   \RequirePackage[footnotefigures]{MinionPro}
+  % Sans; Myriad
+  \RequirePackage[medfamily,scale=0.925]{MyriadPro}
+  % Mono: DejaVu
+  \RequirePackage[scaled=0.83]{DejaVuSansMono}
 \else
-  % Crimson
+  % Roman Font: Crimson
   \RequirePackage[osf]{cochineal}
   % Enable bold and slanted in IPA
   \AtBeginDocument{%
     \@ifpackageloaded{tipa}{%
        \DeclareFontFamilySubstitution{T3}{Cochineal-TOsF}{cmr}}{}
   }
+  % Sans: Alegreya
+  \RequirePackage[osf,scaled=.9]{sourcesanspro}
+  % Mono: DejaVu
+  \RequirePackage[scaled=0.8]{DejaVuSansMono}
 \fi
 
 % Hyperlinks
@@ -182,6 +229,8 @@
 \languagealias{naustrian}{German}
 \deftranslation[to=German]{chapter}{Kapitel}
 \deftranslation[to=English]{chapter}{chapter}
+\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.}
@@ -392,13 +441,13 @@
 \raggedbottom
 
 % Quotation marks
-\AfterPackage*{inputenc}{%
+\AfterInputencOrAtEndPreamble{%
   \RequirePackage{csquotes}
   \ExecuteQuoteOptions{autostyle=try,german=guillemets,austrian=guillemets,maxlevel=3}
-  \if@wlg@biblatex
+  \AfterPackage*{biblatex}{%
      % Change cite command for integrated csquotes env.
      \SetCiteCommand{\parencite}
-  \fi
+  }
   \renewcommand{\mktextdel}[1]{[\,]}
 }
 
@@ -432,12 +481,12 @@
 \def\@author{}
 \def\@@author{}
 \renewcommand*\author[2][]{%
-	\ifx\\#1\\%
-		\def\@@author{#2}
-	\else
-		\def\@@author{#1}
-	\fi
-	\def\@author{#2}
+    \ifx\\#1\\%
+        \def\@@author{#2}
+    \else
+        \def\@@author{#1}
+    \fi
+    \def\@author{#2}
 }
 
 % Author affiliation (starred: corresponding author)
@@ -454,25 +503,25 @@
 \def\@title{}
 \def\@@title{}
 \renewcommand*\title[2][]{%
-	\ifx\\#1\\%
-		\def\@@title{#2}
-	\else
-		\def\@@title{#1}
-	\fi
-	\def\@title{#2}
+    \ifx\\#1\\%
+        \def\@@title{#2}
+    \else
+        \def\@@title{#1}
+    \fi
+    \def\@title{#2}
 }
 
 \def\@issuetitle{}
 \newcommand*\issuetitle[1]{%
-	\def\@issuetitle{#1}
+    \def\@issuetitle{#1}
 }
 \def\@issuesubtitle{}
 \newcommand*\issuesubtitle[1]{%
-	\def\@issuesubtitle{#1}
+    \def\@issuesubtitle{#1}
 }
 \def\@issueeditors{}
 \newcommand*\issueeditors[1]{%
-	\def\@issueeditors{#1}
+    \def\@issueeditors{#1}
 }
 
 \def\@issue{}
@@ -588,58 +637,58 @@
           \vskip 3em
         \fi
         \if@wlg@specialprint
-		{\usekomafont{title}{\@title\par}}%
-		\vskip 1em
-		{\ifx\@subtitle\@empty\else\usekomafont{subtitle}{\@subtitle\par}\fi}%
-		\vskip 2em
-		{%
-		  \usekomafont{author}{%
-		      \@author\par
-		  }%
-		}%
-		  \vfill
-		  {\usekomafont{date}{\if@wlg@preprint\translate{preprintfrom}%
-		                      \else\translate{specialprint}\fi\ \emph{Wiener Linguistische Gazette}
-		                      (\versal{WLG})
-		 \@issue\ (\@pubyear)\if@wlg@preprint\else: \startpageref--\lastpageref\fi\par}}
-		{\ifx\@issuetitle\@empty\else
-			\vskip 1em
-			\usekomafont{date}{\translate{specialissue} \itshape\@issuetitle
+        {\usekomafont{title}{\@title\par}}%
+        \vskip 1em
+        {\ifx\@subtitle\@empty\else\usekomafont{subtitle}{\@subtitle\par}\fi}%
+        \vskip 2em
+        {%
+          \usekomafont{author}{%
+              \@author\par
+          }%
+        }%
+          \vfill
+          {\usekomafont{date}{\if@wlg@preprint\translate{preprintfrom}%
+                              \else\translate{specialprint}\fi\ \emph{Wiener Linguistische Gazette}
+                              (\versal{WLG})
+         \@issue\ (\@pubyear)\if@wlg@preprint\else: \startpageref--\lastpageref\fi\par}}
+        {\ifx\@issuetitle\@empty\else
+            \vskip 1em
+            \usekomafont{date}{\translate{specialissue} \itshape\@issuetitle
                          \ifx\@issuesubtitle\@empty\else.\ \@issuesubtitle\fi\par}%
-		 \fi}%
-		 \ifx\@issueeditors\@empty\else
-		  \usekomafont{date}{%
-		      \translate{edby}\ \@issueeditors\par
-		  }%
+         \fi}%
+         \ifx\@issueeditors\@empty\else
+          \usekomafont{date}{%
+              \translate{edby}\ \@issueeditors\par
+          }%
                  \fi
         \else
-		{\ifx\@issuetitle\@empty
-		   \usekomafont{title}{\translate{issue} \@issue\ (\@pubyear)\par}
+        {\ifx\@issuetitle\@empty
+           \usekomafont{title}{\translate{issue} \@issue\ (\@pubyear)\par}
                      \etocsettocstyle{\subsubsection*{\contentsname}}{}
-		     \etocsetstyle{chapter}
-			  {}
-			  {\scriptsize\mdseries\rmfamily}
-			  {\scriptsize\etocname{}\dotfill\etocpage\par\vspace{8pt}}
-			  {}
+             \etocsetstyle{chapter}
+              {}
+              {\scriptsize\mdseries\rmfamily}
+              {\scriptsize\etocname{}\dotfill\etocpage\par\vspace{8pt}}
+              {}
                    \tableofcontents
-		\else
-		   \usekomafont{date}{\translate{issue} \@issue\ (\@pubyear)\par}
-		\fi}
-		{\ifx\@issuetitle\@empty\else
-			\vskip 1em
-			\usekomafont{date}{\translate{specialissue}\par}%
-			\usekomafont{title}{\@issuetitle\par}%
-		        \vskip 3pt
-		        {\ifx\@issuesubtitle\@empty\else\usekomafont{subtitle}{\@issuesubtitle\par}\fi}%
-		         \vskip 2em
-		        {%
-		         \ifx\@issueeditors\@empty\else
-		         \usekomafont{date}{%
-		            \translate{edby}\ \@issueeditors\par
-		         }%
+        \else
+           \usekomafont{date}{\translate{issue} \@issue\ (\@pubyear)\par}
+        \fi}
+        {\ifx\@issuetitle\@empty\else
+            \vskip 1em
+            \usekomafont{date}{\translate{specialissue}\par}%
+            \usekomafont{title}{\@issuetitle\par}%
+                \vskip 3pt
+                {\ifx\@issuesubtitle\@empty\else\usekomafont{subtitle}{\@issuesubtitle\par}\fi}%
+                 \vskip 2em
+                {%
+                 \ifx\@issueeditors\@empty\else
+                 \usekomafont{date}{%
+                    \translate{edby}\ \@issueeditors\par
+                 }%
                          \fi
                        }%
-		 \fi}%
+         \fi}%
         \fi%
         \vfill
         {\usekomafont{publishers}{\translate{univie} $\cdot$ \translate{lingdep} $\cdot$ \@pubyear\par}}%
@@ -694,7 +743,7 @@
 
 \renewcommand*{\@maketitle}{%
   \addcontentsline{toc}{chapter}{\@author\texorpdfstring{\\[5pt]}{: }\@title%
-				       \ifx\@subtitle\empty\else\texorpdfstring{\\}{. }\@subtitle\fi}%
+                       \ifx\@subtitle\empty\else\texorpdfstring{\\}{. }\@subtitle\fi}%
   \next@tdpage
   \global\@topnum=\z@
   \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
@@ -706,17 +755,17 @@
   \null
   \vskip 2em%
   \renewcommand*\@@aff[2][]{%
-	\def\@ccauthor{\translate{corrauthor}}%
-	\ifx##1f%
-		\def\@ccauthor{\translate{corrauthorf}}%
-	\else\ifx##1p%
-		\def\@ccauthor{\translate{corrauthors}}%
-	\fi\fi%
-	\def\@cauthor{##2}%
-	\thanks{\protect\raggedright ##2 (\@ccauthor).}
+    \def\@ccauthor{\translate{corrauthor}}%
+    \ifx##1f%
+        \def\@ccauthor{\translate{corrauthorf}}%
+    \else\ifx##1p%
+        \def\@ccauthor{\translate{corrauthors}}%
+    \fi\fi%
+    \def\@cauthor{##2}%
+    \thanks{\protect\raggedright ##2 (\@ccauthor).}
   }
   \renewcommand*\@aff[2][]{%
-	\thanks{\protect\raggedright ##2.}
+    \thanks{\protect\raggedright ##2.}
   }
   \begin{flushleft}%
     \renewcommand*\thefootnote{\@fnsymbol\c@footnote}%
@@ -820,7 +869,7 @@
     \cleardoublepage
     \phantomsection
     \addcontentsline{toc}{chapter}{\@iauthor\texorpdfstring{\\[5pt]}{: }\@ititle%
-				       \ifx\@isubtitle\empty\else\texorpdfstring{\\}{. }\@isubtitle\fi}%
+                       \ifx\@isubtitle\empty\else\texorpdfstring{\\}{. }\@isubtitle\fi}%
     \includepdf[pages=3-]{\@ipaper}
 }
 
@@ -928,10 +977,10 @@
 \setkomafont{captionlabel}{\bfseries}
 % left aligned captions
 \RequirePackage[%
-	format=hang,
-	justification=RaggedRight,
-	singlelinecheck=false
-	]{caption}
+    format=hang,
+    justification=RaggedRight,
+    singlelinecheck=false
+    ]{caption}
 
 %% Nicer tables with booktabs.sty
 \RequirePackage{booktabs}
@@ -946,11 +995,13 @@
 
 % Biblatex
 \if@wlg@biblatex
-  \RequirePackage[%
-      style=univie-ling,
-      sorting=nyvt,
-      autolang=hyphen]
-  {biblatex}
+  \AfterInputencOrAtEndPreamble{%
+      \RequirePackage[%
+           style=univie-ling,
+           sorting=nyvt,
+           autolang=hyphen]
+      {biblatex}
+  }
 \fi
 \AtBeginDocument{%
   \@ifundefined{bibhang}{}{%
@@ -1008,4 +1059,26 @@
 % Main url
 \def\wlgurl{http://wlg.univie.ac.at}
 
+%% =============================================================
+%% DRAFT:
+%% =============================================================
+
+\if@wlg@draftmark
+
+\if@wlg@draftmarkfp
+  \RequirePackage[firstpageonly]{draftwatermark}
+\else
+  \RequirePackage{draftwatermark}
+\fi
+
+\DraftwatermarkOptions{%
+  angle=0,
+  vpos=10pt,
+  anchor=ct,
+  fontsize=14pt,
+  text={\translate{draft} (\today)}
+}
+
+\fi
+
 %% Finis.
diff --git a/Master/texmf-dist/tex/latex/univie-ling/univie-ling.bbx b/Master/texmf-dist/tex/latex/univie-ling/univie-ling.bbx
index 297bf740f16..1564b3a9eeb 100644
--- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling.bbx
+++ b/Master/texmf-dist/tex/latex/univie-ling/univie-ling.bbx
@@ -37,7 +37,7 @@
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\ProvidesFile{univie-ling.bbx}[2022/10/02 v.2.0 biblatex bibliography style]
+\ProvidesFile{univie-ling.bbx}[2022/10/21 v.2.1 biblatex bibliography style]
 
 % Load base style (authoryear-comp)
 \RequireBibliographyStyle{authoryear-comp}
diff --git a/Master/texmf-dist/tex/latex/univie-ling/univie-ling.cbx b/Master/texmf-dist/tex/latex/univie-ling/univie-ling.cbx
index e4937b0fa37..a643cacf268 100644
--- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling.cbx
+++ b/Master/texmf-dist/tex/latex/univie-ling/univie-ling.cbx
@@ -35,7 +35,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-\ProvidesFile{univie-ling.cbx}[2022/10/02 v.2.0 biblatex citation style]
+\ProvidesFile{univie-ling.cbx}[2022/10/21 v.2.1 biblatex citation style]
 
 \RequireCitationStyle{authoryear-comp}