biblatex-chicago (15nov11)

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

7 files changed, 117 insertions, 89 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/README b/Master/texmf-dist/doc/latex/biblatex-chicago/README
index 4c51e349e5b..77c5c2354af 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/README
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/README
@@ -1,15 +1,15 @@
 IMPORTANT NOTE:
 
 This is the package formerly known as biblatex-chicago-notes-df.  It
-is intended for use only with the latest version of biblatex -- 1.6 is
+is intended for use only with the latest version of biblatex -- 1.7 is
 current.  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.6 beta is now
-required for the author-date style, and indeed for the notes &
-bibliography style if you choose to use Biber with it.
+date.  Most particularly please note that Biber 0.9.6 is now required
+for the author-date style, and indeed for the notes & bibliography
+style if you choose to use Biber with it.
 
-README (version 0.9.8c, 2011-10-12):
+README (version 0.9.8d, 2011-11-15):
 
 Biblatex-chicago contains two biblatex styles implementing the
 specifications of the Chicago Manual of Style, 15th edition.  (If you
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE b/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE
index 514663923c2..57a0235ddeb 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE
@@ -1,3 +1,18 @@
+Release notes for version 0.9.8d [2011-11-15]:
+
+ - Some minor fixes to both styles for compatibility with biblatex
+   1.7.
+
+ - Kenneth Pearce found an error in the formatting of BookInBook
+   titles in the author-date style's list of shorthands.  This should
+   work properly now.
+
+ - Jonathan Robinson spotted some inconsistencies in the way the notes
+   & bibliography style interacts with the hyperref package.
+   Following his suggestion, short notes now point to long notes when
+   the latter are available, but to bibliography entries instead when
+   you have given the "short" option to biblatex-chicago.
+
 Release notes for version 0.9.8c [2011-10-12]:
 
  - Emil Salim pointed out some rather basic errors in the presentation
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 6bfd1c91da0..90c4af1e1ef 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 3f00e78acbf..b5cbe1b1cf2 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.8c (beta) \\
+\sffamily\normalsize\bfseries David Fussner\qquad Version 0.9.8d (beta) \\
 \href{mailto:djf027@googlemail.com}{djf027@googlemail.com}\\ \today
 
 \end{center} 
@@ -134,7 +134,7 @@ release.
 
 \begin{itemize}{}{}
 \item Philipp Lehman's \textsf{biblatex} package, of course!  You
-  should use the latest version --- 1.6 at the time of writing --- as
+  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
@@ -159,15 +159,11 @@ release.
     following:
   \item \mycolor{\textsf{Biber}} --- the next-generation
     \textsc{Bib}\TeX\ replacement, called \textsf{Biber}, which is
-    available from SourceForge.  You need version 0.9.6 beta or higher
-    to work with \textsf{biblatex-chicago} and \textsf{biblatex} 1.6,
-    and it is required for users who are either using the author-date
-    style or processing a .bib file in Unicode.  The latest stable
-    release is 0.9.5, but it has bugs that make it tricky to use with
-    \textsf{biblatex-chicago}, so I recommend downloading the current
-    beta from your local
-    \href{http://www.mirrorservice.org/sites/download.sourceforge.net/pub/sourceforge/b/project/bi/biblatex-biber/biblatex-biber/development/binaries/}{SourceForge}
-    mirror.  See \textsf{cms-dates-sample.pdf} for more details.
+    available from SourceForge.  You need version 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
+    \textsf{cms-dates-sample.pdf} for more details.
   \end{itemize}
 \item The line:
   \begin{quote}
@@ -299,6 +295,8 @@ either expressed or implied, including, but not limited to, the
 implied warranties of merchantability and fitness for a particular
 purpose.
 
+\enlargethispage{-\baselineskip}
+
 \subsection{Acknowledgements}
 \label{sec:acknowl}
 
@@ -338,8 +336,6 @@ number of different kinds of source material, then your choice (or
 your publisher's choice) of the \emph{Manual} as a style guide seems
 set to be a happy one.
 
-%\enlargethispage{-\baselineskip}
-
 \mylittlespace These very strengths, however, also make the style
 difficult to use.  Admittedly, the \emph{Manual} does leave room for
 \enquote{inventive solutions} to particular problems (17.2), and it
@@ -575,14 +571,14 @@ of personal preference, you wish to keep the \textsf{title} in initial
 position, then you need to define the \textsf{author} using,
 effectively, anything at all, then set \texttt{useauthor=false} in the
 \textsf{options} field.  (The \cmd{isdot} macro in the \textsf{author}
-field no longer works on its own under \textsf{biblatex 1.6}, so you
-may need to change your .bib files when you upgrade.)  Note that if
-you choose to use the name of the newspaper as an author, then you'll
-need a \textsf{sortkey} field to ensure that the bibliography entry is
-alphabetized by \textsf{journaltitle} rather than by \textsf{title}.
-The provision of a \textsf{shortauthor} field is no longer necessary,
-as in its absence the package automatically takes it from
-\textsf{journaltitle}.  (See lakeforester:pushcarts.)
+field no longer works on its own under \textsf{biblatex 1.6} and
+later, so you may need to change your .bib files when you upgrade.)
+Note that if you choose to use the name of the newspaper as an author,
+then you'll need a \textsf{sortkey} field to ensure that the
+bibliography entry is alphabetized by \textsf{journaltitle} rather
+than by \textsf{title}.  The provision of a \textsf{shortauthor} field
+is no longer necessary, as in its absence the package automatically
+takes it from \textsf{journaltitle}.  (See lakeforester:pushcarts.)
 
 %\enlargethispage{-\baselineskip}
 
@@ -636,7 +632,7 @@ type would be the best place for it.  (8.196, 17.207; see
 bundy:macneil for an example of how this all might look in a .bib
 file.)
 
-% \enlargethispage{-\baselineskip}
+\enlargethispage{\baselineskip}
 
 \mylittlespace If you're still with me, allow me to recommend that you
 browse through \textsf{notes-test.bib} to get a feel for just how many
@@ -881,7 +877,7 @@ shortening citations of multiple pieces from the same
 \textsf{incollection} entries.  See \textbf{crossref}, below, for more
 details.
 
-% \enlargethispage{-\baselineskip}
+\enlargethispage{-\baselineskip}
 
 \mybigspace This \mymarginpar{\textbf{inreference}} entry type is
 aliased to \textsf{incollection} in the standard styles, but the
@@ -1032,7 +1028,7 @@ can disable it simply by not using a \textsf{crossref} or an
 recommend a way of keeping the individual letters from turning up in
 the bibliography, involving the use of the \textsf{keywords} field.
 
-% \enlargethispage{\baselineskip}
+\enlargethispage{\baselineskip}
 
 \mybigspace This \mymarginpar{\textbf{manual}} is the second of two
 traditional \textsc{Bib}\TeX\ entry types that the \emph{Manual}
@@ -1280,7 +1276,7 @@ title should go in \textsf{titleaddon}, not forgetting to begin that
 field with a lowercase letter so that capitalization will work out
 correctly.
 
-\enlargethispage{\baselineskip}
+%\enlargethispage{\baselineskip}
 
 \mybigspace The \mymarginpar{\textbf{patent}} \emph{Manual} is very
 brief on this subject (17.219), but very clear about which information
@@ -1407,9 +1403,9 @@ the title at the head of an entry, then you'll need to define
 \textsf{author} somehow and place \texttt{useauthor=false} in the
 \textsf{options} field (as in nyt:obittrevor, by contrast with
 nyt:trevorobit.  Please note that the \cmd{isdot} macro alone in the
-\textsf{author} field no longer works in \textsf{biblatex} 1.6, so you
-may need to check your .bib files when you upgrade.)  As in
-\textsf{misc} entries with an \textsf{entrysubtype}, words like
+\textsf{author} field no longer works in \textsf{biblatex} 1.6 and
+later, so you may need to check your .bib files when you upgrade.)  As
+in \textsf{misc} entries with an \textsf{entrysubtype}, words like
 \enquote{interview,} \enquote{review,} and \enquote{letter} only need
 capitalization after a full stop, i.e., ordinarily in a bibliography
 and not a note, so \textsf{biblatex-chicago-notes} automatically deals
@@ -2028,7 +2024,7 @@ performers.  To specify the role, use the fields \textsf{editoratype},
 \textsf{editorbtype}, and \textsf{editorctype}, which see.  (Cf.\
 bernstein:shostakovich, handel:messiah.)
 
-\enlargethispage{-\baselineskip}
+%\enlargethispage{-\baselineskip}
 
 \mybigspace Normally, \mymarginpar{\textbf{editortype}} with the
 exception of the \textsf{article} and \textsf{review} types,
@@ -2379,7 +2375,7 @@ multi-volume work, e.g., \enquote{Opera} or \enquote{Collected Works.}
 (See donne:var, euripides:orestes, harley:cartography, lach:asia,
 pelikan:chris\-tian, and plato:republic:gr.)
 
-\enlargethispage{\baselineskip}
+%\enlargethispage{\baselineskip}
 
 \mybigspace An \mymarginpar{\textbf{maintitleaddon}} annex to the
 \textsf{maintitle}, for which see previous entry.  Such an annex would
@@ -2899,14 +2895,14 @@ jackson:paulina:letter, white:ross:memo, white:russ.)  Some
 special attention.  (See creel:house, where the full \textsf{title} is
 used as the \textsf{shortauthor} + \textsf{shorttitle} by using
 \cmd{headlesscite} commands.  Placing \cmd{isdot} into the
-\textsf{shortauthor} field no longer works in \textsf{biblatex} 1.6,
-so be sure to check your .bib files when you upgrade.)  Remember,
-also, that the generic titles in \textsf{review} and \textsf{misc}
-entries may not want capitalization in all contexts, so, as with the
-\textsf{title} field, if you begin a \textsf{shorttitle} with a
-lowercase letter the style will do the right thing (barcott:review,
-bundy:macneil, Clemens:letter, kozinn:review, ratliff:review,
-unsigned:ranke).
+\textsf{shortauthor} field no longer works in \textsf{biblatex} 1.6
+and later, so be sure to check your .bib files when you upgrade.)
+Remember, also, that the generic titles in \textsf{review} and
+\textsf{misc} entries may not want capitalization in all contexts, so,
+as with the \textsf{title} field, if you begin a \textsf{shorttitle}
+with a lowercase letter the style will do the right thing
+(barcott:review, bundy:macneil, Clemens:letter, kozinn:review,
+ratliff:review, unsigned:ranke).
 
 %\enlargethispage{\baselineskip}
 
