univie-ling (2mar18)

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

17 files changed, 92 insertions, 29 deletions

diff --git a/Master/texmf-dist/doc/latex/univie-ling/README b/Master/texmf-dist/doc/latex/univie-ling/README
index 45099f0c4ab..2757b3efe48 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/README
+++ b/Master/texmf-dist/doc/latex/univie-ling/README
@@ -80,6 +80,14 @@ also have a look at the example files.
 
 == CHANGES ==
 
+V. 1.3 (2018-03-02):
+   - Use \mknormrange to support range normalization in cbx file
+     (requires biblatex 3.11; backwards compatibility provided).
+   - univie-ling.bbx:
+     * Fix whitespace issue in @inproceedings entry.
+     * Specify date output details (era, uncertain etc.).
+   - Add license to wlg copyright page (uses doclicense package)
+
 V. 1.2 (2018-02-13):
    - Rename wlg.cls to univie-ling-wlg.cls per TeXLive request.
 
diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-expose-deutsch.pdf b/Master/texmf-dist/doc/latex/univie-ling/templates/template-expose-deutsch.pdf
index 5b66d77e5d5..2b5487ec58f 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-expose-deutsch.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-expose-deutsch.pdf
diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-article.pdf b/Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-article.pdf
index cc91a38a567..3f2849c4b84 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-article.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-article.pdf
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.pdf b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.pdf
index a53d8473da1..18c2dd10b5e 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.pdf
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.tex b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.tex
index 53302d1d059..2cde93e98b2 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.tex
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.tex
@@ -63,7 +63,7 @@
 \author{\texorpdfstring{Jürgen Spitzmüller%
 \thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
 
-\date{Version 1.2, 2018/02/13}
+\date{Version 1.3, 2018/03/02}
 
 \maketitle
 
@@ -308,16 +308,31 @@ Templates are provided as well:
 
 \section{Release History}
 
-\begin{itemize}
-  \item 2018/02/13 (v. 1.2): No change to this class.
-  \item 2018/02/11 (v. 1.1): No change to this class.
-  \item 2018/02/08 (v. 1.0): Switch default bibliography style (from APA to Unified). Initial release to CTAN.
-  \item 2016/05/05 (v. 0.7): Fix comma after \emph{et al.} with \textsf{biblatex-apa}.
-  \item 2016/04/30 (v. 0.6): Set proper citation command for csquotes' integrated environments; improve templates.
-  \item 2016/03/23 (v. 0.5): Fix the output of German multi-name citations (DGPs guidelines); 
-  extend documentation of bibliographic features.
-  \item 2016/01/29 (v. 0.4): Initial release.
-\end{itemize}
+\begin{description}
+  \item 2018/03/02 (v. 1.3) No change to this class.
+  \item 2018/02/13 (v. 1.2) No change to this class.
+  \item 2018/02/11 (v. 1.1) No change to this class.
+  \item 2018/02/08 (v. 1.0) 
+  \begin{itemize}
+  	\item  Switch default bibliography style (from APA to Unified).
+  	\item  Initial release to CTAN.
+  \end{itemize}
+  \item 2016/05/05 (v. 0.7)
+  \begin{itemize}
+  	\item Fix comma after \emph{et al.} with \textsf{biblatex-apa}.
+  \end{itemize}
+  \item 2016/04/30 (v. 0.6)
+  \begin{itemize}
+  	\item Set proper citation command for csquotes' integrated environments.
+  	\item Improve templates.
+  \end{itemize}
+  \item 2016/03/23 (v. 0.5)
+  \begin{itemize}
+  	\item Fix the output of German multi-name citations (DGPs guidelines).
+  	\item Extend documentation of bibliographic features.
+  \end{itemize}
+  \item 2016/01/29 (v. 0.4) Initial release.
+\end{description}
 
 \begin{thebibliography}{1}
 
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.pdf b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.pdf
index 65d37297088..4e56742fc7d 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.pdf
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.tex b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.tex
index a8bb44e4297..606991a0fe6 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.tex
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.tex
@@ -59,7 +59,7 @@
 \author{\texorpdfstring{Jürgen Spitzmüller%
 		\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
 
-\date{Version 1.2, 2018/02/13}
+\date{Version 1.3, 2018/03/02}
 
 \maketitle
 
@@ -335,6 +335,7 @@ Templates are provided as well:
 \section{Release History}
 
 \begin{itemize}
+  \item 2018/03/02 (v. 1.3)	No change to this class.
   \item 2018/02/13 (v. 1.2)	No change to this class.
   \item 2018/02/11 (v. 1.1)	No change to this class.
   \item 2018/02/08 (v. 1.0)
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.pdf b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.pdf
index 1ffcb716ef6..0874d351dca 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.pdf
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.tex b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.tex
index 6bc91cb875f..0c0f6f0ad06 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.tex
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.tex
@@ -59,7 +59,7 @@
 \author{\texorpdfstring{Jürgen Spitzmüller%
 		\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
 
-\date{Version 1.2, 2018/02/13}
+\date{Version 1.3, 2018/03/02}
 
 \maketitle
 
@@ -359,6 +359,7 @@ Templates are provided as well:
 \section{Release History}
 
 \begin{itemize}
+ \item 2018/03/02 (v. 1.3)	No change to this class.
  \item 2018/02/13 (v. 1.2)	No change to this class.
  \item 2018/02/11 (v. 1.1)	No change to this class.
   \item 2018/02/08 (v. 1.0)
@@ -366,7 +367,7 @@ Templates are provided as well:
 		\item Switch default bibliography style (from APA to Unified).
 		\item  Initial release to CTAN.
 	\end{itemize}
-  \item 2016/05/05 (v. 0.9 )
+  \item 2016/05/05 (v. 0.9)
 	\begin{itemize}
 		\item Fix comma after \emph{et al.} with \textsf{biblatex-apa}.
 	\end{itemize}
@@ -389,7 +390,7 @@ Templates are provided as well:
   	\item Fix the PDF logo for PDF/A output.
   	\item Extend documentation of PDF/A production.
   \end{itemize}
-  \item 2016/01/25 (v. 0.4): First (documented) release.
+  \item 2016/01/25 (v. 0.4) First (documented) release.
   \begin{itemize}
     \item Title page layout has been adapted to the new (bilingual) standards.
     \item add \joption{bachelor} thesis type.
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.pdf b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.pdf
index c40c7ae8d2e..647c5e7150b 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.pdf
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.tex b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.tex
index 20257124198..a7e47d943ab 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.tex
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.tex
@@ -59,7 +59,7 @@
 \author{\texorpdfstring{Jürgen Spitzmüller%
 		\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
 
-\date{Version 1.2, 2018/02/13}
+\date{Version 1.3, 2018/03/02}
 
 \maketitle
 
@@ -204,6 +204,7 @@ A template is provided as well:	\url{https://github.com/jspitz/univie-ling/raw/m
 \section{Release History}
 
 \begin{itemize}
+  \item 2018/03/02 (v. 1.3)	Add (CC BY-NC-ND-4.0) license statement to copyright page (via \textsf{doclicense} package).
   \item 2018/02/13 (v. 1.2)	Rename \texttt{wlg.cls} to \texttt{univie-ling-wlg.cls} as per TeXLive request.
   \item 2018/02/11 (v. 1.1)	Initial release to CTAN.
 \end{itemize}
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 23b19efc5ea..4b996b96ff6 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
@@ -31,7 +31,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-expose}[2018/02/13 v1.2 Univie Linguistic Exposes (JSp)]
+\ProvidesPackage{univie-ling-expose}[2018/03/02 v1.3 Univie Linguistic Exposes (JSp)]
 
 \RequirePackage{xkeyval}
 
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 0574db09a73..7a96f58863a 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}[2018/02/13 v1.2 Univie Linguistic Papers (JSp)]
+\ProvidesPackage{univie-ling-paper}[2018/03/02 v1.3 Univie Linguistic Papers (JSp)]
 
 \RequirePackage{xkeyval}
 
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 cee08881d75..d06d7f8be2d 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
@@ -31,7 +31,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-thesis}[2018/02/13 v1.2 Univie Linguistic Theses (JSp)]
+\ProvidesPackage{univie-ling-thesis}[2018/03/02 v1.3 Univie Linguistic Theses (JSp)]
 
 \RequirePackage{xkeyval}
 
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 71ebbbdfcbf..dc139124207 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
@@ -32,7 +32,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-wlg}[2018/02/13 v1.2 WLG journal layout (JSp)]
+\ProvidesPackage{univie-ling-wlg}[2018/03/02 v1.3 WLG journal layout (JSp)]
 
 
 %% ============================================================
@@ -214,12 +214,28 @@
 \deftranslation[to=English]{applied}{Applied Linguistics}
 \deftranslation[to=German]{genhist}{Allgemeine und Historische Sprachwissenschaft}
 \deftranslation[to=English]{genhist}{General and Historical Linguistics}
+\deftranslation[to=German]{license}{Dieses Werk unterliegt der Creative-Commons-Lizenz \doclicenseNameRef\\
+                                    (Namensnennung -- Nicht kommerziell -- Keine Bearbeitungen)}
+\deftranslation[to=English]{license}{This work is published under a Creative Commons \doclicenseNameRef\ license\\
+                                    (Attribution-NonCommercial-NoDerivatives)}
 
 
 \AtBeginDocument{%
 \addto\captionsngerman{\renewcommand*\contentsname{Inhalt}}
 \addto\captionsnaustrian{\renewcommand*\contentsname{Inhalt}}
 }
+\AtEndPreamble{
+% License
+\PassOptionsToPackage{%
+   imagewidth=8em,
+   imagedistance=1em,
+   imagemodifier=-eu,
+   hyphenation=RaggedRight,
+   type={CC},
+   modifier={by-nc-nd},
+   version={4.0}}{doclicense}
+\RequirePackage{doclicense}
+}
 
 \newcommand\impressum{%
 \bgroup
@@ -250,6 +266,20 @@
 \end{labeling}
 \vspace*{-.5em}
 \noindent\translate{appform}\par
+\setlength{\doclicense@hsize}{\textwidth-\doclicense@imagewidth-\doclicense@imagedistance}%
+\begin{center}
+      \begin{minipage}{\doclicense@imagewidth}
+        \doclicenseImage%
+      \end{minipage}
+      \hfill
+      \begin{minipage}{\doclicense@hsize}
+        \ifthenelse{\isempty{\doclicense@hyphenation}}{}{%
+          \@nameuse{\doclicense@hyphenation}%
+        }%
+        \translate{license}%
+      \end{minipage}
+    \end{center}
+\par
 \egroup
 }
 
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 1f59f379681..de2c9fb904d 100644
--- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling.bbx
+++ b/Master/texmf-dist/tex/latex/univie-ling/univie-ling.bbx
@@ -36,7 +36,7 @@
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\ProvidesFile{univie-ling.bbx}[2018/02/13 v1.2 biblatex bibliography style]
+\ProvidesFile{univie-ling.bbx}[2018/03/02 v1.3 biblatex bibliography style]
 
 % Load base style (authoryear)
 \RequireBibliographyStyle{authoryear}
@@ -47,6 +47,10 @@
   sorting=nyt,
   abbreviate,
   dateabbrev=false,
+  dateera=secular,
+  datezeros=false,
+  datecirca=true,
+  dateuncertain=true,
   dashed=false,
   isbn=false,
   eprint=false,
@@ -112,7 +116,7 @@
   \iffieldundef{pubstate}{%
     \iffieldundef{labelyear}{}{%
         \printlabeldateextra%
-        \iffieldundef{origyear}{}{\addspace\mkbibbrackets{\printorigdate}}
+        \iffieldundef{origyear}{}{\addspace\mkbibbrackets{\printorigdate}}%
         \clearfield{year}%
      }%
  }{%
@@ -712,13 +716,13 @@
      \usebibmacro{doi+eprint+url}%
      \newunit\newblock
      \usebibmacro{addendum+pubstate}%
-     \setunit{\bibpagerefpunct}\newblock
+     \setunit{\bibpagerefpunct}\newblock%
      \usebibmacro{pageref}%
      \newunit\newblock
      \iftoggle{bbx:related}
        {\usebibmacro{related:init}%
         \usebibmacro{related}}
-       {}}
+       {}}%
     {\usebibmacro{author/translator+others}%
      \setunit{\labelnamepunct}\newblock
      \usebibmacro{title}%
@@ -732,7 +736,7 @@
      \printfield{version}%
      \newunit\newblock
      \usebibmacro{unified:proc-as-article:maintitle+booktitle}%
-     \usebibmacro{unified:proc-as-article:volume+number+eid}
+     \usebibmacro{unified:proc-as-article:volume+number+eid}%
      \newunit\newblock%                           \newblock ensures period before pages
      \usebibmacro{note+pages}%
      \newunit\newblock
@@ -749,7 +753,7 @@
      \iftoggle{bbx:related}
        {\usebibmacro{related:init}%
         \usebibmacro{related}}
-       {}}
+       {}}%
   \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{thesis}{%
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 b235bb9b2cf..6599851a89e 100644
--- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling.cbx
+++ b/Master/texmf-dist/tex/latex/univie-ling/univie-ling.cbx
@@ -34,7 +34,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-\ProvidesFile{univie-ling.cbx}[2018/02/13 v1.2 biblatex citation style]
+\ProvidesFile{univie-ling.cbx}[2018/03/02 v1.3 biblatex citation style]
 
 \RequireCitationStyle{authoryear}
 
@@ -83,8 +83,11 @@
 
 \renewcommand*{\postnotedelim}{\addcolon\space}
 
-\DeclareFieldFormat{postnote}{#1}
-\DeclareFieldFormat{multipostnote}{#1}
+% Fallback for biblatex < 3.11
+\AtBeginDocument{\providecommand*\mknormrange[1]{#1}}
+
+\DeclareFieldFormat{postnote}{\mknormrange{#1}}
+\DeclareFieldFormat{multipostnote}{\mknormrange{#1}}
 
 \renewcommand*{\multicitedelim}{\addsemicolon\space}
 \renewcommand*{\finalnamedelim}{\addspace\&\addspace}