1 files changed, 23 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.def b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
index 36f149d3b65..a210229c8da 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.def
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.def
@@ -1,7 +1,7 @@
-% $Id: biblatex.def,v 1.2a 2011/02/13 12:05:37 lehman stable $
+% $Id: biblatex.def,v 1.3 2011/03/14 18:25:44 lehman stable $
 
 \ProvidesFile{biblatex.def}
-[\abx@rcsid $Id: biblatex.def,v 1.2a 2011/02/13 12:05:37 lehman stable $
+[\abx@rcsid $Id: biblatex.def,v 1.3 2011/03/14 18:25:44 lehman stable $
  biblatex generic definitions]
 
 % ------------------------------------------------------------------
@@ -262,7 +262,10 @@
   [suppbook,suppcollection,suppperiodical]
   {citetitle}{#1}
 \DeclareFieldFormat{labelyear}{#1}% = the '1995' part in 'Jones 1995a'
-\DeclareFieldFormat{extrayear}{\mknumalph{#1}}% = the 'a' in 'Jones 1995a'
+\DeclareFieldFormat{extrayear}{% = the 'a' in 'Jones 1995a'
+  \iffieldnums{labelyear}
+    {\mknumalph{#1}}
+    {\mkbibparens{\mknumalph{#1}}}}
 \DeclareFieldFormat{labelalpha}{#1}% = the 'Jon95' part of 'Jon95a'
 \DeclareFieldFormat{extraalpha}{\mknumalph{#1}}% = the 'a' in 'Jon95a'
 \DeclareFieldFormat{shorthand}{#1\isdot}
@@ -696,7 +699,7 @@
        {\ifcapital
           {\mkbibnameprefix{\MakeCapital{#3}}\isdot}
           {\mkbibnameprefix{#3}\isdot}%
-        \ifpunctmark{'}{}{\addhighpenspace}}}
+        \ifpunctmark{'}{}{\bibnamedelimc}}}
     {\usebibmacro{name:delim}{#1}%
      \usebibmacro{name:hook}{#1}}%
   \mkbibnamelast{#1}}%
@@ -704,14 +707,14 @@
 \newbibmacro*{name:first-last}[4]{%
   \usebibmacro{name:delim}{#2#3#1}%
   \usebibmacro{name:hook}{#2#3#1}%
-  \ifblank{#2}{}{\mkbibnamefirst{#2}\isdot\addlowpenspace}%
+  \ifblank{#2}{}{\mkbibnamefirst{#2}\isdot\bibnamedelimd}%
   \ifblank{#3}{}{%
     \mkbibnameprefix{#3}\isdot
     \ifpunctmark{'}
       {}
-      {\ifuseprefix{\addhighpenspace}{\addlowpenspace}}}%
+      {\ifuseprefix{\bibnamedelimc}{\bibnamedelimd}}}%
   \mkbibnamelast{#1}\isdot
-  \ifblank{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\isdot}}
+  \ifblank{#4}{}{\bibnamedelimd\mkbibnameaffix{#4}\isdot}}
 
 \newbibmacro*{name:last-first}[4]{%
   \ifuseprefix
@@ -721,17 +724,17 @@
        \ifcapital
          {\mkbibnameprefix{\MakeCapital{#3}}\isdot}
 	 {\mkbibnameprefix{#3}\isdot}%
-       \ifpunctmark{'}{}{\addhighpenspace}}%
+       \ifpunctmark{'}{}{\bibnamedelimc}}%
      \mkbibnamelast{#1}\isdot
-     \ifblank{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\isdot}%
-     \ifblank{#2}{}{\addcomma\addlowpenspace\mkbibnamefirst{#2}\isdot}}
+     \ifblank{#4}{}{\bibnamedelimd\mkbibnameaffix{#4}\isdot}%
+     \ifblank{#2}{}{\addcomma\bibnamedelimd\mkbibnamefirst{#2}\isdot}}
     {\usebibmacro{name:delim}{#1}%
      \usebibmacro{name:hook}{#1}%
      \mkbibnamelast{#1}\isdot
-     \ifblank{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\isdot}%
+     \ifblank{#4}{}{\bibnamedelimd\mkbibnameaffix{#4}\isdot}%
      \ifblank{#2#3}{}{\addcomma}%
-     \ifblank{#2}{}{\addlowpenspace\mkbibnamefirst{#2}\isdot}%
-     \ifblank{#3}{}{\addlowpenspace\mkbibnameprefix{#3}\isdot}}}
+     \ifblank{#2}{}{\bibnamedelimd\mkbibnamefirst{#2}\isdot}%
+     \ifblank{#3}{}{\bibnamedelimd\mkbibnameprefix{#3}\isdot}}}
 
 \newbibmacro*{name:hook}[1]{%
   \ifnumequal{\value{listcount}}{1}
@@ -1643,6 +1646,7 @@
 \newrobustcmd*{\pvolcite}{\volcitecmd\parencite}
 \newrobustcmd*{\fvolcite}{\volcitecmd\footcite}
 \newrobustcmd*{\ftvolcite}{\volcitecmd\footcitetext}
+\newrobustcmd*{\svolcite}{\volcitecmd\smartcite}
 \newrobustcmd*{\tvolcite}{\volcitecmd\textcite}
 \newrobustcmd*{\avolcite}{\volcitecmd\autocite}
 
@@ -1650,6 +1654,7 @@
 \newrobustcmd*{\Parencite}{\bibsentence\parencite}
 \newrobustcmd*{\Footcite}{\footcite}
 \newrobustcmd*{\Footcitetext}{\footcitetext}
+\newrobustcmd*{\Smartcite}{\bibsentence\smartcite}
 \newrobustcmd*{\Textcite}{\bibsentence\textcite}
 \newrobustcmd*{\Citeauthor}{\bibsentence\citeauthor}
 \newrobustcmd*{\Citetitle}{\bibsentence\citetitle}
@@ -1658,6 +1663,7 @@
 \newrobustcmd*{\Pvolcite}{\volcitecmd\Parencite}
 \newrobustcmd*{\Fvolcite}{\volcitecmd\Footcite}
 \newrobustcmd*{\Ftvolcite}{\volcitecmd\Footcitetext}
+\newrobustcmd*{\Svolcite}{\volcitecmd\Smartcite}
 \newrobustcmd*{\Tvolcite}{\volcitecmd\Textcite}
 \newrobustcmd*{\Avolcite}{\volcitecmd\Autocite}
 
@@ -1669,6 +1675,7 @@
 \DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}{\multicitedelim}
 \DeclareMultiCiteCommand{\footcites}[\mkbibfootnote]{\footcite}{\multicitedelim}
 \DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext]{\footcitetext}{\multicitedelim}
+\DeclareMultiCiteCommand{\smartcites}[\iffootnote\mkbibparens\mkbibfootnote]{\smartcite}{\multicitedelim}
 \DeclareMultiCiteCommand{\supercites}[\mkbibsuperscript]{\supercite}{\supercitedelim}
 \DeclareMultiCiteCommand{\textcites}{\textcite}{\multicitedelim}
 
@@ -1676,11 +1683,13 @@
 \newrobustcmd*{\Parencites}{\bibsentence\parencites}
 \newrobustcmd*{\Footcites}{\footcites}
 \newrobustcmd*{\Footcitetexts}{\footcitetexts}
+\newrobustcmd*{\Smartcites}{\bibsentence\smartcites}
 \newrobustcmd*{\Textcites}{\bibsentence\textcites}
 
 \DeclareAutoCiteCommand{plain}{\cite}{\cites}
 \DeclareAutoCiteCommand{inline}{\parencite}{\parencites}
-\DeclareAutoCiteCommand{footnote}[l]{\footcite}{\footcites}
+%\DeclareAutoCiteCommand{footnote}[l]{\footcite}{\footcites}
+\DeclareAutoCiteCommand{footnote}[f]{\smartcite}{\smartcites}
 \DeclareAutoCiteCommand{superscript}[l]{\supercite}{\supercites}
 
 \newrobustcmd*{\Autocite}{\bibsentence\autocite}