@@ -3773,11 +3769,11 @@ following the specification (16.47).
 of names printed in the bibliography when that number exceeds 10.
 These numbers follow the recommendations of the \emph{Manual}
 (17.29--30), and they are different from those for use in notes.  With
-\textsf{biblatex} 1.6 you can no longer redefine \texttt{maxnames} and
-\texttt{minnames} in the \cmd{printbibliography} command at the bottom
-of your document, so \textsf{biblatex-chicago} now does this
-automatically for you, though of course you can change them in your
-document preamble.
+\textsf{biblatex} 1.6 and later you can no longer redefine
+\texttt{maxnames} and \texttt{minnames} in the \cmd{printbibliography}
+command at the bottom of your document, so \textsf{biblatex-chicago}
+now does this automatically for you, though of course you can change
+them in your document preamble.
 
 \mylittlespace This \mymarginpar{\texttt{pagetracker=\\true}} enables
 page tracking for the \cmd{iffirstonpage} and \cmd{ifsamepage}
@@ -5369,8 +5365,8 @@ provided a \textsf{shorthand} field, which by default in
 With this release, you can expand the abbreviation inside the list of
 references itself, as suggested by the \emph{Manual}, (17.47).  Please
 see \textsf{customc} above and \textsf{shorthands} below for the
