biblatex-chicago (30jul12)

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

15 files changed, 111 insertions, 59 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/README b/Master/texmf-dist/doc/latex/biblatex-chicago/README
index c964fb09b9e..455231567f7 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/README
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/README
@@ -1,17 +1,17 @@
 IMPORTANT NOTE:
 
 This is the package formerly known as biblatex-chicago-notes-df.  It
-is intended for use only with version 1.7 of biblatex, and hasn't been
-tested with version 2.0, now in beta.  It contains, for the first
-time, both the 15th- and 16th-edition Chicago style files.  If you
-have used the package before, then you should be sure to consult the
-RELEASE file to find out what alterations you may need to make to your
-.bib files and document preambles to bring them up to date.  Most
-particularly please note that Biber 0.9.8 or 0.9.9 is now required for
-the author-date style, and indeed for the notes & bibliography style
-if you choose to use Biber with it.
+has now been upgraded to work with version 2.0 of biblatex, which has
+recently been released.  It contains, for the first time, both the
+15th- and 16th-edition Chicago style files.  If you have used the
+package before, then you should be sure to consult the RELEASE file to
+find out what alterations you may need to make to your .bib files and
+document preambles to bring them up to date.  Most particularly please
+note that Biber is now required for the author-date style (version 1.0
+if you are using the latest biblatex, 0.9.8 or 0.9.9 if you are still
+using biblatex 1.7).
 
-README (version 0.9.9, 2012-07-05):
+README (version 0.9.9a, 2012-07-30):
 
 Biblatex-chicago contains four biblatex styles implementing the
 specifications of the Chicago Manual of Style in both its 15th and
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE b/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE
index 353550ed501..d31c2cf1770 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE
@@ -1,3 +1,12 @@
+Release notes for version 0.9.9a [2012-07-30]:
+
+ - I have made a few changes to biblatex-chicago.sty to allow the
+   package to work with the latest version (2.0) of biblatex.  In all
+   other respects this release is identical to 0.9.9.  If you do use
+   the package with biblatex 2.0, please let me know if there are
+   issues I need to address.  Thanks to Charles Schaum for alerting me
+   to some of them.
+
 Release notes for version 0.9.9 [2012-07-05]:
 
 This release contains, for the first time, the style files for the
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf
index 627a7a76963..aa0e0f063a9 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex
index 26cf64ae13d..6220ad7ef71 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex
@@ -56,7 +56,7 @@
   Style files for biblatex
 
 \vspace{.3\baselineskip}
-\sffamily\normalsize\bfseries David Fussner\qquad Version 0.9.9 (beta) \\
+\sffamily\normalsize\bfseries David Fussner\qquad Version 0.9.9a (beta) \\
 \href{mailto:djf027@googlemail.com}{djf027@googlemail.com}\\ \today
 
 \end{center} 
@@ -140,11 +140,12 @@ release.
 
 \begin{itemize}{}{}
 \item Philipp Lehman's \textsf{biblatex} package, of course!  You
-  should use the latest version --- 1.7 at the time of writing --- as
-  that version has been tested more thoroughly than any other, meaning
-  that these style files may well not function properly with some
-  earlier iterations of \textsf{biblatex}. Lehman's tools require
-  several packages, and he strongly recommends several more:
+  should use the latest version(s) --- 1.7 or 2.0 at the time of
+  writing --- as those versions have been tested more thoroughly than
+  any other, meaning that these style files may well not function
+  properly with some earlier iterations of \textsf{biblatex}. Lehman's
+  tools require several packages, and he strongly recommends several
+  more:
   \begin{itemize}{}{}
   \item e-\TeX\ (required)
   \item \textsf{etoolbox} --- available from CTAN (required)
@@ -166,10 +167,11 @@ release.
   \item \mycolor{\textsf{Biber}} --- the next-generation
     \textsc{Bib}\TeX\ replacement, called \textsf{Biber}, which is
     available from SourceForge.  You should use the latest version,
-    0.9.8, to work with \textsf{biblatex-chicago} and
-    \textsf{biblatex} 1.7, and it is required for users who are either
-    using the author-date style or processing a .bib file in Unicode.
-    See \textsf{cms-dates-sample.pdf} for more details.
+    1.0, to work with \textsf{biblatex-chicago} and \textsf{biblatex}
+    2.0, or 0.9.9 with \textsf{biblatex} 1.7, and it is required for
+    users who are either using the author-date style or processing a
+    .bib file in Unicode.  See \textsf{cms-dates-sample.pdf} for more
+    details.
   \end{itemize}
 \item The line:
   \begin{quote}
@@ -9381,7 +9383,17 @@ code for it, let me know, and I'll look into it.
 \section{Revision History}
 \label{sec:history}
 
