biblatex 0.9d (4sep10)

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

27 files changed, 150 insertions, 100 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic-verb.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic-verb.bbx
index 39859f98d69..3b9232a2d39 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic-verb.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic-verb.bbx
@@ -1,7 +1,7 @@
-% $Id: alphabetic-verb.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: alphabetic-verb.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{alphabetic-verb.bbx}
-[\abx@bbxid $Id: alphabetic-verb.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: alphabetic-verb.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{alphabetic}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx
index d81006e7790..73c25c368fc 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx
@@ -1,7 +1,7 @@
-% $Id: alphabetic.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: alphabetic.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{alphabetic.bbx}
-[\abx@bbxid $Id: alphabetic.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@bbxid $Id: alphabetic.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{standard}
 \ExecuteBibliographyOptions{labelalpha,sorting=anyt}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-comp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-comp.bbx
index 062f08718d7..3d8bbe68dd4 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-comp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-comp.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-comp.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: authortitle-comp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{authortitle-comp.bbx}
-[\abx@bbxid $Id: authortitle-comp.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: authortitle-comp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{authortitle}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ibid.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ibid.bbx
index cf586c9787b..bae7a30891d 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ibid.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ibid.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-ibid.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: authortitle-ibid.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{authortitle-ibid.bbx}
-[\abx@bbxid $Id: authortitle-ibid.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: authortitle-ibid.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{authortitle}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-icomp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-icomp.bbx
index 9ba53fa2b09..22d48fa135f 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-icomp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-icomp.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-icomp.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: authortitle-icomp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{authortitle-icomp.bbx}
-[\abx@bbxid $Id: authortitle-icomp.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: authortitle-icomp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{authortitle}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-tcomp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-tcomp.bbx
index 4f3508759fa..21dca612f13 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-tcomp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-tcomp.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-tcomp.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: authortitle-tcomp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{authortitle-tcomp.bbx}
-[\abx@bbxid $Id: authortitle-tcomp.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: authortitle-tcomp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{authortitle}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-terse.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-terse.bbx
index 5cb8bf6bed6..9e84f2523d7 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-terse.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-terse.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle-terse.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: authortitle-terse.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{authortitle-terse.bbx}
-[\abx@bbxid $Id: authortitle-terse.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: authortitle-terse.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{authortitle}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ticomp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ticomp.bbx
new file mode 100644
index 00000000000..f6ae2f26897
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle-ticomp.bbx
@@ -0,0 +1,8 @@
+% $Id: authortitle-ticomp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
+
+\ProvidesFile{authortitle-ticomp.bbx}
+[\abx@bbxid $Id: authortitle-ticomp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
+
+\RequireBibliographyStyle{authortitle}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx
index ac08c959d7e..184e5249cd1 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx
@@ -1,7 +1,7 @@
-% $Id: authortitle.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: authortitle.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{authortitle.bbx}
-[\abx@bbxid $Id: authortitle.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@bbxid $Id: authortitle.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{standard}
 \ExecuteBibliographyOptions{pagetracker}
@@ -56,15 +56,16 @@
   \finentry}
 
 \renewbibmacro*{author}{%
-  \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND
-                 \NOT\iffirstonpage\AND
-		 \(\NOT\boolean{bbx@inset}\OR
-		   \iffieldequalstr{entrysetcount}{1}\)}
+  \ifboolexpr{
+    test \ifuseauthor
+    and
+    not test {\ifnameundef{author}}
+  }
+    {\usebibmacro{bbx:dashcheck}
        {\bibnamedash}
        {\printnames{author}%
 	\setunit{\addcomma\space}%
-        \usebibmacro{bbx:savehash}}%
+	\usebibmacro{bbx:savehash}}%
      \usebibmacro{authorstrg}}
     {\global\undef\bbx@lasthash}}
 
@@ -73,15 +74,16 @@
 \renewbibmacro*{editor+others}{%
   \usebibmacro{bbx:editor}{editor+othersstrg}}
 \newbibmacro*{bbx:editor}[1]{%
-  \ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{editor}}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND
-                 \NOT\iffirstonpage\AND
-		 \(\NOT\boolean{bbx@inset}\OR
-		   \iffieldequalstr{entrysetcount}{1}\)}
+  \ifboolexpr{
+    test \ifuseeditor
+    and
+    not test {\ifnameundef{editor}}
+  }
+    {\usebibmacro{bbx:dashcheck}
        {\bibnamedash}
        {\printnames{editor}%
 	\setunit{\addcomma\space}%
-        \usebibmacro{bbx:savehash}}%
+	\usebibmacro{bbx:savehash}}%
      \usebibmacro{#1}%
      \clearname{editor}}
     {\global\undef\bbx@lasthash}}
@@ -91,11 +93,12 @@
 \renewbibmacro*{translator+others}{%
   \usebibmacro{bbx:translator}{translator+othersstrg}}
 \newbibmacro*{bbx:translator}[1]{%
-  \ifthenelse{\ifusetranslator\AND\NOT\ifnameundef{translator}}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND
-                 \NOT\iffirstonpage\AND
-		 \(\NOT\boolean{bbx@inset}\OR
-		   \iffieldequalstr{entrysetcount}{1}\)}
+  \ifboolexpr{
+    test \ifusetranslator
+    and
+    not test {\ifnameundef{translator}}
+  }
+    {\usebibmacro{bbx:dashcheck}
        {\bibnamedash}
        {\printnames{translator}%
 	\setunit{\addcomma\space}%
@@ -104,4 +107,19 @@
      \clearname{translator}}
     {\global\undef\bbx@lasthash}}
 
+\newbibmacro*{bbx:dashcheck}[2]{%
+  \ifboolexpr{
+    test {\iffieldequals{fullhash}{\bbx@lasthash}}
+    and
+    not test \iffirstonpage
+    and
+    (
+       not bool {bbx@inset}
+       or
+       test {\iffieldequalstr{entrysetcount}{1}}
+    )
+  }
+    {#1}
+    {#2}}
+
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-comp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-comp.bbx
index 0afe2cb9687..e39175ca4b5 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-comp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-comp.bbx
@@ -1,7 +1,7 @@
-% $Id: authoryear-comp.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: authoryear-comp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{authoryear-comp.bbx}
-[\abx@bbxid $Id: authoryear-comp.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: authoryear-comp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{authoryear}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-ibid.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-ibid.bbx
index 013f753ab7c..0b288eee160 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-ibid.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-ibid.bbx
@@ -1,7 +1,7 @@
-% $Id: authoryear-ibid.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: authoryear-ibid.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{authoryear-ibid.bbx}
-[\abx@bbxid $Id: authoryear-ibid.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: authoryear-ibid.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{authoryear}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-icomp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-icomp.bbx
index e730c30f017..b7026d43a13 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-icomp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear-icomp.bbx
@@ -1,7 +1,7 @@
-% $Id: authoryear-icomp.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: authoryear-icomp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{authoryear-icomp.bbx}
-[\abx@bbxid $Id: authoryear-icomp.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: authoryear-icomp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{authoryear}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
index a00b58e13b8..c4fc460d66b 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
@@ -1,7 +1,7 @@
-% $Id: authoryear.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: authoryear.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{authoryear.bbx}
-[\abx@bbxid $Id: authoryear.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@bbxid $Id: authoryear.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{standard}
 \ExecuteBibliographyOptions{labelyear,sorting=nyt,pagetracker}
@@ -56,11 +56,12 @@
   \finentry}
 
 \renewbibmacro*{author}{%
-  \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND
-                 \NOT\iffirstonpage\AND
-		 \(\NOT\boolean{bbx@inset}\OR
-		   \iffieldequalstr{entrysetcount}{1}\)}
+  \ifboolexpr{
+    test \ifuseauthor
+    and
+    not test {\ifnameundef{author}}
+  }
+    {\usebibmacro{bbx:dashcheck}
        {\bibnamedash}
        {\usebibmacro{bbx:savehash}%
         \printnames{author}%
@@ -81,11 +82,12 @@
 \renewbibmacro*{editor+others}{%
   \usebibmacro{bbx:editor}{editor+othersstrg}}
 \newbibmacro*{bbx:editor}[1]{%
-  \ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{editor}}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND
-                 \NOT\iffirstonpage\AND
-		 \(\NOT\boolean{bbx@inset}\OR
-		   \iffieldequalstr{entrysetcount}{1}\)}
+  \ifboolexpr{
+    test \ifuseeditor
+    and
+    not test {\ifnameundef{editor}}
+  }
+    {\usebibmacro{bbx:dashcheck}
        {\bibnamedash}
        {\printnames{editor}%
 	\setunit{\addcomma\space}%
@@ -103,11 +105,12 @@
 \renewbibmacro*{translator+others}{%
   \usebibmacro{bbx:translator}{translator+othersstrg}}
 \newbibmacro*{bbx:translator}[1]{%
-  \ifthenelse{\ifusetranslator\AND\NOT\ifnameundef{translator}}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND
-                 \NOT\iffirstonpage\AND
-		 \(\NOT\boolean{bbx@inset}\OR
-		   \iffieldequalstr{entrysetcount}{1}\)}
+  \ifboolexpr{
+    test \ifusetranslator
+    and
+    not test {\ifnameundef{translator}}
+  }
+    {\usebibmacro{bbx:dashcheck}
        {\bibnamedash}
        {\printnames{translator}%
 	\setunit{\addcomma\space}%
@@ -120,6 +123,21 @@
      \setunit*{\addspace}}%
   \usebibmacro{date+extrayear}}
 
+\newbibmacro*{bbx:dashcheck}[2]{%
+  \ifboolexpr{
+    test {\iffieldequals{fullhash}{\bbx@lasthash}}
+    and
+    not test \iffirstonpage
+    and
+    (
+       not bool {bbx@inset}
+       or
+       test {\iffieldequalstr{entrysetcount}{1}}
+    )
+  }
+    {#1}
+    {#2}}
+
 \newbibmacro*{date+extrayear}{%
   \iffieldundef{year}
     {}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx
index 0bbdd2aa878..2a196206e55 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx
@@ -1,7 +1,7 @@
-% $Id: debug.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: debug.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{debug.bbx}
-[\abx@bbxid $Id: debug.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@bbxid $Id: debug.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \ExecuteBibliographyOptions{sorting=debug}
 \DeclareFieldFormat{entrykey}{\ttfamily[#1]}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx
index d3a913fd255..18541bf5bf1 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx
@@ -1,7 +1,7 @@
-% $Id: draft.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: draft.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{draft.bbx}
-[\abx@bbxid $Id: draft.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@bbxid $Id: draft.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{standard}
 \ExecuteBibliographyOptions{sorting=debug}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-comp.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-comp.bbx
index 6c4a3169231..7282ad5a4fe 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-comp.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-comp.bbx
@@ -1,7 +1,7 @@
-% $Id: numeric-comp.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: numeric-comp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{numeric-comp.bbx}
-[\abx@bbxid $Id: numeric-comp.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: numeric-comp.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{numeric}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-verb.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-verb.bbx
index 6c8256ece60..b9bcec93050 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-verb.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric-verb.bbx
@@ -1,7 +1,7 @@
-% $Id: numeric-verb.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: numeric-verb.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{numeric-verb.bbx}
-[\abx@bbxid $Id: numeric-verb.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: numeric-verb.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{numeric}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx
index 5aca28eb5b8..160036883b3 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx
@@ -1,7 +1,7 @@
-% $Id: numeric.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: numeric.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{numeric.bbx}
-[\abx@bbxid $Id: numeric.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@bbxid $Id: numeric.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{standard}
 \ExecuteBibliographyOptions{labelnumber}
@@ -21,7 +21,9 @@
 
 \defbibenvironment{bibliography}
   {\list
-     {\printfield[labelnumberwidth]{labelnumber}}
+     {\printtext[labelnumberwidth]{%
+	\printfield{prefixnumber}%
+	\printfield{labelnumber}}}
      {\setlength{\labelwidth}{\labelnumberwidth}%
       \setlength{\leftmargin}{\labelwidth}%
       \setlength{\labelsep}{\biblabelsep}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx
index 1accffc4fcb..a9111ac67ce 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx
@@ -1,7 +1,7 @@
-% $Id: reading.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: reading.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{reading.bbx}
-[\abx@bbxid $Id: reading.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@bbxid $Id: reading.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{standard}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
index 40e8b728c27..a7ea8e96e04 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
@@ -1,7 +1,7 @@
-% $Id: standard.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
+% $Id: standard.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{standard.bbx}
-[\abx@bbxid $Id: standard.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
+[\abx@bbxid $Id: standard.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \newtoggle{bbx:isbn}
 \newtoggle{bbx:url}
@@ -437,9 +437,7 @@
   \newunit\newblock
   \usebibmacro{date}%
   \newunit\newblock
-  \iftoggle{bbx:url}
-    {\usebibmacro{url+urldate}}
-    {}%
+  \usebibmacro{doi+eprint+url}%
   \newunit\newblock
   \usebibmacro{addendum+pubstate}%
   \newunit\newblock
@@ -592,7 +590,7 @@
   \newunit\newblock
   \printfield{note}%
   \newunit\newblock
-  \usebibmacro{date}%
+  \usebibmacro{location+date}%
   \newunit\newblock
   \iftoggle{bbx:url}
     {\usebibmacro{url+urldate}}
@@ -660,17 +658,20 @@
     {\newunit
      \printfield{series}%
      \setunit{\addspace}}%
-  \printfield{volume}%
-  \setunit*{\adddot}%
-  \printfield{number}%
-  \setunit{\addcomma\space}%
-  \printfield{eid}%
+  \usebibmacro{volume+number+eid}%
   \setunit{\addspace}%
   \usebibmacro{issue+date}%
   \setunit{\addcolon\space}%
   \usebibmacro{issue}%
   \newunit}
 
+\newbibmacro*{volume+number+eid}{%
+  \printfield{volume}%
+  \setunit*{\adddot}%
+  \printfield{number}%
+  \setunit{\addcomma\space}%
+  \printfield{eid}}
+
 \newbibmacro*{title+issuetitle}{%
   \usebibmacro{periodical}%
   \setunit*{\addspace}%
@@ -693,18 +694,21 @@
 \newbibmacro*{issue+date}{%
   \printtext[parens]{%
     \iffieldundef{issue}
-      {\printdate}
+      {\usebibmacro{date}}
       {\printfield{issue}%
-       \setunit{\addspace}%
-       \printfield{year}}}%
+       \setunit*{\addspace}%
+       \usebibmacro{date}}}%
   \newunit}
 
 \newbibmacro*{event+venue+date}{%
   \printfield{eventtitle}%
-  \ifthenelse{\iffieldundef{venue}\AND
-	      \iffieldundef{eventyear}}
+  \ifboolexpr{
+    test {\iffieldundef{venue}}
+    and
+    test {\iffieldundef{eventyear}}
+  }
     {}
-    {\setunit{\addspace}%
+    {\setunit*{\addspace}%
      \printtext[parens]{%
        \printfield{venue}%
        \setunit*{\addcomma\space}%
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-ibid.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-ibid.bbx
index 23e05cb435d..468bbdc26b8 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-ibid.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-ibid.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose-ibid.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: verbose-ibid.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{verbose-ibid.bbx}
-[\abx@bbxid $Id: verbose-ibid.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: verbose-ibid.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{authortitle}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-inote.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-inote.bbx
index 7a5ed0f13b5..4ef0943b977 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-inote.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-inote.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose-inote.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: verbose-inote.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{verbose-inote.bbx}
-[\abx@bbxid $Id: verbose-inote.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: verbose-inote.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{authortitle}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-note.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-note.bbx
index 7de32f6a938..853bd821383 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-note.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-note.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose-note.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: verbose-note.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{verbose-note.bbx}
-[\abx@bbxid $Id: verbose-note.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: verbose-note.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{authortitle}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad1.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad1.bbx
index c2249146e9d..a947435dd02 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad1.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad1.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose-trad1.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: verbose-trad1.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{verbose-trad1.bbx}
-[\abx@bbxid $Id: verbose-trad1.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: verbose-trad1.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{authortitle}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad2.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad2.bbx
index 461a1fc3ab7..848a2b05e97 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad2.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad2.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose-trad2.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: verbose-trad2.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{verbose-trad2.bbx}
-[\abx@bbxid $Id: verbose-trad2.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: verbose-trad2.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{authortitle}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad3.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad3.bbx
index 103cd55742a..8145890b9cc 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad3.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose-trad3.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose-trad3.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: verbose-trad3.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{verbose-trad3.bbx}
-[\abx@bbxid $Id: verbose-trad3.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: verbose-trad3.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{authortitle}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose.bbx
index a729977481c..17cec628b58 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/verbose.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/verbose.bbx
@@ -1,7 +1,7 @@
-% $Id: verbose.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: verbose.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $
 
 \ProvidesFile{verbose.bbx}
-[\abx@bbxid $Id: verbose.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: verbose.bbx,v 0.9d 2010/09/03 20:11:58 lehman beta $]
 
 \RequireBibliographyStyle{authortitle}