biblatex-chicago-notes-df update (20mar10)

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

6 files changed, 31 insertions, 15 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago-notes-df/RELEASE b/Master/texmf-dist/doc/latex/biblatex-chicago-notes-df/RELEASE
index 56c67f2808e..0a9931fa91e 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago-notes-df/RELEASE
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago-notes-df/RELEASE
@@ -1,3 +1,7 @@
+Release notes for version 0.9a [2010-03-20]:
+
+ - Small, quick fixes for immediate compatibility with biblatex 0.9a.
+
 Release notes for version 0.9 [2010-03-18]:
 
 As I noted in the README file, users will have to modify their .bib
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago-notes-df/biblatex-chicago-notes-df.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago-notes-df/biblatex-chicago-notes-df.pdf
index bf2d9f48704..df357f712ce 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago-notes-df/biblatex-chicago-notes-df.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago-notes-df/biblatex-chicago-notes-df.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago-notes-df/biblatex-chicago-notes-df.tex b/Master/texmf-dist/doc/latex/biblatex-chicago-notes-df/biblatex-chicago-notes-df.tex
index 7c11e6be122..54511c9b28d 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago-notes-df/biblatex-chicago-notes-df.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago-notes-df/biblatex-chicago-notes-df.tex
@@ -56,7 +56,7 @@
   Style files for biblatex
 
 \vspace{.3\baselineskip}
-\sffamily\normalsize\bfseries David Fussner\qquad Version 0.9 (beta) \\
+\sffamily\normalsize\bfseries David Fussner\qquad Version 0.9a (beta) \\
 \href{mailto:djf027@googlemail.com}{djf027@googlemail.com}\\ \today
 
 \end{center} 
@@ -3856,7 +3856,12 @@ like eventually to bring them more into line with the current state of
 \section{Revision History}
 \label{sec:history}
 
-\textbf{0.9: Released \today}
+\textbf{0.9a: Released \today}
+\begin{itemize}
+\item Quick fixes for compatibility with \textsf{biblatex} 0.9a.
+\end{itemize}
+
+\textbf{0.9: Released March 18, 2010}
 
 \mylittlespace \label{deprec:obsol} Obsolete and Deprecated Features:
 \begin{itemize}
@@ -3877,8 +3882,6 @@ like eventually to bring them more into line with the current state of
   search path, or at the very least excise the code I provided.
 \end{itemize}
 
-\enlargethispage{-\baselineskip}
-
 Other New Features:
 \begin{itemize}
 \item Added the files \textsf{cms-german.lbx} (with its clone
@@ -3940,8 +3943,6 @@ Other New Features:
   and what punctuation follows it.
 \end{itemize}
 
-\enlargethispage{-\baselineskip}
-
 \textbf{0.8.9b: Released September 9, 2009}
 \begin{itemize}
 \item Fixed a long-standing bug in formatting names in the
@@ -3974,6 +3975,8 @@ Other New Features:
   field if you would like to test this functionality.
 \end{itemize}
 
+\enlargethispage{-3\baselineskip}
+
 \textbf{0.8.9a: Released July 5, 2009}
 \begin{itemize}
 \item Slight changes for compatibility with \textsf{biblatex} 0.8e.
@@ -4088,8 +4091,6 @@ To Do:
     \textbf{userb} fields are also deprecated.
   \end{itemize}
 
-\enlargethispage{-3\baselineskip}
-
 Other New Features:
 
 \begin{itemize}
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago-notes-df/sample.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago-notes-df/sample.pdf
index b92bbdab3cc..93a2eee084a 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago-notes-df/sample.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago-notes-df/sample.pdf
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago-notes-df/biblatex-chicago.sty b/Master/texmf-dist/tex/latex/biblatex-chicago-notes-df/biblatex-chicago.sty
index b8815e74d23..0b0a3436f78 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago-notes-df/biblatex-chicago.sty
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago-notes-df/biblatex-chicago.sty
@@ -1,4 +1,4 @@
-% $Id: biblatex-chicago.sty,v 0.1.1.21 2010/03/18 15:41:29 dfussner Exp $
+% $Id: biblatex-chicago.sty,v 0.1.1.22 2010/03/20 14:37:12 dfussner Exp $
 
 % Copyright (c) 2009 David Fussner.  This package is
 % author-maintained.
@@ -13,7 +13,7 @@
 % but not limited to, the implied warranties of merchantability and
 % fitness for a particular purpose.
 
-\ProvidesPackage{biblatex-chicago}[2010/03/18 v.0.9 biblatex style]
+\ProvidesPackage{biblatex-chicago}[2010/03/20 v.0.9a biblatex style]
 
 \RequirePackage[style=chicago-notes-df]{biblatex}
 
@@ -25,7 +25,11 @@
   usecompiler=true,loccittracker=constrict}
 
 \DeclareOption{footmarkoff}{\global\toggletrue{cms@nomark}}
-\DeclareOption{natbib}{\blx@inputonce{bibnatex.def}{}{}{}{}{}}
+
+\@ifpackagelater{biblatex}{2010/02/15}% For 0.9a
+{\DeclareOption{natbib}{\blx@inputonce{blx-natbib.def}{}{}{}{}{}}}
+{\DeclareOption{natbib}{\blx@inputonce{bibnatex.def}{}{}{}{}{}}}
+
 
 \DeclareOption*{%
   \expandafter\ExecuteBibliographyOptions
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago-notes-df/chicago-notes-df.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago-notes-df/chicago-notes-df.cbx
index a0826a617e3..da983ffcf55 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago-notes-df/chicago-notes-df.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago-notes-df/chicago-notes-df.cbx
@@ -1,10 +1,10 @@
-% $Id: chicago-notes-df.cbx,v 0.9 2010/03/18 15:47:45 dfussner Exp $
+% $Id: chicago-notes-df.cbx,v 0.9.1.1 2010/03/20 14:37:40 dfussner Exp $
 % This is a biblatex citation style file, adapted from Lehman's
 % authortitle-cverb.cbx.  It is heavily modified, with the intention
 % of providing footnote citations and a bibliography formatted
 % according to the specifications of the Chicago Manual of Style.
 
-\ProvidesFile{chicago-notes-df.cbx}[2010/03/18 v0.9 biblatex citation style]
+\ProvidesFile{chicago-notes-df.cbx}[2010/03/20 v0.9a biblatex citation style]
 
 %%%% Biblatex initialization + Chicago options + Toggles %%%%
 
@@ -2416,11 +2416,18 @@
   \setunit*{\addcomma\addspace}%
   \usebibmacro{cwithafterword}}
 
-\newbibmacro*{in:}{%
+\@ifpackagelater{biblatex}{2010/02/15}% Quick fix for 0.9a. Modify.  
+{\renewbibmacro*{in:}{%
   \iftoggle{cms@origpublished}%
   {}
   {\bibstring{in}
-    \setunit{\addspace}}}
+    \setunit{\addspace}}}}
+{\newbibmacro*{in:}{%
+  \iftoggle{cms@origpublished}%
+  {}
+  {\bibstring{in}
+    \setunit{\addspace}}}}
+
 
 \newbibmacro*{alt-in:}{%
   \iffieldundef{booktitle}%