-\textbf{0.9.9: Released \today}
+\textbf{0.9.9a: Released \today}
+\begin{itemize}
+\item I have made a few changes to \textsf{biblatex-chicago.sty} to
+  allow the package to work with the latest version (2.0) of
+  \textsf{biblatex}.  In all other respects this release is identical
+  to 0.9.9.  If you do use the package with \textsf{biblatex} 2.0,
+  please let me know if there are issues I need to address.  Thanks to
+  Charles Schaum for alerting me to some of them.
+\end{itemize}
+
+\textbf{0.9.9: Released July 5, 2012}
 
 \mylittlespace \label{deprec:obsol} Converting 15th-Edition .bib Files
 to Use the 16th Edition:
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.pdf
index de55d357364..0c1af80fdfd 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.tex
index 6e207800a17..7cf79353965 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.tex
@@ -56,7 +56,7 @@
   15th-edition style files for biblatex
 
 \vspace{.3\baselineskip}
-\sffamily\normalsize\bfseries David Fussner\qquad Version 0.9.9 (beta) \\
+\sffamily\normalsize\bfseries David Fussner\qquad Version 0.9.9a (beta) \\
 \href{mailto:djf027@googlemail.com}{djf027@googlemail.com}\\ \today
 
 \end{center} 
@@ -144,8 +144,8 @@ release.
 
 \begin{itemize}{}{}
 \item Philipp Lehman's \textsf{biblatex} package, of course!  You
-  should use the latest version --- 1.7 at the time of writing --- as
-  that version has been tested more thoroughly than any other, meaning
+  should use the latest version(s) --- 1.7 or 2.0 --- as those
+  versions have been tested more thoroughly than any other, meaning
   that these style files may well not function properly with some
   earlier iterations of \textsf{biblatex}. Lehman's tools require
   several packages, and he strongly recommends several more:
@@ -169,10 +169,10 @@ release.
     following:
   \item \textsf{Biber} --- the next-generation \textsc{Bib}\TeX\
     replacement, called \textsf{Biber}, which is available from
-    SourceForge.  You need version at least 0.9.6 to work with
-    \textsf{biblatex-chicago} and \textsf{biblatex} 1.7, and it is
-    required for users who are either using the author-date style or
-    processing a .bib file in Unicode.  See
+    SourceForge.  You should use the latest version, 1.0, to work with
+    \textsf{biblatex} 2.0, or 0.9.9 with \textsf{biblatex} 1.7, and it
+    is required for users who are either using the author-date style
+    or processing a .bib file in Unicode.  See
     \textsf{cms-dates-sample.pdf} for more details.
   \end{itemize}
 \item The line:
@@ -8544,7 +8544,17 @@ code for it, let me know, and I'll look into it.
 \section{Revision History}
 \label{sec:history}
 
-\textbf{0.9.9: Released \today}
+\textbf{0.9.9a: Released \today}
+\begin{itemize}
+\item I have made a few changes to \textsf{biblatex-chicago.sty} to
+  allow the package to work with the latest version (2.0) of
+  \textsf{biblatex}.  In all other respects this release is identical
+  to 0.9.9.  If you do use the package with \textsf{biblatex} 2.0,
+  please let me know if there are issues I need to address.  Thanks to
+  Charles Schaum for alerting me to some of them.
+\end{itemize}
+
+\textbf{0.9.9: Released July 5, 2012}
 
 \mylittlespace \label{deprec:obsol} This release, for the first time,
 provides style files implementing the specifications of the 16th
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.pdf
index 4aaa02fed54..bd42b0c9669 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.tex
index 8f195b73ce2..cf2189a331a 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.tex
@@ -66,16 +66,17 @@ plainpages=false,breaklinks=true]{hyperref}
 Starting with \textsf{biblatex} version 1.5, in order to adhere to the
 author-date specification you will need to use \textsf{Biber} to
 process your .bib files, as \textsc{Bib}\TeX\ (and its more recent
-variants) will no longer provide all the features you need.  The
-previous release of \textsf{Biber} (0.9.5), however, contained bugs
-that made it tricky to use with \textsf{biblatex-chicago}.  These bugs
-have been addressed in more recent versions, so I highly recommend
-that you upgrade to (at least) 0.9.8 and to \textsf{biblatex} 1.7,
-which are intended to work together.  The advice that follows in this
-document assumes that you are using \textsf{Biber}; if you wish to
-continue using \textsc{Bib}\TeX\ then you need \textsf{biblatex}
-version 1.4c and, if you have any problems with the current release,
-possibly \textsf{biblatex-chicago} 0.9.7a.
+variants) will no longer provide all the features you need.  I highly
+recommend, therefore, that you upgrade either to \textsf{Biber} 0.9.9
+and to \textsf{biblatex} 1.7, which are designed to work together, or
+to \textsf{Biber} 1.0 and \textsf{biblatex} 2.0, which latter two are
+the newest releases and are likewise designed to work as a matched
+pair.  The advice that follows in this document assumes that you are
+using \textsf{Biber}; if you wish to continue using \textsc{Bib}\TeX\
+then you need \textsf{biblatex} version 1.4c and
+\textsf{biblatex-chicago} 0.9.7a.  (Please contact me at the email
+address in \textsf{biblatex-chicago.pdf} if you have any difficulty
+obtaining a copy of this earlier release.)
 
 \subsection*{Editions}
 \label{editions}
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdf
index fad992151b1..0fc044156fe 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.pdf
index 32c2f0d283f..0d78264d6d2 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.tex
index 53b48e2292e..c78a1fdf7b5 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.tex
@@ -64,16 +64,15 @@ plainpages=false,breaklinks=true]{hyperref}
 Starting with \textsf{biblatex} version 1.5, in order to adhere to the
 author-date specification you will need to use \textsf{Biber} to
 process your .bib files, as \textsc{Bib}\TeX\ (and its more recent
-variants) will no longer provide all the features you need.  The
-previous release of \textsf{Biber} (0.9.5), however, contained bugs
-that made it tricky to use with \textsf{biblatex-chicago}.  These bugs
-have been addressed in more recent versions, so I highly recommend
-that you upgrade to (at least) 0.9.8 and to \textsf{biblatex} 1.7,
-which are intended to work together.  The advice that follows in this
-document assumes that you are using \textsf{Biber}; if you wish to
-continue using \textsc{Bib}\TeX\ then you need \textsf{biblatex}
-version 1.4c and, if you have any problems with the current release,
-possibly \textsf{biblatex-chicago} 0.9.7a.
+variants) will no longer provide all the features you need.  I highly
+recommend, therefore, that you upgrade either to \textsf{Biber} 0.9.9
+and to \textsf{biblatex} 1.7, which are designed to work together, or
+to \textsf{Biber} 1.0 and \textsf{biblatex} 2.0, which latter two are
+the newest releases and are likewise designed to work as a matched
+pair.  The advice that follows in this document assumes that you are
+using \textsf{Biber}; if you wish to continue using \textsc{Bib}\TeX\
+then you need \textsf{biblatex} version 1.4c and
+\textsf{biblatex-chicago} 0.9.7a.
 
 \subsection*{Usage}
 \label{usage}
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-notes-sample.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-notes-sample.pdf
index 56ac29a0756..be407912878 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-notes-sample.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-notes-sample.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib b/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib
index edd23e62354..46f6f7867dd 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib
@@ -458,7 +458,8 @@
   year = 	 1978,
   issue = 	 {Summer},
   volume = 	 61,