-details.  (You can also still utilize the list of shorthands to
-clarify the abbreviation, if you wish.)
+details.  (A list of shorthands can still clarify the abbreviation, if
+you wish.)
 
 \mybigspace In \mymarginpar{\textbf{authortype}}
 \textsf{biblatex-chicago}, this field serves a function very much in
@@ -5394,7 +5390,7 @@ the brackets.  Assuming the strings are correct,
 in the short note form.  (See the \textsf{author} docs just above.
 Also \emph{Manual} 17.33--34; cook:sotweed, horsley:prosodies.)
 
-\enlargethispage{-\baselineskip}
+%\enlargethispage{-\baselineskip}
 
 \mybigspace For \mymarginpar{\textbf{bookauthor}} the most part, as in
 \textsf{biblatex}, a \textsf{bookauthor} is the author of a
@@ -5448,7 +5444,7 @@ cross-referencing apparatus (prairie:state), which I discuss below
 (\textbf{crossref}).  The \textsf{booktitle} takes sentence-style
 capitalization in author-date.
 
-\enlargethispage{\baselineskip}
+%\enlargethispage{\baselineskip}
 
 \mybigspace An \mymarginpar{\textbf{booktitleaddon}} annex to the
 \textsf{booktitle}.  It will be printed in the main text font, without
