biblatex-chicago (16feb11)

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

20 files changed, 4363 insertions, 1433 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/README b/Master/texmf-dist/doc/latex/biblatex-chicago/README
index 41f15a9331c..5bcc4ae6ead 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/README
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/README
@@ -1,37 +1,39 @@
 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 -- you
-need at least version 0.9c, though 0.9d is current.  If you have been
-using biblatex-chicago-notes-df, 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.
+is intended for use only with the latest version of biblatex -- 1.2a
+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.
 
-README (version 0.9.5a):
+README (version 0.9.7, 2011-02-15):
 
 Biblatex-chicago contains two biblatex styles implementing the
-specifications of the Chicago Manual of Style, 15th edition.  The
-"notes & bibliography" style was formerly available in the package
+specifications of the Chicago Manual of Style, 15th edition.  (If you
+are interested in adopting the changes introduced in the 16th edition,
+published last fall, then please note that the next release of
+biblatex-chicago will provide what you need.)  The "notes &
+bibliography" style was formerly available in the package
 biblatex-chicago-notes-df, and is intended primarily for writers in
-the humanities.  The "author-date" style is new to this release, and
-is generally favored by writers in the sciences and social sciences.
+the humanities, whereas the "author-date" style is generally favored
+by writers in the sciences and social sciences.
 
 This is a beta release, but its feature set is already fairly
-extensive.  If you have used the package before under its old name you
-may, after perusing the RELEASE file, want to look at the changelog at
-the end of biblatex-chicago.pdf, which contains cross-references to
-more detailed explanations about how this update will affect parts of
-your .bib file.  If you are just getting started, the best way to
-learn the system is to read the documentation in that same pdf file,
-which contains both a Quickstart section and a complete reference
-guide to both styles (sections 4 and 5).  The package also contains
-annotated .bib files (notes-test.bib and dates-test.bib) which each
-offer over 100 entries demonstrating how to present a wide range of
-sources, nearly all of them taken from the Chicago Manual of Style
-itself, so that you can compare the output of your system
-(cms-notes-sample.tex, cms-dates-sample.tex) or my system
-(cms-notes-sample.pdf, cms-dates-sample.pdf) with the actual examples
-in the Manual.
+extensive.  If you have used the package before you may, after
+perusing the RELEASE file, want to look at the changelog at the end of
+biblatex-chicago.pdf, which contains cross-references to more detailed
+explanations about how this update will affect parts of your .bib
+file.  If you are just getting started, the best way to learn the
+system is to read the documentation in that same pdf file, which
+contains both a Quickstart section and a complete reference guide to
+both styles (sections 4 and 5).  The package also contains annotated
+.bib files (notes-test.bib and dates-test.bib) which each offer over
+100 entries demonstrating how to present a wide range of sources,
+nearly all of them taken from the Chicago Manual of Style itself, so
+that you can compare the output of your system (cms-notes-sample.tex,
+cms-dates-sample.tex) or my system (cms-notes-sample.pdf,
+cms-dates-sample.pdf) with the actual examples in the Manual.
 
 I have, wherever possible, attempted to maintain backward
 compatibility with the standard biblatex styles, but there are a
@@ -53,18 +55,22 @@ biblatex-chicago.pdf.
 
 Installation:
 
-If you wish to place these files in your TeX directory tree instead of
-in your working directory, I recommend the following for the moment,
-an arrangement which at least has the virtue of minimizing the
-footprint of the package in the main tree, allowing for easier
-updating:
+With the recent proliferation of files, I have thought it best to
+implement, with this release, a different directory structure for the
+package archive.  I have adopted the structure found in biblatex.zip,
+so if you want to place these files in your TeX directory tree instead
+of in your working directory, I recommend the following, which should
+be familiar from the main biblatex package:
 
  - The nine files biblatex-chicago.sty, chicago-notes.cbx,
    chicago-notes.bbx, chicago-authordate.cbx, chicago-authordate.bbx,
-   cms-american.lbx, cms-french.lbx, cms-german.lbx, and cms-ngerman.lbx
-   can go in <TEXMFLOCAL>/tex/latex/biblatex-contrib/biblatex-chicago,
-   where <TEXMFLOCAL> is the root of your local TeX installation --
-   for example, and depending on your system, /usr/share/texmf-local,
+   cms-american.lbx, cms-french.lbx, cms-german.lbx, and
+   cms-ngerman.lbx are located in the latex/ subdirectory, itself
+   further subdivided into bbx/, cbx/, and lbx/.  The entire contents
+   of this latex/ directory, including its subdirectories, can go in
+   <TEXMFLOCAL>/tex/latex/biblatex-contrib/biblatex-chicago, where
+   <TEXMFLOCAL> is the root of your local TeX installation -- for
+   example, and depending on your system, /usr/share/texmf-local,
    /usr/local/texmf, or C:\Local TeX Files\.  You may need to create
    this directory first, and after copying the files there please
    remember to update your TeX file name database so that TeX can find
@@ -72,7 +78,9 @@ updating:
 
  - The eight files biblatex-chicago.tex, biblatex-chicago.pdf,
    cms-notes-sample.tex, cms-dates-sample.tex, cms-notes-sample.pdf,
-   cms-dates.sample.pdf, notes-test.bib, and dates-test.bib can go in
+   cms-dates.sample.pdf, notes-test.bib, and dates-test.bib can all be
+   found in the doc/ directory in the package archive, the last 6 in
+   the examples/ subdirectory.  You can place all of this in
    <TEXMFLOCAL>/doc/latex/biblatex-contrib/biblatex-chicago.
 
 
@@ -80,7 +88,7 @@ Changelog: See the RELEASE file, and also the end of
 biblatex-chicago.pdf.
 
 
-Copyright (c) 2008-2010 David Fussner.  This package is
+Copyright (c) 2008-2011 David Fussner.  This package is
 author-maintained.  This work may be copied, distributed and/or
 modified under the conditions of the LaTeX Project Public License,
 either version 1.3 of this license or (at your option) any later
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE b/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE
index 0c781b010d0..92aaa01afef 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE
@@ -1,3 +1,82 @@
+Release notes for version 0.9.7 [2011-02-15]:
+
+ - The CustomA and CustomB entry types are now obsolete.  Any such
+   entry in your .bib files will be ignored.  Please use Letter and
+   BookInBook, respectively.
+
+ - If you still have any CustomC entries containing introductions,
+   afterwords, or the like, please change them to SuppBook, as I have
+   reclaimed CustomC in order to provide alphabetized cross-references
+   to other, separate entries in a bibliography or list of references.
+
+ - The directory structure of the package archive has changed.  I've
+   copied that used by the biblatex package, so now you will find a
+   latex/ directory with further bbx/, cbx/, and lbx/ subdirectories,
+   and a doc/ directory with an examples/ subdirectory.  The files are
+   the same as in the previous release, merely organized differently.
+
+Other changes in 0.9.7:
+
+ - I have added three new audiovisual entry types to both styles,
+   Audio, Music, and Video.  The documentation of Audio in sections
+   4.1 and 5.1 of biblatex-chicago.pdf contains an overview of the
+   three, and the details for each type are to be found under their
+   individual headings.
+
+ - I have added several new bibstrings to the cms-*.lbx files for
+   these new audiovisual entry types.  This means that the
+   "editortype" fields can now be set to "director," "producer," or
+   "conductor," depending on your needs.  You can also set the fields
+   to "none," which eliminates all identifying strings, and which is
+   useful for identifying performers of various sorts.
+
+ - I have transformed the CustomC entry type to enable alphabetized
+   cross-references -- the "c" is meant to be mnemonic -- to other,
+   separate entries in a reference list or bibliography.  In
+   particular, this facilitates cross-references to other names in a
+   list, rather than to other works.  In author-date, in a procedure
+   recommended by the Manual, this now allows you to expand shorthands
+   inside the reference list rather than in a list of shorthands.  In
+   both styles, you can now provide a pointer to the main entry if a
+   reader is looking an author up under, e.g., a pseudonym or other
+   alternative name.
+
+ - I have introduced the "userc" field, intended to simplify the
+   printing of the cross-references provided by CustomC entries.  The
+   standard \nocite command works as well, but the additional
+   mechanism may be more convenient in some circumstances.
+
+ - You can now provide an "eventdate" field in Music entries to
+   identify, e.g., a particular recording session.  It will be printed
+   just after the "title."
+
+ - In the notes & bibliography style, I have now implemented the
+   "shorthandintro" field, which allows you to change the string
+   introducing a shorthand in the first, long note.  It works just as
+   it does in the standard biblatex styles.
+
+ - I have added six new field-exclusion options to both styles, all of
+   which can be set both in the document preamble and/or in the
+   "options" field of individual .bib entries.  Three of these --
+   "doi," "isbn," and "url" -- are standard biblatex options, the
+   others -- "bookpages," "includeall," and "numbermonth" -- are
+   chicago-specific.
+
+ - I've added the "juniorcomma" option to both styles, which can be
+   set in the document preamble and/or in the "options" field of
+   individual entries.  It allows you get the traditional comma
+   between a surname and "Jr." or "Sr."
+
+ - I fixed some old inaccuracies in the syntax of shortened notes and
+   bibliography entries presenting multiple contributions to one
+   multi-author (or single-author) volume.  For the most part the
+   changes won't affect your .bib files, but there may be cases where
+   you need to choose your entry types carefully in order to get the
+   results you want.  For the details, please consult the "crossref"
+   docs in section 4.2 of biblatex-chicago.pdf.
+
+ - Several other bug fixes -- see biblatex-chicago.pdf for details.
+
 Release notes for version 0.9.5a [2010-09-07]:
 
  - This fixes an elementary and show-stopping mistake in
@@ -329,7 +408,7 @@ Changelog for version 0.7 [2008-08-18]:
 
  - First public release 
 
-Copyright (c) 2008-2010 David Fussner.  This package is
+Copyright (c) 2008-2011 David Fussner.  This package is
 author-maintained.  This work may be copied, distributed and/or
 modified under the conditions of the LaTeX Project Public License,
 either version 1.3 of this license or (at your option) any later
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 e3154b6536e..d28bfce7f61 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 b62b224ed93..d9f73fb335a 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex
@@ -5,6 +5,7 @@
 %
 \documentclass[a4paper]{article}
 \usepackage[T1]{fontenc}
+\usepackage{textcomp}
 \usepackage[latin1]{inputenc}
 \usepackage[american]{babel}
 \usepackage[autostyle]{csquotes}
@@ -55,7 +56,7 @@
   Style files for biblatex
 
 \vspace{.3\baselineskip}
-\sffamily\normalsize\bfseries David Fussner\qquad Version 0.9.5a (beta) \\
+\sffamily\normalsize\bfseries David Fussner\qquad Version 0.9.7 (beta) \\
 \href{mailto:djf027@googlemail.com}{djf027@googlemail.com}\\ \today
 
 \end{center} 
@@ -69,22 +70,24 @@
 \section{Notice}
 \label{sec:Notice}
 
-\textbf{Please be advised that this package is beta software, in at
-  least two senses.  First, it merely contains styles to be used in
-  conjunction with the \textsf{biblatex} package, whose author
-  (Philipp Lehman) has made it clear that some parts of it may be
-  subject to alteration before a final release.  Any such changes may
-  necessitate alterations to \textsf{biblatex-chicago}, as well.
-  Second, I have tried to implement as much of the \emph{Chicago
-    Manual of Style}'s specification as possible, though undoubtedly
-  some gaps remain.  Most of the ones of which I am aware and which I
-  believe I can fill are in the TODO list, while others, e.g., legal
-  citations, await a convincing argument for inclusion.  Consider this
-  beta release, then, a request for comments.  If it seems like this
-  package could be of use to you, yet it doesn't do something you
-  need/want it to do, please feel free to let me know, and of course
-  any suggestions for solving problems more elegantly or accurately
-  would be most welcome.}
+\textbf{Please be advised that this package is beta software.  Philipp
+  Lehman's \textsf{biblatex} package has now reached a stable state,
+  and is unlikely to require wholesale changes to styles written for
+  it.  With the recent release of the \emph{Chicago Manual of Style's}
+  16th edition, however, it is possible that future releases of
+  \textsf{biblatex-chicago} implementing that new specification may
+  require significant alterations.  I intend to maintain the current
+  15th-edition files in a more or less stable state after this
+  release, but that is not to say that all development will cease.
+  \mylittlespace\\ I have tried to implement as much of the
+  \emph{Manual's} specification as possible, though undoubtedly some
+  gaps remain.  One user has recently argued that I should attempt to
+  include legal citations, so in the long term it may be that I return
+  to this issue.  In the meantime, if it seems like this package could
+  be of use to you, yet it doesn't do something you need/want it to
+  do, please feel free to let me know, and of course any suggestions
+  for solving problems more elegantly or accurately would be most
+  welcome.}
 
 \mylittlespace\textbf{Important Note:} If you have used
 \textsf{biblatex-chicago} before, please make sure you have read the
@@ -101,16 +104,15 @@ read on.
 The \textsf{biblatex-chicago} package is designed for writers who wish
 to use \LaTeX\ and \textsf{biblatex}, and who either want or need to
 format their references according to one of the specifications defined
-by the \emph{Chicago Manual of Style}.  This package now, for the
-first time, includes the \emph{Manual's} \enquote{author-date} system,
-favored by many disciplines in the sciences and social sciences,
-whereas previous releases only implemented the \enquote{notes \&\
-  bibliography} style, generally favored in the humanities.  The
-latter code produces a full reference in a first footnote, shorter
-references in subsequent notes, and a full reference in the
-bibliography. Some authors prefer to use the shorter note form even
-for the first occurrence, relying on the bibliography to provide the
-full information.  This, too, is supported by the code.  The
+by the \emph{Chicago Manual of Style}.  This package includes both the
+\emph{Manual's} \enquote{author-date} system, favored by many
+disciplines in the sciences and social sciences, and its
+\enquote{notes \&\ bibliography} style, generally favored in the
+humanities.  The latter code produces a full reference in a first
+footnote, shorter references in subsequent notes, and a full reference
+in the bibliography. Some authors prefer to use the shorter note form
+even for the first occurrence, relying on the bibliography to provide
+the full information.  This, too, is supported by the code.  The
 author-date style produces a short, in-text citation inside
 parentheses --- (Author Year) --- keyed to a list of references where
 entries start with the same name and year.
@@ -125,20 +127,18 @@ efficiency's loss should, I hope, be clarity's gain, and much of what
 you learn using one style will be applicable without alteration to the
 other.  Throughout the documentation, any \mycolor{green} text
 \colmarginpar{\textsf{New!}} indicates something \mycolor{new} in this
-release, though I shall not so color the entire section on the
-author-date style.
+release.
 
 \mylittlespace Here's a list of things you will need in order to use
 \textsf{biblatex-chicago}:
 
 \begin{itemize}{}{}
 \item Philipp Lehman's \textsf{biblatex} package, of course!  You
-  \emph{must} use the latest version --- at least 0.9c, 0.9d is
-  current --- as that version introduces incompatibilities with
-  previous releases, meaning that these style files will not function
-  properly with earlier iterations of \textsf{biblatex}. Lehman's
-  tools require several packages, and he strongly recommends several
-  more:
+  should use the latest version --- 1.2a 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:
   \begin{itemize}{}{}
   \item e-\TeX\ (required)
   \item \textsf{etoolbox} --- available from CTAN (required)
@@ -148,7 +148,7 @@ author-date style.
   \item \textsf{babel} --- a standard package (\emph{strongly}
     recommended)
   \item \textsf{csquotes} --- available from CTAN (recommended).
-    Please upgrade to the latest version of \textsf{csquotes} (5.0b).
+    Please upgrade to the latest version of \textsf{csquotes} (5.1b).
   \item \textsf{bibtex8} --- a replacement for \textsc{Bib}\TeX, which
     can, with the right com\-mand-line switches, process very large
     .bib files.  It also does the right thing when alphabetizing
@@ -157,10 +157,10 @@ author-date style.
   \item \textsf{Biber} --- alternatively, you can use Lehman's
     next-generation \textsc{Bib}\TeX\ replacement, called
     \textsf{Biber}, which is available from SourceForge.  You need the
-    latest version (0.5.4) to work with \textsf{biblatex} 0.9, and it
+    latest version (0.7) to work with \textsf{biblatex} 1.2a, and it
     is required for users who are processing a .bib file in Unicode.
   \end{itemize}
-\item The \colmarginpar{\textsf{New!}} line:
+\item The line:
   \begin{quote}
     \cmd{usepackage[notes]\{biblatex-chicago\}}
   \end{quote}
@@ -198,25 +198,31 @@ author-date style.
   \textsf{Biblatex-chicago} also now provides support for German and
   French.  Please see below (section~\ref{sec:international}) for a
   fuller explanation of all the options.
-\item The \colmarginpar{\textsf{New!}} \textsf{chicago-notes.bbx},
-  \textsf{chicago-notes.cbx},
-  \textsf{\mycolor{chicago-authordate.cbx}},
-  \textsf{\mycolor{chi\-cago-authordate.bbx}},
+\item The \textsf{chicago-notes.bbx}, \textsf{chicago-notes.cbx},
+  \textsf{chicago-authordate.cbx}, \textsf{chi\-cago-authordate.bbx},
   \textsf{biblatex-chicago.sty}, \textsf{cms-am\-erican.lbx},
   \textsf{cms-french.lbx}, \textsf{cms-german.lbx}, and
   \textsf{cms-ngerman.lbx} files from \textsf{biblatex-chicago},
   installed either in a system-wide \TeX\ directory, or in the working
-  directory where you keep your *.tex files.  If you use a system-wide
-  directory, I recommend creating the
-  \texttt{<TEXMFLOCAL>/tex/latex/biblatex\-contrib/biblatex-chicago}
-  directory, where \texttt{<TEX\-MFLOCAL>} is the root of your local
-  \TeX\ installation --- for example, and depending on your system,
-  \texttt{/usr/share/texmf-local}, \texttt{/usr/local/share/texmf}, or
-  \texttt{C:\textbackslash{}Local TeX Files\textbackslash}.  Then you
-  can place all nine of these files there, as it will be easier to
-  update if they're all in one place.  Of course, wherever you choose
-  to place them in the \texttt{texmf} tree, you'll need to update the
-  file name database to make sure \TeX\ can find them.
+  directory where you keep your *.tex files.  With
+  \colmarginpar{\textsf{New!}} this release the .zip file from CTAN
+  contains several subdirectories to help keep the growing number of
+  files organized, so the files listed above can be found in the
+  \texttt{latex/} subdirectory, itself further divided into the
+  \texttt{bbx/}, \texttt{cbx/}, and \texttt{lbx/} subdirectories.  If
+  you install in a system-wide directory, I recommend creating
+  \texttt{<TEXMFLOCAL>/tex/latex/biblatex-contrib/biblatex-chicago},
+  where\ \texttt{<TEXMFLOCAL>} is the root of your local \TeX\
+  installation --- for example, and depending on your system and
+  preferences, \texttt{/usr/share/texmf-local},
+  \texttt{/usr/local/share/texmf}, or \texttt{C:\textbackslash{}Local
+    TeX Files\textbackslash}.  Then you can copy the contents of the
+  \texttt{latex/} directory there, subdirectories and all.  (If you
+  install into your working directory, then you'll need to copy the
+  files directly there, without subdirectories.)  Of course, if you
+  choose to place them anywhere in the \texttt{texmf} tree, you'll
+  need to update the file name database to make sure \TeX\ can find
+  them.
 \item If you are using the Xe\LaTeX\ engine and are encountering
   difficulties, please upgrade to the latest version of
   \textsf{csquotes}, which incorporates chan\-ges that should address
@@ -229,16 +235,16 @@ author-date style.
   (numerous) methods at your disposal for modifying the formatted
   output.
 \item The annotated bibliography files \textsf{notes-test.bib} and
-  \mycolor{\textsf{dates-test.bib}}, which will acquaint you with most
-  of the details on how to get started constructing your own .bib
-  files for use with the two \textsf{biblatex-chicago} styles.
+  \textsf{dates-test.bib}, which will acquaint you with most of the
+  details on how to get started constructing your own .bib files for
+  use with the two \textsf{biblatex-chicago} styles.
 \item The files \textsf{cms-notes-sample.pdf} and
-  \mycolor{\textsf{cms-dates-sample.pdf}}.  The first shows how my
-  system processes \textsf{notes-test.bib} and
-  \textsf{cms-notes-sample.tex}, in both footnotes and bibliography,
-  the second is the result of processing
-  \mycolor{\textsf{dates-test.bib}} and
-  \mycolor{\textsf{cms-dates-sample.tex}}.
+  \textsf{cms-dates-sample.pdf}.  The first shows how my system
+  processes \textsf{notes-test.bib} and \textsf{cms-notes-sample.tex},
+  in both footnotes and bibliography, the second is the result of
+  processing \textsf{dates-test.bib} and
+  \textsf{cms-dates-sample.tex}.  All of these files are in
+  \texttt{doc/examples/}.
 \item The file you are reading, \textsf{biblatex-chicago.pdf}, which
   aims to be as complete a description as possible of the rules for
   creating a .bib file that will, when processed by \LaTeX\ and
@@ -251,12 +257,14 @@ author-date style.
   need for both styles then using one will be excellent preparation
   for the other.  If you have used a previous version of this package,
   please pay particular attention to the sections on Obsolete and
-  Deprecated Features, starting on page~\pageref{deprec:obsol}.  (If
-  you wish to place the seven previous files in a system-wide
-  directory, I would recommend
+  Deprecated Features, starting on page~\pageref{deprec:obsol}.  You
+  will find the seven previous files in the \texttt{doc/} subdirectory
+  \colmarginpar{\textsf{New!}} once you've extracted
+  \textsf{biblatex-chicago.zip}.  If you wish to place them in a
+  system-wide directory, I would recommend
   \texttt{<TEXMFLOCAL>/doc/latex/biblatex-contrib/biblatex-chicago},
   remembering of course to update the file name database afterward.
-  Let me reiterate, also, that if you currently have quoted material
+  (Let me reiterate, also, that if you currently have quoted material
   in your .bib file, and are using \cmd{enquote} or the standard
   \LaTeX\ mechanisms there, then the simplest procedure is always to
   use \cmd{mkbibquote} instead in order to ensure that punctuation
@@ -270,7 +278,7 @@ author-date style.
 \subsection{License}
 \label{sec:lppl}
 
-Copyright © 2008--2010 David Fussner.  This package is
+Copyright © 2008--2011 David Fussner.  This package is
 author-maintained.  This work may be copied, distributed and/or
 modified under the conditions of the \LaTeX\ Project Public License,
 either version 1.3 of this license or (at your option) any later
@@ -294,8 +302,8 @@ which the style makes such frequent use, and his advice on
 constructing \textsf{biblatex-chicago.sty} was invaluable.  The code
 for formatting the footnote marks, and that for printing the
 separating rule only after a run-on note, I've adapted from the
-\textsf{footmisc} package by Robin Fairbairns.  I borrowed ideas for
-the \texttt{shorthandibid} option from Dominik Waßenhoven's
+\textsf{footmisc} package by Robin Fairbairns, and I've borrowed ideas
+for the \texttt{shorthandibid} option from Dominik Waßenhoven's
 \textsf{biblatex-dw} package.  There may be other \LaTeX\ code I've
 appropriated and forgotten, in which case please remind me.  Finally,
 Charles Schaum and Joseph Reagle Jr.\ were both extremely generous
@@ -310,15 +318,16 @@ got their hands on it.
 \section{Detailed Introduction}
 \label{sec:Intro}
 
-The \emph{Chicago Manual of Style}, now in its 15th edition, has long,
-in America at least, been one of the most influential style guides for
-writers and publishers.  While one's choices are now perhaps more
-extensive than ever, the \emph{Manual} at least still provides a
-widely-recognized, and widely-utilized, standard.  Indeed, when you
-add to this the sheer completeness of the specification, its detailed
-instructions for referencing an enormous 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.
+The \emph{Chicago Manual of Style}, implemented here in its 15th
+edition, has long, in America at least, been one of the most
+influential style guides for writers and publishers.  While one's
+choices are now perhaps more extensive than ever, the \emph{Manual} at
+least still provides a widely-recognized, and widely-utilized,
+standard.  Indeed, when you add to this the sheer completeness of the
+specification, its detailed instructions for referencing an enormous
+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}
 
@@ -400,9 +409,9 @@ biblatex.bst, if he were willing.  As luck would have it, several new
 types appeared in \textsf{biblatex} 0.8, many of which I have
 incorporated as replacements for the custom entry types I defined
 before.  If a consensus emerges about how best to assign the data to
-various fields in such entries, then I shall adopt it, but, as you
-will see below, I have begun the process of making the old custom
-types obsolete, though in this release they will continue to work.
+various fields in such entries, then I shall adopt it.  In the
+meantime, as you will see below, I have made two of the old custom
+types obsolete, and recycled the third for an entirely new purpose.
 Needless to say, I'm open to advice and suggestions on this score.
 
 \section{The Specification:\ Notes\,\&\,Bibliography}
@@ -434,19 +443,18 @@ from the latter file below in parentheses.
 The complete list of entry types currently available in
 \textsf{biblatex-chicago-notes}, minus the odd \textsf{biblatex}
 alias, is as follows: \textbf{article}, \textbf{artwork},
-\textbf{book}, \mycolor{\textbf{bookinbook}}, \textbf{booklet},
-\textbf{collection}, \mycolor{\textbf{customa}},
-\mycolor{\textbf{customb}}, \mycolor{\textbf{customc}},
+\mycolor{\textbf{audio}}, \textbf{book}, \textbf{bookinbook},
+\textbf{booklet}, \textbf{collection}, \mycolor{\textbf{customc}},
 \textbf{image}, \textbf{inbook}, \textbf{incollection},
-\textbf{inproceedings}, \textbf{inreference},
-\mycolor{\textbf{letter}}, \textbf{manual}, \mycolor{\textbf{misc}},
+\textbf{inproceedings}, \textbf{inreference}, \textbf{letter},
+\textbf{manual},\textbf{misc}, \mycolor{\textbf{music}},
 \textbf{online} (with its alias \textbf{www}), \textbf{patent},
 \textbf{periodical}, \textbf{proceedings}, \textbf{reference},
 \textbf{report} (with its alias \textbf{techreport}), \textbf{review},
-\mycolor{\textbf{suppbook}}, \textbf{suppcollection},
-\textbf{suppperiodical}, \textbf{thesis} (with its aliases
-\textbf{mastersthesis} and \textbf{phdthesis}), and
-\textbf{unpublished}.
+\textbf{suppbook}, \textbf{suppcollection}, \textbf{suppperiodical},
+\textbf{thesis} (with its aliases \textbf{mastersthesis} and
+\textbf{phdthesis}), \textbf{unpublished}, and
+\mycolor{\textbf{video}}.
 
 \mylittlespace What follows is an attempt to specify all the
 differences between these types and the standard provided by
@@ -563,10 +571,9 @@ to define the \textsf{author}, yet to print nothing.  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 \colmarginpar{\textsf{New!}} provision of a \textsf{shortauthor}
-field is no longer necessary with this release, as in its absence the
-package will now automatically take it from \textsf{journaltitle}.
-(See lakeforester:pushcarts.)
+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}
 
@@ -620,7 +627,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
@@ -671,13 +678,67 @@ use the \textsf{misc} entry type with an \textsf{entrysubtype}.
 Fortunately, in this instance the other fields in a \textsf{misc}
 entry function pretty much as in \textsf{artwork} or \textsf{image}.
 
-\mybigspace This \colmarginpar{\textbf{bookinbook}} type provides the
+\mybigspace For \colmarginpar{\textbf{audio}} this release of
+\textsf{biblatex-chicago}, following the request of Johan Nordstrom, I
+have included three new entry types, all undefined by the standard
+styles, designed to allow users to present audiovisual sources in
+accordance with the Chicago specifications.  The \emph{Manual's}
+presentation of such sources (17.263--273), though admirably brief,
+seems to me somewhat inconsistent.  I attempted to condense all the
+requirements into two new entry types, but ended up relying on three,
+the differences between which I shall attempt to delineate here.
+There are likely to be occasions when your choice of entry type is not
+obvious, but at the very least \textsf{biblatex-chicago} should help
+you maintain consistency.
+
+\mylittlespace The \mycolor{\textbf{music}} type is intended for all
+musical recordings that do not have a video component.  This means,
+for example, digital media (whether on CD or hard drive), vinyl
+records, and tapes.  The \mycolor{\textbf{video}} type includes
+(nearly) all visual media, whether it be films, TV shows, tapes and
+DVDs of the preceding or of any sort of performance (including music),
+or online multimedia.  Finally, the \mycolor{\textbf{audio}} type, our
+current concern, fills gaps in the two others, and presents its
+sources in a more \enquote{book-like} manner.  Published musical
+scores need this type --- unpublished ones would use \textsf{misc}
+with an \textsf{entrysubtype} (shapey:partita) --- as do such favorite
+educational formats as the slideshow and the filmstrip
+(greek:filmstrip, schubert:muellerin, verdi:corsaro).  The
+\emph{Manual} (17.269--270) sometimes uses a similar format for audio
+books and even for films (twain:audio, weed:flatiron), though
+elsewhere these sorts of material are presented as \textsf{music} and
+\textsf{video}, respectively.  It would appear to depend on which
+sorts of publication facts you wish to present --- cf.\ \emph{Manual}
+17.269.
+
+\enlargethispage{-\baselineskip}
+
+\mylittlespace Once you've accepted the analogy of composer to
+\textsf{author}, constructing an \textsf{audio} entry should be fairly
+straightforward, since many of the fields function just as they do in
+\textsf{book} or \textsf{inbook} entries.  Indeed, please note that I
+compare it to both these other types as, in common with the other
+audiovisual types, \textsf{audio} has to do double duty as an analogue
+for both books and collections, so while there will normally be an
+\textsf{author}, a \textsf{title}, a \textsf{publisher}, a
+\textsf{date}, and a \textsf{location}, there may also be a
+\textsf{booktitle} and/or a \textsf{maintitle} --- see
+schubert:muellerin for an entry that uses all three in citing one song
+from a cycle.  If the medium in question needs specifying, the
+\textsf{type} field is the place for it.  (It is characteristic of
+this entry type that such information is placed after the publisher
+information, whereas in the other audiovisual types their order is
+reversed.)  Finally, the \textsf{titleaddon} field can specify
+functions for which \textsf{biblatex-chicago} provides no automated
+handling, e.g., a librettist (verdi:corsaro).
+
+\mybigspace This \mymarginpar{\textbf{bookinbook}} type provides the
 means of referring to parts of books that are considered, in other
 contexts, themselves to be books, rather than chapters, essays, or
 articles.  (Older versions of \textsf{biblatex-chicago} used
-\textbf{customb} for this purpose, but this is now deprecated.)  Such
-an entry can have a \textsf{title} and a \textsf{maintitle}, but it
-can also contain a \textsf{booktitle}, all three of which will be
+\textbf{customb} for this purpose, but this is now obsolete.)  Such an
+entry can have a \textsf{title} and a \textsf{maintitle}, but it can
+also contain a \textsf{booktitle}, all three of which will be
 italicized when printed.  In general usage it is, therefore, rather
 like the traditional \textsf{inbook} type, only with its
 \textsf{title} in italics rather than in quotation marks.  (See
@@ -703,28 +764,48 @@ uses the \textsf{howpublished} field instead of a standard
 (See clark:mesopot.)
 
 \mybigspace This \colmarginpar{\textbf{customa}} entry type is now
-deprecated in favor of the standard \textsf{biblatex} \textbf{letter}
-type, which see.  If your .bib files contain any \textsf{customa}
-entries you should change them to \textsf{letter} soon, as I am
-reclaiming this custom type for other uses in the next release of
-\textsf{biblatex-chicago}.
+obsolete, and any such entries in your .bib file will trigger an
+error.  Please use the standard \textsf{biblatex} \textbf{letter} type
+instead.
 
 %\enlargethispage{-\baselineskip}
 
 \mybigspace This \colmarginpar{\textbf{customb}} entry type is now
-deprecated in favor of the standard \textsf{biblatex}
-\textbf{bookinbook}, which see.  If your .bib files contain any
-\textsf{customb} entries you should change them to \textsf{bookinbook}
-soon, as it will cease to function in the next release of
-\textsf{biblatex-chicago}.
-
-\mybigspace This \colmarginpar{\textbf{customc}} entry type is now
-deprecated in favor of the standard \textsf{biblatex}
-\textbf{suppbook} (and \textbf{suppcollection}, which currently serves
-as an alias to \textsf{suppbook}).  Please see their documentation
-below.  If your .bib files contain any \textsf{customc} entries you
-should change them to \textsf{suppbook} soon, as it will cease to
-function in the next release of \textsf{biblatex-chicago}.
+obsolete, and any such entries in your .bib file will trigger an
+error.  Please use the standard \textsf{biblatex} \textbf{bookinbook}
+type instead.
+
+\mybigspace This \colmarginpar{\textbf{customc}} entry type has
+undergone a metamorphosis with this release, as I previously warned
+both here and in the RELEASE file.  Rather than being a (deprecated)
+alias of the standard \textsf{biblatex} \textbf{suppbook}, it now
+allows you to include alphabetized cross-references to other, separate
+entries in the bibliography, particularly to other names or
+pseudonyms, as recommended by the \emph{Manual}.  (This is different
+from the usual \textsf{crossref}, \textsf{xref}, and \textsf{userf}
+mechanisms, all primarily designed to include cross-references to
+other works.  Cf.\ 17.39--40).  The lecarre:cornwell entry, for
+example, would allow your readers to find the more-commonly-used
+pseudonym \enquote{John Le Carré} even if they were, for some reason,
+looking under his real name \enquote{David John Moore Cornwell.}
+
+\mylittlespace In such a case, you would need merely to place the
+author's real name in the \textsf{author} field, and the pseudonym(s),
+under which his or her works are presented in the bibliography, in the
+\textsf{title} field.  To make sure the cross-reference also appears
+in the bibliography, you can either manually include the entry key in
+a \cmd{nocite} command, or you can put that entry key in the
+\mycolor{\textbf{userc}} field in the main .bib entry, in which case
+\textsf{biblatex-chicago} will print the expanded abbreviation if and
+only if you cite the main entry.  (Cf.\ lecarre:cornwell,
+lecarre:quest; \textsf{userc}, below.)
+
+\mylittlespace Under ordinary circumstances, \textsf{biblatex-chicago}
+will connect the two parts of the cross-reference with the word
+\enquote{\emph{See}} --- or its equivalent in the document's language
+--- in italics.  If you wish to present the cross-reference
+differently, you can put the connecting word(s) into the
+\textsf{nameaddon} field.
 
 \mybigspace This \mymarginpar{\textbf{image}} entry type, left
 undefined in the standard styles, is in \textsf{biblatex-chicago}
@@ -755,15 +836,18 @@ entries, and not in \textsf{inbook} entries, mainly because the
 \emph{Manual} (17.70) here specifies a \enquote{multiauthor book.}
 (For more on this mechanism see \textbf{crossref}, below, and note
 that it is also active in \textsf{letter} and \textsf{inproceedings}
-entries.)  If the part of a book to which you are referring has had a
-separate publishing history as a book in its own right, then you may
-wish to use the \textsf{bookinbook} type, instead, on which see above.
-(See \emph{Manual} 17.68--72; \textsf{inbook}: ashbrook:brain,
-phibbs:diary, will:cohere; \textsf{incollection}: centinel:letters,
-contrib:contrib, sirosh:visualcortex; ellet:galena, keating:dearborn,
-and lippincott:chicago [and the \textsf{collection} entry
-prairie:state] demonstrate the use of the \textsf{crossref} field with
-its attendant abbreviations in notes and bibliography.)
+entries.  There is, of course, nothing to prevent you from using the
+mechanism when referring to, e.g., chapters from a single-author book,
+but you'll have to use \textsf{incollection} instead of
+\textsf{inbook}.)  If the part of a book to which you are referring
+has had a separate publishing history as a book in its own right, then
+you may wish to use the \textsf{bookinbook} type, instead, on which
+see above.  (See \emph{Manual} 17.68--72; \textsf{inbook}:
+ashbrook:brain, phibbs:diary, will:cohere; \textsf{incollection}:
+centinel:letters, contrib:contrib, sirosh:visualcortex; ellet:galena,
+keating:dearborn, and lippincott:chicago [and the \textsf{collection}
+entry prairie:state] demonstrate the use of the \textsf{crossref}
+field with its attendant abbreviations in notes and bibliography.)
 
 \mylittlespace \textbf{NB}: The \emph{Manual} suggests that, when
 referring to a chapter, one use either a chapter number or the
@@ -771,16 +855,11 @@ inclusive page numbers, not both.  If, however, you wish to refer in a
 footnote to a specific page within the chapter,
 \textsf{biblatex-chicago-notes} will always print the optional,
 postnote argument of a \cmd{cite} command --- the page number, say ---
-instead of any chapter number or inclusive page numbers given in the
-.bib file \textsf{incollection} entry.  This mechanism is quite
-general, that is, any specific page reference given in any sort of
-\cmd{cite} command overrides the contents of a \textsf{pages} field in
-a .bib file entry.
-
-\mylittlespace Currently, only the \textsf{chapter} field receives
-this treatment in \textsf{biblatex-chicago-notes}, though it may be
-possible in the future to generalize this to other named parts of a
-book.  Do let me know if this would be helpful to you.
+instead of any inclusive page numbers given in the .bib file
+\textsf{incollection} entry.  This mechanism is quite general, that
+is, any specific page reference given in any sort of \cmd{cite}
+command overrides the contents of a \textsf{pages} field in a .bib
+file entry.
 
 \mybigspace This \mymarginpar{\textbf{inproceedings}} entry type works
 pretty much as in standard \textsf{biblatex}.  Indeed, the main
@@ -794,7 +873,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
@@ -945,9 +1024,9 @@ 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 \colmarginpar{\textbf{manual}} is the second of two
+\mybigspace This \mymarginpar{\textbf{manual}} is the second of two
 traditional \textsc{Bib}\TeX\ entry types that the \emph{Manual}
 suggests formatting as books, the other being \textsf{booklet}. As
 with this latter, I have retained it in
@@ -964,7 +1043,7 @@ define both \textsf{author} and \textsf{publisher} using the name you
 here might have put in \textsf{organization}.  (See 17:47;
 chicago:manual, dyna:browser, natrecoff:camera.)
 
-\mybigspace As \colmarginpar{\textbf{misc}} its name suggests, the
+\mybigspace As \mymarginpar{\textbf{misc}} its name suggests, the
 \textsf{misc} entry type was designed as a hold-all for citations that
 didn't quite fit into other categories.  In
 \textsf{biblatex-chicago-notes}, I have somewhat extended its
@@ -991,25 +1070,28 @@ have a specific author and title, and won't come from a named archive.
 The \textsf{misc} type with an \textsf{entrysubtype} defined is the
 least formatted of all those specified by the \emph{Manual}, so titles
 are in plain text, and any location details take no parentheses in
-full footnotes.
+full footnotes.  (It is quite possible, though somewhat unusual, for
+archival material to have a specific title, rather than a generic one.
+In these cases, you will need to enclose the title inside a
+\cmd{mkbibquote} command manually.  Cf.\ shapey:partita.)
 
 \mylittlespace If you are wondering what to put in
 \textsf{entrysubtype}, the answer is, currently, anything at all.  You
 no longer need to put the exact string \texttt{letter} there in order
 to move the date into closer proximity with the \textsf{title}.
-Indeed, recent \colmarginpar{\textsf{New}} reconsideration of the
-\emph{Manual} has suggested that the distinction to be drawn in this
-class of material hasn't to do with \emph{where} the date is presented
-but, rather, with \emph{how} it is presented.  As I now understand the
-specification, it draws a distinction between archival material that
-is \enquote{letter-like} (letters, memoranda, reports, telegrams) and
-that which isn't (interviews, wills, contracts, or even personal
-communications you've received and which you wish to cite).  This may
-not always be the easiest distinction to draw, and in previous
-releases of \textsf{biblatex-chicago} I have been ignoring it, but
-once you've decided to classify it one way or the other you put the
-date in the \textsf{origdate} field for letters, etc., and into the
-\textsf{date} field for the others.
+Indeed, recent reconsideration of the \emph{Manual} has suggested that
+the distinction to be drawn in this class of material hasn't to do
+with \emph{where} the date is presented but, rather, with \emph{how}
+it is presented.  As I now understand the specification, it draws a
+distinction between archival material that is \enquote{letter-like}
+(letters, memoranda, reports, telegrams) and that which isn't
+(interviews, wills, contracts, or even personal communications you've
+received and which you wish to cite).  This may not always be the
+easiest distinction to draw, and in previous releases of
+\textsf{biblatex-chicago} I have been ignoring it, but once you've
+decided to classify it one way or the other you put the date in the
+\textsf{origdate} field for letters, etc., and into the \textsf{date}
+field for the others.
 
 \mylittlespace In effect, whether it's a \textsf{letter} entry or a
 \enquote{letter-like} \textsf{misc} entry (with
@@ -1072,6 +1154,93 @@ conformity to some external standard, so it is the former which you
 should pursue.  I hope that \textsf{biblatex-chicago-notes} proves
 helpful in this regard.
 
+\mybigspace This \colmarginpar{\textbf{music}} is one of three new
+audiovisual entry types, and is intended primarily to aid in the
+presentation of musical recordings that do not have a video component,
+though it can also include audio books (auden:reading).  A DVD or VHS
+of an opera or other performance, by contrast, should use the
+\mycolor{\textbf{video}} type instead (handel:messiah).  Because
+\textsf{biblatex} --- and \textsc{Bib}\TeX\ before it --- were
+designed primarily for citing book-like objects, some choices needed
+to be made in assigning the various roles found on the back of a CD to
+the fields in a typical .bib entry.  I have also implemented several
+new bibstrings to help in identifying these roles within entries.  If
+you can think of a simpler way to distribute the roles, please let me
+know, so that I can consider making changes before anyone gets used to
+the current equivalences.
+
+\mylittlespace These equivalences, in summary form, are:
+
+{\renewcommand{\descriptionlabel}[1]{\qquad\textsf{#1}}
+\begin{description}
+\item[author =] composer, songwriter, or performer(s),
+  depending on whom you wish to emphasize by placing them at the head
+  of the entry.
+\item[editor, editora, editorb =] conductor, director or
+  performer(s).  These will ordinarily follow the \textsf{title} of
+  the work, though the usual \texttt{useauthor} and \texttt{useeditor}
+  options can alter the presentation within an entry.  Because these
+  are non-standard roles, you will need to identify them using the
+  following:
+\item[editortype, editoratype, editorbtype:] The most common roles,
+  all associated with specific bibstrings (or their absence), will be
+  \texttt{conductor}, \texttt{director}, \texttt{producer}, and,
+  oddly, \texttt{none}.  The last is particularly useful when
+  identifying the group performing a piece, as it usually doesn't need
+  further specifying and this role prevents \textsf{biblatex} from
+  falling back on the default \texttt{editor} bibstring.
+\item[title, booktitle, maintitle:] As with the other audiovisual
+  types, \textsf{music} serves as an analogue both to books and to
+  collections, so the title will either be, e.g., the album title or a
+  song title, in which latter case the album title would go into
+  \textsf{booktitle}.  The \textsf{maintitle} might be necessary for
+  something like a box set of \emph{Complete Symphonies}.
+\item[series, number:] These two are closely associated, and are
+  intended for presenting the catalog information provided by the
+  music publisher, especially in the case when a publisher oversees
+  more than one label.  In nytrumpet:art, for example, the
+  \textsf{series} field holds the label (\texttt{Vox/Turnabout} and
+  the \textsf{number} field the catalog number (\texttt{PVT 7183}).
+  You can certainly put all of this information into one of the above
+  fields, but separating it may help make the .bib entry more
+  readable.
+\item[howpublished/pubstate, date, publisher:] The \emph{Manual}
+  (17.268) follows the rather specialized requirements for presenting
+  publishing information for musical recordings.  The normal symbol
+  for musical copyright is\ \texttt{\textcircledP} (Unicode point
+  u+2117, SOUND RECORDING COPYRIGHT), but other copyrights
+  \texttt{\textcopyright} are often also asserted.  The
+  \textsf{howpublished} field is the place for these symbols, and it
+  may also have to hold a year designation if the
+  \texttt{\textcircledP} and the \texttt{\textcopyright} apply to
+  different years, as sometimes happens.  (The \textsf{pubstate} field
+  in this entry type is a synonym for \textsf{howpublished}.  Please
+  use only one of them per entry, and note that the usual mechanism
+  for automatically printing \cmd{bibstring\{reprint\}} is turned off
+  in \textsf{music} entries.)  The \textsf{date} field holds the year
+  either of all the symbols or of whichever symbol appears last in
+  \textsf{howpublished}, and the \textsf{publisher} field is
+  self-explanatory.  (See nytrumpet:art.)
+\item[type:] As in all the audiovisual entry types, the \textsf{type}
+  field holds the medium of the recording, e.g., vinyl, 33 rpm,
+  8-track tape, cassette, compact disc, mp3, ogg vorbis.
+\end{description}}
+
+I should also note here that I have implemented the standard
+\textsf{biblatex} \mycolor{\textsf{eventdate}} field, in case you need
+it to identify a particular recording session or concert.  It will be
+printed just after the \textsf{title}.  The entries in
+\textsf{notes-test.bib} should at least give you a good idea of how
+this all works, and that file also contains an example of an audio
+book presented in a \textsf{music} entry.  If you browse the examples
+in the \emph{Manual} you will see some variation from the formatting
+choices I have made for \textsf{biblatex-chicago}, but it wasn't
+always clear to me that these variations were rules as opposed to
+suggestions, so I've ignored some of them in the code.  Arguments as
+to why I'm wrong will, of course, be entertained.  (Cf. 17.268;
+auden:reading, beethoven:sonata29, bernstein:shostakovich,
+nytrumpet:art.)
+
 \mybigspace The \mymarginpar{\textbf{online}} \emph{Manual}'s
 instructions (17.142--147, 17.198, 17.234--237) for citing online
 materials are slightly different from those suggested by standard
@@ -1102,9 +1271,9 @@ 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 \colmarginpar{\textbf{patent}} \emph{Manual} is very
+\mybigspace The \mymarginpar{\textbf{patent}} \emph{Manual} is very
 brief on this subject (17.219), but very clear about which information
 it wants you to present, so such entries may not work well with other
 \textsf{biblatex} styles.  The important date, as far as Chicago is
@@ -1170,6 +1339,8 @@ Technical Report Number of a technical report.  As in standard
 report type in \textsf{note} and the \textsf{institution} in
 \textsf{publisher}.  (See herwign:office.)
 
+\enlargethispage{\baselineskip}
+
 \mybigspace The \mymarginpar{\textbf{review}} \textsf{review} entry
 type was added to \textsf{biblatex 0.7}, and it certainly eases the
 task of coping with the \emph{Manual}'s complicated requirements for
@@ -1218,12 +1389,12 @@ ratliff:review.)
 the \textbf{article} section above, but I'll repeat some of them
 briefly here.  If anything in the \textsf{title} needs formatting, you
 need to provide those instructions yourself, as the default is
-completely plain.  In the short note form \colmarginpar{\textsf{New!}}
-you no longer need to provide a formatted \textsf{shortauthor} field
-for when a \textsf{journatitle} replaces an absent \textsf{author}, as
-the package now automatically prints the former there in the absence
-of anything else (gourmet:052006, nyt:trevorobit).  If you wish to
-keep the title at the head of an entry, then you'll need to define
+completely plain.  In the short note form you no longer need to
+provide a formatted \textsf{shortauthor} field for when a
+\textsf{journatitle} replaces an absent \textsf{author}, as the
+package automatically prints the former there in the absence of
+anything else (gourmet:052006, nyt:trevorobit).  If you wish to keep
+the title at the head of an entry, then you'll need to define
 \textsf{author} with \cmd{isdot}, (as in nyt:obittrevor, by contrast
 with nyt:trevorobit).  As in \textsf{misc} entries with an
 \textsf{entrysubtype}, words like \enquote{interview,}
@@ -1287,6 +1458,8 @@ this purpose, and now you can use either of these, as I've added
 above under \textbf{review} for the full instructions on how to
 construct a .bib entry for such a reference.
 
+\enlargethispage{-\baselineskip}
+
 \mybigspace The \mymarginpar{\textbf{unpublished}}
 \textsf{unpublished} entry type works largely as it does in standard
 \textsf{biblatex}, though it's worth remembering that you should use a
@@ -1296,6 +1469,69 @@ an\ \cmd{autocap} command in the somewhat contradictory
 ordinarily be capitalized except at the beginning of a sentence
 (nass:address).
 
+\mybigspace This \colmarginpar{\textbf{video}} is the last of the new
+audiovisual entry types, and as its name suggests it is intended for
+citing visual media, be it films of any sort or TV shows, broadcast,
+on the Net, on VHS, DVD, or Blu-ray.  As with the \textsf{music} type
+discussed above, certain choices had to be made when associating the
+production roles found, e.g., on a DVD, to those bookish ones provided
+by \textsf{biblatex}.  Here are the main correspondences:
+
+{\renewcommand{\descriptionlabel}[1]{\qquad\textsf{#1}}
+\begin{description}
+\item[author:] This will not infrequently be left undefined, as the
+  director of a film should be identified as such and therefore placed
+  in the \textsf{editor} field with the appropriate
+  \textsf{editortype} (see below).  You will need it, however, to
+  identify the composer of, e.g., an oratorio on VHS (handel:messiah),
+  or perhaps the provider of commentaries or other extras on a film
+  DVD (cleese:holygrail).
+\item[editor, editora, editorb =] director or producer, or possibly
+  the performer or conductor in recorded musical performances.  These
+  will ordinarily follow the \textsf{title} of the work, though the
+  usual \texttt{useauthor} and \texttt{useeditor} options can alter
+  the presentation within an entry.  Because these are non-standard
+  roles, you will need to identify them using the following:
+\item[editortype, editoratype, editorbtype:] The most common roles,
+  all associated with specific bibstrings (or their absence), will
+  likely be \texttt{director}, \texttt{produ\-cer}, and, oddly,
+  \texttt{none}.  The last is particularly useful if you want to
+  identify performers, as they usually don't need further specifying
+  and this role prevents \textsf{biblatex} from falling back on the
+  default \texttt{editor} bibstring.
+\item[title, titleaddon, booktitle, maintitle:] As with the other
+  audiovisual types, \textsf{video} serves as an analogue both to
+  books and to collections, so the \textsf{title} may be of a whole
+  film DVD or of a TV series, or it may identify one episode in a
+  series or one scene in a film.  In the latter cases, the title of
+  the whole would go in \textsf{booktitle}.  The \textsf{titleaddon}
+  field may be useful for specifying the season and/or episode number
+  of a TV series, or for any other information that needs to come
+  between the \textsf{title} and the \textsf{booktitle}
+  (cleese:holygrail, episode:tv, handel:messiah).  As in the
+  \textsf{music} type, \textsf{maintitle} may be necessary for a boxed
+  set or something similar.
+\item[date, origdate:] The publication details of this sort of
+  material are usually straightforward, at least compared with the
+  \textsf{music} type, but there will be occasions when you need two
+  dates.  When citing an episode of a long-running TV series you may
+  need both a date for the episode and a date range for the whole run,
+  and when citing a film on DVD you may want to present both the
+  original release date and the date of release on DVD.  In both
+  cases, the \textsf{origdate} field holds the year of the original
+  showing or transmission, while the \textsf{date} field holds either
+  the years for an entire run of a TV show or the year of publication
+  of the DVD (or other medium).  Cf. episode:tv, hitchcock:nbynw.
+\item[type:] As in all the audiovisual entry types, the \textsf{type}
+  field holds the medium of the \textsf{title}, e.g., 8 mm, VHS, DVD,
+  Blu-ray, MPEG.
+\end{description}}
+
+As with the \textsf{music} type, entries in \textsf{notes-test.bib}
+should at least give you a good idea of how all this works.  (Cf.\
+17.270, 273; cleese:holygrail, episode:tv, handel:messiah,
+hitchcock:nbynw, loc:city.)
+
 \subsection{Entry Fields}
 \label{sec:entryfields}
 
@@ -1605,7 +1841,25 @@ prairie:state you'll see this mechanism in action in both notes and
 bibliography.  If you wish to disable this, then simply don't use a
 \textsf{crossref} or \textsf{xref} field in your entries.
 
-\enlargethispage{\baselineskip}
+\mylittlespace There \colmarginpar{\textsf{New!}} is a subtlety
+involved in this mechanism that I should address here.  Andrew
+Goldstone has pointed out to me some inaccuracies in the package's
+treatment of these abbreviated citations, both in notes and
+bibliography.  Most of the changes I've made won't affect users in any
+way, only the actual printed output, but if you refer separately to
+chapters in a single-author \textsf{book}, then the shortened part of
+the reference, to the whole book, won't repeat the author's name
+before the title of the whole.  If, however, you refer separately to
+parts of a \textsf{collection} or \textsf{proceedings}, even when the
+\textsf{editor} of the \textsf{collection} is the same as the
+\textsf{author} of an essay in the collection, you will see the name
+repeated before the abbreviated part referencing the whole parent
+volume.  Because the code tests for entry type, if you don't use
+\textsf{collection} or \textsf{proceedings} for the whole volume,
+you'll not get the repeated name, so there may be corner cases where
+careful choice of the parent entry type gets you what you want.
+
+% \enlargethispage{\baselineskip}
 
 \mylittlespace A published collection of letters requires a somewhat
 different treatment (17.78).  If you cite more than one letter from
@@ -1657,7 +1911,7 @@ such cross-references, most especially in \textsf{letter},
 \textsf{shorthand} field in a parent entry is, at least in the current
 state of \textsf{biblatex-chicago-notes}, a bad idea.
 
-\mybigspace This \colmarginpar{\textbf{date}} field may be used to
+\mybigspace This \mymarginpar{\textbf{date}} field may be used to
 specify an item's complete date of publication, in \textsc{iso}8601
 format, i.e., \texttt{yyyy-mm-dd}.  It may also be used to specify a
 date range, according to Lehman's instructions in §~2.3.8 of
@@ -1747,16 +2001,17 @@ the need for a macro, which I discuss further in the commands section
 below [\ref{sec:formatcommands}].)  Cf.\ \textsf{namea},
 \textsf{nameb}, \textsf{namec}, and \textsf{translator}.
 
-\mybigspace The \mymarginpar{\textbf{editora\\editorb\\editorc}} new
-release of \textsf{biblatex} provides these fields as a means to
+\mybigspace The \mymarginpar{\textbf{editora\\editorb\\editorc}} newer
+releases of \textsf{biblatex} provide these fields as a means to
 specify additional contributors to texts in a number of editorial
-roles.  I'm uncertain how relevant they may be to users of the Chicago
-style, but I have implemented them just as the standard styles do.  To
-specify the role, use the new fields \textsf{editoratype},
-\textsf{editorbtype}, and \textsf{editorctype}, and see
-\textsf{biblatex.pdf} §~2.3.6.
+roles.  In the Chicago styles they seem most relevant for the
+audiovisual types, especially \textsf{music} and \textsf{video}, where
+they help to identify conductors, directors, producers, and
+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,
@@ -1801,8 +2056,8 @@ also need a \textsf{shorteditor} defined to help with the short note
 form, not a \textsf{shortauthor}, ruled out because
 \texttt{useauthor=false}.
 
-\mylittlespace In \textsf{biblatex} 0.9 Lehman has reworked the string
-concatenation mechanism, for reasons he outlines in his RELEASE file,
+\mylittlespace In \textsf{biblatex} 0.9 Lehman reworked the string
+concatenation mechanism, for reasons he outlined in his RELEASE file,
 and I have followed his lead.  In short, if you define the
 \textsf{editortype} field, then concatenation is turned off, even if
 the name of the \textsf{editor} matches, for example, that of the
@@ -1828,12 +2083,12 @@ the following entry types: \textsf{collection}, \textsf{letter},
 
 \mybigspace These
 \mymarginpar{\textbf{editoratype\\editorbtype\\editorctype}} fields
-are new to \textsf{biblatex} 0.9, and identify the exact role of the
-person named in the corresponding \textsf{editor[a-c]} field.  Note
-that they are not part of the string concatenation mechanism.  I have
-implemented them just as the standard styles do, though I am uncertain
-of their usefulness for users of Chicago.  Cf.\ \textsf{biblatex.pdf}
-§~2.3.6.
+identify the exact role of the person named in the corresponding
+\textsf{editor[a-c]} field.  Note that they are not part of the string
+concatenation mechanism.  I have implemented them just as the standard
+styles do, and they have now found a use particularly in
+\textsf{music} and \textsf{video} entries.  Cf.\
+bernstein:shostakovich, handel:messiah.
 
 \mybigspace Standard \mymarginpar{\textbf{eid}} \textsf{biblatex}
 field, providing a string or number some journals use uniquely to
@@ -1894,6 +2149,13 @@ new \textsf{artwork} entry type in order to refer to a work from
 antiquity whose title you do not wish to be italicized.  Please see
 the documentation of \textsf{artwork} above for the details.
 
+\mybigspace This \colmarginpar{\textbf{eventdate}} is a standard
+\textsf{biblatex} field, added in this release to the
+\mycolor{\textbf{music}} entry type in case users need it to identify
+a particular recording session or concert.  See the documentation of
+that type above.  The field will currently be ignored in any other
+sort of entry.
+
 \mybigspace As \mymarginpar{\textbf{foreword}} with the
 \textsf{afterword} field above, \textsf{foreword} will in general
 function as it does in standard \textsf{biblatex}.  Like
@@ -1915,7 +2177,8 @@ parentheses, just after the author(s).
 \textsf{biblatex} field, mainly applicable in the \textsf{booklet}
 entry type, where it replaces the \textsf{publisher}.  I have also
 retained it in the \textsf{misc} and \textsf{unpublished} entry types,
-for historical reasons.
+for historical reasons, and either it or \textsf{pubstate} can be used
+in \textsf{music} entries to clarify publication details.
 
 \mybigspace Standard \mymarginpar{\textbf{institution}}
 \textsf{biblatex} field.  In the \textsf{thesis} entry type, it will
@@ -2058,7 +2321,7 @@ the documentation of these entry types for further details.  (See
 \emph{Manual} 17.238--239; ency:britannica, grove:sibelius,
 times:guide, wikiped:bibtex.)
 
-\mybigspace This \colmarginpar{\textbf{location}} is
+\mybigspace This \mymarginpar{\textbf{location}} is
 \textsf{biblatex}'s version of the usual \textsc{Bib}\TeX\ field
 \textsf{address}, though the latter is accepted as an alias if that
 simplifies the modification of older .bib files.  According to the
@@ -2100,6 +2363,8 @@ 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}
+
 \mybigspace An \mymarginpar{\textbf{maintitleaddon}} annex to the
 \textsf{maintitle}, for which see previous entry.  Such an annex would
 be printed in the main text font.  If your data begins with a word
@@ -2130,16 +2395,22 @@ section~\ref{sec:formatcommands}.
 
 \mybigspace This \mymarginpar{\textbf{nameaddon}} field is provided by
 \textsf{biblatex}, though not used by the standard styles.  In
-\textsf{biblatex-chicago}, it allows you to specify that an author's
-name is a pseudo\-nym, or to provide either the real name or the
-pseudonym itself, if the other is being provided in the
-\textsf{author} field.  The abbreviation
-\enquote{\texttt{pseud.}\hspace{-2pt}}\ (always lowercase in English)
-is specified, either on its own or after the pseudonym
-(centinel:letters, creasey:ashe:blast, creasey:morton:hide,
-creasey:york:death, and le\-carre:quest); \cmd{bibstring\{pseudonym\}}
-does the work for you.  See under \textbf{author} above for the full
-details.
+\textsf{biblatex-chicago}, it allows you, in most entry types, to
+specify that an author's name is a pseudo\-nym, or to provide either
+the real name or the pseudonym itself, if the other is being provided
+in the \textsf{author} field.  The abbreviation
+\enquote{\texttt{pseud}.}\ (always lowercase in English) is specified,
+either on its own or after the pseudo\-nym (centinel:letters,
+creasey:ashe:blast, creasey:morton:hide, creasey:york:death, and
+le\-carre:quest); \cmd{bibstring\{pseudonym\}} does the work for you.
+See under \textbf{author} above for the full details.
+
+\mylittlespace In the \textsf{customc} entry type, on the other hand,
+which is used to create alphabetized cross-references to other
+bibliography entries, the \textsf{nameaddon} field allows you to
+change the default string linking the two parts of the
+cross-reference.  The code automatically tests for a known bibstring,
+which it will italicize.  Otherwise, it prints the string as is.
 
 \mybigspace Like \mymarginpar{\textbf{nameb}} \textsf{namea}, above,
 this is a field left undefined by the standard \textsf{biblatex}
@@ -2158,7 +2429,7 @@ with \textsf{namea} if they are identical.  See under the
 \cmd{parteditandcomp}, \cmd{parttransandcomp}, and
 \cmd{partedittransandcomp} in section~\ref{sec:formatcommands}.
 
-\mybigspace The \colmarginpar{\textbf{namec}} \emph{Manual} (17.41)
+\mybigspace The \mymarginpar{\textbf{namec}} \emph{Manual} (17.41)
 specifies that works without an author may be listed under an editor,
 translator, or compiler, assuming that one is available, and it also
 specifies the strings to be used with the name(s) of compiler(s).  All
@@ -2231,7 +2502,7 @@ beginning of a sentence, then simply ensure that that word is in
 lowercase, and \textsf{biblatex-chicago-notes} will automatically do
 the right thing.  Cf.\ \textsf{addendum}.
 
-\mybigspace This \colmarginpar{\textbf{number}} is a standard
+\mybigspace This \mymarginpar{\textbf{number}} is a standard
 \textsf{biblatex} field, containing the number of a
 \textsf{journaltitle} in an \textsf{article} or \textsf{review} entry,
 the number of a \textsf{title} in a \textsf{periodical} entry, or the
@@ -2277,7 +2548,7 @@ organization sponsoring a conference in a \textsf{proceedings} or
 \textsf{inproceedings} entry, and I have retained this as a
 possibility, though the \emph{Manual} is silent on the matter.
 
-\mybigspace This \colmarginpar{\textbf{origdate}} is a new
+\mybigspace This \mymarginpar{\textbf{origdate}} is a new
 \textsf{biblatex} field, replacing the obsolete \textsf{origyear}, and
 allowing more than one full specification for those references which
 need to provide more than one date.  As with the analogous
@@ -2357,7 +2628,7 @@ writing, be one of \texttt{american}, \texttt{brazilian},
 \texttt{norwegian}, \texttt{portuguese}, \texttt{spanish}, or
 \texttt{swedish}, to which I've added \texttt{russian}.
 
-%\enlargethispage{\baselineskip}
+\enlargethispage{-\baselineskip}
 
 \mybigspace NB: \mymarginpar{\textbf{origlocation}} This field is now
 obsolete, and has, as announced previously, been replaced by
@@ -2439,22 +2710,29 @@ apparently suggest using \texttt{s.n.}\,(= \emph{sine nomine}) to
 specify the lack of a publisher, but the \emph{Manual} doesn't mention
 this.
 
-\mybigspace Due \colmarginpar{\textbf{pubstate}} to specific
+\mybigspace Due \mymarginpar{\textbf{pubstate}} to specific
 requirements in the author-date style, I have implemented this field
 there as a way of providing accurate citations of reprinted books.  As
-the functionality seemed useful, I have also, with this release,
-included some of it in \textsf{biblatex-chicago-notes}.  In previous
-releases you could identify a reprint by placing
-\cmd{bibstring\{reprint\}} in the \textsf{location} field, followed by
-a comma, and the style would print the appropriate string in notes and
-bibliography.  Now, if it is more convenient, easier to remember, or
-if you want to reuse your .bib database for the author-date style, you
-can simply put the string \texttt{reprint} into the \textsf{pubstate}
-field, and the package will take care of everything for you.  Both of
-these methods will now work just fine, but please choose only one per
-entry, otherwise the string will be printed twice.  Currently, if you
-put anything else in the \textsf{pubstate} field, it will silently be
-ignored, but this may change in future releases.
+the functionality seemed useful, I have also included some of it in
+\textsf{biblatex-chicago-notes}.  In previous releases you could
+identify a reprint by placing \cmd{bibstring\{reprint\}} in the
+\textsf{location} field, followed by a comma, and the style would
+print the appropriate string in notes and bibliography.  Now, if it is
+more convenient, easier to remember, or if you want to reuse your .bib
+database for the author-date style, you can simply put the string
+\texttt{reprint} into the \textsf{pubstate} field, and the package
+will take care of everything for you.  Both of these methods will now
+work just fine, but please choose only one per entry, otherwise the
+string will be printed twice.  Please note, also, that this automatic
+mechanism has been disabled in \textsf{music} and \textsf{video}
+entries, as it isn't appropriate to those sorts of material.  In the
+latter, \textsf{pubstate} will be silently ignored, whereas in the
+former, for compatibility with the author-date style, the field
+functions as a synonym for \textsf{howpublished}, and will be printed
+verbatim.  Currently, if you put anything besides \texttt{reprint} in
+the \textsf{pubstate} field of anything except \textsf{music} entries,
+it too will silently be ignored, but this may change in future
+releases.
 
 \mybigspace I \mymarginpar{\textbf{redactor}} have implemented this
 field just as \textsf{biblatex}'s standard styles do, even though the
@@ -2519,7 +2797,7 @@ periodicals, see 17.178; garaud:gatine, sewall:letter.)  Cf.\
 \textsf{number} for more information on the \emph{Manual}'s
 preferences regarding the formatting of numerals.
 
-\mybigspace This \colmarginpar{\textbf{shortauthor}} is a standard
+\mybigspace This \mymarginpar{\textbf{shortauthor}} is a standard
 \textsf{biblatex} field, but \textsf{biblatex-chicago-notes} makes
 considerably grea\-ter use of it than the standard styles.  For the
 purposes of the Chicago style, the field provides the name to be used
@@ -2583,6 +2861,17 @@ care is needed when using shorthands with cross-references, and I
 would avoid them in all parent entries, at least in the current state
 of \textsf{biblatex-chicago-notes}.
 
+\mybigspace When \colmarginpar{\textbf{shorthandintro}} you include a
+\textsf{shorthand} in an entry, it will ordinarily appear the first
+time you cite the work, at the end of a long note, prefaced by the
+phrase \enquote{Henceforth cited as.}  With this standard
+\textsf{biblatex} field, you can change that phrase to suit your
+needs.  Please note, first, that you need to include the shorthand in
+this field as you intend it to appear and, second, that you still need
+the \textsf{shorthand} field present in order to ensure the
+appropriate presentation of the shorthand in later citations and in
+the list of shorthands.
+
 \mybigspace A \mymarginpar{\textbf{shorttitle}} standard
 \textsf{biblatex} field, primarily used to provide an abbreviated
 title for short notes.  In \textsf{biblatex-chicago-notes}, you need
@@ -2656,9 +2945,16 @@ are as follows:
   \textsf{review} entry types.
 \item[\qquad Unformatted:] \textsf{booktitleaddon},
   \textsf{maintitleaddon}, and \textsf{titleaddon} in all entry types,
-  \textsf{title} of \textsf{letter}, \textsf{misc} (with an
-  \textsf{entrysubtype}), \textsf{review}, and \textsf{suppperiodical}
-  entry types.
+  \textsf{title} of \textsf{customc}, \textsf{letter}, \textsf{misc}
+  (with an \textsf{entrysubtype}), \textsf{review}, and
+  \textsf{suppperiodical} entry types.
+\item[\qquad \mycolor{Italics or Quotation Marks:}] All of the
+  audiovisual entry types --- \textsf{audio}, \textsf{music}, and
+  \textsf{video} --- have to serve as analogues both to \textsf{book}
+  and to \textsf{inbook}.  Therefore, if there is both a
+  \textsf{title} and a \textsf{booktitle}, then the \textsf{title}
+  will be in quotation marks.  If there is no \textsf{booktitle}, then
+  the \textsf{title} will be italicized.
 \end{description}
 
 Now, the rules for which entry type to use for which sort of work tend
@@ -2709,8 +3005,6 @@ assuming that such a \textsf{title} begins with a lowercase letter in
 your .bib database.  See \textbf{\textbackslash autocap} below for
 more details.
 
-%\enlargethispage{-\baselineskip}
-
 \mybigspace Standard \mymarginpar{\textbf{titleaddon}}
 \textsf{biblatex} intends this field for use with additions to titles
 that may need to be formatted differently from the titles themselves,
@@ -2733,6 +3027,8 @@ example where the \textsf{titleaddon} field, holding the name of a
 regular column in a newspaper, is capitalized, a situation that is
 handled as you would expect.)
 
+\enlargethispage{\baselineskip}
+
 \mybigspace As \mymarginpar{\textbf{translator}} far as possible, I
 have implemented this field as \textsf{biblatex}'s standard styles do,
 but the requirements specified by the \emph{Manual} present certain
@@ -2803,14 +3099,16 @@ you are citing, e.g., \enquote{\texttt{preface to}} or
 details.  (See \emph{Manual} 17.74--75; polakow:afterw, prose:intro).
 
 \mylittlespace You can also use the \textsf{type} field in
-\textsf{artwork} and \textsf{image} entries to identify the medium of
-the artwork or photograph, e.g., \texttt{oil on canvas} or
-\texttt{albumen print}.  If the first word in this field would
-normally only be capitalized at the beginning of a sentence, then
-leave it in lowercase in your .bib file and \textsf{biblatex} will
-automatically do the right thing in citations.  Cf.\ \textsf{artwork}
-and \textsf{image}, above, for all the details.  (See leo:madonna,
-bedford:photo.)
+\textsf{artwork}, \textsf{audio}, \textsf{image}, \textsf{music}, and
+\textsf{video} entries to identify the medium of the work, e.g.,
+\texttt{oil on canvas}, \texttt{albumen print}, \texttt{compact disc}
+or \texttt{MPEG}.  If the first word in this field would normally only
+be capitalized at the beginning of a sentence, then leave it in
+lowercase in your .bib file and \textsf{biblatex} will automatically
+do the right thing in citations.  Cf.\ \textsf{artwork},
+\textsf{audio}, \textsf{image}, \textsf{music}, and \textsf{video},
+above, for all the details.  (See auden:reading, bedford:photo,
+cleese:holygrail, leo:madonna, nytrumpet:art.)
 
 %\enlargethispage{-\baselineskip}
 
@@ -2861,7 +3159,22 @@ the \cmd{custpunct} with a toggle, then you'll have to use
 \cmd{custpunctb}, toggled by putting the exact string \texttt{plain}
 in \textsf{userb}.
 
-%\enlargethispage{\baselineskip}
+\mybigspace I \colmarginpar{\textbf{userc}} have now implemented this
+supplemental \textsf{biblatex} field as part of Chicago's name
+cross-referencing system.  (The \enquote{c} part is meant as a sort of
+mnemonic for this function, though it's perfectly possible to use the
+field in other contexts.)  If you use the \mycolor{\textbf{customc}}
+entry type to include alphabetized cross-references to other, separate
+entries in a bibliography, it is unlikely that you will cite the
+\textsf{customc} entry in the body of your text.  Therefore, in order
+for it to appear in the bibliography, you have two choices.  You can
+either include the entry key of the \textsf{customc} entry in a
+\cmd{nocite} command inside your document, or you can place that entry
+key in the \textsf{userc} field of another .bib entry that you will be
+citing.  In the latter case, \textsf{biblatex-chicago} will call
+\cmd{nocite} for you, and this method should ensure that there will be
+at least one entry in the bibliography to which the cross-reference
+will point.  (See 17.39--40; lecarre:cornwell, lecarre:quest.)
 
 \mybigspace NB: \mymarginpar{\textbf{userd}} this field is now
 obsolete.  If it appears in a .bib file it will be ignored.
@@ -3026,8 +3339,10 @@ complete list of fields where this functionality is active:
   \textsf{entrysubtype} defined, indicating that the work cited is
   from an archive.
 \item The \textbf{titleaddon} field in all entry types.
-\item The \textbf{type} field in \textsf{artwork}, \textsf{image},
-  \textsf{suppbook}, and \textsf{suppcollection} entry types.
+\item The \textbf{type} field in \textsf{artwork},
+  \mycolor{\textsf{audio}}, \textsf{image}, \mycolor{\textsf{music}},
+  \textsf{suppbook}, \textsf{suppcollection}, and
+  \mycolor{\textsf{video}} entry types.
 \end{enumerate}
 
 In any other cases --- and there are only two examples of this in
@@ -3075,12 +3390,13 @@ cases either form will work.  This functionality is available in the
 \textsf{series} field of \textsf{article}, \textsf{periodical}, and
 \textsf{review} entries; in the \textsf{type} field of
 \textsf{manual}, \textsf{patent}, \textsf{report}, and \textsf{thesis}
-entries; in the \textsf{location} field of \textsf{patent} entries;
-and in the \textsf{language} field in all entry types.  These are the
+entries; in the \textsf{location} field of \textsf{patent} entries; in
+the \textsf{language} field in all entry types; and in the
+\textsf{nameaddon} field in \textsf{customc} entries.  These are the
 places, as far as I can make out, where \textsf{biblatex's} standard
-styles support this feature, and I have followed suit.  If Lehman
-generalizes it still further in a future release, I shall do the same,
-if possible.
+styles support this feature, and I have added the last,
+style-specific, one.  If Lehman generalizes it still further in a
+future release, I shall do the same, if possible.
 
 \mybigspace In \mymarginpar{\textbf{\textbackslash custpunct} \\
   \textbf{\textbackslash custpunctb}} common with other American
@@ -3219,7 +3535,7 @@ originally I intended them for use when a particular name applied only
 to a specific \textsf{title}, rather than to a \textsf{maintitle} or
 \textsf{booktitle} (cf.\ \textbf{namea} and \textbf{nameb}, above).
 
-%\enlargethispage{\baselineskip}
+\enlargethispage{\baselineskip}
 
 \mylittlespace In the present instance, you can use \cmd{partcomp} to
 identify a compiler when \textsf{namec} won't do, e.g., in a
@@ -3407,7 +3723,7 @@ for the \cmd{ifciteseen} test is enabled globally.
 for the long format when presenting dates, slightly shortened when
 presenting date ranges.
 
-\mylittlespace The \colmarginpar{\texttt{dateabbrev=\\false}}
+\mylittlespace The \mymarginpar{\texttt{dateabbrev=\\false}}
 \emph{Manual} prefers full month names in the notes \&\ bibliography
 style.
 
@@ -3440,28 +3756,6 @@ translator's surname.  You can disable this functionality on a
 per-entry basis by setting \texttt{usetranslator=false} in the
 \textsf{options} field.  Cf.\ silver:gawain.
 
-\subsubsection*{{Pre-set \textsf{biblatex-chicago} Option}}
-\label{sec:chicpreset}
-
-This \mymarginpar{\texttt{usecompiler=\\true}} option enables
-automatic use of the name of the compiler (in the \textsf{namec}
-field) at the head of an entry, usually in the absence of an
-\textsf{author}, \textsf{editor}, or \textsf{translator}, in
-accordance with the specification (\emph{Manual} 17.41).  It may also,
-like \texttt{useauthor}, \texttt{useeditor}, and
-\texttt{usetranslator}, be disabled on a per-entry basis by setting
-\texttt{usecompiler=false} in the \textsf{options} field.  Please
-remember that, because \textsf{namec} isn't a standard
-\textsf{biblatex} field, this name won't be part of its standard name
-algorithms, and that any entry headed by a \textsf{namec} will
-therefore need a \textsf{shortauthor} for short notes and a
-\textsf{sortkey} or the like in order to have it appear in the correct
-place in the bibliography.  (The exception to this is when you modify
-the \textsf{editor's} identifying string using the \textsf{editortype}
-field, which is the procedure I recommend if the entry-heading
-compiler is only a compiler, and not also, e.g., an editor or a
-translator.)
-
 \subsubsection*{Other \textsf{biblatex} Formatting Options}
 \label{sec:formatopts}
 
@@ -3494,6 +3788,88 @@ command, you can use \textsf{biblatex's} default settings for notes,
 which are correct as far as the \emph{Manual} is concerned, and then
 switch to these settings for the bibliography.
 
+\subsubsection{{Pre-Set \textsf{chicago} Options}}
+\label{sec:chicpreset}
+
+At \colmarginpar{\texttt{bookpages=\\true}} the request of Scot
+Becker, I have included this rather specialized option, which controls
+the printing of the \textsf{pages} field in \textsf{book} entries.
+Some bibliographic managers, apparently, place the total page count in
+that field by default, and this option allows you to stop the printing
+of this information in notes and bibliography.  It defaults to true,
+which means the field is printed, but it can be set to false either in
+the preamble, for the whole document, or on a per-entry basis in the
+\textsf{options} field (though rather than use this latter method it
+would make sense to eliminate the \textsf{pages} field from the
+affected entries).
+
+\mylittlespace This \colmarginpar{\texttt{doi=true}} option controls
+whether any \textsf{doi} fields present in the .bib file will be
+printed in notes and bibliography.  It defaults to true, and can be
+set to false either in the preamble, for the whole document, or on a
+per-entry basis, in the \textsf{options} field.
+
+\mylittlespace This \colmarginpar{\texttt{isbn=true}} option controls
+whether any \textsf{isan}, \textsf{isbn}, \textsf{ismn},
+\textsf{isrn}, \textsf{issn}, and \textsf{iswc} fields present in the
+.bib file will be printed in notes and bibliography.  It defaults to
+true, and can be set to false either in the preamble, for the whole
+document, or on a per-entry basis, in the \textsf{options} field.
+
+\mylittlespace Once \colmarginpar{\texttt{numbermonth=\\true}} again
+at the request of Scot Becker, I have included this option, which
+controls the printing of the \textsf{month} field in all the
+periodical-type entries when a \textsf{number} field is also present.
+Some bibliographic software, apparently, always includes the month of
+publication even when a \textsf{number} is present.  When all this
+information is available the \emph{Manual} (17.181) prints everything,
+so this option defaults to true, which means the field is printed, but
+it can be set to false either in the preamble, for the whole document,
+or on a per-entry basis in the \textsf{options} field.
+
+\mylittlespace This \colmarginpar{\texttt{url=true}} option controls
+whether any \textsf{url} fields present in the .bib file will be
+printed in notes and bibliography.  It defaults to true, and can be
+set to false either in the preamble, for the whole document, or on a
+per-entry basis, in the \textsf{options} field.  Please note that, as
+in standard \textsf{biblatex}, the \textsf{url} field is always
+printed in \textsf{online} entries, regardless of the state of this
+option.
+
+\mylittlespace This \colmarginpar{\texttt{includeall=\\true}} is the
+one option that rules the five preceding, either printing all the
+fields under consideration --- the default --- or excluding all of
+them.  It is set to \texttt{true} in \textsf{chicago-notes.cbx}, but
+you can change it either in the preamble for the whole document or in
+the \textsf{options} field of individual entries.  The rationale for
+all of these options is the availability of bibliographic managers
+that helpfully present as much data as possible, in every entry, some
+of which may not be felt to be entirely necessary.  Setting
+\texttt{includeall} to \texttt{true} probably works just fine for
+those compiling their .bib databases by hand, but others may find that
+some automatic pruning helps clear things up, at least to a first
+approximation.  Some per-entry work afterward may then polish up the
+details.
+
+\mylittlespace This \mymarginpar{\texttt{usecompiler=\\true}} option
+enables automatic use of the name of the compiler (in the
+\textsf{namec} field) at the head of an entry, usually in the absence
+of an \textsf{author}, \textsf{editor}, or \textsf{translator}, in
+accordance with the specification (\emph{Manual} 17.41).  It may also,
+like \texttt{useauthor}, \texttt{useeditor}, and
+\texttt{usetranslator}, be disabled on a per-entry basis by setting
+\texttt{usecompiler=false} in the \textsf{options} field.  Please
+remember that, because \textsf{namec} isn't a standard
+\textsf{biblatex} field, this name won't be part of its standard name
+algorithms, and that any entry headed by a \textsf{namec} will
+therefore need a \textsf{shortauthor} for short notes and a
+\textsf{sortkey} or the like in order to have it appear in the correct
+place in the bibliography.  (The exception to this is when you modify
+the \textsf{editor's} identifying string using the \textsf{editortype}
+field, which is the procedure I recommend if the entry-heading
+compiler is only a compiler, and not also, e.g., an editor or a
+translator.)
+
 \subsubsection{Style Options -- Preamble}
 \label{sec:useropts}
 
@@ -3530,7 +3906,25 @@ revert to the \LaTeX\ default, but of course you also lose a fair
 amount of other formatting, as well.  See section~\ref{sec:loading},
 below.
 
-%\enlargethispage{\baselineskip}
+\mylittlespace The \colmarginpar{\texttt{juniorcomma}} \emph{Manual}
+(6.49) states that \enquote{commas are no longer required around
+  \emph{Jr.}\ and \emph{Sr.},} so by default \textsf{biblatex-chicago}
+has followed standard \textsf{biblatex} in using a simple space in
+names like \enquote{John Doe Jr.}  Charles Schaum has pointed out that
+traditional \textsc{Bib}\TeX\ practice was to include the comma, and
+since the \emph{Manual} has no objections to this, I have provided an
+option which allows you to turn this behavior back on, either for the
+whole document or on a per-entry basis.  Please note, first, that
+numerical suffixes (John Doe III) never take the comma.  The code
+tests for this situation, and detects cardinal numbers well, but if
+you are using ordinals you may need to set this to \texttt{false} in
+the \textsf{options} field of some entries.  Second, I have fixed a
+bug in older releases which always printed the \enquote{Jr.}\ part of
+the name immediately after the surname, even when the surname came
+before the given names (as in a bibliography).  The package now
+correctly puts the \enquote{Jr.}\ part at the end, after the given
+names, and in this position it always takes a comma, the presence of
+which is unaffected by this option.
 
 \mylittlespace This \mymarginpar{\texttt{natbib}} may look like the
 standard \textsf{biblatex} option, but to keep the coding of
@@ -3644,7 +4038,9 @@ footnotes.  Also in this file is the code that calls
 Chicago-specific bibstrings I've defined unless you provide, in your
 preamble, a \cmd{DeclareLanguageMapping} command adapted for your
 setup, on which see section~\ref{sec:international} below and also
-§§~4.8.1 and 4.10.8 in Lehman's \textsf{biblatex.pdf}.
+§§~4.9.1 and 4.11.7 in Lehman's \textsf{biblatex.pdf}.
+
+\enlargethispage{-\baselineskip}
 
 \mylittlespace What you \emph{will not} lose is the ability to call
 the package options \texttt{annotation, strict, short,} and
@@ -3683,11 +4079,12 @@ helpfully provide as much information as is available, including
 fields that users may well wish not to have printed (ISBN, URL, DOI,
 \textsf{pagetotal}, inter alia).  The standard \textsf{biblatex}
 styles contain a series of options, detailed in \textsf{biblatex.pdf}
-§3.1.3, for controlling the printing of some of these fields, but I
-haven't yet implemented them in \textsf{biblatex-chicago}.  This is in
-my TODO list, and the next release will also include some more
-general options, at Scot's recommendation, that turn off everything at
-once.  Until then judicious pruning remains the only solution.
+§3.1.2.2, for controlling the printing of some of these fields, and
+with this release I have implemented the ones that are relevant to
+\textsf{biblatex-chicago}, along with a couple that Scot requested and
+that may be of more general usefulness.  There is also a general
+option to excise with one command all the fields under consideration
+-- please see section~\ref{sec:chicpreset} above.
 
 \mylittlespace If you are having problems with the interaction of
 punctuation and quotation marks in notes or bibliography, first please
@@ -3758,17 +4155,18 @@ from the latter file below in parentheses.
 The complete list of entry types currently available in
 \textsf{biblatex-chicago-authordate}, minus the odd \textsf{biblatex}
 alias, is as follows: \textbf{article}, \textbf{artwork},
-\textbf{book}, \textbf{bookinbook}, \textbf{booklet},
-\textbf{collection}, \textbf{customa}, \textbf{customb},
-\textbf{customc}, \textbf{image}, \textbf{inbook},
-\textbf{incollection}, \textbf{inproceedings}, \textbf{inreference},
-\textbf{letter}, \textbf{manual}, \textbf{misc}, \textbf{online} (with
-its alias \textbf{www}), \textbf{patent}, \textbf{periodical},
-\textbf{proceedings}, \textbf{reference}, \textbf{report} (with its
-alias \textbf{techreport}), \textbf{review}, \textbf{suppbook},
-\textbf{suppcollection}, \textbf{suppperiodical}, \textbf{thesis}
-(with its aliases \textbf{mastersthesis} and \textbf{phdthesis}), and
-\textbf{unpublished}.
+\mycolor{\textbf{audio}}, \textbf{book}, \textbf{bookinbook},
+\textbf{booklet}, \textbf{collection}, \mycolor{\textbf{customc}},
+\textbf{image}, \textbf{inbook}, \textbf{incollection},
+\textbf{inproceedings}, \textbf{inreference}, \textbf{letter},
+\textbf{manual}, \textbf{misc}, \mycolor{\textbf{music}},
+\textbf{online} (with its alias \textbf{www}), \textbf{patent},
+\textbf{periodical}, \textbf{proceedings}, \textbf{reference},
+\textbf{report} (with its alias \textbf{techreport}), \textbf{review},
+\textbf{suppbook}, \textbf{suppcollection}, \textbf{suppperiodical},
+\textbf{thesis} (with its aliases \textbf{mastersthesis} and
+\textbf{phdthesis}), \textbf{unpublished}, and
+\mycolor{\textbf{video}}.
 
 \mylittlespace What follows is an attempt to specify all the
 differences between these types and the standard provided by
@@ -3976,6 +4374,64 @@ type with an \textsf{entrysubtype}.  Fortunately, in this instance the
 other fields in a \textsf{misc} entry function pretty much as in
 \textsf{artwork} or \textsf{image}.
 
+\mybigspace For \colmarginpar{\textbf{audio}} this release of
+\textsf{biblatex-chicago}, following the request of Johan Nordstrom, I
+have included three new entry types, all undefined by the standard
+styles, designed to allow users to present audiovisual sources in
+accordance with the Chicago specifications.  The \emph{Manual's}
+presentation of such sources (17.263--273), though admirably brief,
+seems to me somewhat inconsistent.  I attempted to condense all the
+requirements into two new entry types, but ended up relying on three,
+the differences between which I shall attempt to delineate here.
+There are likely to be occasions when your choice of entry type is not
+obvious, but at the very least \textsf{biblatex-chicago} should help
+you maintain consistency.  For users of the author-date style, it is
+as well to note here that the \emph{Manual} (17.265) suggests that
+\enquote{such materials are best mentioned in running text and grouped
+  in the reference list under a subhead,} a suggestion you may wish to
+follow, particularly if your audiovisual entries don't typically
+contain the information --- \textsf{author} and \textsf{date} ---
+needed to produce a parseable parenthetical citation.
+
+\mylittlespace The \mycolor{\textbf{music}} type is intended for all
+musical recordings that do not have a video component.  This means,
+for example, digital media (whether on CD or hard drive), vinyl
+records, and tapes.  The \mycolor{\textbf{video}} type includes
+(nearly) all visual media, whether it be films, TV shows, tapes and
+DVDs of the preceding or of any sort of performance (including music),
+or online multimedia.  Finally, the \mycolor{\textbf{audio}} type, our
+current concern, fills gaps in the two others, and presents its
+sources in a more \enquote{book-like} manner.  Published musical
+scores need this type --- unpublished ones would use \textsf{misc}
+with an \textsf{entrysubtype} (shapey:partita) --- as do such favorite
+educational formats as the slideshow and the filmstrip
+(greek:filmstrip, schubert:muellerin, verdi:corsaro).  The
+\emph{Manual} (17.269--270) sometimes uses a similar format for audio
+books and even for films (twain:audio, weed:flatiron), though
+elsewhere these sorts of material are presented as \textsf{music} and
+\textsf{video}, respectively.  It would appear to depend on which
+sorts of publication facts you wish to present --- cf.\ \emph{Manual}
+17.269.
+
+\mylittlespace Once you've accepted the analogy of composer to
+\textsf{author}, constructing an \textsf{audio} entry should be fairly
+straightforward, since many of the fields function just as they do in
+\textsf{book} or \textsf{inbook} entries.  Indeed, please note that I
+compare it to both these other types as, in common with the other
+audiovisual types, \textsf{audio} has to do double duty as an analogue
+for both books and collections, so while there will normally be an
+\textsf{author}, a \textsf{title}, a \textsf{publisher}, a
+\textsf{date}, and a \textsf{location}, there may also be a
+\textsf{booktitle} and/or a \textsf{maintitle} --- see
+schubert:muellerin for an entry that uses all three in citing one song
+from a cycle.  If the medium in question needs specifying, the
+\textsf{type} field is the place for it.  (It is characteristic of
+this entry type that such information is placed after the publisher
+information, whereas in the other audiovisual types their order is
+reversed.)  Finally, the \textsf{titleaddon} field can specify
+functions for which \textsf{biblatex-chicago} provides no automated
+handling, e.g., a librettist (verdi:corsaro).
+
 \mybigspace This \mymarginpar{\textbf{bookinbook}} type provides the
 means of referring to parts of books that are considered, in other
 contexts, themselves to be books, rather than chapters, essays, or
@@ -4007,27 +4463,66 @@ which uses the \textsf{howpublished} field instead of a standard
 \textsf{howpublished} field should instead go in \textsf{publisher}.
 (See clark:mesopot.)
 
-\mybigspace This \mymarginpar{\textbf{customa}} entry type is now
-deprecated in favor of the standard \textsf{biblatex} \textbf{letter}
-type, which see.  If your .bib files contain any \textsf{customa}
-entries you should change them to \textsf{letter} soon, as I am
-reclaiming this custom type for other uses in the next release of
-\textsf{biblatex-chicago}.
-
-\mybigspace This \mymarginpar{\textbf{customb}} entry type is now
-deprecated in favor of the standard \textsf{biblatex}
-\textbf{bookinbook}, which see.  If your .bib files contain any
-\textsf{customb} entries you should change them to \textsf{bookinbook}
-soon, as it will cease to function in the next release of
-\textsf{biblatex-chicago}.
-
-\mybigspace This \mymarginpar{\textbf{customc}} entry type is now
-deprecated in favor of the standard \textsf{biblatex}
-\textbf{suppbook} (and \textbf{suppcollection}, which currently serves
-as an alias to \textsf{suppbook}).  Please see their documentation
-below.  If your .bib files contain any \textsf{customc} entries you
-should change them to \textsf{suppbook} soon, as it will cease to
-function in the next release of \textsf{biblatex-chicago}.
+\mybigspace This \colmarginpar{\textbf{customa}} entry type is now
+obsolete, and any such entries in your .bib file will trigger an
+error.  Please use the standard \textsf{biblatex} \textbf{letter} type
+instead.
+
+\enlargethispage{-\baselineskip}
+
+\mybigspace This \colmarginpar{\textbf{customb}} entry type is now
+obsolete, and any such entries in your .bib file will trigger an
+error.  Please use the standard \textsf{biblatex} \textbf{bookinbook}
+type instead.
+
+\mybigspace This \colmarginpar{\textbf{customc}} entry type has
+undergone a metamorphosis with this release, as I previously warned
+both here and in the RELEASE file.  Rather than being a (deprecated)
+alias of the standard \textsf{biblatex} \textbf{suppbook}, it now
+allows you to include the expansions of abbreviations and shorthands
+\emph{inside} the list of references itself, as recommended by the
+\emph{Manual} (17.47), rather than in the list of shorthands.
+
+\mylittlespace In its simplest form, you need merely place the
+abbreviation of the (often institutional) author's name into the
+\textsf{author} field, and its expansion into the \textsf{title}
+field.  To make sure it appears in the list of references, you can
+either manually include the entry key in a \cmd{nocite} command, or
+you can put that entry key in the \textsf{userc} field in the main
+.bib entry, in which case \textsf{biblatex-chicago-authordate} will
+print the expanded abbreviation if and only if you cite the main
+entry.  (See abbrev:BSI, abbrev:ISO, bsi:abbreviation,
+iso:electrodoc.)  Under ordinary circumstances,
+\textsf{biblatex-chicago} will connect the abbreviation and its
+expansion with the word \enquote{\emph{See}} --- or its equivalent in
+the document's language --- in italics.  If you wish to present the
+cross-reference differently, you can put the connecting word(s) into
+the \textsf{nameaddon} field.
+
+\mylittlespace I haven't disabled in any way the mechanisms
+\textsf{biblatex} uses to produce the list of shorthands, so the
+\cmd{printshorthands} command will still print that list in your
+document.  Judicious use of \texttt{skiplos} in the \textsf{options}
+field will therefore enable simultaneous use of several methods of
+shorthand presentation, if that is useful.  It may be as well to
+mention here that the \emph{Manual} (17.39--40) offers other uses for
+this alphabetized cross-referencing system in reference lists, which
+may also prove helpful for the author-date style.  See the discussion
+of \textsf{customc} in section~\ref{sec:entrytypes} of the notes \&\
+bibliography docs, above.
+
+\mylittlespace Finally, you may need to use this entry type if you
+wish to include a comment inside the parentheses of a citation, as
+specified by the \emph{Manual} (16.111).  If you have a
+\textsf{postnote}, then you can manually provide the punctuation and
+comment there, e.g., \cmd{autocite[4; the unrevised
+  trans.]\{stendhal:parma\}}.  Without a \textsf{postnote}, you'll
+need a separate \textsf{misc} or \textsf{customc} entry containing
+just the text of the comment in the \textsf{title} field,
+\textsf{entrysubtype} \texttt{classical}, and \textsf{options}
+\texttt{skipbib}.  An \cmd{autocites} command calling both the main
+text and the comment will do the trick, e.g.,
+\cmd{autocites\{chicago:manual\}\{chicago:comment\}}.
 
 \mybigspace This \mymarginpar{\textbf{image}} entry type, left
 undefined in the standard styles, is in
@@ -4058,15 +4553,18 @@ entries, and not in \textsf{inbook} entries, mainly because the
 \emph{Manual} (17.70) here specifies a \enquote{multiauthor book.}
 (For more on this mechanism see \textbf{crossref}, below, and note
 that it is also active in \textsf{letter} and \textsf{inproceedings}
-entries.)  If the part of a book to which you are referring has had a
-separate publishing history as a book in its own right, then you may
-wish to use the \textsf{bookinbook} type, instead, on which see above.
-(See \emph{Manual} 17.68--72; \textsf{inbook}: ashbrook:brain,
-phibbs:diary, will:cohere; \textsf{incollection}: centinel:letters,
-contrib:contrib, sirosh:visualcortex; ellet:galena, keating:dearborn,
-and lippincott:chicago [and the \textsf{collection} entry
-prairie:state] demonstrate the use of the \textsf{crossref} field with
-its attendant abbreviations in the list of references.)
+entries.  There is, of course, nothing to prevent you from using the
+mechanism when referring to, e.g., chapters from a single-author book,
+but you'll have to use \textsf{incollection} instead of
+\textsf{inbook}.)  If the part of a book to which you are referring
+has had a separate publishing history as a book in its own right, then
+you may wish to use the \textsf{bookinbook} type, instead, on which
+see above.  (See \emph{Manual} 17.68--72; \textsf{inbook}:
+ashbrook:brain, phibbs:diary, will:cohere; \textsf{incollection}:
+centinel:letters, contrib:contrib, sirosh:visualcortex; ellet:galena,
+keating:dearborn, and lippincott:chicago [and the \textsf{collection}
+entry prairie:state] demonstrate the use of the \textsf{crossref}
+field with its attendant abbreviations in the list of references.)
 
 \mylittlespace \textbf{NB}: The \emph{Manual} suggests that, when
 referring to a chapter, one use either a chapter number or the
@@ -4309,6 +4807,103 @@ within your own work than conformity to some external standard, so it
 is the former which you should pursue.  I hope that
 \textsf{biblatex-chicago} proves helpful in this regard.
 
+\mybigspace This \colmarginpar{\textbf{music}} is one of three new
+audiovisual entry types, and is intended primarily to aid in the
+presentation of musical recordings that do not have a video component,
+though it can also include audio books (auden:reading).  A DVD or VHS
+of an opera or other performance, by contrast, should use the
+\mycolor{\textbf{video}} type instead (handel:messiah).  Because
+\textsf{biblatex} --- and \textsc{Bib}\TeX\ before it --- were
+designed primarily for citing book-like objects, some choices needed
+to be made in assigning the various roles found on the back of a CD to
+the fields in a typical .bib entry.  I have also implemented several
+new bibstrings to help in identifying these roles within entries.  If
+you can think of a simpler way to distribute the roles, please let me
+know, so that I can consider making changes before anyone gets used to
+the current equivalences.
+
+\mylittlespace These equivalences, in summary form, are:
+
+{\renewcommand{\descriptionlabel}[1]{\qquad\textsf{#1}}
+\begin{description}
+\item[author =] composer, songwriter, or performer(s),
+  depending on whom you wish to emphasize by placing them at the head
+  of the entry.
+\item[editor, editora, editorb =] conductor, director or
+  performer(s).  These will ordinarily follow the \textsf{title} of
+  the work, though the usual \texttt{useauthor} and \texttt{useeditor}
+  options can alter the presentation within an entry.  Because these
+  are non-standard roles, you will need to identify them using the
+  following:
+\item[editortype, editoratype, editorbtype:] The most common roles,
+  all associated with specific bibstrings (or their absence), will be
+  \texttt{conductor}, \texttt{director}, \texttt{producer}, and,
+  oddly, \texttt{none}.  The last is particularly useful when
+  identifying the group performing a piece, as it usually doesn't need
+  further specifying and this role prevents \textsf{biblatex} from
+  falling back on the default \texttt{editor} bibstring.
+\item[title, booktitle, maintitle:] As with the other audiovisual
+  types, \textsf{music} serves as an analogue both to books and to
+  collections, so the title will either be, e.g., the album title or a
+  song title, in which latter case the album title would go into
+  \textsf{booktitle}.  The \textsf{maintitle} might be necessary for
+  something like a box set of \emph{Complete Symphonies}.
+\item[series, number:] These two are closely associated, and are
+  intended for presenting the catalog information provided by the
+  music publisher, especially in the case when a publisher oversees
+  more than one label.  In nytrumpet:art, for example, the
+  \textsf{series} field holds the label (\texttt{Vox/Turnabout} and
+  the \textsf{number} field the catalog number (\texttt{PVT 7183}).
+  You can certainly put all of this information into one of the above
+  fields, but separating it may help make the .bib entry more
+  readable.
+\item[howpublished/pubstate:] The \emph{Manual} (17.268) follows the
+  rather specialized requirements for presenting publishing
+  information for musical recordings.  The normal symbol for musical
+  copyright is\ \texttt{\textcircledP} (Unicode point u+2117, SOUND
+  RECORDING COPYRIGHT), but other copyrights \texttt{\textcopyright}
+  are often also asserted.  The \textsf{howpublished} field is the
+  place for these symbols, and it may also have to hold a year
+  designation if the \texttt{\textcircledP} and the
+  \texttt{\textcopyright} apply to different years, as sometimes
+  happens.  In keeping with its general usage in the author-date
+  style, but also recognizing the peculiarities of this entry type, I
+  have made the \textsf{pubstate} field a synonym for
+  \textsf{howpublished}.  Please choose only one of them per entry,
+  and remember that the automatic presentation of reprints via the
+  \textsf{pubstate} field is disabled in \textsf{music} entries.  (See
+  nytrumpet:art.)
+\item[date, publisher:] Ordinarily, you can use a combination of the
+  \textsf{date} and \textsf{origdate} fields, along with the
+  \texttt{cmsdate} entry option, to present the various dates of
+  publication and republication of a work.  This will mostly still
+  work in \textsf{music} entries, but, as I just pointed out, the
+  automatic presentation of reprints via the \textsf{pubstate} field
+  has been turned off, as it doesn't provide a good fit for the
+  materials at hand.  Instead, the \textsf{howpublished} or
+  \textsf{pubstate} field can be used manually to present the
+  publishing complexities, including year information that won't be
+  placed at the head of an entry.  Any year data you do wish placed
+  there needs to go in \textsf{date} or \textsf{origdate}, as usual.
+  Thankfully, the \textsf{publisher} field itself is self-explanatory.
+\item[type:] As in all the audiovisual entry types, the \textsf{type}
+  field holds the medium of the recording, e.g., vinyl, 33 rpm,
+  8-track tape, cassette, compact disc, mp3, ogg vorbis.
+\end{description}}
+
+I should also note here that I have implemented the standard
+\textsf{biblatex} \mycolor{\textbf{eventdate}} field, in case you need
+it to identify a particular recording session or concert.  It will be
+printed just after the \textsf{title}.  The entries in
+\textsf{dates-test.bib} should at least give you a good idea of how
+this all works, and that file also contains an example of an audio
+book presented in a \textsf{music} entry.  If you browse the examples
+in the \emph{Manual} you will see that no author-date examples are
+given, so I have generally adopted the formatting decisions I made for
+the notes \&\ bibliography style.  Arguments as to why I'm wrong will,
+of course, be entertained.  (Cf. 17.268; auden:reading,
+beethoven:sonata29, bernstein:shostakovich, nytrumpet:art.)
+
 \mybigspace The \mymarginpar{\textbf{online}} \emph{Manual}'s
 instructions (17.142--147, 17.198, 17.234--237) for citing online
 materials are slightly different from those suggested by standard
@@ -4422,6 +5017,8 @@ this, please let me know.  (Cf.\ barcott:review, bundy:macneil,
 Clemens:letter, gourmet:052006, kozinn:review, nyt:trevorobit,
 ratliff:review, unsigned:ranke, wallraff:word.)
 
+\enlargethispage{\baselineskip}
+
 \mybigspace This \mymarginpar{\textbf{suppbook}} is the entry type to
 use if the main focus of a reference is supplemental material in a
 book or in a collection, e.g., an introduction, afterword, or forward,
@@ -4476,6 +5073,88 @@ the \textsf{article} entry type for this purpose, though I have
 retained \textsf{suppperiodical} in order to facilitate switching
 between the two Chicago styles.
 
+\mybigspace This \colmarginpar{\textbf{video}} is the last of the new
+audiovisual entry types, and as its name suggests it is intended for
+citing visual media, be it films of any sort or TV shows, broadcast,
+on the Net, on VHS, DVD, or Blu-ray.  As with the \textsf{music} type
+discussed above, certain choices had to be made when associating the
+production roles found, e.g., on a DVD, to those bookish ones provided
+by \textsf{biblatex}.  Here are the main correspondences:
+
+{\renewcommand{\descriptionlabel}[1]{\qquad\textsf{#1}}
+\begin{description}
+\item[author:] This will not infrequently be left undefined, as the
+  director of a film should be identified as such and therefore placed
+  in the \textsf{editor} field with the appropriate
+  \textsf{editortype} (see below).  You will need it, however, to
+  identify the composer of, e.g., an oratorio on VHS (handel:messiah),
+  or perhaps the provider of commentaries or other extras on a film
+  DVD (cleese:holygrail).
+\item[editor, editora, editorb:] The director or producer, or possibly
+  the performer or conductor in recorded musical performances.  These
+  will ordinarily follow the \textsf{title} of the work, though the
+  usual \texttt{useauthor} and \texttt{useeditor} options can alter
+  the presentation within an entry.  Because these are non-standard
+  roles, you will need to identify them using the following:
+\item[editortype, editoratype, editorbtype:] The most common roles,
+  all associated with specific bibstrings (or their absence), will
+  likely be \texttt{director}, \texttt{produ\-cer}, and, oddly,
+  \texttt{none}.  The last is particularly useful if you want to
+  identify performers, as they usually don't need further specifying
+  and this role prevents \textsf{biblatex} from falling back on the
+  default \texttt{editor} bibstring.
+\item[title, titleaddon, booktitle, maintitle:] As with the other
+  audiovisual types, \textsf{video} serves as an analogue both to
+  books and to collections, so the \textsf{title} may be of a whole
+  film DVD or of a TV series, or it may identify one episode in a
+  series or one scene in a film.  In the latter cases, the title of
+  the whole would go in \textsf{booktitle}.  The \textsf{titleaddon}
+  field may be useful for specifying the season and/or episode number
+  of a TV series, or for any other information that needs to come
+  between the \textsf{title} and the \textsf{booktitle}
+  (cleese:holygrail, episode:tv, handel:messiah).  As in the
+  \textsf{music} type, \textsf{maintitle} may be necessary for a boxed
+  set or something similar.
+\item[date, origdate, pubstate:] The publication details of this sort
+  of material are usually straightforward, at least compared with the
+  \textsf{music} type, but there will be occasions when you need two
+  dates.  When citing an episode of a long-running TV series you may
+  need both a date for the episode and either a range for the whole
+  run or a year for the release of the box set, and when citing a film
+  on DVD you may want to present both the original release date and
+  the date of release on DVD.  In these cases, the usual
+  \textsf{chicago-authordate} mechanisms for choosing the date to
+  appear at the head of an entry apply.  You can also use the standard
+  \textsf{pubstate} field with \texttt{reprint} in it to control the
+  printing of the original date in parentheses at the end of the
+  entry, though I have altered the string that is printed there (see
+  next item).  I have also disabled the printing of the
+  \cmd{bibstring\{reprint\}} before the publication information, as it
+  doesn't really apply to this class of material.  Cf.\ episode:tv,
+  hitchcock:nbynw; \textsf{pubstate}, below.
+\item[entrysubtype:] In most entry types, the string printed in
+  parentheses to date the original appearance of a work is
+  \enquote{\texttt{Orig.\ pub.}}  This won't work in \textsf{video},
+  so by default in this entry type it will print
+  \enquote{\texttt{Orig.\ released.}}  As this isn't quite right for
+  TV shows, you can place the exact string \texttt{tv} into the
+  \textsf{entrysubtype} field to obtain \enquote{\texttt{Orig.\
+      shown.}}  Alternatively, you can put whatever you like in the
+  \textsf{pubstate} field, including parentheses and the year if you
+  want them, and all of it will appear where it should.  (The
+  \emph{Manual} gives no guidance on presenting televisual materials,
+  so I've improvised.  Any improvements will be gratefully
+  considered.)
+\item[type:] As in all the audiovisual entry types, the \textsf{type}
+  field holds the medium of the \textsf{title}, e.g., 8 mm, VHS, DVD,
+  Blu-ray, MPEG.
+\end{description}}
+
+As with the \textsf{music} type, entries in \textsf{dates-test.bib}
+should at least give you a good idea of how all this works.  (Cf.\
+17.270, 273; cleese:holygrail, episode:tv, handel:messiah,
+hitchcock:nbynw, loc:city.)
+
 \subsection{Entry Fields}
 \label{sec:fields:authdate}
 
@@ -4635,8 +5314,6 @@ mark indicating doubt.  As long as you have the right string in the
 \textsf{authortype} field, \textsf{biblatex-chicago-authordate} will
 also do the right thing automatically in text citations.
 
-\enlargethispage{-\baselineskip}
-
 \mylittlespace The \textsf{nameaddon} field furnishes the means to
 cope with the case of pseudonymous authorship.  If the author's real
 name isn't known, simply put \texttt{pseud.}\ (or
@@ -4646,7 +5323,7 @@ there, formatted as you wish it to appear, as the contents of this
 field won't be manipulated as a name by \textsf{biblatex}
 (lecarre:quest, stendhal:parma).  If you have given the author's real
 name in the \textsf{author} field, then the pseudonym goes in
-\textsf{nameaddon}, in the form \texttt{Firstname Lastname, pseud.}\
+\textsf{nameaddon}, in the form \texttt{Firstname Lastname,\,pseud.}\
 (creasey:ashe:blast, creasey:morton:hide, creasey:\\york:death).  This
 latter method will allow you to keep all references to one author's
 work under different pseudonyms grouped together in the list of
@@ -4659,12 +5336,12 @@ abbreviated form of the \textsf{journaltitle} into
 \textsf{shortauthor}, a practice condoned by the \emph{Manual}
 (17.159) even in author-date reference lists.  In iso:electrodoc, I
 provided a \textsf{shorthand} field, which by default in
-\textsf{biblatex-chicago-authordate} will appear in text citations and
-will produce an entry in a list of shorthands that clarifies the
-abbreviation.  (A future release of \textsf{biblatex-chicago} will
-allow you to explain the abbreviation inside the list of references
-itself, as suggested by the \emph{Manual}, 17.47.)  Please see
-\textsf{shorthands} below for the details.
+\textsf{biblatex-chicago-authordate} will appear in text citations.
+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.)
 
 \mybigspace In \mymarginpar{\textbf{authortype}}
 \textsf{biblatex-chicago}, this field serves a function very much in
@@ -4688,6 +5365,8 @@ 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}
+
 \mybigspace For \mymarginpar{\textbf{bookauthor}} the most part, as in
 \textsf{biblatex}, a \textsf{bookauthor} is the author of a
 \textsf{booktitle}, so that, for example, if one chapter in a book has
@@ -5002,6 +5681,8 @@ field.  The Digital Object Identifier of the work, which the
   or other locators} (17.181; friedman:learn\-ing).  Cf.\
 \textsf{url}.
 
+\enlargethispage{-\baselineskip}
+
 \mybigspace Standard \mymarginpar{\textbf{edition}} \textsf{biblatex}
 field.  If you enter a plain cardinal number, \textsf{biblatex} will
 convert it to an ordinal (chicago:manual), followed by the appropriate
@@ -5056,14 +5737,15 @@ languages, but they are otherwise unnecessary.
 Cf. section~\ref{sec:international}, and also \textsf{namea},
 \textsf{nameb}, \textsf{namec}, and \textsf{translator}.)
 
-\mybigspace The \mymarginpar{\textbf{editora\\editorb\\editorc}} new
-release of \textsf{biblatex} provides these fields as a means to
+\mybigspace The \mymarginpar{\textbf{editora\\editorb\\editorc}} newer
+releases of \textsf{biblatex} provide these fields as a means to
 specify additional contributors to texts in a number of editorial
-roles.  I'm uncertain how relevant they may be to users of the Chicago
-styles, but I have implemented them just as the standard styles do.  To
-specify the role, use the new fields \textsf{editoratype},
-\textsf{editorbtype}, and \textsf{editorctype}, and see
-\textsf{biblatex.pdf} §~2.3.6.
+roles.  In the Chicago styles they seem most relevant for the
+audiovisual types, especially \textsf{music} and \textsf{video}, where
+they help to identify conductors, directors, producers, and
+performers.  To specify the role, use the fields \textsf{editoratype},
+\textsf{editorbtype}, and \textsf{editorctype}, which see.  (Cf.\
+bernstein:shostakovich, handel:messiah.)
 
 \mybigspace Normally, \mymarginpar{\textbf{editortype}} with the
 exception of the \textsf{article} type,
@@ -5134,12 +5816,12 @@ the following entry types: \textsf{collection}, \textsf{letter},
 
 \mybigspace These
 \mymarginpar{\textbf{editoratype\\editorbtype\\editorctype}} fields
-are new to \textsf{biblatex} 0.9, and identify the exact role of the
-person named in the corresponding \textsf{editor[a-c]} field.  Note
-that they are not part of the string concatenation mechanism.  I have
-implemented them just as the standard styles do, though I am uncertain
-of their usefulness for users of Chicago.  Cf.\ \textsf{biblatex.pdf}
-§~2.3.6.
+identify the exact role of the person named in the corresponding
+\textsf{editor[a-c]} field.  Note that they are not part of the string
+concatenation mechanism.  I have implemented them just as the standard
+styles do, and they have now found a use particularly in
+\textsf{music} and \textsf{video} entries.  Cf.\
+bernstein:shostakovich, handel:messiah.
 
 \mybigspace Standard \mymarginpar{\textbf{eid}} \textsf{biblatex}
 field, providing a string or number some journals use uniquely to
@@ -5147,9 +5829,9 @@ identify a particular article.  Only applicable to the
 \textsf{article} entry type.  Not typically required by the
 \emph{Manual}.
 
-\mybigspace Standard \mymarginpar{\textbf{entrysubtype}} and very
+\mybigspace Standard \colmarginpar{\textbf{entrysubtype}} and very
 powerful \textsf{biblatex} field, left undefined by the standard
-styles.  In \textsf{biblatex-chicago-authordate} it has four very
+styles.  In \textsf{biblatex-chicago-authordate} it has five very
 specific uses, the first three of which I have designed in order to
 maintain, as much as possible, backward compatibility with the
 standard styles.  First, in \textsf{article} and \textsf{periodical}
@@ -5200,10 +5882,25 @@ unpublished archive.  Please see section~\ref{sec:types:authdate}
 above under \textbf{misc} for all the details on how these citations
 work.
 
-\mylittlespace Fourth, and finally, the field can be defined in the
+\mylittlespace Fourth, the field can be defined in the
 \textsf{artwork} entry type in order to refer to a work from antiquity
 whose title you do not wish to be italicized.  Please see the
-documentation of \textsf{artwork} above for the details.
+documentation of \textsf{artwork} above for the details.  Fifth, and
+finally, you can use the exact string \texttt{tv} to identify
+televisual material as a subset of the \textsf{video} entry type.
+This will only affect the entry in the list of references if you use
+\texttt{reprint} in the \textsf{pubstate} field in order to print
+the date a program was originally shown in parentheses at the end of
+such an entry.  (It's a niche usage but it at least maintains
+consistency for the \texttt{reprint} mechanism.  Cf.\
+\textsf{pubstate}, below.)
+
+\mybigspace This \colmarginpar{\textbf{eventdate}} is a standard
+\textsf{biblatex} field, added in this release to the
+\mycolor{\textbf{music}} entry type in case users need it to identify
+a particular recording session or concert.  See the documentation of
+that type above.  The field will currently be ignored in any other
+sort of entry.
 
 \mybigspace As \mymarginpar{\textbf{foreword}} with the
 \textsf{afterword} field above, \textsf{foreword} will in general
@@ -5226,7 +5923,8 @@ parentheses, just after the author(s).
 \textsf{biblatex} field, mainly applicable in the \textsf{booklet}
 entry type, where it replaces the \textsf{publisher}.  I have also
 retained it in the \textsf{misc} and \textsf{unpublished} entry types,
-for historical reasons.
+for historical reasons, and either it or \textsf{pubstate} can be used
+in \textsf{music} entries to clarify publication details.
 
 \mybigspace Standard \mymarginpar{\textbf{institution}}
 \textsf{biblatex} field.  In the \textsf{thesis} entry type, it will
@@ -5347,6 +6045,8 @@ language or a translation to either of the latter two, you could
 probably manage it with special formatting inside those fields
 themselves.
 
+\enlargethispage{\baselineskip}
+
 \mybigspace I \mymarginpar{\textbf{lista}} intend this field
 specifically for presenting citations from reference works that are
 arranged alphabetically, where the name of the article rather than a
@@ -5434,6 +6134,13 @@ creasey:york:death, and le\-carre:quest); \cmd{bibstring\{pseudonym\}}
 does the work for you.  See under \textbf{author} above for the full
 details.
 
+\mylittlespace In the \textsf{customc} entry type, on the other hand,
+which is used to create alphabetized expansions of
+\textsf{shorthands}, the \textsf{nameaddon} field allows you to change
+the default string linking the two parts of the expansion.  The code
+automatically tests for a known bibstring, which it will italicize.
+Otherwise, it prints the string as is.
+
 \mybigspace Like \mymarginpar{\textbf{nameb}} \textsf{namea}, above,
 this is a field left undefined by the standard \textsf{biblatex}
 styles.  In \textsf{biblatex-chicago}, it contains the name(s) of the
@@ -5558,7 +6265,7 @@ and below in section~\ref{sec:authuseropts}.  See creel:house,
 eliot:pound, emerson:nature, ency:britannica, herwign:office,
 lecarre:quest, and maitland:canon for examples of the field in use.
 
-\enlargethispage{\baselineskip}
+% \enlargethispage{\baselineskip}
 
 \mybigspace A \mymarginpar{\textbf{organization}} standard
 \textsf{biblatex} field, retained mainly for use in the \textsf{misc},
@@ -5747,15 +6454,16 @@ problem for users.  Instead of hand-formatting in the
 \textsf{location} field, you can now simply put the string
 \texttt{reprint} into the \textsf{pubstate} field, and depending on
 which date you have chosen to appear at the head of the entry,
-\textsf{biblatex-chicago-authordate} will either print the string
-\texttt{Repr.}\ in the proper place or otherwise provide a
+\textsf{biblatex-chicago-authordate} will either print the (localized)
+string \texttt{Repr.}\ in the proper place or otherwise provide a
 parenthesized notice at the end of the entry detailing the original
 publication date.  See under \textbf{date} above for the available
 permutations. (Cf.\ aristotle:metaphy:gr, maitland:canon,
 maitland:equity, schweitzer:bach.)  If the field contains something
 other than the word \texttt{reprint}, then it will be treated as in
-the standard styles, and printed after the publication information,
-although the \emph{Manual} has nothing to say about this.
+the standard styles, and printed after the publication information.
+In \textsf{music} entries, its literal contents will always be printed
+as part of the publication data.
 
 \mybigspace I \mymarginpar{\textbf{redactor}} have implemented this
 field just as \textsf{biblatex}'s standard styles do, even though the
@@ -5866,7 +6574,7 @@ most situations, but if you have set \texttt{useauthor=false} (and not
 only \textsf{shorteditor} will be recognized.  Cf.\
 \textsf{editortype}, above.
 
-\mybigspace This \mymarginpar{\textbf{shorthand}} is
+\mybigspace This \colmarginpar{\textbf{shorthand}} is
 \textsf{biblatex}'s mechanism for using abbreviations in citations.
 For \textsf{biblatex-chicago-authordate} I have modified it somewhat
 to conform to the needs of the specification, though there is a
@@ -5877,34 +6585,40 @@ readers with an abbreviation is to ensure that they know how to expand
 it.  In the notes \&\ bibliography style this is accomplished with a
 notice in the first footnote citing a given work, which explains that
 henceforth the abbreviation will be used instead, and also, if needed,
-a list of shorthands that summarizes all the abbreviations used in a
-particular text.  The first part of this system isn't available in the
-author-date style of citation, and indeed these citations are in
-themselves already highly-abbreviated keys to the fuller information
-to be found in the list of references.  There are cases, however,
-particularly when institutions or \textsf{journaltitles} appear as
-authors, when you may feel the need to provide a shortened version for
-citations.  I have already discussed one option available to you just
-above (cf.\ \textbf{shortauthor}), but for this to work the
-abbreviation must either be instantly recognizable to your readership
-or at least easily parseable by them.
+with a list of shorthands that summarizes all the abbreviations used
+in a particular text.  The first part of this system isn't available
+in the author-date style of citation, and indeed these citations are
+in themselves already highly-abbreviated keys to the fuller
+information to be found in the list of references.  There are cases,
+however, particularly when institutions or \textsf{journaltitles}
+appear as authors, when you may feel the need to provide a shortened
+version for citations.  I have already discussed one option available
+to you just above (cf.\ \textbf{shortauthor}), but for this to work
+the abbreviation must either be instantly recognizable to your
+readership or at least easily parseable by them.
 
 \mylittlespace The \emph{Manual's} suggestion, particularly when
 \enquote{long names are cited several times} (17.47), is to provide an
-abbreviation which is then explained by a cross-refer\-ence inside the
-list of references itself.  In a future release of
-\textsf{biblatex-chicago}, once I have reclaimed one of the custom
-entry types from its current use, I shall implement exactly this
-system.  For the moment, the author-date style will automatically
-produce this cross-reference in the list of shorthands, rather than in
-the list of references.  (Cf.\ bsi:abbreviation, iso:electrodoc.)  As
-in standard \textsf{biblatex}, the \cmd{printshorthands} command will
-produce a formatted list of these cross-references.  You can, if
-necessary, place \texttt{skiplos} in the \textsf{options} field to
-exclude a particular entry from the list of shorthands.  (See
+abbreviation which is then explained by an alphabetized
+cross-refer\-ence inside the list of references itself.  In this
+release of \textsf{biblatex-chicago}, I have reclaimed one of the
+custom entry types (\textbf{customc}) to implement exactly this
+system.  See the explanation of this entry type above, but basically
+you can put the abbreviation itself in the \textsf{author} field and
+its expansion in the \textsf{title} field, then use either
+\cmd{nocite} or a \textsf{userc} field to ensure the entry appears in
+the list of references.  (Cf.\ abbrev:BSI, abbrev:ISO,
+bsi:abbreviation, iso:electrodoc.)
+
+\mylittlespace The author-date style will still automatically print
+the cross-reference in the list of shorthands too, as in standard
+\textsf{biblatex}, if the \cmd{printshorthands} command appears in
+your document.  You can place \texttt{skiplos} in the \textsf{options}
+field to exclude a particular entry from the list of shorthands if you
+do decide to print that list, giving maximum flexibility.  (See
 16.39--40, and also \textsf{biblatex.pdf} for more information.)
 
-\enlargethispage{-\baselineskip}
+%\enlargethispage{-\baselineskip}
 
 \mylittlespace As I mentioned above under \textbf{crossref}, extra
 care is needed when using shorthands with cross-references, and I
@@ -5951,7 +6665,7 @@ present several reprinted books by the same author.  See
 \mybigspace The \mymarginpar{\textbf{subtitle}} subtitle for a
 \textsf{title} --- see next entry.
 
-\enlargethispage{-\baselineskip}
+%\enlargethispage{-\baselineskip}
 
 \mybigspace In \mymarginpar{\textbf{title}} the vast majority of
 cases, this field works just as it always has in \textsc{Bib}\TeX, and
@@ -6044,7 +6758,14 @@ fields], but it still pays to be aware of the issue.)
   \textsf{unpublished} entry types, \textsf{issuetitle} in
   \textsf{article} and \textsf{periodical} entry types.
   \textsf{booktitleaddon}, \textsf{maintitleaddon}, and
-  \textsf{titleaddon} in all entry types. 
+  \textsf{titleaddon} in all entry types.
+\item[\qquad \mycolor{Italics or Roman:}] All of the audiovisual entry
+  types --- \textsf{audio}, \textsf{music}, and \textsf{video} ---
+  have to serve as analogues both to \textsf{book} and to
+  \textsf{inbook}.  Therefore, if there is both a \textsf{title} and a
+  \textsf{booktitle}, then the \textsf{title} will be in the main text
+  font.  If there is no \textsf{booktitle}, then the \textsf{title}
+  will be italicized.
 \end{description}
 
 Now, the rules for which entry type to use for which sort of work tend
@@ -6088,6 +6809,8 @@ sentence-ending punctuation, assuming that such a \textsf{title}
 begins with a lowercase letter in your .bib database.  See
 \textbf{\textbackslash autocap} below for more details.
 
+\enlargethispage{\baselineskip}
+
 \mybigspace Standard \mymarginpar{\textbf{titleaddon}}
 \textsf{biblatex} intends this field for use with additions to titles
 that may need to be formatted differently from the titles themselves,
@@ -6158,7 +6881,7 @@ translator's name, behavior that can be controlled with the
 \textsf{author}, \textsf{editor}, \textsf{namea}, \textsf{nameb}, and
 \textsf{namec}.
 
-\enlargethispage{\baselineskip}
+% \enlargethispage{\baselineskip}
 
 \mybigspace This \mymarginpar{\textbf{type}} is a standard
 \textsf{biblatex} field, and in its normal usage serves to identify
@@ -6182,14 +6905,17 @@ Cf.\ \textsf{suppbook} above for the details.  (See \emph{Manual}
 17.74--75; polakow:afterw, prose:intro).
 
 \mylittlespace You can also use the \textsf{type} field in
-\textsf{artwork} and \textsf{image} entries to identify the medium of
-the artwork or photograph, e.g., \texttt{oil on canvas} or
-\texttt{albumen print}.  If the first word in this field would
-normally only be capitalized at the beginning of a sentence, then
-leave it in lowercase in your .bib file and \textsf{biblatex} will
-automatically do the right thing in citations.  Cf.\ \textsf{artwork}
-and \textsf{image}, above, for all the details.  (See leo:madonna,
-bedford:photo.)
+\textsf{artwork}, \mycolor{\textsf{audio}}, \textsf{image},
+\mycolor{\textsf{music}}, and \mycolor{\textsf{video}} entries to
+identify the medium of the work, e.g., \texttt{oil on canvas},
+\texttt{albumen print}, \texttt{compact disc}, or \texttt{MPEG}.  If
+the first word in this field would normally only be capitalized at the
+beginning of a sentence, then leave it in lowercase in your .bib file
+and \textsf{biblatex} will automatically do the right thing in
+citations.  Cf.\ \textsf{artwork}, \textsf{audio}, \textsf{image},
+\textsf{music}, and \textsf{video}, above, for all the details.  (See
+auden:reading, bedford:photo, cleese:holygrail, leo:madonna,
+nytrumpet:art.)
 
 \mybigspace Standard \mymarginpar{\textbf{url}} \textsf{biblatex}
 field, it holds the url of an online publication, though you can
@@ -6221,6 +6947,26 @@ either before the date [\textsf{usera}] or after it [\textsf{pages}].
 Cp. kozinn:review [17.202] and morgenson:market [17.190].  The choice
 would appear to be yours.)
 
+\mybigspace I \colmarginpar{\textbf{userc}} have now implemented this
+supplemental \textsf{biblatex} field as part of the Chicago
+author-date style's handling of the \textsf{shorthand} field and other
+cross-references within the list of references.  (The \enquote{c} part
+is meant as a sort of mnemonic for this latter, general function,
+though its main use will probably be in association with the former.)
+If you use the \mycolor{\textbf{customc}} entry type to include
+alphabetized expansions of \textsf{shorthands} in the reference list,
+or indeed to provide cross-references of any sort to separate entries
+in that list, it is unlikely that you will cite the \textsf{customc}
+entry itself in the body of your text.  Therefore, in order for it to
+appear in the reference list, you have two choices.  You can either
+include the entry key of the \textsf{customc} entry in a \cmd{nocite}
+command inside your document, or you can place that entry key in the
+\textsf{userc} field of the .bib entry that actually uses the
+\textsf{shorthand}.  In the latter case, \textsf{biblatex-chicago}
+will call \cmd{nocite} for you when you cite the main entry.  (See
+17.39--40,47; abbrev:BSI, abbrev:ISO, bsi:abbreviation,
+iso:electrodoc.)
+
 \mybigspace Another \mymarginpar{\textbf{usere}} supplemental
 \textsf{biblatex} field, which \textsf{biblatex-chicago} uses
 specifically to provide a translated \textsf{title} of a work,
@@ -6382,8 +7128,10 @@ active:
   \textsf{entrysubtype} defined, indicating that the work cited is
   from an archive.
 \item The \textbf{titleaddon} field in all entry types.
-\item The \textbf{type} field in \textsf{artwork}, \textsf{image},
-  \textsf{suppbook}, and \textsf{suppcollection} entry types.
+\item The \textbf{type} field in \textsf{artwork},
+  \mycolor{\textsf{audio}}, \textsf{image}, \mycolor{\textsf{music}},
+  \textsf{suppbook}, \textsf{suppcollection}, and
+  \mycolor{\textsf{video}} entry types.
 \end{enumerate}
 
 If you accidentally use the \cmd{autocap} macro in one of the above
@@ -6391,7 +7139,7 @@ fields, it frankly shouldn't matter at all, and you'll still get what
 you want, but taking advantage of the automatic provisions should at
 least save some typing.
 
-\enlargethispage{-\baselineskip}
+%\enlargethispage{-\baselineskip}
 
 \mybigspace This \mymarginpar{\textbf{\textbackslash bibstring}} is
 Lehman's very powerful mechanism to allow \textsf{biblatex}
@@ -6406,11 +7154,13 @@ functionality is available in the \textsf{series} field of
 \textsf{article}, \textsf{periodical}, and \textsf{review} entries; in
 the \textsf{type} field of \textsf{manual}, \textsf{patent},
 \textsf{report}, and \textsf{thesis} entries; in the \textsf{location}
-field of \textsf{patent} entries; and in the \textsf{language} field
-in all entry types.  These are the places, as far as I can make out,
-where \textsf{biblatex's} standard styles support this feature, and I
-have followed suit.  If Lehman generalizes it still further in a
-future release, I shall do the same, if possible.
+field of \textsf{patent} entries; in the \textsf{language} field in
+all entry types; and in the \textsf{nameaddon} field in
+\textsf{customc} entries.  These are the places, as far as I can make
+out, where \textsf{biblatex's} standard styles support this feature,
+though I have added the last, style-specific, one.  If Lehman
+generalizes it still further in a future release, I shall do the same,
+if possible.
 
 \mybigspace This \mymarginpar{\textbf{\textbackslash mkbibquote}} is
 the standard \textsf{biblatex} command, which requires attention here
@@ -6553,7 +7303,9 @@ the former doesn't exist.  Because of the way the Chicago author-date
 specification recommends handling abbreviations, I have switched this
 around, and the command now searches for a \textsf{shorthand} first.
 This holds also for the multicite form \textbf{\textbackslash
-  textcites}.
+  textcites}, though both commands revert to their standard
+\textsf{biblatex} behavior when you give the \texttt{cmslos=false}
+option in the preamble.
 
 \subsection{Package Options}
 \label{sec:opts:authdate}
@@ -6595,10 +7347,10 @@ this should only occur when a source is cited \enquote{more than once
 command from \textsf{biblatex} to achieve the greatest compliance, as
 the package only offers automatic resetting on part, chapter, section,
 and subsection boundaries, while \textsf{biblatex-chicago}
-automatically resets the tracker at page breaks.  (Cf./
-\textsf{biblatex.pdf} §3.1.2.)  Whenever there might be any ambiguity,
-\textsf{biblatex} should default to printing a more informative
-reference.
+automatically resets the tracker at page breaks.  (Cf.\
+\textsf{biblatex.pdf} §3.1.2.1.)  Whenever there might be any
+ambiguity, \textsf{biblatex} should default to printing a more
+informative reference.
 
 \mylittlespace If you are going to repeat a source, make sure that the
 cite command provides a \textsf{postnote} --- if you don't need to cite a
@@ -6616,6 +7368,10 @@ commands for controlling, among other things, the \emph{ibidem}
 mechanism.  It tracks individual pages if \LaTeX\ is in oneside mode,
 or whole spreads in twoside mode.
 
+\mylittlespace This \colmarginpar{\texttt{punctfont=\\true}} fixes a
+minor problem with punctuation in titles, ensuring that the colon
+between a title and a subtitle appears in the correct, matching font.
+
 \mylittlespace This \mymarginpar{\texttt{sorting=nyt}} changes
 \textsf{biblatex's} default sorting order in the list of references to
 comply with the Chicago author-date specification.
@@ -6633,10 +7389,70 @@ translator's surname.  You can disable this functionality on a
 per-entry basis by setting \texttt{usetranslator=false} in the
 \textsf{options} field.  Cf.\ silver:gawain.
 
-\subsubsection*{{Pre-set \textsf{biblatex-chicago} Options}}
+\subsubsection{{Pre-set \textsf{chicago} Options}}
 \label{sec:authpreset}
 
-This \mymarginpar{\texttt{cmslos=true}} option alters
+At \colmarginpar{\texttt{bookpages=\\true}} the request of Scot
+Becker, I have included this rather specialized option, which controls
+the printing of the \textsf{pages} field in \textsf{book} entries.
+Some bibliographic managers, apparently, place the total page count in
+that field by default, and this option allows you to stop the printing
+of this information in the reference list.  It defaults to true, which
+means the field is printed, but it can be set to false either in the
+preamble, for the whole document, or on a per-entry basis in the
+\textsf{options} field (though rather than use this latter method it
+would make sense to eliminate the \textsf{pages} field from the
+affected entries).
+
+\mylittlespace This \colmarginpar{\texttt{doi=true}} option controls
+whether any \textsf{doi} fields present in the .bib file will be
+printed in the reference list.  It defaults to true, and can be set to
+false either in the preamble, for the whole document, or on a
+per-entry basis, in the \textsf{options} field.
+
+\mylittlespace This \colmarginpar{\texttt{isbn=true}} option controls
+whether any \textsf{isan}, \textsf{isbn}, \textsf{ismn},
+\textsf{isrn}, \textsf{issn}, and \textsf{iswc} fields present in the
+.bib file will be printed in the list of references.  It defaults to
+true, and can be set to false either in the preamble, for the whole
+document, or on a per-entry basis, in the \textsf{options} field.
+
+\mylittlespace Once \colmarginpar{\texttt{numbermonth=\\true}} again
+at the request of Scot Becker, I have included this option, which
+controls the printing of the \textsf{month} field in all the
+periodical-type entries when a \textsf{number} field is also present.
+Some bibliographic software, apparently, always includes the month of
+publication even when a \textsf{number} is present.  When all this
+information is available the \emph{Manual} (17.181) prints everything,
+so this option defaults to true, which means the field is printed, but
+it can be set to false either in the preamble, for the whole document,
+or on a per-entry basis in the \textsf{options} field.
+
+\mylittlespace This \colmarginpar{\texttt{url=true}} option controls
+whether any \textsf{url} fields present in the .bib file will be
+printed in the reference list.  It defaults to true, and can be set to
+false either in the preamble, for the whole document, or on a
+per-entry basis, in the \textsf{options} field.  Please note that, as
+in standard \textsf{biblatex}, the \textsf{url} field is always
+printed in \textsf{online} entries, regardless of the state of this
+option.
+
+\mylittlespace This \colmarginpar{\texttt{includeall=\\true}} is the
+one option that rules the five preceding, either printing all the
+fields under consideration --- the default --- or excluding all of
+them.  It is set to \texttt{true} in \textsf{chicago-authordate.cbx},
+but you can change it either in the preamble for the whole document or
+in the \textsf{options} field of individual entries.  The rationale
+for all of these options is the availability of bibliographic managers
+that helpfully present as much data as possible, in every entry, some
+of which may not be felt to be entirely necessary.  Setting
+\texttt{includeall} to \texttt{true} probably works just fine for
+those compiling their .bib databases by hand, but others may find that
+some automatic pruning helps clear things up, at least to a first
+approximation.  Some per-entry work afterward may then polish up the
+details.
+
+\mylittlespace This \mymarginpar{\texttt{cmslos=true}} option alters
 \textsf{biblatex's} standard behavior when processing the
 \textsf{shorthand} field.  Chicago's author-date style only seems to
 recommend the use of shorthands as abbreviations for long authors'
@@ -6644,14 +7460,14 @@ names, particularly institutional names, which means the shorthand
 will replace only the name part in citations rather than the whole
 citation (17.47; bsi:abbreviation, iso:electrodoc).  It suggests
 placing the expansion of the abbreviation into the reference list
-itself, a procedure that I shall implement in the next release of
-\textsf{biblatex-chicago}.  For now, the list of shorthands will
-present the expansion.  Please note, also, that you can get back
-something approaching the \enquote{standard} behavior of shorthands if
-you give the \texttt{cmslos=false} option to \textsf{biblatex-chicago}
-in your document preamble.  Cf.\ section~\ref{sec:fields:authdate},
-s.v. \enquote{\textbf{shorthand}} above, and also
-\textsf{cms-dates-sample.pdf}.
+itself, a procedure that I have implemented in this release using the
+\textbf{customc} entry type, which see.  Please note that you can
+still print a list of shorthands if you wish, and you can also get
+back something approaching the \enquote{standard} behavior of
+shorthands if you give the \texttt{cmslos=false} option to
+\textsf{biblatex-chicago} in your document preamble.  Cf.\
+section~\ref{sec:fields:authdate}, s.v. \enquote{\textbf{shorthand}}
+above, and also \textsf{cms-dates-sample.pdf}.
 
 \mylittlespace This \mymarginpar{\texttt{nodates=true}} option means
 that for all entry types except \textsf{inreference}, \textsf{misc},
@@ -6753,7 +7569,25 @@ once again footnote marks will revert to the \LaTeX\ default, but of
 course you also lose a fair amount of other formatting, as well.  See
 section~\ref{sec:loading:auth}, below.
 
-%\enlargethispage{\baselineskip}  Sort this out???
+\mylittlespace The \colmarginpar{\texttt{juniorcomma}} \emph{Manual}
+(6.49) states that \enquote{commas are no longer required around
+  \emph{Jr.}\ and \emph{Sr.},} so by default \textsf{biblatex-chicago}
+has followed standard \textsf{biblatex} in using a simple space in
+names like \enquote{John Doe Jr.}  Charles Schaum has pointed out that
+traditional \textsc{Bib}\TeX\ practice was to include the comma, and
+since the \emph{Manual} has no objections to this, I have provided an
+option which allows you to turn this behavior back on, either for the
+whole document or on a per-entry basis.  Please note, first, that
+numerical suffixes (John Doe III) never take the comma.  The code
+tests for this situation, and detects cardinal numbers well, but if
+you are using ordinals you may need to set this to \texttt{false} in
+the \textsf{options} field of some entries.  Second, I have fixed a
+bug in older releases which always printed the \enquote{Jr.}\ part of
+the name immediately after the surname, even when the surname came
+before the given names (as in a reference list).  The package now
+correctly puts the \enquote{Jr.}\ part at the end, after the given
+names, and in this position it always takes a comma, the presence of
+which is unaffected by this option.
 
 \mylittlespace This \mymarginpar{\texttt{natbib}} may look like the
 standard \textsf{biblatex} option, but to keep the coding of
@@ -6777,7 +7611,7 @@ none of these shortened citations will appear automatically.  For more
 fine-grained control of individual citations you'll probably want to
 use the \cmd{citereset} command, allied possibly with the
 \textsf{biblatex}\ \texttt{citereset} option, on which see
-\textsf{biblatex.pdf} §3.1.2.
+\textsf{biblatex.pdf} §3.1.2.1.
 
 %\enlargethispage{\baselineskip}
 
@@ -6899,7 +7733,7 @@ footnotes.  Also in this file is the code that calls
 Chicago-specific bibstrings I've defined unless you provide, in your
 preamble, a \cmd{DeclareLanguageMapping} command adapted for your
 setup, on which see section~\ref{sec:international} below and also
-§§~4.8.1 and 4.10.8 in Lehman's \textsf{biblatex.pdf}.
+§§~4.9.1 and 4.11.7 in Lehman's \textsf{biblatex.pdf}.
 
 \mylittlespace What you \emph{will not} lose is the ability to call
 the package options \texttt{annotation, strict, cmslos=false} and
@@ -6968,6 +7802,8 @@ reevaluate how much information you're providing.  I've tried to make
 data-rich citations, but there may be instances where you can save
 yourself some typing by keeping it simple.
 
+\enlargethispage{\baselineskip}
+
 \mylittlespace Scot Becker has pointed out to me that the inverse
 problem not only exists but may well become increasingly common, to
 wit, .bib database entries generated by bibliographic managers which
@@ -6975,11 +7811,12 @@ helpfully provide as much information as is available, including
 fields that users may well wish not to have printed (ISBN, URL, DOI,
 \textsf{pagetotal}, inter alia).  The standard \textsf{biblatex}
 styles contain a series of options, detailed in \textsf{biblatex.pdf}
-§3.1.3, for controlling the printing of some of these fields, but I
-haven't yet implemented them in \textsf{biblatex-chicago}.  This is in
-my TODO list, and the next release will also include some more
-general options, at Scot's recommendation, that turn off everything at
-once.  Until then judicious pruning remains the only solution.
+§3.1.2.2, for controlling the printing of some of these fields, and
+with this release I have implemented the ones that are relevant to
+\textsf{biblatex-chicago}, along with a couple that Scot requested and
+that may be of more general usefulness.  There is also a general
+option to excise with one command all the fields under consideration
+-- please see section~\ref{sec:authpreset} above.
 
 \mylittlespace Finally, allow me to reiterate what Philipp Lehman says
 in \textsf{biblatex.pdf}, to wit, use \textsf{bibtex8}, rather than
@@ -7195,7 +8032,7 @@ For \mymarginpar{\textbf{endnotes}} users of the \textsf{endnotes}
 package --- or of \textsf{pagenote} --- \textsf{biblatex} 0.9 offers
 considerably enhanced functionality.  Please read Lehman's RELEASE
 file and the documentation of the \texttt{notetype} option in
-\textsf{biblatex.pdf} §~3.1.2.
+\textsf{biblatex.pdf} §~3.1.2.1.
 
 \mylittlespace Another \mymarginpar{\textbf{memoir}} problem I have
 found occurs because the \textsf{memoir} class provides its own
@@ -7231,58 +8068,50 @@ package.
 \section{TODO \&\ Known Bugs}
 \label{sec:bugs}
 
-Johan Nordstrom asked me to look into citing audiovisual sources, and
-I agree with him that as it now stands \textsf{biblatex-chicago}
-doesn't conveniently handle as many different kinds as it could.
-\textsf{Biblatex} provides a number of entry types for such
-references, so in the next major release I shall include as many of
-these types as seem necessary.  The \emph{Manual} believes such
-material is mainly relevant for the notes \&\ bibliography style, but
-I shall attempt to provide similar functionality for author-date, as
-well.
+Following the arrival last autumn of the 16th edition of the
+\emph{Chicago Manual of Style}, I intend to devote the next major
+release more or less entirely to implementing the new specification.
+I haven't yet, I confess, taken an inventory of the changes that may
+be required, so I'm not certain how large a task it is.  My current
+plan is to continue to maintain the 15th edition style files,
+providing bug fixes and any compatibility updates, while switching the
+main focus of development over to the most recent edition.  If, after
+the next release, you still have feature requests for the older
+specification, I'll do what I can to include them.
+
+\mylittlespace Regardless of which edition you are considering, there
+are a number of things I haven't implemented.  The solution in
+brown:bre\-mer to multi-part journal articles obviously isn't optimal,
+and I should investigate a way of making it simpler.  If the kludge
+presented there doesn't appeal, you can always, for the time being,
+refer separately to the various parts.  Legal citations are another
+thorny issue, and implementing them would involve choosing a
+particular documentation scheme (for which there exist at least three
+widely-used standards in the US), then providing what would be, it has
+seemed to me, an entirely separate \textsf{biblatex} style, bearing
+little or no relation to the usual look of Chicago citations.  Indeed,
+the \emph{Manual} (17.275) even makes it clear that you should be
+using a different reference book if you are presenting work in the
+field, so I've thought it prudent to stay clear of those waters so
+far.  I have received a request for this feature, however, so when I
+have finished the updates for the 16th edition I shall look at it more
+closely.  If you have other issues with particular sorts of citation,
+I'm of course happy to take them on board.  The \emph{Manual} covers
+an enormous range of materials, but if we exclude the legal citations
+it seems to me that the available entry types could be pressed into
+service to address the vast majority of them.  If this optimism proves
+misguided, please let me know.
+
+\mylittlespace The most recent version of \textsf{biblatex} (1.2a) has
+introduced some new entry types for citing multi-volume works.  These
+are largely aimed at those already using \textsf{biber}, which
+provides much-improved functionality for the \textsf{crossref} field
+compared to standard \textsc{Bib}\TeX\ or \textsf{bibtex8}.  Depending
+upon the time required to implement the changes for the 16th edition,
+these types may make it into the package for the next release, or they
+may have to wait until the one after.
 
-\enlargethispage{-\baselineskip}
-
-\mylittlespace For the author-date style, the \emph{Manual} (17.47)
-recommends expanding shorthands inside the list of references itself.
-Currently, \textsf{biblatex-chicago-authordate} does so only in the
-separate list of shorthands.  In the next major release I shall
-attempt to rectify this, probably using one of the \textsf{custom}
-entry types which are now dedicated to other purposes, but which I
-have marked as deprecated in this release.
-
-\mylittlespace As recommended by Scot Becker, I shall implement the
-standard \textsf{biblatex} options \texttt{isbn,\,url,} and
-\texttt{doi}, along with some more draconian general options for
-turning off the printing of fields that bibliographic managers
-routinely provide but which the Chicago styles don't particularly
-require.
-
-\mylittlespace I am planning to implement the \textsf{shorthandintro}
-field to improve the flexibility of the package.  I shall also be
-looking into the \textsf{pubstate} field, which currently functions
-more fully in author-date than it does in notes \&\ bibliography.
-
-\mylittlespace There are a number of things I haven't implemented.
-The solution in brown:bre\-mer to multi-part journal articles
-obviously isn't optimal, and I should investigate a way of making it
-simpler.  If the kludge presented there doesn't appeal, you can
-always, for the time being, refer separately to the various parts.
-Legal citations are another thorny issue, and implementing them would
-involve choosing a particular documentation scheme (for which there
-exist at least three widely-used standards in the US), then providing
-what would effectively be an entirely separate \textsf{biblatex}
-style, bearing little or no relation to the usual look of Chicago
-citations.  Indeed, the \emph{Manual} (17.275) even makes it clear
-that you should be using a different reference book if you are
-presenting work in the field, so I've thought it prudent to stay clear
-of those waters.  I'm open to arguments on this score, and of course
-if you have other issues with particular sorts of citation I'm happy
-to take them on board.  The \emph{Manual} covers an enormous range of
-materials, but if we exclude the legal citations --- the audio-visual
-ones mentioned above --- it seems to me that the available entry types
-could be pressed into service to address the vast majority of them.
-If this optimism proves misguided, please let me know.
+\enlargethispage{\baselineskip}
 
 \mylittlespace This release fixes the formatting errors of which I am
 aware, though users writing in French should be aware of problems with
@@ -7292,7 +8121,7 @@ documentation, which mainly represent my inability to make all of
 \textsf{biblatex-chicago's} formatting functions transparent for the
 user, but thankfully Lehman's superb punctuation-tracking code has
 preemptively fixed a great many small errors, some of which I hadn't
-even noticed before I began testing the new functionality.  That there
+even noticed before I began testing that functionality.  That there
 are other micro-bugs seems certain --- if you report them I'll do my
 best to fix them.
 
@@ -7314,7 +8143,98 @@ thought I should warn you in advance.
 \section{Revision History}
 \label{sec:history}
 
-\textbf{0.9.5a: Released \today}
+\textbf{0.9.7: Released \today}
+
+\mylittlespace \label{deprec:obsol} Obsolete and Deprecated Features:
+\begin{itemize}
+\item The \textbf{customa} and \textbf{customb} entry types are now
+  obsolete.  Any such entries will be ignored.  Please change any that
+  remain to \textbf{letter} and \textbf{bookinbook}, respectively.
+\item If you still have any \textbf{customc} entries containing
+  introductions, prefaces, or the like, please change them to
+  \textbf{suppbook}.  I have recycled \textsf{customc} for another
+  purpose, on which see below.
+\end{itemize}
+
+Other New Features:
+
+\begin{itemize}
+\item At the request of Johan Nordstrom, I have added three new
+  audiovisual entry types to both styles, \textbf{audio},
+  \textbf{music}, and \textbf{video}.  The documentation of
+  \textsf{audio} in sections~ \ref{sec:entrytypes} and
+  \ref{sec:types:authdate} above contains an overview of the three,
+  and the details for each type are to be found under their individual
+  headings.
+\item I have transformed the \textbf{customc} entry type to enable
+  alphabetized cross-references --- the \enquote{c} is meant to be
+  mnemonic --- to other, separate entries in a reference list or
+  bibliography.  In particular, this facilitates cross-references to
+  other names in a list, rather than to other works.  In author-date,
+  in a procedure recommended by the \emph{Manual}, this now allows you
+  to expand shorthands inside the reference list rather than in a list
+  of shorthands.  In both styles, you can now provide a pointer to the
+  main entry if a reader is looking an author up under, e.g., a
+  pseudonym or other alternative name.
+\item I have introduced the \textbf{userc} field, intended to simplify
+  the printing of the cross-references provided by \textsf{customc}
+  entries.  The standard \cmd{nocite} command works as well, but the
+  additional mechanism may be more convenient in some circumstances.
+\item You can now provide an \textbf{eventdate} in \textsf{music}
+  entries to identify, e.g., a particular recording session.  It will
+  be printed just after the \textsf{title}.
+\item In the notes \&\ bibliography style, I have now implemented the
+  \textbf{shorthandintro} field, which allows you to change the string
+  introducing a shorthand in the first, long note.  It works just as
+  it does in the standard \textsf{biblatex} styles.
+\item At the request of Scot Becker, I have added six new
+  field-exclusion options to both styles, all of which can be set both
+  in the document preamble and/or in the \textsf{options} field of
+  individual .bib entries.  Three of these --- \texttt{doi},
+  \texttt{isbn}, and \texttt{url} --- are standard \textsf{biblatex}
+  options, the others --- \texttt{bookpages}, \texttt{includeall}, and
+  \texttt{numbermonth} --- are \textsf{chicago}-specific.  See the
+  docs in sections~\ref{sec:chicpreset} and \ref{sec:authpreset},
+  above.
+\item At the request of Charles Schaum, I've added the
+  \texttt{juniorcomma} option to both styles, which can be set in the
+  document preamble and/or in the \textsf{options} field of individual
+  entries.  It allows you to get the traditional comma between a
+  surname and \enquote{Jr.} or \enquote{Sr.}
+\item Fixed an old inaccuracy in the presentation of \enquote{Jr.} and
+  \enquote{Sr.,} so that they now appear at the end of names printed
+  surname first in bibliographies and reference lists.
+\item Thanks to Andrew Goldstone, I fixed some old inaccuracies in the
+  syntax of shortened notes and bibliography entries presenting
+  multiple contributions to one multi-author (or single-author)
+  volume.
+\item I've altered the directory structure of the archive containing
+  this release.  Files were multiplying, and look set to multiply
+  still further, so I've copied the structure used by Lehman for
+  \textsf{biblatex} itself.
+\item Fixed an old bug, which I'd guess was triggered quite rarely, in
+  the formatting of publication information in long notes.
+\item Fixed another bug in author-date where the colon separating
+  titles and subtitles was in the wrong font.  The \textsf{biblatex}
+  \texttt{punctfont} option solved this.
+\item Fixed a punctuation bug in \textsf{InReference} entries in the
+  notes \&\ bibliography style.  Also fixed \textsf{title}
+  presentation in \textsf{Reference} entries in author-date.
+\item Fixed some inaccuracies in the tests establishing priority
+  between \textsf{date} and \textsf{origdate} fields.  These arose
+  when date ranges were involved, and it's possible I haven't yet
+  addressed all possible permutations of the problem.
+\item Added several new bibstrings to the \textsf{cms-*.lbx} files for
+  the new audiovisual entry types.  This means that the
+  \textsf{editortype} fields can now be set to \texttt{director},
+  \texttt{producer}, or \texttt{conductor}, depending on your needs.
+  You can also set the fields to \texttt{none}, which eliminates all
+  identifying strings, and which is useful for identifying performers
+  of various sorts.
+\item Minor improvements to documentation.
+\end{itemize}
+
+\textbf{0.9.5a: Released September 7, 2010}
 \begin{itemize}
 \item Quick fix for an elementary and show-stopping mistake in
   \textsf{biblatex-chica\-go.sty}, a mistake disguised if you load
@@ -7325,7 +8245,7 @@ thought I should warn you in advance.
 
 \textbf{0.9.5: Released September 3, 2010}
 
-\mylittlespace \label{deprec:obsol} Obsolete and Deprecated Features:
+\mylittlespace Obsolete and Deprecated Features:
 \begin{itemize}
 \item All the custom entry types --- \textbf{customa},
   \textbf{customb}, and \textbf{customc} --- are now deprecated.  They
@@ -7340,7 +8260,7 @@ thought I should warn you in advance.
   me know if I'm wrong.
 \end{itemize}
 
-\vspace{2\baselineskip}
+%\vspace{2\baselineskip}
 
 Other New Features:
 \begin{itemize}
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 a3eabbab836..973d303a0c7 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 87d8620f5b4..7df4a169382 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
@@ -91,13 +91,19 @@ institutional names \autocite[17.47]{chicago:manual}.  By default, I
 have followed this recommendation: \cmd{autocites}:
 \autocites{bsi:abbreviation}{iso:electrodoc}; \cmd{textcites}:
 \textcites{bsi:abbreviation}{iso:electrodoc}.  It suggests placing the
-expansion of the abbreviation into the reference list itself, a
-procedure that I shall implement in the next release of
-\textsf{biblatex-chicago}.  For now, the list of shorthands will
-present the expansion.  Please note, also, that you can get back
-something approaching the \enquote{standard} behavior of shorthands if
-you give the \texttt{cmslos=false} option to \textsf{biblatex-chicago}
-in your document preamble.
+expansion of the abbreviation into an alphabetized cross-reference
+inside the reference list itself, a procedure that I have now
+implemented for \textsf{biblatex-chicago}.  To use this, you need a
+\textsf{CustomC} entry containing the expansion, and either a
+\textsf{userc} field in the parent entry or a \cmd{nocite} command to
+make sure it is printed in the reference list.  If you use a
+\cmd{printshorthands} command, the list of shorthands will still be
+printed, so you now have a variety of options available for presenting
+the expansions depending on your specific requirements.  Please note,
+also, that you can get back something approaching the
+\enquote{standard} behavior of shorthands if you give the
+\texttt{cmslos=false} option to \textsf{biblatex-chicago} in your
+document preamble.
 
 \subsection*{Mildly problematic entries}
 \label{sec:problematic}
@@ -212,6 +218,21 @@ An unpublished archive, from which more than one work has been cited:
 \autocite[file 12]{house:papers}.  (Both this and the previous example
 use a Misc entry with \texttt{classical} \textsf{entrysubtype}.)
 
+\subsubsection*{Comments inside citations}
+\label{sec:comments}
+
+If you wish to include a comment inside the parentheses of a citation,
+it will need to be separated by a semicolon
+\autocite[16.111]{chicago:manual}.  If you have a \textsf{postnote},
+then you can manually provide the punctuation and comment in that
+field, e.g., \autocite[4; the unrevised trans.]{stendhal:parma}.
+Without a \textsf{postnote}, you'll need a separate Misc or CustomC
+entry containing just the text of the comment in the \textsf{title}
+field, \textsf{entrysubtype} \texttt{classical}, and \textsf{options}
+\texttt{skipbib}.  An \cmd{autocites} command calling both the main
+text and the comment will do the trick, e.g.,
+\autocites{chicago:manual}{chicago:comment}.
+
 \subsubsection*{Multiple authors}
 \label{sec:multiple}
 
@@ -249,6 +270,24 @@ shortened title to distinguish the references.  This would produce
 There is, unfortunately, no simpler way that I know of to deal with
 this situation.
 
+\subsubsection*{Audiovisual entries}
+\label{sec:audiovisual}
+
+According to the \emph{Manual}, \enquote{the author-date system is
+  inappropriate for most audiovisual materials\ldots\ Such materials
+  are best mentioned in running text and grouped in the reference list
+  under a subhead\ldots} \autocite[17.265]{chicago:manual}.  Some
+entries work perfectly well: \autocite{auden:reading};
+\autocite{hitchcock:nbynw}; \autocite{handel:messiah}.  Others perhaps
+require further information in the entry or genuinely are better
+suited to presentation in running text: \autocite{beethoven:sonata29};
+\autocite{nytrumpet:art}.  Published (\textsf{Audio}) and unpublished
+(\textsf{Misc}) scores, for their part, are no problem at all:
+\autocite{schubert:muellerin}; \autocite{verdi:corsaro};
+\autocite{shapey:partita}.  The standard \textsf{biblatex} tools for
+subdividing reference lists are all available if you want to follow
+the \emph{Manual's} recommendations on that front.
+
 \subsection*{Further examples (mainly for testing purposes)}
 \label{testing}
 
@@ -307,6 +346,8 @@ InCollection: \autocite{centinel:letters}; \autocite{ellet:galena};
 \autocite{keating:dearborn}; \autocite{lippincott:chicago};
 \autocite{sirosh:visualcortex}; \autocite{wiens:avian}.
 
+InReference: \autocite[absolute]{oed:cdrom}.
+
 Manual: \autocite{dyna:browser}.
 
 Online: \autocite{powell:email}.
@@ -325,9 +366,10 @@ Thesis: \autocite{murphy:silent}.
 Unpublished: \autocite{nass:address}.
 
 
-\printshorthands
+% \printshorthands % No longer necessary in author-date.
 \nocite{*}
 \printbibliography[title=References,maxnames=10,minnames=7]
+
 \end{document}
 %%% Local Variables: 
 %%% mode: latex
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 ef14eeec36c..c3c27cef025 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/cms-notes-sample.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.tex
index c7009923348..15697c43e02 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.tex
@@ -14,7 +14,7 @@ bibencoding=inputenc]{biblatex-chicago}
 \usepackage{vmargin} \setpapersize{A4}
 \setmarginsrb{1in}{20pt}{1in}{.5in}{1pt}{2pt}{0pt}{2mm}
 \renewcommand{\sfdefault}{phv}
-\renewcommand{\ttdefault}{pcr}
+%\renewcommand{\ttdefault}{pcr}
 \usepackage{url}
 \urlstyle{rm}
 \setlength{\dimen\footins}{9.5in}
@@ -25,159 +25,186 @@ Note\autocite{adorno:benj} note\autocite{aristotle:metaphy:gr}
 note\autocite{adorno:benj} note\autocite[23]{adorno:benj}
 note\autocite{ashbrook:brain}
 note\autocite[3.2.996b5--8]{aristotle:metaphy:gr}
-note\autocite{assocpress:gun} note\autocite[149]{ashbrook:brain}
-note\autocite{author:forthcoming} note\autocite{assocpress:gun}
-note\autocite{babb:peru} note\autocite{author:forthcoming}
-note\autocite{barcott:review} note\autocite{batson}.
+note\autocite{assocpress:gun} note\autocite{auden:reading}
+note\autocite[149]{ashbrook:brain} note\autocite{author:forthcoming}
+note\autocite{assocpress:gun} note\autocite{babb:peru}
+note\autocite{author:forthcoming} note\autocite{auden:reading}.
 
-Note\autocite{babb:peru} note\autocite{barcott:review}
+Note\autocite{barcott:review} note\autocite{batson}.
+note\autocite{babb:peru} note\autocite{barcott:review}
 note\autocite[339]{batson} note\autocite{beattie:crime}
 note\autocite{bedford:photo} note\autocite{babb:peru}
-note\autocite{bernard:boris} note\autocite{boxer:china}
-note\autocite{beattie:crime} note\autocite{brown:bremer}
-note\autocite{bernard:boris} note\autocite{boxer:china}
-note\autocite{browning:aurora}.
-
-Note\autocite[pt.\ 2:55]{brown:bremer} note\autocite{bundy:macneil}
+note\autocite{beethoven:sonata29} note\autocite{bernard:boris}
+note\autocite{bernstein:shostakovich} note\autocite{boxer:china}
+note\autocite{beattie:crime}.
+
+Note\autocite{brown:bremer} note\autocite{beethoven:sonata29}
+note\autocite{bernstein:shostakovich} note\autocite{bernard:boris}
+note\autocite{boxer:china} note\autocite{browning:aurora}
+note\autocite[pt.\ 2:55]{brown:bremer} note\autocite{bundy:macneil}
 note\autocite{centinel:letters} note\autocite{chaucer:liferecords}
 note\autocite{browning:aurora}
 note\autocite[\printdate]{bundy:macneil}
-note\autocite[29]{centinel:letters} note\autocite{chaucer:alt}
-note\autocite{clark:mesopot} note\autocite{chaucer:liferecords}
-note\autocite{Clemens:letter} note\autocite{cohen:schiff}
-note\autocite{Clemens:letter} note\autocite{clark:mesopot}
-note\autocite{cohen:schiff}.
-
-\clearpage
-
-Note\autocite{chaucer:alt} note\autocite{conley:fifthgrade}
-note\autocite{contrib:contrib} note\autocite{conley:fifthgrade}
-note\autocite{contrib:contrib} note\autocite{cook:sotweed}
-note\autocite{cotton:manufacture} note\autocite{cook:sotweed}
+note\autocite[29]{centinel:letters}.
+
+Note\autocite{chaucer:alt} note\autocite{clark:mesopot}
+note\autocite{chaucer:liferecords}.
+
+%\clearpage
+
+Note\autocite{cleese:holygrail} note\autocite{Clemens:letter}
+note\autocite{cohen:schiff} note\autocite{Clemens:letter}
+note\autocite{clark:mesopot} note\autocite{cleese:holygrail}
+note\autocite{cohen:schiff} note\autocite{chaucer:alt}
+note\autocite{conley:fifthgrade} note\autocite{contrib:contrib}
+note\autocite{conley:fifthgrade} note\autocite{contrib:contrib}
+note\autocite{cook:sotweed}.
+
+Note\autocite{cotton:manufacture} note\autocite{cook:sotweed}
 note\autocite{creasey:ashe:blast} note\autocite{creasey:york:death}
 note\autocite{cotton:manufacture} note\autocite{creasey:morton:hide}
-note\autocite{creasey:ashe:blast}.
-
-Note\footnote{\headlessfullcite{creel:house}.}
+note\autocite{creasey:ashe:blast}
+note\footnote{\headlessfullcite{creel:house}.}
 note\autocite{davenport:attention} note\autocite{creasey:york:death}
 note\autocite{creasey:morton:hide}
 note\autocite[\letterdatelong]{creel:house}
-note\autocite{dinkel:agassiz} note\autocite{donne:var}
-note\autocite{davenport:attention} note\autocite{dunn:revolutions}
-note\autocite{dyna:browser} note\autocite{dinkel:agassiz}
-note\autocite{eliot:pound} note\autocite{ellet:galena}.
-
-Note\autocite{donne:var} note\autocite{dyna:browser}
-note\autocite{emerson:nature} note\footfullcite{ency:britannica}
-note\autocite{dunn:revolutions} note\autocite{eliot:pound}
-note\autocite{euripides:orestes} note\autocite{ellet:galena}
-note\autocite{evanston:library}
-note\footnote{\headlessfullcite[3]{feydeau:farces}.}
-note\autocite{emerson:nature} note\autocite{euripides:orestes}
-note\autocite{friedman:learning} note\autocite{evanston:library}
-note\autocite{feydeau:farces} note\autocite{friedman:learning}.
+note\autocite{dinkel:agassiz}.
+
+Note\autocite{donne:var} note\autocite{davenport:attention}
+note\autocite{dunn:revolutions} note\autocite{dyna:browser}
+note\autocite{dinkel:agassiz} note\autocite{eliot:pound}
+note\autocite{ellet:galena} note\autocite{donne:var}
+note\autocite{dyna:browser} note\autocite{emerson:nature}
+note\footfullcite{ency:britannica} note\autocite{dunn:revolutions}
+note\autocite{episode:tv}.
+
+Note\autocite{eliot:pound} note\autocite{euripides:orestes}
+note\autocite{ellet:galena} note\autocite{episode:tv}
+note\autocite{emerson:nature}.
 
-\clearpage
+%\clearpage
 
-Note\autocite{furet:passing:eng} note\autocite{garaud:gatine}
-note\autocite{garrett} note\autocite{gibbard}
-note\autocite{furet:passing:eng} note\autocite{garrett}
-note\autocite{gourmet:052006} note\autocite{garaud:gatine}
-note\autocite{grove:sibelius} note\autocite{harley:cartography}
-note\autocite{gibbard} note\autocite{hlatky:hrt}
-note\autocite{gourmet:052006}
+Note\autocite{evanston:library}
+note\footnote{\headlessfullcite[3]{feydeau:farces}.}
+note\autocite{euripides:orestes} note\autocite{friedman:learning}
+note\autocite{evanston:library} note\autocite{feydeau:farces}
+note\autocite{friedman:learning} note\autocite{furet:passing:eng}
+note\autocite{garaud:gatine} note\autocite{garrett}
+note\autocite{gibbard} note\autocite{furet:passing:eng}
+note\autocite{garrett}.
+
+Note\autocite{gourmet:052006} note\autocite{garaud:gatine}
+note\autocite{greek:filmstrip} note\autocite{grove:sibelius}
+note\autocite{handel:messiah} note\autocite{harley:cartography}
+note\autocite{gibbard} note\autocite{hitchcock:nbynw}
+note\autocite{hlatky:hrt} note\autocite{greek:filmstrip}
+note\autocite{gourmet:052006} note\autocite{handel:messiah}.
 
 Note\autocite[Sibelius, Jean]{grove:sibelius}
-note\autocite{horsley:prosodies} note\autocite{harley:cartography}
+note\autocite{hitchcock:nbynw} note\autocite{horsley:prosodies}
+note\autocite{harley:cartography}
 note\autocite{jackson:paulina:letter} note\autocite{hlatky:hrt}
 note\autocite{james:ambassadors} note\autocite{horsley:prosodies}
 note\autocite{keating:dearborn} note\autocite{jackson:paulina:letter}
 note\autocite{kern} note\autocite{james:ambassadors}
-note\autocite{kimluu:diethyl}
-
-Note\autocite{keating:dearborn} note\autocite{kozinn:review}
-note\autocite{kern} note\autocite{lach:asia}
-note\autocite{kimluu:diethyl} note\autocite{lakeforester:pushcarts}
-note\autocite{kozinn:review} note\autocite{levistrauss:savage}
-note\autocite{lach:asia} note\autocite{leo:madonna}
-note\autocite{lewis} note\autocite{lakeforester:pushcarts}
-note\autocite{levistrauss:savage} note\autocite{lecarre:quest}
-note\autocite{lewis} note\autocite{lecarre:quest}.
-
-\clearpage
-
-Note\autocite{lippincott:chicago} note\autocite{loften:hamlet}
-note\autocite{maisonneuve:relations} note\autocite{lippincott:chicago}
-note\autocite{loften:hamlet} note\autocite{mchugh:wake}
-note\autocite{mcmillen:antebellum}
+
+Note\autocite{kimluu:diethyl} note\autocite{keating:dearborn}.
+
+%\clearpage
+
+Note\autocite{kozinn:review} note\autocite{kern}
+note\autocite{lach:asia} note\autocite{kimluu:diethyl}
+note\autocite{lakeforester:pushcarts} note\autocite{kozinn:review}
+note\autocite{levistrauss:savage} note\autocite{lach:asia}
+note\autocite{leo:madonna} note\autocite{lewis}
+note\autocite{lakeforester:pushcarts}
+note\autocite{levistrauss:savage}.
+
+Note\autocite{lecarre:quest} note\autocite{lewis}
+note\autocite{lecarre:quest} note\autocite{lippincott:chicago}
+note\autocite{loften:hamlet} note\autocite{maisonneuve:relations}
+note\autocite{lippincott:chicago} note\autocite{loften:hamlet}
+note\autocite{mchugh:wake} note\autocite{mcmillen:antebellum}
 note\autocite{maisonneuve:relations}
-note\footnote{\headlessfullcite[2:218]{meredith:letters}.}
-note\autocite{mchugh:wake} note\autocite[6.9.4]{mla:style}
+note.\footnote{\headlessfullcite[2:218]{meredith:letters}.}
+
+Note\autocite{mchugh:wake} note\autocite[6.9.4]{mla:style}
 note\autocite{morgenson:market} note\autocite{murphy:silent}
 note\autocite{nass:address} note\autocite{mcmillen:antebellum}
 note\autocite{natrecoff:camera} note\autocite[2:25]{meredith:letters}
 note\autocite[6.9.5]{mla:style} note\autocite{morgenson:market}
-note\autocite{murphy:silent} note\autocite{nass:address}
-note\autocite{nyt:obittrevor} note\autocite{nyt:trevorobit}
-note\autocite{osborne:poison}.
-
-Note\autocite{natrecoff:camera} note\autocite{palmatary:pottery}
-note\autocite{nyt:obittrevor} note\autocite{nyt:trevorobit}
-note\autocite{pelikan:christian} note\autocite{petroff:impurity}
-note\autocite{osborne:poison} note\autocite{phibbs:diary}
-note\autocite{palmatary:pottery} note\autocite{pirumova}
-note\autocite{pelikan:christian} note\autocite{petroff:impurity}.
-
-Note\autocite{plato:republic:gr} note\autocite{polakow:afterw}
-note\autocite{phibbs:diary}
-note\autocite[360e--361b]{plato:republic:gr}.
-
-\clearpage
-
-Note\autocite{pirumova} note\autocite{polakow:afterw}
-note\autocite{powell:email} note\autocite{prose:intro}
-note\autocite{ratliff:review} note\autocite{reaves:rosen}
-note\autocite{powell:email} note\autocite{prose:intro}
-note\autocite{rodman:walk} note\autocite{ross:thesis}
-note\autocite{ratliff:review} note\autocite{rozner:liberation}
-note\autocite{schellinger:novel} note\autocite{reaves:rosen}
+note\autocite{murphy:silent} note\autocite{nass:address}.
+
+Note\autocite{nyt:obittrevor} note\autocite{nyt:trevorobit}
+note\autocite{nytrumpet:art} note\autocite{osborne:poison}
+note\autocite{oed:cdrom} note\autocite{natrecoff:camera}.
+
+%\clearpage
+
+note\autocite{palmatary:pottery} note\autocite{nyt:obittrevor}
+note\autocite{nyt:trevorobit} note\autocite[arithmetical]{oed:cdrom}
+note\autocite{nytrumpet:art} note\autocite{pelikan:christian}
+note\autocite{petroff:impurity} note\autocite{osborne:poison}
+note\autocite{phibbs:diary} note\autocite{palmatary:pottery}
+note\autocite{pirumova} note\autocite{pelikan:christian}.
+
+Note\autocite{petroff:impurity} note\autocite{plato:republic:gr}
+note\autocite{polakow:afterw} note\autocite{phibbs:diary}
+note\autocite[360e--361b]{plato:republic:gr} note\autocite{pirumova}
+note\autocite{polakow:afterw} note\autocite{powell:email}
+note\autocite{prose:intro} note\autocite{ratliff:review}
+note\autocite{reaves:rosen} note\autocite{powell:email}.
+
+note\autocite{prose:intro} note\autocite{rodman:walk}
+note\autocite{ross:thesis} note\autocite{ratliff:review}
+note\autocite{rozner:liberation} note\autocite{schellinger:novel}
+note\autocite{reaves:rosen} note\autocite{schubert:muellerin}
 note\autocite{rodman:walk} note\autocite{schweitzer:bach}
-note\autocite{ross:thesis} note\autocite{rozner:liberation}
-note\autocite{sechzer:women} note\autocite{schellinger:novel}
-note\autocite{sereny:cries} note\autocite{schweitzer:bach}
-note\footnote{\headlessfullcite{sewall:letter}.}
-note\autocite{sechzer:women}.
+note\autocite{ross:thesis} note\autocite{rozner:liberation}.
 
-Note\autocite{sirosh:visualcortex} note\autocite{sereny:cries}
+Note\autocite{sechzer:women} note\autocite{schellinger:novel}
+note\autocite{sereny:cries} note\autocite{schubert:muellerin}
+note\autocite{schweitzer:bach}.
+
+%\clearpage
+
+Note\footnote{\headlessfullcite{sewall:letter}.}
+note\autocite{shapey:partita} note\autocite{sechzer:women}
+note\autocite{sirosh:visualcortex} note\autocite{sereny:cries}
 note\autocite{silver:gawain} note\autocite{sewall:letter}
 note\autocite{soltes:georgia} note\autocite{sirosh:visualcortex}
-note\autocite{spock:interview} note\autocite{stenger:privacy}
-note\autocite{silver:gawain} note\autocite{tillich:system}
-note\autocite{soltes:georgia} note\autocite{spock:interview}.
-
-Note\autocite{times:guide} note\autocite{virginia:plantation}
-note\autocite{stenger:privacy} note\autocite{chicago:manual}
-note\autocite[2:45]{tillich:system}.
+note\autocite{spock:interview} note\autocite{shapey:partita}
+note\autocite{stenger:privacy}.
+
+Note\autocite{silver:gawain} note\autocite{tillich:system}
+note\autocite{soltes:georgia} note\autocite{spock:interview}
+note\autocite{times:guide} note\autocite{twain:audio}
+note\autocite{virginia:plantation} note\autocite{stenger:privacy}
+note\autocite{chicago:manual} note\autocite{twain:audio}
+note\autocite[2:45]{tillich:system} note\autocite[police
+ranks]{times:guide}.
+
+Note\autocite{virginia:plantation} note\autocite{chicago:manual}
+note\autocite{unsigned:ranke} note\autocite{herwign:office}
+note\autocite{verdi:corsaro} note\autocite{wallraff:word}
+note\autocite{unsigned:ranke} note\autocite{warr:ellison}
+note\autocite{herwign:office} note\autocite{wallraff:word}
+note\autocite{verdi:corsaro} note\autocite{wauchope:ceramics}.
 
-\clearpage
+Note\autocite{weed:flatiron}.
 
-Note\autocite[police ranks]{times:guide}
-note\autocite{virginia:plantation} note\autocite{chicago:manual}
-note\autocite{unsigned:ranke} note\autocite{herwign:office}
-note\autocite{wallraff:word} note\autocite{unsigned:ranke}
-note\autocite{warr:ellison} note\autocite{herwign:office}
-note\autocite{wallraff:word} note\autocite{wauchope:ceramics}
-note\autocite{weresz}.
+%\clearpage
 
-Note\autocite{white:callimachus} note\autocite{white:ross:memo}
-note\autocite{warr:ellison} note\autocite{wikiped:bibtex}
+Note\autocite{weresz} note\autocite{white:callimachus}
+note\autocite{white:ross:memo} note\autocite{warr:ellison}
+note\autocite{weed:flatiron} note\autocite{wikiped:bibtex}
 note\autocite{will:cohere} note\autocite{wauchope:ceramics}
 note\autocite{zukowsky:chicago} note\autocite{weresz}
-note\autocite{white:russ} note\autocite{white:callimachus}
-note\autocite{white:ross:memo} note\autocite{white:russ}.
+note\autocite{white:russ} note\autocite{white:callimachus}.
 
-Note\autocite[BibTeX]{wikiped:bibtex}
-note\autocite{will:cohere} note\autocite{zukowsky:chicago}
+Note\autocite{white:ross:memo} note\autocite{white:russ}
+note\autocite[BibTeX]{wikiped:bibtex} note\autocite{will:cohere}
+note\autocite{zukowsky:chicago}
 note\autocites[See][3.2.996b5--8]{aristotle:metaphy:gr}[360e--361b]
 {plato:republic:gr}[and also][for additional
 information]{white:callimachus} note\autocite{aristotle:metaphy:trans}
@@ -185,13 +212,16 @@ note\autocites[See][]{mchugh:wake}[and][569]{warr:ellison}
 note\footnote{\citetitles{warr:ellison}{mchugh:wake}.}
 note\footnote{\Citetitle{powell:email}.}
 note\footnote{\headlessfullcite[3:126]{meredith:letters}.}
-note\autocite[3:126]{meredith:letters} note\footfullcite[2]{weresz}
-note\autocite[2]{weresz} note\footnote{\fullcite{zukowsky:chicago}.}
+note\autocite[3:126]{meredith:letters}.
+
+Note\footfullcite[2]{weresz} note\autocite[2]{weresz}
+note\footnote{\fullcite{zukowsky:chicago}.}
 note.\footnote{\cite*{zukowsky:chicago}.}
 
-\clearpage
 \nocite{furet:passing:fr,good:wholeissue,house:papers}
+
 \printshorthands
+
 \printbibliography[maxnames=10,minnames=7,notkeyword=original]
 \end{document}
 %%% Local Variables: 
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 8ea061ff4e4..329050944f5 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib
@@ -21,6 +21,28 @@
                   though you could get away without it.}
 }
 
+@CustomC{abbrev:BSI,
+  author = 	 {BSI},
+  title = 	 {British Standards Institute},
+  annote = 	 {A CustomC entry presenting the expansion of a
+                  shorthand from another entry (bsi:abbreviation).  It
+                  allows the presentation of that expansion in the
+                  correct, alphabetized place in the list of
+                  references.}
+}
+
+@CustomC{abbrev:ISO,
+  entrysubtype = {classical},
+  author = 	 {ISO},
+  title = 	 {International Organization for Standardization},
+  annote = 	 {A CustomC entry presenting the expansion of a
+                  shorthand from another entry (iso:electrodoc).  It
+                  allows the presentation of that expansion in the
+                  correct, alphabetized place in the list of
+                  references.  The entrysubtype allows you to print
+                  the expansion elsewhere, e.g., in a footnote.}
+}
+
 @Book{adorno:benj,
   title = 	 {The Complete Correspondence, 1928--1940},
   publisher = 	 hup,
@@ -136,6 +158,24 @@
                   braces.}
 }
 
+@Music{auden:reading,
+  title = 	 {Poems},
+  author = 	 {Auden, W. H.},
+  number = 	 7137,
+  series = 	 {Spoken Arts},
+  type = 	 {compact disc},
+  entrysubtype = {classical},
+  note = 	 {read by the author},
+  annote = 	 {An audiobook, lacking traditional publishing
+                  information, presented in a Music entry, with which
+                  cp. twain:audio, an Audio entry.  Here, the type
+                  field contains the medium, while the series and
+                  number field contain the label information for the
+                  CD, as is standard in Music entries.  The
+                  entrysubtype may help with in-text citations of a
+                  source like this in the author-date style.}
+}
+
 @Article{author:forthcoming,
   author = 	 {Author, Margaret~M.},
   title = 	 {Article Title},
@@ -230,6 +270,30 @@
                   less important in the author-date style.}
 }
 
+@Music{beethoven:sonata29,
+  title = 	 {Piano Sonata \bibstring{number} 29
+                  \mkbibquote{Hammerklavier}},
+  author = 	 {Beethoven},
+  editor = 	 {Peter Serkin},
+  editortype = 	 {none},
+  number = 	 {CDD 270},
+  series = 	 {Proarte Digital},
+  annote = 	 {A musical recording exhibiting several of the
+                  peculiarities common to the audiovisual entry types.
+                  Here, the composer goes in the author field, while
+                  the performer goes into the editor field.  The
+                  editortype "none" prevents any identifying string
+                  being used for the performer, as none is needed.  As
+                  in most Music entries, the series and number give
+                  label identifying information, but the Manual has
+                  provided neither a medium for the type field nor the
+                  publisher who owns the label.  (I'm assuming that
+                  one is supposed to be able to gather this
+                  information from the number and series field, but
+                  the absence of a date doesn't help, either,
+                  particularly in the author-date style.)}
+}
+
 @BookInBook{bernard:boris,
   author =	 {Bernard, Thomas},
   title =	 {A Party for {Boris}},
@@ -247,6 +311,28 @@
                   book."}
 }
 
+@Music{bernstein:shostakovich,
+  title = 	 {Symphony \bibstring{number} 5},
+  author = 	 {Shostakovich, Dmitri},
+  editor = 	 {Bernstein, Leonard},
+  editortype = 	 {conductor},
+  editora = 	 {{New York Philharmonic}},
+  editoratype =  {none},
+  number = 	 {IM 35854},
+  series = 	 {CBS},
+  options = 	 {useauthor=false},
+  annote = 	 {Like beethoven:sonata29, this is another rather
+                  abbreviated Music entry, lacking a date, a publisher
+                  and a type.  It does, however, show the method for
+                  emphasizing the conductor instead of the composer,
+                  and also for identifying the conductor in the
+                  editortype field.  Here, the performing orchestra
+                  goes in the editora field, and the editoratype
+                  "none" prevents any string attaching to the
+                  orchestra, as one isn't needed.  The usual series
+                  and number give the label information.}
+}
+
 @Book{boxer:china,
   title = 	 {South {China} in the Sixteenth Century},
   year = 	 1953,
@@ -317,11 +403,17 @@
                   Titles of Publications},
   date = 	 1985,
   organization = {British Standards Institute},
+  userc = 	 {abbrev:BSI},
   sortkey = 	 {British},
   address = 	 {Linford Woods, Milton Keynes, UK},
   shorthand = 	 {BSI},
   annote = 	 {A Manual entry providing an organizational author
-                  and a shorthand field for in-text citations.}
+                  and a shorthand field for in-text citations.  The
+                  userc field points to a CustomC entry which provides
+                  the expansion of the shorthand inside the reference
+                  list, rather than in a list of shorthands.  Using
+                  the field in this way ensures that the expansion
+                  will be printed if this entry is cited.}
 }
 
 @Article{bundy:macneil,
@@ -378,6 +470,14 @@
                   notes-test.bib.}
 }
 
+@CustomC{chicago:comment,
+  title = 	 {no longer the current edition},
+  options = 	 {skipbib},
+  entrysubtype = {classical},
+  annote = 	 {An example of how to use a CustomC entry to insert a
+                  comment inside another parenthetical citation.}
+}
+
 @Book{chicago:manual,
   title = 	 {The {Chicago} Manual of Style},
   year = 	 2003,
@@ -439,6 +539,36 @@
                   guess.}
 }
 
+@Video{cleese:holygrail,
+  title = 	 {Commentaries},
+  date = 	 2001,
+  titleaddon = 	 {disc 2},
+  booktitle = 	 {Monty {Python and the Holy Grail}},
+  author = 	 {Cleese, John and Gilliam, Terry and Idle, Eric and
+                  Jones, Terry and Palin, Michael},
+  editor = 	 {Gilliam, Terry and Jones, Terry},
+  editortype = 	 {director},
+  publisher = {Columbia Tristar Home Entertainment},
+  type = 	 {DVD},
+  address = 	 {Culver City, CA},
+  edition = 	 {special \bibstring{edition}},
+  annote = 	 {This shows some typical features of a Video entry.
+                  It focusses on some of the DVD extras, so the actors
+                  providing the commentary appear in the author field.
+                  The directors go in the editor field, as usual, with
+                  the identifying string in editortype.  The booktitle
+                  provides the film title in this instance -- the
+                  title in this case will appear in the main text font
+                  rather than italicized, because of the presence of a
+                  booktitle.  The titleaddon tells where in the DVD
+                  set the commentaries are to be found, and the type
+                  field gives the medium.  The date field contains the
+                  date the DVD was released, and the original release
+                  date (origdate) isn't needed here, according to the
+                  Manual, because the entry cites the DVD extras
+                  rather than the film itself.}
+}
+
 @Book{cohen:schiff,
   title =	 {{Jacob H. Schiff}},
   subtitle =	 {A Study in {American} Leadership},
@@ -763,6 +893,42 @@
                   a possible style of presentation only. }
 }
 
+@Video{episode:tv,
+  title = 	 {Episode Title},
+  titleaddon = 	 {series 5, episode 2},
+  options = 	 {cmsdate=on},
+  entrysubtype = {tv},
+  editor = 	 {{Production Company}},
+  editortype = 	 {producer},
+  date = 	 {2000/2007},
+  origdate = 	 2004,
+  pubstate = 	 {reprint},
+  booktitle = 	 {Series Title},
+  publisher = {Production Company},
+  type = 	 {DVD},
+  annote = 	 {The Manual doesn't, that I can find, provide
+                  guidance for citing television programs, so I have
+                  guessed, using the analogy of films, at how to
+                  present one using the Video entry type.  The title
+                  of the episode will be presented in the main text
+                  font, as there is a booktitle presenting the name of
+                  the TV series.  The titleaddon gives details about
+                  the episode, and the type gives the medium, as
+                  usual.  The origdate is the year of original
+                  transmission, while the date provides the year range
+                  for the whole series, though it would perhaps make
+                  more sense in this situation to provide the date the
+                  DVD was released, instead.  The entrysubtype isn't
+                  necessary, but may be of some use in the author-date
+                  style if you want the origdate to appear in
+                  parentheses after the main part of the entry, for
+                  which you would also require the pubstate field as
+                  shown.  Repeating the publisher as the editor, and
+                  giving an editortype, may help to present this entry
+                  in the list of references and, possibly, in textual
+                  citatons, as well.}
+}
+
 @BookInBook{euripides:orestes,
   title = 	 {Orestes},
   year = 	 1958,
@@ -977,6 +1143,20 @@
                   journaltitle rather than by the title.}
 }
 
+@Audio{greek:filmstrip,
+  title = 	 {The {Greek} and {Roman} World},
+  date = 	 1977,
+  publisher = 	 {Society for Visual Education},
+  author = 	 {{Society for Visual Education}},
+  type = 	 {filmstrip},
+  address = 	 {Chicago},
+  annote = 	 {An Audio entry for a filmstrip, the medium being
+                  given in the type field.  For the author-date style,
+                  it probably makes sense to give the publisher as the
+                  author, also, so that the entry in the reference
+                  list doesn't start with the date.}
+}
+
 @InReference{grove:sibelius,
   title = 	 {The New {Grove} Dictionary of Music and Musicians},
   author = 	 {Hepokoski, James},
@@ -1001,6 +1181,27 @@
                   InReference entries.}
 }
 
+@Video{handel:messiah,
+  title = 	 {Messiah},
+  date = 	 1988,
+  titleaddon = 	 {selections},
+  type = 	 {VHS},
+  editor = 	 {{Atlanta Symphony Orchestra and Chamber Chorus}},
+  editortype = 	 {none},
+  editora = 	 {Shaw, Robert},
+  editoratype =  {none},
+  author = 	 {Handel, George Frederic},
+  publisher = {Video Treasures},
+  address = 	 {Batavia, OH},
+  annote = 	 {This is a videotape of an oratorio, presented
+                  therefore as a Video entry rather than as Music.
+                  The composer goes in author, the performers and
+                  conductor in editor and editora.  Note the "none" in
+                  both editortypes, as the context presumably makes it
+                  clear what role Shaw is playing.  The usual type
+                  field identifies the medium.}
+}
+
 @Book{harley:cartography,
   title =	 {Cartography in the Traditional {East and Southeast
                   Asian} Societies},
@@ -1019,6 +1220,7 @@
 @TechReport{herwign:office,
   options = 	 {useprefix=true},
   author = 	 {{van} Herwijnen, Eric},
+  sortname = 	 {Van},
   title = 	 {Future Office Systems Requirements},
   institution =  {CERN DD internal note},
   date = 	 {1988-11},
@@ -1027,6 +1229,30 @@
                   field identifies the issuer of the report.}
 }
 
+@Video{hitchcock:nbynw,
+  title = 	 {Crop Duster Attack},
+  booktitle = 	 {North by Northwest},
+  date = 	 2000,
+  origdate = 	 1959,
+  editor = 	 {Hitchcock, Alfred},
+  editortype = 	 {director},
+  publisher = {Warner Home Video},
+  type = 	 {DVD},
+  pubstate = 	 {reprint},
+  address = 	 {Burbank, CA},
+  annote = 	 {This Video entry cites one scene (title) from a film
+                  (booktitle).  By contrast with the notes &
+                  bibliography style, we don't need an options field
+                  here, as we allow the director to appear at the head
+                  of the entry.  The editortype field identifies the
+                  directorial role, while the origdate and date give
+                  the original year of release and the year of DVD
+                  release, respectively.  The pubstate field means
+                  that the origdate will be printed in parentheses
+                  after the main part of the entry, with a bibstring
+                  identifying it as the year of original release.}
+}
+
 @Article{hlatky:hrt,
   author =	 {Hlatky, Mark~A. and Boothroyd, Derek and
                   Vittinghoff, Eric and Sharp, Penny and Whooley,
@@ -1120,6 +1346,7 @@
   titleaddon = 	 {Part 2 of\nopunct},
   date = 	 2001,
   maintitle = 	 {Information and Documentation},
+  userc = 	 {abbrev:ISO},
   mainsubtitle = {Bibliographic References},
   shorthand = 	 {ISO},
   author = 	 {{International Organization for Standardization}},
@@ -1133,7 +1360,12 @@
                   provide an appropriate solution.  The nopunct
                   command suppresses the following punctuation.  The
                   shorthand for the organization will appear in the
-                  in-text citations.}}
+                  in-text citations.  The userc field points to a
+                  CustomC entry which provides the expansion of the
+                  shorthand inside the reference list, rather than in
+                  a list of shorthands.  Using the field in this way
+                  ensures that the expansion will be printed if this
+                  entry is cited.}}
 
 @Book{james:ambassadors,
   title = 	 {The Ambassadors},
@@ -1260,6 +1492,7 @@
   publisher = 	 {Knopf},
   year = 	 1982,
   author = 	 {Le Carr{\'e}, John},
+  sortname = 	 {Lec},
   nameaddon = 	 {David John Moore Cornwell},
   location =  {New York},
   options =   {useprefix=true},
@@ -1328,6 +1561,22 @@
                   and keating:dearborn.}
 }
 
+@Video{loc:city,
+  title = 	 {The Life of a City},
+  subtitle = 	 {Early Films of {New York}, 1898--1906},
+  author = 	 {{Library of Congress}},
+  options = 	 {skipbib},
+  type = 	 {MPEG},
+  url = 	 {http://lcweb2.loc.gov/ammem/papr/nychome.html},
+  urldate = 	 {2001-08-14},
+  annote = 	 {This Video entry provides the online location of the
+                  weed:flatiron film, providing it as an MPEG file for
+                  download.  Here, the options field prevents this
+                  from printing independently of the other entry,
+                  which contains a manual citation of this entry in
+                  its addendum field.}
+}
+
 @Article{loften:hamlet,
   author = 	 {Loften, Peter},
   title = 	 {Reverberations between Wordplay and Swordplay in
@@ -1566,6 +1815,45 @@
                   journaltitle instead of title.}
 }
 
+@Music{nytrumpet:art,
+  title = 	 {Art of the Trumpet},
+  date = 	 1982,
+  author = 	 {{The New York Trumpet Ensemble, with Edward Carroll
+                  (trumpet) and Edward Brewer (organ)}},
+  shortauthor =  {{New York Trumpet Ensemble}},
+  number = 	 {PVT 7183},
+  series = 	 {Vox/Turnabout},
+  publisher =    {The Moss Music Group},
+  howpublished = {\textsf{\small\textcircledP}\ and
+                  \textsf{\small\textcopyright}},
+  sortkey = 	 {New York Trumpet},
+  type = 	 {compact disc},
+  annote = 	 {This can be considered an example of a satisfyingly
+                  full Music entry, providing nearly all pertinent
+                  information, although the composers are missing on
+                  what is presumably a compilation CD.  The performers
+                  take the composers' place in the author field, the
+                  series and number field give the label information,
+                  and the type field gives the medium.  The publisher
+                  of the label is also present, along with the date
+                  and the howpublished field, presenting, as the
+                  Manual suggests, the nature of the copyrights
+                  asserted by the publisher.  (The pubstate field,
+                  only in this entry type, could serve as a synonym
+                  for howpublished.)}
+}
+
+@InReference{oed:cdrom,
+  title = 	 {Oxford {English} Dictionary},
+  publisher = oup,
+  edition = 	 2,
+  shorttitle = 	 {{OED}, \mkbibemph{2nd ed}\adddot},
+  note = 	 {CD-ROM, version 2.0},
+  annote = 	 {An example of a reference work on CD-ROM, presented
+                  in an InReference entry.  The shorttitle is for
+                  in-text citations.}
+}
+
 @Article{osborne:poison,
   journaltitle = {Salon},
   entrysubtype = {magazine},
@@ -1893,6 +2181,19 @@
                   preserve the capitalization.  Cf. pirumova:russian.}
 }
 
+@Audio{schubert:muellerin,
+  title = 	 {{Das Wandern (Wandering)}},
+  date = 	 1895,
+  booktitle = 	 {{Die sch\"one M\"ullerin} ({The} Maid of the Mill)},
+  maintitle = 	 {First Vocal Album \mkbibemph{(for high voice)}},
+  author = 	 {Schubert, Franz},
+  publisher = {G.~Schirmer},
+  address = 	 {New York},
+  annote = 	 {An Audio entry presenting a published musical score.
+                  Note the presence of all three sorts of title, and
+                  the "reverse italics" in the maintitle.}
+}
+
 @Book{schweitzer:bach,
   title = 	 {{J. S. Bach}},
   origdate = 	 1966,
@@ -1951,6 +2252,21 @@
                   in series field of an Article entry.}
 }
 
+@Misc{shapey:partita,
+  author = 	 {Shapey, Ralph},
+  title = 	 {Partita for Violin and Thirteen Players},
+  titleaddon = 	 {score},
+  entrysubtype = {music},
+  date = 	 1966,
+  note = 	 {Special Collections},
+  organization = {Joseph Regenstein Library},
+  institution =  {University of Chicago},
+  annote = 	 {An example of an unpublished musical score,
+                  presented in a Misc (with entrysubtype) rather than
+                  an Audio entry.  No quotation marks are necessary in
+                  the title in the author-date style.}
+}
+
 @Book{silver:gawain,
   title = 	 {Sir {Gawain} and the {Green Knight}},
   publisher = 	 uchp,
@@ -2130,6 +2446,22 @@
   annote = 	 {A book with edition information included in the note
                   field.}}
 
+@Audio{twain:audio,
+  title = 	 {The Humor of {Mark Twain}},
+  author = 	 {Twain, Mark},
+  series = 	 {Commuters' Library},
+  publisher = {Entertainment Software},
+  type = 	 {6 cassettes},
+  address = 	 {Arlington, TX},
+  annote = 	 {An Audio entry presenting an audiobook, which means
+                  the publishing information will be presented as it
+                  would be in the standard book-like entries.  The
+                  Manual sometimes presents this sort of material
+                  somewhat differently, requiring a Music entry --
+                  cf. auden:reading.  Here, the type field gives the
+                  medium.}
+}
+
 @Article{unsigned:ranke,
   journaltitle = {Ergänzungsblätter zur Allgemeinen Literatur-Zeitung},
   entrysubtype = {magazine},
@@ -2153,6 +2485,24 @@
                   bibstring.}
 }
 
+@Audio{verdi:corsaro,
+  title = 	 {Il corsaro (melodramma tragico \mkbibemph{in three acts})},
+  titleaddon = 	 {libretto by Francesco Maria Piave},
+  date = 	 1998,
+  author = 	 {Verdi, Giuseppe},
+  editor = 	 {Hudson, Elizabeth},
+  number = 	 {\bibstring{jourser} 1, Operas},
+  series = 	 {The Works of Giuseppe Verdi},
+  publisher = {University of Chicago Press; Milan: G.\ Ricordi},
+  volumes = 	 2,
+  address = 	 {Chicago},
+  annote = 	 {An Audio entry presenting a published operatic
+                  score.  Note the "reverse italics" in the title, and
+                  also the titleaddon, which identifies the
+                  librettist.  Note also the two publishers, and two
+                  places of publication.}
+}
+
 @Book{virginia:plantation,
   title =	 {A True and Sincere Declaration of the Purpose and
                   Ends of the Plantation Begun in {Virginia}, of the
@@ -2239,6 +2589,27 @@
                   extra curly braces.}
 }
 
+@Audio{weed:flatiron,
+  title = 	 {At the Foot of the {Flatiron}},
+  date = 	 1903,
+  addendum = 	 {from \fullcite{loc:city}},
+  author = 	 {Weed, A.~E.},
+  publisher = {American Mutoscope {and} Biograph Company},
+  type = 	 {35~mm; 2 min., 19 sec.},
+  annote = 	 {The Manual, for some reason, has chosen a rather
+                  more book-like presentation for this film, so
+                  instead of a Video entry I have here used Audio.  To
+                  be more consistent, I would have chosen Video for
+                  this, but in any case note the creator of the film
+                  in the author field, and the medium w/ running
+                  length in the type field.  The addendum cites
+                  another (Video) entry, containing information about
+                  the online location of the MPEG version of the
+                  original 35mm film.  These two entries will be
+                  presented together in the reference list, as
+                  suggested by the Manual, 17.270.}
+}
+
 @Book{weresz,
   author = 	 {Wereszycki, Henryk},
   title = 	 {Koniec sojuszu trzech cesarzy},
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 2a3d4a683d9..0d9cbefe721 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/notes-test.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/notes-test.bib
@@ -121,6 +121,21 @@
                   braces.}
 }
 
+@Music{auden:reading,
+  title = 	 {Poems},
+  author = 	 {Auden, W. H.},
+  number = 	 7137,
+  series = 	 {Spoken Arts},
+  type = 	 {compact disc},
+  note = 	 {read by the author},
+  annote = 	 {An audiobook, lacking traditional publishing
+                  information, presented in a Music entry, with which
+                  cp. twain:audio, an Audio entry.  Here, the type
+                  field contains the medium, while the series and
+                  number field contain the label information for the
+                  CD, as is standard in Music entries.}
+}
+
 @Article{author:forthcoming,
   author = 	 {Author, Margaret~M.},
   title = 	 {Article Title},
@@ -199,6 +214,30 @@
                   capitalize it contextually if needed.}
 }
 
+@Music{beethoven:sonata29,
+  title = 	 {Piano Sonata \bibstring{number} 29
+                  \mkbibquote{Hammerklavier}},
+  author = 	 {Beethoven},
+  editor = 	 {Peter Serkin},
+  shorttitle = 	 {Piano Sonata \bibstring{number} 29},
+  editortype = 	 {none},
+  number = 	 {CDD 270},
+  series = 	 {Proarte Digital},
+  annote = 	 {A musical recording exhibiting several of the
+                  peculiarities common to the audiovisual entry types.
+                  Here, the composer goes in the author field, while
+                  the performer goes into the editor field.  The
+                  editortype "none" prevents any identifying string
+                  being used for the performer, as none is needed.  As
+                  in most Music entries, the series and number give
+                  label identifying information, but the Manual has
+                  provided neither a medium for the type field nor the
+                  publisher who owns the label.  (I'm assuming that
+                  one is supposed to be able to gather this
+                  information from the number and series field, but
+                  the absence of a date doesn't help, either.)}
+}
+
 @BookInBook{bernard:boris,
   author =	 {Bernard, Thomas},
   title =	 {A Party for Boris},
@@ -216,6 +255,28 @@
                   book."}
 }
 
+@Music{bernstein:shostakovich,
+  title = 	 {Symphony \bibstring{number} 5},
+  author = 	 {Shostakovich, Dmitri},
+  editor = 	 {Bernstein, Leonard},
+  editortype = 	 {conductor},
+  editora = 	 {{New York Philharmonic}},
+  editoratype =  {none},
+  number = 	 {IM 35854},
+  series = 	 {CBS},
+  options = 	 {useauthor=false},
+  annote = 	 {Like beethoven:sonata29, this is another rather
+                  abbreviated Music entry, lacking a date, a publisher
+                  and a type.  It does, however, show the method for
+                  emphasizing the conductor instead of the composer,
+                  and also for identifying the conductor in the
+                  editortype field.  Here, the performing orchestra
+                  goes in the editora field, and the editoratype
+                  "none" prevents any string attaching to the
+                  orchestra, as one isn't needed.  The usual series
+                  and number give the label information.}
+}
+
 @Book{boxer:china,
   title = 	 {South China in the Sixteenth Century},
   year = 	 1953,
@@ -373,6 +434,36 @@
                   guess.}
 }
 
+@Video{cleese:holygrail,
+  title = 	 {Commentaries},
+  date = 	 2001,
+  titleaddon = 	 {disc 2},
+  booktitle = 	 {Monty Python and the Holy Grail},
+  author = 	 {Cleese, John and Gilliam, Terry and Idle, Eric and
+                  Jones, Terry and Palin, Michael},
+  editor = 	 {Gilliam, Terry and Jones, Terry},
+  editortype = 	 {director},
+  publisher = {Columbia Tristar Home Entertainment},
+  type = 	 {DVD},
+  address = 	 {Culver City, CA},
+  edition = 	 {special \bibstring{edition}},
+  annote = 	 {This shows some typical features of a Video entry.
+                  It focusses on some of the DVD extras, so the actors
+                  providing the commentary appear in the author field.
+                  The directors go in the editor field, as usual, with
+                  the identifying string in editortype.  The booktitle
+                  provides the film title in this instance -- the
+                  title in this case will appear in quotation marks
+                  rather than italicized, because of the presence of a
+                  booktitle.  The titleaddon tells where in the DVD
+                  set the commentaries are to be found, and the type
+                  field gives the medium.  The date field contains the
+                  date the DVD was released, and the original release
+                  date (origdate) isn't needed here, according to the
+                  Manual, because the entry cites the DVD extras
+                  rather than the film itself.}
+}
+
 @Book{cohen:schiff,
   title =	 {Jacob H. Schiff},
   subtitle =	 {A Study in American Leadership},
@@ -664,6 +755,32 @@
                   citation is taken.}
 }
 
+@Video{episode:tv,
+  title = 	 {Episode Title},
+  titleaddon = 	 {series 5, episode 2},
+  entrysubtype = {tv},
+  date = 	 {2000/2007},
+  origdate = 	 2004,
+  booktitle = 	 {Series Title},
+  publisher = {Production Company},
+  type = 	 {DVD},
+  annote = 	 {The Manual doesn't, that I can find, provide
+                  guidance for citing television programs, so I have
+                  guessed, using the analogy of films, at how to
+                  present one using the Video entry type.  The title
+                  of the episode will be presented within quotation
+                  marks, as there is a booktitle presenting the name
+                  of the TV series.  The titleaddon gives details
+                  about the episode, and the type gives the medium, as
+                  usual.  The origdate is the year of original
+                  transmission, while the date provides the year range
+                  for the whole series, though it would perhaps make
+                  more sense in this situation to provide the date the
+                  DVD was released, instead.  The entrysubtype isn't
+                  necessary, but may be of some use in the author-date
+                  style.}
+}
+
 @BookInBook{euripides:orestes,
   title = 	 {Orestes},
   year = 	 1958,
@@ -845,6 +962,19 @@
                   than by the title.}
 }
 
+@Audio{greek:filmstrip,
+  title = 	 {The Greek and Roman World},
+  date = 	 1977,
+  publisher = {Society for Visual Education},
+  type = 	 {filmstrip},
+  address = 	 {Chicago},
+  sortkey = 	 {Greek and Roman},
+  annote = 	 {A standard Audio entry presenting a filmstrip.  The
+                  type field explains what sort of content it is, and
+                  the sortkey helps with alphabetization, preventing
+                  biblatex from using "The" for that purpose.}
+}
+
 @InReference{grove:sibelius,
   title = 	 {The New Grove Dictionary of Music and Musicians},
   author = 	 {Hepokoski, James},
@@ -866,6 +996,27 @@
                   entries.}
 }
 
+@Video{handel:messiah,
+  title = 	 {Messiah},
+  date = 	 1988,
+  titleaddon = 	 {selections},
+  type = 	 {VHS},
+  editor = 	 {{Atlanta Symphony Orchestra and Chamber Chorus}},
+  editortype = 	 {none},
+  editora = 	 {Shaw, Robert},
+  editoratype =  {none},
+  author = 	 {Handel, George Frederic},
+  publisher = {Video Treasures},
+  address = 	 {Batavia, OH},
+  annote = 	 {This is a videotape of an oratorio, presented
+                  therefore as a Video entry rather than as Music.
+                  The composer goes in author, the performers and
+                  conductor in editor and editora.  Note the "none" in
+                  both editortypes, as the context presumably makes it
+                  clear what role Shaw is playing.  The usual type
+                  field identifies the medium.}
+}
+
 @Book{harley:cartography,
   title =	 {Cartography in the Traditional East and Southeast
                   Asian Societies},
@@ -886,6 +1037,7 @@
   options = 	 {useprefix=true},
   author = 	 {{van} Herwijnen, Eric},
   title = 	 {Future Office Systems Requirements},
+  sortname = 	 {Van},
   institution =  {CERN DD internal note},
   year = 	 1988,
   month = 	 11,
@@ -894,6 +1046,27 @@
                   field identifies the issuer of the report.}
 }
 
+@Video{hitchcock:nbynw,
+  title = 	 {Crop Duster Attack},
+  booktitle = 	 {North by Northwest},
+  date = 	 2000,
+  origdate = 	 1959,
+  editor = 	 {Hitchcock, Alfred},
+  editortype = 	 {director},
+  publisher = {Warner Home Video},
+  type = 	 {DVD},
+  address = 	 {Burbank, CA},
+  options = 	 {useauthor=false,useeditor=false},
+  annote = 	 {This Video entry cites one scene (title) from a film
+                  (booktitle).  Here, the entry in the bibliography
+                  will be alphabetized by the name of the scene, as
+                  the useeditor=false option turns off the printing of
+                  the editor at the head of the entry.  The editortype
+                  field identifies the editor's role, while the
+                  origdate and date give the original year of release
+                  and the year of DVD release, respectively.}
+}
+
 @Article{hlatky:hrt,
   author =	 {Hlatky, Mark~A. and Boothroyd, Derek and
                   Vittinghoff, Eric and Sharp, Penny and Whooley,
@@ -1096,11 +1269,21 @@
                   title.}
 }
 
+@CustomC{lecarre:cornwell,
+  author = 	 {Cornwell, David John Moore},
+  title = 	 {Le Carr{\'e}, John},
+  annote = 	 {A CustomC entry providing an alphabetized cross
+                  reference to a separate entry in the bibliography.
+                  (See next entry.)}
+}
+
 @Book{lecarre:quest,
   title = 	 {The Quest for Karla},
   publisher = 	 {Knopf},
   year = 	 1982,
   author = 	 {Le Carr{\'e}, John},
+  sortname = 	 {Lec},
+  userc = 	 {lecarre:cornwell},
   nameaddon = 	 {David John Moore Cornwell},
   location =  {New York},
   options =   {useprefix=true},
@@ -1109,7 +1292,11 @@
                   nameaddon.  This isn't strictly necessary in this
                   case, as one normally refers to this author by the
                   pseudonym, but if it is of particular interest this
-                  is how you would present such information.}
+                  is how you would present such information.  The
+                  userc field points to a CustomC entry providing a
+                  cross-reference from the author's real name to his
+                  pseudonym, and ensures that this cross-reference
+                  will be printed if this parent entry is cited.}
 }
 
 @Artwork{leo:madonna,
@@ -1174,6 +1361,22 @@
                   keating:dearborn.}
 }
 
+@Video{loc:city,
+  title = 	 {The Life of a City},
+  subtitle = 	 {Early Films of New York, 1898--1906},
+  author = 	 {{Library of Congress}},
+  options = 	 {skipbib},
+  type = 	 {MPEG},
+  url = 	 {http://lcweb2.loc.gov/ammem/papr/nychome.html},
+  urldate = 	 {2001-08-14},
+  annote = 	 {This Video entry provides the online location of the
+                  weed:flatiron film, providing it as an MPEG file for
+                  download.  Here, the options field prevents this
+                  from printing independently of the other entry,
+                  which contains a manual citation of this entry in
+                  its addendum field.}
+}
+
 @Article{loften:hamlet,
   author = 	 {Loften, Peter},
   title = 	 {Reverberations between Wordplay and Swordplay in
@@ -1363,6 +1566,43 @@
                   is again needed to alphabetize by journaltitle.}
 }
 
+@Music{nytrumpet:art,
+  title = 	 {Art of the Trumpet},
+  date = 	 1982,
+  author = 	 {{The New York Trumpet Ensemble, with Edward Carroll
+                  (trumpet) and Edward Brewer (organ)}},
+  shortauthor =  {{New York Trumpet Ensemble}},
+  number = 	 {PVT 7183},
+  series = 	 {Vox/Turnabout},
+  publisher =    {The Moss Music Group},
+  howpublished = {\texttt{\small\textcircledP}\ and
+                  \texttt{\small\textcopyright}},
+  sortkey = 	 {New York Trumpet},
+  type = 	 {compact disc},
+  annote = 	 {This can be considered an example of a satisfyingly
+                  full Music entry, providing nearly all pertinent
+                  information, although the composers are missing on
+                  what is presumably a compilation CD.  The performers
+                  take the composers' place in the author field, the
+                  series and number field give the label information,
+                  and the type field gives the medium.  The publisher
+                  of the label is also present, along with the date
+                  and the howpublished field, presenting, as the
+                  Manual suggests, the nature of the copyrights
+                  asserted by the publisher.  (The pubstate field,
+                  only in this entry type, could serve as a synonym
+                  for howpublished.)}
+}
+
+@InReference{oed:cdrom,
+  title = 	 {Oxford English Dictionary},
+  publisher = oup,
+  edition = 	 2,
+  note = 	 {CD-ROM, version 2.0},
+  annote = 	 {An example of a reference work on CD-ROM, presented
+                  in an InReference entry.}
+}
+
 @Article{osborne:poison,
   journaltitle = {Salon},
   entrysubtype = {magazine},
@@ -1655,6 +1895,20 @@
                   Book rather than Reference.}
 }
 
+@Audio{schubert:muellerin,
+  title = 	 {Das Wandern (Wandering)},
+  date = 	 1895,
+  shorttitle = 	 {Das Wandern},
+  booktitle = 	 {Die sch\"one M\"ullerin (The Maid of the Mill)},
+  maintitle = 	 {First Vocal Album \mkbibemph{(for high voice)}},
+  author = 	 {Schubert, Franz},
+  publisher = {G.~Schirmer},
+  address = 	 {New York},
+  annote = 	 {An Audio entry presenting a published musical score.
+                  Note the presence of all three sorts of title, and
+                  the "reverse italics" in the maintitle.}
+}
+
 @Book{schweitzer:bach,
   title = 	 {J. S. Bach},
   year = 	 1966,
@@ -1710,6 +1964,23 @@
                   series field of an Article entry.}
 }
 
+@Misc{shapey:partita,
+  author = 	 {Shapey, Ralph},
+  title = 	 {\mkbibquote{Partita for Violin and Thirteen Players}},
+  titleaddon = 	 {score},
+  entrysubtype = {music},
+  date = 	 1966,
+  note = 	 {Special Collections},
+  organization = {Joseph Regenstein Library},
+  institution =  {University of Chicago},
+  annote = 	 {An example of an unpublished musical score,
+                  presented in a Misc (with entrysubtype) rather than
+                  an Audio entry.  The title, being more specific than
+                  many archival documents, is manually given quotation
+                  marks, as may at times be necessary in such
+                  entries.}
+}
+
 @Book{silver:gawain,
   title = 	 {Sir Gawain and the Green Knight},
   publisher = 	 uchp,
@@ -1822,6 +2093,22 @@
                   the articles.}
 }
 
+@Audio{twain:audio,
+  title = 	 {The Humor of Mark Twain},
+  author = 	 {Twain, Mark},
+  series = 	 {Commuters' Library},
+  publisher = {Entertainment Software},
+  type = 	 {6 cassettes},
+  address = 	 {Arlington, TX},
+  annote = 	 {An Audio entry presenting an audiobook, which means
+                  the publishing information will be presented as it
+                  would be in the standard book-like entries.  The
+                  Manual sometimes presents this sort of material
+                  somewhat differently, requiring a Music entry --
+                  cf. auden:reading.  Here, the type field gives the
+                  medium.}
+}
+
 @Review{unsigned:ranke,
   journaltitle = {Ergänzungsblätter zur Allgemeinen Literatur-Zeitung},
   entrysubtype = {magazine},
@@ -1847,6 +2134,25 @@
                   correct (plural) bibstring.}
 }
 
+@Audio{verdi:corsaro,
+  title = 	 {Il corsaro (melodramma tragico \mkbibemph{in three acts})},
+  titleaddon = 	 {libretto by Francesco Maria Piave},
+  date = 	 1998,
+  author = 	 {Verdi, Giuseppe},
+  shorttitle = 	 {Il corsaro},
+  editor = 	 {Hudson, Elizabeth},
+  number = 	 {\bibstring{jourser} 1, Operas},
+  series = 	 {The Works of Giuseppe Verdi},
+  publisher = {University of Chicago Press; Milan: G.\ Ricordi},
+  volumes = 	 2,
+  address = 	 {Chicago},
+  annote = 	 {An Audio entry presenting a published operatic
+                  score.  Note the "reverse italics" in the title, and
+                  also the titleaddon, which identifies the
+                  librettist.  Note also the two publishers, and two
+                  places of publication.}
+}
+
 @Book{virginia:plantation,
   title =	 {A True and Sincere Declaration of the Purpose and
                   Ends of the Plantation Begun in Virginia, of the
@@ -1905,6 +2211,27 @@
                   series alone goes in series, the rest in number.}
 }
 
+@Audio{weed:flatiron,
+  title = 	 {At the Foot of the Flatiron},
+  date = 	 1903,
+  addendum = 	 {from \fullcite{loc:city}},
+  author = 	 {Weed, A.~E.},
+  publisher = {American Mutoscope {and} Biograph Company},
+  type = 	 {35~mm; 2 min., 19 sec.},
+  annote = 	 {The Manual, for some reason, has chosen a rather
+                  more book-like presentation for this film, so
+                  instead of a Video entry I have here used Audio.  To
+                  be more consistent, I would have chosen Video for
+                  this, but in any case note the creator of the film
+                  in the author field, and the medium w/ running
+                  length in the type field.  The addendum cites
+                  another (Video) entry, containing information about
+                  the online location of the MPEG version of the
+                  original 35mm film.  These two entries will be
+                  presented together in both notes and bibliography,
+                  as suggested by the Manual, 17.270.}
+}
+
 @Book{weresz,
   author = 	 {Wereszycki, Henryk},
   title = 	 {Koniec sojuszu trzech cesarzy},
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 6aebbb89278..e6e03ea3dfa 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty
@@ -1,6 +1,6 @@
-% $Id: biblatex-chicago.sty,v 0.1.1.29 2010/09/07 10:51:36 dfussner Exp $
+% $Id: biblatex-chicago.sty,v 0.1.1.31 2011/02/15 11:56:42 dfussner Exp $
 
-% Copyright (c) 2009-2010 David Fussner.  This package is
+% Copyright (c) 2009-2011 David Fussner.  This package is
 % author-maintained.
 %
 % This work may be copied, distributed and/or modified under the
@@ -13,7 +13,7 @@
 % but not limited to, the implied warranties of merchantability and
 % fitness for a particular purpose.
 
-\ProvidesPackage{biblatex-chicago}[2010/09/07 v.0.9d biblatex style]
+\ProvidesPackage{biblatex-chicago}[2011/02/15 v 1.2a biblatex style]
 
 \RequirePackage{etoolbox}
 
@@ -37,7 +37,7 @@
   \ExecuteBibliographyOptions{%
     pagetracker=true,autocite=inline,alldates=comp,labelyear=true,
     uniquename=true,useeditor=true,usetranslator=true,usecompiler=true,
-    ibidtracker=constrict,sorting=nyt,cmslos=true,nodates}}
+    ibidtracker=constrict,sorting=nyt,punctfont,cmslos=true,nodates}}
 
 \def\cms@notes{%
   \RequirePackage[style=chicago-notes]{biblatex}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
index b8a47e28a83..d63a666fd5f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
@@ -1,10 +1,10 @@
-% $Id: chicago-authordate.bbx,v 0.6.1.17 2010/09/03 08:51:57 dfussner Exp $
+% $Id: chicago-authordate.bbx,v 0.8 2011/02/15 14:59:29 dfussner Exp $
 % This is a biblatex style file, adapted mainly from Lehman's
 % standard.bbx and from chicago-notes.bbx.  It provides the
 % reference list formatting for the Chicago author-date style.
 
 
-\ProvidesFile{chicago-authordate.bbx}[2010/09/03 v0.9c biblatex
+\ProvidesFile{chicago-authordate.bbx}[2011/02/15 v 1.2a biblatex
 bibliography style]
 
 %%%% Initialize and format bibliography and los %%%%
@@ -56,6 +56,50 @@ bibliography style]
 
 %%%% Author, Editor, Translator, and Compiler  Macros %%%%
 
+\renewbibmacro*{name:last-first}[4]{%
+  \ifuseprefix
+  {\usebibmacro{name:delim}{#3#1}%
+    \usebibmacro{name:hook}{#3#1}%
+    \ifblank{#3}{}{%
+      \ifcapital
+      {\mkbibnameprefix{\MakeCapital{#3}}\isdot}
+      {\mkbibnameprefix{#3}\isdot}%
+      \ifpunctmark{'}{}{\addhighpenspace}}%
+    \mkbibnamelast{#1}\isdot
+    \ifblank{#2}{}{\addcomma\addlowpenspace\mkbibnamefirst{#2}\isdot}%
+    \ifblank{#4}{}{\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot}}
+  {\usebibmacro{name:delim}{#1}%
+    \usebibmacro{name:hook}{#1}%
+    \mkbibnamelast{#1}\isdot%
+    \ifblank{#2#3#4}{}{\addcomma}%
+    \ifblank{#2}{}{\addlowpenspace\mkbibnamefirst{#2}\isdot}%
+    \ifblank{#3}{}{\addlowpenspace\mkbibnameprefix{#3}\isdot}%
+    \ifblank{#4}{}{\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot}}}
+
+\renewbibmacro*{name:first-last}[4]{%
+  \usebibmacro{name:delim}{#2#3#1}%
+  \usebibmacro{name:hook}{#2#3#1}%
+  \ifblank{#2}{}{\mkbibnamefirst{#2}\isdot\addlowpenspace}%
+  \ifblank{#3}{}{%
+    \mkbibnameprefix{#3}\isdot
+    \ifpunctmark{'}
+    {}
+    {\ifuseprefix{\addhighpenspace}{\addlowpenspace}}}%
+  \mkbibnamelast{#1}\isdot
+  \ifblank{#4}{}{%
+    \iftoggle{cms@jrcomma}%
+    {\ifnumeral{#4}%
+      {\addlowpenspace\mkbibnameaffix{#4}\isdot}%
+      {\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot%
+        \ifboolexpr{
+          test{\ifnumless{\value{listcount}}{\value{listtotal}}}
+          and
+          test{\ifnumless{\value{listcount}}{\value{maxnames}}}
+        }
+        {\addcomma}%
+        {}}}%
+    {\addlowpenspace\mkbibnameaffix{#4}\isdot}}}
+
 \newbibmacro*{author/editors/translators}{%
   \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}%
     {\usebibmacro{author}}%
@@ -303,11 +347,11 @@ bibliography style]
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{issn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -334,18 +378,17 @@ bibliography style]
   \newunit\newblock
   \printfield{note}%
   \setunit*{\addcomma\addspace}\newblock% (changed for 0.7)??
-%  \usebibmacro{cms-in:}%
   \usebibmacro{journal+issue+year+pages}%
   \newunit\newblock
   \usebibmacro{pubstate}%
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{issn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -386,15 +429,107 @@ bibliography style]
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
+\DeclareBibliographyDriver{audio}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \setunit{\addspace}%
+  \printfield{nameaddon}%
+  \newunit\newblock
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \usebibmacro{italtitle+stitle}%
+  \newcunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \newcunit%\setunit{\addperiod\addspace}%
+  \usebibmacro{chapinscore}%
+  \usebibmacro{btitle+bstitle}%
+  \iffieldundef{booktitle}
+  {\setunit{\addperiod\addspace}}% Fix customc?
+  {\setunit{\addcomma\addspace}}%
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}%
+    \newcunit
+    \iffieldundef{maintitle}
+    {\printfield{volume}%
+      \printfield{part}%
+      \clearfield{volume}%
+      \clearfield{part}}%
+    {}%
+    \newcunit
+    \printfield{volumes}
+    \clearfield{volumes}}%
+  \newunit% unit, not cunit?
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{byeditor+others}%
+  \newunit% ??? Editorpunct maybe not right here?
+  \iffieldundef{maintitle}
+  {}
+  {\iffieldundef{volume}
+    {\usebibmacro{cms-in:}%
+      \printtext{%
+        \printfield{maintitle}%
+        \setunit{\addcolon\addspace}%
+        \printfield[maintitle]{mainsubtitle}}%
+      \newcunit
+      \printfield{maintitleaddon}}
+    {\printfield{volume}%
+      \printfield{part}%
+      \setunit{\addspace}
+      \bibstring{ofseries}%
+      \setunit{\addspace}
+      \printtext{%
+        \printfield{maintitle}%
+        \setunit{\addcolon\addspace}%
+        \printfield[maintitle]{mainsubtitle}}%
+      \newcunit
+      \printfield{maintitleaddon}}}
+  \newcunit\newblock
+  \printfield{pages}%
+  \newunit
+  \iffieldundef{maintitle}
+    {\printfield{volume}%
+     \printfield{part}}
+    {}%
+  \newunit
+  \printfield{volumes}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \usebibmacro{bibreprint}%\printorigdate%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{publ+loc+year}%
+  \newunit
+  \printfield{type}%
+  \newunit\newblock
+  \usebibmacro{pubstate}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isan}%
+    \setunit*{\addcomma\addspace}\newblock%
+    \printfield{ismn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}%
+
 \DeclareBibliographyDriver{book}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
@@ -440,7 +575,10 @@ bibliography style]
     \clearfield{volumes}}%
   \usebibmacro{editorpunct}%
   \usebibmacro{byeditor+others}%
-  \newcunit\newblock
+  \usebibmacro{editorpunct}%
+  \iftoggle{cms@bookpages}%
+  {}%
+  {\clearfield{pages}}%
   \usebibmacro{chap+pag}%
   \newunit
   \iffieldundef{maintitle}
@@ -451,8 +589,6 @@ bibliography style]
   \printfield{volumes}%
   \newunit\newblock
   \usebibmacro{ser+num}%
-%  \newunit\newblock
-%  \printorigdate%
   \newunit\newblock
   \printfield{note}%
   \newunit\newblock
@@ -466,11 +602,11 @@ bibliography style]
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -539,8 +675,6 @@ bibliography style]
   \printfield{volumes}%
   \newunit\newblock
   \usebibmacro{ser+num}%
-%  \newunit\newblock
-%  \printorigdate%
   \newunit\newblock
   \printfield{note}%
   \newunit\newblock
@@ -552,11 +686,11 @@ bibliography style]
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -587,9 +721,7 @@ bibliography style]
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -623,8 +755,6 @@ bibliography style]
     \clearfield{volumes}}%
   \usebibmacro{editorpunct}%
   \usebibmacro{bytranslator+others}%
-%  \newunit\newblock
-%  \printfield{edition}%
   \newunit
   \iffieldundef{maintitle}
     {\printfield{volume}%
@@ -634,8 +764,6 @@ bibliography style]
   \printfield{volumes}%
   \newunit\newblock
   \usebibmacro{ser+num}%
-%  \newunit\newblock
-%  \printorigdate%
   \newunit\newblock
   \printfield{note}%
   \newunit\newblock
@@ -647,22 +775,25 @@ bibliography style]
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
-\DeclareBibliographyAlias{customa}{letter}%
-
-\DeclareBibliographyAlias{customb}{bookinbook}%
-
-\DeclareBibliographyAlias{customc}{suppbook}%
+\DeclareBibliographyDriver{customc}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \printfield{nameaddon}%
+  \setunit*{\addspace}%
+  \usebibmacro{italtitle+stitle}%
+  \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{image}{%
   \usebibmacro{bibindex}%
@@ -700,9 +831,7 @@ bibliography style]
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -747,8 +876,6 @@ bibliography style]
   \usebibmacro{byeditor+others}%
   \newcunit\newblock
   \printfield{pages}%
-%  \newunit\newblock
-%  \printfield{edition}%
   \newunit
   \iffieldundef{maintitle}
     {\printfield{volume}%
@@ -758,8 +885,6 @@ bibliography style]
   \printfield{volumes}%
   \newunit\newblock
   \usebibmacro{ser+num}%
-%  \newunit\newblock
-%  \printorigdate%
   \newunit\newblock
   \printfield{note}%
   \newunit\newblock
@@ -771,11 +896,11 @@ bibliography style]
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -797,7 +922,6 @@ bibliography style]
   \usebibmacro{byauthor}%
   \setunit{\addperiod\addspace}%
   \usebibmacro{part+editor+translator}%
-%  \setunit{\addperiod\addspace}% Part of the crossref fix. Moved below.
   \iffieldundef{crossref}%
   {\iffieldundef{xref}%
   {\setunit{\addperiod\addspace}% Moved here.
@@ -823,8 +947,6 @@ bibliography style]
   \usebibmacro{byeditor+others}%
   \newcunit\newblock
   \printfield{pages}%
-%  \newunit\newblock
-%  \printfield{edition}%
   \newunit
   \iffieldundef{maintitle}
     {\printfield{volume}%
@@ -834,8 +956,6 @@ bibliography style]
   \printfield{volumes}%
   \newunit\newblock
   \usebibmacro{ser+num}%
-%  \newunit\newblock
-%  \printorigdate%
   \newunit\newblock
   \printfield{note}%
   \newunit\newblock
@@ -847,11 +967,11 @@ bibliography style]
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -881,7 +1001,6 @@ bibliography style]
   \usebibmacro{byauthor}%
   \setunit{\addperiod\addspace}%
   \usebibmacro{part+editor+translator}%
-%  \setunit{\addperiod\addspace}%
   \iffieldundef{crossref}%
   {\iffieldundef{xref}%
   {\setunit{\addperiod\addspace}%
@@ -910,11 +1029,11 @@ bibliography style]
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -973,8 +1092,6 @@ bibliography style]
   \usebibmacro{byeditor+others}%
   \newcunit\newblock
   \usebibmacro{chap+pag}%
-%  \newunit\newblock
-%  \printfield{edition}%
   \newunit
   \iffieldundef{maintitle}
     {\printfield{volume}%
@@ -984,8 +1101,6 @@ bibliography style]
   \printfield{volumes}%
   \newunit\newblock
   \usebibmacro{ser+num}%
-%  \newunit\newblock
-%  \printorigdate%
   \newunit\newblock
   \printfield{note}%
   \newunit\newblock
@@ -1006,11 +1121,11 @@ bibliography style]
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1060,8 +1175,6 @@ bibliography style]
   \usebibmacro{byeditor+others}%
   \newcunit\newblock
   \printfield{pages}%
-%  \newunit\newblock
-%  \printfield{edition}%
   \newunit
   \iffieldundef{maintitle}
     {\printfield{volume}%
@@ -1082,11 +1195,11 @@ bibliography style]
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1118,8 +1231,6 @@ bibliography style]
   \usebibmacro{edition}%
   \newcunit
   \usebibmacro{byauthor}%
-%  \newunit\newblock
-%  \printfield{edition}%
   \newunit\newblock
   \usebibmacro{ser+num}%
   \newunit\newblock
@@ -1135,11 +1246,11 @@ bibliography style]
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1192,9 +1303,109 @@ bibliography style]
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{music}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \setunit{\addspace}%
+  \printfield{nameaddon}%
+  \newunit\newblock
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \usebibmacro{italtitle+stitle}%
+  \newcunit%
+  \printeventdate%
+  \newcunit%
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \newunit\newblock
+  \usebibmacro{chapinscore}%
+  \usebibmacro{btitle+bstitle}%
+  \iffieldundef{booktitle}
+  {\newunit}% Fix customc?
+  {\newcunit}%
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}%
+    \newcunit
+    \iffieldundef{maintitle}
+    {\printfield{volume}%
+      \printfield{part}%
+      \clearfield{volume}%
+      \clearfield{part}}%
+    {}%
+    \newcunit
+    \printfield{volumes}
+    \clearfield{volumes}}%
+  \newunit% unit, not cunit?
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{byeditor+others}%
+  \newunit% ??? Editorpunct maybe not right here?
+  \iffieldundef{maintitle}
+  {}
+  {\iffieldundef{volume}
+    {\usebibmacro{cms-in:}%
+      \printtext{%
+        \printfield{maintitle}%
+        \setunit{\addcolon\addspace}%
+        \printfield[maintitle]{mainsubtitle}}%
+      \newcunit
+      \printfield{maintitleaddon}}
+    {\printfield{volume}%
+      \printfield{part}%
+      \setunit{\addspace}
+      \bibstring{ofseries}%
+      \setunit{\addspace}
+      \printtext{%
+        \printfield{maintitle}%
+        \setunit{\addcolon\addspace}%
+        \printfield[maintitle]{mainsubtitle}}%
+      \newcunit
+      \printfield{maintitleaddon}}}
+  \newcunit\newblock
+  \printfield{pages}%
+  \newunit
+  \iffieldundef{maintitle}
+    {\printfield{volume}%
+     \printfield{part}}
+    {}%
+  \newunit
+  \printfield{volumes}%
+  \newunit\newblock
+  \printfield{version}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{music+ser+num}%
+  \newunit
+  \usebibmacro{music+publisher}%
+  \setunit*{\addspace}%\newblock
+  \usebibmacro{date}%
+  \setunit{\ifthenelse{\iffieldundef{howpublished}\AND%
+      \iffieldundef{pubstate}}%
+    {\newunit}{\space\bibstring{by}\space}}%
+  \printlist{publisher}%
+  \newunit
+  \usebibmacro{institution+organization}%
+  \setunit*{\addcomma\addspace}\newblock
+  \printlist{location}%
+  \newunit\newblock
+  \printfield{type}%
+  \newunit\newblock
+  \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \iftoggle{cms@isbn}%
+  {\printfield{iswc}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1223,7 +1434,9 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{date}%
   \newunit\newblock
-  \printfield{doi}%
+  \iftoggle{cms@doi}%
+  {\printfield{doi}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
   \usebibmacro{url+date}%
   \newunit\newblock
@@ -1261,7 +1474,6 @@ bibliography style]
   \newcunit\newblock
   \printfield{version}%
   \newcunit\newblock
-%  \bibstring{patentfiled}\addspace}\newblock%
   \iftoggle{cms@switchdates}%
   {\bibstring{patentfiled}%
     \setunit{\addspace}%
@@ -1280,15 +1492,12 @@ bibliography style]
       \setunit{\addcomma\addspace\bibstring{and}%
         \addspace\bibstring{patentissued}\addspace}%
       \usebibmacro{date}}}%
-%  \usebibmacro{date}%
   \newcunit\newblock
   \printfield{addendum}%
   \newunit\newblock
   \usebibmacro{pubstate}%
   \newunit\newblock
-  \printfield{doi}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -1320,11 +1529,11 @@ bibliography style]
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{issn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1349,18 +1558,17 @@ bibliography style]
   \newunit\newblock
   \printfield{note}%
   \setunit*{\addcomma\addspace}\newblock% (changed for 0.7)??
-%  \usebibmacro{cms-in:}%
   \usebibmacro{periodical+issue+year+pages}%
   \newunit\newblock
   \usebibmacro{pubstate}%
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{issn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1398,11 +1606,11 @@ bibliography style]
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1453,8 +1661,6 @@ bibliography style]
   \usebibmacro{byeditor+others}%
   \newcunit\newblock
   \usebibmacro{chap+pag}%
-%  \newunit\newblock
-%  \printfield{edition}%
   \newunit
   \iffieldundef{maintitle}
     {\printfield{volume}%
@@ -1464,8 +1670,6 @@ bibliography style]
   \printfield{volumes}%
   \newunit\newblock
   \usebibmacro{ser+num}%
-%  \newunit\newblock
-%  \printorigdate%
   \newunit\newblock
   \printfield{note}%
   \newunit\newblock
@@ -1477,11 +1681,11 @@ bibliography style]
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1514,11 +1718,11 @@ bibliography style]
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isrn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isrn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1535,7 +1739,6 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{cmsbibsortdate}%
   \newunit\newblock
-%  \usebibmacro{mag+news+title}%
   \printfield{title}%
   \setunit{\addcolon\addspace}%
   \printfield[noformat]{subtitle}%
@@ -1562,11 +1765,11 @@ bibliography style]
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{issn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1618,10 +1821,8 @@ bibliography style]
     \clearfield{volumes}}%
   \usebibmacro{editorpunct}%
   \usebibmacro{byeditor}%
-  \newcunit\newblock
+  \usebibmacro{editorpunct}%\newcunit\newblock
   \usebibmacro{chap+pag}%
-%  \newunit\newblock
-%  \printfield{edition}%
   \newunit
   \iffieldundef{maintitle}
     {\printfield{volume}%
@@ -1631,8 +1832,6 @@ bibliography style]
   \printfield{volumes}%
   \newunit\newblock
   \usebibmacro{ser+num}%
-%  \newunit\newblock
-%  \printorigdate%
   \newunit\newblock
   \printfield{note}%
   \newunit\newblock
@@ -1644,11 +1843,11 @@ bibliography style]
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1683,9 +1882,7 @@ bibliography style]
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1720,15 +1917,125 @@ bibliography style]
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \iftoggle{cms@url}
+  {\usebibmacro{url+date}}%
+  {}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
+\DeclareBibliographyDriver{video}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \setunit{\addspace}%
+  \printfield{nameaddon}%
+  \newunit\newblock
+  \usebibmacro{cmsbibsortdate}%
+  \newunit\newblock
+  \printtext{%
+    \printfield{title}%
+    \setunit{\addcolon\addspace}%
+    \printfield[title]{subtitle}}%
+  \iffieldundef{booktitle}% Comma after italics, period after quotes
+  {\newcunit}
+  {\newunit}%\setunit{\addspace}\newblock%
+  \printfield{titleaddon}%\usebibmacro{title+stitle}%
+  \setunit{\addspace}\newblock%\bibsentence
+  \usebibmacro{language+transtitle}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{byauthor}%
+  \setunit{\addperiod\addspace}%
+  \usebibmacro{part+editor+translator}%
+  \setunit{\addperiod\addspace}%
+  \usebibmacro{chapinscore}%
+  \usebibmacro{btitle+bstitle}%
+  \iffieldundef{booktitle}
+  {\setunit{\addperiod\addspace}}% Fix customc?
+  {\setunit{\addcomma\addspace}}%
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}%
+    \newcunit
+    \iffieldundef{maintitle}
+    {\printfield{volume}%
+      \printfield{part}%
+      \clearfield{volume}%
+      \clearfield{part}}%
+    {}%
+    \newcunit
+    \printfield{volumes}
+    \clearfield{volumes}}%
+  \newunit
+  \printfield{type}%
+  \newunit% unit, not cunit?
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{byeditor+others}%
+  \newunit% ??? Editorpunct maybe not right here?
+  \iffieldundef{maintitle}
+  {}
+  {\iffieldundef{volume}
+    {\usebibmacro{cms-in:}%
+      \printtext{%
+        \printfield{maintitle}%
+        \setunit{\addcolon\addspace}%
+        \printfield[maintitle]{mainsubtitle}}%
+      \newcunit
+      \printfield{maintitleaddon}}
+    {\printfield{volume}%
+      \printfield{part}%
+      \setunit{\addspace}
+      \bibstring{ofseries}%
+      \setunit{\addspace}
+      \printtext{%
+        \printfield{maintitle}%
+        \setunit{\addcolon\addspace}%
+        \printfield[maintitle]{mainsubtitle}}%
+      \newcunit
+      \printfield{maintitleaddon}}}
+  \newcunit\newblock
+  \printfield{pages}%
+  \newunit
+  \iffieldundef{maintitle}
+    {\printfield{volume}%
+     \printfield{part}}
+    {}%
+  \newunit
+  \printfield{volumes}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{publ+loc+year}%
+  \newunit\newblock
+  \usebibmacro{pubstate}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isan}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}%
+
 %%%% Other Formatting Macros %%%%
 
+\newbibmacro*{bib+doi+url}{% For biblatex field exclusion
+  \iftoggle{cms@doi}%
+  {\printfield{doi}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@url}%
+  {\usebibmacro{url+date}}%
+  {}}
+
 \newbibmacro*{shorthand:label}{% Test this
   \iffieldequalstr{entrysubtype}{magazine}% Simplifies .bib creation
     {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}}}%
@@ -1762,10 +2069,15 @@ bibliography style]
   \iffieldundef{origyear}%
   {\usebibmacro{cmsbibyear}}%
   {\iffieldint{year}%
-    {\ifthenelse{\thefield{origyear}>\thefield{year}}%
-      {\toggletrue{cms@switchdates}%
-        \usebibmacro{cmsbibyear}}%
-      {\usebibmacro{cmsbibyear}}}%
+    {\iffieldundef{endyear}% Needed for date ranges - video type, esp.
+      {\ifthenelse{\thefield{origyear}>\thefield{year}}%
+        {\toggletrue{cms@switchdates}%
+          \usebibmacro{cmsbibyear}}%
+        {\usebibmacro{cmsbibyear}}}%
+      {\ifthenelse{\thefield{origyear}>\thefield{endyear}}%
+        {\toggletrue{cms@switchdates}%
+          \usebibmacro{cmsbibyear}}%
+        {\usebibmacro{cmsbibyear}}}}%
     {\usebibmacro{cmsbibyear}}}}
 
 \newbibmacro*{cmsbibyear}{%
@@ -1830,10 +2142,17 @@ bibliography style]
     {\iffieldundef{origyear}%
       {}
       {\printtext[parens]{%
-          \bibstring{origpubyear}%
-          \printfield{origyear}\addperiod}\nopunct}}}%
+          \usebibmacro{choosepubstring}%
+          \printorigdate\addperiod}\nopunct}}}%
   {\printfield{pubstate}}}
 
+\newbibmacro*{choosepubstring}{%
+  \iffieldequalstr{entrytype}{video}%
+  {\iffieldequalstr{entrysubtype}{tv}%
+    {\bibstring{origshownyear}}%
+    {\bibstring{origreleaseyear}}}%
+  {\bibstring{origpubyear}}}%
+
 \newbibmacro*{bibreprint}{%
   \iftoggle{cms@reprint}%
   {\iffieldundef{origyear}%
@@ -1904,6 +2223,7 @@ bibliography style]
     \printfield{maintitleaddon}}}}
 
 \newbibmacro*{journal+issue+year+pages}{%
+  \iftoggle{cms@numbermonth}{}{\clearfield{month}}%
   \usebibmacro{cjournal+ser+vol+num}%
   \setunit{\addspace}%
   \ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month}
@@ -1917,11 +2237,12 @@ bibliography style]
         \printfield{number}}%
       {\printfield{issue}%
         \setunit{\addspace}%
-        \printfield{year}}}%
+        \usebibmacro{cmsyear}}}%
     \setunit{\addcolon\addspace}}
   \printfield{pages}}
 
 \newbibmacro*{periodical+issue+year+pages}{%
+  \iftoggle{cms@numbermonth}{}{\clearfield{month}}%
   \usebibmacro{cperiodical+ser+vol+num}%
   \setunit{\addspace}%
   \ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month}
@@ -1935,7 +2256,7 @@ bibliography style]
         \printfield{number}}%
       {\printfield{issue}%
         \setunit{\addspace}%
-        \printfield{year}}}%
+        \usebibmacro{cmsyear}}}%
     \setunit{\addcolon\addspace}}
   \printfield{pages}}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
index cb763d8fa2b..10302cb00e6 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
@@ -1,10 +1,10 @@
-% $Id: chicago-authordate.cbx,v 0.6.1.30 2010/09/03 08:52:06 dfussner Exp $
+% $Id: chicago-authordate.cbx,v 0.8.1.1 2011/02/15 17:09:04 dfussner Exp $
 % This is a biblatex citation style file, adapted from Lehman's
 % authoryear-comp.cbx.  It is heavily modified, with the intention of
 % providing inline citations (and a reference list) for the
 % author-date style of the Chicago Manual of Style, 15th edition.
 
-\ProvidesFile{chicago-authordate.cbx}[2010/09/03 v0.9c biblatex citation style]
+\ProvidesFile{chicago-authordate.cbx}[2011/02/15 v 1.2a biblatex citation style]
 
 %%%% Biblatex initialization + Chicago options + Toggles %%%%
 
@@ -22,6 +22,14 @@
 \providetoggle{cms@oneyear}
 \providetoggle{cms@nodates}
 
+\providetoggle{cms@url}% These are for the field-exclusion options
+\providetoggle{cms@doi}
+\providetoggle{cms@isbn}
+\providetoggle{cms@numbermonth}
+\providetoggle{cms@bookpages}
+
+\providetoggle{cms@jrcomma}% Comma after Jr./Sr.
+
 \providetoggle{cms@headlessnote}% Keep
 \providetoggle{cms@noibid}% Keep
 \providetoggle{cms@usecompiler}% Keep
@@ -30,6 +38,9 @@
 \providetoggle{cms@postposit}% Keep
 
 \AtEveryCitekey{%
+  \iffieldundef{userc}%
+  {}%
+  {\nocite{\thefield{userc}}}%
   \iffieldequalstr{entrytype}{patent}%
   {\toggletrue{cms@origlabel}}%
   {}%
@@ -88,6 +99,46 @@
 \DeclareEntryOption{usecompiler}[true]{%
   \settoggle{cms@usecompiler}{#1}}
 
+\DeclareBibliographyOption{juniorcomma}[true]{%
+  \settoggle{cms@jrcomma}{#1}}
+
+\DeclareEntryOption{juniorcomma}[true]{%
+  \settoggle{cms@jrcomma}{#1}}
+
+% The field-exclusion options %
+
+\DeclareBibliographyOption{isbn}[true]{%
+  \settoggle{cms@isbn}{#1}}
+\DeclareBibliographyOption{url}[true]{%
+  \settoggle{cms@url}{#1}}
+\DeclareBibliographyOption{doi}[true]{%
+  \settoggle{cms@doi}{#1}}
+\DeclareBibliographyOption{numbermonth}[true]{%
+  \settoggle{cms@numbermonth}{#1}}
+\DeclareBibliographyOption{bookpages}[true]{%
+  \settoggle{cms@bookpages}{#1}}
+\DeclareBibliographyOption{includeall}[true]{%
+  \settoggle{cms@isbn}{#1}%
+  \settoggle{cms@url}{#1}%
+  \settoggle{cms@doi}{#1}%
+  \settoggle{cms@numbermonth}{#1}%
+  \settoggle{cms@bookpages}{#1}}
+
+\DeclareEntryOption{isbn}[true]{%
+  \settoggle{cms@isbn}{#1}}
+\DeclareEntryOption{url}[true]{%
+  \settoggle{cms@url}{#1}}
+\DeclareEntryOption{doi}[true]{%
+  \settoggle{cms@doi}{#1}}
+\DeclareEntryOption{numbermonth}[true]{%
+  \settoggle{cms@numbermonth}{#1}}
+\DeclareEntryOption{bookpages}[true]{%
+  \settoggle{cms@bookpages}{#1}}
+
+\ExecuteBibliographyOptions{includeall}%
+
+% More authordate options %
+
 \DeclareEntryOption{switchdates}[true]{%
   \settoggle{cms@switchdates}{#1}}
 
@@ -167,7 +218,9 @@
           {\iffieldequals{namehash}{\cbx@lastyear}%
             {}%
             {\usebibmacro{cmsbracketname}% For names in []
-              \setunit{\addspace}}%
+              \iffieldequalstr{entrytype}{customc}%
+              {\newcunit}%
+              {\setunit{\addspace}}}%
             \usebibmacro{cite:label}%
             \iffieldundef{postnote}%
             {\savefield{namehash}{\cbx@lasthash}}%
@@ -443,10 +496,15 @@
   \iffieldundef{origyear}%
   {\usebibmacro{cmsciteyear}}%
   {\iffieldint{year}%
-    {\ifthenelse{\thefield{origyear}>\thefield{year}}%
-      {\toggletrue{cms@switchdates}%
-        \usebibmacro{cmsciteyear}}%
-      {\usebibmacro{cmsciteyear}}}%
+    {\iffieldundef{endyear}% Needed for date ranges -- video type, esp.
+      {\ifthenelse{\thefield{origyear}>\thefield{year}}%
+        {\toggletrue{cms@switchdates}%
+          \usebibmacro{cmsciteyear}}%
+        {\usebibmacro{cmsciteyear}}}%
+      {\ifthenelse{\thefield{origyear}>\thefield{endyear}}%
+        {\toggletrue{cms@switchdates}%
+          \usebibmacro{cmsciteyear}}%
+        {\usebibmacro{cmsciteyear}}}}%
     {\usebibmacro{cmsciteyear}}}}
 
 \newbibmacro*{cmsciteyear}{%
@@ -680,12 +738,6 @@
 \DeclareFieldFormat[book]{title}{%
   \mkbibemph{\MakeSentenceCase*{#1}}\isdot}
 
-\DeclareFieldAlias[customb]{title}[book]{title}
-
-\DeclareFieldAlias[customb]{citetitle}[book]{title}
-
-\DeclareFieldAlias[customb]{lostitle}[book]{lostitle}
-
 \DeclareFieldAlias[bookinbook]{title}[book]{title}
 
 \DeclareFieldAlias[bookinbook]{citetitle}[book]{title}
@@ -722,17 +774,17 @@
 
 \DeclareFieldAlias[inreference]{lostitle}[book]{lostitle}
 
-\DeclareFieldFormat[letter]{title}{#1\isdot}
+\DeclareFieldAlias[reference]{title}[book]{title}
 
-\DeclareFieldFormat[letter]{citetitle}{#1\isdot}
+\DeclareFieldAlias[reference]{citetitle}[book]{title}
 
-\DeclareFieldFormat[letter]{lostitle}{#1\isdot}
+\DeclareFieldAlias[reference]{lostitle}[book]{lostitle}
 
-\DeclareFieldAlias[customa]{title}[letter]{title}
+\DeclareFieldFormat[letter]{title}{#1\isdot}
 
-\DeclareFieldAlias[customa]{citetitle}[letter]{citetitle}
+\DeclareFieldFormat[letter]{citetitle}{#1\isdot}
 
-\DeclareFieldAlias[customa]{lostitle}[letter]{lostitle}
+\DeclareFieldFormat[letter]{lostitle}{#1\isdot}
 
 \DeclareFieldAlias[inproceedings]{title}[article]{title}% As above
 
@@ -798,11 +850,21 @@
   \addspace%
   \mkbibemph{\MakeSentenceCase*{#1}}\isdot}
 
-\DeclareFieldAlias[customc]{title}[suppbook]{title}
-
-\DeclareFieldAlias[customc]{citetitle}[suppbook]{lostitle}
+\DeclareFieldFormat[customc]{title}{%
+  \iffieldundef{nameaddon}%
+  {\mkbibemph{\bibstring{see}}%
+    \addspace%
+    #1}%
+  {#1}}
 
-\DeclareFieldAlias[customc]{lostitle}[suppbook]{lostitle}
+\DeclareFieldFormat[customc]{citetitle}{%
+  \ifnameundef{author}%
+  {#1}
+  {\iffieldundef{nameaddon}%
+    {\mkbibemph{\bibstring{see}}%
+      \addspace%
+      #1}%
+    {\printfield{nameaddon}\addspace #1}}}
 
 \DeclareFieldAlias[suppcollection]{title}[suppbook]{title}
 
@@ -862,6 +924,33 @@
 
 \DeclareFieldFormat{maintitle}{\mkbibemph{\MakeSentenceCase*{#1}}}
 
+\DeclareFieldFormat[video]{title}{%
+  \iffieldundef{booktitle}%
+  {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
+  {\MakeSentenceCase*{#1}\isdot}}
+
+\DeclareFieldFormat[video]{citetitle}{%
+  \iffieldundef{booktitle}%
+  {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
+  {\MakeSentenceCase*{#1}\isdot}}
+
+\DeclareFieldFormat[video]{lostitle}{%
+  \iffieldundef{booktitle}%
+  {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
+  {\MakeSentenceCase*{#1}\isdot}}
+
+\DeclareFieldAlias[music]{title}[video]{title}
+
+\DeclareFieldAlias[music]{citetitle}[video]{citetitle}
+
+\DeclareFieldAlias[music]{lostitle}[video]{lostitle}
+
+\DeclareFieldAlias[audio]{title}[video]{title}
+
+\DeclareFieldAlias[audio]{citetitle}[video]{citetitle}
+
+\DeclareFieldAlias[audio]{lostitle}[video]{lostitle}
+
 %%%% Other Field Formats %%%%
 
 \DeclareNumChars*{:}%
@@ -885,10 +974,14 @@
 
 \DeclareFieldAlias[image]{type}[artwork]{type}
 
-\DeclareFieldAlias[customc]{type}[suppbook]{type}
-
 \DeclareFieldAlias[suppcollection]{type}[suppbook]{type}
 
+\DeclareFieldAlias[video]{type}[suppbook]{type}
+
+\DeclareFieldAlias[music]{type}[suppbook]{type}
+
+\DeclareFieldAlias[audio]{type}[suppbook]{type}
+
 \DeclareFieldFormat{url}{\url{#1}}
 
 \DeclareFieldFormat{doi}{%
@@ -899,6 +992,11 @@
 
 \DeclareFieldFormat{nameaddon}{\mkbibbrackets{#1\bibsentence}}% ?!
 
+\DeclareFieldFormat[customc]{nameaddon}{% For cross-refs
+  \ifbibstring{#1}%
+  {\mkbibemph{\bibstring{#1}}}%
+  {#1}}%
+
 \DeclareFieldFormat{edition}{% New in 0.8
   \ifinteger{#1}
   {\mkbibordinal{#1}~\bibstring{edition}}%
@@ -976,7 +1074,6 @@
 
 \newcommand{\classicpunct}{%
   \ifthenelse{\iffieldequalstr{entrysubtype}{classical}\OR%
-    \iffieldequalstr{entrytype}{customa}\OR%
     \iffieldequalstr{entrytype}{letter}}%
   {\setunit*{\addspace}}%
   {\setunit*{\addcomma\addspace}}}
@@ -1111,7 +1208,9 @@
   \ifthenelse{\(\iffieldundef{booktitle}\AND\iffieldundef{maintitle}\)%
     \OR\iffieldsequal{booktitle}{title}%  Changed these for crossrefed
     \OR\iffieldsequal{maintitle}{title}}% entries.  Create problems?
-  {\newunit\newblock}%
+  {\iffieldequalstr{entrytype}{video}%
+    {\newcunit\newblock}%
+    {\newunit\newblock}}%
   {\newcunit\newblock}}
 
 \newbibmacro*{edition}{%
@@ -1404,44 +1503,33 @@
   {}
   {\printfield{chapter}\addspace}}
 
+\newbibmacro*{chapinscore}{%
+  \iffieldundef{chapter}%
+  {}
+  {\printfield{chapter}%
+    \addspace\bibstring{of}\setunit{\addspace}}}
+
+\newbibmacro*{music+ser+num}{%
+  \iffieldundef{series}%
+  {\iffieldundef{number}%
+    {}%
+    {\printfield{number}}}
+  {\printfield{series}%
+    \setunit{\addspace}%
+    \printfield{number}}}%
+
+\newbibmacro*{music+publisher}{%
+  \iffieldundef{howpublished}%
+  {\iffieldundef{pubstate}%
+    {}%
+    {\printfield{pubstate}}}%
+  {\printfield{howpublished}}}%
+
 \newbibmacro*{ser+num}{%
   \printfield{series}%
   \printfield[sernum]{number}%
   \newunit}
 
-\newbibmacro*{ctitle+stitle}{%
-  \printtext[title]{%
-    \printfield[noformat]{title}%
-    \setunit{\addcolon\addspace}%
-    \printfield[noformat]{subtitle}}%
-  \setunit{\addcomma\addspace}\newblock%
-  \printfield{titleaddon}}%
-%  \setunit{\addspace}}%
-%  \usebibmacro{language+transtitle}%
-%  \setunit*{\addcomma}\newblock}
-
-\newbibmacro*{citaltitle+stitle}{%
-  \printtext[title]{%
-    \printfield[noformat]{title}%
-    \setunit{\addcolon\addspace}%
-    \printfield[noformat]{subtitle}}%
-  \newcunit\newblock%
-  \printfield{titleaddon}%
-  \setunit{\addspace}%
-  \usebibmacro{language+transtitle}%
-  \newcunit\newblock}
-
-\newbibmacro*{title+stitle}{%
-  \printtext[title]{%
-    \printfield[noformat]{title}%
-    \setunit{\addcolon\addspace}%
-    \printfield[noformat]{subtitle}}%
-  \newunit%\setunit{\addspace}\newblock%
-  \printfield{titleaddon}}%
-%  \setunit{\addspace}}%
-%  \usebibmacro{language+transtitle}%
-%  \newunit\newblock}
-
 \newbibmacro*{italtitle+stitle}{%
   \printtext{%
     \printfield{title}%
@@ -1462,15 +1550,6 @@
      \printfield{titleaddon}%
      }%\newcunit\newblock
 
-\newbibmacro*{cmag+news+title}{%
-  \printtext[title]{%
-       \printfield[noformat]{title}%
-       \setunit{\addcolon\addspace}%
-       \printfield[noformat]{subtitle}}%
-     \setunit{\addcomma\addspace}%
-     \printfield{titleaddon}%
-     }%\newcunit\newblock
-
 \newbibmacro*{language+transtitle}{%
   \iffieldundef{usere}%
   {\printlist[][-\value{listtotal}]{language}}%
@@ -1529,33 +1608,6 @@
   \usebibmacro{date}%
 }%
 
-\newbibmacro*{cpubl+loc+year}{%
-  \ifthenelse{\iffieldundef{location}\AND\iffieldundef{publisher}
-    \AND\iffieldundef{year}}%
-  {}
-  {\setunit{\addspace}%
-    \printtext[parens]{%
-      \printorigdate%\printfield{origyear}%
-      \setunit*{\addsemicolon\addspace}%
-      \printlist{location}%
-      \iflistundef{publisher}
-      {\setunit*{\addspace}}
-      {\setunit*{\addcolon\space}}%
-      \printlist{publisher}%
-      \setunit{\addcomma\space}%
-      \usebibmacro{date}}}}%
-
-\newbibmacro*{cpubletter+loc+year}{%
-    \setunit{\addspace}%
-    \printtext[parens]{%
-    \printlist{location}%
-  \iflistundef{publisher}
-    {\setunit*{\addspace}}
-    {\setunit*{\addcolon\space}}%
-  \printlist{publisher}%
-  \setunit{\addcomma\space}%
-  \usebibmacro{date}}}% Changed for 0.9
-
 \newbibmacro*{originally+published+as}{% Punctuation fix now in 
   \iffieldundef{userf}%                  \origfullcite for 0.8e. 
   {\iffieldundef{reprinttitle}%
@@ -1598,26 +1650,6 @@
   {noformat}%
   {parens}}
 
-\newbibmacro*{cjournal+issue+year+pages}{%
-  \usebibmacro{cjournal+ser+vol+num}%
-  \setunit{\addspace}%
-  \printtext[parens]{% parens is the default here
-    \iffieldundef{issue}
-    {\usebibmacro{date}}%
-      {\printfield{issue}%
-       \setunit{\addspace}%
-       \printfield{year}}}}
-
-\newbibmacro*{cperiodical+issue+year+pages}{% For periodicals,
-  \usebibmacro{cperiodical+ser+vol+num}% subtype article
-  \setunit{\addspace}%
-  \printtext[parens]{% parens is the default here
-    \iffieldundef{issue}
-    {\usebibmacro{date}}%
-      {\printfield{issue}%
-       \setunit{\addspace}%
-       \printfield{year}}}}
-
 \newbibmacro*{letter+date}{% New for 0.9
   \iftoggle{cms@switchdates}%
   {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}%
@@ -1768,12 +1800,14 @@
   \iffieldundef{issue}
   {\iffieldundef{number}%
     {\usebibmacro{date}}%
-    {\usebibmacro{date}%
-      \setunit{\addcomma\addspace}%
-      \printfield[journum]{number}}}%
-  {\printfield{issue}%
+    {\iftoggle{cms@numbermonth}%
+      {\usebibmacro{date}}%
+      {\usebibmacro{cmsyear}}%
+      \setunit*{\addcomma\addspace}% Starred version for when the 
+      \printfield[journum]{number}}}% month isn't printed because of
+  {\printfield{issue}% the toggle.
     \setunit{\addspace}%
-    \printfield{year}}}
+    \usebibmacro{cmsyear}}}
 
 \newbibmacro*{mag+date+issue}{%
   \usebibmacro{journal+sub}%
@@ -1784,6 +1818,11 @@
   \newcunit\newblock
   \usebibmacro{date+issue}}
 
+\newbibmacro*{cmsyear}{%
+  \iftoggle{cms@switchdates}%
+  {\printfield{origyear}}%
+  {\printfield{year}}}
+
 \newbibmacro*{periodical+date+issue}{% For periodical type &
   \printtext[title]{% magazine subtype
     \printfield[noformat]{title}%
@@ -1818,32 +1857,6 @@
     \newcunit
     \printfield{maintitleaddon}}}}
 
-\newbibmacro*{crefmtitle+mstitle+vol+part+title+stitle}{%
-  \iffieldundef{booktitle}
-  {\usebibmacro{citaltitle+stitle}}%
-  {\usebibmacro{btitle+bstitle}}%
-  \newcunit% need this?
-  \iffieldundef{maintitle}
-  {}
-  {\iffieldundef{volume}
-    {\printtext{%
-        \printfield{maintitle}%
-      \setunit{\addcolon\addspace}%
-      \printfield[maintitle]{mainsubtitle}}%
-    \newcunit
-    \printfield{maintitleaddon}}
-  {\printfield{volume}%
-    \printfield{part}%
-    \setunit{\addspace}
-    \bibstring{ofseries}%
-    \setunit{\addspace}
-    \printtext{%
-      \printfield{maintitle}%
-      \setunit{\addcolon\addspace}%
-      \printfield[maintitle]{mainsubtitle}}%
-    \newcunit
-    \printfield{maintitleaddon}}}}
-
 \newbibmacro*{cmtitle+mstitle+vol+part+btitle+bstitle}{%
   \usebibmacro{btitle+bstitle}%
   \newcunit
@@ -1874,43 +1887,6 @@
   {\setunit{\postnotedelim}%
   \printfield{postnote}}}
 
-% \newbibmacro*{fullpostnote}{%
-%   \iffieldundef{postnote}%
-%   {\iffieldundef{chapter}%
-%     {\iffieldundef{pages}%
-%       {}%
-%       {\postnotedelim%
-%         \printfield{pages}}}%
-%     {\postnotedelim%
-%       \printfield{chapter}}}%
-%   {\postnotedelim%
-%     \printfield{postnote}}}
-
-% \newbibmacro*{inreffullpostnote}{%
-%   \iffieldundef{postnote}%
-%   {\iffieldundef{chapter}%
-%     {\iffieldundef{pages}%
-%       {\addcomma\addspace%
-%         \printlist[][-\value{listtotal}]{lista}}%
-%       {\postnotedelim%
-%         \printfield{pages}}}%
-%     {\postnotedelim%
-%       \printfield{chapter}}}%
-%   {\postnotedelim%
-%     \printfield{postnote}}}
-
-% \newbibmacro*{xrefpostnote}{% Only for crossrefed (or xrefed) InCollection,
-%   \iffieldundef{postnote}%    InProceedings, or CustomA entries
-%   {\iffieldundef{chapter}%
-%     {\iffieldundef{pages}%
-%       {}%
-%       {\addcomma\addspace%
-%         \printfield{pages}}}%
-%     {\addcomma\addspace%
-%       \printfield{chapter}}}%
-%   {}}% The postnote field already shows up because of the fullpostnote
-%      % call.
-
 \newbibmacro*{part+editor+translator}{%
   \ifnameundef{namea}%
   {\ifnameundef{nameb}%
@@ -1928,23 +1904,6 @@
       \bibstring{cbytranslator}\space%
       \printnames[bytranslator]{nameb}}}}}
 
-% \newbibmacro*{cpart+editor+translator}{%
-%   \ifnameundef{namea}%
-%   {\ifnameundef{nameb}%
-%     {}
-%     {\bibstring{cbytranslator}\space%
-%     \printnames[bytranslator]{nameb}}}%
-% {\ifnamesequal{namea}{nameb}%
-%   {\bibstring{cbyeditortr}\space%
-%     \printnames[byeditor]{namea}}%
-%   {\bibstring{cbyeditor}\space% Need this \space here?
-%     \printnames[byeditor]{namea}%
-%     \ifnameundef{nameb}%
-%     {}
-%     {\newcunit
-%       \bibstring{cbytranslator}\space%
-%       \printnames[bytranslator]{nameb}}}}}
-
 \newbibmacro*{compilestrg}{%
   \ifthenelse{\value{namec}>1\OR\ifandothers{namec}}
   {\bibstring{compilers}}
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
index 16cece4b09f..958fb7feffb 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
@@ -1,10 +1,10 @@
-% $Id: chicago-notes.bbx,v 0.9.1.9 2010/09/03 08:39:14 dfussner Exp $
+% $Id: chicago-notes.bbx,v 0.9.7.1 2011/02/15 15:02:59 dfussner Exp $
 % This is a biblatex style file, adapted mainly from Lehman's standard.bbx
 % It provides the bibliography formatting for the Chicago notes + 
 % bibliography style.
 
 
-\ProvidesFile{chicago-notes.bbx}[2010/09/03 v0.9c biblatex bibliography style]
+\ProvidesFile{chicago-notes.bbx}[2011/02/15 v 1.2a biblatex bibliography style]
 
 %%%% Initialize and format bibliography and los %%%%
 
@@ -56,9 +56,13 @@
     togl {cms@switchdates}
   }%
   {}%
-  {\ifthenelse{\thefield{origyear}>\thefield{year}}%
-    {\toggletrue{cms@switchdates}}%
-    {}}}%
+  {\iffieldundef{endyear}%
+    {\ifthenelse{\thefield{origyear}>\thefield{year}}%
+      {\toggletrue{cms@switchdates}}%
+      {}}%
+    {\ifthenelse{\thefield{origyear}>\thefield{endyear}}%
+      {\toggletrue{cms@switchdates}}%
+      {}}}}%
 
 \InitializeBibliographyStyle{%
   \let\bbx@lasthash\undefined}
@@ -69,6 +73,50 @@
 
 %%%% Author, Editor, Translator, and Compiler  Macros %%%%
 
+\renewbibmacro*{name:last-first}[4]{%
+  \ifuseprefix
+  {\usebibmacro{name:delim}{#3#1}%
+    \usebibmacro{name:hook}{#3#1}%
+    \ifblank{#3}{}{%
+      \ifcapital
+      {\mkbibnameprefix{\MakeCapital{#3}}\isdot}
+      {\mkbibnameprefix{#3}\isdot}%
+      \ifpunctmark{'}{}{\addhighpenspace}}%
+    \mkbibnamelast{#1}\isdot
+    \ifblank{#2}{}{\addcomma\addlowpenspace\mkbibnamefirst{#2}\isdot}%
+    \ifblank{#4}{}{\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot}}
+  {\usebibmacro{name:delim}{#1}%
+    \usebibmacro{name:hook}{#1}%
+    \mkbibnamelast{#1}\isdot%
+    \ifblank{#2#3#4}{}{\addcomma}%
+    \ifblank{#2}{}{\addlowpenspace\mkbibnamefirst{#2}\isdot}%
+    \ifblank{#3}{}{\addlowpenspace\mkbibnameprefix{#3}\isdot}%
+    \ifblank{#4}{}{\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot}}}
+
+\renewbibmacro*{name:first-last}[4]{%
+  \usebibmacro{name:delim}{#2#3#1}%
+  \usebibmacro{name:hook}{#2#3#1}%
+  \ifblank{#2}{}{\mkbibnamefirst{#2}\isdot\addlowpenspace}%
+  \ifblank{#3}{}{%
+    \mkbibnameprefix{#3}\isdot
+    \ifpunctmark{'}
+    {}
+    {\ifuseprefix{\addhighpenspace}{\addlowpenspace}}}%
+  \mkbibnamelast{#1}\isdot
+  \ifblank{#4}{}{%
+    \iftoggle{cms@jrcomma}%
+    {\ifnumeral{#4}%
+      {\addlowpenspace\mkbibnameaffix{#4}\isdot}%
+      {\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot%
+        \ifboolexpr{
+          test{\ifnumless{\value{listcount}}{\value{listtotal}}}
+          and
+          test{\ifnumless{\value{listcount}}{\value{maxnames}}}
+        }
+        {\addcomma}%
+        {}}}%
+    {\addlowpenspace\mkbibnameaffix{#4}\isdot}}}
+
 \newbibmacro*{author/editors/translators}{%
   \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}%
     {\usebibmacro{author}}%
@@ -295,11 +343,11 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{issn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -322,16 +370,15 @@
   \newunit\newblock
   \printfield{note}%
   \setunit*{\addcomma\addspace}\newblock% (changed for 0.7)??
-%  \usebibmacro{cms-in:}%
   \usebibmacro{journal+issue+year+pages}%
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{issn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -366,15 +413,103 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
+\DeclareBibliographyDriver{audio}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \setunit{\addspace}%
+  \printfield{nameaddon}%
+  \newunit\newblock
+  \usebibmacro{italtitle+stitle}%
+  \newcunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \newcunit%\setunit{\addperiod\addspace}%
+  \usebibmacro{chapinscore}%
+  \usebibmacro{btitle+bstitle}%
+  \iffieldundef{booktitle}
+  {\setunit{\addperiod\addspace}}% Fix customc?
+  {\setunit{\addcomma\addspace}}%
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}%
+    \newcunit
+    \iffieldundef{maintitle}
+    {\printfield{volume}%
+      \printfield{part}%
+      \clearfield{volume}%
+      \clearfield{part}}%
+    {}%
+    \newcunit
+    \printfield{volumes}
+    \clearfield{volumes}}%
+  \newunit% unit, not cunit?
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{byeditor+others}%
+  \newunit% ??? Editorpunct maybe not right here?
+  \iffieldundef{maintitle}
+  {}
+  {\iffieldundef{volume}
+    {\usebibmacro{cms-in:}%
+      \printtext[maintitle]{%
+        \printfield[noformat]{maintitle}%
+        \setunit{\addcolon\addspace}%
+        \printfield[noformat]{mainsubtitle}}%
+      \newcunit
+      \printfield{maintitleaddon}}
+    {\printfield{volume}%
+      \printfield{part}%
+      \setunit{\addspace}
+      \bibstring{ofseries}%
+      \setunit{\addspace}
+      \printtext[maintitle]{%
+        \printfield[noformat]{maintitle}%
+        \setunit{\addcolon\addspace}%
+        \printfield[noformat]{mainsubtitle}}%
+      \newcunit
+      \printfield{maintitleaddon}}}
+  \newcunit\newblock
+  \printfield{pages}%
+  \newunit
+  \iffieldundef{maintitle}
+    {\printfield{volume}%
+     \printfield{part}}
+    {}%
+  \newunit
+  \printfield{volumes}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \usebibmacro{cmsorigdate}%\printorigdate%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{publ+loc+year}%
+  \newunit
+  \printfield{type}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isan}%
+    \setunit*{\addcomma\addspace}\newblock%
+    \printfield{ismn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}%
+
 \DeclareBibliographyDriver{book}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
@@ -418,7 +553,10 @@
     \clearfield{volumes}}%
   \usebibmacro{editorpunct}%
   \usebibmacro{byeditor+others}%
-  \newcunit\newblock
+  \usebibmacro{editorpunct}%\newcunit\newblock
+  \iftoggle{cms@bookpages}%
+  {}%
+  {\clearfield{pages}}%
   \usebibmacro{chap+pag}%
   \newunit
   \iffieldundef{maintitle}
@@ -440,11 +578,11 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -520,11 +658,11 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -549,9 +687,7 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -583,8 +719,6 @@
     \clearfield{volumes}}%
   \usebibmacro{editorpunct}%
   \usebibmacro{bytranslator+others}%
-%  \newunit\newblock
-%  \printfield{edition}%
   \newunit
   \iffieldundef{maintitle}
     {\printfield{volume}%
@@ -603,22 +737,25 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
-\DeclareBibliographyAlias{customa}{letter}%
-
-\DeclareBibliographyAlias{customb}{bookinbook}%
-
-\DeclareBibliographyAlias{customc}{suppbook}%
+\DeclareBibliographyDriver{customc}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \printfield{nameaddon}%
+  \setunit*{\addspace}%
+  \usebibmacro{italtitle+stitle}%
+  \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{image}{%
   \usebibmacro{bibindex}%
@@ -650,9 +787,7 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -695,8 +830,6 @@
   \usebibmacro{byeditor+others}%
   \newcunit\newblock
   \printfield{pages}%
-%  \newunit\newblock
-%  \printfield{edition}%
   \newunit
   \iffieldundef{maintitle}
     {\printfield{volume}%
@@ -715,11 +848,11 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -735,14 +868,13 @@
   \usebibmacro{title+stitle}%
   \setunit{\addspace}\newblock%\bibsentence
   \usebibmacro{language+transtitle}%
-  \setunit{\addcomma\addspace}%
+  \newcunit\newblock
   \usebibmacro{byauthor}%
-  \setunit{\addperiod\addspace}%
+  \newunit\newblock
   \usebibmacro{part+editor+translator}%
-%  \setunit{\addperiod\addspace}% Part of the crossref fix. Moved below.
   \iffieldundef{crossref}%
   {\iffieldundef{xref}%
-  {\setunit{\addperiod\addspace}% Moved here.
+  {\newunit\newblock
   \usebibmacro{chapincoll}%
   \usebibmacro{cms-in:}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
@@ -765,8 +897,6 @@
   \usebibmacro{byeditor+others}%
   \newcunit\newblock
   \printfield{pages}%
-%  \newunit\newblock
-%  \printfield{edition}%
   \newunit
   \iffieldundef{maintitle}
     {\printfield{volume}%
@@ -785,21 +915,23 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}%
 {\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
-  \bibxrefcite{\thefield{xref}}
+  \usebibmacro{chapincoll}%
+  \bibxrefcite{\thefield{xref}}%
   \usebibmacro{bibpostxref}%
   \usebibmacro{finentry}}}%
 {\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+  \usebibmacro{chapincoll}%
   \bibxrefcite{\thefield{crossref}}%
   \usebibmacro{bibpostxref}%
   \usebibmacro{finentry}}}
@@ -817,7 +949,6 @@
   \usebibmacro{byauthor}%
   \setunit{\addperiod\addspace}%
   \usebibmacro{part+editor+translator}%
-%  \setunit{\addperiod\addspace}%
   \iffieldundef{crossref}%
   {\iffieldundef{xref}%
   {\setunit{\addperiod\addspace}%
@@ -825,7 +956,7 @@
     \usebibmacro{cms-in:}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit\newblock
-  \usebibmacro{chap+pag}%
+  \printfield{pages}%
   \newunit\newblock
   \iffieldundef{maintitle}
     {\printfield{volume}%
@@ -842,21 +973,23 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}%
 {\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
-  \bibxrefcite{\thefield{xref}}
+  \usebibmacro{chapincoll}%
+  \bibxrefcite{\thefield{xref}}%
   \usebibmacro{bibpostxref}%
   \usebibmacro{finentry}}}%
 {\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+  \usebibmacro{chapincoll}%
   \bibxrefcite{\thefield{crossref}}%
   \usebibmacro{bibpostxref}%
   \usebibmacro{finentry}}}
@@ -903,8 +1036,6 @@
   \usebibmacro{byeditor+others}%
   \newcunit\newblock
   \usebibmacro{chap+pag}%
-%  \newunit\newblock
-%  \printfield{edition}%
   \newunit
   \iffieldundef{maintitle}
     {\printfield{volume}%
@@ -932,11 +1063,11 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1002,11 +1133,11 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1015,12 +1146,14 @@
 {\ifpunctmark{*}% Attempt to fix issues with n.d. Changed for 0.9.
   {\setunit{\nopunct\addspace\bibsentence}}%
   {}%
-  \bibxrefcite{\thefield{xref}}
+  \usebibmacro{chapincoll}%
+  \bibxrefcite{\thefield{xref}}%
   \usebibmacro{bibpostxref}%
   \usebibmacro{finentry}}}%
 {\ifpunctmark{*}% Likewise.
   {\setunit{\nopunct\addspace\bibsentence}}%
   {}%
+  \usebibmacro{chapincoll}%
   \bibxrefcite{\thefield{crossref}}%
   \usebibmacro{bibpostxref}%
   \usebibmacro{finentry}}}
@@ -1036,8 +1169,6 @@
   \usebibmacro{edition}%
   \newcunit
   \usebibmacro{byauthor}%
-%  \newunit\newblock
-%  \printfield{edition}%
   \newunit\newblock
   \usebibmacro{ser+num}%
   \newunit\newblock
@@ -1049,11 +1180,11 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1100,9 +1231,107 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{music}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \setunit{\addspace}%
+  \printfield{nameaddon}%
+  \newunit\newblock
+  \usebibmacro{italtitle+stitle}%
+  \newcunit%
+  \printeventdate%
+  \newcunit%
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \newunit\newblock
+  \usebibmacro{chapinscore}%
+  \usebibmacro{btitle+bstitle}%
+  \iffieldundef{booktitle}
+  {\newunit}% Fix customc?
+  {\newcunit}%
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}%
+    \newcunit
+    \iffieldundef{maintitle}
+    {\printfield{volume}%
+      \printfield{part}%
+      \clearfield{volume}%
+      \clearfield{part}}%
+    {}%
+    \newcunit
+    \printfield{volumes}
+    \clearfield{volumes}}%
+  \newunit% unit, not cunit?
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{byeditor+others}%
+  \newunit% ??? Editorpunct maybe not right here?
+  \iffieldundef{maintitle}
+  {}
+  {\iffieldundef{volume}
+    {\usebibmacro{cms-in:}%
+      \printtext[maintitle]{%
+        \printfield[noformat]{maintitle}%
+        \setunit{\addcolon\addspace}%
+        \printfield[noformat]{mainsubtitle}}%
+      \newcunit
+      \printfield{maintitleaddon}}
+    {\printfield{volume}%
+      \printfield{part}%
+      \setunit{\addspace}
+      \bibstring{ofseries}%
+      \setunit{\addspace}
+      \printtext[maintitle]{%
+        \printfield[noformat]{maintitle}%
+        \setunit{\addcolon\addspace}%
+        \printfield[noformat]{mainsubtitle}}%
+      \newcunit
+      \printfield{maintitleaddon}}}
+  \newcunit\newblock
+  \printfield{pages}%
+  \newunit
+  \iffieldundef{maintitle}
+    {\printfield{volume}%
+     \printfield{part}}
+    {}%
+  \newunit
+  \printfield{volumes}%
+  \newunit\newblock
+  \printfield{version}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{music+ser+num}%
+  \newunit
+  \usebibmacro{music+publisher}%
+  \setunit*{\addspace}%\newblock
+  \usebibmacro{date}%
+  \setunit*{\ifthenelse{\iffieldundef{howpublished}\AND%
+      \iffieldundef{pubstate}}%
+    {\addperiod\addspace}{\space\bibstring{by}\space}}%
+  \printlist{publisher}%
+  \newunit
+  \usebibmacro{institution+organization}%
+  \setunit*{\addcomma\addspace}\newblock
+  \printlist{location}%
+  \newunit\newblock
+  \printfield{type}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{iswc}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1127,7 +1356,9 @@
   \newunit\newblock
   \usebibmacro{date}%
   \newunit\newblock
-  \printfield{doi}%
+  \iftoggle{cms@doi}%
+  {\printfield{doi}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
   \usebibmacro{url+date}%
   \newunit\newblock
@@ -1158,8 +1389,6 @@
        \printlist[][-\value{listtotal}]{location}}}%
   \newcunit\newblock
   \printfield{version}%
-%  \setunit{\addcomma\addspace
-%  \bibstring{patentfiled}\addspace}\newblock%
   \iffieldundef{origyear}%
   {\iffieldundef{year}%
     {}%
@@ -1170,13 +1399,10 @@
     \setunit{\addcomma\addspace\bibstring{and}%
       \addspace\bibstring{patentissued}\addspace}%
     \usebibmacro{date}}%
-%  \usebibmacro{date}%
   \newcunit\newblock
   \printfield{addendum}%
   \newunit\newblock
-  \printfield{doi}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -1202,11 +1428,11 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{issn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1227,16 +1453,15 @@
   \newunit\newblock
   \printfield{note}%
   \setunit*{\addcomma\addspace}\newblock% (changed for 0.7)??
-%  \usebibmacro{cms-in:}%
   \usebibmacro{periodical+issue+year+pages}%
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{issn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1268,11 +1493,11 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1321,8 +1546,6 @@
   \usebibmacro{byeditor+others}%
   \newcunit\newblock
   \usebibmacro{chap+pag}%
-%  \newunit\newblock
-%  \printfield{edition}%
   \newunit
   \iffieldundef{maintitle}
     {\printfield{volume}%
@@ -1341,11 +1564,11 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1372,11 +1595,11 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isrn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isrn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1391,7 +1614,6 @@
   \setunit{\addspace}%
   \printfield{nameaddon}%
   \newunit\newblock
-%  \usebibmacro{mag+news+title}%
   \printfield{title}%
   \setunit{\addcolon\addspace}%
   \printfield[noformat]{subtitle}%
@@ -1414,11 +1636,11 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{issn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1468,10 +1690,8 @@
     \clearfield{volumes}}%
   \usebibmacro{editorpunct}%
   \usebibmacro{byeditor}%
-  \newcunit\newblock
+  \usebibmacro{editorpunct}%\newcunit\newblock
   \usebibmacro{chap+pag}%
-%  \newunit\newblock
-%  \printfield{edition}%
   \newunit
   \iffieldundef{maintitle}
     {\printfield{volume}%
@@ -1490,11 +1710,11 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1523,9 +1743,7 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1554,15 +1772,123 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \iftoggle{cms@url}
+  {\usebibmacro{url+date}}%
+  {}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
+\DeclareBibliographyDriver{video}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \setunit{\addspace}%
+  \printfield{nameaddon}%
+  \newunit\newblock
+  \printtext[title]{%
+    \printfield[noformat]{title}%
+    \setunit{\addcolon\addspace}%
+    \printfield[noformat]{subtitle}}%
+  \iffieldundef{booktitle}% Comma after italics, period after quotes
+  {\newcunit}
+  {\newunit}%\setunit{\addspace}\newblock%
+  \printfield{titleaddon}%\usebibmacro{title+stitle}%
+  \setunit{\addspace}\newblock%\bibsentence
+  \usebibmacro{language+transtitle}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{byauthor}%
+  \setunit{\addperiod\addspace}%
+  \usebibmacro{part+editor+translator}%
+  \setunit{\addperiod\addspace}%
+  \usebibmacro{chapinscore}%
+  \usebibmacro{btitle+bstitle}%
+  \iffieldundef{booktitle}
+  {\setunit{\addperiod\addspace}}% Fix customc?
+  {\setunit{\addcomma\addspace}}%
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}%
+    \newcunit
+    \iffieldundef{maintitle}
+    {\printfield{volume}%
+      \printfield{part}%
+      \clearfield{volume}%
+      \clearfield{part}}%
+    {}%
+    \newcunit
+    \printfield{volumes}
+    \clearfield{volumes}}%
+  \newunit
+  \printfield{type}%
+  \newunit% unit, not cunit?
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{byeditor+others}%
+  \newunit% ??? Editorpunct maybe not right here?
+  \iffieldundef{maintitle}
+  {}
+  {\iffieldundef{volume}
+    {\usebibmacro{cms-in:}%
+      \printtext[maintitle]{%
+        \printfield[noformat]{maintitle}%
+        \setunit{\addcolon\addspace}%
+        \printfield[noformat]{mainsubtitle}}%
+      \newcunit
+      \printfield{maintitleaddon}}
+    {\printfield{volume}%
+      \printfield{part}%
+      \setunit{\addspace}
+      \bibstring{ofseries}%
+      \setunit{\addspace}
+      \printtext[maintitle]{%
+        \printfield[noformat]{maintitle}%
+        \setunit{\addcolon\addspace}%
+        \printfield[noformat]{mainsubtitle}}%
+      \newcunit
+      \printfield{maintitleaddon}}}
+  \newcunit\newblock
+  \printfield{pages}%
+  \newunit
+  \iffieldundef{maintitle}
+    {\printfield{volume}%
+     \printfield{part}}
+    {}%
+  \newunit
+  \printfield{volumes}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \usebibmacro{cmsorigdate}%\printorigdate%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{publ+loc+year}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isan}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}%
+
 %%%% Other Formatting Macros %%%%
 
+\newbibmacro*{bib+doi+url}{% For biblatex field exclusion
+  \iftoggle{cms@doi}%
+  {\printfield{doi}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@url}%
+  {\usebibmacro{url+date}}%
+  {}}
+
 \newbibmacro*{bibpostxref}{%
   \iffieldundef{postnote}%
   {\iffieldundef{chapter}%
@@ -1628,10 +1954,10 @@
   \setunit{\addspace}%
   \printtext[parens]{%
     \iffieldundef{issue}
-    {\usebibmacro{date}}%
+    {\usebibmacro{number+or+month}}%
       {\printfield{issue}%
        \setunit{\addspace}%
-       \printfield{year}}}%
+       \usebibmacro{cmsyear}}}%
   \setunit{\addcolon\addspace}
   \printfield{pages}}
 
@@ -1640,10 +1966,10 @@
   \setunit{\addspace}%
   \printtext[parens]{%
     \iffieldundef{issue}
-    {\usebibmacro{date}}%
+    {\usebibmacro{number+or+month}}%
       {\printfield{issue}%
        \setunit{\addspace}%
-       \printfield{year}}}%
+       \usebibmacro{cmsyear}}}%
   \setunit{\addcolon\addspace}
   \printfield{pages}}
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
index 28de8fb80e3..d97e430551b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
@@ -1,10 +1,10 @@
-% $Id: chicago-notes.cbx,v 0.9.1.13 2010/09/03 08:39:06 dfussner Exp $
+% $Id: chicago-notes.cbx,v 0.9.7.1 2011/02/15 15:01:59 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.cbx}[2010/09/03 v0.9c biblatex citation style]
+\ProvidesFile{chicago-notes.cbx}[2011/02/15 v 1.2a biblatex citation style]
 
 %%%% Biblatex initialization + Chicago options + Toggles %%%%
 
@@ -14,6 +14,14 @@
 \providetoggle{cms@reprint}% ditto
 \providetoggle{cms@switchdates}% ditto
 
+\providetoggle{cms@jrcomma}% For comma before Jr./Sr.
+
+\providetoggle{cms@url}% These are for the field-exclusion options
+\providetoggle{cms@doi}
+\providetoggle{cms@isbn}
+\providetoggle{cms@numbermonth}
+\providetoggle{cms@bookpages}
+
 \providetoggle{cms@headlessnote}
 \providetoggle{cms@fullnote}
 \providetoggle{cms@shortnote}
@@ -28,6 +36,9 @@
 \providetoggle{cms@postposit}
 
 \AtEveryCitekey{%
+  \iffieldundef{userc}%
+  {}%
+  {\nocite{\thefield{userc}}}%
   \global\togglefalse{cms@loccit}%
   \iffieldequalstr{pubstate}{reprint}%
   {\toggletrue{cms@reprint}}%
@@ -42,9 +53,13 @@
     togl {cms@switchdates}
   }%
   {}%
-  {\ifthenelse{\thefield{origyear}>\thefield{year}}%
-    {\toggletrue{cms@switchdates}}%
-    {}}}%
+  {\iffieldundef{endyear}%
+    {\ifthenelse{\thefield{origyear}>\thefield{year}}%
+      {\toggletrue{cms@switchdates}}%
+      {}}%
+    {\ifthenelse{\thefield{origyear}>\thefield{endyear}}%
+      {\toggletrue{cms@switchdates}}%
+      {}}}}%
 
 \DeclareBibliographyOption{annotation}[true]{%
   \global\toggletrue{cms@annotation}}
@@ -64,6 +79,44 @@
 \DeclareEntryOption{usecompiler}[true]{%
   \settoggle{cms@usecompiler}{#1}}
 
+\DeclareBibliographyOption{juniorcomma}[true]{%
+  \settoggle{cms@jrcomma}{#1}}
+
+\DeclareEntryOption{juniorcomma}[true]{%
+  \settoggle{cms@jrcomma}{#1}}
+
+% The field-exclusion options %
+
+\DeclareBibliographyOption{isbn}[true]{%
+  \settoggle{cms@isbn}{#1}}
+\DeclareBibliographyOption{url}[true]{%
+  \settoggle{cms@url}{#1}}
+\DeclareBibliographyOption{doi}[true]{%
+  \settoggle{cms@doi}{#1}}
+\DeclareBibliographyOption{numbermonth}[true]{%
+  \settoggle{cms@numbermonth}{#1}}
+\DeclareBibliographyOption{bookpages}[true]{%
+  \settoggle{cms@bookpages}{#1}}
+\DeclareBibliographyOption{includeall}[true]{%
+  \settoggle{cms@isbn}{#1}%
+  \settoggle{cms@url}{#1}%
+  \settoggle{cms@doi}{#1}%
+  \settoggle{cms@numbermonth}{#1}%
+  \settoggle{cms@bookpages}{#1}}
+
+\DeclareEntryOption{isbn}[true]{%
+  \settoggle{cms@isbn}{#1}}
+\DeclareEntryOption{url}[true]{%
+  \settoggle{cms@url}{#1}}
+\DeclareEntryOption{doi}[true]{%
+  \settoggle{cms@doi}{#1}}
+\DeclareEntryOption{numbermonth}[true]{%
+  \settoggle{cms@numbermonth}{#1}}
+\DeclareEntryOption{bookpages}[true]{%
+  \settoggle{cms@bookpages}{#1}}
+
+\ExecuteBibliographyOptions{includeall}
+
 % For author-date compatibility %
 
 \DeclareEntryOption{switchdates}[true]{%
@@ -179,9 +232,7 @@
       {cite:\thefield{entrytype}}%
    \iffieldundef{shorthand}
      {}%
-     {\addperiod\space%
-      \bibstring{citedas}\space%
-      \printfield{shorthand}}}}
+     {\usebibmacro{cms:shorthandintro}}}}
 
 \newbibmacro*{cite:crossfull}{%
   \printtext[bibhypertarget]{%
@@ -190,9 +241,7 @@
       {cite:crossfull}%
    \iffieldundef{shorthand}
      {}
-     {\addperiod\space
-      \bibstring{citedas}\space
-      \printfield{shorthand}}}}
+     {\usebibmacro{cms:shorthandintro}}}}
 
 \newbibmacro*{cite:short}{%
   \ifthenelse{\ifnameundef{labelname}\OR%
@@ -218,6 +267,14 @@
   \printtext[bibhyperlink]{%
     \printfield{shorthand}}}
 
+\newbibmacro*{cms:shorthandintro}{% For changing the citedas phrase
+  \iffieldundef{shorthandintro}%
+  {\addperiod\space%
+    \bibstring{citedas}\space%
+    \printfield{shorthand}}%
+  {\addperiod\space%
+    \printfield{shorthandintro}}}
+
 \newbibmacro*{cite:ibid}{%
   \iftoggle{cms@noibid}
   {\global\toggletrue{cms@shortnote}%
@@ -243,6 +300,13 @@
   {}%\usebibmacro{clearalmostall}} (?)
   {\usebibmacro{citeindex}%
     \usebibmacro{cms-in:}%
+    \ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
+      \(\iffieldequalstr{entrytype}{collection}\OR%
+      \iffieldequalstr{entrytype}{proceedings}\)}%
+    {\clearname{author}%
+      \clearname{shortauthor}%
+      \clearname{labelname}}%
+    {}%
     \usebibmacro{crosscite}}
   {}
   {}%\usebibmacro{xrefpostnote}}
@@ -250,6 +314,13 @@
 \DeclareCiteCommand{\bibxrefcite}
   {}%\usebibmacro{clearalmostall}} (?)
   {\usebibmacro{cms-in:}%
+    \ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
+      \(\iffieldequalstr{entrytype}{collection}\OR%
+      \iffieldequalstr{entrytype}{proceedings}\)}%
+    {\clearname{author}%
+      \clearname{shortauthor}%
+      \clearname{labelname}}%
+    {}%
     \toggletrue{cms@shortnote}%
     \togglefalse{cms@fullnote}%
     \usebibmacro{cite:short}}
@@ -376,11 +447,11 @@
   \newcunit\newblock
   \printfield{addendum}%
   \newcunit\newblock
-  \printfield{issn}%
-  \newcunit\newblock
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
   \newcunit\newblock
-  \usebibmacro{url+date}%
+  \usebibmacro{cite+doi+url}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -406,11 +477,11 @@
   \newcunit\newblock
   \printfield{addendum}%
   \newcunit\newblock
-  \printfield{issn}%
-  \newcunit\newblock
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
   \newcunit\newblock
-  \usebibmacro{url+date}%
+  \usebibmacro{cite+doi+url}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}}
@@ -444,9 +515,91 @@
   \newcunit\newblock
   \printfield{addendum}%
   \newcunit\newblock
-  \printfield{doi}%
+  \usebibmacro{cite+doi+url}%
   \newcunit\newblock
-  \usebibmacro{url+date}%
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{cite:audio}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \setunit{\addspace}%
+  \printfield{nameaddon}%
+  \newcunit\newblock
+  \usebibmacro{ctitle+stitle}%
+  \setunit{\addspace}\newblock%
+  \usebibmacro{language+transtitle}%
+  \newcunit
+  \usebibmacro{byauthor}%
+  \newcunit
+  \usebibmacro{cpart+editor+translator}%
+  \newcunit
+  \usebibmacro{chapinscore}%
+  \usebibmacro{btitle+bstitle}%
+  \newcunit
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}%
+    \newcunit
+    \iffieldundef{maintitle}
+    {\printfield{volume}%
+      \printfield{part}%
+      \clearfield{volume}%
+      \clearfield{part}}%
+    {}%
+    \newcunit
+    \printfield{volumes}
+    \clearfield{volumes}}%
+  \newcunit
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{cbyeditor+others}%
+  \iffieldundef{maintitle}
+  {}
+  {\iffieldundef{volume}
+    {\usebibmacro{cms-in:}%
+      \printtext[maintitle]{%
+        \printfield[noformat]{maintitle}%
+        \setunit{\addcolon\addspace}%
+        \printfield[noformat]{mainsubtitle}}%
+      \newcunit
+      \printfield{maintitleaddon}}
+    {\printfield{volume}%
+      \printfield{part}%
+      \setunit{\addspace}
+      \bibstring{ofseries}%
+      \setunit{\addspace}
+      \printtext[maintitle]{%
+        \printfield[noformat]{maintitle}%
+        \setunit{\addcolon\addspace}%
+        \printfield[noformat]{mainsubtitle}}%
+      \newcunit
+      \printfield{maintitleaddon}}}
+  \newcunit
+  \iffieldundef{maintitle}
+    {\printfield{volume}%
+     \printfield{part}}
+    {}%
+  \newcunit
+  \printfield{volumes}%
+  \newcunit\newblock
+  \usebibmacro{ser+num}%
+  \newcunit\newblock
+  \printfield{note}%
+  \newcunit\newblock
+  \usebibmacro{cpubl+loc+year}%
+  \newcunit
+  \printfield{type}%
+  \usebibmacro{fullpostnote}%
+  \newcunit\newblock
+  \printfield{addendum}%
+  \newcunit\newblock
+  \iftoggle{cms@isbn}%
+  {\printfield{isan}%
+    \newcunit\newblock
+    \printfield{ismn}}%
+  {}%
+  \newcunit\newblock%
+  \usebibmacro{cite+doi+url}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -507,17 +660,20 @@
   \printfield{note}%
   \newcunit\newblock
   \usebibmacro{cpubl+loc+year}%
+  \iftoggle{cms@bookpages}%
+  {}%
+  {\clearfield{pages}}%
   \usebibmacro{fullpostnote}%
   \newcunit\newblock
   \printlist[][-\value{listtotal}]{lista}%
   \newcunit\newblock
   \printfield{addendum}%
   \newcunit\newblock
-  \printfield{isbn}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \newcunit\newblock
-  \printfield{doi}%
-  \newcunit\newblock
-  \usebibmacro{url+date}%
+  \usebibmacro{cite+doi+url}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -570,11 +726,11 @@
   \newcunit\newblock
   \printfield{addendum}%
   \newcunit\newblock
-  \printfield{isbn}%
-  \newcunit\newblock
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \newcunit\newblock
-  \usebibmacro{url+date}%
+  \usebibmacro{cite+doi+url}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -597,9 +753,7 @@
   \newcunit\newblock
   \printfield{addendum}%
   \newcunit\newblock
-  \printfield{doi}%
-  \newcunit\newblock
-  \usebibmacro{url+date}%
+  \usebibmacro{cite+doi+url}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -630,8 +784,6 @@
   \newcunit
   \usebibmacro{cbytranslator+others}%
   \newcunit\newblock
-%  \printfield{edition}%
-%  \newcunit
   \iffieldundef{maintitle}
     {\printfield{volume}%
      \printfield{part}}
@@ -648,11 +800,11 @@
   \newcunit\newblock
   \printfield{addendum}%
   \newcunit\newblock
-  \printfield{isbn}%
-  \newcunit\newblock
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \newcunit\newblock
-  \usebibmacro{url+date}%
+  \usebibmacro{cite+doi+url}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -677,8 +829,6 @@
   \usebibmacro{bybookauthor}%
   \usebibmacro{cbyeditor+others}%
   \newcunit\newblock
-%  \printfield{edition}%
-%  \newcunit
   \iffieldundef{maintitle}
     {\printfield{volume}%
      \printfield{part}}
@@ -695,20 +845,22 @@
   \newcunit\newblock
   \printfield{addendum}%
   \newcunit\newblock
-  \printfield{isbn}%
-  \newcunit\newblock
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \newcunit\newblock
-  \usebibmacro{url+date}%
+  \usebibmacro{cite+doi+url}%
   \newcunit\newblock
   \usebibmacro{pageref}}%
-%  \usebibmacro{finentry}}
-
-\DeclareBibliographyAlias{cite:customa}{cite:letter}%
 
-\DeclareBibliographyAlias{cite:customb}{cite:bookinbook}%
-
-\DeclareBibliographyAlias{cite:customc}{cite:suppbook}%
+\DeclareBibliographyDriver{cite:customc}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \newcunit\newblock
+  \printfield{nameaddon}%
+  \setunit*{\addspace}%
+  \usebibmacro{italtitle+stitle}%
+  \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{cite:image}{%
   \usebibmacro{bibindex}%
@@ -741,9 +893,7 @@
   \newcunit\newblock
   \printfield{addendum}%
   \newcunit\newblock
-  \printfield{doi}%
-  \newcunit\newblock
-  \usebibmacro{url+date}%
+  \usebibmacro{cite+doi+url}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -762,7 +912,7 @@
   \setunit{\addcomma\addspace}%
   \usebibmacro{cpart+editor+translator}%
   \setunit{\addcomma\addspace}%
-%  \usebibmacro{chapincoll}%
+  \usebibmacro{chapincoll}%
   \usebibmacro{cms-in:}%
   \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
@@ -782,8 +932,6 @@
   \newcunit
   \usebibmacro{bybookauthor}%
   \usebibmacro{cbyeditor+others}%
-%  \newcunit\newblock
-%  \printfield{edition}%
   \newcunit
   \iffieldundef{maintitle}
     {\printfield{volume}%
@@ -801,11 +949,11 @@
   \newcunit\newblock
   \printfield{addendum}%
   \newcunit\newblock
-  \printfield{isbn}%
-  \newcunit\newblock
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \newcunit\newblock
-  \usebibmacro{url+date}%
+  \usebibmacro{cite+doi+url}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -824,65 +972,69 @@
   \setunit{\addcomma\addspace}%
   \usebibmacro{cpart+editor+translator}%
   \setunit{\addcomma\addspace}%
-%  \usebibmacro{chapincoll}%
   \iffieldundef{crossref}%
   {\iffieldundef{xref}
-  {\usebibmacro{cms-in:}%
-  \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
-  \newcunit
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}
-    \clearfield{volumes}}%
-  \newcunit
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{cbyeditor+others}%
-%  \newcunit\newblock
-%  \printfield{edition}%
-  \newcunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newcunit
-  \printfield{volumes}%
-  \newcunit\newblock
-  \usebibmacro{ser+num}%
-  \newcunit\newblock
-  \printfield{note}%
-  \newcunit\newblock
-  \usebibmacro{cpubl+loc+year}%
-  \usebibmacro{fullpostnote}%
-  \newcunit\newblock
-  \printfield{addendum}%
-  \newcunit\newblock
-  \printfield{isbn}%
-  \newcunit\newblock
-  \printfield{doi}%
-  \newcunit\newblock
-  \usebibmacro{url+date}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
-{\ifterm{\addspace\bibsentence}% All altered for 0.9c.
-  {\addcomma\addspace}% Perhaps need to alter it back
-  \xrefcite{\thefield{xref}}% Removed \addspace from each.
-  \usebibmacro{xrefpostnote}%
-  \usebibmacro{finentry}}}%
-{\ifterm{\addspace\bibsentence}%
-  {\addcomma\addspace}%
-  \xrefcite{\thefield{crossref}}%
-  \usebibmacro{xrefpostnote}%
-  \usebibmacro{finentry}}}
+    {\usebibmacro{chapincoll}%
+      \usebibmacro{cms-in:}%
+      \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
+      \newcunit
+      \iffieldundef{edition}%
+      {}%
+      {\usebibmacro{edition}%
+        \newcunit
+        \iffieldundef{maintitle}
+        {\printfield{volume}%
+          \printfield{part}%
+          \clearfield{volume}%
+          \clearfield{part}}%
+        {}%
+        \newcunit
+        \printfield{volumes}
+        \clearfield{volumes}}%
+      \newcunit
+      \usebibmacro{bybookauthor}%
+      \usebibmacro{cbyeditor+others}%
+      \newcunit
+      \iffieldundef{maintitle}
+      {\printfield{volume}%
+        \printfield{part}}
+      {}%
+      \newcunit
+      \printfield{volumes}%
+      \newcunit\newblock
+      \usebibmacro{ser+num}%
+      \newcunit\newblock
+      \printfield{note}%
+      \newcunit\newblock
+      \usebibmacro{cpubl+loc+year}%
+      \usebibmacro{fullpostnote}%
+      \newcunit\newblock
+      \printfield{addendum}%
+      \newcunit\newblock
+      \iftoggle{cms@isbn}%
+      {\printfield{isbn}}%
+      {}%
+      \newcunit\newblock
+      \usebibmacro{cite+doi+url}%
+      \newcunit\newblock
+      \usebibmacro{pageref}%
+      \usebibmacro{finentry}}
+    {\ifterm{\iffieldundef{chapter}% New test needed to cope with
+      {\addspace\bibsentence}%     new chapter citing system.
+      {\setunit{\addspace\bibsentence}}}% All altered for 0.9c.
+      {\addcomma\addspace}% Perhaps need to alter it back
+      \usebibmacro{chapincoll}%
+      \xrefcite{\thefield{xref}}% Removed \addspace from each.
+      \usebibmacro{xrefpostnote}%
+      \usebibmacro{finentry}}}%
+  {\ifterm{\iffieldundef{chapter}% New test needed to cope with
+      {\addspace\bibsentence}%     new chapter citing system.
+      {\setunit{\addspace\bibsentence}}}%
+    {\addcomma\addspace}%
+    \usebibmacro{chapincoll}%
+    \xrefcite{\thefield{crossref}}%
+    \usebibmacro{xrefpostnote}%
+    \usebibmacro{finentry}}}
 
 \DeclareBibliographyDriver{cite:inproceedings}{%
   \usebibmacro{bibindex}%
@@ -900,44 +1052,51 @@
   \setunit{\addcomma\addspace}%
   \iffieldundef{crossref}%
   {\iffieldundef{xref}
-  {\usebibmacro{cms-in:}%
-  \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
-  \newcunit\newblock
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newcunit
-  \printfield{volumes}%
-  \newcunit\newblock
-  \usebibmacro{ser+num}%
-  \newcunit\newblock
-  \printfield{note}%
-  \setunit{\addspace}\newblock%
-  \printtext[parens]{%
-  \usebibmacro{org+publ+loc+year}}%
-  \usebibmacro{fullpostnote}%
-  \newcunit\newblock
-  \printfield{addendum}%
-  \newcunit\newblock
-  \printfield{isbn}%
-  \newcunit\newblock
-  \printfield{doi}%
-  \newcunit\newblock
-  \usebibmacro{url+date}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
-{\ifterm{\addspace\bibsentence}% See incollection
-  {\addcomma\addspace}%
-  \xrefcite{\thefield{xref}}%
-  \usebibmacro{xrefpostnote}%
-  \usebibmacro{finentry}}}%
-{\ifterm{\addspace\bibsentence}%
-  {\addcomma\addspace}%
-  \xrefcite{\thefield{crossref}}%
-  \usebibmacro{xrefpostnote}%
-  \usebibmacro{finentry}}}
+    {\usebibmacro{chapincoll}%
+      \usebibmacro{cms-in:}%
+      \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
+      \newcunit\newblock
+      \iffieldundef{maintitle}
+      {\printfield{volume}%
+        \printfield{part}}
+      {}%
+      \newcunit
+      \printfield{volumes}%
+      \newcunit\newblock
+      \usebibmacro{ser+num}%
+      \newcunit\newblock
+      \printfield{note}%
+      \setunit{\addspace}\newblock%
+      \printtext[parens]{%
+        \usebibmacro{org+publ+loc+year}}%
+      \usebibmacro{fullpostnote}%
+      \newcunit\newblock
+      \printfield{addendum}%
+      \newcunit\newblock
+      \iftoggle{cms@isbn}%
+      {\printfield{isbn}}%
+      {}%
+      \newcunit\newblock
+      \usebibmacro{cite+doi+url}%
+      \newcunit\newblock
+      \usebibmacro{pageref}%
+      \usebibmacro{finentry}}
+    {\ifterm{\iffieldundef{chapter}% New test needed to cope with
+      {\addspace\bibsentence}%     new chapter citing system.
+      {\setunit{\addspace\bibsentence}}}% See incollection
+      {\addcomma\addspace}%
+      \usebibmacro{chapincoll}%
+      \xrefcite{\thefield{xref}}%
+      \usebibmacro{xrefpostnote}%
+      \usebibmacro{finentry}}}%
+  {\ifterm{\iffieldundef{chapter}% New test needed to cope with
+      {\addspace\bibsentence}%     new chapter citing system.
+      {\setunit{\addspace\bibsentence}}}%
+    {\addcomma\addspace}%
+    \usebibmacro{chapincoll}%
+    \xrefcite{\thefield{crossref}}%
+    \usebibmacro{xrefpostnote}%
+    \usebibmacro{finentry}}}
 
 \DeclareBibliographyDriver{cite:inreference}{%
   \usebibmacro{bibindex}%
@@ -978,8 +1137,6 @@
   \newcunit
   \usebibmacro{bybookauthor}%
   \usebibmacro{cbyeditor+others}%
-%  \newcunit\newblock
-%  \printfield{edition}%
   \newcunit
   \iffieldundef{maintitle}
     {\printfield{volume}%
@@ -994,8 +1151,6 @@
   \newcunit\newblock
   \usebibmacro{cpubl+loc+year}%
   \usebibmacro{inreffullpostnote}%
-%  \newcunit\newblock
-%  \printlist[][-\value{listtotal}]{lista}%
   \setunit{\addspace}%
   \ifnameundef{author}%
   {}%
@@ -1006,11 +1161,11 @@
   \newcunit\newblock
   \printfield{addendum}%
   \newcunit\newblock
-  \printfield{isbn}%
-  \newcunit\newblock
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \newcunit\newblock
-  \usebibmacro{url+date}%
+  \usebibmacro{cite+doi+url}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -1028,65 +1183,69 @@
   \newcunit\newblock%
   \usebibmacro{cpart+editor+translator}%
   \setunit*{\addcomma\addspace}%
-%  \usebibmacro{chapincoll}%
   \iffieldundef{crossref}%
   {\iffieldundef{xref}%
-  {\usebibmacro{cms-in:}%
-  \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
-  \newcunit
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}
-    \clearfield{volumes}}%
-  \newcunit
-  \usebibmacro{bybookauthor}%
-%  \printlist{language}%
-%  \newcunit\newblock
-  \usebibmacro{cbyeditor+others}%
-%  \newcunit\newblock
-%  \printfield{edition}%
-  \newcunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newcunit
-  \printfield{volumes}%
-  \newcunit\newblock
-  \usebibmacro{ser+num}%
-  \newcunit\newblock
-  \printfield{note}%
-  \newcunit\newblock
-  \usebibmacro{cpubletter+loc+year}%
-  \usebibmacro{fullpostnote}%
-  \newcunit\newblock
-  \printfield{addendum}%
-  \newcunit\newblock
-  \printfield{isbn}%
-  \newcunit\newblock
-  \printfield{doi}%
-  \newcunit\newblock
-  \usebibmacro{url+date}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}%
-{\addcomma\addspace% See incollection for info
-  \xrefcite{\thefield{xref}}%
-  \usebibmacro{xrefpostnote}%
-  \usebibmacro{finentry}}}%
-{\addcomma\addspace%
-  \xrefcite{\thefield{crossref}}%
-  \usebibmacro{xrefpostnote}%
-  \usebibmacro{finentry}}}
+    {\usebibmacro{chapincoll}%
+      \usebibmacro{cms-in:}%
+      \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
+      \newcunit
+      \iffieldundef{edition}%
+      {}%
+      {\usebibmacro{edition}%
+        \newcunit
+        \iffieldundef{maintitle}
+        {\printfield{volume}%
+          \printfield{part}%
+          \clearfield{volume}%
+          \clearfield{part}}%
+        {}%
+        \newcunit
+        \printfield{volumes}
+        \clearfield{volumes}}%
+      \newcunit
+      \usebibmacro{bybookauthor}%
+      \usebibmacro{cbyeditor+others}%
+      \newcunit
+      \iffieldundef{maintitle}
+      {\printfield{volume}%
+        \printfield{part}}
+      {}%
+      \newcunit
+      \printfield{volumes}%
+      \newcunit\newblock
+      \usebibmacro{ser+num}%
+      \newcunit\newblock
+      \printfield{note}%
+      \newcunit\newblock
+      \usebibmacro{cpubletter+loc+year}%
+      \usebibmacro{fullpostnote}%
+      \newcunit\newblock
+      \printfield{addendum}%
+      \newcunit\newblock
+      \iftoggle{cms@isbn}%
+      {\printfield{isbn}}%
+      {}%
+      \newcunit\newblock
+      \usebibmacro{cite+doi+url}%
+      \newcunit\newblock
+      \usebibmacro{pageref}%
+      \usebibmacro{finentry}}%
+    {\ifterm{\iffieldundef{chapter}% New test needed to cope with
+      {\addspace\bibsentence}%     new chapter citing system.
+      {\setunit{\addspace\bibsentence}}}%
+    {\addcomma\addspace}%
+      \usebibmacro{chapincoll}%
+      \xrefcite{\thefield{xref}}%
+      \usebibmacro{xrefpostnote}%
+      \usebibmacro{finentry}}}%
+  {\ifterm{\iffieldundef{chapter}% New test needed to cope with
+      {\addspace\bibsentence}%     new chapter citing system.
+      {\setunit{\addspace\bibsentence}}}%
+    {\addcomma\addspace}%
+    \usebibmacro{chapincoll}%
+    \xrefcite{\thefield{crossref}}%
+    \usebibmacro{xrefpostnote}%
+    \usebibmacro{finentry}}}
 
 \DeclareBibliographyDriver{cite:manual}{%
   \usebibmacro{bibindex}%
@@ -1099,8 +1258,6 @@
   \usebibmacro{edition}%
   \newcunit
   \usebibmacro{byauthor}%
-%  \newcunit\newblock
-%  \printfield{edition}%
   \newcunit\newblock
   \usebibmacro{ser+num}%
   \newcunit\newblock
@@ -1114,11 +1271,11 @@
   \newcunit\newblock
   \printfield{addendum}%
   \newcunit\newblock
-  \printfield{isbn}%
-  \newcunit\newblock
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \newcunit\newblock
-  \usebibmacro{url+date}%
+  \usebibmacro{cite+doi+url}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -1164,9 +1321,101 @@
   \newcunit\newblock
   \printfield{addendum}%
   \newcunit\newblock
-  \printfield{doi}%
+  \usebibmacro{cite+doi+url}%
   \newcunit\newblock
-  \usebibmacro{url+date}%
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{cite:music}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \setunit{\addspace}%
+  \printfield{nameaddon}%
+  \setunit{\addcomma\addspace}\newblock
+  \usebibmacro{citaltitle+stitle}%
+  \newcunit
+  \printeventdate%
+  \newcunit
+  \usebibmacro{byauthor}%
+  \newcunit\newblock
+  \usebibmacro{cpart+editor+translator}%
+  \newcunit
+  \usebibmacro{chapinscore}%
+  \usebibmacro{btitle+bstitle}%
+  \newcunit
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}%
+    \newcunit
+    \iffieldundef{maintitle}
+    {\printfield{volume}%
+      \printfield{part}%
+      \clearfield{volume}%
+      \clearfield{part}}%
+    {}%
+    \newcunit
+    \printfield{volumes}
+    \clearfield{volumes}}%
+  \newcunit
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{cbyeditor+others}%
+  \iffieldundef{maintitle}
+  {}
+  {\iffieldundef{volume}
+    {\usebibmacro{cms-in:}%
+      \printtext[maintitle]{%
+        \printfield[noformat]{maintitle}%
+        \setunit{\addcolon\addspace}%
+        \printfield[noformat]{mainsubtitle}}%
+      \newcunit
+      \printfield{maintitleaddon}}
+    {\printfield{volume}%
+      \printfield{part}%
+      \setunit{\addspace}
+      \bibstring{ofseries}%
+      \setunit{\addspace}
+      \printtext[maintitle]{%
+        \printfield[noformat]{maintitle}%
+        \setunit{\addcolon\addspace}%
+        \printfield[noformat]{mainsubtitle}}%
+      \newcunit
+      \printfield{maintitleaddon}}}
+  \newcunit
+  \iffieldundef{maintitle}
+    {\printfield{volume}%
+     \printfield{part}}
+    {}%
+  \newcunit
+  \printfield{volumes}%
+  \newcunit\newblock
+  \printfield{version}%
+  \newcunit\newblock
+  \printfield{note}%
+  \newcunit\newblock
+  \usebibmacro{music+ser+num}%
+  \newcunit\newblock
+  \usebibmacro{music+publisher}%
+  \setunit*{\addspace}%\newblock
+  \usebibmacro{date}%
+  \setunit*{\ifthenelse{\iffieldundef{howpublished}\AND%
+      \iffieldundef{pubstate}}%
+    {\addcomma\addspace}{\addspace}}%
+  \printlist{publisher}%
+  \newcunit
+  \usebibmacro{institution+organization}%
+  \newcunit\newblock
+  \printlist{location}%
+  \newcunit\newblock
+  \printfield{type}%
+  \usebibmacro{fullpostnote}%
+  \newcunit\newblock
+  \printfield{addendum}%
+  \newcunit\newblock
+  \iftoggle{cms@isbn}%
+  {\printfield{iswc}}%
+  {}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -1189,7 +1438,9 @@
   \setunit{\addcomma\addspace}
   \usebibmacro{date}%
   \setunit{\addcomma\addspace}%
-  \printfield{doi}%
+  \iftoggle{cms@doi}%
+  {\printfield{doi}}%
+  {}%
   \setunit{\addcomma\addspace}%
   \usebibmacro{url+date}%
   \usebibmacro{fullpostnote}%
@@ -1221,7 +1472,6 @@
   \newcunit\newblock
   \printfield{version}%
   \newcunit
-%  \setunit{\addcomma\addspace \bibstring{patentfiled}\addspace}%
   \iffieldundef{origyear}%
   {\iffieldundef{year}%
     {}%
@@ -1236,9 +1486,7 @@
   \printfield{addendum}}%
   \usebibmacro{fullpostnote}%
   \newcunit\newblock
-  \printfield{doi}%
-  \newcunit\newblock
-  \usebibmacro{url+date}%
+  \usebibmacro{cite+doi+url}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -1263,11 +1511,11 @@
   \newcunit\newblock
   \printfield{addendum}%
   \newcunit\newblock
-  \printfield{issn}%
-  \newcunit\newblock
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
   \newcunit\newblock
-  \usebibmacro{url+date}%
+  \usebibmacro{cite+doi+url}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}%
@@ -1291,11 +1539,11 @@
   \newcunit\newblock
   \printfield{addendum}%
   \newcunit\newblock
-  \printfield{issn}%
-  \newcunit\newblock
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
   \newcunit\newblock
-  \usebibmacro{url+date}%
+  \usebibmacro{cite+doi+url}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}}
@@ -1327,11 +1575,11 @@
   \newcunit\newblock
   \printfield{addendum}%
   \newcunit\newblock
-  \printfield{isbn}%
-  \newcunit\newblock
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \newcunit\newblock
-  \usebibmacro{url+date}%
+  \usebibmacro{cite+doi+url}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -1375,8 +1623,6 @@
   \newcunit
   \usebibmacro{bybookauthor}%
   \usebibmacro{cbyeditor+others}%
-%  \newcunit\newblock
-%  \printfield{edition}%
   \newcunit
   \iffieldundef{maintitle}
     {\printfield{volume}%
@@ -1394,11 +1640,11 @@
   \newcunit\newblock
   \printfield{addendum}%
   \newcunit\newblock
-  \printfield{isbn}%
-  \newcunit\newblock
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \newcunit\newblock
-  \usebibmacro{url+date}%
+  \usebibmacro{cite+doi+url}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -1425,11 +1671,11 @@
   \newcunit\newblock
   \printfield{addendum}%
   \newcunit\newblock
-  \printfield{isrn}%
-  \newcunit\newblock
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isrn}}%
+  {}%
   \newcunit\newblock
-  \usebibmacro{url+date}%
+  \usebibmacro{cite+doi+url}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -1442,13 +1688,11 @@
   \setunit{\addspace}%
   \printfield{nameaddon}%
   \newcunit\newblock
-%  \usebibmacro{mag+news+title}% Changed to enable \MakeCapital
   \printfield{title}%
   \setunit{\addcolon\addspace}%
   \printfield[noformat]{subtitle}%
   \newcunit\newblock
   \printfield{titleaddon}%
-%  \newcunit\newblock
   \setunit{\addspace}%
   \usebibmacro{language+transtitle}%
   \setunit{\addcomma\addspace}%\newblock%
@@ -1465,11 +1709,11 @@
   \newcunit\newblock
   \printfield{addendum}%
   \newcunit\newblock
-  \printfield{issn}%
-  \newcunit\newblock
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
   \newcunit\newblock
-  \usebibmacro{url+date}%
+  \usebibmacro{cite+doi+url}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -1517,8 +1761,6 @@
     \clearfield{volumes}}%
   \newcunit
   \usebibmacro{cbyeditor}%
-%  \newcunit\newblock
-%  \printfield{edition}%
   \newcunit
   \iffieldundef{maintitle}
     {\printfield{volume}%
@@ -1536,11 +1778,11 @@
   \newcunit\newblock
   \printfield{addendum}%
   \newcunit\newblock
-  \printfield{isbn}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \newcunit\newblock
-  \printfield{doi}%
-  \newcunit\newblock
-  \usebibmacro{url+date}%
+  \usebibmacro{cite+doi+url}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -1569,9 +1811,7 @@
   \newcunit\newblock
   \printfield{addendum}%
   \newcunit\newblock
-  \printfield{doi}%
-  \newcunit\newblock
-  \usebibmacro{url+date}%
+  \usebibmacro{cite+doi+url}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -1600,7 +1840,91 @@
   \newcunit\newblock
   \printfield{addendum}%
   \newcunit\newblock
-  \usebibmacro{url+date}%
+  \iftoggle{cms@url}%
+  {\usebibmacro{url+date}}%
+  {}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{cite:video}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \setunit{\addspace}%
+  \printfield{nameaddon}%
+  \newcunit\newblock
+  \usebibmacro{ctitle+stitle}%
+  \setunit{\addspace}\newblock%
+  \usebibmacro{language+transtitle}%
+  \newcunit
+  \usebibmacro{byauthor}%
+  \newcunit
+  \usebibmacro{cpart+editor+translator}%
+  \newcunit
+  \usebibmacro{chapinscore}%
+  \usebibmacro{btitle+bstitle}%
+  \newcunit
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}%
+    \newcunit
+    \iffieldundef{maintitle}
+    {\printfield{volume}%
+      \printfield{part}%
+      \clearfield{volume}%
+      \clearfield{part}}%
+    {}%
+    \newcunit
+    \printfield{volumes}
+    \clearfield{volumes}}%
+  \newcunit
+  \printfield{type}%
+  \newcunit
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{cbyeditor+others}%
+  \iffieldundef{maintitle}
+  {}
+  {\iffieldundef{volume}
+    {\usebibmacro{cms-in:}%
+      \printtext[maintitle]{%
+        \printfield[noformat]{maintitle}%
+        \setunit{\addcolon\addspace}%
+        \printfield[noformat]{mainsubtitle}}%
+      \newcunit
+      \printfield{maintitleaddon}}
+    {\printfield{volume}%
+      \printfield{part}%
+      \setunit{\addspace}
+      \bibstring{ofseries}%
+      \setunit{\addspace}
+      \printtext[maintitle]{%
+        \printfield[noformat]{maintitle}%
+        \setunit{\addcolon\addspace}%
+        \printfield[noformat]{mainsubtitle}}%
+      \newcunit
+      \printfield{maintitleaddon}}}
+  \newcunit
+  \iffieldundef{maintitle}
+    {\printfield{volume}%
+     \printfield{part}}
+    {}%
+  \newcunit
+  \printfield{volumes}%
+  \newcunit\newblock
+  \usebibmacro{ser+num}%
+  \newcunit\newblock
+  \printfield{note}%
+  \newcunit\newblock
+  \usebibmacro{cpubl+loc+year}%
+  \usebibmacro{fullpostnote}%
+  \newcunit\newblock
+  \printfield{addendum}%
+  \newcunit\newblock
+  \iftoggle{cms@isbn}%
+  {\printfield{isan}}%
+  {}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -1715,12 +2039,6 @@
 
 \DeclareFieldFormat[letter]{lostitle}{#1\isdot}
 
-\DeclareFieldAlias[customa]{title}[letter]{title}
-
-\DeclareFieldAlias[customa]{citetitle}[letter]{citetitle}
-
-\DeclareFieldAlias[customa]{lostitle}[letter]{lostitle}
-
 \DeclareFieldAlias[inproceedings]{title}[article]{title}
 
 \DeclareFieldAlias[inproceedings]{citetitle}[article]{citetitle}
@@ -1785,11 +2103,19 @@
   \addspace%
   \mkbibemph{#1}\isdot}
 
-\DeclareFieldAlias[customc]{title}[suppbook]{title}
-
-\DeclareFieldAlias[customc]{citetitle}[suppbook]{citetitle}
+\DeclareFieldFormat[customc]{title}{%
+  \iffieldundef{nameaddon}%
+  {\mkbibemph{\bibstring{see}}%
+    \addspace%
+    #1}%
+  {#1}}
 
-\DeclareFieldAlias[customc]{lostitle}[suppbook]{lostitle}
+\DeclareFieldFormat[customc]{citetitle}{%
+  \iffieldundef{nameaddon}%
+  {\mkbibemph{\bibstring{see}}%
+    \addspace%
+    #1}%
+  {\printfield{nameaddon}\addspace #1}}
 
 \DeclareFieldAlias[suppcollection]{title}[suppbook]{title}
 
@@ -1851,6 +2177,33 @@
 
 \DeclareFieldAlias[online]{lostitle}[article]{lostitle}
 
+\DeclareFieldFormat[video]{title}{%
+  \iffieldundef{booktitle}%
+  {\mkbibemph{#1}\isdot}%
+  {\mkbibquote{#1\isdot}}}
+
+\DeclareFieldFormat[video]{citetitle}{%
+  \iffieldundef{booktitle}%
+  {\mkbibemph{#1}\isdot}%
+  {\mkbibquote{#1\isdot}}}
+
+\DeclareFieldFormat[video]{lostitle}{%
+  \iffieldundef{booktitle}%
+  {\mkbibemph{#1}\isdot}%
+  {\mkbibquote{#1\isdot}}}
+
+\DeclareFieldAlias[music]{title}[video]{title}
+
+\DeclareFieldAlias[music]{citetitle}[video]{citetitle}
+
+\DeclareFieldAlias[music]{lostitle}[video]{lostitle}
+
+\DeclareFieldAlias[audio]{title}[video]{title}
+
+\DeclareFieldAlias[audio]{citetitle}[video]{citetitle}
+
+\DeclareFieldAlias[audio]{lostitle}[video]{lostitle}
+
 %%%% Other Field Formats %%%%
 
 \DeclareNumChars*{:}% For proper ibidem with multi-volume works.
@@ -1864,8 +2217,8 @@
   \ifbibstring{#1}%
   {\bibstring{#1}}%
   {\ifcapital%
-    {\MakeCapital{#1}}%
-    {#1}}}
+    {\MakeCapital{#1\isdot}}%
+    {#1\isdot}}}
 
 \DeclareFieldFormat[artwork]{type}{%
   \ifcapital%
@@ -1874,10 +2227,14 @@
 
 \DeclareFieldAlias[image]{type}[artwork]{type}
 
-\DeclareFieldAlias[customc]{type}[suppbook]{type}
-
 \DeclareFieldAlias[suppcollection]{type}[suppbook]{type}
 
+\DeclareFieldAlias[video]{type}[suppbook]{type}
+
+\DeclareFieldAlias[music]{type}[suppbook]{type}
+
+\DeclareFieldAlias[audio]{type}[suppbook]{type}
+
 \DeclareFieldFormat{url}{\url{#1}}
 
 \DeclareFieldFormat{doi}{%
@@ -1888,6 +2245,11 @@
 
 \DeclareFieldFormat{nameaddon}{\mkbibbrackets{#1\bibsentence}}% ?!
 
+\DeclareFieldFormat[customc]{nameaddon}{% For cross-refs
+  \ifbibstring{#1}%
+  {\mkbibemph{\bibstring{#1}}}%
+  {#1}}
+
 \DeclareFieldFormat{edition}{% New in 0.8
   \ifinteger{#1}
   {\mkbibordinal{#1}~\bibstring{edition}}%
@@ -1945,6 +2307,8 @@
   {\addnbspace #1}%
   {\addcomma\addspace #1}}
 
+\DeclareFieldFormat{series}{#1\isdot}
+
 \DeclareFieldFormat{addendum}{%
   \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}
 
@@ -1996,7 +2360,6 @@
 
 \newcommand{\classicpunct}{%
   \ifthenelse{\iffieldequalstr{entrysubtype}{classical}\OR%
-    \iffieldequalstr{entrytype}{customa}\OR%
     \iffieldequalstr{entrytype}{letter}}%
   {\setunit*{\addspace}}%
   {\setunit*{\addcomma\addspace}}}
@@ -2189,7 +2552,9 @@
   \ifthenelse{\(\iffieldundef{booktitle}\AND\iffieldundef{maintitle}\)%
     \OR\iffieldsequal{booktitle}{title}%  Changed these for crossrefed
     \OR\iffieldsequal{maintitle}{title}}% entries.  Create problems?
-  {\newunit\newblock}%
+  {\iffieldequalstr{entrytype}{video}% Change for Video type?  Appears
+    {\newcunit\newblock}% to treat italicized title as booktitle in
+    {\newunit\newblock}}% available examples.
   {\newcunit\newblock}}
 
 \newbibmacro*{edition}{%
@@ -2235,7 +2600,7 @@
   \newcunit
   \printlist{institution}%
   \setunit*{\addcomma\space}%
-  \printfield{year}}
+  \usebibmacro{cmsyear}}
 
 \newbibmacro*{institution+organization}{%
   \iflistundef{organization}%
@@ -2482,13 +2847,37 @@
 \newbibmacro*{chapincoll}{%
   \iffieldundef{chapter}%
   {}
-  {\printfield{chapter}\addspace}}
+  {\printfield{chapter}\addspace%
+    \clearfield{chapter}}}
+
+\newbibmacro*{chapinscore}{%
+  \iffieldundef{chapter}%
+  {}
+  {\printfield{chapter}%
+    \addspace\bibstring{of}\setunit{\addspace}%
+    \clearfield{chapter}}}
 
 \newbibmacro*{ser+num}{%
   \printfield{series}%
   \printfield[sernum]{number}%
   \newunit}
 
+\newbibmacro*{music+ser+num}{%
+  \iffieldundef{series}%
+  {\iffieldundef{number}%
+    {}%
+    {\printfield{number}}}
+  {\printfield{series}%
+    \setunit{\addspace}%
+    \printfield{number}}}%
+
+\newbibmacro*{music+publisher}{%
+  \iffieldundef{howpublished}%
+  {\iffieldundef{pubstate}%
+    {}%
+    {\printfield{pubstate}}}%
+  {\printfield{howpublished}}}%
+
 \newbibmacro*{ctitle+stitle}{%
   \printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
     \printfield[noformat]{title}%
@@ -2580,7 +2969,11 @@
      \printfield{booktitleaddon}}}
 
 \newbibmacro*{publ+loc+year}{% Revised for reprint
-  \iftoggle{cms@reprint}%
+  \ifboolexpr{
+    togl{cms@reprint}
+    and
+    not test {\iffieldequalstr{entrytype}{video}}
+  }%
   {\bibstring{reprint}%
     \newcunit}%
   {}%
@@ -2625,9 +3018,9 @@
 
 \newbibmacro*{cpubl+loc+year}{% Revised for reprint
   \ifboolexpr{
-    test {\iffieldundef{location}}
+    test {\iflistundef{location}}
     and
-    test {\iffieldundef{publisher}}
+    test {\iflistundef{publisher}}
     and
     test {\iffieldundef{year}}
     and
@@ -2638,7 +3031,11 @@
     \printtext[parens]{%
       \usebibmacro{cmsorigdate}%\printfield{origyear}%
       \setunit*{\addsemicolon\addspace}%
-      \iftoggle{cms@reprint}%
+      \ifboolexpr{
+        togl {cms@reprint}
+        and
+        not test{\iffieldequalstr{entrytype}{video}}
+      }%
       {\bibsstring{reprint}%
         \newcunit}%
       {}%
@@ -2713,20 +3110,20 @@
   \setunit{\addspace}%
   \printtext[parens]{% parens is the default here
     \iffieldundef{issue}
-    {\usebibmacro{date}}%
+    {\usebibmacro{number+or+month}}%
       {\printfield{issue}%
        \setunit{\addspace}%
-       \printfield{year}}}}
+       \usebibmacro{cmsyear}}}}
 
 \newbibmacro*{cperiodical+issue+year+pages}{% For periodicals,
   \usebibmacro{cperiodical+ser+vol+num}% subtype article
   \setunit{\addspace}%
   \printtext[parens]{% parens is the default here
     \iffieldundef{issue}
-    {\usebibmacro{date}}%
+    {\usebibmacro{number+or+month}}%
       {\printfield{issue}%
        \setunit{\addspace}%
-       \printfield{year}}}}
+       \usebibmacro{cmsyear}}}}
 
 \newbibmacro*{letter+date}{% New for 0.9
   \iftoggle{cms@switchdates}%
@@ -2756,6 +3153,18 @@
   {\printdate}%
   {\printorigdate}}
 
+\newbibmacro*{cmsyear}{%
+  \iftoggle{cms@switchdates}%
+  {\printfield{origyear}}%
+  {\printfield{year}}}
+
+\newbibmacro*{number+or+month}{%
+  \iffieldundef{number}%
+  {\usebibmacro{date}}%
+  {\iftoggle{cms@numbermonth}%
+    {\usebibmacro{date}}%
+    {\usebibmacro{cmsyear}}}}
+
 \newcommand*{\cms@datelong}{% Modified for 0.9
   \iffieldundef{origmonth}%
   {\printfield{origyear}}%
@@ -2832,6 +3241,15 @@
        \setunit{\addcolon\addspace}%
        \printfield[noformat]{journalsubtitle}}}}
 
+\newbibmacro*{cite+doi+url}{%
+  \iftoggle{cms@doi}%
+  {\printfield{doi}}%
+  {}%
+  \newcunit\newblock
+  \iftoggle{cms@url}%
+  {\usebibmacro{url+date}}%
+  {}}
+
 \newbibmacro*{url+date}{% Changed for 0.9
   \printfield{url}%
   \iffieldundef{urlyear}
@@ -2853,12 +3271,14 @@
   \iffieldundef{issue}
   {\iffieldundef{number}%
     {\usebibmacro{date}}%
-    {\usebibmacro{date}%
+    {\iftoggle{cms@numbermonth}% For exclusion of month
+      {\usebibmacro{date}}%
+      {\usebibmacro{cmsyear}}%
       \setunit{\addcomma\addspace}%
       \printfield[journum]{number}}}%
   {\printfield{issue}%
     \setunit{\addspace}%
-    \printfield{year}}}
+    \usebibmacro{cmsyear}}}
 
 \newbibmacro*{mag+date+issue}{%
   \usebibmacro{journal+sub}%
@@ -2968,9 +3388,7 @@
         {\global\togglefalse{cms@printshhand}%
           \global\togglefalse{cms@shortnote}%
           \global\togglefalse{cms@fullnote}}
-        {\addperiod\space%
-          \bibstring{citedas}\space%
-          \printfield{shorthand}%
+        {\usebibmacro{cms:shorthandintro}%
           \global\togglefalse{cms@printshhand}%
           \global\togglefalse{cms@shortnote}%
           \global\togglefalse{cms@fullnote}}}
@@ -2982,9 +3400,7 @@
           \global\togglefalse{cms@fullnote}}
         {\postnotedelim%
           \printfield{postnote}%
-          \addperiod\space%
-          \bibstring{citedas}\space%
-          \printfield{shorthand}%
+          \usebibmacro{cms:shorthandintro}%
           \global\togglefalse{cms@printshhand}%
           \global\togglefalse{cms@shortnote}%
           \global\togglefalse{cms@fullnote}}}}
@@ -3012,7 +3428,7 @@
   \iffieldundef{postnote}%
   {\iffieldundef{chapter}%
     {\iffieldundef{pages}%
-      {\addcomma\addspace%
+      {\newcunit%\addcomma\addspace% Change to axe spurious comma
         \printlist[][-\value{listtotal}]{lista}}%
       {\postnotedelim%
         \printfield{pages}}}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx
index 02ebacfae61..601beda5eaa 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx
@@ -1,6 +1,6 @@
-% $Id: cms-american.lbx,v 0.10.1.8 2010/09/03 08:32:47 dfussner Exp $	
+% $Id: cms-american.lbx,v 0.10.1.13 2011/02/15 12:00:23 dfussner Exp $	
 
-\ProvidesFile{cms-american.lbx}[2010/09/03 v0.9c biblatex localization]
+\ProvidesFile{cms-american.lbx}[2011/02/15 v 1.2a biblatex localization]
 
 \InheritBibliographyExtras{american}
 
@@ -25,7 +25,10 @@
   \restorecommand\mkbibrangeterseextra%
 }
 
+\NewBibliographyString{bynone}
 \NewBibliographyString{bycompiler}
+\NewBibliographyString{bydirector}
+\NewBibliographyString{byproducer}
 \NewBibliographyString{byeditorcp}
 \NewBibliographyString{byeditortrcp}
 \NewBibliographyString{byeditortrcpco}
@@ -73,6 +76,8 @@
 \NewBibliographyString{bycompileranin}
 \NewBibliographyString{bycompileranfo}
 \NewBibliographyString{bycompileranaf}
+\NewBibliographyString{cbynone}
+\NewBibliographyString{cbyauthor}
 \NewBibliographyString{cbyeditor}
 \NewBibliographyString{cbytranslator}
 \NewBibliographyString{cbycompiler}
@@ -82,6 +87,8 @@
 \NewBibliographyString{cbyfounder}
 \NewBibliographyString{cbycontinuator}
 \NewBibliographyString{cbycollaborator}
+\NewBibliographyString{cbydirector}
+\NewBibliographyString{cbyproducer}
 \NewBibliographyString{cbyeditortr}
 \NewBibliographyString{cbyeditorcp}
 \NewBibliographyString{cbyeditorco}
@@ -186,6 +193,8 @@
 \NewBibliographyString{origpub}
 \NewBibliographyString{origpublin}
 \NewBibliographyString{origpubyear}
+\NewBibliographyString{origreleaseyear}
+\NewBibliographyString{origshownyear}
 \NewBibliographyString{origedition}
 \NewBibliographyString{revisededition}
 \NewBibliographyString{numbers}
@@ -217,6 +226,12 @@
 \NewBibliographyString{sections}
 \NewBibliographyString{compiler}
 \NewBibliographyString{compilers}
+\NewBibliographyString{conductor}
+\NewBibliographyString{conductors}
+\NewBibliographyString{director}
+\NewBibliographyString{directors}
+\NewBibliographyString{producer}
+\NewBibliographyString{producers}
 \NewBibliographyString{transcompiler}
 \NewBibliographyString{transcompilers}
 \NewBibliographyString{editortranscompiler}
@@ -255,6 +270,12 @@
     {eds\adddot\addspace and comps\adddot}},
   editortranslators = {{eds\adddot\addspace and trans\adddot}%
     {eds\adddot\addspace and trans\adddot}},
+  conductor = {{dir\adddot}{dir\adddot}},
+  conductors = {{dirs\adddot}{dirs\adddot}},
+  director = {{dir\adddot}{dir\adddot}},
+  directors = {{dirs\adddot}{dirs\adddot}},
+  producer = {{prod\adddot}{prod\adddot}},
+  producers = {{prods\adddot}{prods\adddot}},
   editor = {{ed\adddot}{ed\adddot}},
   editors = {{eds\adddot}{eds\adddot}},
   ibidem = {{ibid\adddot}{ibid\adddot}},
@@ -264,6 +285,10 @@
     {orig\adddot\ pub\adddot\addspace in\addspace}},
   origpubyear = {{originally published in\addspace}%
     {orig\adddot\ pub\adddot\addspace}},
+  origreleaseyear = {{originally released in\addspace}%
+    {orig\adddot\ released\addspace}},
+  origshownyear = {{originally shown in\addspace}%
+    {orig\adddot\ shown\addspace}},
   origedition ={{edition\addcolon\addspace}%
     {ed\adddot\addcolon\addspace}},
   revisededition = {{rev\adddot\addspace ed\adddot}%
@@ -309,6 +334,8 @@
   shorthands = {{Abbreviations}{Abbreviations}},
   newseries = {{n\adddot s\adddot}{n\adddot s\adddot}},
   urlseen = {{accessed}{accessed}},
+  cbynone = {{}{}},
+  cbyauthor = {{by}{by}},
   cbyeditor = {{ed\adddot}{ed\adddot}},
   cbytranslator     = {{trans\adddot\addspace\lbx@cfromlang}%
     {trans\adddot\addspace\lbx@cfromlang}},
@@ -320,6 +347,8 @@
   cbycontinuator    = {{cont\adddot}{cont\adddot}},
   cbycollaborator   = {{in collab\adddotspace with}%
     {in collab\adddotspace with}},
+  cbydirector = {{dir\adddot}{dir\adddot}},
+  cbyproducer = {{prod\adddot}{prod\adddot}},
   cbyeditortr    = {{ed\adddot\space and
       trans\adddot\addspace\lbx@cfromlang}%
     {ed\adddot\space and trans\adddot\addspace\lbx@cfromlang}},
@@ -618,7 +647,10 @@
   cfromrussian      = {{from the Russian by}{from the Russian by}},
   cfromspanish      = {{from the Spanish by}{from the Spanish by}},
   cfromswedish      = {{from the Swedish by}{from the Swedish by}},
+  bynone = {{}{}},
   bycompiler = {{compiled by}{comp\adddot}},
+  bydirector = {{directed by}{dir\adddot}},
+  byproducer = {{produced by}{prod\adddot}},
   byeditorcp = {{edited and compiled by}{ed\adddot\space and comp\adddot}},
   byeditortrcp = {{edited, translated \lbx@fromlang, and compiled by}%
     {ed.,\addabbrvspace trans.\addspace\lbx@fromlang, and comp\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx
index f9ab5e94f33..23ff86ea9aa 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx
@@ -1,6 +1,6 @@
-% $Id: cms-french.lbx,v 0.9.5.4 2010/09/03 08:32:58 dfussner Exp $	
+% $Id: cms-french.lbx,v 0.9.5.7 2011/02/15 12:04:01 dfussner Exp $	
 
-\ProvidesFile{cms-french.lbx}[2010/09/03 v0.9c biblatex localization]
+\ProvidesFile{cms-french.lbx}[2011/02/15 v 1.2a biblatex localization]
 
 % STATUS OF THIS FILE
 % - Some strings still missing
@@ -40,7 +40,10 @@
   \restorecommand\mkbibrangeterse%
   \restorecommand\mkbibrangeterseextra}
 
+\NewBibliographyString{bynone}
 \NewBibliographyString{bycompiler}
+\NewBibliographyString{bydirector}
+\NewBibliographyString{byproducer}
 \NewBibliographyString{byeditorcp}
 \NewBibliographyString{byeditortrcp}
 \NewBibliographyString{byeditortrcpco}
@@ -88,6 +91,8 @@
 \NewBibliographyString{bycompileranin}
 \NewBibliographyString{bycompileranfo}
 \NewBibliographyString{bycompileranaf}
+\NewBibliographyString{cbynone}
+\NewBibliographyString{cbyauthor}
 \NewBibliographyString{cbyeditor}
 \NewBibliographyString{cbyeditoralt} % To cope with \smartof issues
 \NewBibliographyString{byeditoralt} %  in \partedit command.
@@ -96,6 +101,8 @@
 \NewBibliographyString{cbyredactor}
 \NewBibliographyString{cbycommentator}
 \NewBibliographyString{cbyannotator}
+\NewBibliographyString{cbydirector}
+\NewBibliographyString{cbyproducer}
 \NewBibliographyString{cbyeditortr}
 \NewBibliographyString{cbyeditorcp}
 \NewBibliographyString{cbyeditorco}
@@ -200,6 +207,8 @@
 \NewBibliographyString{origpub}
 \NewBibliographyString{origpublin}
 \NewBibliographyString{origpubyear}
+\NewBibliographyString{origreleaseyear}
+\NewBibliographyString{origshownyear}
 \NewBibliographyString{origedition}
 \NewBibliographyString{revisededition}
 \NewBibliographyString{numbers}
@@ -231,6 +240,12 @@
 \NewBibliographyString{sections}
 \NewBibliographyString{compiler}
 \NewBibliographyString{compilers}
+\NewBibliographyString{conductor}
+\NewBibliographyString{conductors}
+\NewBibliographyString{director}
+\NewBibliographyString{directors}
+\NewBibliographyString{producer}
+\NewBibliographyString{producers}
 \NewBibliographyString{transcompiler}
 \NewBibliographyString{transcompilers}
 \NewBibliographyString{editortranscompiler}
@@ -263,8 +278,14 @@
     {\'eds\adddot\ et comp\adddot}},
   editortranslators = {{\'eds\adddot\ et trad\adddot}%
     {\'eds\adddot\ et trad\adddot}},
+  conductor = {{dir\adddot}{dir\adddot}},
+  conductors = {{dir\adddot}{dir\adddot}},
+  director = {{r\'eal\adddot}{r\'eal\adddot}},
+  directors = {{r\'eal\adddot}{r\'eal\adddot}},
+  producer = {{prod\adddot}{prod\adddot}},
+  producers = {{prod\adddot}{prod\adddot}},
   editor = {{\'ed\adddot}{\'ed\adddot}},
-  editors = {{\'eds\adddot}{\'ed\adddot}},
+  editors = {{\'eds\adddot}{\'eds\adddot}},
   ibidem = {{ibid\adddot}{ibid\adddot}},
   origpub = {{originellement publi\'e comme}%
     {origin\adddot\ publ\adddot\ comme}},
@@ -272,6 +293,10 @@
     {origin\adddot\ publ\adddot\ dans}},
   origpubyear = {{originellement publi\'e en\addspace}%
     {origin\adddot\ publ\adddot\addspace}},
+  origreleaseyear = {{originellement sorti en\addspace}%
+    {origin\adddot\ sorti\addspace}},
+  origshownyear = {{originellement diffus\'ee en\addspace}%
+    {origin\adddot\ diffus\'ee\addspace}},
   origedition = {{\'edition}{\'edition}},
   revisededition = {{\'ed\adddot\ r\'ev\adddot}{\'ed\adddot\ r\'ev\adddot}},
   numbers = {{n\textsuperscript{os}}{n\textsuperscript{os}}},% ?
@@ -313,7 +338,10 @@
   reviewof = {{critique de}{critique de}},
   reprint = {{r\'eimpression}{r\'eimpr\adddot}},
   shorthands = {{Sigles}{Sigles}},
-  newseries = {{nouv\adddot\ s\'er\adddot}{nouv\adddot\ s\'er\adddot}},
+  newseries = {{nouv\adddot\ s\'er\adddot}{nouv\adddot\
+      s\'er\adddot}},
+  cbynone = {{}{}},
+  cbyauthor = {{par}{par}},
   cbyeditor = {{sous la dir\adddot\smartof}{sous la
       dir\adddot\smartof}},
   cbyeditoralt = {{sous la dir\adddot}{sous la dir\adddot}},
@@ -327,6 +355,8 @@
   % cbyfounder        = {{}{}}, % FIXME
   % cbycontinuator    = {{}{}}, % FIXME
   % cbycollaborator   = {{}{}}, % FIXME
+  cbydirector = {{r\'eal\adddot}{r\'eal\adddot}},
+  cbyproducer = {{prod\adddot}{prod\adddot}},
   cbyeditortr    = {{\'ed\adddotspace \'etablie et trad\adddot\
       \lbx@cfromlang}{\'ed\adddotspace \'etablie et trad\adddot\
       \lbx@cfromlang}},
@@ -597,7 +627,10 @@
   cfromrussian      = {{du russe par}{du russe par}},
   cfromspanish      = {{de l'espagnol par}{de l'espagnol par}},
   cfromswedish      = {{du su\'edois par}{du su\'edois par}},
+  bynone = {{}{}},
   bycompiler = {{compil\'e par}{comp\adddot}},
+  bydirector = {{r\'ealis\'e par}{r\'eal\adddot}},
+  byproducer = {{produit par}{prod\adddot}},
   byeditorcp = {{\'edition \'etablie et compil\'ee par}%
     {\'ed\adddotspace \'etablie et comp\adddot}},
   byeditortrcp = {{\'edition \'etablie, traduite \lbx@fromlang\ et
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx
index c565bb0e517..464976fdee1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx
@@ -1,6 +1,6 @@
-% $Id: cms-german.lbx,v 0.9.5.4 2010/09/03 08:32:37 dfussner Exp $	
+% $Id: cms-german.lbx,v 0.9.5.7 2011/02/15 12:02:26 dfussner Exp $	
 
-\ProvidesFile{cms-german.lbx}[2010/09/03 v0.9c biblatex localization]
+\ProvidesFile{cms-german.lbx}[2011/02/15 v 1.2a biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated strings and formatting decisions need review by native
@@ -56,7 +56,10 @@
   \restorecommand\mkbibrangeterse%
   \restorecommand\mkbibrangeterseextra}
 
+\NewBibliographyString{bynone}
 \NewBibliographyString{bycompiler}
+\NewBibliographyString{bydirector}
+\NewBibliographyString{byproducer}
 \NewBibliographyString{byeditorcp}
 \NewBibliographyString{byeditortrcp}
 \NewBibliographyString{byeditortrcpco}
@@ -104,6 +107,8 @@
 \NewBibliographyString{bycompileranin}
 \NewBibliographyString{bycompileranfo}
 \NewBibliographyString{bycompileranaf}
+\NewBibliographyString{cbynone}
+\NewBibliographyString{cbyauthor}
 \NewBibliographyString{cbyeditor}
 \NewBibliographyString{cbytranslator}
 \NewBibliographyString{cbycompiler}
@@ -113,6 +118,8 @@
 \NewBibliographyString{cbyfounder}
 \NewBibliographyString{cbycontinuator}
 \NewBibliographyString{cbycollaborator}
+\NewBibliographyString{cbydirector}
+\NewBibliographyString{cbyproducer}
 \NewBibliographyString{cbyeditortr}
 \NewBibliographyString{cbyeditorcp}
 \NewBibliographyString{cbyeditorco}
@@ -202,6 +209,8 @@
 \NewBibliographyString{origpub}
 \NewBibliographyString{origpublin}
 \NewBibliographyString{origpubyear}
+\NewBibliographyString{origreleaseyear}
+\NewBibliographyString{origshownyear}
 \NewBibliographyString{origedition}
 \NewBibliographyString{revisededition}
 \NewBibliographyString{numbers}
@@ -233,6 +242,12 @@
 \NewBibliographyString{sections}
 \NewBibliographyString{compiler}
 \NewBibliographyString{compilers}
+\NewBibliographyString{conductor}
+\NewBibliographyString{conductors}
+\NewBibliographyString{director}
+\NewBibliographyString{directors}
+\NewBibliographyString{producer}
+\NewBibliographyString{producers}
 \NewBibliographyString{transcompiler}
 \NewBibliographyString{transcompilers}
 \NewBibliographyString{editortranscompiler}
@@ -270,6 +285,12 @@
   editortranslators = {{Hrsg\adddot\addabbrvspace und
       \"Ubers\adddot}%
     {Hrsg\adddot\addabbrvspace und \"Ubers\adddot}},
+  conductor = {{Dir\adddot}{Dir\adddot}},
+  conductors = {{Dir\adddot}{Dir\adddot}},
+  director = {{Reg\adddot}{Reg\adddot}},
+  directors = {{Reg\adddot}{Reg\adddot}},
+  producer = {{Prod\adddot}{Prod\adddot}},
+  producers = {{Prod\adddot}{Prod\adddot}},
   editor = {{Hrsg\adddot}{Hrsg\adddot}},
   editors = {{Hrsg\adddot}{Hrsg\adddot}},
   ibidem = {{ebd\adddot}{ebd\adddot}},
@@ -279,6 +300,10 @@
     {urspr\adddot\ ver\"offtl\adddot\ in}},
   origpubyear = {{urspr\"unglich ver\"offentlicht im Jahr\addspace}%
     {urspr\adddot\ ver\"offtl\adddot\addspace}},
+  origreleaseyear = {{urspr\"unglich freigegeben\addspace}%
+    {urspr\adddot\ freigegeben\addspace}},
+  origshownyear = {{urspr\"unglich gezeigt\addspace}%
+    {urspr\adddot\ gezeigt\addspace}},
   origedition = {{Auf\noligature lage\addcolon}%
     {Aufl\adddot\addcolon}},
   revisededition = {{\"uberarb\adddot\space Aufl\adddot}%
@@ -323,6 +348,8 @@
   reprint = {{Nachdruck}{Nachdr\adddot}},
   shorthands = {{Sigel}{Sigel}},
   newseries = {{n.\,F\adddot}{n.\,F\adddot}},
+  cbynone = {{}{}},
+  cbyauthor = {{von}{von}},
   cbyeditor = {{hrsg\adddot}{hrsg\adddot}},
   cbytranslator     = {{\lbx@fromlang \"ubers\adddot}%
     {\lbx@fromlang \"ubers\adddot}},
@@ -334,6 +361,8 @@
   cbycontinuator    = {{fortgef\adddot}{fortgef\adddot}},
   cbycollaborator   = {{unter Mitarb\adddotspace von}%
     {unter Mitarb\adddotspace von}},
+  cbydirector = {{unter der Reg\adddot\ von}{unter der Reg\adddot\ von}},
+  cbyproducer = {{prod\adddot}{prod\adddot}},
   cbyeditortr    = {{hrsg\adddot\addabbrvspace und \lbx@fromlang
       \"ubers\adddot}%
     {hrsg\adddot\addabbrvspace und \lbx@fromlang \"ubers\adddot}},
@@ -706,7 +735,10 @@
   mathesis = {{Magisterarbeit}{Magisterarbeit}},
   phdthesis = {{Diss\adddot}{Diss\adddot}},
   techreport = {{Technischer Bericht}{Technischer Bericht}},
+  bynone = {{}{}},
   bycompiler = {{zusammengestellt von}{zusammengest\adddot}},
+  bydirector = {{unter der Regie von}{unter der Reg\adddot\ von}},
+  byproducer = {{produziert von}{prod\adddot}},
   byeditorcp = {{herausgegeben und zusammengestellt von}%
     {hrsg\adddot\addabbrvspace und zusammengest\adddot}},
   byeditortrcp = {{herausgegeben, \lbx@fromlang \"ubersetzt und
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx
index 2d2896f547c..f6e7ce22492 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx
@@ -1,6 +1,6 @@
-% $Id: cms-ngerman.lbx,v 0.9.5.4 2010/09/03 08:32:37 dfussner Exp $	
+% $Id: cms-ngerman.lbx,v 0.9.5.7 2011/02/15 12:02:26 dfussner Exp $	
 
-\ProvidesFile{cms-ngerman.lbx}[2010/09/03 v0.9c biblatex localization]
+\ProvidesFile{cms-ngerman.lbx}[2011/02/15 v 1.2a biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated strings and formatting decisions need review by native
@@ -56,7 +56,10 @@
   \restorecommand\mkbibrangeterse%
   \restorecommand\mkbibrangeterseextra}
 
+\NewBibliographyString{bynone}
 \NewBibliographyString{bycompiler}
+\NewBibliographyString{bydirector}
+\NewBibliographyString{byproducer}
 \NewBibliographyString{byeditorcp}
 \NewBibliographyString{byeditortrcp}
 \NewBibliographyString{byeditortrcpco}
@@ -104,6 +107,8 @@
 \NewBibliographyString{bycompileranin}
 \NewBibliographyString{bycompileranfo}
 \NewBibliographyString{bycompileranaf}
+\NewBibliographyString{cbynone}
+\NewBibliographyString{cbyauthor}
 \NewBibliographyString{cbyeditor}
 \NewBibliographyString{cbytranslator}
 \NewBibliographyString{cbycompiler}
@@ -113,6 +118,8 @@
 \NewBibliographyString{cbyfounder}
 \NewBibliographyString{cbycontinuator}
 \NewBibliographyString{cbycollaborator}
+\NewBibliographyString{cbydirector}
+\NewBibliographyString{cbyproducer}
 \NewBibliographyString{cbyeditortr}
 \NewBibliographyString{cbyeditorcp}
 \NewBibliographyString{cbyeditorco}
@@ -202,6 +209,8 @@
 \NewBibliographyString{origpub}
 \NewBibliographyString{origpublin}
 \NewBibliographyString{origpubyear}
+\NewBibliographyString{origreleaseyear}
+\NewBibliographyString{origshownyear}
 \NewBibliographyString{origedition}
 \NewBibliographyString{revisededition}
 \NewBibliographyString{numbers}
@@ -233,6 +242,12 @@
 \NewBibliographyString{sections}
 \NewBibliographyString{compiler}
 \NewBibliographyString{compilers}
+\NewBibliographyString{conductor}
+\NewBibliographyString{conductors}
+\NewBibliographyString{director}
+\NewBibliographyString{directors}
+\NewBibliographyString{producer}
+\NewBibliographyString{producers}
 \NewBibliographyString{transcompiler}
 \NewBibliographyString{transcompilers}
 \NewBibliographyString{editortranscompiler}
@@ -270,6 +285,12 @@
   editortranslators = {{Hrsg\adddot\addabbrvspace und
       \"Ubers\adddot}%
     {Hrsg\adddot\addabbrvspace und \"Ubers\adddot}},
+  conductor = {{Dir\adddot}{Dir\adddot}},
+  conductors = {{Dir\adddot}{Dir\adddot}},
+  director = {{Reg\adddot}{Reg\adddot}},
+  directors = {{Reg\adddot}{Reg\adddot}},
+  producer = {{Prod\adddot}{Prod\adddot}},
+  producers = {{Prod\adddot}{Prod\adddot}},
   editor = {{Hrsg\adddot}{Hrsg\adddot}},
   editors = {{Hrsg\adddot}{Hrsg\adddot}},
   ibidem = {{ebd\adddot}{ebd\adddot}},
@@ -279,6 +300,10 @@
     {urspr\adddot\ ver\"offtl\adddot\ in}},
   origpubyear = {{urspr\"unglich ver\"offentlicht im Jahr\addspace}%
     {urspr\adddot\ ver\"offtl\adddot\addspace}},
+  origreleaseyear = {{urspr\"unglich freigegeben\addspace}%
+    {urspr\adddot\ freigegeben\addspace}},
+  origshownyear = {{urspr\"unglich gezeigt\addspace}%
+    {urspr\adddot\ gezeigt\addspace}},
   origedition = {{Auf\noligature lage\addcolon}%
     {Aufl\adddot\addcolon}},
   revisededition = {{\"uberarb\adddot\space Aufl\adddot}%
@@ -323,6 +348,8 @@
   reprint = {{Nachdruck}{Nachdr\adddot}},
   shorthands = {{Sigel}{Sigel}},
   newseries = {{n.\,F\adddot}{n.\,F\adddot}},
+  cbynone = {{}{}},
+  cbyauthor = {{von}{von}},
   cbyeditor = {{hrsg\adddot}{hrsg\adddot}},
   cbytranslator     = {{\lbx@fromlang \"ubers\adddot}%
     {\lbx@fromlang \"ubers\adddot}},
@@ -334,6 +361,8 @@
   cbycontinuator    = {{fortgef\adddot}{fortgef\adddot}},
   cbycollaborator   = {{unter Mitarb\adddotspace von}%
     {unter Mitarb\adddotspace von}},
+  cbydirector = {{unter der Reg\adddot\ von}{unter der Reg\adddot\ von}},
+  cbyproducer = {{prod\adddot}{prod\adddot}},
   cbyeditortr    = {{hrsg\adddot\addabbrvspace und \lbx@fromlang
       \"ubers\adddot}%
     {hrsg\adddot\addabbrvspace und \lbx@fromlang \"ubers\adddot}},
@@ -706,7 +735,10 @@
   mathesis = {{Magisterarbeit}{Magisterarbeit}},
   phdthesis = {{Diss\adddot}{Diss\adddot}},
   techreport = {{Technischer Bericht}{Technischer Bericht}},
+  bynone = {{}{}},
   bycompiler = {{zusammengestellt von}{zusammengest\adddot}},
+  bydirector = {{unter der Regie von}{unter der Reg\adddot\ von}},
+  byproducer = {{produziert von}{prod\adddot}},
   byeditorcp = {{herausgegeben und zusammengestellt von}%
     {hrsg\adddot\addabbrvspace und zusammengest\adddot}},
   byeditortrcp = {{herausgegeben, \lbx@fromlang \"ubersetzt und
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 8e21f1b9c6e..e865e3ae9e8 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -129,6 +129,7 @@ $Master = "$mydir/../..";
  'bib2ml',	"die 'skipping, no self-locate?, etc.'",
  'bib2xhtml',	"die 'skipping, requires PDF::API2'",
  'biber',	"die 'skipping, arch-dependent perl, etc.'",
+ 'biblatex-chicago', "&MAKEflatten",
  'biblatex-contrib',	"die 'skipping, use subdir'",
  'biblatex-philosophy', "&MAKEflatten",
  'bibtool',	"die 'skipping, requires compilation'",
@@ -359,6 +360,7 @@ $Master = "$mydir/../..";
  'he-le-na',	"die 'skipping, nonfree (shareware) license'",
  'hfbright',	"&MAKEflatten",
  'hfoldsty',	"&MAKEflatten",
+ 'hge',		"die 'skipping, looks nonfree'",
  'highlight',	"die 'skipping, complicated compilation'",
  'hilowres',	"die 'skipping, nonfree'",
  'html2latex',	"die 'skipping, no self-locating of Perl modules'",