1 files changed, 24 insertions, 16 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex-ext/ext-standard.bbx b/Master/texmf-dist/tex/latex/biblatex-ext/ext-standard.bbx
index e82ffb6f62e..a88f2291017 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ext/ext-standard.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ext/ext-standard.bbx
@@ -1,5 +1,5 @@
 \ProvidesFile{ext-standard.bbx}
-  [2018/03/20 v0.1a extended biblatex standard style (MW)]
+  [2018/03/28 v0.2 extended biblatex standard style (MW)]
 
 \blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}{}{}{}{}
 
@@ -68,19 +68,19 @@
   \settoggle{bbx:maintitleaftertitle}{#1}}
 
 
-\newbibmacro*{bbx:cite:intro}{\usebibmacro{cite}}
+\newbibmacro*{bbx:introcite}{\usebibmacro{cite}}
 
 \extblx@create@mkcitedelim{inner}{bbx:introcite}
 \DeclareInnerCiteDelimAlias{bbx:introcite}{cite}
 \DeclareFieldFormat{bbx:introcite}{#1}
 \newcommand*{\introcitepunct}{\addcolon\space}
-\newcommand*{\introcitebreak}{\newline}
+\newcommand*{\introcitebreak}{\leavevmode\newline}
 
-\newlength{\extbl@introcitewidth}
+\newlength{\extbl@this@introcitewidth}
 \newlength{\introcitewidth}
 \setlength{\introcitewidth}{8\biblabelsep}
 \newlength{\introcitesep}
-\setlength{\introcitesep}{.5\biblabelsep}
+\setlength{\introcitesep}{\biblabelsep}
 
 \newbibmacro{introcite:typeset}{%
   \begingroup
@@ -92,7 +92,7 @@
     \undef\cbx@lastyear
     \citetrackerfalse\pagetrackerfalse\backtrackerfalse
     \defcounter{maxnames}{\blx@maxcitenames}%
-    \printtext[bbx:introcite]{\usebibmacro{bbx:cite:intro}}%
+    \printtext[bbx:introcite]{\usebibmacro{bbx:introcite}}%
   \endgroup
 }
 
@@ -104,9 +104,9 @@
 
 % This macro is used in \defbibenvironment
 \newbibmacro*{introcite:break}{%
-  \settowidth{\extbl@introcitewidth}{\usebibmacro{introcite:typeset}}%
-  \ifdimgreater{\extbl@introcitewidth+\introcitesep}{\introcitewidth}
-    {\leavevmode\introcitebreak}
+  \settowidth{\extbl@this@introcitewidth}{\usebibmacro{introcite:typeset}}%
+  \ifdimgreater{\extbl@this@introcitewidth}{\introcitewidth}
+    {\introcitebreak}
     {}}
 
 
@@ -123,6 +123,7 @@
 \DeclareDelimcontextAlias{bbx@cite@inxref}{cite}
 \DeclareOuterCiteDelimAlias{bibinxrefcite}{cite}
 
+
 \newbibmacro*{crosscite}[1]{%
   \iftoggle{bbx:citeinxref}
     {\iffieldundef{crossref}
@@ -135,6 +136,7 @@
 \DeclareDelimAlias{innametitledelim}{nametitledelim}
 \DeclareDelimAlias*[bib,biblist]{innametitledelim}{nametitledelim}
 
+
 \DeclareBibliographyDriver{article}{%
   \usebibmacro{introcite:plain}%
   \usebibmacro{bibindex}%
@@ -567,7 +569,7 @@
   \newunit
   \usebibmacro{note}%
   \newunit\newblock
-  \printlist{organization+location+date}%
+  \usebibmacro{organization+location+date}%
   \newunit\newblock
   \iftoggle{bbx:eprint}
     {\usebibmacro{eprint}}
@@ -780,6 +782,10 @@
   \newunit\newblock
   \printfield{howpublished}%
   \newunit\newblock
+  \printfield{type}%
+  \newunit\newblock
+  \usebibmacro{event+venue+date}%
+  \newunit\newblock
   \usebibmacro{note}%
   \newunit\newblock
   \usebibmacro{location+date}%
@@ -800,7 +806,8 @@
 
 \DeclareFieldFormat{volumeof}{\bibstring{volume}~#1}
 \newcommand*{\titlemaintitledelim}{\newunitpunct}
-\newcommand*{\maintitletitledelim}{\addcolon\space}
+\newcommand*{\maintitletitledelim}{\newunitpunct}
+\newcommand*{\voltitledelim}{\addcolon\space}
 \renewbibmacro*{maintitle+title}{%
   \iftoggle{bbx:maintitleaftertitle}
     {}
@@ -811,12 +818,12 @@
        {\iffieldundef{maintitle}
           {}
           {\usebibmacro{maintitle}%
-           \newunit\newblock
+           \setunit{\maintitletitledelim}\newblock
            \iffieldundef{volume}
              {}
              {\printfield{volume}%
               \printfield{part}%
-              \setunit{\maintitletitledelim}}}}}%
+              \setunit{\voltitledelim}}}}}%
   \usebibmacro{title}%
   \iftoggle{bbx:maintitleaftertitle}
     {\iffieldsequal{maintitle}{title}
@@ -843,12 +850,12 @@
     {\iffieldundef{maintitle}
        {}
        {\usebibmacro{maintitle}%
-        \newunit\newblock
+        \setunit{\maintitletitledelim}\newblock
         \iffieldundef{volume}
           {}
           {\printfield{volume}%
            \printfield{part}%
-           \setunit{\maintitletitledelim}}}}%
+           \setunit{\voltitledelim}}}}%
   \usebibmacro{booktitle}%
   \iftoggle{bbx:maintitleaftertitle}
     {\iffieldundef{maintitle}
@@ -865,6 +872,7 @@
     {}%
   \newunit}
 
+
 \renewbibmacro*{bybookauthor}{%
   \ifnamesequal{author}{bookauthor}
     {\iftoggle{bbx:innameidem}
@@ -1003,7 +1011,7 @@
 
 \newbibmacro*{isrn}{%
   \iftoggle{bbx:isbn}
-    {\printfield{issn}}
+    {\printfield{isrn}}
     {}}
 
 \DeclareFieldFormat{issuedate}{\mkbibparens{#1}}