@@ -6561,7 +6557,7 @@ be \enquote{Orig.\ pub.\ in.}  Please see the documentation on
 \textsf{userf} below for all the details on how to create .bib entries
 for presenting your data.
 
-\enlargethispage{\baselineskip}
+\enlargethispage{-\baselineskip}
 
 \mybigspace A \mymarginpar{\textbf{series}} standard \textsf{biblatex}
 field, usually just a number in an \textsf{article},
@@ -7440,7 +7436,7 @@ tells \textsf{biblatex} to provide the special \textsf{labelyear} and
 of names printed in the list of references when that number exceeds
 10.  These numbers follow the recommendations of the \emph{Manual}
 (17.29--30), and they are different from those for use in citations.
-With \textsf{biblatex} 1.6 you can no longer redefine
+With \textsf{biblatex} 1.6 and later you can no longer redefine
 \texttt{maxnames} and \texttt{minnames} in the \cmd{printbibliography}
 command at the bottom of your document, so \textsf{biblatex-chicago}
 now does this automatically for you, though of course you can change
@@ -7840,19 +7836,15 @@ suggestions on this score are, of course, welcome.
 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 required features.
-Unfortunately, however, the current release of \textsf{Biber} (0.9.5)
-contains bugs that make it tricky to use with
-\textsf{biblatex-chicago}.  These bugs have been addressed in 0.9.6
-beta, which is available for various operating systems in the
-\texttt{development} subdirectory of your SourceForge mirror, e.g.,
-\href{http://www.mirrorservice.org/sites/download.sourceforge.net/pub/sourceforge/b/project/bi/biblatex-biber/biblatex-biber/development/binaries/}{UK
-  mirror}.  (If, by the time you read this, \textsf{Biber} 0.9.6 has
-already been released, then so much the better.)  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 required features.  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 0.9.6, so I recommend you upgrade to it and to
+the latest \textsf{biblatex} (1.7), which are designed to work
+together.  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.
 
 \mylittlespace If your .bib file contains a large number of entries
 with more than three authors, then you may run into some limitations
@@ -8213,11 +8205,14 @@ misguided, please let me know.
 
 \mylittlespace Kenneth L. Pearce has reported a bug that appears when
 using multiple citation commands inside the \textsf{annotation} field
