univie-ling (5may20)

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

1 files changed, 41 insertions, 14 deletions

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 c190660feb5..b63e553b589 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
@@ -31,7 +31,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-paper}[2019/05/01 v1.10 Univie Linguistic Papers (JSp)]
+\ProvidesPackage{univie-ling-paper}[2020/05/05 v1.11 Univie Linguistic Papers (JSp)]
 
 \RequirePackage{xkeyval}
 
@@ -42,6 +42,10 @@
 \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
@@ -62,7 +66,7 @@
 }{%
     \ClassWarning{univie-ling-paper}{unknown 'all' value}%
 }
-\DeclareOptionX{all}{\setkeys{uvt}{all=#1}}
+\DeclareOptionX{all}[true]{\setkeys{uvt}{all=#1}}
 
 % biblatex=<true|false>
 % Load biblatex
@@ -75,7 +79,7 @@
 }{%
     \ClassWarning{univie-ling-paper}{unknown biblatex value}%
 }
-\DeclareOptionX{biblatex}{\setkeys{uvt}{biblatex=#1}}
+\DeclareOptionX{biblatex}[true]{\setkeys{uvt}{biblatex=#1}}
 
 % apa=<true|false>
 % Load APA style
@@ -88,7 +92,7 @@
 }{%
     \ClassWarning{univie-ling-paper}{unknown apa value}%
 }
-\DeclareOptionX{apa}{\setkeys{uvt}{apa=#1}}
+\DeclareOptionX{apa}[true]{\setkeys{uvt}{apa=#1}}
 
 % caption=<true|false>
 % Load caption
@@ -101,7 +105,7 @@
 }{%
     \ClassWarning{univie-ling-paper}{unknown caption value}%
 }
-\DeclareOptionX{caption}{\setkeys{uvt}{caption=#1}}
+\DeclareOptionX{caption}[true]{\setkeys{uvt}{caption=#1}}
 
 % ref=<true|false>
 % Load varioref and prettyref
@@ -114,7 +118,7 @@
 }{%
     \ClassWarning{univie-ling-paper}{unknown ref value}%
 }
-\DeclareOptionX{ref}{\setkeys{uvt}{ref=#1}}
+\DeclareOptionX{ref}[true]{\setkeys{uvt}{ref=#1}}
 
 % covington=<true|false>
 % Load covington
@@ -127,7 +131,7 @@
 }{%
     \ClassWarning{univie-ling-paper}{unknown covington value}%
 }
-\DeclareOptionX{covington}{\setkeys{uvt}{covington=#1}}
+\DeclareOptionX{covington}[true]{\setkeys{uvt}{covington=#1}}
 
 % microtype=<true|false>
 % Load microtype
@@ -138,13 +142,26 @@
         \microtypefalse
     \fi
 }{%
-    \ClassWarning{univie-ling-thesis}{unknown microtype value}%
+    \ClassWarning{univie-ling-paper}{unknown microtype value}%
+}
+\DeclareOptionX{microtype}[true]{\setkeys{uvt}{microtype=#1}}
+
+% polyglossia=<true|false>
+% Load polyglossia
+\define@boolkey+{uvt}{polyglossia}[true]{%
+    \ifKV@uvt@polyglossia
+        \polyglossiatrue
+        \psfontsfalse
+        \otffontstrue
+        \nofontsfalse
+    \else
+        \polyglossiafalse
+    \fi
+}{%
+    \ClassWarning{univie-ling-paper}{unknown polyglossia value}%
 }
-\DeclareOptionX{microtype}{\setkeys{uvt}{microtype=#1}}
+\DeclareOptionX{polyglossia}[true]{\setkeys{uvt}{polyglossia=#1}}
 
-\newif\ifpsfonts\psfontstrue
-\newif\ifotffonts\otffontsfalse
-\newif\ifnofonts\nofontsfalse
 % fonts=<ps|otf|none>
 \define@choicekey*+{uvt}{fonts}[\val\nr]{ps,otf,none}{%
     \ifcase\nr\relax% ps: use PostScript fonts (classic LaTeX)
@@ -161,7 +178,7 @@
       \nofontstrue
     \fi
 }{%
-    \PackageWarning{jsdossier}{unknown fonts value '#1'}%
+    \PackageWarning{univie-ling-paper}{unknown fonts value '#1'}%
 }
 \DeclareOptionX{fonts}{\setkeys{uvt}{fonts=#1}}
 
@@ -227,7 +244,6 @@ This includes all drawings, sketches, graphics and internet sources.}
 \ifpsfonts
 
 \usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
 
 % Palatino
 \usepackage[osf]{mathpazo}
@@ -669,6 +685,17 @@ This includes all drawings, sketches, graphics and internet sources.}
 \fi
 
 %% =============================================================
+%% POLYGLOSSIA:
+%% =============================================================
+
+\ifpolyglossia
+  \ifcaptionp
+    \RequirePackage{ragged2e}
+  \fi
+  \RequirePackage{polyglossia}
+\fi
+
+%% =============================================================
 %% BIBLIOGRAPHY:
 %% =============================================================