biblatex 0.9a (19mar10)

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

8 files changed, 53 insertions, 58 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/alphabetic.bbx
index b74e27ec051..d81006e7790 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.9 2010/02/14 15:42:33 lehman beta $
+% $Id: alphabetic.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
 
 \ProvidesFile{alphabetic.bbx}
-[\abx@bbxid $Id: alphabetic.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: alphabetic.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
 
 \RequireBibliographyStyle{standard}
 \ExecuteBibliographyOptions{labelalpha,sorting=anyt}
@@ -12,10 +12,8 @@
 
 \DeclareFieldFormat{labelalphawidth}{\mkbibbrackets{#1}}
 \DeclareFieldFormat{shorthandwidth}{\mkbibbrackets{#1}}
-\renewcommand*{\thebibitem}{\item}
-\renewcommand*{\thelositem}{\item}
 
-\renewenvironment*{thebibliography}
+\defbibenvironment{bibliography}
   {\list
      {\printtext[labelalphawidth]{%
         \printfield{labelalpha}%
@@ -28,8 +26,9 @@
       \setlength{\parsep}{\bibparsep}}%
       \renewcommand*{\makelabel}[1]{##1\hss}}
   {\endlist}
+  {\item}
 
-\renewenvironment*{theshorthands}
+\defbibenvironment{shorthands}
   {\list
      {\printfield[shorthandwidth]{shorthand}}
      {\setlength{\labelwidth}{\shorthandwidth}%
@@ -40,5 +39,6 @@
       \setlength{\parsep}{\bibparsep}%
       \renewcommand*{\makelabel}[1]{##1\hss}}}
   {\endlist}
+  {\item}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authortitle.bbx
index 5ec753f314c..ac08c959d7e 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.9 2010/02/14 15:42:33 lehman beta $
+% $Id: authortitle.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
 
 \ProvidesFile{authortitle.bbx}
-[\abx@bbxid $Id: authortitle.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: authortitle.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
 
 \RequireBibliographyStyle{standard}
 \ExecuteBibliographyOptions{pagetracker}
@@ -14,15 +14,13 @@
      \renewbibmacro*{bbx:savehash}{}}}
 
 \DeclareFieldFormat{shorthandwidth}{#1}
-\renewcommand*{\thebibitem}{\item}
-\renewcommand*{\thelositem}{\item}
 \setlength{\bibitemsep}{0pt}
 
 \DeclareNameAlias{author}{sortname}
 \DeclareNameAlias{editor}{sortname}
 \DeclareNameAlias{translator}{sortname}
 
-\renewenvironment*{thebibliography}
+\defbibenvironment{bibliography}
   {\list
      {}
      {\setlength{\leftmargin}{\bibhang}%
@@ -30,8 +28,9 @@
       \setlength{\itemsep}{\bibitemsep}%
       \setlength{\parsep}{\bibparsep}}}
   {\endlist}
+  {\item}
 
-\renewenvironment*{theshorthands}
+\defbibenvironment{shorthands}
   {\list
      {\printfield[shorthandwidth]{shorthand}}
      {\setlength{\labelwidth}{\shorthandwidth}%
@@ -42,6 +41,7 @@
       \setlength{\parsep}{\bibparsep}%
       \renewcommand*{\makelabel}[1]{##1\hss}}}
   {\endlist}
+  {\item}
 
 \InitializeBibliographyStyle{%
   \global\undef\bbx@lasthash}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/authoryear.bbx
index 5429cf55f80..a00b58e13b8 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.9 2010/02/14 15:42:33 lehman beta $
+% $Id: authoryear.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
 
 \ProvidesFile{authoryear.bbx}
-[\abx@bbxid $Id: authoryear.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: authoryear.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
 
 \RequireBibliographyStyle{standard}
 \ExecuteBibliographyOptions{labelyear,sorting=nyt,pagetracker}
@@ -14,15 +14,13 @@
      \renewbibmacro*{bbx:savehash}{}}}
 
 \DeclareFieldFormat{shorthandwidth}{#1}
-\renewcommand*{\thebibitem}{\item}
-\renewcommand*{\thelositem}{\item}
 \setlength{\bibitemsep}{0pt}
 
 \DeclareNameAlias{author}{sortname}
 \DeclareNameAlias{editor}{sortname}
 \DeclareNameAlias{translator}{sortname}
 
-\renewenvironment*{thebibliography}
+\defbibenvironment{bibliography}
   {\list
      {}
      {\setlength{\leftmargin}{\bibhang}%
@@ -30,8 +28,9 @@
       \setlength{\itemsep}{\bibitemsep}%
       \setlength{\parsep}{\bibparsep}}}
   {\endlist}
+  {\item}
 
-\renewenvironment*{theshorthands}
+\defbibenvironment{shorthands}
   {\list
      {\printfield[shorthandwidth]{shorthand}}
      {\setlength{\labelwidth}{\shorthandwidth}%
@@ -42,6 +41,7 @@
       \setlength{\parsep}{\bibparsep}%
       \renewcommand*{\makelabel}[1]{##1\hss}}}
   {\endlist}
+  {\item}
 
 \InitializeBibliographyStyle{%
   \global\undef\bbx@lasthash}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx
index 73eec79d1f6..0bbdd2aa878 100644
--- a/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex/bbx/debug.bbx
@@ -1,15 +1,13 @@
-% $Id: debug.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $
+% $Id: debug.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
 
 \ProvidesFile{debug.bbx}
-[\abx@bbxid $Id: debug.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: debug.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
 
 \ExecuteBibliographyOptions{sorting=debug}
 \DeclareFieldFormat{entrykey}{\ttfamily[#1]}
 \DeclareFieldFormat{shorthandwidth}{#1}
-\renewcommand*{\thebibitem}{\item}
-\renewcommand*{\thelositem}{\item}
 
-\renewenvironment*{thebibliography}
+\defbibenvironment{bibliography}
   {\list
      {}
      {\setlength{\leftmargin}{8em}%
@@ -21,8 +19,9 @@
       \frenchspacing
       \normalfont\footnotesize}}
   {\endlist}
+  {\item}
 
-\renewenvironment*{theshorthands}
+\defbibenvironment{shorthands}
   {\list
      {\printfield[shorthandwidth]{shorthand}}
      {\setlength{\labelwidth}{8em}%
@@ -36,6 +35,7 @@
       \frenchspacing
       \normalfont\footnotesize}}
   {\endlist}
+  {\item}
 
 \DeclareNameFormat{debug}{%
   \bbx@mklabel{\currentname}%
@@ -63,7 +63,7 @@
   \detokenize{#1}}
 
 \newcommand*{\bbx@mklabel}[1]{%
-  \thebibitem
+  \item
   \makebox[\leftmargin][l]{\ttfamily [#1]}}
 
 \newcommand*{\bbx@mksublabel}[1]{%
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/draft.bbx
index 9f40ccbb005..d3a913fd255 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.9 2010/02/14 15:42:33 lehman beta $
+% $Id: draft.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
 
 \ProvidesFile{draft.bbx}
-[\abx@bbxid $Id: draft.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: draft.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
 
 \RequireBibliographyStyle{standard}
 \ExecuteBibliographyOptions{sorting=debug}
@@ -11,10 +11,8 @@
 \DeclareNameAlias{translator}{default}
 
 \DeclareFieldFormat{shorthandwidth}{#1}
-\renewcommand*{\thebibitem}{\item}
-\renewcommand*{\thelositem}{\item}
 
-\renewenvironment*{thebibliography}
+\defbibenvironment{bibliography}
   {\list
      {\printfield{entrykey}}
      {\setlength{\labelwidth}{0pt}%
@@ -24,8 +22,9 @@
       \renewcommand*{\makelabel}[1]{%
 	\hspace\labelsep\bfseries##1}}}
   {\endlist}
+  {\item}
 
-\renewenvironment*{theshorthands}
+\defbibenvironment{shorthands}
   {\list
      {\printfield[shorthandwidth]{shorthand}}
      {\setlength{\labelwidth}{\shorthandwidth}%
@@ -36,5 +35,6 @@
       \setlength{\parsep}{\bibparsep}%
       \renewcommand*{\makelabel}[1]{##1\hss}}}
   {\endlist}
+  {\item}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx
index 3ff85cf53aa..5aca28eb5b8 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.9 2010/02/14 15:42:33 lehman beta $
+% $Id: numeric.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
 
 \ProvidesFile{numeric.bbx}
-[\abx@bbxid $Id: numeric.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: numeric.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
 
 \RequireBibliographyStyle{standard}
 \ExecuteBibliographyOptions{labelnumber}
@@ -18,10 +18,8 @@
 \DeclareFieldFormat{bibentrysetcount}{\mkbibparens{\mknumalph{#1}}}
 \DeclareFieldFormat{labelnumberwidth}{\mkbibbrackets{#1}}
 \DeclareFieldFormat{shorthandwidth}{\mkbibbrackets{#1}}
-\renewcommand*{\thebibitem}{\item}
-\renewcommand*{\thelositem}{\item}
 
-\renewenvironment*{thebibliography}
+\defbibenvironment{bibliography}
   {\list
      {\printfield[labelnumberwidth]{labelnumber}}
      {\setlength{\labelwidth}{\labelnumberwidth}%
@@ -32,8 +30,9 @@
       \setlength{\parsep}{\bibparsep}}%
       \renewcommand*{\makelabel}[1]{\hss##1}}
   {\endlist}
+  {\item}
 
-\renewenvironment*{theshorthands}
+\defbibenvironment{shorthands}
   {\list
      {\printfield[shorthandwidth]{shorthand}}
      {\setlength{\labelwidth}{\shorthandwidth}%
@@ -44,7 +43,7 @@
       \setlength{\parsep}{\bibparsep}%
       \renewcommand*{\makelabel}[1]{\hss##1}}}
   {\endlist}
-
+  {\item}
 
 \DeclareBibliographyDriver{set}{%
   \ifbool{bbx:subentry}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/reading.bbx
index 25e3099fde6..1accffc4fcb 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.9 2010/02/14 15:42:33 lehman beta $
+% $Id: reading.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
 
 \ProvidesFile{reading.bbx}
-[\abx@bbxid $Id: reading.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: reading.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
 
 \RequireBibliographyStyle{standard}
 
@@ -22,7 +22,7 @@
 \setlength{\bibitemsep}{0.5\baselineskip}
 \setlength{\bibparsep}{0pt}
 
-\renewenvironment*{thebibliography}
+\defbibenvironment{bibliography}
   {\list
      {}
      {\setlength{\leftmargin}{0pt}%
@@ -30,10 +30,9 @@
       \setlength{\itemsep}{\bibitemsep}%
       \setlength{\parsep}{\bibparsep}}}
   {\endlist}
+  {\bbx@item}
 
-\renewcommand*{\thelositem}{\item}
-
-\renewenvironment*{theshorthands}
+\defbibenvironment{shorthands}
   {\list
      {\printfield[shorthandwidth]{shorthand}}
      {\setlength{\labelwidth}{\shorthandwidth}%
@@ -44,16 +43,17 @@
       \setlength{\parsep}{\bibparsep}%
       \renewcommand*{\makelabel}[1]{##1\hss}}}
   {\endlist}
+  {\item}
 
-\def\bbx@bibitem@false{%
+\def\bbx@item@false{%
   \itemsep2\bibitemsep
   \item\relax
   \itemsep\bibitemsep}
 
-\def\bbx@bibitem@true{%
-  \bbx@bibitem@full}
+\def\bbx@item@true{%
+  \bbx@item@full}
 
-\def\bbx@bibitem@full{%
+\def\bbx@item@full{%
   \itemsep2\bibitemsep
   \@itempenalty\z@
   \item\relax
@@ -80,9 +80,9 @@
   \item\strut
   \@itempenalty\z@}
 
-\def\bbx@bibitem@name{%
+\def\bbx@item@name{%
   \iffieldequals{fullhash}{\bbx@lasthash}
-    {\bbx@bibitem@false}
+    {\bbx@item@false}
     {\itemsep2\bibitemsep
      \@itempenalty\z@
      \item\relax
@@ -105,8 +105,8 @@
 \newbool{bbx:file}
 
 \DeclareBibliographyOption{entryhead}[true]{%
-  \ifcsdef{bbx@bibitem@#1}
-    {\letcs\thebibitem{bbx@bibitem@#1}}
+  \ifcsdef{bbx@item@#1}
+    {\letcs\bbx@item{bbx@item@#1}}
     {\PackageError{biblatex}
        {Invalid option 'header=#1'}
        {Valid values: header=true, false, full, name.}}}
diff --git a/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx b/Master/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
index 0d994f10d5e..40e8b728c27 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.9 2010/02/14 15:42:33 lehman beta $
+% $Id: standard.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $
 
 \ProvidesFile{standard.bbx}
-[\abx@bbxid $Id: standard.bbx,v 0.9 2010/02/14 15:42:33 lehman beta $]
+[\abx@bbxid $Id: standard.bbx,v 0.9a 2010/03/19 19:52:15 lehman beta $]
 
 \newtoggle{bbx:isbn}
 \newtoggle{bbx:url}
@@ -622,10 +622,6 @@
 \DeclareBibliographyAlias{suppperiodical}{article}
 \DeclareBibliographyAlias{*}{misc}
 
-\newbibmacro*{in:}{%
-  \bibstring{in}\addcolon
-  \setunit{\space}}
-
 \newbibmacro*{maintitle+title}{%
   \iffieldsequal{maintitle}{title}
     {\clearfield{maintitle}%