-of annotated bibliographies.  As late as I am with the compatibility
-fixes for \textsf{biblatex} 1.6, I shall attempt to address this in a
-future release.  If you run into this problem, he suggests placing all
-the citations together in parentheses at the end of the annotation,
-though on my machine this doesn't always work too well, either.
+of annotated bibliographies.  As late as I am with the update to the
+16th edition of the \emph{Manual}, I shall attempt to address this in
+a future release.  If you run into this problem, he suggests placing
+all the citations together in parentheses at the end of the
+annotation, though on my machine this doesn't always work too well,
+either.
+
+\enlargethispage{\baselineskip}
 
 \mylittlespace Version 1.5 of \textsf{biblatex} revised the way the
 package deals with breaking long URLs and DOIs across lines.  The new
@@ -8230,9 +8225,11 @@ done by copying and pasting the old definition of the
 \cmd{biburlsetup} command into your document preamble.  If you look in
 the preambles of \textsf{cms-notes-sample.tex} or
 \textsf{cms-dates-sample.tex}, you can see the redefinition and copy
-it from there, just to see whether it helps your situation.  If it
-would be generally useful, I could also easily turn it into a package
-option.  Feedback welcome.
+it from there, just to see whether it helps your situation.
+\textsf{Biblatex} 1.7 also now provides several new counters for
+tuning the formatting of URLs, and these may serve you better than the
+old code.  I have tested them in \textsf{cms-dates-sample.tex} and
+they work well.  Cf.\ \textsf{biblatex.pdf}, §~4.10.3.
 
 \mylittlespace The switch to \textsf{Biber} for the author-date
 specification means that \textsf{biblatex} now provides considerably
@@ -8284,7 +8281,23 @@ thought I should warn you in advance.
 \section{Revision History}
 \label{sec:history}
 
-\textbf{0.9.8c: Released \today}
+\textbf{0.9.8d: Released \today}
+\begin{itemize}
+\item Some minor fixes to both styles for compatibility with
+  \textsf{biblatex} 1.7.
+\item Kenneth Pearce found an error in the formatting of
+  \textsf{bookinbook} titles in the author-date style's list of
+  shorthands.  This should work properly now.
+\item Jonathan Robinson spotted some inconsistencies in the way the
+  notes \&\ bibliography style interacts with the \textsf{hyperref}
+  package.  Following his suggestion, short notes now point to long
+  notes when the latter are available, but to bibliography entries
+  instead when you have set the \texttt{short} option.
+\end{itemize}
+
+\enlargethispage{\baselineskip}
+
+\textbf{0.9.8c: Released October 12, 2011}
 \begin{itemize}
 \item Emil Salim pointed out some rather basic errors in the
   presentation of \textsf{inproceedings} and \textsf{proceedings}
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 d17e40dbe6c..4cf265d9213 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 1daba713024..ed175a3e1ef 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
@@ -45,6 +45,9 @@ bibencoding=latin1,strict]{biblatex-chicago}
 \setlength{\dimen\footins}{9.5in}
 \setlength{\parindent}{0pt}
 \setlength{\parskip}{5pt}
+\setcounter{biburlnumpenalty}{9000}
+\setcounter{biburlucpenalty}{9000}
+\setcounter{biburllcpenalty}{9000}
 \newcommand{\cmd}[1]{\texttt{\textbackslash #1}}
 \usepackage[colorlinks,urlcolor=blue,citecolor=black,
 plainpages=false,breaklinks=true]{hyperref}
@@ -61,19 +64,16 @@ 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.
-Unfortunately, however, the current release of \textsf{Biber} (0.9.5)
-contains bugs that make it tricky to use with
-\textsf{biblatex-chicago}.  These bugs have been addressed in 0.9.6
-beta, which is available for various operating systems in the
-\texttt{development} subdirectory of your SourceForge mirror, e.g.,
-\href{http://www.mirrorservice.org/sites/download.sourceforge.net/pub/sourceforge/b/project/bi/biblatex-biber/biblatex-biber/development/binaries/}{UK
-  mirror}.  (If, by the time you read this, \textsf{Biber} 0.9.6 has
-already been released, then so much the better.)  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.  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 version 0.9.6, now current, so I highly
+recommend that you upgrade to it 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.
 
 \subsection*{Usage}
 \label{usage}
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 ec94d7fc75e..717fdc5057f 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