1 files changed, 121 insertions, 78 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-dw/bbx/standard-dw.bbx b/Master/texmf-dist/tex/latex/biblatex-dw/bbx/standard-dw.bbx
index 2b5d32bba90..66d77408027 100644
--- a/Master/texmf-dist/tex/latex/biblatex-dw/bbx/standard-dw.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-dw/bbx/standard-dw.bbx
@@ -1,12 +1,12 @@
-% standard-dw.bbx, Dominik Waßenhoven 2013
+% standard-dw.bbx, Dominik Waßenhoven 2016
 
-\ProvidesFile{standard-dw.bbx}[2013/09/22 v1.6a biblatex bibliography style]
+\ProvidesFile{standard-dw.bbx}[2016/12/06 v1.7 biblatex bibliography style]
 
-\@ifpackagelater{biblatex}{2011/11/13}
+\@ifpackagelater{biblatex}{2016/03/11}
   {}
   {\PackageError{biblatex-dw}
     {Outdated 'biblatex' package\MessageBreak
-     Upgrade to biblatex v1.7 (2011/11/13) or later.\MessageBreak
+     Upgrade to biblatex v3.3 (2016/03/11) or later.\MessageBreak
      I found: '\csuse{ver@biblatex.sty}'.\MessageBreak
      This is a fatal error. I'm aborting now}%
      \endinput}
@@ -19,7 +19,9 @@
 \newbool{bbx:acronym}
 \newbool{bbx:journumafteryear}
 \newbool{bbx:journumdate}
+\newbool{bbx:seriesstandard}
 \newbool{bbx:seriesafteryear}
+\newbool{bbx:seriesbeforeedition}
 \newbool{bbx:seriesinparens}
 \newbool{bbx:shorthandacro}
 \newbool{bbx:shorthandinbib}
@@ -74,15 +76,26 @@
 \DeclareBibliographyOption{bernhard}[true]{%
   \csuse{bool#1}{bbx:bernhard}}
 
-% Option series=standard|afteryear
-\newcommand{\bbx@option@series}{}
-\DeclareBibliographyOption{series}{%
-  \renewcommand{\bbx@option@series}{#1}}
-\AtBeginDocument{%
-  \ifdefstring{\bbx@option@series}{afteryear}
-    {\global\booltrue{bbx:seriesafteryear}}
-    {\global\boolfalse{bbx:seriesafteryear}}}
-
+% Option series=standard|afteryear|beforeedition
+\DeclareBibliographyOption{series}[standard]{%
+  \ifcsdef{bbx@opt@series@#1}
+    {\csuse{bbx@opt@series@#1}}
+    {\blxdw@error{%
+       Invalid option 'series=#1'\MessageBreak
+       Valid values are 'standard', 'afteryear', 'beforeedition'}}}
+\def\bbx@opt@series@standard{%
+  \global\booltrue{bbx:seriesstandard}%
+  \global\boolfalse{bbx:seriesafteryear}%
+  \global\boolfalse{bbx:seriesbeforeedition}}
+\def\bbx@opt@series@afteryear{%
+  \global\boolfalse{bbx:seriesstandard}%
+  \global\booltrue{bbx:seriesafteryear}%
+  \global\boolfalse{bbx:seriesbeforeedition}}
+\def\bbx@opt@series@beforeedition{%
+  \global\boolfalse{bbx:seriesstandard}%
+  \global\boolfalse{bbx:seriesafteryear}%
+  \global\booltrue{bbx:seriesbeforeedition}}
+  
 % Option seriesformat=standard|parens
 \newcommand{\bbx@option@seriesformat}{}
 \DeclareBibliographyOption{seriesformat}{%
@@ -206,7 +219,7 @@
   \printfield{booktitle}%
   \newunit}
   
-\DeclareBibliographyDriver{shorthands}{%
+\DeclareBibliographyDriver{shorthand}{%
   \toggletrue{listofshorthands}%
   \usebibmacro{terselos}}
 
@@ -216,7 +229,7 @@
 %% List of Shorthands: Länge der Labels einstellbar
 \AtBeginDocument{%
 \ifbool{bbx:shorthandwidthbool}
-  {\defbibenvironment{shorthands}
+  {\defbibenvironment{shorthand}
     {\list
        {\printfield[shorthandwidth]{shorthand}%
         \printtext{\shorthandpunct}}
@@ -229,7 +242,7 @@
         \renewcommand*{\makelabel}[1]{##1\hss}}}
     {\endlist}
     {\item}}
-  {\defbibenvironment{shorthands}
+  {\defbibenvironment{shorthand}
     {\list
        {\printfield[shorthandwidth]{shorthand}}
        {\setlength{\labelwidth}{\shorthandwidth}%
@@ -644,13 +657,17 @@
   \usebibmacro{maintitle+booktitle}%
   \newunit
   \usebibmacro{byeditor+others}%
+  \ifbool{bbx:seriesbeforeedition}
+    {\setunit{\addspace}%
+     \usebibmacro{series+number}}
+    {}%
   \newunit\newblock
   \usebibmacro{edition}%
   \usebibmacro{volumes+volume+part}%
-  \setunit{\addspace}%
-  \ifbool{bbx:seriesafteryear}
-    {}
-    {\usebibmacro{series+number}}%
+  \ifbool{bbx:seriesstandard}
+    {\setunit{\addspace}%
+     \usebibmacro{series+number}}
+    {}%
   \newunit\newblock
   \printfield{note}%
   \newunit\newblock
@@ -677,13 +694,17 @@
   \usebibmacro{maintitle+booktitle}%
   \newunit
   \usebibmacro{ifuse:byeditor+others}%
+  \ifbool{bbx:seriesbeforeedition}
+    {\setunit{\addspace}%
+     \usebibmacro{series+number}}
+    {}%
   \newunit\newblock
   \usebibmacro{edition}%
   \usebibmacro{volumes+volume+part}%
-  \setunit{\addspace}%
-  \ifbool{bbx:seriesafteryear}
-    {}
-    {\usebibmacro{series+number}}%
+  \ifbool{bbx:seriesstandard}
+    {\setunit{\addspace}%
+     \usebibmacro{series+number}}
+    {}%
   \newunit\newblock
   \printfield{note}%
   \newunit\newblock
@@ -714,10 +735,10 @@
   \usebibmacro{ifuse:byeditor+others}%
   \newunit\newblock
   \usebibmacro{volumes+volume+part}%
-  \setunit{\addspace}%
-  \ifbool{bbx:seriesafteryear}
-    {}
-    {\usebibmacro{series+number}}%
+  \ifbool{bbx:seriesstandard}
+    {\setunit{\addspace}%
+     \usebibmacro{series+number}}
+    {}%
   \newunit\newblock
   \printfield{note}%
   \newunit\newblock
@@ -748,10 +769,10 @@
   \usebibmacro{ifuse:byeditor+others}%
   \newunit\newblock
   \usebibmacro{edition}%
-  \setunit{\addspace}%
-  \ifbool{bbx:seriesafteryear}
-    {}
-    {\usebibmacro{series+number}}%
+  \ifbool{bbx:seriesstandard}
+    {\setunit{\addspace}%
+     \usebibmacro{series+number}}
+    {}%
   \newunit\newblock
   \printfield{note}%
   \newunit\newblock
@@ -829,13 +850,17 @@
   \usebibmacro{byauthor}%
   \newunit\newblock
   \usebibmacro{byeditor+others}%
+  \ifbool{bbx:seriesbeforeedition}
+    {\setunit{\addspace}%
+     \usebibmacro{series+number}}
+    {}%
   \newunit\newblock
   \usebibmacro{edition}%
   \usebibmacro{volumes+volume+part}%
-  \setunit{\addspace}%
-  \ifbool{bbx:seriesafteryear}
-    {}
-    {\usebibmacro{series+number}}%
+  \ifbool{bbx:seriesstandard}
+    {\setunit{\addspace}%
+     \usebibmacro{series+number}}
+    {}%
   \newunit\newblock
   \printfield{note}%
   \newunit\newblock
@@ -912,13 +937,17 @@
   \printlist{language}%
   \newunit\newblock
   \usebibmacro{byeditor+others}%
+  \ifbool{bbx:seriesbeforeedition}
+    {\setunit{\addspace}%
+     \usebibmacro{series+number}}
+    {}%
   \newunit\newblock
   \usebibmacro{edition}%
   \usebibmacro{volumes+volume+part}%
-  \setunit{\addspace}%
-  \ifbool{bbx:seriesafteryear}
-    {}
-    {\usebibmacro{series+number}}%
+  \ifbool{bbx:seriesstandard}
+    {\setunit{\addspace}%
+     \usebibmacro{series+number}}
+    {}%
   \newunit\newblock
   \printfield{note}%
   \newunit\newblock
@@ -1102,11 +1131,16 @@
   \usebibmacro{byauthor}%
   \newunit\newblock
   \usebibmacro{byeditor}%
+  \ifbool{bbx:seriesbeforeedition}
+    {\setunit{\addspace}%
+     \usebibmacro{series+number}}
+    {}%
   \newunit\newblock
   \usebibmacro{edition}%
-  \ifbool{bbx:seriesafteryear}
-    {}
-    {\usebibmacro{series+number}}%
+  \ifbool{bbx:seriesstandard}
+    {\setunit{\addspace}%
+     \usebibmacro{series+number}}
+    {}%
   \newunit\newblock
   \printfield{type}%
   \newunit
@@ -1297,10 +1331,10 @@
   \usebibmacro{byeditor+others}%
   \newunit\newblock
   \usebibmacro{volumes+volume+part}%
-  \setunit{\addspace}%
-  \ifbool{bbx:seriesafteryear}
-    {}
-    {\usebibmacro{series+number}}%
+  \ifbool{bbx:seriesstandard}
+    {\setunit{\addspace}%
+     \usebibmacro{series+number}}
+    {}%
   \newunit\newblock
   \printfield{note}%
   \newunit\newblock
@@ -1500,13 +1534,17 @@
   \ifbool{xref:inbook}% child is an @inbook entry
     {\usebibmacro{byeditor+others}}
     {\usebibmacro{ifuse:byeditor+others}}%
+  \ifbool{bbx:seriesbeforeedition}
+    {\setunit{\addspace}%
+     \usebibmacro{series+number}}
+    {}%
   \newunit\newblock
   \usebibmacro{edition}%
   \usebibmacro{volumes+volume+part}%
-  \setunit{\addspace}%
-  \ifbool{bbx:seriesafteryear}
-    {}
-    {\usebibmacro{series+number}}%
+  \ifbool{bbx:seriesstandard}
+    {\setunit{\addspace}%
+     \usebibmacro{series+number}}
+    {}%
   \newunit\newblock
   \printfield{note}%
   \newunit\newblock
@@ -1546,13 +1584,17 @@
   \printlist{language}%
   \newunit\newblock
   \usebibmacro{ifuse:byeditor+others}%
+  \ifbool{bbx:seriesbeforeedition}
+    {\setunit{\addspace}%
+     \usebibmacro{series+number}}
+    {}%
   \newunit\newblock
   \usebibmacro{edition}%
   \usebibmacro{volumes+volume+part}%
-  \setunit{\addspace}%
-  \ifbool{bbx:seriesafteryear}
-    {}
-    {\usebibmacro{series+number}}%
+  \ifbool{bbx:seriesstandard}
+    {\setunit{\addspace}%
+     \usebibmacro{series+number}}
+    {}%
   \newunit\newblock
   \printfield{note}%
   \newunit\newblock
@@ -1596,10 +1638,10 @@
   \usebibmacro{ifuse:byeditor+others}%
   \newunit\newblock
   \usebibmacro{volumes+volume+part}%
-  \setunit{\addspace}%
-  \ifbool{bbx:seriesafteryear}
-    {}
-    {\usebibmacro{series+number}}%
+  \ifbool{bbx:seriesstandard}
+    {\setunit{\addspace}%
+     \usebibmacro{series+number}}
+    {}%
   \newunit\newblock
   \printfield{note}%
   \newunit\newblock
@@ -1650,13 +1692,17 @@
   \ifbool{xref:inbook}% child is an @inbook entry
     {\usebibmacro{byeditor+others}}
     {\usebibmacro{ifuse:byeditor+others}}%
+  \ifbool{bbx:seriesbeforeedition}
+    {\setunit{\addspace}%
+     \usebibmacro{series+number}}
+    {}%
   \newunit\newblock
   \usebibmacro{edition}%
   \usebibmacro{volumes+volume+part}%
-  \setunit{\addspace}%
-  \ifbool{bbx:seriesafteryear}
-    {}
-    {\usebibmacro{series+number}}%
+  \ifbool{bbx:seriesstandard}
+    {\setunit{\addspace}%
+     \usebibmacro{series+number}}
+    {}%
   \newunit\newblock
   \printfield{note}%
   \newunit\newblock
@@ -1692,13 +1738,17 @@
   \printlist{language}%
   \newunit\newblock
   \usebibmacro{ifuse:byeditor+others}%
+  \ifbool{bbx:seriesbeforeedition}
+    {\setunit{\addspace}%
+     \usebibmacro{series+number}}
+    {}%
   \newunit\newblock
   \usebibmacro{edition}%
   \usebibmacro{volumes+volume+part}%
-  \setunit{\addspace}%
-  \ifbool{bbx:seriesafteryear}
-    {}
-    {\usebibmacro{series+number}}%
+  \ifbool{bbx:seriesstandard}
+    {\setunit{\addspace}%
+     \usebibmacro{series+number}}
+    {}%
   \newunit\newblock
   \printfield{note}%
   \newunit\newblock
@@ -1738,10 +1788,10 @@
   \usebibmacro{ifuse:byeditor+others}%
   \newunit\newblock
   \usebibmacro{volumes+volume+part}%
-  \setunit{\addspace}%
-  \ifbool{bbx:seriesafteryear}
-    {}
-    {\usebibmacro{series+number}}%
+  \ifbool{bbx:seriesstandard}
+    {\setunit{\addspace}%
+     \usebibmacro{series+number}}
+    {}%
   \newunit\newblock
   \printfield{note}%
   \newunit\newblock
@@ -1822,13 +1872,6 @@
          Thus, 'omiteditor' is ignored}}
       {}}%
     {}%
-  \ifdefstring{\bbx@option@series}{standard}
-    {}
-    {\ifdefstring{\bbx@option@series}{afteryear}
-      {}
-      {\blxdw@warning@noline{%
-         Unknown value for option 'series'.\MessageBreak
-         Option 'series=standard' used instead}}}%
   \ifdefstring{\bbx@option@seriesformat}{standard}
     {}
     {\ifdefstring{\bbx@option@seriesformat}{parens}