-  pages = 	 {300--318; 62 (Autumn): 41\bibrangedash 56},
+  pages = 	 {300--318\addsemicolon\space 62 (Autumn):
+                  41\bibrangedash 56},
   editor = 	 {Brown, George~C.},
   annotation = 	 {An unusual Article entry, combining into one
                   reference a two-part article using both the
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/notes-test.bib b/Master/texmf-dist/doc/latex/biblatex-chicago/notes-test.bib
index 0c48760f315..120ad5b3b11 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/notes-test.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/notes-test.bib
@@ -347,7 +347,8 @@
   year = 	 1978,
   issue = 	 {Summer},
   volume = 	 61,
-  pages = 	 {300--318; 62 (Autumn 1978): 41\bibrangedash 56},
+  pages = 	 {300--318\addsemicolon\space 62 (Autumn 1978):
+                  41\bibrangedash 56},
   editor = 	 {Brown, George~C.},
   annote = 	 {An unusual Article entry, combining into one
                   reference a two-part article using both the
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty b/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty
index dd20e8fc81e..709bd122d7a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty
@@ -1,4 +1,4 @@
-% $Id: biblatex-chicago.sty,v 0.1.1.41 2012/07/05 11:10:02 dfussner Exp $
+% $Id: biblatex-chicago.sty,v 0.1.1.43 2012/07/26 13:21:52 dfussner Exp $
 
 % Copyright (c) 2009-2012 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}[2012/07/05 v 1.7 biblatex style]
+\ProvidesPackage{biblatex-chicago}[2012/07/26 v 2.0 biblatex style]
 
 \RequirePackage{etoolbox}
 
@@ -32,6 +32,18 @@
 \DeclareOption{natbib}{%
   \PassOptionsToPackage{natbib}{biblatex}}
 
+\DeclareOption{backend=biber}{%
+  \PassOptionsToPackage{\CurrentOption}{biblatex}}%
+
+\DeclareOption{backend=bibtex}{%
+  \PassOptionsToPackage{\CurrentOption}{biblatex}}%
+
+\DeclareOption{backend=bibtex8}{%
+  \PassOptionsToPackage{\CurrentOption}{biblatex}}%
+
+\DeclareOption{backend=bibtexu}{%
+  \PassOptionsToPackage{\CurrentOption}{biblatex}}%
+
 \ProcessOptions*
 
 \def\cms@authordate{%
@@ -112,11 +124,18 @@
 \DeclareLanguageMapping{french}{cms-french}
 \DeclareLanguageMapping{ngerman}{cms-ngerman}
 
-\def\cms@choose{%
-  \ifnum\blx@backend=\blx@backend@biber
-  cms%
-  \else
-  nty%
-  \fi}
+\@ifpackagelater{biblatex}{2012/06/30}
+{\def\cms@choose{%
+    \ifblx@load@version@one
+    nty%
+    \else
+    cms%
+    \fi}}
+{\def\cms@choose{%
+    \ifnum\blx@backend=\blx@backend@biber
+    cms%
+    \else
+    nty%
+    \fi}}
 
 \endinput