univie-ling (4nov18)

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

6 files changed, 115 insertions, 130 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 256a638ff9e..93f59f5f96a 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/09/03 v1.5 Univie Linguistic Exposes (JSp)]
+\ProvidesPackage{univie-ling-expose}[2018/11/04 v1.6 Univie Linguistic Exposes (JSp)]
 
 \RequirePackage{xkeyval}
 
@@ -549,17 +549,6 @@
 \ifcovington
 \RequirePackage{covington}
 \renewcommand{\p@equation}[1]{(#1)}
-\newenvironment{subexamples}{%
-    \begin{example}
-    \begin{enumerate}[leftmargin=1.35em]
-    \renewcommand\theenumi{\alph{enumi}}
-    \renewcommand\labelenumi{(\theenumi)}
-    \renewcommand\p@enumi{\theequation\,}%
-}%
-{%
-    \end{enumerate}
-    \end{example}
-}
 \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 32487e33057..afeaf1eff90 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/09/03 v1.5 Univie Linguistic Papers (JSp)]
+\ProvidesPackage{univie-ling-paper}[2018/11/04 v1.6 Univie Linguistic Papers (JSp)]
 
 \RequirePackage{xkeyval}
 
@@ -652,17 +652,6 @@ This includes all drawings, sketches, graphics and internet sources.}
 \ifcovington
 \RequirePackage{covington}
 \renewcommand{\p@equation}[1]{(#1)}
-\newenvironment{subexamples}{%
-    \begin{example}
-    \begin{enumerate}[leftmargin=1.35em]
-    \renewcommand\theenumi{\alph{enumi}}
-    \renewcommand\labelenumi{(\theenumi)}
-    \renewcommand\p@enumi{\theequation\,}%
-}%
-{%
-    \end{enumerate}
-    \end{example}
-}
 \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 932ce8ec56c..48a23773acc 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/09/03 v1.5 Univie Linguistic Theses (JSp)]
+\ProvidesPackage{univie-ling-thesis}[2018/11/04 v1.6 Univie Linguistic Theses (JSp)]
 
 \RequirePackage{xkeyval}
 
@@ -606,17 +606,6 @@
 \ifcovington
 \RequirePackage{covington}
 \renewcommand{\p@equation}[1]{(#1)}
-\newenvironment{subexamples}{%
-    \begin{example}
-    \begin{enumerate}[leftmargin=1.35em]
-    \renewcommand\theenumi{\alph{enumi}}
-    \renewcommand\labelenumi{(\theenumi)}
-    \renewcommand\p@enumi{\theequation\,}%
-}%
-{%
-    \end{enumerate}
-    \end{example}
-}
 \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 0fd75b9a5e8..adf34238a71 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/09/03 v1.5 WLG journal layout (JSp)]
+\ProvidesPackage{univie-ling-wlg}[2018/11/04 v1.6 WLG journal layout (JSp)]
 
 
 %% ============================================================
@@ -863,17 +863,6 @@ pdfborder={0 0 0}
 \ifcovington
 \RequirePackage{covington}
 \renewcommand{\p@equation}[1]{(#1)}
-\newenvironment{subexamples}{%
-    \begin{example}
-    \begin{enumerate}[leftmargin=1.35em]
-    \renewcommand\theenumi{\alph{enumi}}
-    \renewcommand\labelenumi{(\theenumi)}
-    \renewcommand\p@enumi{\theequation\,}%
-}%
-{%
-    \end{enumerate}
-    \end{example}
-}
 \fi
 
 
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 9c0b0d6a2b6..4c65d94e357 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/09/03 v1.5 biblatex bibliography style]
+\ProvidesFile{univie-ling.bbx}[2018/11/04 v1.6 biblatex bibliography style]
 
 % Load base style (authoryear)
 \RequireBibliographyStyle{authoryear}
@@ -420,6 +420,11 @@
      \newunit}%
   \usebibmacro{byeditorx}}
 
+\renewbibmacro*{bybookauthor}{%
+  \ifnamesequal{author}{bookauthor}
+    {\bibstring{idem}}
+    {\printnames{bookauthor}}}
+
 \renewbibmacro*{chapter+pages}{%
   \iffieldundef{chapter}%
   {}%
@@ -671,89 +676,113 @@
 
 \DeclareBibliographyAlias{incollection}{inproceedings}
 
-\DeclareBibliographyAlias{inbook}{incollection}
-
 \DeclareBibliographyDriver{inproceedings}{%
   \usebibmacro{bibindex}%
   \usebibmacro{begentry}%
-  \iffieldundef{issn}
-    {\usebibmacro{author/translator+others}%
-     \setunit{\labelnamepunct}\newblock
-     \usebibmacro{title}%
-     \newunit
-     \printlist{language}%
-     \newunit\newblock
-     \usebibmacro{byauthor}%
-     \usebibmacro{bytranslator+others}%
-     \newunit\newblock
-     \usebibmacro{in:}%
-     \ifnameundef{editor}
-       {\setunit{\addspace}}
-       {\usebibmacro{byeditor+others}\setunit{\addcomma\space}}
-     \usebibmacro{maintitle+booktitle}%
-     \setunit{\addcomma\space}
-     \printfield{edition}%
-     \setunit{\addcomma\space}
-     \iffieldundef{maintitle}
-       {\printfield{volume}%
-        \printfield{part}}
-       {}%
-     \setunit{\addcomma\space}
-     \printfield{volumes}%
-     \setunit{\addspace}%
-     \usebibmacro{series+number}%
-     \setunit{\addcomma\space}
-     \usebibmacro{chapter+pages}%
-     \newunit\newblock
-     \printfield{note}%
-     \newunit\newblock
-     \usebibmacro{publisher+location+date}%
-     \newunit\newblock
-     \iftoggle{bbx:isbn}
-       {\printfield{isbn}}
-       {}%
-     \newunit\newblock
-     \usebibmacro{doi+eprint+url}%
-     \newunit\newblock
-     \usebibmacro{addendum+pubstate}%
-     \setunit{\bibpagerefpunct}\newblock%
-     \usebibmacro{pageref}%
-     \newunit\newblock
-     \iftoggle{bbx:related}
-       {\usebibmacro{related:init}%
-        \usebibmacro{related}}
-       {}}%
-    {\usebibmacro{author/translator+others}%
-     \setunit{\labelnamepunct}\newblock
-     \usebibmacro{title}%
-     \newunit
-     \printlist{language}%
-     \newunit\newblock
-     \usebibmacro{byauthor}%
-     \newunit\newblock
-     \usebibmacro{bytranslator+others}%
-     \newunit\newblock
-     \printfield{version}%
-     \newunit\newblock
-     \usebibmacro{unified:proc-as-article:maintitle+booktitle}%
-     \usebibmacro{unified:proc-as-article:volume+number+eid}%
-     \newunit\newblock%                           \newblock ensures period before pages
-     \usebibmacro{note+pages}%
-     \newunit\newblock
-     \iftoggle{bbx:isbn}
-       {\printfield{issn}}
-       {}%
-     \newunit\newblock
-     \usebibmacro{doi+eprint+url}%
-     \newunit\newblock
-     \usebibmacro{addendum+pubstate}%
-     \setunit{\bibpagerefpunct}\newblock
-     \usebibmacro{pageref}%
-     \newunit\newblock
-     \iftoggle{bbx:related}
-       {\usebibmacro{related:init}%
-        \usebibmacro{related}}
-       {}}%
+  \usebibmacro{author/translator+others}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \usebibmacro{bytranslator+others}%
+  \newunit\newblock
+  \usebibmacro{in:}%
+  \ifnameundef{editor}
+    {\setunit{\addspace}}
+    {\usebibmacro{byeditor+others}\setunit{\addcomma\space}}
+  \usebibmacro{maintitle+booktitle}%
+  \setunit{\addcomma\space}
+  \printfield{edition}%
+  \setunit{\addcomma\space}
+  \iffieldundef{maintitle}
+    {\printfield{volume}%
+     \printfield{part}}
+    {}%
+  \setunit{\addcomma\space}
+  \printfield{volumes}%
+  \setunit{\addspace}%
+  \usebibmacro{series+number}%
+  \setunit{\addcomma\space}
+  \usebibmacro{chapter+pages}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{publisher+location+date}%
+  \newunit\newblock
+  \iftoggle{bbx:isbn}
+    {\printfield{isbn}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\bibpagerefpunct}\newblock%
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{inbook}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/translator+others}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \usebibmacro{bytranslator+others}%
+  \newunit\newblock
+  \usebibmacro{in:}%
+  \ifnameundef{bookauthor}{
+      \ifnameundef{editor}
+        {\setunit{\addspace}}
+        {\usebibmacro{byeditor+others}\setunit{\addcomma\space}}
+  }{%
+      \usebibmacro{bybookauthor}%
+  }
+  \usebibmacro{maintitle+booktitle}%
+  \ifnameundef{editor}
+        {\setunit{\addspace}}
+        {\usebibmacro{byeditor+others}}
+  \setunit{\addcomma\space}
+  \printfield{edition}%
+  \setunit{\addcomma\space}
+  \iffieldundef{maintitle}
+    {\printfield{volume}%
+     \printfield{part}}
+    {}%
+  \setunit{\addcomma\space}
+  \printfield{volumes}%
+  \setunit{\addspace}%
+  \usebibmacro{series+number}%
+  \setunit{\addcomma\space}
+  \usebibmacro{chapter+pages}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{publisher+location+date}%
+  \newunit\newblock
+  \iftoggle{bbx:isbn}
+    {\printfield{isbn}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\bibpagerefpunct}\newblock%
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \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 d241bff6e9d..8dae4faaceb 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/09/03 v1.5 biblatex citation style]
+\ProvidesFile{univie-ling.cbx}[2018/11/04 v1.6 biblatex citation style]
 
 \RequireCitationStyle{authoryear}