biblatex-chicago (6dec12)

git-svn-id: svn://tug.org/texlive/trunk@28472 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2012-12-08 17:16:40 +0000
committer: Karl Berry <karl@freefriends.org> 2012-12-08 17:16:40 +0000
commit: d5550a5b1dfc527de0b394ca1af3dff46548c6e3 (patch)
tree: c75e4296b600e2d2effb0dd168a9c3e6aacf229d
parent: d70e4e2f7daa386b9f77c0ff1d5a61b0c2c4b7f3 (diff)
36 files changed, 6198 insertions, 769 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/README b/Master/texmf-dist/doc/latex/biblatex-chicago/README
index 455231567f7..16edb477aee 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/README
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/README
@@ -1,19 +1,19 @@
 IMPORTANT NOTE:
 
 This is the package formerly known as biblatex-chicago-notes-df.  It
-has now been upgraded to work with version 2.0 of biblatex, which has
+has now been upgraded to work with version 2.4 of biblatex, which has
 recently been released.  It contains, for the first time, both the
 15th- and 16th-edition Chicago style files.  If you have used the
 package before, then you should be sure to consult the RELEASE file to
 find out what alterations you may need to make to your .bib files and
 document preambles to bring them up to date.  Most particularly please
-note that Biber is now required for the author-date style (version 1.0
+note that Biber is now required for the author-date style (version 1.4
 if you are using the latest biblatex, 0.9.8 or 0.9.9 if you are still
 using biblatex 1.7).
 
-README (version 0.9.9a, 2012-07-30):
+README (version 0.9.9b, 2012-12-06):
 
-Biblatex-chicago contains four biblatex styles implementing the
+Biblatex-chicago contains five biblatex styles implementing the
 specifications of the Chicago Manual of Style in both its 15th and
 16th editions.  The "notes & bibliography" style was formerly
 available in the package biblatex-chicago-notes-df, and is intended
@@ -27,13 +27,14 @@ of the Manual has brought the presentation of sources in this style
 much more into line with the notes & bibliography specification,
 especially regarding the formatting of titles.  If you still require
 titles to be capitalized sentence style, and article titles, for
-example, not to be enclosed in quotation marks, then you may wish to
-continue using the 15th-edition files until I have provided, in the
-next release, these features as an option to the 16th-edition style.
-Other users should upgrade to the most recent specification.  To
-continue using the 15th-edition files, you'll need to specify
-"notes15" or "authordate15" in the options when loading
-biblatex-chicago.
+example, not to be enclosed in quotation marks, then you may now use
+the new, traditional author-date style ("authordate-trad"), which
+provides these features while in all other respects following the
+16th-edition specifications.  I encourage all users to upgrade to one
+of these three up-to-date styles, which should now cater to nearly all
+needs.  If you with to continue using the 15th-edition files, you'll
+need to specify "notes15" or "authordate15" in the options when
+loading biblatex-chicago.
 
 This is a beta release, but its feature set is already fairly
 extensive.  If you have used the package before you may, after
@@ -49,10 +50,10 @@ reference guide to both notes & bibliography and author-date styles
 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, cms15-notes-sample.tex, cms15-dates-sample.tex)
-or my system (cms-notes-sample.pdf, cms-dates-sample.pdf,
-cms15-notes-sample.pdf, cms15-dates-sample.pdf) with the actual
-examples in the Manual.
+cms-dates-sample.tex, cms-trad-sample.tex, cms15-notes-sample.tex,
+cms15-dates-sample.tex) or my system (cms-notes-sample.pdf,
+cms-dates-sample.pdf, cms-trad-sample.pdf, cms15-notes-sample.pdf,
+cms15-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
@@ -80,14 +81,16 @@ 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 thirteen files biblatex-chicago.sty, chicago-notes.cbx,
+ - The twenty files biblatex-chicago.sty, chicago-notes.cbx,
    chicago-notes.bbx, chicago-authordate.cbx, chicago-authordate.bbx,
+   chicago-authordate-trad.cbx, chicago-authordate-trad.bbx,
    chicago-notes15.cbx, chicago-notes15.bbx, chicago-authordate15.cbx,
-   chicago-authordate15.bbx, 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
+   chicago-authordate15.bbx, cms-american.lbx, cms-british.lbx,
+   cms-french.lbx, cms-german.lbx, cms-icelandic.lbx, cms-ngerman.lbx,
+   cms-norsk.lbx, cms-norwegian.lbx, and cms-nynorsk.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,
@@ -96,14 +99,15 @@ biblatex package:
    remember to update your TeX file name database so that TeX can find
    them.
 
- - The fourteen files biblatex-chicago.tex, biblatex-chicago.pdf,
+ - The sixteen files biblatex-chicago.tex, biblatex-chicago.pdf,
    biblatex-chicago15.tex, biblatex-chicago15.pdf
-   cms-notes-sample.tex, cms-dates-sample.tex, cms-notes-sample.pdf,
-   cms-dates.sample.pdf, cms15-notes-sample.tex,
-   cms15-dates-sample.tex, cms15-notes-sample.pdf,
-   cms15-dates.sample.pdf, notes-test.bib, and dates-test.bib can all
-   be found in the doc/ directory in the package archive, the last 10
-   in the examples/ subdirectory.  You can place all of this in
+   cms-notes-sample.tex, cms-dates-sample.tex, cms-trad-sample.tex,
+   cms-notes-sample.pdf, cms-dates.sample.pdf, cms-trad-sample.pdf,
+   cms15-notes-sample.tex, cms15-dates-sample.tex,
+   cms15-notes-sample.pdf, cms15-dates.sample.pdf, notes-test.bib, and
+   dates-test.bib can all be found in the doc/ directory in the
+   package archive, the last 10 in the examples/ subdirectory.  You
+   can place all of this in
    <TEXMFLOCAL>/doc/latex/biblatex-contrib/biblatex-chicago.
 
 
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE b/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE
index d31c2cf1770..47c547c7e35 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE
@@ -1,3 +1,59 @@
+Release notes for version 0.9.9b [2012-12-06]:
+
+ - This release contains a new variant of the author-date style,
+   available as the "authordate-trad" option when loading
+   biblatex-chicago.  This provides the traditional, plain,
+   pre-16th-edition Chicago title handling -- sentence-style
+   capitalization, absence of quotation marks in Article titles and
+   the like -- but in all other respects follows the 16th-edition
+   specification, as suggested by the Manual (15.45).  Remember that
+   the "headline" package option can be used to turn off the automatic
+   sentence-style capitalization, meaning that titles will appear as
+   presented in the .bib file, at least as far as capitalization is
+   concerned.  Please see especially the documentation under "title"
+   in section 5.2 of biblatex-chicago.pdf for the details.
+
+ - I have updated calls to \DeclareLabelname and \DeclareLabelyear in
+   several .cbx files so that the package works correctly with the
+   most recent version (2.4) of biblatex.
+
+ - Following a request by Norman Gray, and adapting code by Audrey
+   Boruvka, I have included a \textcite (and a \textcites) command in
+   the notes & bibliography style for the first time.
+
+ - Following a request by Daniel Possenriede, I have added in all
+   three 16th-edition styles a new switch, "only", to the "doi"
+   option, which prints the "doi" field when present and the "url"
+   field only when there is no "doi."  The package default remains,
+   however, "true".
+
+ - I am grateful to Baldur Kristinsson for providing an Icelandic
+   localization file for biblatex-chicago, called cms-icelandic.lbx.
+   You'll see if you look through it that it is still something of a
+   work in progress, but it should cover most needs in that language
+   very well.  If you would like to fill in some of the gaps please
+   let me know.
+
+ - I am also grateful to H�kon Malmedal for providing Norwegian
+   localizations for biblatex-chicago, contained in the files
+   cms-norsk.lbx, cms-norwegian.lbx, and cms-nynorsk.lbx.
+
+ - I have added a new British localization, cms-british.lbx.  The
+   "british" option to babel should now work without further
+   intervention.  For further details on the usage of all these
+   localizations please see section 6 of biblatex-chicago.pdf.
+
+ - Several users have reported a bug that resulted in doubled
+   bibstrings in certain contexts.  This happened only when using
+   localizations for which biblatex-chicago didn't have explicit
+   support, and it should now be fixed.
+
+ - I have changed the way the 16th-edition author-date styles handle
+   the Ibidem mechanism.  In the absence of a "postnote" field you no
+   longer get empty parentheses, but rather a standard in-text
+   citation.  If you do have a "postnote" field, then only that will
+   appear.
+
 Release notes for version 0.9.9a [2012-07-30]:
 
  - I have made a few changes to biblatex-chicago.sty to allow the
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf
index aa0e0f063a9..49826af7f1d 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 6220ad7ef71..297c4928601 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex
@@ -56,7 +56,7 @@
   Style files for biblatex
 
 \vspace{.3\baselineskip}
-\sffamily\normalsize\bfseries David Fussner\qquad Version 0.9.9a (beta) \\
+\sffamily\normalsize\bfseries David Fussner\qquad Version 0.9.9b (beta) \\
 \href{mailto:djf027@googlemail.com}{djf027@googlemail.com}\\ \today
 
 \end{center} 
@@ -73,16 +73,17 @@
 \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, aside from those necessary for the upcoming switch to
-  \textsf{Biber} as the required backend rather than an optional one.
-  This release of \textsf{biblatex-chicago} implements, for the first
-  time, the 16th edition of the \emph{Chicago Manual of Style}, but I
-  shall continue to maintain the 15th-edition files for those who need
-  or want them, a situation I anticipate being rather more common with
-  the author-date style than with notes \&\ bibliography.  I shall
-  also continue to maintain the 15th-edition documentation, which you
-  can find in \textsf{biblatex-chicago15.pdf}.  I have summarized the
-  changes between the two in section~\ref{sec:history} below,
+  it.  This release of \textsf{biblatex-chicago} implements, for the
+  first time, the 16th edition of the \emph{Chicago Manual of Style}.
+  I shall continue, for the moment, to maintain the 15th-edition files
+  for those who need or want them, but I encourage all users to switch
+  to the newer specification.  If the title-formatting changes in the
+  author-date style have been an obstacle, please note that the new
+  \textsf{authordate-trad} style keeps the traditional title
+  formatting but switches everything else to the 16th edition spec.
+  The 15th-edition documentation is still available, also, in
+  \textsf{biblatex-chicago15.pdf}.  I have summarized the changes
+  between the two editions in section~\ref{sec:history} below,
   especially the ones
   that may require alterations to your .bib files.\mylittlespace\\
   I have tried to implement as much of the \emph{Manual's}
@@ -110,37 +111,41 @@ 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 includes both the
-\emph{Manual's} \enquote{author-date} system, favored by many
-disciplines in the sciences and social sciences, and its
+by the \emph{Chicago Manual of Style}.  This package includes two
+versions of the \emph{Manual's} \enquote{author-date} system, favored
+by many disciplines in the sciences and social sciences, and also 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
+author-date styles produce a short, in-text citation inside
 parentheses --- (Author Year) --- keyed to a list of references where
 entries start with the same name and year.
 
-\mylittlespace The documentation you are reading covers both of these
-Chicago styles and their variants.  Much of what follows is relevant
-to all users, but I have decided, after some experimentation, to keep
-the instructions for the two styles separate, at least in
+\mylittlespace The documentation you are reading covers all three of
+these Chicago styles and their variants.  Much of what follows is
+relevant to all users, but I have decided, after some experimentation,
+to keep the instructions for the two author-date styles separate from
+those pertaining to the notes \&\ bibliography style, at least in
 sections~\ref{sec:Spec} and \ref{sec:authdate}.  Information provided
 under one style will often duplicate that found under the other, but
 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.
+other.  Within the author-date section, the
+\mycolor{\textsf{authordate-trad}} information really only appears
+separately in section~\ref{sec:fields:authdate}, s.v.\
+\enquote{title.} Throughout the documentation, any \mycolor{green}
+text \colmarginpar{\textsf{New!}} indicates something \mycolor{new} in
+this 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
-  should use the latest version(s) --- 1.7 or 2.0 at the time of
+  should use the latest version(s) --- 1.7 or 2.4 at the time of
   writing --- as those versions have been tested more thoroughly than
   any other, meaning that these style files may well not function
   properly with some earlier iterations of \textsf{biblatex}. Lehman's
@@ -167,9 +172,9 @@ release.
   \item \mycolor{\textsf{Biber}} --- the next-generation
     \textsc{Bib}\TeX\ replacement, called \textsf{Biber}, which is
     available from SourceForge.  You should use the latest version,
-    1.0, to work with \textsf{biblatex-chicago} and \textsf{biblatex}
-    2.0, or 0.9.9 with \textsf{biblatex} 1.7, and it is required for
-    users who are either using the author-date style or processing a
+    1.4, to work with \textsf{biblatex-chicago} and \textsf{biblatex}
+    2.4, or 0.9.9 with \textsf{biblatex} 1.7, and it is required for
+    users who are either using the author-date styles or processing a
     .bib file in Unicode.  See \textsf{cms-dates-sample.pdf} for more
     details.
   \end{itemize}
@@ -178,19 +183,24 @@ release.
     \cmd{usepackage[notes]\{biblatex-chicago\}}
   \end{quote}
   in your document preamble to load the notes \&\ bibliography style,
-  or the line:
+  the line:
   \begin{quote}
     \cmd{usepackage[authordate,backend=biber]\{biblatex-chicago\}}
   \end{quote}
-  to load the author-date style.  (You can use
-  \mycolor{\texttt{notes15}} or \mycolor{\texttt{authordate15}} to
+  to load the author-date style, or the line:
+  \begin{quote}
+    \cmd{usepackage[\mycolor{authordate-trad},backend=biber]\{biblatex-chicago\}}
+  \end{quote}
+
+  to load the traditional variant of the author-date style.  (You can
+  use \mycolor{\texttt{notes15}} or \mycolor{\texttt{authordate15}} to
   load the 15th-edition styles.  Please see
   \mycolor{\textsf{biblatex-chicago15.pdf}} for the details.)  Any
   other options you usually pass to \textsf{biblatex} can be given to
   \textsf{biblatex-chicago} instead, but loading it this way sets up a
   number of other parameters automatically.  You can also load the
   package via the usual \cmd{usepackage\{biblatex\}}, adding either
-  \texttt{style=chicago-notes} or \texttt{style=chicago-authordate},
+  \texttt{style=chicago\-notes} or \texttt{style=chicago-authordate},
   but this is mainly for those who wish to set much of the low-level
   formatting of their document themselves.  Please see
   sections~\ref{sec:loading} and \ref{sec:loading:auth} below for a
@@ -211,14 +221,23 @@ release.
   \texttt{american} as the main text language.  As before,
   \textsf{babel}-less setups, and also those choosing \texttt{english}
   as the main text language, should work out of the box.
-  \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 \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},
+  \textsf{Biblatex-chicago} also now provides support for
+  \mycolor{British}, French, German, \mycolor{Icelandic}, and
+  \mycolor{Norwegian}.  Please see below
+  (section~\ref{sec:international}) for a fuller explanation of all
+  the options.
+\item \textsf{chicago-auth\-ordate.cbx},
+  \textsf{chi\-cago-authordate.bbx},
+  \mycolor{\textsf{chi\-cago-authordate-trad.cbx}},
+  \mycolor{\textsf{chicago-auth\-ordate-trad.bbx}},
+  \textsf{chicago-notes.bbx}, \textsf{chi\-cago-notes.cbx},
+  \textsf{cms-am\-erican.lbx}, \mycolor{\textsf{cms-british.lbx}},
+  \textsf{cms-french.lbx}, \textsf{cms-ger\-man.lbx},
+  \mycolor{\textsf{cms-icelandic.lbx}}, \textsf{cms-ngerman.lbx},
+  \mycolor{\textsf{cms-norsk.lbx}},
+  \mycolor{\textsf{cms-norwe\-gian.lbx}},
+  \mycolor{\textsf{cms-nynorsk.lbx}}, and
+  \textsf{biblatex-chicago.sty}, all from \textsf{biblatex-chicago},
   installed either in a system-wide \TeX\ directory, or in the working
   directory where you keep your *.tex files.  (To use the 15th-edition
   styles, you'll also require \textsf{\mycolor{chicago-notes15.bbx}},
@@ -253,12 +272,14 @@ release.
   \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
-  \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
+\item The files \textsf{cms-notes-sample.pdf},
+  \textsf{cms-dates-sample.pdf}, and
+  \mycolor{\textsf{cms-trad-sam\-ple.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 and third are the result of processing
+  \textsf{dates-test.bib} with \textsf{cms-dates-sample.tex} or
+  \mycolor{\textsf{cms-trad-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
@@ -269,13 +290,14 @@ release.
   only need to read the part(s) that apply to the style in which you
   are interested.  Much of the information in section~\ref{sec:Spec}
   is duplicated in section~\ref{sec:authdate}, so even if you have a
-  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}.  You
-  will find the seven previous files in the \texttt{doc/} subdirectory
-  once you've extracted \textsf{biblatex-chicago.zip}.  If you wish to
-  place them in a system-wide directory, I would recommend
+  need for multiple styles then using one will be excellent
+  preparation for the others.  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}.  You will find the seven previous files
+  in the \texttt{doc/} subdirectory 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},
   all the while remembering, of course, to update the file name
   database afterward.  (Let me reiterate, also, that if you currently
@@ -318,13 +340,18 @@ 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, and I've borrowed ideas
 for the \texttt{shorthandibid} option from Dominik Wa�enhoven's
-\textsf{biblatex-dw} package.  Kazuo Teramoto and Gildas Hamel both
-sent patches to improve the package, and 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 with their help and advice during the development of this
-package, and have both continued indefatigably to test it and suggest
-needed improvements.  They were particularly instrumental in
+\textsf{biblatex-dw} package.  I've adapted Audrey Boruvka's
+\cmd{textcite} code from
+\href{http://tex/stackexchange.com/questions/67837/citations-as-nouns-in-biblatex-chicago}{Stackexchange}
+for the notes \&\ bibliography style.  I am very grateful to Baldur
+Kristinsson for providing the Icelandic localization, and to H�kon
+Malmedal for the Norwegian localizations.  Kazuo Teramoto and Gildas
+Hamel both sent patches to improve the package, and 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 with their help and advice during the development
+of this package, and have both continued indefatigably to test it and
+suggest needed improvements.  They were particularly instrumental in
 encouraging the greatest possible degree of compatibility with other
 \textsf{biblatex} styles.  Indeed, if the task of adapting .bib files
 for use with the Chicago style seems onerous now, you should have
@@ -374,18 +401,19 @@ utterly sacrificing the latter.
 \label{sec:bltries}
 
 In short, the \textsf{biblatex} style files in this package try to
-simplify the task of following the two Chicago specifications.  In the
-notes \&\ bibliography style, the two sorts of reference are treated
-separately (as are the two different note forms, long and short), and
-you can choose always to use the short note form, even at the first
-citation.  In the author-date style, a series of options allows you to
-choose which date (original printing, reprint, or both) appears in
-citations and at the head of entries in the list of references.  In
-both styles, punctuation is placed within quotation marks when needed,
-and as a general rule as many parts of the style as possible are
-implemented as transparently as possible.  Thanks to advice I received
-from Joseph Reagle Jr.\ and Charles Schaum while these files were a
-work in progress, I have attended as carefully as I can to backward
+simplify the task of following the two Chicago specifications along
+with their major variants.  In the notes \&\ bibliography style, the
+two sorts of reference are treated separately (as are the two
+different note forms, long and short), and you can choose always to
+use the short note form, even at the first citation.  In the two
+author-date styles, a series of options allows you to choose which
+date (original printing, reprint, or both) appears in citations and at
+the head of entries in the list of references.  In all styles,
+punctuation is placed within quotation marks when needed, and as a
+general rule as many parts of the style as possible are implemented as
+transparently as possible.  Thanks to advice I received from Joseph
+Reagle Jr.\ and Charles Schaum while these files were a work in
+progress, I have attended as carefully as I can to backward
 compatibility with the standard \textsf{biblatex} styles, and have
 attempted to minimize both any changes you need to make to achieve
 compliance with the Chicago specification, and indeed also any changes
@@ -441,7 +469,7 @@ the system.  Headings in \mycolor{green} \colmarginpar{\textsf{New in
     this release}} indicate material new to this release, or
 occasionally old material that has undergone significant revision.
 Numbers in parentheses refer to sections of the \emph{Chicago Manual
-  of Style}, 15th edition.  The file \textsf{notes-test.bib} contains
+  of Style}, 16th edition.  The file \textsf{notes-test.bib} contains
 many examples from the \emph{Manual} which, when processed using
 \textsf{biblatex-chicago-notes}, should produce the same output as you
 see in the \emph{Manual} itself, or at least compliant output, where
@@ -808,7 +836,7 @@ 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}
+%\enlargethispage{\baselineskip}
 
 \mybigspace This \mymarginpar{\textbf{customb}} entry type is now
 obsolete, and any such entries in your .bib file will trigger an
@@ -843,6 +871,8 @@ key in a \cmd{nocite} command, or you can put that entry key in the
 \textsf{biblatex-chicago} will print the expanded abbreviation if and
 only if you cite the main entry.  (Cf.\ \textsf{userc}, below.)
 
+\enlargethispage{\baselineskip}
+
 \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
@@ -860,8 +890,6 @@ media.  This means that this entry type is now a clone of the
 for users migrating from the old to the new specification.  (See 3.22,
 8.193; bedford:photo.)
 
-\enlargethispage{\baselineskip}
-
 \mybigspace These \mymarginpar{\textbf{inbook}\\\textbf{incollection}}
 two standard \textsf{biblatex} types have very nearly identical
 formatting requirements as far as the Chicago specification is
@@ -1445,7 +1473,7 @@ 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}
+%\enlargethispage{\baselineskip}
 
 \mybigspace The \colmarginpar{\textbf{review}} \textsf{review} entry
 type was added to \textsf{biblatex 0.7}, and it certainly eases the
@@ -1529,7 +1557,7 @@ providing pseudonyms in square brackets that is the standard function
 of this field in all other entry types, and possibly in the the
 \textsf{review} type as well.
 
-\enlargethispage{-\baselineskip}
+%\enlargethispage{-\baselineskip}
 
 \mybigspace This \colmarginpar{\textbf{suppbook}} is the entry type to
 use if the main focus of a reference is supplemental material in a
@@ -1937,7 +1965,7 @@ ordinarily only be capitalized at the beginning of a sentence, then
 simply ensure that that word is in lowercase, and
 \textsf{biblatex-chicago-notes} will automatically do the right thing.
 
-%\enlargethispage{-\baselineskip}
+\enlargethispage{\baselineskip}
 
 \mybigspace This \mymarginpar{\textbf{chapter}} field holds the
 chapter number, mainly useful only in an \textsf{inbook} or an
@@ -2416,6 +2444,8 @@ proper place to identify the type of issue, e.g.,\ \texttt{special
   issue}, with the initial letter lower-cased to enable automatic
 contextual capitalization.
 
+\enlargethispage{\baselineskip}
+
 \mybigspace The \mymarginpar{\textbf{journalsubtitle}} subtitle for a
 \textsf{journaltitle} --- see next entry.
 
@@ -2459,8 +2489,6 @@ with a \texttt{notkeyword=original} in the optional argument to the
 \cmd{printbibliography} command, though of course you can choose any
 key you wish.
 
-%\enlargethispage{\baselineskip}
-
 \mybigspace A \mymarginpar{\textbf{language}} standard
 \textsf{biblatex} field, designed to allow you to specify the
 language(s) in which a work is written.  As a general rule, the
@@ -2791,7 +2819,7 @@ numbers, some improvisation may be needed if you wish to include
 \textsf{titleaddon}, but in other entry types you may need to use the
 \textsf{location} field.
 
-\enlargethispage{\baselineskip}
+%\enlargethispage{\baselineskip}
 
 \mybigspace In \mymarginpar{\textbf{origlanguage}} keeping with the
 \emph{Manual}'s specifications, I have fairly thoroughly redefined
@@ -3061,7 +3089,7 @@ need to provide these strings in such a citation, then you'll have to
 do so by hand in the \textsf{shortauthor} field, or in the
 \textsf{shorteditor} field, whichever you are using.
 
-\enlargethispage{\baselineskip}
+%\enlargethispage{\baselineskip}
 
 \mybigspace Like \mymarginpar{\textbf{shorteditor}}
 \textsf{shortauthor}, a field to provide a name for a short footnote,
@@ -3378,7 +3406,7 @@ do the right thing in citations.  Cf.\ \textsf{artwork},
 above, for all the details.  (See auden:reading, bedford:photo,
 cleese:holygrail, leo:madonna, nytrumpet:art.)
 
-\enlargethispage{-\baselineskip}
+%\enlargethispage{-\baselineskip}
 
 \mybigspace A standard \colmarginpar{\textbf{url}} \textsf{biblatex}
 field, it holds the url of an online publication, though you can
@@ -3526,6 +3554,8 @@ field.  It holds the volume of a \textsf{journaltitle} in
 volume of a multi-volume work in many other sorts of entry.  Cf.\
 \textsf{part}.
 
+\enlargethispage{\baselineskip}
+
 \mybigspace Standard \colmarginpar{\textbf{volumes}} \textsf{biblatex}
 field.  It holds the total number of volumes of a multi-volume work,
 and in the 16th edition of the \emph{Manual} no longer triggers any
@@ -3858,17 +3888,15 @@ The \textsf{biblatex} package is particularly rich in citation
 commands, some of which (e.g., \cmd{supercite(s)}, \cmd{citeyear})
 provide functionality that isn't really needed by the Chicago notes
 and bibliography style offered here.  If you are getting unexpected
-behavior when using them please have a look in your .log file.  A
-command like \cmd{textcite}, listed in �~3.6.2 of the
-\textsf{biblatex} manual but not defined by \textsf{biblatex-chicago},
-defaults to \cmd{cite}, and leaves a warning in the .log.  Others
-(e.g., \cmd{cite\-author}), though I haven't tested them extensively,
-should pretty much work out of the box.  What remains are the commands
-I have found most useful and necessary for following the
-\emph{Manual}'s specifications, and I document in this section any
-alterations I have made to these.  As always, if there are standard
-commands that don't work for you, or new commands that would be
-useful, please let me know, and it should be possible to fix or add
+behavior when using them please have a look in your .log file ---
+there may be warnings there that alert you to undefined citation
+commands.  Other \textsf{biblatex}-provided commands, though I haven't
+tested them extensively, should pretty much work out of the box.  What
+remains are the commands I have found most useful and necessary for
+following the \emph{Manual}'s specifications, and I document in this
+section any alterations I have made to these.  As always, if there are
+standard commands that don't work for you, or new commands that would
+be useful, please let me know, and it should be possible to fix or add
 them.
 
 \mylittlespace A number of users have run into a problem that appears
@@ -3954,6 +3982,8 @@ is a standard command, and it too provides a full citation, but unlike
 the previous command it doesn't automatically place it in a footnote.
 It may be useful within long textual notes.
 
+\enlargethispage{-\baselineskip}
+
 \mybigspace Matthew \mymarginpar{\textbf{\textbackslash headlesscite}}
 Lundin requested a more generalized \cmd{headlesscite} macro,
 suppressing the author's name in specific contexts while allowing
@@ -3967,8 +3997,6 @@ only the most flexible form of the command, you'll have to wrap it in
 a \cmd{footnote} yourself.  Please see the next entry for further
 discussion of some of the needs this command might help address.
 
-%\enlargethispage{-\baselineskip}
-
 \mybigspace I \mymarginpar{\textbf{\textbackslash
     headless-\\fullcite}} have provided this command in case you want
 to print a full citation without the author's name.  The \emph{Manual}
@@ -4006,6 +4034,29 @@ notes this falls back to the standard format, but in long notes it
 simply omits the given names of the \textsf{author} and provides only
 the surname, along with the full data of the entry.  (Cf.\ 14.52.)
 
+\mybigspace Norman \colmarginpar{\textbf{\textbackslash textcite}}
+Gray started a discussion on
+\href{http://tex/stackexchange.com/questions/67837/citations-as-nouns-in-biblatex-chicago}{Stackexchange}
+which established both that \textsf{biblatex} had begun including a
+\cmd{textcite} command in its verbose styles and that
+\textsf{biblatex-chicago-notes} hadn't kept up.  In that thread the
+user Audrey provided some code, adapted from \textsf{verbose.cbx}, to
+provide such a command for the Chicago notes \&\ bibliography style.
+I'm still not entirely certain how best to accommodate this request
+within the package, but there are now at least commands
+(\cmd{textcite} and \cmd{textcites}) for users to test.  Their
+functionality is a little complicated.  In the main text, they will
+provide an \textsf{author's} name, followed immediately by a foot- or
+endnote which contains the full (or short) reference, following the
+usual rules.  If you use \cmd{textcite} inside a foot- or endnote,
+then you'll get the \textsf{author's} name followed by the bibstring
+\enquote{\texttt{in},} then the headless citation.  This latter usage
+is slightly awkward when the citation is a full one, but works
+reasonably well for short notes, and I'm as yet unconvinced that
+putting the citation inside parentheses, generally discouraged by the
+\emph{Manual} (14.33), helps this situation much.  If you disagree,
+please let me know.
+
 \mylittlespace If you look at \textsf{chicago-notes.cbx}, you'll see a
 number of other citation commands, but those are intended for internal
 use only, mainly in cross-references of various sorts.  Use at your
@@ -4175,6 +4226,8 @@ variant of the default \texttt{nty}.  (You can find its definition in
 \textsf{chicago-notes.cbx}.)  Users of all other backends will still
 be using \texttt{nty}.
 
+\enlargethispage{\baselineskip}
+
 \mylittlespace The advantages of this scheme are, specifically, that
 any entry headed by one of the supplemental name fields
 (\textsf{name[a-c]}), a \textsf{manual} entry headed by an
@@ -4206,12 +4259,20 @@ the preamble, for the whole document, or on a per-entry basis in the
 would make sense to eliminate the \textsf{pages} field from the
 affected entries).
 
-\mylittlespace This \mymarginpar{\texttt{doi=true}} option controls
+\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.  In \textsf{online}
-entries, the \textsf{doi} field will always be printed.
+printed in notes and bibliography.  At the request of Daniel
+Possenriede, and keeping in mind the \emph{Manual's} preference for
+this field instead of a \textsf{url} (14.6), I have added a third
+switch, \mycolor{\texttt{only}}, which prints the \textsf{doi} if it
+is present and the \textsf{url} only if there is no \textsf{doi}.  The
+package default remains the same, however --- it defaults to true,
+which will print both \textsf{doi} and \textsf{url} if both are
+present.  The option can be set to \texttt{only} or to \texttt{false}
+either in the preamble, for the whole document, or on a per-entry
+basis in the \textsf{options} field.  In \textsf{online} entries, the
+\textsf{doi} field will always be printed, but the \texttt{only}
+switch will still eliminate any \textsf{url}.
 
 \mylittlespace This \colmarginpar{\texttt{eprint=true}} option controls
 whether any \textsf{eprint} fields present in the .bib file will be
@@ -4593,45 +4654,70 @@ when your .bib file gets to a certain size.
 \section{The Specification: Author-Date}
 \label{sec:authdate}
 
-In what follows, I attempt to explain all the parts of
-\textsf{biblatex-chicago-authordate} that might be considered somehow
-\enquote{non standard,} at least with respect to the styles included
-with \textsf{biblatex} itself, though in the section on entry fields I
+The \textsf{biblatex-chicago} package now contains \emph{two}
+different author-date styles.  The first,
+\textsf{biblatex-chicago-authordate}, implements the specifications of
+the 16th edition of the \emph{Chicago Manual of Style}.  Numbers in
+parentheses refer to sections of the \emph{Manual}, though as this
+latest edition now recommends \enquote{a uniform treatment for the
+  main elements of citation in both of its systems of documentation}
+(15.2), many of these references will in fact be to the chapter on the
+notes \&\ bibliography style (chap.\ 14), which chapter is, by design,
+considerably more detailed than that devoted to the author-date style.
+The second, \mycolor{\textsf{biblatex-chicago-authordate-trad}},
+implements that same specification but with a markedly different style
+of title presentation, including sentence-style capitalization and an
+absence of quotation marks around the (plain-text) titles of
+\textsf{article} or \textsf{incollection} entries, \emph{inter alia}.
+The \textsf{trad} style is so named because older versions of the
+\emph{Manual}, up to and including the 15th edition, recommended this
+plainer style for author-date titles, and the 16th edition itself
+suggests the possibility, when needed, of retaining such title
+presentation in combination with its own recommendations for other
+parts of the reference apparatus (15.45).  In practice, the
+differences between the two styles necessitate separate discussions of
+the \textsf{title} field and one extra package option
+(\mycolor{\texttt{headline}}), and that's about it.
+
+\mylittlespace Generally, then, the following documentation covers
+both Chicago author-date styles, and attempts to explain all the parts
+of the specification that might be considered somehow \enquote{non
+  standard,} at least with respect to the styles included with
+\textsf{biblatex} itself.  In the section on entry fields I admit I
 have also duplicated a lot of the information in
 \textsf{biblatex.pdf}, which I hope won't badly annoy expert users of
-the system.  Headings in \mycolor{green} \colmarginpar{\textsf{New in
-    this release}} indicate material new to this release, or
-occasionally old material that has undergone significant revision.
-Numbers in parentheses refer to sections of the \emph{Chicago Manual
-  of Style}, 16th edition.  (As this latest edition now recommends
-\enquote{a uniform treatment for the main elements of citation in both
-  of its systems of documentation} [15.2], many of these references
-will in fact be to the chapter on the notes \&\ bibliography style,
-which chapter is, by design, considerably more detailed than that
-devoted to the author-date style.)  The file \textsf{dates-test.bib}
-contains many examples from the \emph{Manual} which, when processed
-using \textsf{biblatex-chicago-authordate}, should produce the same
-output as you see in the \emph{Manual} itself, or at least compliant
-output, where the specifications are vague or open to interpretation,
-a state of affairs which does sometimes occur.  I have provided
-\textsf{cms-dates-sample.pdf}, which shows how my system processes
-\textsf{dates-test.bib}, and I have also included the reference keys
-from the latter file below in parentheses.
+the system.  As usual, headings in \mycolor{green}
+\colmarginpar{\textsf{New in this release}} indicate material new to
+this release, or occasionally old material that has undergone
+significant revision.  The file \textsf{dates-test.bib} contains many
+examples from the \emph{Manual} which, when processed using
+\textsf{biblatex-chicago-authordate}, should produce the same output
+as you see in the \emph{Manual} itself, or at least compliant output,
+where the specifications are vague or open to interpretation, a state
+of affairs which does sometimes occur.  If you are using
+\mycolor{\textsf{biblatex-chicago-authordate-trad}} the same basically
+holds, but you'd have to keep one eye on the 15th edition of the
+\emph{Manual} (chap.\ 17) for the titles.  I have provided
+\textsf{cms-dates-sample.pdf} and
+\mycolor{\textsf{cms-trad-sample.pdf}}, which show how my system
+processes \textsf{dates-test.bib}, and I have also included the
+reference keys from the latter file below in parentheses.
 
 \subsection{Entry Types}
 \label{sec:types:authdate}
 
 The complete list of entry types currently available in
-\textsf{biblatex-chicago-authordate}, minus the odd \textsf{biblatex}
+\textsf{biblatex-chicago-authordate} and
+\mycolor{\textsf{authordate-trad}}, minus the odd \textsf{biblatex}
 alias, is as follows: \textbf{article}, \textbf{artwork},
 \textbf{audio}, \textbf{book}, \textbf{bookinbook}, \textbf{booklet},
 \textbf{collection}, \textbf{customc}, \textbf{image},
 \textbf{inbook}, \textbf{incollection}, \textbf{inproceedings},
-\textbf{inreference}, \mycolor{\textbf{letter}}, \textbf{manual},
-\mycolor{\textbf{misc}}, \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{inreference}, \textbf{letter}, \textbf{manual}, \textbf{misc},
+\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 \textbf{video}.
@@ -4647,8 +4733,8 @@ very few fields when you use \textsf{biblatex-chicago-authordate}, so
 it seemed to me better to gather information pertaining to fields in
 the next section.
 
-\mybigspace The \colmarginpar{\textbf{article}} \emph{Chicago Manual
-  of Style} (14.170) recognizes three different sorts of periodical
+\mybigspace The \mymarginpar{\textbf{article}} \emph{Chicago Manual of
+  Style} (14.170) recognizes three different sorts of periodical
 publication, \enquote{journals,} \enquote{magazines,} and
 \enquote{newspapers.}  The first (14.172) includes \enquote{scholarly
   or professional periodicals available mainly by subscription,} while
@@ -4689,7 +4775,7 @@ citation style you are using, it is \enquote{usually sufficient to
 date of publication in a parenthetical reference, including any other
 information in the main text (14.206), thereby obviating the need to
 present such an entry in the list of references.  To utilize this
-method in the author-date style, in addition to a \texttt{magazine}
+method in the author-date styles, in addition to a \texttt{magazine}
 \textsf{entrysubtype}, you'll need to place
 \mycolor{\texttt{cmsdate=full}} into the \textsf{options} field,
 including \texttt{skipbib} there as well to stop the entry printing in
@@ -4705,8 +4791,8 @@ plays, performances, etc.) as a sort of recognizable subset of
 \enquote{journals,} \enquote{magazines,} and \enquote{newspapers,}
 distinguished mainly by the way one formats the title of the review
 itself.  With the 16th edition's changes to the way titles are
-presented in the author-date style, users need to learn how to present
-this sort of material, which involves using an entry type
+presented in the \textsf{authordate} style, users need to learn how to
+present this sort of material, which involves using an entry type
 (\textsf{review}) that wasn't necessary in the 15th edition.  The key
 rule is this: if a review has a separate, non-generic title (gibbard;
 osborne:poison) in addition to something that reads like
@@ -4785,7 +4871,7 @@ nyt:trevorobit, unsigned:ranke.)
 \mylittlespace Fourth, in certain fields, just beginning your data
 with a lowercase letter activates the mechanism for capitalizing that
 letter depending on its context within a list of references entry.
-This is less important in the author-date style, where this
+This is less important in the author-date styles, where this
 information only turns up in the reference list and not in citations,
 but you can consult \textbf{\textbackslash autocap} below for all the
 details.  Both the \textsf{titleaddon} and \textsf{note} fields are
@@ -4837,7 +4923,7 @@ entry with the same \textsf{entrysubtype}.  Such comments make
 particular use of the \textsf{eventdate} and of the \textsf{nameaddon}
 fields; please see the documentation of \textbf{review}, below.
 
-\enlargethispage{\baselineskip}
+%\enlargethispage{\baselineskip}
 
 \mylittlespace If you're still with me, allow me to recommend that you
 browse through \textsf{dates-test.bib} to get a feel for just how many
@@ -4889,7 +4975,7 @@ 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 Following \colmarginpar{\textbf{audio}} the request of
+\mybigspace Following \mymarginpar{\textbf{audio}} the request of
 Johan Nordstrom, I have included three entry types, all undefined by
 the standard styles, designed to allow users to present audiovisual
 sources in accordance with the Chicago specifications.  The
@@ -4905,8 +4991,8 @@ though there are likely to be occasions when your choice of entry type
 is not obvious, at the very least \textsf{biblatex-chicago} should
 help you maintain consistency.
 
-\mylittlespace For users of the author-date style, the 16th edition of
-the \emph{Manual} (15.53) \enquote{recommends a more comprehensive
+\mylittlespace For users of the author-date styles, the 16th edition
+of the \emph{Manual} (15.53) \enquote{recommends a more comprehensive
   approach to dating audiovisual materials than in previous editions,}
 meaning that nearly all such entries will have some sort of dating
 information and will therefore fit better stylistically with other
@@ -5004,7 +5090,7 @@ 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 allows you
+\mybigspace This \mymarginpar{\textbf{customc}} entry type 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
@@ -5062,7 +5148,7 @@ just the text of the comment in the \textsf{title} field,
 text and the comment will do the trick, e.g.,
 \cmd{autocites\{chicago:manual\}\{chicago:comment\}}.
 
-\mybigspace This \colmarginpar{\textbf{image}} entry type, left
+\mybigspace This \mymarginpar{\textbf{image}} entry type, left
 undefined in the standard styles, was in previous releases of
 \textsf{biblatex-chicago} intended for referring to photographs, but
 the 16th edition of the \emph{Manual} has changed its specifications
@@ -5145,7 +5231,7 @@ latter was presented as an \textsf{inreference} entry for the notes
 \&\ bibliography style, but because the \textsf{book} entry type can
 also present references to alphabetized headings [see below], at least
 in the list of references, then it seemed better just to choose a
-\textsf{book} entry for the author-date style.)
+\textsf{book} entry for the author-date styles.)
 
 \mylittlespace If you simply cannot make your source fit the template
 for a \textsf{book}, then you may need to use the \textsf{inreference}
@@ -5157,7 +5243,7 @@ keyword \enquote{\texttt{and}} if there is more than one, and
 \textsf{biblatex-chicago-authordate} will provide the appropriate
 prefatory string (\texttt{s.v.}, plural \texttt{s.vv.}), and enclose
 each in its own set of quotation marks (times:guide).  More relevant
-to the author-date style is the fact that the \textsf{postnote} field
+to the author-date styles is the fact that the \textsf{postnote} field
 works the same way in \textsf{inreference} entries, the only
 limitation on this system being that this field, unlike
 \textsf{lista}, is not a list, and therefore for the formatting to
@@ -5193,7 +5279,7 @@ This name will be printed in parentheses after the entry's name
 \mylittlespace All of these rules apply to online reference works, as
 well, for which you need to provide not only a \textsf{url} but also,
 always, a \textsf{urldate}, as these sources are in constant flux
-(wikiped:bibtex, grove:sibelius).  The author-date style will
+(wikiped:bibtex, grove:sibelius).  The author-date styles will
 automatically use this as the identifying date in citations and the
 list of references, assuming a more conventional \textsf{date} isn't
 available.  Please note, however, that the automatic provision of the
@@ -5255,7 +5341,7 @@ entry for such a reference, then you would need to define both
 have put in \textsf{organization}.  (See 14.92; 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},
 I have somewhat extended its applicability, while retaining its
@@ -5350,7 +5436,7 @@ 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 The \colmarginpar{\textbf{music}} 16th edition of the
+\mybigspace The \mymarginpar{\textbf{music}} 16th edition of the
 manual has revised its recommendations more for this type than for any
 other, so the notes which follow present several large changes that
 you'll need to make to your .bib files.  The good news is that some,
@@ -5475,7 +5561,7 @@ section~\ref{sec:authpreset}; auden:reading, beethoven:sonata29,
 bernstein:shostakovich, floyd:atom, holiday:fool, nytrumpet:art,
 rubinstein:chopin.)
 
-\mybigspace The \colmarginpar{\textbf{online}} \emph{Manual}'s
+\mybigspace The \mymarginpar{\textbf{online}} \emph{Manual}'s
 scattered instructions (14.4--13, 14.166--169, 14.184--185, 14.200,
 14.223, 14.243--246, 15.4, 15.9) for citing online materials are
 slightly different from those suggested by standard \textsf{biblatex}.
@@ -5519,7 +5605,7 @@ dates to access dates when documenting online material.  See
 
 %\enlargethispage{\baselineskip}
 
-\mybigspace The \colmarginpar{\textbf{patent}} \emph{Manual} is very
+\mybigspace The \mymarginpar{\textbf{patent}} \emph{Manual} is very
 brief on the subject of patents (15.50), but very clear about which
 information it wants you to present, so such entries may not work well
 with other \textsf{biblatex} styles.  In a change to previous
@@ -5558,7 +5644,7 @@ citing is a \enquote{newspaper} or \enquote{magazine} instead of a
 place for identifying strings like \enquote{special issue,} with its
 initial lowercase letter to activate the automatic capitalization
 routines, though this isn't strictly necessary in the author-date
-style.  (See \emph{Manual} 14.187; good:wholeissue.)
+styles.  (See \emph{Manual} 14.187; good:wholeissue.)
 
 \mybigspace This \mymarginpar{\textbf{reference}} entry type is
 aliased to \textsf{collection} by the standard \textsf{biblatex}
@@ -5589,27 +5675,29 @@ 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.)
 
-\mybigspace The \colmarginpar{\textbf{review}} \textsf{review} entry
+\mybigspace The \mymarginpar{\textbf{review}} \textsf{review} entry
 type wasn't, strictly speaking, necessary for the 15th edition
 author-date specification.  With the major changes to the presentation
 of the title fields in the 16th edition, however, it has now become
-necessary for author-date users to familiarize themselves with it as a
-means of coping with the \emph{Manual}'s complicated requirements for
-citing periodicals of all sorts.  As its name suggests, this entry
-type was designed for reviews published in periodicals, and if you've
-already read the \textsf{article} instructions above --- if you
-haven't, I recommend doing so now --- you'll know that \textsf{review}
-serves as well for citing other sorts of material with generic titles,
-like letters to the editor, obituaries, interviews, online comments
-and the like.  The primary rule is that any piece that has only a
-generic title, like \enquote{review of \ldots,} \enquote{interview
-  with \ldots,} or \enquote{obituary of \ldots,} calls for the
-\textsf{review} type.  Any piece that also has a specific title, e.g.,
-\enquote{\enquote{Lost in \textsc{Bib}\TeX,} an interview with
-  \ldots,} requires an \textsf{article} entry.  (This assumes the text
-is found in a periodical of some sort.  Were it found in a book, then
-the \textsf{incollection} type would serve your needs, and you could
-use \textsf{title} and \textsf{titleaddon} there.  While we're on the
+necessary for \textsf{authordate} users, if not
+\mycolor{\textsf{authordate-trad}} users, to familiarize themselves
+with it as a means of coping with the \emph{Manual}'s complicated
+requirements for citing periodicals of all sorts.  As its name
+suggests, this entry type was designed for reviews published in
+periodicals, and if you've already read the \textsf{article}
+instructions above --- if you haven't, I recommend doing so now ---
+you'll know that \textsf{review} serves as well for citing other sorts
+of material with generic titles, like letters to the editor,
+obituaries, interviews, online comments and the like.  The primary
+rule is that any piece that has only a generic title, like
+\enquote{review of \ldots,} \enquote{interview with \ldots,} or
+\enquote{obituary of \ldots,} calls for the \textsf{review} type.  Any
+piece that also has a specific title, e.g., \enquote{\enquote{Lost in
+    \textsc{Bib}\TeX,} an interview with \ldots,} requires an
+\textsf{article} entry.  (This assumes the text is found in a
+periodical of some sort.  Were it found in a book, then the
+\textsf{incollection} type would serve your needs, and you could use
+\textsf{title} and \textsf{titleaddon} there.  While we're on the
 topic of exceptions, the \emph{Manual} includes an example --- 14.221
 --- where the \enquote{Interview} part of the title is considered a
 subtitle rather than a titleaddon, said part therefore being included
@@ -5642,7 +5730,7 @@ citation style you are using, it is \enquote{usually sufficient to
 date of publication in a parenthetical reference, including any other
 information in the main text (14.206), thereby obviating the need to
 present such an entry in the list of references.  To utilize this
-method in the author-date style, in addition to a \texttt{magazine}
+method in the author-date styles, in addition to a \texttt{magazine}
 \textsf{entrysubtype}, you'll need to place
 \mycolor{\texttt{cmsdate=full}} into the \textsf{options} field,
 including \texttt{skipbib} there as well to stop the entry printing in
@@ -5719,7 +5807,7 @@ depending on the context.  Examples might be \enquote{\texttt{preface
 that unless you use a \cmd{bibstring} command in the \textsf{type}
 field, the resultant entry will not be portable across languages.)
 
-\enlargethispage{-\baselineskip}
+\enlargethispage{\baselineskip}
 
 \mylittlespace The other rules for constructing your .bib entry remain
 the same.  The \textsf{author} field refers to the author of the
@@ -5741,15 +5829,15 @@ function analogous to \textsf{suppbook}.  Indeed, I believe the
 both types of work, so this entry type is an alias to
 \textsf{suppbook}, which see.
 
-\mybigspace This \colmarginpar{\textbf{suppperiodical}} type is
+\mybigspace This \mymarginpar{\textbf{suppperiodical}} type is
 intended to allow reference to generically-titled works in
 periodicals, such as regular columns or letters to the editor.
 \textsf{Biblatex} also provides the \textsf{review} type for this
 purpose, so in both Chicago styles \textsf{suppperiodical} is an alias
-of \textsf{review}.  In the 16th edition of the author-date style, as
-discussed above, the use of this latter entry type has become
-necessary, so please see its documentation for instructions on how to
-construct a .bib entry for such works.
+of \textsf{review}.  In the 16th edition of the \textsf{authordate}
+style, as discussed above, the use of this latter entry type has
+become necessary, so please see its documentation for instructions on
+how to construct a .bib entry for such works.
 
 \mybigspace This \mymarginpar{\textbf{video}} is the last of the three
 audiovisual entry types, and as its name suggests it is intended for
@@ -5884,6 +5972,8 @@ undefined, and \textsf{biblatex-chicago} will do the rest. Cf.\
 \textsf{foreword} and \textsf{introduction}. (See \emph{Manual} 14.91,
 14.116; polakow:afterw.)
 
+\enlargethispage{\baselineskip}
+
 \mybigspace At \mymarginpar{\textbf{annotation}} the request of Emil
 Salim, \textsf{biblatex-chicago} has, as of version 0.9, added a
 package option (see \texttt{annotation} below, section
@@ -5980,6 +6070,8 @@ may be advantageous to provide a (formatted and abbreviated)
 reasonable length, though not at the expense of making it hard to find
 the relevant entries in the reference list.
 
+\enlargethispage{-\baselineskip}
+
 \mylittlespace Recommendations \colmarginpar{New!} concerning
 anonymous authors in other kinds of references have changed somewhat
 in the 16th edition of the \emph{Manual} (15.32), placing greater
@@ -6118,7 +6210,8 @@ find a \textsf{booktitle} in other sorts of entries (e.g.,
 invariably be providing information for the \textsc{Bib}\TeX\
 cross-referencing apparatus (prairie:state), which I discuss below
 (\textbf{crossref}).  The \textsf{booktitle} no longer takes
-sentence-style capitalization in author-date.
+sentence-style capitalization in \textsf{authordate}, though it does
+in \mycolor{\textsf{authordate-trad}}.
 
 %\enlargethispage{\baselineskip}
 
@@ -6213,7 +6306,7 @@ such cross-references, most especially in \textsf{letter},
 state of \textsf{biblatex-chicago}, a bad idea.
 
 \mybigspace Predictably, \colmarginpar{\textbf{date}} this is one of
-the key fields for the author-date style, and one which, as a general
+the key fields for the author-date styles, and one which, as a general
 rule, every .bib entry designed for this system ought to contain.  So
 important is it, that \textsf{biblatex-chicago-authordate} will, in
 most entry types, supply a missing \cmd{bibstring\{nodate\}} if there
@@ -6232,7 +6325,7 @@ year at all will it fall back on \cmd{bibstring\{nodate\}}.  You can
 eliminate some of these dates from the running, or change the search
 order, using the \cmd{DeclareLabelyear} command in your preamble, but
 please be aware that I have hard-coded this order into the author-date
-style in order to cope with some tricky corners of the specification.
+styles in order to cope with some tricky corners of the specification.
 If you reorder these dates, and your references enter these tricky
 corners, the results might be surprising.  (Cf.\ section~4.5.2 in
 \textsf{biblatex.pdf} for the \cmd{DeclareLabelyear} command, and
@@ -6403,6 +6496,8 @@ options often being required, but their presence at least should allow
 maximum flexibility in reference lists that contain a lot of
 \textsf{origdates}.
 
+\enlargethispage{\baselineskip}
+
 \mylittlespace Finally, in the \textsf{misc} entry type this field can
 help to distinguish between two classes of archival material, letters
 and \enquote{letter-like} sources using \textsf{origdate} while others
@@ -6486,7 +6581,7 @@ field, in one of the \textsf{titleaddon} fields, or even in a
 identifying an editor differ in notes and bibliography, one can't
 simply write them out in such a field when using the notes \&\
 bibliography style, but you can certainly do so in the author-date
-style, if you wish.  Using the macros will make your .bib file more
+styles, if you wish.  Using the macros will make your .bib file more
 portable across both Chicago specifications, and also across multiple
 languages, but they are otherwise unnecessary.
 Cf. section~\ref{sec:international}, and also \textsf{namea},
@@ -6677,7 +6772,7 @@ performances (friends:leia, handel:messiah, holiday:fool).
 \mylittlespace In the default configuration of \cmd{DeclareLabelyear},
 dates for citations and for the head of reference list entries are
 searched for in the order \textsf{date, eventdate, origdate, urldate}.
-This suits the Chicago author-date style very well, except for
+This suits the Chicago author-date styles very well, except for
 \textsf{music} and \textsf{video} entries, where the general rule is
 to emphasize the earliest date, whether that be, for example, the
 recording date or original release date (15.53).  For these two entry
@@ -6712,7 +6807,7 @@ from the \textsf{author}.  The \emph{Manual} has nothing to say on the
 subject, but \textsf{biblatex-chicago} prints it (them), in
 parentheses, just after the author(s).
 
-%\enlargethispage{\baselineskip}
+\enlargethispage{\baselineskip}
 
 \mybigspace Standard \mymarginpar{\textbf{howpublished}}
 \textsf{biblatex} field, mainly applicable in the \textsf{booklet}
@@ -6886,8 +6981,10 @@ provide the parentheses (14.246; ellis:blog).
 
 \mybigspace The \colmarginpar{\textbf{maintitle}} main title for a
 multi-volume work, e.g., \enquote{Opera} or \enquote{Collected Works.}
-It no longer takes sentence-style capitalization in author-date.  (See
-donne:var, euripides:\-orestes, harley:cartography, lach:asia,
+It no longer takes sentence-style capitalization in
+\textsf{authordate}, though it does in
+\mycolor{\textsf{authordate-trad}}.  (See donne:var,
+euripides:\-orestes, harley:cartography, lach:asia,
 pelikan:chris\-tian, and plato:re\-public:gr.)
 
 \mybigspace An \mymarginpar{\textbf{maintitleaddon}} annex to the
@@ -7103,29 +7200,29 @@ entries can work; creel:house shows the field in action in a
 instead.)
 
 \mylittlespace Because of the importance of date specifications in the
-author-date style, \textsf{biblatex-chicago-authordate} provides
-options and automated behaviors that allow you to emphasize the
-\textsf{origdate} in citations and at the head of entries in the list
-of references.  In entries which have \emph{only} an \textsf{origdate}
---- usually \textsf{misc} with an \textsf{entrysubtype} ---
-\textsf{Biber} and the default \cmd{DeclareLabelyear} configuration
-now make it possible to do without a \texttt{cmsdate} option, as the
-\textsf{origdate} will automatically appear where and as it should.
-In \textsf{book}-like entries with both a \textsf{date} and an
-\textsf{origdate}, and this has \colmarginpar{New!} changed from the
-15th edition, the 16th edition of the \emph{Manual} recommends that
-you present, in citations and at the head of reference list entries,
-only the \textsf{date} or both dates together.  The latter is
-accomplished using the \texttt{cmsdate} entry option.  In some cases
-it may even be necessary to reverse the two date fields, putting the
-earlier year in \textsf{date} and the later in \textsf{origdate}.
-Please see above under \textbf{date} for all the details on how these
-options interact.
+author-date styles, \textsf{bibla\-tex-chicago-authordate} and
+\mycolor{\textsf{authordate-trad}} provide options and automated
+behaviors that allow you to emphasize the \textsf{origdate} in
+citations and at the head of entries in the list of references.  In
+entries which have \emph{only} an \textsf{origdate} --- usually
+\textsf{misc} with an \textsf{entrysubtype} --- \textsf{Biber} and the
+default \cmd{DeclareLabelyear} configuration now make it possible to
+do without a \texttt{cmsdate} option, as the \textsf{origdate} will
+automatically appear where and as it should.  In \textsf{book}-like
+entries with both a \textsf{date} and an \textsf{origdate}, and this
+has \colmarginpar{New!} changed from the 15th edition, the 16th
+edition of the \emph{Manual} recommends that you present, in citations
+and at the head of reference list entries, only the \textsf{date} or
+both dates together.  The latter is accomplished using the
+\texttt{cmsdate} entry option.  In some cases it may even be necessary
+to reverse the two date fields, putting the earlier year in
+\textsf{date} and the later in \textsf{origdate}.  Please see above
+under \textbf{date} for all the details on how these options interact.
 
 \mylittlespace In the default configuration of \cmd{DeclareLabelyear},
 dates for citations and for the head of reference list entries are
 searched for in the order \textsf{date, eventdate, origdate, urldate}.
-This suits the Chicago author-date style very well, except for
+This suits the Chicago author-date styles very well, except for
 \textsf{music} and \textsf{video} entries, and, exceptionally, some
 \textsf{review} entries.  Here the general rule is to emphasize the
 earliest date.  For these three entry types, then,
@@ -7368,7 +7465,7 @@ be \enquote{Orig.\ pub.\ in.}  Please see the documentation on
 \textsf{userf} below for all the details on how to create .bib entries
 for presenting your data.
 
-\enlargethispage{\baselineskip}
+%\enlargethispage{\baselineskip}
 
 \mybigspace A \mymarginpar{\textbf{series}} standard \textsf{biblatex}
 field, usually just a number in an \textsf{article},
@@ -7567,87 +7664,54 @@ present several reprinted books by the same author.  See
 
 %\enlargethispage{-\baselineskip}
 
-\mybigspace In \colmarginpar{\textbf{title}} the vast majority of
-cases, this field works just as it always has in \textsc{Bib}\TeX, and
-just as it does in \textsf{biblatex}.  In a major change to previous
-editions of the \emph{Manual}, the 16th edition now recommends that
-\textsf{titles} be treated more or less identically across both its
-systems of documentation, whether with respect to headline-style
-capitalization or to the use of italics and quotation marks (15.2,
-15.6, 15.13).  This means that users of the author-date style no
-longer need to worry about sentence-style capitalization when
-compiling their .bib databases, and so can eschew the extra curly
-braces needed to preserve uppercase letters in this context.  The
-other new rules, however, mean that a few new complications, familiar
-to users of the notes \&\ bibliography style, will arise.  First,
-although nearly every entry will have a \textsf{title}, there are some
-exceptions, particularly \textsf{incollection} or \textsf{online}
-entries with a merely generic title, instead of a specific one
-(centinel:letters, powell:email).  Second, the \emph{Manual}'s rules
-for formatting \textsf{titles}, which also hold for
-\textsf{booktitles} and \textsf{maintitles}, require additional
-attention.  The whole point of using a \textsc{Bib}\TeX-based system
-is for it to do the formatting for you, and in most cases
-\textsf{biblatex-chicago-authordate} does just that, surrounding
-titles with quotation marks, italicizing them, or occasionally just
-leaving them alone.  When, however, a title is quoted within a title,
-then you need to know some of the rules.  A summary here should serve
-to clarify them, and help you to understand when
-\textsf{biblatex-chicago-authordate} might need your help in order to
-comply with them.
-
-% \mylittlespace With regard to sentence-style capitalization, the rules
-% of the Chicago author-date style are fairly simple:
-
-% \begin{description}
-% \item[\qquad Headline Style:] \textsf{journaltitle} in all types,
-%   \textsf{series} in all \textsf{book}-like entries (i.e., not in
-%   \textsf{articles}), and \textsf{title} in \textsf{periodical}
-%   entries.
-% \item[\qquad Sentence Style:] Every other \textsf{title},
-%   \emph{except} in \textsf{letter} entries and in \textsf{misc}
-%   entries with an \textsf{entrysubtype}.  Also, the
-%   \textsf{booktitle}, \textsf{issuetitle}, and \textsf{maintitle} in
-%   all entry types.
-% \item[\qquad Contextual Capitalization of First Word:]
-%   \textsf{titleaddon}, \textsf{booktitleaddon},
-%   \textsf{maintitleaddon} in all entry types, and the \textsf{title}
-%   of \textsf{misc} entries with an \textsf{entrysubtype}.
-% \item[\qquad Plain:] \textsf{title} in \textsf{letter} entries.
-% \end{description}
-
-% What this means in practice is that to get a title like \emph{The
-%   Chicago manual of style}, your .bib entry needs to have a field that
-% looks something like this:
-% \begin{quote}
-%   \texttt{title = \{The \{Chicago\} Manual of Style\}}
-% \end{quote}
-
-% This is completely straightforward, but remember that if an
-% \textsf{article} has a title like: Review of \emph{The Chicago manual
-%   of style}, then the curly braces enclosing material to be formatted
-% in italics will cause the capitalization algorithm to stop and leave
-% all of that material as it is, so your .bib entry would need to have a
-% field something like this:
-
-% \begin{quote}
-%   \texttt{title = \{}\cmd{bibstring\{reviewof\}} \cmd{mkbibemph\{The
-%     Chicago manual of style\}\}}
-% \end{quote}
-
-% (As an aside, the use of the \texttt{reviewof} bibstring isn't
-% strictly necessary here, but it helps with portability across
-% languages and across the two Chicago styles.  If you've noticed a lot
-% of lowercase letters starting fields in \textsf{dates-test.bib},
-% they're present because in the notes \&\ bibliography style
-% capitalization is complicated by notes using commas where the
-% bibliography uses periods, and words like \enquote{review} start in
-% uppercase only if the context demands it.  There's considerably less
-% of this in the author-date style [note the \textsf{*titleaddon}
-% fields], but it still pays to be aware of the issue.)
+\mybigspace This \colmarginpar{\textbf{title}} release of
+\textsf{biblatex-chicago} now includes the
+\mycolor{\textsf{authordate-trad}} style, designed as a kind of hybrid
+style according to indications contained in the 16th edition of the
+\emph{Manual} (14.45).  This \mycolor{\textsf{trad}} style differs
+\emph{only} in the way it treats the \textsf{title} and related
+fields, which retain the forms they have traditionally had in the
+Chicago author-date specifications prior to the latest edition.  Where
+the new edition uses headline-style capitalization, the older editions
+used sentence-style; where the new edition places \textsf{article} or
+\textsf{incollection} \textsf{titles} within quotation marks, the
+older editions presented them in plain text.  If you have been using
+the 15th-edition author-date style, then your \textsf{title} fields
+won't need any changes for \mycolor{\textsf{authordate-trad}}, but I
+shall include just below, under a separate rubric, full documentation
+for \mycolor{\textsf{trad}} \textsf{title} fields for those just
+coming to the package.  First, though, I document the same field(s)
+for the standard author-date style.
+
+\mylittlespace In the vast majority of cases, this field works just as
+it always has in \textsc{Bib}\TeX, and just as it does in
+\textsf{biblatex}.  In a major change to previous editions of the
+\emph{Manual}, the 16th edition now recommends that \textsf{titles} be
+treated more or less identically across both its systems of
+documentation (15.2, 15.6, 15.13).  This means that users of the
+author-date style no longer need to worry about sentence-style
+capitalization when compiling their .bib databases, and so can eschew
+the extra curly braces needed to preserve uppercase letters in this
+context.  The other new rules, however, mean that a few new
+complications, familiar to users of the notes \&\ bibliography style,
+will arise.  First, although nearly every entry will have a
+\textsf{title}, there are some exceptions, particularly
+\textsf{incollection} or \textsf{online} entries with a merely generic
+title, instead of a specific one (centinel:letters, powell:email).
+Second, the \emph{Manual}'s rules for formatting \textsf{titles},
+which also hold for \textsf{booktitles} and \textsf{maintitles},
+require additional attention.  The whole point of using a
+\textsc{Bib}\TeX-based system is for it to do the formatting for you,
+and in most cases \textsf{biblatex-chicago-authordate} does just that,
+surrounding titles with quotation marks, italicizing them, or
+occasionally just leaving them alone.  When, however, a title is
+quoted within a title, then you need to know some of the rules.  A
+summary here should serve to clarify them, and help you to understand
+when \textsf{biblatex-chicago-authordate} might need your help in
+order to comply with them.
 
-\mylittlespace The internal rules of \textsf{biblatex-chicago-notes}
-are as follows:
+\mylittlespace The internal rules of
+\textsf{biblatex-chicago-authordate} are as follows:
 
 \begin{description}
 \item[\qquad Italics:] \textsf{booktitle}, \textsf{maintitle}, and
@@ -7717,58 +7781,7 @@ retains them when the surrounding title is quoted or plain (14.104,
 14.177; lewis).  A word or phrase in quotation marks, but that isn't a
 quotation, retains those marks in all title types (kimluu:diethyl).
 
-% \mylittlespace With regard to italics, the rules of
-% \textsf{biblatex-chicago-authordate} are as follows:
-
-% \begin{description}
-% \item[\qquad Italics:] \textsf{booktitle}, \textsf{maintitle}, and
-%   \textsf{journaltitle} in all entry types; \textsf{title} of
-%   \textsf{artwork}, \textsf{book}, \textsf{bookinbook},
-%   \textsf{booklet}, \textsf{collection}, \textsf{inbook},
-%   \textsf{manual}, \textsf{misc} (with no \textsf{entrysubtype}),
-%   \textsf{periodical}, \textsf{proceedings}, \textsf{report},
-%   \textsf{suppbook}, and \textsf{suppcollection} entry types.
-% \item[\qquad Main Text Font (Roman):] \textsf{title} of
-%   \textsf{article}, \textsf{image}, \textsf{incollection},
-%   \textsf{inproceedings}, \textsf{letter}, \textsf{misc} (with an
-%   \textsf{entrysubtype}), \textsf{online}, \textsf{patent},
-%   \textsf{periodical}, \textsf{suppperiodical}, \textsf{thesis}, and
-%   \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.
-% \item[\qquad 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}
-
-% \begin{enumerate}
-% \item Inside an italicized title, all other titles are enclosed in
-%   quotation marks and italicized, so in such cases all you need to do
-%   is provide the quotation marks using \cmd{mkbibquote}, which will
-%   take care of any following punctuation that needs to be brought
-%   within the closing quotation mark(s) (17.58; donne:var,
-%   mchugh:wake).
-% \item Inside a plain-text title, you should present another title as
-%   it would appear if it were on its own, so in such cases you'll need
-%   to do the formatting yourself, using \cmd{mkbibemph} or
-%   \cmd{mkbibquote}.  (See 17.157; barcott:review, garrett, gibbard,
-%   loften:hamlet, loomis:structure, murphy:silent, osborne:poi\-son,
-%   ratliff:review, unsigned:ranke, white:callimachus.)
-% \end{enumerate}
-
-% The \emph{Manual} provides a few more rules, as well.  A word normally
-% italicized in text should also be italicized in a plain-text title,
-% but should be in roman (\enquote{reverse italics}) in an italicized
-% title.  A quotation used as a (whole) title (with or without a
-% subtitle) retains its quotation marks when it is plain, but loses them
-% when it is italicized (17.60, 17.157; lewis).  A word or phrase in
-% quotation marks, but that isn't a quotation, retains those marks in
-% all title types (kimluu:diethyl).
+
 
 \mylittlespace Finally, please note that in all \textsf{review} (and
 \textsf{suppperiodical}) entries, and in \textsf{misc} entries with an
@@ -7781,6 +7794,149 @@ more details.
 
 %\enlargethispage{\baselineskip}
 
+\mybigspace When \colmarginpar{\textbf{title (trad)}} you choose the
+new \mycolor{\textsf{authordate-trad}} style, your \textsf{title} and
+related fields will need extra care, familiar to users of the
+15th-edition author-date style.  The whole point of using a
+\textsc{Bib}\TeX-based system is for it to do the formatting for you,
+and in most cases \mycolor{\textsf{biblatex-chicago-authordate-trad}}
+does just that, capitalizing them sentence-style, italicizing them,
+and sometimes both.  There are two situations that require user
+intervention.  First, in titles that take sentence-style
+capitalization, you need, as always in traditional \textsc{Bib}\TeX,
+to assist the algorithms by placing anything that needs to remain
+capitalized within an extra pair of curly braces.  Second, when a
+title is quoted within a title, you need to know some of the rules of
+the Chicago style.  A summary here should serve to clarify them, and
+help you to understand when
+\mycolor{\textsf{biblatex-chicago-authordate-trad}} might need your
+help in order to comply with them.
+
+\mylittlespace With regard to sentence-style capitalization, the rules
+of the Chicago \textsf{authordate-trad} style are fairly simple:
+
+\begin{description}
+\item[\qquad Headline Style:] \textsf{journaltitle} in all types,
+  \textsf{series} in all \textsf{book}-like entries (i.e., not in
+  \textsf{articles}), and \textsf{title} in \textsf{periodical}
+  entries.
+\item[\qquad Sentence Style:] every other \textsf{title},
+  \emph{except} in \textsf{letter} entries, \textsf{review} entries,
+  and in \textsf{misc} entries with an \textsf{entrysubtype}.  Also,
+  the \textsf{booktitle}, \textsf{issuetitle}, and \textsf{maintitle}
+  in all entry types use sentence style.
+\item[\qquad Contextual Capitalization of First Word:]
+  \textsf{titleaddon}, \textsf{booktitleaddon},
+  \textsf{maintitleaddon} in all entry types, also the \textsf{title}
+  of \textsf{review} entries and of \textsf{misc} entries with an
+  \textsf{entrysubtype}.
+\item[\qquad Plain:] \textsf{title} in \textsf{letter} entries.
+\end{description}
+
+What this means in practice is that to get a title like \emph{The
+  Chicago manual of style}, your .bib entry needs to have a field that
+looks something like this:
+\begin{quote}
+  \texttt{title = \{The \{Chicago\} Manual of Style\}}
+\end{quote}
+
+This is completely straightforward, but remember that if an
+\textsf{article} has a title like: Review of \emph{The Chicago manual
+  of style}, then the curly braces enclosing material to be formatted
+in italics will cause the capitalization algorithm to stop and leave
+all of that material as it is, so your .bib entry would need to have a
+field something like this:
+
+\begin{quote}
+  \texttt{title = \{}\cmd{bibstring\{reviewof\}} \cmd{mkbibemph\{The
+    Chicago manual of style\}\}}
+\end{quote}
+
+(As an aside, the use of the \texttt{reviewof} bibstring isn't
+strictly necessary here, but it helps with portability across
+languages and across the two Chicago styles.  If you've noticed a lot
+of lowercase letters starting fields in \textsf{dates-test.bib},
+they're present because in the notes \&\ bibliography style
+capitalization is complicated by notes using commas where the
+bibliography uses periods, and words like \enquote{review} start in
+uppercase only if the context demands it.  There's considerably less
+of this in the author-date styles [note the \textsf{*titleaddon}
+fields], but it still pays to be aware of the issue.)
+
+\mylittlespace With regard to italics, the rules of
+\textsf{biblatex-chicago-authordate-trad} are as follows:
+
+\begin{description}
+\item[\qquad Italics:] \textsf{booktitle}, \textsf{maintitle}, and
+  \textsf{journaltitle} in all entry types; \textsf{title} of
+  \textsf{artwork}, \textsf{book}, \textsf{bookinbook},
+  \textsf{booklet}, \textsf{collection}, \textsf{inbook},
+  \textsf{manual}, \textsf{misc} (with no \textsf{entrysubtype}),
+  \textsf{periodical}, \textsf{proceedings}, \textsf{report},
+  \textsf{suppbook}, and \textsf{suppcollection} entry types.
+\item[\qquad Main Text Font (Roman):] \textsf{title} of
+  \textsf{article}, \textsf{image}, \textsf{incollection},
+  \textsf{inproceedings}, \textsf{letter}, \textsf{misc} (with an
+  \textsf{entrysubtype}), \textsf{online}, \textsf{patent},
+  \textsf{periodical}, \textsf{review}, \textsf{suppperiodical},
+  \textsf{thesis}, and \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.
+\item[\qquad 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
+to be fairly straightforward, but in cases of doubt you can consult
+section~\ref{sec:types:authdate} above, the examples in
+\textsf{dates-test.bib}, or go to the \emph{Manual} itself,
+8.154--195.  Assuming, then, that you want to present a title within a
+title, and you know what sort of formatting each of the two would, on
+its own, require, then the following rules apply:
+
+\begin{enumerate}
+\item Inside an italicized title, all other titles are enclosed in
+  quotation marks and italicized, so in such cases all you need to do
+  is provide the quotation marks using \cmd{mkbibquote}, which will
+  take care of any following punctuation that needs to be brought
+  within the closing quotation mark(s) (14.102; donne:var,
+  mchugh:wake).
+\item Inside a plain-text title, you should set off other plain-text
+  titles with quotation marks, while italicized titles should appear
+  as they would if they were on their own.  In such cases you'll need
+  to do the formatting yourself, using \cmd{mkbibemph} or
+  \cmd{mkbibquote}.  (See barcott:review, garrett, gibbard,
+  loften:hamlet, loomis:structure, murphy:silent, osborne:poi\-son,
+  ratliff:review, unsigned:ranke, white:callimachus.)
+\end{enumerate}
+
+The \emph{Manual} provides a few more rules, as well.  A word normally
+italicized in text should also be italicized in a plain-text title,
+but should be in roman (\enquote{reverse italics}) in an italicized
+title.  A quotation used as a (whole) title (with or without a
+subtitle) retains its quotation marks when it is plain, but loses them
+when it is italicized, unless it specifically retains them in the
+source (14.104, 14.177; lewis).  A word or phrase in quotation marks,
+but that isn't a quotation, retains those marks in all title types
+(kimluu:diethyl).
+
+\mylittlespace Finally, please note that there is also a preamble
+option --- \mycolor{\texttt{headline}} --- that disables the automatic
+sentence-style capitalization routines in \textsf{authordate-trad}.
+If you set this option, the word case in your title fields will not be
+changed in any way, that is, this doesn't automatically transform your
+titles into headline-style, but rather allows the .bib file to
+determine capitalization.  It works by redefining the command
+\cmd{MakeSentenceCase}, so in the unlikely event you are using the
+latter anywhere in your document please be aware that it will also be
+turned off there.  See section~\ref{sec:authuseropts}, below.
+
 \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,
@@ -7837,7 +7993,7 @@ one of the \textsf{titleaddon} fields (ratliff:review).  (Because the
 strings identifying a translator differ in notes and bibliography, one
 can't simply write them out in such a field when using the notes \&\
 bibliography style, but you can certainly do so in the author-date
-style, if you wish.  Using the macros will make your .bib file more
+styles, if you wish.  Using the macros will make your .bib file more
 portable across both Chicago specifications, and also across multiple
 languages, but they are otherwise unnecessary.  [See
 section~\ref{sec:international}].)
@@ -7851,7 +8007,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
@@ -7911,7 +8067,7 @@ sirosh:visualcortex, wikiped:bibtex).  In the default setting of
 \textsf{urldate} to find a year for citations and the list of
 references (grove:sibelius, wikiped:bibtex).
 
-\enlargethispage{\baselineskip}
+%\enlargethispage{\baselineskip}
 
 \mybigspace A \mymarginpar{\textbf{usera}} supplemental
 \textsf{biblatex} field which functions in \textsf{biblatex-chicago}
@@ -8169,7 +8325,7 @@ 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.
 
-%\enlargethispage{\baselineskip}
+\enlargethispage{-3\baselineskip}
 
 \mybigspace This \mymarginpar{\textbf{\textbackslash mkbibquote}} is
 the standard \textsf{biblatex} command, which requires attention here
@@ -8231,7 +8387,7 @@ the following 6 macros were all designed to help
 the notes \&\ bibliography style differ between notes and
 bibliography, the former sometimes using abbreviated forms when the
 latter prints them in full.  These problems do not arise in the
-author-date style, but using these macros will make your .bib database
+author-date styles, but using these macros will make your .bib database
 more portable across languages and across both Chicago styles, and may
 be slightly easier to remember than the strings themselves.  On the
 other hand, of course, they will make your .bib file less portable
@@ -8287,17 +8443,17 @@ compiler.
 \label{sec:cite:authordate}
 
 The \textsf{biblatex} package is particularly rich in citation
-commands, most of which, in \textsf{biblatex-chicago-authordate},
-function as they do in the standard author-date styles.  If you are
-getting unexpected behavior when using them please have a look in your
-.log file.  A command like \cmd{supercite}, listed in �~3.6.2 of the
-\textsf{biblatex} manual but not defined by
-\textsf{biblatex-chicago-authordate} or by core \textsf{biblatex},
-defaults to \cmd{cite}, and leaves a warning in the .log.  The
-following commands may require some minimal explanation, but if there
-are standard commands that don't work for you, or new commands that
-would be useful, please let me know, and it should be possible to fix
-or add them.
+commands, most of which, in \textsf{biblatex-chicago-authordate} and
+\mycolor{\textsf{authordate-trad}}, function as they do in the
+standard author-date styles.  If you are getting unexpected behavior
+when using them please have a look in your .log file.  A command like
+\cmd{supercite}, listed in �~3.6.2 of the \textsf{biblatex} manual but
+not defined by \textsf{biblatex-chicago-authordate} or by core
+\textsf{biblatex}, defaults to \cmd{cite}, and leaves a warning in the
+.log.  The following commands may require some minimal explanation,
+but if there are standard commands that don't work for you, or new
+commands that would be useful, please let me know, and it should be
+possible to fix or add them.
 
 \mybigspace I \mymarginpar{\textbf{\textbackslash autocite}} haven't
 adapted this in the slightest, but I thought it worth pointing out
@@ -8335,8 +8491,9 @@ you the \textsf{biblatex} defaults unless you redefine them yourself
 inside the square brackets.
 
 \mylittlespace \textsf{Biblatex-chicago-authordate}
-\mymarginpar{\texttt{autocite=\\inline}} places references in
-footnotes by default.
+\mymarginpar{\texttt{autocite=\\inline}} and
+\mycolor{\textsf{authordate-trad}} place references in parentheses by
+default.
 
 \mybigspace The \mymarginpar{\texttt{citetracker=\\true}} citetracker
 for the \cmd{ifciteseen} test is enabled globally.
@@ -8364,10 +8521,10 @@ 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
-specific page, then it's better only to use one citation rather than
-two, as otherwise, in the current state of the code, you'll get empty
-parentheses, like so: ().
+cite command provides a postnote --- from this release of
+\textsf{biblatex-chicago} you'll no longer get any annoying empty
+parentheses, but you will get another standard citation, which may add
+too much clutter.
 
 %\enlargethispage{\baselineskip}
 
@@ -8418,7 +8575,8 @@ which have more than three \textsf{authors}, but which differ
 two such entries have the same \textsf{year} (15.28).  The option is
 \textsf{Biber}-only, like the following, which means that this
 next-generation \textsc{Bib}\TeX\ replacement is required for the
-author-date style.  Please see \textsf{cms-dates-sample.pdf} and
+author-date styles.  Please see \textsf{cms-dates-sample.pdf} (or
+\mycolor{\textsf{cms-trad-sample.pdf}}) and
 section~\ref{sec:otherhints:auth}, below, for further details.
 
 \mylittlespace This \mymarginpar{\texttt{uniquename=\\minfull}}
@@ -8507,7 +8665,7 @@ year to which an alphabetical suffix will be appended when an author
 has published more than one work in the same year.)  In the default
 configuration, a year will be searched for in the order \textsf{date,
   eventdate, origdate, urldate}.  This suits the Chicago author-date
-style very well, except for \textsf{music} and \textsf{video} entries,
+styles very well, except for \textsf{music} and \textsf{video} entries,
 and, exceptionally, some \textsf{review} entries.  Here the general
 rule is to emphasize the earliest date.  For these three entry types,
 then, \cmd{DeclareLabelyear} uses the order \textsf{eventdate,
@@ -8558,12 +8716,20 @@ preamble, for the whole document, or on a per-entry basis in the
 would make sense to eliminate the \textsf{pages} field from the
 affected entries).
 
-\mylittlespace This \mymarginpar{\texttt{doi=true}} option controls
+\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.  In \textsf{online}
-entries, the \textsf{doi} field will always be printed.
+printed in the reference list.  At the request of Daniel Possenriede,
+and keeping in mind the \emph{Manual's} preference for this field
+instead of a \textsf{url} (15.9), I have added a third switch,
+\mycolor{\texttt{only}}, which prints the \textsf{doi} if it is
+present and the \textsf{url} only if there is no \textsf{doi}.  The
+package default remains the same, however --- it defaults to true,
+which will print both \textsf{doi} and \textsf{url} if both are
+present.  The option can be set to \texttt{only} or to \texttt{false}
+either in the preamble, for the whole document, or on a per-entry
+basis in the \textsf{options} field.  In \textsf{online} entries, the
+\textsf{doi} field will always be printed, but the \texttt{only}
+switch will still eliminate any \textsf{url}.
 
 \mylittlespace This \colmarginpar{\texttt{eprint=true}} option controls
 whether any \textsf{eprint} fields present in the .bib file will be
@@ -8723,6 +8889,19 @@ section~\ref{sec:loading:auth}, below.
 
 \enlargethispage{\baselineskip}
 
+\mylittlespace Several \colmarginpar{\texttt{headline}\\\texttt{(trad
+    only)}} users requested an option that turned off the automatic
+transformations that produce sentence-style capitalization in the
+title fields of the 15th-edition author-date style.  I have,
+therefore, also included it in \mycolor{\textsf{authordate-trad}}.  If
+you set this option, the word case in your title fields will not be
+changed in any way, that is, this doesn't automatically transform your
+titles into headline-style, but rather allows the .bib file to
+determine capitalization.  It works by redefining the command
+\cmd{MakeSentenceCase}, so in the unlikely event you are using the
+latter anywhere in your document please be aware that it will also be
+turned off there.
+
 \mylittlespace The \mymarginpar{\texttt{juniorcomma}} \emph{Manual}
 (6.47) states that \enquote{commas are not required around \emph{Jr.}\
   and \emph{Sr.},} so by default \textsf{biblatex-chicago} has
@@ -8878,13 +9057,14 @@ for testing purposes.
 \subsection{General Usage Hints}
 \label{sec:hints:auth}
 
-\subsubsection{Loading the Style}
+\subsubsection{Loading the Styles}
 \label{sec:loading:auth}
 
-With the addition of the author-date style to the package, I have
-provided two keys for choosing which style to load, \texttt{notes} and
-\texttt{authordate}, one of which you put in the options to the
-\cmd{usepackage} command.  With early versions of
+With the addition of the \mycolor{\textsf{authordate-trad}} style to
+the package, there are now three keys for choosing which style to
+load, \texttt{notes}, \texttt{authordate}, and
+\mycolor{\textsf{authordate-trad}}, one of which you put in the
+options to the \cmd{usepackage} command.  With early versions of
 \textsf{biblatex-chicago}, the standard way of loading the package was
 via a call to \textsf{biblatex}, e.g.:
 \begin{quote}
@@ -8919,12 +9099,12 @@ then you may want to revert to the old style of invocation above.
 You'll lose all the definitions in \textsf{biblatex-chicago.sty},
 including those to which I've already alluded and also the code that
 sets the note number in-line rather than superscript in endnotes or
-footnotes.  Also in this file is the code that calls
-\textsf{cms-american.lbx}, which means that you'll lose all the
+footnotes.  Also in this file is the code that calls all of the
+package's localization files, which means that you'll lose all the
 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.9.1 and 4.11.7 in Lehman's \textsf{biblatex.pdf}.
+preamble, a \cmd{DeclareLanguageMapping} command, or several, adapted
+for your setup, on which see section~\ref{sec:international} below and
+also ��~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
@@ -9005,7 +9185,7 @@ 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}
+\enlargethispage{\baselineskip}
 
 \mylittlespace Scot Becker has pointed out to me that the inverse
 problem not only exists but may well become increasingly common, to
@@ -9027,29 +9207,39 @@ in \textsf{biblatex.pdf}, to wit, if you aren't going to use
 \textsc{Bib}\TeX, and avoid the cryptic errors that ensue when your
 .bib file gets to a certain size.
 
-\section{Internationalization}
+\section{\mycolor{Internationalization}}
 \label{sec:international}
 
 Several users have requested that, in line with analogous provisions
 in other \enquote{American} \textsf{biblatex} styles (e.g.,
 \textsf{biblatex-apa} and \textsf{biblatex-mla}), I include facilities
 for producing a Chicago-like style in other languages.  I have
-supplied three new lbx files, \textsf{cms-german.lbx}, its clone
+supplied three lbx files, \textsf{cms-german.lbx}, its clone
 \textsf{cms-ngerman.lbx}, and \textsf{cms-french.lbx}, in at least
-partial fulfillment of this request.  This means that all of the
+partial fulfillment of this request.  For this release, Baldur
+Kristinsson has very kindly provided
+\mycolor{\textsf{cms-icelandic.lbx}} for speakers of that language,
+while H�kon Malmedal has equally kindly provided
+\mycolor{\textsf{cms-norsk.lbx}},
+\mycolor{\textsf{cms-norwegian.lbx}}, and
+\mycolor{\textsf{cms-nynorsk.lbx}}.  I have added
+\mycolor{\textsf{cms-british.lbx}} in order to simplify and to improve
+the package's handling of non-American typographical conventions in
+English.  This means that all --- or at least most --- of the
 Chicago-specific bibstrings are now available for documents and
-reference apparatuses written in French and German, with, as I intend,
+reference apparatuses written in these languages, with, as I intend,
 more languages to follow, limited mainly by my finite time and
 even-more-finite competence.  (If you would like to provide bibstrings
 for a language in which you want to work, or indeed correct
-deficiencies in the lbx files I have prepared, please contact me.)
-
-\mylittlespace Using \mymarginpar{\textbf{babel}} these new facilities
-is fairly simple.  By default, and this functionality remains the same
-as it was in the previous release of \textsf{biblatex-chicago}, calls
-to \cmd{DeclareLanguage\-Mapping} in \textsf{biblatex-chicago.sty}
-will automatically load the American strings, and also
-\textsf{biblatex's} American-style punctuation tracking, when you:
+deficiencies in the lbx files contained in the package, please contact
+me.)
+
+\mylittlespace Using \mymarginpar{\textbf{babel}} these facilities is
+fairly simple.  By default, and this functionality remains the same as
+it was in the previous release of \textsf{biblatex-chicago}, calls to
+\cmd{DeclareLanguage\-Mapping} in \textsf{biblatex-chicago.sty} will
+automatically load the American strings, and also \textsf{biblatex's}
+American-style punctuation tracking, when you:
 \begin{enumerate}
 \item Load \textsf{babel} with \texttt{american} as the main text
   language.
@@ -9063,28 +9253,22 @@ will automatically load the American strings, and also
 an American citation style, to expect this arrangement to work well
 for the majority of users.)
 
-\mylittlespace If, for whatever reason, you wanted to use
-\textsf{biblatex-chicago} but retain British typographical conventions
---- punctuation outside of quotation marks, outer quotes single rather
-than double, etc.\ --- then one possible solution at least would be to
-follow these three steps:
-\begin{enumerate}
-\item Load \textsf{babel} with the \texttt{british} option.
-\item Put \cmd{DeclareLanguageMapping\{british\}\{cms-american\}} in
-  your preamble.
-\item Edit \textsf{cms-american.lbx} so that the line reading:\\
-  \cmd{InheritBibliographyExtras\{american\}}\\ instead reads:\\
-  \cmd{InheritBibliographyExtras\{british\}}.
-\end{enumerate}
-
-If you want to use French or German strings in the reference
-apparatus, then you can load \textsf{babel} with \texttt{german} or
-\texttt{french} as the main document language.  You no longer need
-\cmd{DeclareLanguageMapping\{german\}\{cms-german\}} or
-\cmd{Declare\-LanguageMapping\{french\}\{cms-french\}} in your
-document preamble, since \textsf{bib\-latex-chicago.sty} now
-automatically provides this if you load the package in the standard
-way.
+\mylittlespace If, \colmarginpar{New!} for whatever reason, you wanted
+to use \textsf{biblatex-chicago} but retain British typographical
+conventions --- punctuation outside of quotation marks, outer quotes
+single rather than double, etc.\ --- then you no longer need to follow
+the complicated rules outlined in previous releases of
+\textsf{biblatex-chicago}.  Instead, simply load \textsf{babel} with
+the \texttt{british} option.
+
+\mylittlespace If you want to use French, German, Icelandic, or
+Norwegian strings in the reference apparatus, then you can load
+\textsf{babel} with \texttt{french}, \texttt{german},
+\texttt{icelandic}, \texttt{ngerman}, \texttt{norsk}, or
+\texttt{nynorsk} as the main document language.  You no longer need
+any calls to \cmd{DeclareLanguageMapping} in your document preamble,
+since \textsf{bib\-latex-chicago.sty} now automatically provides these
+if you load the package in the standard way.
 
 \mylittlespace You can also define which bibstrings to use on an
 entry-by-entry basis by using the \textsf{hyphenation} field in your
@@ -9098,11 +9282,12 @@ preamble, as \textsf{biblatex-chicago.sty} won't load it for you.
 
 \mylittlespace Three other hints may be in order here.  Please note,
 first, that I haven't altered the standard punctuation procedures used
-in German or French, so commas and full stops will appear outside of
-quotation marks, and those quotation marks themselves will be
-language-specific.  If, for whatever reason, you wish to follow the
-Chicago specification and move punctuation inside quotation marks,
-then you'll need a declaration of this sort in your preamble:
+in any of the other available languages, so commas and full stops will
+appear outside of quotation marks, and those quotation marks
+themselves will be language-specific.  If, for whatever reason, you
+wish to follow the Chicago specification and move punctuation inside
+quotation marks, then you'll need a declaration of this sort in your
+preamble:
 
 \begin{quote}
   \cmd{DefineBibliographyExtras\{german\}\{\%}\\
@@ -9130,9 +9315,11 @@ esp.\ s.v.\ \enquote{\cmd{partedit}.}
 \mylittlespace Finally, the French and German bibstrings I have
 provided may well break with established bibliographical traditions in
 those languages, but my main concern when choosing them was to remain
-as close as possible to the quirks of the Chicago specification.  If
-you have strong objections to any of the strings, or indeed to any of
-my formatting decisions, please let me know.
+as close as possible to the quirks of the Chicago specification.  I
+have entirely relied on the judgment of the creators of the Icelandic
+and Norwegian localizations in those instances.  If you have strong
+objections to any of the strings, or indeed to any of my formatting
+decisions, please let me know.
 
 \section{One .bib Database, Two Chicago Styles}
 \label{sec:twostyles}
@@ -9157,11 +9344,15 @@ This is, I believe, the simpler conversion, as most well-constructed
 nonetheless:
 
 \begin{enumerate}
-\item \textbf{NB: The formatting of titles in the two styles is now
-    the same, which means you no longer need to worry about extra
-    curly brackets and their affects on capitalization.}
+\item \mycolor{\textbf{NB:}} Unless you are using
+  \mycolor{\textsf{authordate-trad}}, the formatting of titles in the
+  two styles is now the same, which means you would no longer need to
+  worry about extra curly brackets and their affects on
+  capitalization.  If you are using \textsf{authordate-trad}, please
+  see the caveats in the documentation of the \textsf{title} field in
+  section~\ref{sec:fields:authdate}, above.
 \item You may need to reevaluate your use of shorthands, given that by
-  default the author-date style uses them in place of authors rather
+  default the author-date styles use them in place of authors rather
   than in place of the whole citation.  The preamble option
   \textsf{cmslos=false} may help, but this may leave your document
   out-of-spec.
@@ -9265,14 +9456,16 @@ package.
 \section{TODO \&\ Known Bugs}
 \label{sec:bugs}
 
-This release now, belatedly, implements the 16th edition of the
-\emph{Chicago Manual of Style}.  The next release will also contain a
-version of the author-date style with traditional title formatting
-alongside the current code which unifies the treatment of titles
-across the two styles.  I hope that, in time, users will migrate to
-the most recent specification, so that I can focus my development
-there.  If you still have feature requests for the older
-specification, I'll do what I can to include them.
+This release implements the 16th edition of the \emph{Chicago Manual
+  of Style}.  It now also contains a version of the author-date style
+(\mycolor{\textsf{authordate-trad}}) with traditional title
+formatting, alongside the \textsf{authordate} code which unifies the
+treatment of titles between itself and the notes \&\ bibliography
+style.  I hope that users will migrate to one of these styles
+implementing the most recent specification, so that I can focus my
+development and testing there.  For the moment, I shall call the
+15th-edition styles \enquote{mildly deprecated,} but if you still have
+urgent feature requests for them, I'll do what I can.
 
 \mylittlespace Regardless of which edition you are considering, there
 are a number of things I haven't implemented.  The solution in
@@ -9297,14 +9490,6 @@ 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 I am very grateful to Baldur Kristinsson for sending a
-Chicago-specific Icelandic localization file
-(\textsf{cms-icelandic.lbx}).  This requires the file
-\textsf{icelandic.lbx}, which will be part of version 2.0 of
-\textsf{biblatex}.  I shall incorporate the localization in the next
-release, when I expect the newest \textsf{biblatex} will have
-appeared.
-
 \mylittlespace Kenneth L. Pearce has reported a bug that appears when
 using multiple citation commands inside the \textsf{annotation} field
 of annotated bibliographies.  As late as I am with the file for the
@@ -9342,6 +9527,15 @@ above, but it's possible the package may need some changes to cope
 with all the permutations.  Please let me know if you find something
 that looks like a bug.
 
+\mylittlespace Roger Hart, Pierric Sans, and a number of other users
+have reported a bug in the formatting of title fields.  This, as far
+as I can tell, has to do with the interaction between
+\cmd{MakeSentenceCase} and certain characters at the start of the
+title, particularly Unicode ones.  If you are using
+\mycolor{\textsf{authordate-trad}}, it may help for the moment to put
+an empty set of curly braces \{\}\ at the start of the field, but I
+shall look into this further.
+
 \mylittlespace Recent versions of \textsf{biblatex} have introduced
 some new entry types for citing multi-volume works.  These are largely
 aimed at those already using \textsf{Biber}, which provides
@@ -9359,7 +9553,7 @@ provide this in the next release.  He has also requested, despite the
 \texttt{Idem} and \texttt{Ibid.}\ in notes.  I shall look into this
 for the next release.
 
-\enlargethispage{-5\baselineskip}
+\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
@@ -9383,7 +9577,65 @@ code for it, let me know, and I'll look into it.
 \section{Revision History}
 \label{sec:history}
 
-\textbf{0.9.9a: Released \today}
+\textbf{0.9.9b: Released \today}
+\begin{itemize}
+\item This \label{deprec:obsol} release contains a new variant of the
+  author-date style, available as the
+  \mycolor{\texttt{authordate-trad}} option when loading
+  \textsf{biblatex-chicago}.  This provides the traditional, plain,
+  pre-16th-edition Chicago title handling --- sentence-style
+  capitalization, absence of quotation marks in \textsf{article}
+  titles and the like --- but in all other respects follows the
+  16th-edition specification, as suggested by the \emph{Manual}
+  (15.45).  Remember that the \texttt{headline} package option can be
+  used to turn off the automatic sentence-style capitalization,
+  meaning that titles will appear as presented in the .bib file, at
+  least as far as capitalization is concerned.  Please see especially
+  the documentation of \textsf{\textbf{title}} in
+  section~\ref{sec:fields:authdate}, above, for the details.
+\item I have updated calls to \cmd{DeclareLabelname} and
+  \cmd{DeclareLabelyear} in several .cbx files so that the package
+  works correctly with the most recent version (2.4) of
+  \textsf{biblatex}.
+\item Following a request by Norman Gray, I have included a
+  \cmd{textcite} (and a \cmd{textcites}) command in the notes \&\
+  bibliography style for the first time.  Please see
+  section~\ref{sec:citecommands}, above, for the details.
+\item Following a request by Daniel Possenriede, I have added in all
+  three 16th-edition styles a new switch, \mycolor{\texttt{only}}, to
+  the \texttt{doi} option, which prints the \textsf{doi} when present
+  and the \textsf{url} only when there is no \textsf{doi}.  The
+  package default remains, however, \texttt{true}.
+\item I am grateful to Baldur Kristinsson for providing an Icelandic
+  localization file for \textsf{biblatex-chicago}, called
+  \mycolor{\textsf{cms-icelandic.lbx}}.  You'll see if you look
+  through it that it is still something of a work in progress, but it
+  should cover most needs in that language very well.  If you would
+  like to fill in some of the gaps please let me know.
+\item I am also grateful to H�kon Malmedal for providing Norwegian
+  localizations for \textsf{biblatex-chicago}, contained in the files
+  \mycolor{\textsf{cms-norsk.lbx}},
+  \mycolor{\textsf{cms-norwe\-gian.lbx}}, and
+  \mycolor{\textsf{cms-nynorsk.lbx}}.
+\item I have added a new British localization
+  (\mycolor{\textsf{cms-british.lbx}}) that should make it much
+  simpler for users to produce documents adhering to that tradition.
+  For further details on the usage of all these localizations please
+  see section~\ref{sec:international}, above.
+\item Several users have reported a bug that resulted in doubled
+  bibstrings in certain contexts.  This happened only when using
+  localizations for which \textsf{biblatex-chicago} didn't have
+  explicit support, and it should now be fixed.
+\item I have changed the way the 16th-edition author-date styles
+  handle the \emph{Ibidem} mechanism.  In the absence of a
+  \textsf{postnote} field you no longer get empty parentheses, but
+  rather a standard in-text citation.  If you do have a
+  \textsf{postnote} field, then only that will appear.
+\end{itemize}
+
+\enlargethispage{-2\baselineskip}
+
+\textbf{0.9.9a: Released July 30, 2012}
 \begin{itemize}
 \item I have made a few changes to \textsf{biblatex-chicago.sty} to
   allow the package to work with the latest version (2.0) of
@@ -9395,8 +9647,8 @@ code for it, let me know, and I'll look into it.
 
 \textbf{0.9.9: Released July 5, 2012}
 
-\mylittlespace \label{deprec:obsol} Converting 15th-Edition .bib Files
-to Use the 16th Edition:
+\mylittlespace Converting 15th-Edition .bib Files to Use the 16th
+Edition:
 
 \mylittlespace \textbf{Notes and Bibliography Style}
 
@@ -9432,7 +9684,7 @@ to Use the 16th Edition:
 \item In \textbf{suppbook} entries, the \emph{Manual} now requires you
   to provide the page range (in the \textsf{pages} field) for the
   specific part you are citing, e.g., an introduction, foreword, or
-  afterword.
+  afterword.\enlargethispage{-2\baselineskip}
 \item In \textbf{patent} entries, the \emph{Manual} now prefers
   sentence-style capitalization for titles, which you'll need to
   provide yourself by hand.
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.pdf
index 0c1af80fdfd..c468b340aea 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.tex
index 7cf79353965..8e4ece31ecd 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago15.tex
@@ -56,7 +56,7 @@
   15th-edition style files for biblatex
 
 \vspace{.3\baselineskip}
-\sffamily\normalsize\bfseries David Fussner\qquad Version 0.9.9a (beta) \\
+\sffamily\normalsize\bfseries David Fussner\qquad Version 0.9.9b (beta) \\
 \href{mailto:djf027@googlemail.com}{djf027@googlemail.com}\\ \today
 
 \end{center} 
@@ -73,31 +73,30 @@
 \textbf{This file documents the \textsf{biblatex} style files
   implementing the 15th edition of \emph{The Chicago Manual of Style}.
   This edition has been superseded by the 16th edition, documented in
-  \textsf{biblatex-chicago.pdf}.  There will no doubt be many users,
+  \textsf{biblatex-chicago.pdf}.  There may still be some users,
   however, who wish to continue using the 15th-edition styles, so I
-  shall, at least for the moment, carry on maintaining them.  Reasons
-  to continue using these files may include, but are not limited to:
-  \begin{itemize}
-  \item A desire not to interrupt a work-in-progress.
-  \item A desire, sanctioned by the 16th edition itself, to continue
-    using an author-date style with the traditional sentence-style
-    capitalization (and absence of quotation marks) in titles.
-  \end{itemize}
-  I have not backported all improvements to the notes \&\ bibliography
-  style, as the 16th-edition specification represents in itself an
-  incremental upgrade which I encourage users of this style to adopt
-  in their own time.  The author-date style is more complicated.  I
-  have backported as many improvements as I can, and documented them
-  here, but it still isn't an implementation of the 16th-edition style
-  with 15th-edition title formatting, as envisaged by the 16th edition
-  itself.  I intend to move the style in that direction in the future,
-  however, its current state, then, representing something of a
-  compromise aimed at creating the least disturbance for current users
-  in the middle of significant projects.  \mylittlespace \\ The
-  package remains beta software.  If it seems like it 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.}
+  shall, at least for the moment, carry on maintaining them, though I
+  am marking them as \enquote{mildly deprecated.}  The main reason to
+  continue using these files is perhaps a desire not to interrupt a
+  work-in-progress.  If you wish to use an author-date style with the
+  traditional sentence-style capitalization (and absence of quotation
+  marks) in titles, the new \mycolor{\textsf{authordate-trad}} style
+  provides this while in all other respects adhering to the
+  16th-edition specification.\mylittlespace \\ I have not backported
+  all improvements to the notes \&\ bibliography style, as the
+  16th-edition specification represents in itself an incremental
+  upgrade which I encourage users of this style to adopt in their own
+  time.  The author-date style is more complicated.  I have backported
+  as many improvements as I can, and documented them here, but it
+  still isn't an implementation of the 16th-edition style with
+  15th-edition title formatting, as provided by
+  \mycolor{\textsf{authordate-trad}}.  I encourage all author-date
+  users, therefore, to adopt one of the newer styles in their own
+  time.  \mylittlespace \\ The package remains beta software.  If it
+  seems like it 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
@@ -144,7 +143,7 @@ release.
 
 \begin{itemize}{}{}
 \item Philipp Lehman's \textsf{biblatex} package, of course!  You
-  should use the latest version(s) --- 1.7 or 2.0 --- as those
+  should use the latest version(s) --- 1.7 or 2.4 --- as those
   versions have been tested more thoroughly than any other, meaning
   that these style files may well not function properly with some
   earlier iterations of \textsf{biblatex}. Lehman's tools require
@@ -169,8 +168,8 @@ release.
     following:
   \item \textsf{Biber} --- the next-generation \textsc{Bib}\TeX\
     replacement, called \textsf{Biber}, which is available from
-    SourceForge.  You should use the latest version, 1.0, to work with
-    \textsf{biblatex} 2.0, or 0.9.9 with \textsf{biblatex} 1.7, and it
+    SourceForge.  You should use the latest version, 1.4, to work with
+    \textsf{biblatex} 2.4, or 0.9.9 with \textsf{biblatex} 1.7, and it
     is required for users who are either using the author-date style
     or processing a .bib file in Unicode.  See
     \textsf{cms-dates-sample.pdf} for more details.
@@ -319,13 +318,15 @@ 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, and I've borrowed ideas
 for the \texttt{shorthandibid} option from Dominik Wa�enhoven's
-\textsf{biblatex-dw} package.  Kazuo Teramoto and Gildas Hamel both
-sent patches to improve the package, and 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 with their help and advice during the development of this
-package, and have both continued indefatigably to test it and suggest
-needed improvements.  They were particularly instrumental in
+\textsf{biblatex-dw} package.  I am very grateful to Baldur
+Kristinsson for providing the Icelandic localization, and to H�kon
+Malmedal for the Norwegian localizations.  Kazuo Teramoto and Gildas
+Hamel both sent patches to improve the package, and 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 with their help and advice during the development
+of this package, and have both continued indefatigably to test it and
+suggest needed improvements.  They were particularly instrumental in
 encouraging the greatest possible degree of compatibility with other
 \textsf{biblatex} styles.  Indeed, if the task of adapting .bib files
 for use with the Chicago style seems onerous now, you should have
@@ -451,6 +452,8 @@ affairs which does sometimes occur.  I have provided
 \textsf{notes-test.bib}, and I have also included the reference keys
 from the latter file below in parentheses.
 
+%\enlargethispage{\baselineskip}
+
 \subsection{Entry Types}
 \label{sec:entrytypes}
 
@@ -589,7 +592,7 @@ than by \textsf{title}.  The provision of a \textsf{shortauthor} field
 is no longer necessary, as in its absence the package automatically
 takes it from \textsf{journaltitle}.  (See lakeforester:pushcarts.)
 
-%\enlargethispage{-\baselineskip}
+\enlargethispage{\baselineskip}
 
 \mylittlespace Fourth, if you've been using
 \textsf{biblatex-chicago-notes} for a while, you may remember using
@@ -641,7 +644,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
@@ -724,7 +727,7 @@ elsewhere these sorts of material are presented as \textsf{music} and
 sorts of publication facts you wish to present --- cf.\ \emph{Manual}
 17.269.
 
-%\enlargethispage{-\baselineskip}
+%\enlargethispage{\baselineskip}
 
 \mylittlespace Once you've accepted the analogy of composer to
 \textsf{author}, constructing an \textsf{audio} entry should be fairly
@@ -1127,7 +1130,7 @@ automatic capitalization mechanism in the \textsf{title} field of
 below.  (See 17.205-206, 17.220, 17.222-232; creel:house,
 dinkel:agassiz, spock:interview.)
 
-\enlargethispage{-\baselineskip}
+\enlargethispage{\baselineskip}
 
 \mylittlespace As in \textsf{letter} entries, the titles of
 unpublished letters are of the form \texttt{Author to Recipient}, and
@@ -1261,6 +1264,8 @@ to why I'm wrong will, of course, be entertained.  (Cf. 17.268;
 auden:reading, beethoven:sonata29, bernstein:shostakovich,
 nytrumpet:art:15.)
 
+\enlargethispage{\baselineskip}
+
 \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
@@ -1291,8 +1296,6 @@ 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}
-
 \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
@@ -1802,7 +1805,7 @@ ordinarily only be capitalized at the beginning of a sentence, then
 simply ensure that that word is in lowercase, and
 \textsf{biblatex-chicago-notes} will automatically do the right thing.
 
-\enlargethispage{-\baselineskip}
+%\enlargethispage{-\baselineskip}
 
 \mybigspace This \mymarginpar{\textbf{chapter}} field holds the
 chapter number, mainly useful only in an \textsf{inbook} or an
@@ -1882,7 +1885,7 @@ entry type, if you don't use \textsf{collection} or
 name, so there may be corner cases where careful choice of the parent
 entry type gets you what you want.
 
-% \enlargethispage{\baselineskip}
+%\enlargethispage{-\baselineskip}
 
 \mylittlespace A published collection of letters requires a somewhat
 different treatment (17.78).  If you cite more than one letter from
@@ -1962,6 +1965,8 @@ making the conversion, though I'm retaining the right to revoke this
 if the code in question demonstrably interferes with the functioning
 of the notes \&\ bibliography style.)
 
+\enlargethispage{\baselineskip}
+
 \mybigspace This \mymarginpar{\textbf{day}} field, as of
 \textsf{biblatex} 0.9, is obsolete, and will be ignored if you use it
 in your .bib files.  Use \textsf{date} instead.
@@ -2039,7 +2044,7 @@ performers.  To specify the role, use the fields \textsf{editoratype},
 \textsf{editorbtype}, and \textsf{editorctype}, which see.  (Cf.\
 bernstein:shostakovich, handel:messiah.)
 
-%\enlargethispage{-\baselineskip}
+%\enlargethispage{\baselineskip}
 
 \mybigspace Normally, \mymarginpar{\textbf{editortype}} with the
 exception of the \textsf{article} and \textsf{review} types,
@@ -2138,6 +2143,8 @@ to put the exact string \texttt{magazine} into the
 types of source, whereas if your source is a \enquote{journal,} then
 you need do nothing.
 
+\enlargethispage{\baselineskip}
+
 \mylittlespace The second use involves references to works from
 classical antiquity and, according to the \emph{Manual}, from the
 Middle Ages, as well.  When you cite such a work using the traditional
@@ -2198,7 +2205,7 @@ from the \textsf{author}.  The \emph{Manual} has nothing to say on the
 subject, but \textsf{biblatex-chicago-notes} prints it (them), in
 parentheses, just after the author(s).
 
-%\enlargethispage{\baselineskip}
+\enlargethispage{\baselineskip}
 
 \mybigspace Standard \mymarginpar{\textbf{howpublished}}
 \textsf{biblatex} field, mainly applicable in the \textsf{booklet}
@@ -2271,7 +2278,7 @@ the author.  See above (section~\ref{sec:entrytypes}) under
 nyt:trevorobit entries in \textsf{notes-test.bib} will give you some
 idea of how this works.
 
-\enlargethispage{\baselineskip}
+%\enlargethispage{\baselineskip}
 
 \mybigspace This \mymarginpar{\textbf{keywords}} field is
 \textsf{biblatex}'s extremely powerful and flexible technique for
@@ -2361,7 +2368,7 @@ cases this isn't strictly necessary (17.32--34; virginia:plantation).
 For all cities, you should use the common English version of the name,
 if such exists (17.101).
 
-\enlargethispage{-\baselineskip}
+%\enlargethispage{-\baselineskip}
 
 \mylittlespace Two more details need explanation here.  In
 \textsf{article}, \textsf{periodical}, and \textsf{review} entries,
@@ -2891,6 +2898,8 @@ most situations, but if you have set \texttt{useauthor=false} (and not
 only \textsf{shorteditor} will be recognized.  Cf.\
 \textsf{editortype}, above.
 
+%\enlargethispage{\baselineskip}
+
 \mybigspace This \mymarginpar{\textbf{shorthand}} is
 \textsf{biblatex}'s mechanism for using abbreviations in place of the
 usual short note form, and I've left it effectively unmodified in
@@ -2941,8 +2950,6 @@ with a lowercase letter the style will do the right thing
 (barcott:review, bundy:macneil, Clemens:letter, kozinn:review,
 ratliff:review, unsigned:ranke:15).
 
-%\enlargethispage{\baselineskip}
-
 \mybigspace A \mymarginpar{\textbf{sortkey}} standard
 \textsf{biblatex} field, designed to allow you to specify how you want
 an entry alphabetized in a bibliography.  In general, if an entry
@@ -3039,6 +3046,8 @@ its own, require, then the following rules apply:
   osborne:poison, ratliff:review, unsigned:ranke:15).
 \end{enumerate}
 
+\enlargethispage{-2\baselineskip}
+
 The \emph{Manual} provides a few more rules, as well.  A word normally
 italicized in text should also be italicized in a quoted or plain-text
 title, but should be in roman (\enquote{reverse italics}) in an
@@ -3079,8 +3088,6 @@ 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
@@ -3346,6 +3353,8 @@ you toward a few such entries in what follows.  \textbf{NB:}
 \textsf{biblatex's} \cmd{mkbibquote} command is now mandatory in some
 situations.  See its entry below.
 
+\enlargethispage{\baselineskip}
+
 \mybigspace Version \mymarginpar{\textbf{\textbackslash autocap}} 0.8
 of \textsf{biblatex} introduced the \cmd{autocap} command, which
 capitalizes a word inside a note or bibliography entry if that word
@@ -3473,7 +3482,7 @@ instead of \cmd{enquote} or the usual \LaTeX\ mechanisms inside their
 .bib files.  For further details, please see the \cmd{mkbibquote}
 entry below.
 
-\enlargethispage{-\baselineskip}
+%\enlargethispage{-\baselineskip}
 
 \mylittlespace I have retained the code for the \cmd{custpunct}
 commands in \textsf{chicago-notes.cbx}, in case a particularly gnarly
@@ -3594,7 +3603,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
@@ -3741,8 +3750,6 @@ only the most flexible form of the command, you'll have to wrap it in
 a \cmd{footnote} yourself.  Please see the next entry for further
 discussion of some of the needs this command might help address.
 
-%\enlargethispage{-\baselineskip}
-
 \mybigspace I \mymarginpar{\textbf{\textbackslash
     headless-\\fullcite}} have provided this command in case you want
 to print a full citation without the author's name.  The \emph{Manual}
@@ -3763,6 +3770,8 @@ want something else.  Again, I've provided only the most flexible form
 of the command, so you'll have to wrap it in a \cmd{footnote}
 manually.
 
+\enlargethispage{\baselineskip}
+
 \mylittlespace If you look at \textsf{chicago-notes.cbx}, you'll see a
 number of other citation commands, but those are intended for internal
 use only, mainly in cross-references of various sorts.  Use at your
@@ -3813,6 +3822,8 @@ command to disable this functionality in any given reference, or
 indeed one of the \texttt{fullcite} commands if you need the long note
 form for any reason.
 
+%\enlargethispage{\baselineskip}
+
 \mylittlespace This \marginpar{\texttt{loccittracker\\=constrict}}
 allows the package to determine whether two consecutive citations of
 the same source also cite the same page of that source.  In such a
@@ -4028,7 +4039,7 @@ form.  For more fine-grained control of individual citations you'll
 probably want to use specialized citation commands, instead.  See
 section \ref{sec:citecommands}.
 
-\enlargethispage{\baselineskip}
+%\enlargethispage{\baselineskip}
 
 \mylittlespace This \mymarginpar{\texttt{short}} option means that
 your text will only use the short note form, even in the first
@@ -4634,6 +4645,8 @@ a clone of \textsf{artwork}, so you should consult the latter's
 documentation above to see how to construct your .bib entry.  (See
 \emph{Manual} 12.33; bedford:photo.)
 
+\enlargethispage{\baselineskip}
+
 \mybigspace These \mymarginpar{\textbf{inbook}\\\textbf{incollection}}
 two standard \textsf{biblatex} types have very nearly identical
 formatting requirements as far as the Chicago specification is
@@ -5299,6 +5312,8 @@ undefined, and \textsf{biblatex-chicago} will do the rest. Cf.\
 \textsf{foreword} and \textsf{introduction}. (See \emph{Manual} 17.46,
 17.74; polakow:afterw.)
 
+\enlargethispage{\baselineskip}
+
 \mybigspace At \mymarginpar{\textbf{annotation}} the request of Emil
 Salim, \textsf{biblatex-chicago} has, as of version 0.9, added a
 package option (see \texttt{annotation} below, section
@@ -6196,7 +6211,7 @@ language or a translation to either of the latter two, you could
 probably manage it with special formatting inside those fields
 themselves.
 
-\enlargethispage{\baselineskip}
+%\enlargethispage{\baselineskip}
 
 \mybigspace I \mymarginpar{\textbf{lista}} intend this field
 specifically for presenting citations from reference works that are
@@ -6522,7 +6537,7 @@ be one of \texttt{american}, \texttt{brazilian}, \texttt{danish},
 \texttt{portuguese}, \texttt{spanish}, or \texttt{swedish}, to which
 I've added \texttt{russian}.
 
-\enlargethispage{\baselineskip}
+%\enlargethispage{\baselineskip}
 
 \mybigspace At \colmarginpar{\textbf{origlocation}} least one notes
 \&\ bibliography example in the \emph{Manual} provides a more complete
@@ -6990,6 +7005,8 @@ its own, require, then the following rules apply:
   white:\\callimachus.)
 \end{enumerate}
 
+\enlargethispage{\baselineskip}
+
 The \emph{Manual} provides a few more rules, as well.  A word normally
 italicized in text should also be italicized in a plain-text title,
 but should be in roman (\enquote{reverse italics}) in an italicized
@@ -7030,7 +7047,7 @@ provides an 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}
+%\enlargethispage{-\baselineskip}
 
 \mybigspace As \mymarginpar{\textbf{translator}} far as possible, I
 have implemented this field as \textsf{biblatex}'s standard styles do,
@@ -7121,7 +7138,7 @@ provide one for all entry types.  The required \LaTeX\ package
 \textsf{url} will ensure that your documents format such references
 properly, in the text and in the reference apparatus.
 
-\enlargethispage{\baselineskip}
+%\enlargethispage{\baselineskip}
 
 \mybigspace Standard \colmarginpar{\textbf{urldate}} \textsf{biblatex}
 field, it identifies exactly when you accessed a given url.  This
@@ -7200,7 +7217,7 @@ others being \textsf{crossref} and \textsf{xref}), and have chosen the
 name \textsf{userf} because it might act as a mnemonic for its
 function.
 
-\enlargethispage{-\baselineskip}
+%\enlargethispage{-\baselineskip}
 
 \mylittlespace In order to use this system, you should start by
 entering both the original and its translation into your .bib file,
@@ -7565,7 +7582,7 @@ specific page, then it's better only to use one citation rather than
 two, as otherwise, in the current state of the code, you'll get empty
 parentheses, like so: ().
 
-\enlargethispage{\baselineskip}
+%\enlargethispage{\baselineskip}
 
 \mylittlespace This \mymarginpar{\texttt{labelyear=\\true}} option
 tells \textsf{biblatex} to provide the special \textsf{labelyear} and
@@ -7927,7 +7944,7 @@ use the \cmd{citereset} command, allied possibly with the
 \textsf{biblatex}\ \texttt{citereset} option, on which see
 \textsf{biblatex.pdf} �3.1.2.1.
 
-\enlargethispage{\baselineskip}
+%\enlargethispage{\baselineskip}
 
 \mylittlespace Kenneth Pearce \colmarginpar{\texttt{shorthandfull}}
 has suggested that, in some fields of study, a list of shorthands
@@ -8165,7 +8182,7 @@ 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}
+\enlargethispage{\baselineskip}
 
 \mylittlespace Scot Becker has pointed out to me that the inverse
 problem not only exists but may well become increasingly common, to
@@ -8193,22 +8210,32 @@ Several users have requested that, in line with analogous provisions
 in other \enquote{American} \textsf{biblatex} styles (e.g.,
 \textsf{biblatex-apa} and \textsf{biblatex-mla}), I include facilities
 for producing a Chicago-like style in other languages.  I have
-supplied three new lbx files, \textsf{cms-german.lbx}, its clone
+supplied three lbx files, \textsf{cms-german.lbx}, its clone
 \textsf{cms-ngerman.lbx}, and \textsf{cms-french.lbx}, in at least
-partial fulfillment of this request.  This means that all of the
+partial fulfillment of this request.  For this release, Baldur
+Kristinsson has very kindly provided
+\mycolor{\textsf{cms-icelandic.lbx}} for speakers of that language,
+while H�kon Malmedal has equally kindly provided
+\mycolor{\textsf{cms-norsk.lbx}},
+\mycolor{\textsf{cms-norwegian.lbx}}, and
+\mycolor{\textsf{cms-nynorsk.lbx}}.  I have added
+\mycolor{\textsf{cms-british.lbx}} in order to simplify and to improve
+the package's handling of non-American typographical conventions in
+English.  This means that all --- or at least most --- of the
 Chicago-specific bibstrings are now available for documents and
-reference apparatuses written in French and German, with, as I intend,
+reference apparatuses written in these languages, with, as I intend,
 more languages to follow, limited mainly by my finite time and
 even-more-finite competence.  (If you would like to provide bibstrings
 for a language in which you want to work, or indeed correct
-deficiencies in the lbx files I have prepared, please contact me.)
-
-\mylittlespace Using \mymarginpar{\textbf{babel}} these new facilities
-is fairly simple.  By default, and this functionality remains the same
-as it was in the previous release of \textsf{biblatex-chicago}, calls
-to \cmd{DeclareLanguage\-Mapping} in \textsf{biblatex-chicago.sty}
-will automatically load the American strings, and also
-\textsf{biblatex's} American-style punctuation tracking, when you:
+deficiencies in the lbx files contained in the package, please contact
+me.)
+
+\mylittlespace Using \mymarginpar{\textbf{babel}} these facilities is
+fairly simple.  By default, and this functionality remains the same as
+it was in the previous release of \textsf{biblatex-chicago}, calls to
+\cmd{DeclareLanguage\-Mapping} in \textsf{biblatex-chicago.sty} will
+automatically load the American strings, and also \textsf{biblatex's}
+American-style punctuation tracking, when you:
 \begin{enumerate}
 \item Load \textsf{babel} with \texttt{american} as the main text
   language.
@@ -8222,28 +8249,22 @@ will automatically load the American strings, and also
 an American citation style, to expect this arrangement to work well
 for the majority of users.)
 
-\mylittlespace If, for whatever reason, you wanted to use
-\textsf{biblatex-chicago} but retain British typographical conventions
---- punctuation outside of quotation marks, outer quotes single rather
-than double, etc.\ --- then one possible solution at least would be to
-follow these three steps:
-\begin{enumerate}
-\item Load \textsf{babel} with the \texttt{british} option.
-\item Put \cmd{DeclareLanguageMapping\{british\}\{cms-american\}} in
-  your preamble.
-\item Edit \textsf{cms-american.lbx} so that the line reading:\\
-  \cmd{InheritBibliographyExtras\{american\}}\\ instead reads:\\
-  \cmd{InheritBibliographyExtras\{british\}}.
-\end{enumerate}
-
-If you want to use French or German strings in the reference
-apparatus, then you can load \textsf{babel} with \texttt{german} or
-\texttt{french} as the main document language.  You no longer need
-\cmd{DeclareLanguageMapping\{german\}\{cms-german\}} or
-\cmd{Declare\-LanguageMapping\{french\}\{cms-french\}} in your
-document preamble, since \textsf{bib\-latex-chicago.sty} now
-automatically provides this if you load the package in the standard
-way.
+\mylittlespace If, \colmarginpar{New!} for whatever reason, you wanted
+to use \textsf{biblatex-chicago} but retain British typographical
+conventions --- punctuation outside of quotation marks, outer quotes
+single rather than double, etc.\ --- then you no longer need to follow
+the complicated rules outlined in previous releases of
+\textsf{biblatex-chicago}.  Instead, simply load \textsf{babel} with
+the \texttt{british} option.
+
+\mylittlespace If you want to use French, German, Icelandic, or
+Norwegian strings in the reference apparatus, then you can load
+\textsf{babel} with \texttt{french}, \texttt{german},
+\texttt{icelandic}, \texttt{ngerman}, \texttt{norsk}, or
+\texttt{nynorsk} as the main document language.  You no longer need
+any calls to \cmd{DeclareLanguageMapping} in your document preamble,
+since \textsf{bib\-latex-chicago.sty} now automatically provides these
+if you load the package in the standard way.
 
 \mylittlespace You can also define which bibstrings to use on an
 entry-by-entry basis by using the \textsf{hyphenation} field in your
@@ -8257,11 +8278,12 @@ preamble, as \textsf{biblatex-chicago.sty} won't load it for you.
 
 \mylittlespace Three other hints may be in order here.  Please note,
 first, that I haven't altered the standard punctuation procedures used
-in German or French, so commas and full stops will appear outside of
-quotation marks, and those quotation marks themselves will be
-language-specific.  If, for whatever reason, you wish to follow the
-Chicago specification and move punctuation inside quotation marks,
-then you'll need a declaration of this sort in your preamble:
+in any of the other available languages, so commas and full stops will
+appear outside of quotation marks, and those quotation marks
+themselves will be language-specific.  If, for whatever reason, you
+wish to follow the Chicago specification and move punctuation inside
+quotation marks, then you'll need a declaration of this sort in your
+preamble:
 
 \begin{quote}
   \cmd{DefineBibliographyExtras\{german\}\{\%}\\
@@ -8289,9 +8311,11 @@ esp.\ s.v.\ \enquote{\cmd{partedit}.}
 \mylittlespace Finally, the French and German bibstrings I have
 provided may well break with established bibliographical traditions in
 those languages, but my main concern when choosing them was to remain
-as close as possible to the quirks of the Chicago specification.  If
-you have strong objections to any of the strings, or indeed to any of
-my formatting decisions, please let me know.
+as close as possible to the quirks of the Chicago specification.  I
+have entirely relied on the judgment of the creators of the Icelandic
+and Norwegian localizations in those instances.  If you have strong
+objections to any of the strings, or indeed to any of my formatting
+decisions, please let me know.
 
 \section{One .bib Database, Two Chicago Styles}
 \label{sec:twostyles}
@@ -8475,7 +8499,7 @@ all the citations together in parentheses at the end of the
 annotation, though on my machine this doesn't always work too well,
 either.
 
-%\enlargethispage{\baselineskip}
+\enlargethispage{\baselineskip}
 
 \mylittlespace Version 1.5 of \textsf{biblatex} revised the way the
 package deals with breaking long URLs and DOIs across lines.  The new
@@ -8512,8 +8536,6 @@ time required to implement the changes for the 16th edition, these
 types may make it into the package for the next major release, or they
 may have to wait until the one after.
 
-%\enlargethispage{-2\baselineskip}
-
 \mylittlespace Roger Hart, Pierric Sans, and a number of other users
 have reported a bug in the formatting of title fields.  This, as far
 as I can tell, has to do with the interaction between
@@ -8544,7 +8566,30 @@ code for it, let me know, and I'll look into it.
 \section{Revision History}
 \label{sec:history}
 
-\textbf{0.9.9a: Released \today}
+\textbf{0.9.9b: Released \today}
+\begin{itemize}
+\item I have updated calls to \cmd{DeclareLabelname} and
+  \cmd{DeclareLabelyear} in .cbx files so that the package works
+  correctly with the most recent version (2.4) of \textsf{biblatex}.
+\item I am grateful to Baldur Kristinsson for providing an Icelandic
+  localization file for \textsf{biblatex-chicago}, called
+  \mycolor{\textsf{cms-icelandic.lbx}}.  You'll see if you look
+  through it that it is still something of a work in progress, but it
+  should cover most needs in that language very well.  If you would
+  like to fill in some of the gaps please let me know.
+\item I am also grateful to H�kon Malmedal for providing Norwegian
+  localizations for \textsf{biblatex-chicago}, contained in the files
+  \mycolor{\textsf{cms-norsk.lbx}},
+  \mycolor{\textsf{cms-norwe\-gian.lbx}}, and
+  \mycolor{\textsf{cms-nynorsk.lbx}}.
+\item I have added a new British localization
+  (\mycolor{\textsf{cms-british.lbx}}) that should make it much
+  simpler for users to produce documents adhering to that tradition.
+  For further details on the usage of all these localizations please
+  see section~\ref{sec:international}, above.
+\end{itemize}
+
+\textbf{0.9.9a: Released July 30, 2012}
 \begin{itemize}
 \item I have made a few changes to \textsf{biblatex-chicago.sty} to
   allow the package to work with the latest version (2.0) of
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 bd42b0c9669..f876dbbe978 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 cf2189a331a..247d32c5e03 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
@@ -69,7 +69,7 @@ process your .bib files, as \textsc{Bib}\TeX\ (and its more recent
 variants) will no longer provide all the features you need.  I highly
 recommend, therefore, that you upgrade either to \textsf{Biber} 0.9.9
 and to \textsf{biblatex} 1.7, which are designed to work together, or
-to \textsf{Biber} 1.0 and \textsf{biblatex} 2.0, which latter two are
+to \textsf{Biber} 1.4 and \textsf{biblatex} 2.4, which latter two are
 the newest releases and are likewise designed to work as a matched
 pair.  The advice that follows in this document assumes that you are
 using \textsf{Biber}; if you wish to continue using \textsc{Bib}\TeX\
@@ -87,14 +87,18 @@ This edition implements significant changes to what the specification
 has, historically, recommended, and there are certain to be users who
 prefer the older format with titles capitalized sentence-style and
 not, in the case of most un-book-like entries, enclosed in quotation
-marks.  You can still use the 15th-edition style files from
-\textsf{biblatex-chicago}, which have been updated with improvements
-borrowed from the 16th edition, but which shouldn't require any
-changes to your current .bib files.  (See
-\textsf{biblatex-chicago15.pdf and cms15-dates-sample.pdf}.)  I shall
-also, in a future release, implement a full 16th-edition style with
-15th-edition title formatting, as envisaged by the \emph{Manual}
-\autocite*[15.45]{chicago:manual}.
+marks.  For such users, the new \textsf{authordate-trad} style, as
+envisaged by the \emph{Manual} \autocite*[15.45]{chicago:manual},
+grafts the traditional Chicago author-date title formatting onto the
+current recommendations for the remainder of the reference apparatus.
+Please consult \textsf{cms-trad-sample.pdf} to see how this looks in
+practice.  You can also still use the 15th-edition style files from
+\textsf{biblatex-chicago}, which have been updated with some
+improvements borrowed from the 16th edition.  (See
+\textsf{biblatex-chicago15.pdf} and \textsf{cms15-dates-sample.pdf}.)
+I would encourage all users, however, to switch to one of the
+16th-edition styles as soon as possible, as I am concentrating nearly
+all of my development time there.
 
 \subsection*{Usage}
 \label{usage}
@@ -124,10 +128,12 @@ automatically resets the tracker at page breaks:
 
 \citereset\cmd{citereset}\ \autocite[15.27]{chicago:manual}.  If you
 are going to repeat a source, make sure that the cite command provides
-a postnote --- if you don't need to cite a specific page, then it's
-better only to use one citation rather than two, as otherwise, in the
-current state of the code, you'll get empty parentheses, like so:
-\autocite{chicago:manual}.
+a postnote --- from this release of \textsf{biblatex-chicago} you'll
+no longer get any annoying empty parentheses, but you will get another
+standard citation, which may add too much clutter:
+\autocite{chicago:manual}.  If you don't need to cite a specific page,
+then it may be better, or at least more concise, only to use one
+citation command rather than two.
 
 \subsection*{Other citation commands}
 \label{sec:other}
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 0fc044156fe..be59f305b60 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 f02c88fa980..33c59badf64 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
@@ -221,17 +221,17 @@ 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{wauchope:ceramics}.  As \textcite{zukowsky:chicago}
+says, note\autocite{weresz} note\autocite{white:russ}
 note\autocite{white:callimachus} 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}.
+note\autocite{will:cohere}
+note.\footnote{\textcite{zukowsky:chicago}.}
 
-Note\autocites[See][]{mchugh:wake}[and][569]{warr:ellison}
+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}
+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}.}
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.pdf
new file mode 100644
index 00000000000..af5c6547def
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.tex
new file mode 100644
index 00000000000..e63610c0f46
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.tex
@@ -0,0 +1,510 @@
+\documentclass[a4paper,12pt]{report}
+\usepackage[T1]{fontenc}
+\usepackage{textcomp}
+%\usepackage{endnotes}
+\usepackage[latin1]{inputenc}
+\usepackage[german,french,american]{babel}
+\usepackage[autostyle]{csquotes}
+%\usepackage[document]{ragged2e}
+\usepackage[authordate-trad,backend=biber,babel=hyphen,%
+bibencoding=latin1,strict]{biblatex-chicago}
+% \usepackage[style=chicago-authordate,backend=biber,usecompiler=true,%
+% babel=hyphen,bibencoding=auto,sorting=nyt,cmslos,autocite=inline]{biblatex}
+%\DeclareLanguageMapping{german}{cms-german}
+%\DeclareLanguageMapping{american}{cms-american}
+%\DeclareLanguageMapping{french}{cms-french}
+%\renewcommand*{\rmdefault}{fgn}% The font (gentium) used for pdf
+\usepackage{ifthen}
+\usepackage{setspace}
+\usepackage{vmargin} \setpapersize{A4}
+\setmarginsrb{1in}{20pt}{1in}{.5in}{1pt}{2pt}{0pt}{2mm}
+% \renewcommand*{\biburlsetup}{%
+%   \Urlmuskip=0mu plus 2mu\relax
+%   \mathchardef\UrlBreakPenalty=200\relax
+%   \mathchardef\UrlBigBreakPenalty=100\relax
+%   \mathchardef\UrlEmergencyPenalty=9000\relax
+%   \appto\UrlSpecials{%
+%     \do\0{\mathchar`\0\penalty\UrlEmergencyPenalty}%
+%     \do\1{\mathchar`\1\penalty\UrlEmergencyPenalty}%
+%     \do\2{\mathchar`\2\penalty\UrlEmergencyPenalty}%
+%     \do\3{\mathchar`\3\penalty\UrlEmergencyPenalty}%
+%     \do\4{\mathchar`\4\penalty\UrlEmergencyPenalty}%
+%     \do\5{\mathchar`\5\penalty\UrlEmergencyPenalty}%
+%     \do\6{\mathchar`\6\penalty\UrlEmergencyPenalty}%
+%     \do\7{\mathchar`\7\penalty\UrlEmergencyPenalty}%
+%     \do\8{\mathchar`\8\penalty\UrlEmergencyPenalty}%
+%     \do\9{\mathchar`\9\penalty\UrlEmergencyPenalty}}%
+%   \def\UrlBreaks{%
+%     \do\.\do\@\do\/\do\\\do\!\do\_\do\|\do\;\do\>\do\]\do\)\do\}%
+%     \do\,\do\?\do\'\do\+\do\=\do\#\do\$\do\&\do\*\do\^\do\"}%
+%   \def\UrlBigBreaks{\do\:\do\-}}
+\usepackage{url}
+\urlstyle{rm}
+\appto\bibsetup{\sloppy}
+\hyphenation{evans-ton clem-ens}
+\setlength{\dimen\footins}{9.5in}
+\setlength{\parindent}{0pt}
+\setlength{\parskip}{5pt}
+\setcounter{biburlnumpenalty}{9000}
+\setcounter{biburlucpenalty}{9000}
+\setcounter{biburllcpenalty}{9000}
+\protected\def\onethird{{\scriptsize\raisebox{.7ex}{1}%
+    \hspace{-0.1em}\raisebox{.2ex}{/}\hspace{-0.03em}3}}
+\newcommand{\cmd}[1]{\texttt{\textbackslash #1}}
+\usepackage[colorlinks,urlcolor=blue,citecolor=black,
+plainpages=false,breaklinks=true]{hyperref}
+\bibliography{dates-test}
+%%\onehalfspacing
+\begin{document}
+
+\section*{The Chicago authordate-trad Specification}
+\label{sec:spec}
+
+\subsection*{Important Note}
+\label{bibernote}
+
+Starting with \textsf{biblatex} version 1.5, in order to adhere to the
+author-date specification you will need to use \textsf{Biber} to
+process your .bib files, as \textsc{Bib}\TeX\ (and its more recent
+variants) will no longer provide all the features you need.  I highly
+recommend, therefore, that you upgrade either to \textsf{Biber} 0.9.9
+and to \textsf{biblatex} 1.7, which are designed to work together, or
+to \textsf{Biber} 1.4 and \textsf{biblatex} 2.4, which latter two are
+the newest releases and are likewise designed to work as a matched
+pair.  The advice that follows in this document assumes that you are
+using \textsf{Biber}; if you wish to continue using \textsc{Bib}\TeX\
+then you need \textsf{biblatex} version 1.4c and
+\textsf{biblatex-chicago} 0.9.7a.  (Please contact me at the email
+address in \textsf{biblatex-chicago.pdf} if you have any difficulty
+obtaining a copy of this earlier release.)
+
+\subsection*{Editions}
+\label{editions}
+
+This file documents the \textsf{authordate-trad} specification which,
+as envisaged by the \emph{Manual} \autocite*[15.45]{chicago:manual},
+grafts the traditional Chicago author-date title formatting onto the
+current, 16th-edition recommendations for the remainder of the
+reference apparatus.  This newest edition implemented significant
+changes to what the author-date specification has, historically,
+recommended, and there are certain to be users who prefer the older
+format with titles capitalized sentence-style and not, in the case of
+most un-book-like entries, enclosed in quotation marks.  I have
+implemented the \textsf{authordate-trad} style for such users.  To
+compare it with the standard style, please see
+\textsf{cms-dates-sample.pdf}.  You can also still use the
+15th-edition style files from \textsf{biblatex-chicago}, which have
+been updated with some improvements borrowed from the 16th edition.
+(See \textsf{biblatex-chicago15.pdf} and
+\textsf{cms15-dates-sample.pdf}.)  I would encourage all users,
+however, to switch to one of the 16th-edition styles as soon as
+possible, as I am concentrating nearly all of my development time
+there.
+
+\subsection*{Usage}
+\label{usage}
+
+As a general rule, you'll probably want to use the \cmd{autocite}
+command for most citations.  For most sources, the result will be
+exactly as you expect it to be.  A few examples:
+\autocite{adorno:benj}; \autocite{ashbrook:brain};
+\autocite{babb:peru}; \autocite{barcott:review:15}.  Any page
+references should also appear as you expect: \autocite[338]{batson};
+\autocite[79]{beattie:crime}; \autocite[36]{boxer:china}.
+
+\subsection*{Repeated citations}
+\label{sec:ibidem}
+
+Repeated citations are somewhat complicated.  The Chicago author-date
+style doesn't use \enquote{\emph{Ibid},} but in general a repeated
+citation on the same page will print only the page reference:
+\autocite{browning:aurora}; \autocite[45]{browning:aurora}.
+Technically, this should only occur when a source is cited
+\enquote{more than once in one paragraph}
+\autocite[15.26]{chicago:manual}, so you can use the \cmd{citereset}
+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:
+
+\citereset\cmd{citereset}\ \autocite[15.27]{chicago:manual}.  If you
+are going to repeat a source, make sure that the cite command provides
+a postnote --- from this release of \textsf{biblatex-chicago} you'll
+no longer get any annoying empty parentheses, but you will get another
+standard citation, which may add too much clutter:
+\autocite{chicago:manual}.  If you don't need to cite a specific page,
+then it may be better, or at least more concise, only to use one
+citation command rather than two.
+
+\subsection*{Other citation commands}
+\label{sec:other}
+
+The other citation commands from \textsf{biblatex} also work fine:
+
+\cmd{textcite}: \textcite{conley:fifthgrade}; \cmd{autocite*}:
+\autocite*{connell:chronic}; \cmd{cite}: \cite{conway:evolution};
+\cmd{cite*}: \cite*{davenport:attention}; \cmd{foot\-note} with
+\cmd{autocite};\footnote{\autocite{donne:var:15}.}\ \cmd{footcite}
+(=\cmd{cite} inside a \cmd{footnote}).  \footcite{dunn:revolutions}
+
+Multicites should work as you expect, too:
+
+\cmd{autocites}: \autocites{dyna:browser}{eliot:pound};
+\cmd{autocites} by the same author:
+\autocites{pirumova}{pirumova:russian}; \cmd{autocites} by the same
+author with postnotes: \autocites{pirumova}[14]{pirumova:russian};
+\cmd{textcites} by the same author with postnotes:
+\textcites[37]{pirumova}{pirumova:russian}.
+
+\subsection*{Shorthands}
+\label{sec:shorthands}
+
+Chicago's author-date style only seems to recommend the use of
+shorthands as abbreviations for long authors' names, particularly
+institutional names \autocite[15.36]{chicago:manual}.  By default, I
+have followed this recommendation: \cmd{autocites}:
+\autocites{bsi:abbreviation}{iso:electrodoc}; \cmd{textcites}:
+\textcites{bsi:abbreviation}{iso:electrodoc}.  This \textsf{shorthand}
+will by default appear at the head of the entry in the list of
+references, followed by the parenthesized expansion of the shorthand,
+taken from the \textsf{author} field.  (This is a change from the 15th
+edition.)  You will usually also need a \textsf{sortkey} field to make
+sure that the entry is alphabetized by the \textsf{shorthand} rather
+than by the \textsf{title}.  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}
+
+In most entries, the absence of an author can be supplied by, e.g., an
+editor or a translator: \autocite{chaucer:alt};
+\autocite{silver:gawain}.  Sometimes an anonymous work's author is
+known or can be guessed: \autocite{horsley:prosodies};
+\autocite{cook:sotweed}.  Alternatively, in some cases the
+\textsf{title} may appear in place of the \textsf{author}:
+\autocite{anon:stanze}; \autocite{virginia:plantation}.  The 16th
+edition is less than enthusiastic about the use of
+\enquote{\texttt{Anon.}}\ as author.
+
+With \textsf{Biber}, in most entry types, an absent \textsf{date} will
+automatically provoke it into searching for other sorts of dates in
+the entry, in the order \textsf{year, eventyear, origyear, urlyear}:
+e.g., \autocite{evanston:library}, which only has a \textsf{urlyear}.
+In three entry types --- \textsf{Music}, \textsf{Review}, and
+\textsf{Video} --- this search order is \textsf{eventyear, origyear,
+  year, urlyear}, as in these types the earliest year should take
+precedence (cf.\ page~\pageref{sec:audiovisual}, below).  You can
+eliminate some of these dates from the running, or change the search
+order, using the \cmd{DeclareLabelyear} command in your preamble, but
+please be aware that I have hard-coded this order into the author-date
+style in order to cope with some tricky corners of the specification.
+If you reorder these dates, and your references enter these tricky
+corners, the results might be surprising.  (Cf.\ section~4.5.2 in
+\textsf{biblatex.pdf} and section~5.2, s.v.\ \enquote{date} in
+\textsf{biblatex-chicago.pdf} for the details.)
+
+In most entry types, the absence of all four possible dates will
+automatically produce \mbox{\enquote{\texttt{n.d.}\hspace{-2pt}}}
+instead: \autocite{bernstein:shostakovich}.  You can also give it
+yourself in the form \cmd{bibstring\{nodate\}}:
+\autocite{ross:thesis}.  A date that can be guessed should appear
+within square brackets: \autocite{clark:mesopot}.  Forthcoming works
+are straightforward, assuming you remember to use the \cmd{autocap}
+macro so that the word appears correctly in both citations and the
+list of references: \autocite{author:forthcoming};
+\autocite{contrib:contrib}.
+
+The 16th edition of the \emph{Manual} has changed the rules for
+entries with more than one date \autocite[15.38]{chicago:manual}.
+First, \textsf{Music} and \textsf{Video} entries have their own rules,
+which are applied automatically.  (Once again, see
+page~\pageref{sec:audiovisual}, below.)  For other entry types, there
+are two options, corresponding to two different states of the
+\texttt{cmsdate} entry option.  The default is \texttt{cmsdate=off}:
+\autocite{maitland:equity}.  Here, setting the \textsf{pubstate} field
+to \texttt{reprint} ensures that a notice of the original publication
+date will be printed at the end of the reference list entry.
+Alternatively, you can use \texttt{cmsdate=both}:
+\autocite{emerson:nature}; \autocite{maitland:canon}.
+\texttt{cmsdate=new} and \texttt{cmsdate=old} are both now synonyms of
+\texttt{both}, while \texttt{cmsdate=on} is still available even
+though it falls outside the specification:
+\autocite{james:ambassadors}.  These options, in combination with
+others available in your .bib files, can cover a wide range of
+difficult cases.  Please see the next section below, the documentation
+in \textsf{biblatex-chicago.pdf}, and also the following entries in
+\textsf{dates-test.bib}:
+\autocites{schweitzer:bach}{white:russ}{white:ross:memo}.
+
+\subsection*{Corners of the specification}
+\label{sec:corners}
+
+In some cases, the \emph{Manual} isn't altogether clear about how to
+present entries in the author-date style.  I'm pretty certain about
+most of what follows, but if you interpret the specification
+differently please let me know.
+
+\subsubsection*{InReference entries}
+\label{sec:inref}
+
+These present several peculiarities: the title of the work should
+always take the place of any author, no
+\enquote{\texttt{n.d.}\hspace{-2pt}} will automatically be provided,
+and any postnote field will be enclosed in quotation marks preceded by
+\enquote{\texttt{s.v.}\hspace{-2pt}} for \enquote{\emph{sub verbo}.}
+This allows you to refer to alphabetized articles in well-known
+reference works: \autocite[Hume, David]{ency:britannica};
+\autocite[Sibelius, Jean]{grove:sibelius};
+\autocite[BibTeX]{wikiped:bibtex}.
+
+\subsubsection*{Author-less Article, Review, and Manual entries}
+\label{sec:authless:art}
+
+In \textsf{Article} and \textsf{Review} entries with the
+\texttt{magazine} entrysubtype, the absence of an author automatically
+places the \textsf{journaltitle} of the periodical in citations and at
+the head of the entry in the list of references:
+\autocite{gourmet:052006}.  You can cite newspaper and magazine
+articles entirely within the text, i.e., without them appearing in the
+reference list \autocite[15.47]{chicago:manual}, if you set the
+\texttt{cmsdate=full} entry option: \autocite{lakeforester:pushcarts};
+\autocite{nyt:trevorobit}.  In \textsf{Manual} entries, the
+\textsf{organization} field does the same: \autocite{dyna:browser}.
+If you wish to present an abbreviated form of the journal (or
+organization) name only in citations, then the \textsf{shortauthor}
+field --- or in other cases the \textsf{shorthand} field --- is the
+place for it, making sure to include formatting:
+\autocite{unsigned:ranke}; \autocite{bsi:abbreviation}.
+
+\subsubsection*{Misc entries with an entrysubtype}
+\label{sec:misc}
+
+When citing individual letter-like pieces from an unpublished archive
+where only an \textsf{origdate} is present, you no longer need to set
+the \texttt{cmsdate} option in your .bib entry, as \textsf{Biber} and
+\textsf{biblatex-chicago} now handle this automatically:
+\autocite{creel:house}.  Non-letters, e.g., interviews, use the
+\textsf{date} field, so you don't need \texttt{cmsdate} there, either:
+\autocite{spock:interview}.  For undated pieces you can put
+\cmd{bibstring\{nodate\}} in the \textsf{year} field:
+\autocite{dinkel:agassiz}.  For citing whole collections, see the next
+section.
+
+\subsubsection*{entrysubtype = \{classical\}}
+\label{sec:classical}
+
+This option's name derives from its use for citing texts from
+classical antiquity, though in the author-date style especially it can
+be put to use in several other contexts.  In a nutshell, any entry
+with such an \textsf{entrysubtype} will be treated, in citations only,
+not as author-date but as author-title.  (Entries in the list of
+references, e.g., a particular edition of Aristotle, will still appear
+in standard author-date format.)  A \cmd{cite*} or \cmd{autocite*}
+command will, in such a case, produce the title rather than the year.
+Some examples should make this clearer:
+
+Classical works: without abbreviation:
+\autocite{aristotle:metaphy:trans}; with abbreviation:
+\autocite{aristotle:metaphy:gr}; \autocite{plato:republic:gr}; using
+standard pagination: \autocite*[3.2.996b5--8]{aristotle:metaphy:gr};
+\autocite*[420e]{plato:republic:gr}; work cited by page of a modern
+edition, i.e., without \textsf{entrysubtype}:
+\autocite[198]{euripides:orestes}.
+
+Sacred works, e.g., the Bible and the Qur'an:
+\autocite[25:19--36:43]{genesis}.
+
+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[15.23]{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 \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.,
+\autocites{chicago:manual}{chicago:comment}.
+
+\subsubsection*{Multiple authors}
+\label{sec:multiple}
+
+The default settings in \textsf{biblatex-chicago} are
+\texttt{maxnames=3,minnames=1} in citations and
+\texttt{max\-bibnames=10,minbibnames=7} in the list of references
+(these latter parameters set in \textsf{biblatex-chicago.sty}).  In
+practice, this means that an entry like hlatky:hrt, with 5 authors,
+will present all of them in the list of references but will truncate
+to one in citations, like so: \autocite{hlatky:hrt}.  For the vast
+majority of circumstances, these settings are exactly right for the
+Chicago author-date specification.  However, if \enquote{a reference
+  list includes another work \emph{of the same date} that would also
+  be abbreviated as [\enquote{Hlatky et al.}] but whose coauthors are
+  different persons or listed in a different order, the text citations
+  must distinguish between them} \autocite[15.28]{chicago:manual}.
+The new (\textsf{Biber}-only) \textsf{biblatex} option
+\texttt{uniquelist}, set for you in \textsf{biblatex-chicago.sty},
+will automatically handle many of these situations for you, but it is
+as well to understand that it does so by temporarily suspending the
+limits, listed above, on how many names to print in a citation.
+Without \texttt{uniquelist}, \textsf{biblatex} would present such a
+work as, e.g., (Hlatky et al. 2002b), while hlatky:hrt would be
+(Hlatky et al. 2002a).  This does distinguish between them, but
+inaccurately, as it suggests that the two different author lists are
+exactly the same.  With \texttt{uniquelist}, the two citations might
+look like (Hlatky, Boothroyd et al.\ 2002) and (Hlatky, Smith et al.\
+2002), which is what the specification requires.
+
+If, however, the distinguishing name occurs further down the author
+list --- in fourth or fifth position in our examples --- then the
+default settings would produce citations with all 4 or 5 names
+printed, which can become awkwardly long.  In such a situation, you
+can provide \textsf{shortauthor} fields that look like this:
+\{\{Hlatky et al., Quality of life,\}\} and \{\{Hlatky et al.,
+Depressive symptoms,\}\}, using a shortened title to distinguish the
+references.  This would produce (Hlatky et al., Quality of life, 2002)
+and (Hlatky et al., Depressive symptoms, 2002), as the spec
+recommends.  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{Chicago recommends a more
+  comprehensive approach to dating audiovisual materials than in
+  previous editions.}  This means, for instance, that, even when
+consulting a digital copy, \enquote{it is generally useful to give
+  information about the original source.}  Also, \enquote{the date of
+  the original recording should be privileged in the citation}
+\autocite[15.53]{chicago:manual}.  The rather more book-like entries
+are generally unaffected by these changes, so published
+(\textsf{Audio}) and unpublished (\textsf{Misc}) scores are no problem
+at all: \autocite{schubert:muellerin}; \autocite{verdi:corsaro};
+\autocite{shapey:partita:15}.  The dating of online materials has been
+enhanced: \autocite{coolidge:speech:trad};
+\autocite{horowitz:youtube}; \autocite{pollan:plant}.  The most
+significant changes, however, appear in \textsf{Music} and
+\textsf{Video} entries, where every effort should be made to find
+date(s) for sources: \autocite{auden:reading};
+\autocite{friends:leia}; \autocite{handel:messiah};
+\autocite{holiday:fool}; \autocite{nytrumpet:art}.  Others perhaps
+require further information in the entry or genuinely are better
+suited to presentation in running text: \autocite{beethoven:sonata29}.
+The standard \textsf{biblatex} tools for subdividing reference lists
+are all available if you want to follow the \emph{Manual's}
+recommendations on presenting this kind of material separately from
+other sources.
+
+\subsection*{Further examples (mainly for testing purposes)}
+\label{testing}
+
+Article: \autocite{assocpress:gun}; \autocite{brown:bremer};
+\autocite{chu:panda}; \autocite{conley:fifthgrade};
+\autocite{connell:chronic}; \autocite{ellis:blog};
+\autocite{friedman:learning}; \autocite{garaud:gatine};
+\autocite{garrett:15}; \autocite{gibbard:15}; \autocite{kern};
+\autocite{kimluu:diethyl:15}; \autocite{lewis:15};
+\autocite{loften:hamlet}; \autocite{loomis:structure:15};
+\autocite{morgenson:market}; \autocite{osborne:poison:15};
+\autocite{reaves:rosen}; \autocite{rozner:liberation};
+\autocite{schneider:mittelpleistozaene}; \autocite{sewall:letter};
+\autocite{stenger:privacy}; \autocite{terborgh:preservation};
+\autocite{wall:radio}; \autocite{warr:ellison};
+\autocite{white:callimachus}.
+
+Artwork: \autocite{leo:madonna}.
+
+Audio: \autocite{greek:filmstrip}; \autocite{weed:flatiron}.
+
+Book: \autocite{barrows:reading}; \autocite{churchill:letters};
+\autocite{cohen:schiff}; \autocite{cotton:manufacture};
+\autocite{creasey:ashe:blast}; \autocite{creasey:morton:hide};
+\autocite{creasey:york:death}; \autocite{davenport:attention};
+\autocite{feydeau:farces}; \autocite{furet:passing:eng};
+\autocite{furet:passing:fr}; \autocite{harley:cartography};
+\autocite{hopp:attalid}; \autocite{howell:marriage};
+\autocite{lach:asia}; \autocite{lecarre:quest};
+\autocite{levistrauss:savage}; \autocite{lynch:webstyle};
+\autocite{maisonneuve:relations}; \autocite{mchugh:wake:15};
+\autocite{menchu:crossing}; \autocite{meredith:letters};
+\autocite{michelangelo:poems}; \autocite{mla:style};
+\autocite{natrecoff:camera}; \autocite{palmatary:pottery};
+\autocite{pelikan:christian}; \autocite{rodman:walk};
+\autocite{schellinger:novel}; \autocite{sechzer:women};
+\autocite{sereny:cries}; \autocite{soltes:georgia};
+\autocite{stendhal:parma}; \autocite{suangtho:tectona};
+\autocite{thompson:making}; \autocite{tillich:system};
+\autocite{times:guide}; \autocite{turabian:manual};
+\autocite{walker:columbia}; \autocite{wauchope:ceramics};
+\autocite{weber:saugetiere}; \autocite{weresz};
+\autocite{white:total}; \autocite{wright:evolution};
+\autocite{wright:theory}.
+
+BookInBook: \autocite{bernard:boris}.
+
+Collection: \autocite{brush:ornithology}; \autocite{kamrany:economic};
+\autocite{prairie:state}; \autocite{zukowsky:chicago}.
+
+Image: \autocite{bedford:photo}.
+
+InBook: \autocite{ashbrook:brain}; \autocite{phibbs:diary};
+\autocite{will:cohere}.
+
+InCollection: \autocite{centinel:letters}; \autocite{ellet:galena};
+\autocite{keating:dearborn}; \autocite{lippincott:chicago};
+\autocite{sirosh:visualcortex}; \autocite{wiens:avian}.
+
+InProceedings: \autocite{frede:inproc}.
+
+InReference: \autocite[absolute]{oed:cdrom}.
+
+Manual: \autocite{dyna:browser}.
+
+Misc: \autocite{roosevelt:speech:trad}.
+
+Music: \autocite{floyd:atom}; \autocite{mozart:figaro};
+\autocite{rubinstein:chopin}.
+
+Online: \autocite{harwood:biden}; \autocite{powell:email}.
+
+Patent: \autocite{petroff:impurity}.
+
+Periodical: \autocite{good:wholeissue}; \autocite{whittington:water}.
+
+Report: \autocite{herwign:office}.
+
+Review: \autocite{ac:comment:trad}; \autocite{bundy:macneil};
+\autocite{Clemens:letter}; \autocite{kozinn:review};
+\autocite{ratliff:review:15}; \autocite{wallraff:word}.
+
+SuppBook: \autocite{friedman:intro}; \autocite{polakow:afterw};
+\autocite{prose:intro}.
+
+Thesis: \autocite{murphy:silent:15}.
+
+Unpublished: \autocite{nass:address}.
+
+Video: \autocite{cleese:holygrail}; \autocite{hitchcock:nbynw}.
+
+
+% \printshorthands % No longer necessary in author-date.
+% \nocite{*}
+\printbibliography[title=References]
+
+\end{document}
+%%% Local Variables: 
+%%% mode: latex
+%%% TeX-master: t
+%%% End: 
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.pdf
index 0d78264d6d2..44d44f6343f 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.tex
index c78a1fdf7b5..f1fb82488bd 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-dates-sample.tex
@@ -67,7 +67,7 @@ process your .bib files, as \textsc{Bib}\TeX\ (and its more recent
 variants) will no longer provide all the features you need.  I highly
 recommend, therefore, that you upgrade either to \textsf{Biber} 0.9.9
 and to \textsf{biblatex} 1.7, which are designed to work together, or
-to \textsf{Biber} 1.0 and \textsf{biblatex} 2.0, which latter two are
+to \textsf{Biber} 1.4 and \textsf{biblatex} 2.4, which latter two are
 the newest releases and are likewise designed to work as a matched
 pair.  The advice that follows in this document assumes that you are
 using \textsf{Biber}; if you wish to continue using \textsc{Bib}\TeX\
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-notes-sample.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-notes-sample.pdf
index be407912878..e1782a2dcbf 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-notes-sample.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms15-notes-sample.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib b/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib
index 46f6f7867dd..733174374b8 100644
--- a/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib
@@ -72,6 +72,24 @@
                   parentheses.}
 }
 
+@Review{ac:comment:trad,
+  entrysubtype = {magazine},
+  author = 	 {AC},
+  eventdate = 	 {2008-07-01},
+  nameaddon = 	 {(10:18 a.m.)},
+  crossref = 	 {ellis:blog},
+  title = 	 {comment on Rhian Ellis, Squatters' rights},
+  annotation = 	 {_authordate-trad only_.  The 16th edition suggests a
+                  format such as this for presenting comments on blogs
+                  or other online material.  Note the sentence-style
+                  capitalization in the title field, and the crossref
+                  field which points to the blog to which the comment
+                  is attached.  The eventdate gives the date of the
+                  comment, and if additional temporal specificity is
+                  required then you can use the nameaddon field to
+                  give a timestamp, inside parentheses.}
+}
+
 @Book{adorno:benj,
   title = 	 {The Complete Correspondence, 1928--1940},
   publisher = 	 hup,
@@ -810,6 +828,20 @@
                   from an online archive, both using a Video entry.}
 }
 
+@Misc{coolidge:speech:trad,
+  author = 	 {Coolidge, Calvin},
+  title = 	 {Equal rights (speech)},
+  entrysubtype = {speech},
+  note = 	 {copy of an undated 78 rpm disc},
+  addendum = 	 {from \fullcite{loc:leaders}},
+  year = 	 {[1920?]},
+  annotation = 	 {This is a recording from an online archive, using a
+                  Misc entry with an entrysubtype, and intended for
+                  _authordate-trad only_.  The addendum cites the
+                  archive itself using an Online entry.
+                  Cp. weed:flatiron and loc:city, which cite a film
+                  from an online archive, both using a Video entry.}}
+
 @Book{cotton:manufacture,
   title =	 {An Inquiry into the Causes of the Present
                   Long-Continued Depression in the Cotton Trade, with
@@ -1248,7 +1280,7 @@
 }
 
 @Video{friends:leia,
-  title = 	 {The One with the Princess Leia Fantasy},
+  title = 	 {The One with the {Princess Leia} Fantasy},
   date = 	 2003,
   booktitle = 	 {Friends},
   booktitleaddon = 	 {season~3, episode~1},
@@ -1443,7 +1475,7 @@
 }
 
 @Audio{greek:filmstrip,
-  title = 	 {The Greek and Roman World},
+  title = 	 {The {Greek} and {Roman} World},
   date = 	 1977,
   publisher = {Society for Visual Education},
   type = 	 {filmstrip, 44 min\adddot},
@@ -1561,7 +1593,7 @@
 
 @Online{harwood:biden,
   author = 	 {Harwood, John},
-  title = 	 {The Pros and Cons of Biden},
+  title = 	 {The Pros and Cons of {Biden}},
   organization = {\mkbibemph{New York Times} video, 2:00},
   date = 	 {2008-08-23},
   url = 	 {http://video.on.nytimes.com/?fr_story=a425c9aca92f51bd19f2a621fd93b5e266507191},
@@ -1678,7 +1710,7 @@
 }
 
 @Online{horowitz:youtube,
-  title = 	 {HOROWITZ AT CARNEGIE HALL 2-Chopin Nocturne in Fm Op.55},
+  title = 	 {{HOROWITZ AT CARNEGIE HALL} 2-{Chopin Nocturne} in Fm Op.55},
   organization = {YouTube video, 5:53},
   sortkey = 	 {Horowitz},
   url = 	 {http://www.youtube.com/watch?v=cDVBtuWkMS8},
@@ -2064,7 +2096,7 @@
 @Online{loc:leaders,
   author = 	 {Library of Congress},
   title = 	 {American Leaders Speak},
-  subtitle = 	 {Recordings from World War I and the 1920 Election,
+  subtitle = 	 {Recordings from {World War I} and the 1920 Election,
                   1918--1920},
   year = 	 {\isdot},
   url = 	 {http://memory.loc.gov/ammem/nfhtml/nforSpeakers01.html},
@@ -2294,7 +2326,7 @@
 }
 
 @Music{mozart:figaro,
-  title = 	 {Le nozze di Figaro},
+  title = 	 {Le nozze di {Figaro}},
   howpublished = {\textsf{\small\textcircledP}},
   date = 	 {1987},
   author = 	 {Mozart, Wolfgang Amadeus},
@@ -2657,7 +2689,7 @@
 
 @Online{pollan:plant,
   author = 	 {Pollan, Michael},
-  title = 	 {Michael Pollan Gives a Plant's-Eye View},
+  title = 	 {Michael {Pollan} Gives a Plant's-Eye View},
   organization = {TED video, 17:31},
   url = 	 {http://www.ted.com/index.php/talks/michael_pollan_gives_a_plant_s_eye_view.html},
   urldate = 	 {2008-02},
@@ -2823,6 +2855,20 @@
                   formatting of the title.  Cp. coolidge:speech.}
 }
 
+@Misc{roosevelt:speech:trad,
+  author = 	 {Roosevelt, Eleanor},
+  title = 	 {Is {America} facing world leadership?},
+  entrysubtype = {speech},
+  note = 	 {radio broadcast, Windows Media Audio, 47:46},
+  titleaddon = {convocation speech, Ball State Teacher's College},
+  url = 	 {http://libx.bsu.edu/cdm4/item_viewer.php?CISOROOT=/ElRoos&CISOPTR=0&CISOBOX=1&REC=2},
+  date = 	 {1959-05-06},
+  annotation = 	 {Another speech from an online archive, presented in
+                  a Misc entry with an entrysubtype, and intended for
+                  _authordate-trad only_.  Note the formatting of the
+                  title.  Cp. coolidge:speech.}
+}
+
 @MastersThesis{ross:thesis,
   author = 	 {Ross, Dorothy},
   title = 	 {The {Irish-Catholic} Immigrant, 1880--1900},
@@ -2840,6 +2886,7 @@
 @Article{rozner:liberation,
   journaltitle = {Voprosy istorii},
   year = 	 1979,
+  entrysubtype = {magazine},
   author = 	 {Rozner, I.~G.},
   title = 	 {The War of Liberation of the {Ukrainian} People in
                   1648--1654 and {Russia}},
@@ -2848,16 +2895,15 @@
   pages = 	 {51--64},
   annotation = 	 {This is a Russian journal, with its issues defined
                   not by volume number but by year.  For the
-                  notes+bibliography style you need a "magazine"
-                  entrysubtype, but for author-date it's not required.
-                  The journaltitle is in transliterated Russian, but
-                  the article title is translated into English, hence
-                  the original language must be provided in the
-                  language field.}
+                  16th-edition style you need a "magazine"
+                  entrysubtype.  The journaltitle is in transliterated
+                  Russian, but the article title is translated into
+                  English, hence the original language must be
+                  provided in the language field.}
 }
 
 @Music{rubinstein:chopin,
-  title = 	 {The Chopin Collection},
+  title = 	 {The {Chopin} Collection},
   date = 	 1991,
   author = 	 {Rubinstein, Artur},
   publisher = {RCA Victor/BMG},
@@ -2998,7 +3044,7 @@
 
 @Misc{shapey:partita:15,
   author = 	 {Shapey, Ralph},
-  title = 	 {Partita for Violin and Thirteen Players},
+  title = 	 {Partita for violin and thirteen players},
   titleaddon = 	 {score},
   entrysubtype = {music},
   date = 	 1966,
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 709bd122d7a..fce7c22a511 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty
@@ -1,4 +1,4 @@
-% $Id: biblatex-chicago.sty,v 0.1.1.43 2012/07/26 13:21:52 dfussner Exp $
+% $Id: biblatex-chicago.sty,v 0.1.1.46 2012/12/06 12:19:45 dfussner Exp $
 
 % Copyright (c) 2009-2012 David Fussner.  This package is
 % author-maintained.
@@ -13,12 +13,13 @@
 % but not limited to, the implied warranties of merchantability and
 % fitness for a particular purpose.
 
-\ProvidesPackage{biblatex-chicago}[2012/07/26 v 2.0 biblatex style]
+\ProvidesPackage{biblatex-chicago}[2012/12/06 v 2.4 biblatex style]
 
 \RequirePackage{etoolbox}
 
 \DeclareOption{authordate}{\def\cms@style{authordate}}
 \DeclareOption{notes}{\def\cms@style{notes}}
+\DeclareOption{authordate-trad}{\def\cms@style{authordatetrad}}
 \DeclareOption{authordate15}{\def\cms@style{authordateold}}
 \DeclareOption{notes15}{\def\cms@style{notesold}}
 \DeclareOption*{\eappto\cms@options{\CurrentOption,}}
@@ -63,6 +64,15 @@
     usecompiler=true,loccittracker=constrict,dateabbrev=false,
     maxbibnames=10,minbibnames=7,sorting=\cms@choose,sortcase=false}}
 
+\def\cms@authordatetrad{%
+  \RequirePackage[style=chicago-authordate-trad]{biblatex}%
+  \ExecuteBibliographyOptions{%
+    pagetracker=true,autocite=inline,alldates=comp,labelyear=true,
+    uniquename=minfull,useeditor=true,usetranslator=true,usecompiler=true,
+    ibidtracker=constrict,sorting=cms,punctfont,cmslos=true,nodates,
+    uniquelist=minyear,maxbibnames=10,minbibnames=7,sortcase=false,
+    abbreviate=false,dateabbrev=false,avdate=true}}
+
 \def\cms@authordateold{%
   \RequirePackage[style=chicago-authordate15]{biblatex}%
   \ExecuteBibliographyOptions{%
@@ -82,6 +92,7 @@
 \csuse{cms@\cms@style}
 \undef\cms@authordate
 \undef\cms@notes
+\undef\cms@authordatetrad
 \undef\cms@authordateold
 \undef\cms@notesold
 \expandafter\ExecuteBibliographyOptions\expandafter{\cms@options}
@@ -120,9 +131,13 @@
     {}}}%
 {\DeclareLanguageMapping{english}{cms-american}}
 
+\DeclareLanguageMapping{british}{cms-british}
 \DeclareLanguageMapping{german}{cms-german}
 \DeclareLanguageMapping{french}{cms-french}
 \DeclareLanguageMapping{ngerman}{cms-ngerman}
+\DeclareLanguageMapping{icelandic}{cms-icelandic}
+\DeclareLanguageMapping{norsk}{cms-norsk}
+\DeclareLanguageMapping{nynorsk}{cms-nynorsk}
 
 \@ifpackagelater{biblatex}{2012/06/30}
 {\def\cms@choose{%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad.bbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad.bbx
new file mode 100644
index 00000000000..b8e33676f28
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad.bbx
@@ -0,0 +1,5 @@
+\ProvidesFile{chicago-authordate-trad.bbx}
+
+\RequireBibliographyStyle{chicago-authordate}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad.cbx
new file mode 100644
index 00000000000..809bcbf8c7b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad.cbx
@@ -0,0 +1,2323 @@
+% $Id: chicago-authordate-trad.cbx,v 0.8.1.27 2012/12/06 11:45:44 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, 16th edition.
+
+\ProvidesFile{chicago-authordate.cbx}[2012/12/06 v 2.4 biblatex citation style]
+
+%%%% Biblatex initialization + Chicago options + Toggles %%%%
+
+\newbool{cbx:parens}
+
+\providecommand*{\mkibid}[1]{#1}
+
+\providetoggle{cms@inlineibid}
+\providetoggle{cms@origlabel}
+\providetoggle{cms@bothlabelold}
+\providetoggle{cms@bothlabelnew}
+\providetoggle{cms@fulldate}
+\providetoggle{cms@reprint}
+\providetoggle{cms@switchdates}
+\providetoggle{cms@los}
+%\providetoggle{cms@oneyear}
+\providetoggle{cms@avdate}
+\providetoggle{cms@nodates}
+\providetoggle{cms@authorparens}
+
+\providetoggle{cms@url}% These are for the field-exclusion options
+\providetoggle{cms@doi}
+\providetoggle{cms@doionly}
+\providetoggle{cms@eprint}
+\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
+\providetoggle{cms@origpublished}% Keep
+\providetoggle{cms@annotation}% Keep
+\providetoggle{cms@postposit}% Keep
+\providetoggle{cms@fullshhand}
+
+\AtEveryCitekey{%
+  \iffieldundef{userc}%
+  {}%
+  {\nocite{\thefield{userc}}}%
+  \iffieldequalstr{pubstate}{reprint}%
+  {\toggletrue{cms@reprint}}%
+  {\togglefalse{cms@reprint}}}%
+
+\DeclareBibliographyOption{avdate}[true]{%
+  \ifcsdef{cms@opt@avdate@#1}%
+  {\csuse{cms@opt@avdate@#1}}
+  {\blx@err@invopt{avdate=#1}{}}}
+\def\cms@opt@avdate@true{%
+  \@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4
+  {\DeclareLabelyear[music,review,video]{\field{eventyear}%
+      \field{origyear} \field{year} \field{urlyear}}}%
+  {\DeclareLabelyear[music,review,video]{eventyear,origyear,year,urlyear}}%
+  \toggletrue{cms@avdate}}%
+\def\cms@opt@avdate@false{%
+  \togglefalse{cms@avdate}}
+
+\DeclareBibliographyOption{cmsdate}{% Trying to implement origyear as
+  \ifcsdef{cms@opt@cmsdate@#1}% labelyear. Sorting will be an issue.
+  {\csuse{cms@opt@cmsdate@#1}}
+  {\blx@err@invopt{cmsdate=#1}{}}}
+
+\DeclareEntryOption{cmsdate}[off]{% Trying to implement origyear as
+  \ifcsdef{cms@opt@cmsdate@#1}% labelyear. Sorting will be an issue.
+  {\iftoggle{cms@origlabel}
+    {\togglefalse{cms@origlabel}%
+      \def\@cms@tempdate{cms@origlabel}}%
+    {\iftoggle{cms@bothlabelnew}%
+      {\togglefalse{cms@bothlabelnew}%
+        \def\@cms@tempdate{cms@bothlabelnew}}%
+      {\iftoggle{cms@bothlabelold}%
+        {\togglefalse{cms@bothlabelold}%
+          \def\@cms@tempdate{cms@bothlabelold}}%
+        {}}}%
+    \csuse{cms@opt@cmsdate@#1}}%
+  {\blx@err@invopt{cmsdate=#1}{}}}
+\def\cms@opt@cmsdate@on{%
+  \toggletrue{cms@origlabel}}
+\def\cms@opt@cmsdate@new{%
+  \toggletrue{cms@bothlabelnew}}
+\def\cms@opt@cmsdate@old{%
+  \toggletrue{cms@bothlabelold}}
+\def\cms@opt@cmsdate@both{%
+  \toggletrue{cms@bothlabelold}}
+\def\cms@opt@cmsdate@full{%
+  \toggletrue{cms@fulldate}}
+\def\cms@opt@cmsdate@off{}
+
+\DeclareBibliographyOption{annotation}[true]{%
+  \global\toggletrue{cms@annotation}}
+
+\DeclareBibliographyOption{cmslos}[true]{%
+  \global\settoggle{cms@los}{#1}}
+
+\DeclareBibliographyOption{noibid}[true]{%
+  \global\toggletrue{cms@noibid}}
+
+\DeclareBibliographyOption{usecompiler}[true]{%
+  \settoggle{cms@usecompiler}{#1}}
+
+\DeclareBibliographyOption{nodates}[true]{%
+  \settoggle{cms@nodates}{#1}}
+
+\DeclareEntryOption{usecompiler}[true]{%
+  \settoggle{cms@usecompiler}{#1}}
+
+\DeclareBibliographyOption{juniorcomma}[true]{%
+  \settoggle{cms@jrcomma}{#1}}
+
+\DeclareEntryOption{juniorcomma}[true]{%
+  \settoggle{cms@jrcomma}{#1}}
+
+\DeclareBibliographyOption{shorthandfull}[true]{%
+  \settoggle{cms@fullshhand}{#1}}
+
+\DeclareBibliographyOption{headline}[true]{%
+  \renewcommand{\MakeSentenceCase}{\@ifstar\relax\relax}}
+
+% The field-exclusion options %
+
+\DeclareBibliographyOption{isbn}[true]{%
+  \settoggle{cms@isbn}{#1}}
+\DeclareBibliographyOption{url}[true]{%
+  \settoggle{cms@url}{#1}}
+\DeclareBibliographyOption{doi}[true]{%
+  \ifcsdef{cms@opt@doi@#1}%
+  {\csuse{cms@opt@doi@#1}}
+  {\blx@err@invopt{doi=#1}{}}}
+\def\cms@opt@doi@true{%
+  \toggletrue{cms@doi}}
+\def\cms@opt@doi@false{%
+  \togglefalse{cms@doi}}
+\def\cms@opt@doi@only{%
+  \toggletrue{cms@doionly}}
+\DeclareBibliographyOption{eprint}[true]{%
+  \settoggle{cms@eprint}{#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@eprint}{#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]{%
+  \ifcsdef{cms@opt@doi@#1}%
+  {\iftoggle{cms@doi}%
+    {\togglefalse{cms@doi}%
+      \iftoggle{cms@doionly}%
+      {\togglefalse{cms@doionly}}% !!
+      {}}%
+    {\toggletrue{cms@doi}}% !!
+    \csuse{cms@opt@doi@#1}}
+  {\blx@err@invopt{doi=#1}{}}}
+\DeclareEntryOption{eprint}[true]{%
+  \settoggle{cms@eprint}{#1}}
+\DeclareEntryOption{numbermonth}[true]{%
+  \settoggle{cms@numbermonth}{#1}}
+\DeclareEntryOption{bookpages}[true]{%
+  \settoggle{cms@bookpages}{#1}}
+
+\ExecuteBibliographyOptions{includeall}%
+
+% More authordate options %
+
+\DeclareSortingScheme{cms}{
+  \sort{
+    \field{presort}
+  }
+  \sort[final]{
+    \field{sortkey}
+  }
+  \sort{
+    \name{sortname}
+    \name{author}
+    \name{namea}
+    \name{editor}
+    \name{nameb}
+    \name{translator}
+    \name{namec}
+    \field{sorttitle}
+    \field{journaltitle}
+    \list{organization}
+    \field{title}
+  }
+  \sort{
+    \field{sortyear}
+    \field{year}
+  }
+  \sort{
+    \field{sorttitle}
+    \field{title}
+  }
+  \sort{
+    \field[padside=left,padwidth=4,padchar=0]{volume}
+    \literal{0000}
+  }
+}
+
+\@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4
+{\DeclareLabelname{\field{shortauthor} \field{author}%
+    \field{shorteditor} \field{namea} \field{editor}%
+    \field{nameb} \field{translator} \field{namec}}}
+{\DeclareLabelname{shortauthor,author,shorteditor,namea,%
+    editor,nameb,translator,namec}}
+
+\DeclareEntryOption{switchdates}[true]{%
+  \settoggle{cms@switchdates}{#1}}
+
+\DeclareBibliographyOption{strict}[true]{%
+  \let\splitfootnoterule\footnoterule
+  \renewcommand\footnoterule{}%
+  \advance\skip\footins 4\p@\@plus2\p@\relax
+  \gdef\split@prev{0}
+  \let\pagefootnoterule\footnoterule
+  % \def\splitfootnoterule{\kern-3\p@ \hrule \kern2.6\p@}
+  \def\footnoterule{\relax
+    \ifnum\split@prev=\z@
+    \pagefootnoterule
+    \else
+    \splitfootnoterule
+    \fi
+    \xdef\split@prev{\the\insertpenalties}%
+  }}
+
+\protected\def\blx@newcunit{%
+  \global\let\blx@unitpunct\newcunitpunct
+  \global\toggletrue{blx@unit}}%
+
+\appto\blx@blxinit{%
+  \let\newcunit\blx@newcunit}
+
+\newcommand*{\newcunitpunct}{\addcomma\space}
+
+\def\mkbibcurdinal#1{%
+  \@tempcnta0#1 \the\@tempcnta}%
+
+\@ifpackagelater{biblatex}{2011/01/04}
+{}
+{\PackageError{biblatex}
+  {Outdated 'biblatex' package}
+  {The Chicago style requires biblatex v1.1 or later.\MessageBreak
+    You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak
+    This is a fatal error. I'm aborting now.}%
+  \endinput}
+
+% American-specific punctuation change for 16th edition %
+
+\DefineBibliographyExtras{american}{%
+  \DeclarePunctuationPairs{comma}{*!?}}
+
+%%%% Initialize and define bibstrings %%%%
+
+% \NewBibliographyString{origpubyear} % Already in .lbx files?
+
+% \DefineBibliographyStrings{american}{%
+%   origpubyear = {first published\addspace},}
+
+%%%% This one needed for 16th edition. Others in cms-*.lbx %%%%
+
+%%%% Macros from authoryear-comp.cbx, revised for CMS %%%%
+
+\newbibmacro*{cite:init}{%
+  \ifnumless{\value{multicitecount}}{2}
+    {\global\boolfalse{cbx:parens}%
+     \global\undef\cbx@lasthash
+     \global\undef\cbx@lastyear}
+    {\iffieldundef{prenote}
+       {}
+       {\global\undef\cbx@lasthash
+	\global\undef\cbx@lastyear}}}
+
+\newbibmacro*{cite:reinit}{%
+  \global\undef\cbx@lasthash
+  \global\undef\cbx@lastyear}
+
+\newbibmacro*{cite}{%
+  \ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+  {\usebibmacro{cite:ibid}}%
+  {\iffieldequalstr{entrysubtype}{classical}% Similar to notes+bib
+    {\iffieldundef{shorthand}%
+      {\ifthenelse{\ifnameundef{labelname}\OR
+          \iffieldequalstr{entrytype}{inreference}\OR
+          \iffieldequalstr{entrytype}{reference}}% Simplified for CMS
+        {\usebibmacro{cite:label}%
+          \setunit{\addspace}%
+          \usebibmacro{cite:reinit}}
+        {\iffieldequals{namehash}{\cbx@lasthash}%
+          {\iffieldundef{postnote}%
+            {\setunit{\compcitedelim}}%
+            {}%
+            \usebibmacro{cite:label}}
+          {\iffieldequals{namehash}{\cbx@lastyear}%
+            {}%
+            {\usebibmacro{cmsbracketname}% For names in []
+              \iffieldequalstr{entrytype}{customc}%
+              {\newcunit}%
+              {\setunit{\addspace}}}%
+            \usebibmacro{cite:label}%
+            \iffieldundef{postnote}%
+            {\savefield{namehash}{\cbx@lasthash}}%
+            {\savefield{namehash}{\cbx@lastyear}}}}}%
+      {\usebibmacro{cite:shorthand+title}}}
+    {\iffieldundef{shorthand}%
+      {\ifthenelse{\ifnameundef{labelname}\OR
+          \iffieldequalstr{entrytype}{inreference}\OR
+          \iffieldequalstr{entrytype}{reference}}% Simplified for CMS
+        {\usebibmacro{cite:label}%
+          \setunit{\addspace}%
+          \usebibmacro{cmscitesortdate}%
+          \usebibmacro{cite:reinit}}
+        {\iffieldequals{namehash}{\cbx@lasthash}%
+          {\iffieldundef{postnote}%
+            {\setunit{\compcitedelim}}%
+            {}%
+            \usebibmacro{cmscitesortdate}}
+          {\iffieldequals{namehash}{\cbx@lastyear}% Is this right?
+            {}%
+            {\usebibmacro{cmsbracketname}%
+              \setunit{\nameyeardelim}}%
+            \usebibmacro{cmscitesortdate}%
+            \iffieldundef{postnote}%
+            {\savefield{namehash}{\cbx@lasthash}}%
+            {\savefield{namehash}{\cbx@lastyear}}}}}%
+      {\usebibmacro{cite:shorthand}}}}%
+  \setunit{\multicitedelim}}% ???
+
+\newbibmacro*{cmsbracketname}{%
+  \iffieldequalstr{authortype}{anon}%
+  {\bibleftbracket\printnames{labelname}%
+    \bibrightbracket}%
+  {\iffieldequalstr{authortype}{anon?}%
+    {\bibleftbracket\printnames{labelname}?%
+      \bibrightbracket}%
+    {\printnames{labelname}}}}
+
+\newbibmacro*{citeyear}{%
+  \iffieldequalstr{entrysubtype}{classical}%
+  {\iffieldundef{shorthand}%
+    {\usebibmacro{citeyear:noshort}}%
+    {\iftoggle{cms@los}%
+      {\usebibmacro{citeyear:noshort}}%
+      {\usebibmacro{cite:shorthand+title}}}}%
+  {\iffieldundef{shorthand}%
+    {\usebibmacro{citeyear:noshort}}%
+    {\iftoggle{cms@los}%
+      {\usebibmacro{citeyear:noshort}}%
+      {\usebibmacro{cite:shorthand}}}}%
+  \setunit{\multicitedelim}}
+
+\newbibmacro*{citeyear:noshort}{%
+  \iffieldequalstr{entrysubtype}{classical}% Altered for CMS
+  {\iffieldequals{namehash}{\cbx@lasthash}%
+    {\iffieldundef{postnote}%
+      {\setunit{\compcitedelim}}%
+      {}%
+      \usebibmacro{cite:label}}
+    {\usebibmacro{cite:label}%
+      \iffieldundef{postnote}%
+      {\savefield{namehash}{\cbx@lasthash}}%
+      {}}}
+  {\iffieldequals{namehash}{\cbx@lasthash}%
+    {\iffieldundef{postnote}%
+      {\setunit{\compcitedelim}}%
+      {}%
+      \usebibmacro{cmscitesortdate}}
+    {\usebibmacro{cmscitesortdate}%
+      \iffieldundef{postnote}%
+      {\savefield{namehash}{\cbx@lasthash}}%
+      {}}}}%
+
+\newbibmacro*{textcite}{%
+  \iftoggle{cms@los}%
+  {\usebibmacro{textcite:authshort}}%
+  {\usebibmacro{textcite:citeshort}}}
+
+\newbibmacro*{textcite:authshort}{%
+  \iffieldequals{namehash}{\cbx@lasthash}
+  {\iffieldundef{postnote}%
+    {\iffieldequals{namehash}{\cbx@lastyear}%
+      {\setunit{\multicitedelim}%
+        \global\undef\cbx@lastyear}%
+      {\setunit{\compcitedelim}}}%
+    {\setunit{\multicitedelim}}%
+    \iffieldequalstr{entrysubtype}{classical}%
+    {\usebibmacro{cite:label}}%
+    {\usebibmacro{cmscitesortdate}}}%
+  {\iffieldundef{shorthand}
+    {\ifthenelse{\ifnameundef{labelname}\OR
+        \iffieldequalstr{entrytype}{inreference}\OR
+        \iffieldequalstr{entrytype}{reference}}%
+      {\iffieldequalstr{entrysubtype}{classical}%
+        {\setunit{%
+            \global\booltrue{cbx:parens}%
+            \addspace\bibopenparen}%
+          \ifnumequal{\value{citecount}}{1}%
+          {\usebibmacro{prenote}}
+          {}%
+          \usebibmacro{cite:label}}
+        {\usebibmacro{cite:label}%
+          \setunit{%
+            \global\booltrue{cbx:parens}%
+            \addspace\bibopenparen}%
+          \ifnumequal{\value{citecount}}{1}
+          {\usebibmacro{prenote}}
+          {}%
+          \usebibmacro{cmscitesortdate}}}
+      {\printnames{labelname}%
+	\setunit{%
+	  \global\booltrue{cbx:parens}%
+	  \addspace\bibopenparen}%
+	\ifnumequal{\value{citecount}}{1}
+        {\usebibmacro{prenote}}
+        {}%
+        \iffieldequalstr{entrysubtype}{classical}%
+        {\usebibmacro{cite:label}}
+        {\usebibmacro{cmscitesortdate}}%
+        \savefield{namehash}{\cbx@lasthash}}}
+    {\printfield{shorthand}%
+      \setunit{%
+        \global\booltrue{cbx:parens}%
+        \addspace\bibopenparen}%
+      \ifnumequal{\value{citecount}}{1}%
+      {\usebibmacro{prenote}}%
+      {}%
+      \iffieldequalstr{entrysubtype}{classical}%
+      {\usebibmacro{cite:label}}
+      {\usebibmacro{cmscitesortdate}}%
+      \savefield{namehash}{\cbx@lasthash}}}%
+  \setunit{%
+    \ifbool{cbx:parens}%
+    {\bibcloseparen\global\boolfalse{cbx:parens}}%
+    {}%
+    \multicitedelim}}
+
+\newbibmacro*{textcite:citeshort}{%
+  \iffieldequals{namehash}{\cbx@lasthash}
+  {\iffieldundef{shorthand}
+    {\iffieldundef{postnote}%
+      {\iffieldequals{namehash}{\cbx@lastyear}%
+        {\setunit{\multicitedelim}%
+          \global\undef\cbx@lastyear}%
+        {\setunit{\compcitedelim}}}%
+      {\setunit{\multicitedelim}}%
+      \iffieldequalstr{entrysubtype}{classical}%
+      {\usebibmacro{cite:label}}%
+      {\usebibmacro{cmscitesortdate}}}
+    {\iffieldundef{postnote}%
+      {\iffieldequals{namehash}{\cbx@lastyear}%
+        {\setunit{\multicitedelim}%
+          \global\undef\cbx@lastyear}%
+        {\setunit{\compcitedelim}}}%
+      {\setunit{\multicitedelim}}%
+      \printtext[bibhyperref]{%
+        \printfield{shorthand}}}}%
+  {\ifthenelse{\ifnameundef{labelname}\OR
+      \iffieldequalstr{entrytype}{inreference}\OR
+      \iffieldequalstr{entrytype}{reference}}%
+    {\iffieldundef{shorthand}
+      {\iffieldequalstr{entrysubtype}{classical}%
+        {\setunit{%
+            \global\booltrue{cbx:parens}%
+            \addspace\bibopenparen}%
+          \ifnumequal{\value{citecount}}{1}%
+          {\usebibmacro{prenote}}
+          {}%
+          \usebibmacro{cite:label}}
+        {\usebibmacro{cite:label}%
+          \setunit{%
+            \global\booltrue{cbx:parens}%
+            \addspace\bibopenparen}%
+          \ifnumequal{\value{citecount}}{1}
+          {\usebibmacro{prenote}}
+          {}%
+          \usebibmacro{cmscitesortdate}}}
+      {\printtext[bibhyperref]{%
+          \printfield{shorthand}}}}
+    {\printnames{labelname}%
+      \setunit{%
+        \global\booltrue{cbx:parens}%
+        \addspace\bibopenparen}%
+      \ifnumequal{\value{citecount}}{1}
+      {\usebibmacro{prenote}}
+      {}%
+      \iffieldundef{shorthand}
+      {\iffieldequalstr{entrysubtype}{classical}%
+        {\usebibmacro{cite:label}}
+        {\usebibmacro{cmscitesortdate}}}%
+      {\printtext[bibhyperref]{%
+          \printfield{shorthand}}}%
+      \savefield{namehash}{\cbx@lasthash}}}%
+  \setunit{%
+    \ifbool{cbx:parens}
+    {\bibcloseparen\global\boolfalse{cbx:parens}}
+    {}%
+    \multicitedelim}}
+
+\newbibmacro*{textcite:postnote}{%
+  \iffieldundef{postnote}%
+  {}%
+  {\savefield{namehash}{\cbx@lastyear}%
+    \setunit{\postnotedelim}%
+    \printfield{postnote}}%
+  \ifthenelse{\value{multicitecount}=\value{multicitetotal}}%
+  {\setunit{}%
+    \printtext{%
+      \ifbool{cbx:parens}
+      {\bibcloseparen\global\boolfalse{cbx:parens}}
+      {}}}%
+  {\setunit{%
+      \ifbool{cbx:parens}
+      {\bibcloseparen\global\boolfalse{cbx:parens}}
+      {}%
+      \multicitedelim}}}
+
+\newbibmacro*{cite:shorthand}{%
+  \iftoggle{cms@los}%
+  {\iffieldequals{namehash}{\cbx@lasthash}%
+    {\printtext[bibhyperref]{%
+        \setunit{\compcitedelim}%
+        \usebibmacro{cmscitesortdate}}}
+    {\printtext[bibhyperref]{%
+        \printfield{shorthand}%
+        \setunit{\nameyeardelim}%
+        \usebibmacro{cmscitesortdate}}%
+      \savefield{namehash}{\cbx@lasthash}}}%
+  {\printtext[bibhyperref]{\printfield{shorthand}}%
+    \usebibmacro{cite:reinit}}}
+
+\newbibmacro*{cite:shorthand+title}{%
+  \iftoggle{cms@los}%
+  {\iffieldequals{namehash}{\cbx@lasthash}%
+    {\printtext[bibhyperref]{%
+        \setunit{\compcitedelim}%
+        \usebibmacro{cite:label}}}
+    {\printtext[bibhyperref]{%
+        \printfield{shorthand}%
+        \setunit{\nameyeardelim}%
+        \usebibmacro{cite:label}}%
+      \savefield{namehash}{\cbx@lasthash}}}%
+  {\printtext[bibhyperref]{\printfield{shorthand}}%
+    \usebibmacro{cite:reinit}}}
+
+\newbibmacro*{cite:label}{% Test this
+  \iffieldundef{label}%
+  {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT%
+      \iffieldequalstr{entrytype}{periodical}}% Simplifies .bib creation
+    {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}}}%
+    {\iffieldequalstr{entrytype}{manual}%
+      {\printtext[bibhyperref]{\printlist{organization}}}%
+      {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}}}%
+  {\printtext[bibhyperref]{\printfield{label}}}}
+
+\newbibmacro*{cite:labelyear+extrayear}{%
+  \ifboolexpr{ (
+    test {\iffieldequalstr{entrytype}{music}}%
+    or
+    test {\iffieldequalstr{entrytype}{review}}%
+    or
+    test {\iffieldequalstr{entrytype}{video}}%
+    )
+    and
+    togl {cms@avdate}
+  }%
+  {\usebibmacro{cite:av+labelyear+extrayear}}%
+  {\usebibmacro{cite:standard+labelyear+extrayear}}}
+
+\newbibmacro*{cite:standard+labelyear+extrayear}{%
+  \iffieldundef{labelyear}
+  {\ifboolexpr{
+      test {\iffieldequalstr{entrytype}{misc}}
+      or
+      test {\iffieldequalstr{entrytype}{inreference}}
+      or
+      test {\iffieldequalstr{entrytype}{reference}}
+      or
+      not togl {cms@nodates}
+    }%
+    {}%
+    {\printtext[bibhyperref]{\bibstring{nodate}}}}% For CMS?
+  {\printtext[bibhyperref]{%
+      \iffieldundef{year}%
+      {\iffieldundef{eventyear}
+        {\iffieldundef{origyear}%
+          {\printfield{labelyear}%
+            \iffieldundef{extrayear}%
+            {}%
+            {\setunit*{}%
+              \printfield{extrayear}}%
+            \iffieldundef{urlendyear}%
+            {}%
+            {\iffieldequalstr{urlendyear}{}%
+              {\mbox{\bibdatedash}}%
+              {}}}%
+          {\printfield{labelyear}%
+            \iffieldundef{extrayear}%
+            {}%
+            {\setunit*{}%
+              \printfield{extrayear}}%
+            \iffieldundef{origendyear}%
+            {}%
+            {\iffieldequalstr{origendyear}{}%
+              {\mbox{\bibdatedash}}%
+              {}}}}
+        {\printfield{labelyear}%
+          \iffieldundef{extrayear}%
+          {}%
+          {\setunit*{}%
+            \printfield{extrayear}}%
+          \iffieldundef{eventendyear}%
+          {}%
+          {\iffieldequalstr{eventendyear}{}%
+            {\mbox{\bibdatedash}}%
+            {}}}}
+      {\printfield{labelyear}%
+        \iffieldundef{extrayear}%
+        {}%
+        {\setunit*{}%
+          \printfield{extrayear}}%
+        \iffieldundef{endyear}% DATE FIX
+        {}%
+        {\iffieldequalstr{endyear}{}%
+          {\mbox{\bibdatedash}}%
+          {}}}}}}
+
+\newbibmacro*{cite:av+labelyear+extrayear}{%
+  \iffieldundef{labelyear}
+  {\ifboolexpr{
+      test {\iffieldequalstr{entrytype}{misc}}
+      or
+      test {\iffieldequalstr{entrytype}{inreference}}
+      or
+      test {\iffieldequalstr{entrytype}{reference}}
+      or
+      not togl {cms@nodates}
+    }%
+    {}%
+    {\printtext[bibhyperref]{\bibstring{nodate}}}}% For CMS?
+  {\printtext[bibhyperref]{%
+      \iffieldundef{eventyear}%
+      {\iffieldundef{origyear}
+        {\iffieldundef{year}%
+          {\printfield{labelyear}%
+            \iffieldundef{extrayear}%
+            {}%
+            {\setunit*{}%
+              \printfield{extrayear}}%
+            \iffieldundef{urlendyear}%
+            {}%
+            {\iffieldequalstr{urlendyear}{}%
+              {\mbox{\bibdatedash}}%
+              {}}}%
+          {\printfield{labelyear}%
+            \iffieldundef{extrayear}%
+            {}%
+            {\setunit*{}%
+              \printfield{extrayear}}%
+            \iffieldundef{endyear}%
+            {}%
+            {\iffieldequalstr{endyear}{}%
+              {\mbox{\bibdatedash}}%
+              {}}}}
+        {\printfield{labelyear}%
+          \iffieldundef{extrayear}%
+          {}%
+          {\setunit*{}%
+            \printfield{extrayear}}%
+          \iffieldundef{origendyear}%
+          {}%
+          {\iffieldequalstr{origendyear}{}%
+            {\mbox{\bibdatedash}}%
+            {}}}}
+      {\printfield{labelyear}%
+        \iffieldundef{extrayear}%
+        {}%
+        {\setunit*{}%
+          \printfield{extrayear}}%
+        \iffieldundef{eventendyear}% DATE FIX
+        {}%
+        {\iffieldequalstr{eventendyear}{}%
+          {\mbox{\bibdatedash}}%
+          {}}}}}}
+
+\newbibmacro*{cmscitesortdate}{% Attempt to solve date-related problems
+  \ifboolexpr{%
+    test {\iffieldundef{origyear}}
+    or
+    not test {\iffieldint{origyear}}
+  }%
+  {\usebibmacro{cmsciteyear}}%
+  {\iffieldint{year}%
+    {\ifboolexpr{% Needed for date ranges
+        test {\iffieldundef{endyear}}%
+        or
+        not test {\iffieldnum{endyear}}
+      }%
+      {\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}{%
+  \iftoggle{cms@origlabel}%
+  {\usebibmacro{cite:origyear+labelyear}}%
+  {\iftoggle{cms@bothlabelnew}%
+    {\usebibmacro{cite:bothyear+oldstyle}}%
+    {\iftoggle{cms@bothlabelold}%
+      {\usebibmacro{cite:bothyear+oldstyle}}%
+      {\iftoggle{cms@fulldate}%
+        {\newcunit\printdate}%
+        {\usebibmacro{cite:labelyear+extrayear}}}}}%
+  \ifcsdef{@cms@tempdate}%
+  {\toggletrue{\@cms@tempdate}}%
+  {}}
+
+\newbibmacro*{cite:origyear+labelyear}{%
+  \iftoggle{cms@switchdates}%
+  {\usebibmacro{cite:labelyear+extrayear}}
+  {\iffieldundef{origyear}%
+    {\usebibmacro{cite:labelyear+extrayear}}%
+    {\printtext[bibhyperref]{%
+        \printfield{origyear}}}}}
+
+\newbibmacro*{cite:bothyear+oldstyle}{%
+  \iftoggle{cms@switchdates}%
+  {\printtext[bibhyperref]{%
+      \bibopenparen%
+      \usebibmacro{cite:labelyear+extrayear}%
+      \bibcloseparen%
+      \addspace\printfield{origyear}}}%
+  {\iffieldundef{origyear}%
+    {\usebibmacro{cite:labelyear+extrayear}}%
+    {\printtext[bibhyperref]{%
+        \printfield[parens]{origyear}%
+        \addspace\printfield{labelyear}}}}}
+
+\newbibmacro*{cite:save}{%
+  \savefield{entrykey}{\cbx@lastkey}}
+
+\newbibmacro*{cite:ibid}{%
+  \iftoggle{cms@noibid}%
+  {\blx@ibidreset%
+    \usebibmacro{cite}}%
+  {\ifthenelse{\iffieldundef{prenote}\AND%
+      \iffieldundef{postnote}}%
+    {\blx@ibidreset%
+      \usebibmacro{cite}%
+      \PackageWarning{biblatex-chicago}%
+      {Empty Ibidem citation}}%
+    {\toggletrue{cms@inlineibid}}}}
+
+%%%% Citation Commands, internal and external %%%%
+
+\DeclareCiteCommand{\cite}
+  {\usebibmacro{cite:init}%
+    \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}}
+  {}%\multicitedelim
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand*{\cite}
+  {\usebibmacro{cite:init}%
+    \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{citeyear}}
+  {}%\multicitedelim
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\parencite}[\mkbibparens]
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}}
+  {}%\setunit{\multicitedelim}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand*{\parencite}[\mkbibparens]
+  {\usebibmacro{cite:init}%
+    \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{citeyear}}
+  {}%\setunit{\multicitedelim}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\footcite}[\mkbibfootnote]
+  {\usebibmacro{cite:init}%
+    \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}}
+  {}%\multicitedelim
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\footcitetext}[\mkbibfootnotetext]
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}}
+  {}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\textcite}
+  {\usebibmacro{cite:init}}
+  {\usebibmacro{citeindex}%
+    \usebibmacro{textcite}}
+  {}
+  {\usebibmacro{textcite:postnote}}
+
+\DeclareMultiCiteCommand{\cites}{\cite}{\setunit{\multicitedelim}}
+
+\DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}%
+   {\setunit{\multicitedelim}}
+
+\DeclareMultiCiteCommand{\footcites}[\mkbibfootnote]{\footcite}%
+   {\setunit{\multicitedelim}}
+
+\DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext]%
+   {\footcitetext}{\setunit{\multicitedelim}}
+
+\DeclareMultiCiteCommand{\textcites}{\textcite}{}
+
+\DeclareCiteCommand{\bibxrefcite}
+  {\usebibmacro{cite:init}}%\usebibmacro{clearalmostall}} (?)
+  {\usebibmacro{cms-in:}%
+    \blx@ibidreset% For authordate style
+    \usebibmacro{cite}}
+  {}
+  {}
+
+\DeclareCiteCommand{\origfullcite}
+  {\nopunct\unspace%
+  \savebibmacro{cmsbibsortdate}%
+  \renewbibmacro*{cmsbibsortdate}{}}%
+  {\usedriver
+    {\DeclareNameAlias{sortname}{default}\clearfield{postnote}
+      \clearname{author}\clearfield{userf}%\toggletrue{cms@fullnote}%
+      \toggletrue{cms@headlessnote}\frenchspacing}%
+    {\thefield{entrytype}}}%
+  {\multicitedelim}%
+  {\restorebibmacro{cmsbibsortdate}}
+
+\DeclareCiteCommand{\origpublcite}% Similar to above, w/o title.
+  {\nopunct\unspace%
+    \savebibmacro{cmsbibsortdate}%
+    \renewbibmacro*{cmsbibsortdate}{}}%
+  {\usedriver
+    {\DeclareNameAlias{sortname}{default}\clearfield{postnote}%
+      \usebibmacro{clearpublin}%
+      \toggletrue{cms@headlessnote}%\toggletrue{cms@fullnote}%
+      \toggletrue{cms@origpublished}\frenchspacing}%
+    {\thefield{entrytype}}}%
+  {\multicitedelim}%
+  {\restorebibmacro{cmsbibsortdate}}
+
+%%%% List Formats %%%%
+
+\DeclareListFormat{language}{%
+  \ifthenelse{\value{listcount}=1}%
+  {\bibleftbracket\bibstring{inlang}%\addspace - for inflected langs.
+    \ifbibstring{#1}
+    {\bibstring{#1}}
+    {\ifbibstring{lang#1}
+      {\bibstring{lang#1}}
+      {#1}}%
+    \ifthenelse{\value{listtotal}=1}%
+    {\bibrightbracket}%
+    {}}%
+  {\ifthenelse{\value{listcount}=\value{listtotal}}%
+    {\multilangdelim%
+      \ifbibstring{#1}
+      {\bibstring{#1}}
+      {\ifbibstring{lang#1}
+        {\bibstring{lang#1}}
+        {#1}}%
+      \bibrightbracket}%
+    {\multilangdelim%
+      \ifbibstring{#1}
+      {\bibstring{#1}}
+      {\ifbibstring{lang#1}
+        {\bibstring{lang#1}}
+        {#1}}}}%
+  \usebibmacro{langlist:andothers}}
+
+\DeclareListFormat{publisher}{%
+  \ifthenelse{\value{listtotal}<2}%
+  {#1\isdot}%
+  {\ifthenelse{\value{listcount}=1}%
+    {#1}%
+    {\multipubsdelim #1\isdot}}}
+
+\DeclareListFormat{periodplace}{\mkbibparens{#1}}
+
+\DeclareListFormat{lista}{% 
+  \ifthenelse{\value{listtotal}<2}
+  {s\adddot v\adddot\addspace\mkbibquote{#1\isdot}}%
+  {\ifthenelse{\value{listcount}=1}%
+    {s\adddot vv\adddot\addspace \mkbibquote{#1\isdot}\addcomma}%
+    {\ifthenelse{\value{listcount}<\value{listtotal}}%
+      {\addspace\mkbibquote{#1\isdot}\addcomma}%
+      {\addspace\mkbibquote{#1\isdot}}}}}
+
+%%%% Field Formats -- Title, Citetitle, Lostitle %%%%
+
+\DeclareFieldFormat[article]{title}{%
+  \iffieldundef{title}%
+  {}%
+  {\MakeSentenceCase*{#1}}}
+
+\DeclareFieldAlias[article]{citetitle}[article]{lostitle}
+
+\DeclareFieldFormat[article]{lostitle}{\MakeSentenceCase*{#1}}
+
+\DeclareFieldFormat[artwork]{title}{%
+  \iffieldundef{entrysubtype}%
+  {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
+  {\MakeSentenceCase*{#1}\isdot}}
+
+\DeclareFieldAlias[artwork]{citetitle}[artwork]{title}
+
+\DeclareFieldAlias[artwork]{lostitle}[artwork]{title}
+
+\DeclareFieldFormat[book]{title}{%
+  \mkbibemph{\MakeSentenceCase*{#1}}\isdot}
+
+\DeclareFieldAlias[book]{citetitle}[book]{title}
+
+\DeclareFieldAlias[book]{lostitle}[book]{title}
+
+\DeclareFieldAlias[bookinbook]{title}[book]{title}
+
+\DeclareFieldAlias[bookinbook]{citetitle}[book]{title}
+
+\DeclareFieldAlias[bookinbook]{lostitle}[book]{title}
+
+\DeclareFieldAlias[collection]{title}[book]{title}
+
+\DeclareFieldAlias[collection]{citetitle}[book]{title}
+
+\DeclareFieldAlias[collection]{lostitle}[book]{lostitle}
+
+\DeclareFieldFormat[periodical]{title}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldFormat[periodical]{citetitle}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldFormat[periodical]{lostitle}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldAlias[image]{title}[artwork]{title}
+
+\DeclareFieldAlias[image]{citetitle}[artwork]{title}
+
+\DeclareFieldAlias[image]{lostitle}[artwork]{lostitle}
+
+\DeclareFieldAlias[incollection]{title}[article]{title}% Change article?
+
+\DeclareFieldAlias[incollection]{citetitle}[article]{title}
+
+\DeclareFieldAlias[incollection]{lostitle}[article]{lostitle}
+
+\DeclareFieldAlias[inreference]{title}[book]{title}
+
+\DeclareFieldAlias[inreference]{citetitle}[book]{title}
+
+\DeclareFieldAlias[inreference]{lostitle}[book]{lostitle}
+
+\DeclareFieldAlias[reference]{title}[book]{title}
+
+\DeclareFieldAlias[reference]{citetitle}[book]{title}
+
+\DeclareFieldAlias[reference]{lostitle}[book]{lostitle}
+
+\DeclareFieldFormat[letter]{title}{#1\isdot}
+
+\DeclareFieldFormat[letter]{citetitle}{#1\isdot}
+
+\DeclareFieldFormat[letter]{lostitle}{#1\isdot}
+
+\DeclareFieldAlias[inproceedings]{title}[article]{title}% As above
+
+\DeclareFieldAlias[inproceedings]{citetitle}[article]{title}
+
+\DeclareFieldAlias[inproceedings]{lostitle}[article]{lostitle}
+
+\DeclareFieldAlias[thesis]{title}[article]{title}
+
+\DeclareFieldAlias[thesis]{citetitle}[article]{title}
+
+\DeclareFieldAlias[thesis]{lostitle}[article]{lostitle}
+
+\DeclareFieldAlias[patent]{title}[article]{lostitle}% 16th ed.
+
+\DeclareFieldAlias[patent]{citetitle}[article]{title}
+
+\DeclareFieldAlias[patent]{lostitle}[article]{lostitle}
+
+\DeclareFieldAlias[unpublished]{title}[article]{title}
+
+\DeclareFieldAlias[unpublished]{citetitle}[article]{citetitle}
+
+\DeclareFieldAlias[unpublished]{lostitle}[article]{lostitle}
+
+\DeclareFieldFormat{postnote}{% Removed \isdots -- required
+  \iffieldundef{pagination}%    elsewhere also?
+  {#1}%
+  {\mkpageprefix[pagination]{#1}}}
+
+\DeclareFieldFormat[inreference]{postnote}{%
+  \iffieldundef{pagination}%
+    {s\adddot v\adddot\addspace\mkbibquote{#1}}
+    {\mkpageprefix[pagination]{#1}}}% Removed \isdots here, also.
+
+\DeclareFieldFormat{pages}{%
+  \iffieldundef{bookpagination}%
+  {#1\isdot}%
+  {\mkpageprefix[bookpagination]{#1\isdot}}}
+
+\DeclareFieldFormat{bibnote}{\MakeCapital{#1}}
+
+\DeclareFieldFormat{edlang}{%
+  \ifbibstring{#1}
+  {\bibstring{#1}}
+  {\ifbibstring{ed#1}
+    {\bibstring{ed#1}}
+    {\ifcapital{\MakeCapital{#1}}{#1}}}}
+
+\DeclareFieldAlias[inbook]{title}[article]{title}
+
+\DeclareFieldAlias[inbook]{citetitle}[article]{title}
+
+\DeclareFieldAlias[inbook]{lostitle}[article]{lostitle}
+
+\DeclareFieldFormat[suppbook]{title}{%
+  \mkbibemph{\MakeSentenceCase*{#1}}\isdot}
+
+\DeclareFieldAlias[suppbook]{citetitle}[suppbook]{lostitle}
+
+\DeclareFieldFormat[suppbook]{lostitle}{%
+  \usebibmacro{inforaft}%
+  \addspace%
+  \mkbibemph{\MakeSentenceCase*{#1}}\isdot}
+
+\DeclareFieldFormat[customc]{title}{%
+  \iffieldundef{nameaddon}%
+  {\mkbibemph{\bibstring{see}}%
+    \addspace%
+    #1}%
+  {#1}}
+
+\DeclareFieldFormat[customc]{citetitle}{%
+  \ifnameundef{author}%
+  {#1}
+  {\iffieldundef{nameaddon}%
+    {\mkbibemph{\bibstring{see}}%
+      \addspace%
+      #1}%
+    {\printfield{nameaddon}\addspace #1}}}
+
+\DeclareFieldAlias[suppcollection]{title}[suppbook]{title}
+
+\DeclareFieldAlias[suppcollection]{citetitle}[suppbook]{lostitle}
+
+\DeclareFieldAlias[suppcollection]{lostitle}[suppbook]{lostitle}
+
+\DeclareFieldAlias[booklet]{title}[book]{title}
+
+\DeclareFieldAlias[booklet]{citetitle}[book]{citetitle}
+
+\DeclareFieldAlias[booklet]{lostitle}[book]{lostitle}
+
+\DeclareFieldAlias[manual]{title}[book]{title}
+
+\DeclareFieldAlias[manual]{citetitle}[book]{citetitle}
+
+\DeclareFieldAlias[manual]{lostitle}[book]{lostitle}
+
+\DeclareFieldAlias[report]{title}[book]{title}
+
+\DeclareFieldAlias[report]{citetitle}[book]{citetitle}
+
+\DeclareFieldAlias[report]{lostitle}[book]{lostitle}
+
+\DeclareFieldFormat[misc]{title}{%
+  \iffieldundef{entrysubtype}%
+  {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
+  {\ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}}
+
+\DeclareFieldAlias[misc]{citetitle}[misc]{title}
+
+\DeclareFieldAlias[misc]{lostitle}[misc]{title}
+
+\DeclareFieldFormat[review]{title}{%
+  \ifcapital{\MakeCapital{#1\isdot}}%
+  {#1\isdot}}
+
+\DeclareFieldAlias[review]{lostitle}[review]{title}
+
+\DeclareFieldAlias[review]{citetitle}[review]{title}
+
+\DeclareFieldAlias[suppperiodical]{title}[review]{title}
+
+\DeclareFieldAlias[suppperiodical]{citetitle}[review]{title}
+
+\DeclareFieldAlias[suppperiodical]{lostitle}[review]{title}
+
+\DeclareFieldAlias[online]{title}[article]{title}
+
+\DeclareFieldAlias[online]{citetitle}[article]{title}
+
+\DeclareFieldAlias[online]{lostitle}[article]{lostitle}
+
+\DeclareFieldFormat{booktitle}{\mkbibemph{\MakeSentenceCase*{#1}}}
+
+\DeclareFieldFormat{maintitle}{\mkbibemph{\MakeSentenceCase*{#1}}}
+
+\DeclareFieldFormat[video]{title}{%
+  \iffieldundef{booktitle}%
+  {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
+  {\MakeSentenceCase*{#1}\isdot}}
+
+\DeclareFieldAlias[video]{citetitle}[video]{title}
+
+\DeclareFieldAlias[video]{lostitle}[video]{title}
+
+\DeclareFieldAlias[music]{title}[video]{title}
+
+\DeclareFieldAlias[music]{citetitle}[video]{title}
+
+\DeclareFieldAlias[music]{lostitle}[video]{title}
+
+\DeclareFieldAlias[audio]{title}[video]{title}
+
+\DeclareFieldAlias[audio]{citetitle}[video]{title}
+
+\DeclareFieldAlias[audio]{lostitle}[video]{title}
+
+%%%% Other Field Formats %%%%
+
+\DeclareNumChars*{:}%
+
+\DeclareFieldFormat{letterday}{\mkbibcurdinal{#1}}
+
+\DeclareFieldFormat{note}{%
+  \ifcapital{\MakeCapital{#1}}{#1}}%
+
+\DeclareFieldFormat[suppbook]{type}{%
+  \ifbibstring{#1}%
+  {\bibstring{#1}}%
+  {\ifcapital%
+    {\MakeCapital{#1}}%
+    {#1}}}
+
+\DeclareFieldFormat[artwork]{type}{%
+  \ifcapital%
+  {\MakeCapital{#1}}%
+  {#1}}
+
+\DeclareFieldAlias[image]{type}[artwork]{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}{%
+  \textrm{doi}\addcolon
+  \ifhyperref
+    {\href{http://dx.doi.org/#1}{\nolinkurl{#1}}}
+    {\nolinkurl{#1}}}
+
+\DeclareFieldFormat{urldate}{% 16th ed.
+  \iffieldundef{userd}%
+  {\bibstring{urlseen}\space #1}%
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat[video]{urldate}{% 16th ed.
+  \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}}%
+  {\bibstring{urlseen}\space #1}%
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat[music]{urldate}{% 16th ed.
+  \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}%
+    \OR\NOT\iffieldundef{origyear}}%
+  {\bibstring{urlseen}\space #1}%
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat[music]{origdate}{% 16th ed.
+  \iftoggle{cms@reprint}% Date fix
+  {#1}%
+  {\ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}}%
+    {\bibstring{recorded}\space #1}%
+    {\printfield{userd}\addspace #1}}}
+
+\DeclareFieldFormat[music]{eventdate}{% 16th ed.
+  \iffieldundef{userd}%
+  {\bibstring{recorded}\space #1}%
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat[video]{eventdate}{% 16th ed.
+  \iffieldundef{userd}%
+  {\bibstring{broadcast}\space #1}%
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldAlias{userd}{titleaddon}% 16th ed.
+
+\DeclareFieldFormat{nameaddon}{\mkbibbrackets{#1\bibsentence}}% ?!
+
+\DeclareFieldFormat[review]{nameaddon}{#1\bibsentence}% 16th ed.
+
+\DeclareFieldFormat[customc]{nameaddon}{% For cross-refs
+  \ifbibstring{#1}%
+  {\mkbibemph{\bibstring{#1}}}%
+  {#1}}%
+
+\DeclareFieldFormat{edition}{% New in 0.8
+  \ifinteger{#1}
+  {\mkbibordinal{#1}~\bibstring{edition}}%
+  {\ifcapital
+    {\MakeCapital{#1\isdot}}%
+    {#1\isdot}}}
+
+\DeclareFieldFormat{usere}{[#1]} % Better than mkbibbrackets?
+
+\DeclareFieldFormat{titleaddon}{%
+  \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}%\custpunctc?
+
+\DeclareFieldAlias{booktitleaddon}{titleaddon}
+
+\DeclareFieldAlias{maintitleaddon}{titleaddon}
+
+\DeclareFieldFormat{issuetitle}{\MakeSentenceCase*{#1\isdot}}
+
+\DeclareFieldFormat{jourser}{%
+  \ifinteger{#1}%
+  {\mkbibordinal{#1}%
+    \addnbspace%
+    \bibstring{jourser}}%
+  {\ifbibstring{#1}{\bibstring{#1}}{#1}}}
+
+\DeclareFieldFormat{journum}{% Revised for 0.9.5
+  \ifboolexpr{%
+    test {\ifnumerals{#1}}
+    and
+    not test {\ifnumeral{#1}}
+  }%
+  {\bibstring{numbers}\addspace #1}%
+  {\bibstring{number}\addspace #1}}
+
+\DeclareFieldFormat{sernum}{%
+  \ifnumeral{#1}%
+  {\addnbspace #1}%
+  {\addcomma\addspace #1}}
+
+\DeclareFieldFormat{addendum}{%
+  \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}
+
+% This works better here than in the entrytail macro -- userf use is
+% no longer a problem, though the page breaking still isn't ideal.
+
+\DeclareFieldFormat{annotation}{\par\nobreak \vskip \bibitemsep #1}
+
+\DeclareFieldFormat{part}{\addcomma\bibstring{partvolume}~#1}
+
+\DeclareFieldAlias[review]{volume}[article]{volume}
+
+\DeclareFieldAlias[suppperiodical]{volume}[article]{volume}
+
+%%%% Commands, for users and internal %%%%
+
+\newcommand*{\cbytypeeditor}{% Needed?
+  \iffieldundef{editortype}
+    {\bibstring{cbytypeeditor}}
+    {\bibstring{cbytype\thefield{editortype}}}}
+
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
+
+\renewcommand*{\nameyeardelim}{%
+  \iffieldundef{origyear}% Is this test correct?
+  {\iffieldundef{year}%
+    {\addspace}
+    {\NumCheckSetup{\renewcommand{\mkbibbrackets}{\expandonce}%
+        \DeclareNumChars*{[?]s}}% For bracketed dates, and decades.
+      \iffieldnums{year}% This one works.
+    {\addspace}%
+    {\iffieldequalstr{year}{\bibstring{nodate}}% This also works.
+      {\addspace}
+      {\addcomma\addspace}}}}%
+  {\addspace}}
+
+\newcommand{\classicpunct}{%
+  \ifthenelse{\iffieldequalstr{entrysubtype}{classical}\OR%
+    \iffieldequalstr{entrytype}{letter}}%
+  {\setunit*{\addspace}}%
+  {\setunit*{\addcomma\addspace}}}
+
+\newcommand{\parttrans}{%
+  {\bibstring{bytranslator}\space}}%
+
+\newcommand{\partedit}{%
+  \iftoggle{cms@postposit}% Kludge to make it work in French.
+  {\bibstring{byeditoralt}\addspace}%
+  {\bibstring{byeditor}\addspace}}%
+
+\newcommand{\partcomp}{%
+  {\bibstring{bycompiler}\space}}%
+
+\newcommand{\parteditandcomp}{%
+  {\bibstring{byeditorcp}\space}}%
+
+\newcommand{\parttransandcomp}{%
+  {\bibstring{bytranslatorcp}\space}}%
+
+\newcommand{\partedittransandcomp}{%
+  {\bibstring{byeditortrcp}\space}}%
+
+\newcommand{\parteditandtrans}{%
+  {\bibstring{byeditortr}\space}}%
+
+\newcommand{\reprint}{\bibstring{reprint}}%
+
+\newcommand*{\multipubsdelim}{\addnbspace/\addspace}
+
+\newcommand*{\multilocsdelim}{%
+  \ifthenelse{\value{listcount}<\value{liststop}}%
+    {\ifthenelse{\numexpr\value{listcount}+1<\value{liststop}}%
+       {\addcomma\addspace}%
+       {\ifthenelse{\value{liststop}>2}%
+         {\addcomma\addspace\bibstring{and}\addspace}%
+         {\addspace\bibstring{and}\addspace}}}%
+       {}}
+
+\newcommand*{\multilangdelim}{%
+  \ifthenelse{\value{listtotal}<3}%
+  {\addspace\bibstring{and}\addspace}%
+  {\ifthenelse{\value{listcount}<\value{listtotal}}%
+    {\addcomma\addspace}%
+    {\addcomma\addspace\bibstring{and}\addspace}}}
+
+\renewcommand*{\postnotedelim}{%
+  \iftoggle{cms@inlineibid}%
+  {\togglefalse{cms@inlineibid}}%
+  {\iffieldequalstr{entrysubtype}{classical}% For Notes+Bib, too?
+    {\NumCheckSetup{\DeclareNumChars*{abcdeABCDE}}%
+      \iffieldpages{postnote}%
+      {\addspace}%
+      {\addcomma\addspace}}%
+    {\addcomma\addspace}}}
+
+\newcommand*{\editordelim}{% Otherwise you get an inaccurate comma.
+  \iffieldequalstr{editortype}{none}%
+  {\addperiod\addspace}%
+  {\addcomma\addspace}}
+
+\newcommand*{\lbx@cfromlang}{%
+  \iffieldundef{userf}
+  {\iffieldundef{origlanguage}
+    {\unspace}
+    {\bibstring{cfrom\thefield{origlanguage}}}}%
+  {\unspace}}
+
+\@ifpackagelater{biblatex}{2011/11/12}
+{\renewcommand*{\lbx@fromlang}{%
+    \iffieldundef{userf}
+    {\iffieldundef{origlanguage}
+      {\unspace}
+      {\bibstring{from\thefield{origlanguage}}}}%
+    {\unspace}}}
+{\@ifpackagelater{biblatex}{2011/07/28}
+  {\newcommand*{\lbx@fromlang}{%
+      \iffieldundef{userf}
+      {\iffieldundef{origlanguage}
+        {\unspace}
+        {\bibstring{from\thefield{origlanguage}}}}%
+      {\unspace}}}%
+  {\renewcommand*{\lbx@fromlang}{%
+      \iffieldundef{userf}
+      {\iffieldundef{origlanguage}
+        {\unspace}
+        {\bibstring{from\thefield{origlanguage}}}}%
+      {\unspace}}}}
+
+\renewcommand*{\lbx@lfromlang}{%
+  \iffieldundef{userf}
+  {\iffieldundef{origlanguage}
+    {\unspace}
+    {\biblstring{from\thefield{origlanguage}}}}%
+  {\unspace}}
+
+\renewcommand*{\lbx@sfromlang}{%
+  \iffieldundef{userf}
+  {\iffieldundef{origlanguage}
+    {\unspace}
+    {\bibsstring{from\thefield{origlanguage}}}}%
+  {\unspace}}
+
+%%%% Formatting macros, called both by cbx and bbx %%%%
+
+\newbibmacro*{finentry}{%{\finentry} To make annotated bibliography
+  \ifbibliography
+    {\usebibmacro{entrytail}}
+    {}%
+  \finentry}
+
+\newbibmacro*{entrytail}{% From reading.bbx, for annotated bibliography
+  \newunit\newblock
+  \iftoggle{cms@annotation}
+    {\usebibmacro{annotation}%
+     \newunit\newblock}
+    {}}%
+
+\newbibmacro*{author+holder}{%
+  \ifnameundef{author}
+    {\let\bbx@lasthash\undefined}
+    {\usebibmacro{author/editor}%
+     \ifthenelse{\ifnameundef{holder}\OR
+                 \ifnamesequal{author}{holder}}
+       {}
+       {\setunit{\addspace}%
+        \printtext[parens]{\printnames{holder}}}}}
+
+\renewbibmacro*{byauthor}{%
+  \ifthenelse{\ifuseauthor\OR
+              \ifnameundef{author}}
+    {}
+    {\bibstring{by}\addspace
+     \printnames[byauthor]{author}}}
+
+\newbibmacro*{byauthorpunct}{%
+  \ifthenelse{\ifuseauthor\OR\ifnameundef{author}}%
+  {\addperiod\addspace}%
+  {\newcunit}}
+
+\renewbibmacro*{bybookauthor}{%
+  \ifnameundef{bookauthor}
+    {}
+    {\ifnamesequal{author}{bookauthor}
+      {}
+      {\bibstring{by}\addspace\printnames[default]{bookauthor}%
+     \newcunit\newblock}}}
+
+\newbibmacro*{editorpunct}{%
+  \ifthenelse{\(\iffieldundef{booktitle}\AND\iffieldundef{maintitle}\)%
+    \OR\iffieldsequal{booktitle}{title}%  Changed these for crossrefed
+    \OR\iffieldsequal{maintitle}{title}}% entries.  Create problems?
+  {\iffieldequalstr{entrytype}{video}%
+    {\newcunit\newblock}%
+    {\newunit\newblock}}%
+  {\newcunit\newblock}}
+
+\newbibmacro*{edition}{%
+  \printfield{edition}%
+    \clearfield{edition}}%
+
+\newbibmacro*{inforaft}{%
+  \ifnameundef{introduction}%
+  {\ifnameundef{afterword}%
+    {\ifnameundef{foreword}%
+      {\printfield{type}}%
+      {\bibstring{forewordto}%
+        \clearname{foreword}}}%
+    {\bibstring{afterwordto}%
+      \clearname{afterword}}}%
+  {\bibstring{introductionto}%
+    \clearname{introduction}}}
+
+\newbibmacro*{langlist:andothers}{%
+  \ifthenelse{\value{listcount}=\value{liststop}\AND
+              \ifmoreitems}
+    {\ifnum\value{liststop}>1 \finalandcomma\fi
+     \andmoredelim\bibstring{andmore}\bibrightbracket}
+    {}}
+
+\newbibmacro*{reference+title}{%
+  \ifthenelse{\iffieldequals{title}{\bbx@lasthash}\AND\NOT
+      \iffirstonpage}%
+    {\bibnamedash\addperiod\addspace}%
+    {\usebibmacro{italtitle+stitle}%
+      \savefield{title}{\bbx@lasthash}}}
+
+\newbibmacro*{mag+news+author}{%
+  \ifnameundef{author}%
+  {\ifthenelse{\iffieldequals{journaltitle}{\bbx@lasthash}\AND\NOT
+      \iffirstonpage}%
+    {\bibnamedash\addperiod\addspace}%
+    {\usebibmacro{journal+sub}%
+      \setunit*{\addspace}%
+      \printlist[periodplace]{location}%
+      \savefield{journaltitle}{\bbx@lasthash}}}%
+  {\usebibmacro{author}}}
+
+\newbibmacro*{cmag+news+author}{%
+  \ifnameundef{author}%
+  {\usebibmacro{journal+sub}%
+    \setunit*{\addspace}%
+    \printlist[periodplace]{location}}%
+  {\usebibmacro{author}}}
+
+\newbibmacro*{type+inst+year}{%
+  \printfield{type}
+  \newcunit
+  \printlist{institution}%
+  \setunit*{\addcomma\space}%
+  \printfield{year}}
+
+\newbibmacro*{institution+organization}{%
+  \iflistundef{organization}%
+  {\iflistundef{institution}%
+    {}%
+    {\printlist{institution}}}%
+  {\printlist{organization}%
+    \newcunit%
+    \printlist{institution}}}
+
+\newbibmacro*{author+org}{%
+  \ifnameundef{author}%
+  {\ifnameundef{editor}%
+    {\iflistundef{organization}%
+      {\let\bbx@lasthash\undefined}%
+      {\ifboolexpr{
+          test {\iflistequals{organization}{\bbx@lasthash}}
+          and
+          not test {\iffirstonpage}
+        }%
+        {\bibnamedash\addperiod\addspace}%
+        {\iftoggle{cms@authorparens}%
+          {\bibopenparen\printlist{organization}\bibcloseparen}%
+          {\printlist{organization}}%
+          \savelist{organization}{\bbx@lasthash}}}}%
+    {\usebibmacro{editor}}}%
+  {\usebibmacro{author/editor}}}
+
+\newbibmacro*{cbytypestrg}[2]{%
+  \iffieldundef{#1type}
+    {\bibstring{by#2}}
+    {\bibstring{by\thefield{#1type}}}}
+
+\newbibmacro*{cbyeditor}{%
+  \ifnameundef{editor}
+    {}
+    {\usebibmacro{cbytypestrg}{editor}{editor}%
+     \setunit{\addspace}%
+     \printnames[byeditor]{editor}%
+     \newcunit}%
+  \usebibmacro{cbyeditorx}}
+
+\newbibmacro*{cbyeditorx}{%
+  \ifnameundef{editora}
+    {}
+    {\usebibmacro{cbytypestrg}{editora}{editor}%
+     \setunit{\addspace}%
+     \printnames[byeditora]{editora}%
+     \newcunit}%
+  \ifnameundef{editorb}
+    {}
+    {\usebibmacro{cbytypestrg}{editorb}{editor}%
+     \setunit{\addspace}%
+     \printnames[byeditorb]{editorb}%
+     \newcunit}%
+  \ifnameundef{editorc}
+    {}
+    {\usebibmacro{cbytypestrg}{editorc}{editor}%
+     \setunit{\addspace}%
+     \printnames[byeditorc]{editorc}%
+     \newcunit}}
+
+\newbibmacro*{cbytranslator}{%
+  \ifnameundef{translator}
+  {}
+  {\bibstring{bytranslator}%
+    \addspace
+    \printnames[bytranslator]{translator}}}
+
+\newbibmacro*{cbycompiler}{%
+  \ifnameundef{namec}
+    {}
+    {\bibstring{cbycompiler}\addspace
+     \printnames[bycompiler]{namec}}}
+
+\newbibmacro*{cbyredactor}{%
+  \ifnameundef{redactor}
+    {}
+    {\bibstring{cbyredactor}\addspace
+     \printnames[byredactor]{redactor}}}
+
+\newbibmacro*{cwithcommentator}{%
+  \ifnameundef{commentator}
+    {}
+    {\bibstring{withcommentator}\addspace
+     \printnames[withcommentator]{commentator}}}
+
+\newbibmacro*{cwithannotator}{%
+  \ifnameundef{annotator}
+    {}
+    {\bibstring{withannotator}\addspace
+     \printnames[withannotator]{annotator}}}
+
+\newbibmacro*{cwithintroduction}{%
+  \ifnameundef{introduction}
+    {}
+    {\bibstring{withintroduction}\addspace
+     \printnames[withintroduction]{introduction}}}
+
+\newbibmacro*{cwithforeword}{%
+  \ifnameundef{foreword}
+    {}
+    {\bibstring{withforeword}\addspace
+     \printnames[withforeword]{foreword}}}
+
+\newbibmacro*{cwithafterword}{%
+  \ifnameundef{afterword}
+    {}
+    {\bibstring{withafterword}\addspace
+     \printnames[withafterword]{afterword}}}
+
+\newbibmacro*{cbyeditor+others}{%
+  \ifthenelse{\NOT\ifnameundef{editor}\AND
+    \(\iffieldundef{editortype}\OR
+    \iffieldequalstr{editortype}{editor}\)}
+  {\def\@tempa{cbyeditor}%
+    \ifnamesequal{editor}{translator}
+    {\edef\@tempa{\@tempa tr}%
+      \clearname{translator}}
+    {}%
+    \ifnamesequal{editor}{namec}
+    {\edef\@tempa{\@tempa cp}%
+      \clearname{namec}}
+    {}%
+    \ifnamesequal{editor}{commentator}
+    {\edef\@tempa{\@tempa co}%
+      \clearname{commentator}}
+    {\ifnamesequal{editor}{annotator}
+      {\edef\@tempa{\@tempa an}%
+        \clearname{annotator}}
+      {}}%
+    \ifnamesequal{editor}{introduction}
+    {\edef\@tempa{\@tempa in}%
+      \clearname{introduction}}
+    {\ifnamesequal{editor}{foreword}
+      {\edef\@tempa{\@tempa fo}%
+        \clearname{foreword}}
+      {\ifnamesequal{editor}{afterword}
+        {\edef\@tempa{\@tempa af}%
+          \clearname{afterword}}
+        {}}}%
+    \bibstring{\@tempa}\space
+    \printnames[byeditor]{editor}%
+    \clearname{editor}%
+    \newcunit%
+    \usebibmacro{cbyeditorx}}%
+  {\usebibmacro{cbyeditor}}%
+  \usebibmacro{cbytranslator+others}}
+
+\newbibmacro*{cbytranslator+others}{%
+  \ifnameundef{translator}
+    {}
+    {\def\@tempa{cbytranslator}%
+      \ifnamesequal{translator}{namec}
+      {\edef\@tempa{\@tempa cp}%
+        \clearname{namec}}
+      {}%
+     \ifnamesequal{translator}{commentator}
+       {\edef\@tempa{\@tempa co}%
+        \clearname{commentator}}
+       {\ifnamesequal{translator}{annotator}
+          {\edef\@tempa{\@tempa an}%
+           \clearname{annotator}}
+          {}}%
+     \ifnamesequal{translator}{introduction}
+       {\edef\@tempa{\@tempa in}%
+        \clearname{introduction}}
+       {\ifnamesequal{translator}{foreword}
+          {\edef\@tempa{\@tempa fo}%
+           \clearname{foreword}}
+          {\ifnamesequal{translator}{afterword}
+             {\edef\@tempa{\@tempa af}%
+              \clearname{afterword}}
+             {}}}%
+     \bibstring{\@tempa}\space
+     \printnames[bytranslator]{translator}%
+     \clearname{translator}%
+     \newcunit}%
+  \usebibmacro{cbycompiler+others}}
+
+\newbibmacro*{cbycompiler+others}{%
+  \ifnameundef{namec}
+    {}
+    {\def\@tempa{cbycompiler}%
+     \ifnamesequal{namec}{commentator}
+       {\edef\@tempa{\@tempa co}%
+        \clearname{commentator}}
+       {\ifnamesequal{namec}{annotator}
+          {\edef\@tempa{\@tempa an}%
+           \clearname{annotator}}
+          {}}%
+     \ifnamesequal{namec}{introduction}
+       {\edef\@tempa{\@tempa in}%
+        \clearname{introduction}}
+       {\ifnamesequal{namec}{foreword}
+          {\edef\@tempa{\@tempa fo}%
+           \clearname{foreword}}
+          {\ifnamesequal{namec}{afterword}
+             {\edef\@tempa{\@tempa af}%
+              \clearname{afterword}}
+             {}}}%
+     \bibstring{\@tempa}\space
+     \printnames[bycompiler]{namec}%
+     \clearname{namec}%
+     \newcunit}%
+  \usebibmacro{cbyothers}}
+
+\newbibmacro*{cbyothers}{%
+  \usebibmacro{cbytranslator}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{cbycompiler}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{cbyredactor}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{cwithcommentator}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{cwithannotator}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{cwithintroduction}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{cwithforeword}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{cwithafterword}}
+
+\newbibmacro*{cms-in:}{% Fix for 0.9a compat.
+  \iftoggle{cms@origpublished}%
+  {}%
+  {\bibstring{in}%
+    \setunit{\addspace}}}
+
+\newbibmacro*{alt-in:}{%
+  \iffieldundef{booktitle}%
+  {}
+  {\bibstring{in}%
+    \setunit{\addspace}}}
+
+\newbibmacro*{chapincoll}{%
+  \iffieldundef{chapter}%
+  {}
+  {\printfield{chapter}\addspace}}
+
+\newbibmacro*{chapinscore}{%
+  \iffieldundef{chapter}%
+  {\ifthenelse{\iffieldequalstr{entrytype}{music}%
+      \AND\NOT\iffieldundef{booktitle}}%
+    {\bibstring{on}\setunit{\addspace}}%
+    {}}%
+  {\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*{music+origdate}{%
+  \iftoggle{cms@reprint}% 16th ed.
+  {}%
+  {\iftoggle{cms@switchdates}% Date fix
+    {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}%
+      {}%
+      {\usebibmacro{cmsorigdate}}}%
+    {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}}%
+      {}%
+      {\usebibmacro{cmsorigdate}}}}}%
+
+\newbibmacro*{music+eventdate}{% Date fix
+  \ifthenelse{\iffieldundef{eventyear}\AND\iffieldundef{eventmonth}}%
+  {}%
+  {\printeventdate}}
+
+\newbibmacro*{ser+num}{%
+  \printfield{series}%
+  \printfield[sernum]{number}%
+  \newunit}
+
+\newbibmacro*{video+title}{%
+  \printtext{%
+    \printfield{title}%
+    \setunit{\addcolon\addspace}%
+    \printfield[title]{subtitle}}}
+
+\newbibmacro*{italtitle+stitle}{%
+  \printtext{%
+    \printfield{title}%
+    \setunit{\addcolon\addspace}%
+    \printfield[title]{subtitle}}%
+  \newunit\newblock%
+  \printfield{titleaddon}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \newunit\newblock}
+
+\newbibmacro*{mag+news+title}{%
+  \printtext{%
+       \printfield{title}%
+       \setunit{\addcolon\addspace}%
+       \printfield[title]{subtitle}}%
+     \newunit%\setunit{\addcomma\addspace}
+     \printfield{titleaddon}%
+     }%\newcunit\newblock
+
+\newbibmacro*{language+transtitle}{%
+  \iffieldundef{usere}%
+  {\printlist[][-\value{listtotal}]{language}}%
+  {\printfield{usere}}}
+
+\newbibmacro*{issuetitle}{%
+  \iffieldundef{issuetitle}%
+  {}
+  {\ifthenelse{\iffieldequalstr{entrytype}{article}\OR%
+      \iffieldequalstr{entrytype}{review}\OR%
+      \iffieldequalstr{entrytype}{suppperiodical}}% This test is for
+    {\usebibmacro{cms-in:}}% periodical entries
+    {}%
+    \printtext{%
+      \printfield{issuetitle}%
+      \setunit{\addcolon\addspace}%
+      \printfield[issuetitle]{issuesubtitle}}}}
+
+\newbibmacro*{btitle+bstitle}{%
+  \iffieldundef{booktitle}
+    {}
+    {\printtext{%
+       \printfield{booktitle}%
+       \setunit{\addcolon\addspace}%
+       \printfield[booktitle]{booksubtitle}}%
+     \newcunit
+     \printfield{booktitleaddon}}}
+
+\newbibmacro*{publ+loc+year}{%
+  \printlist{location}%
+  \iflistundef{publisher}%
+  {\setunit*{\addcomma\addspace}}%
+  {\setunit*{\addcolon\addspace}}%
+  \printlist{publisher}%
+  \setunit*{\addcomma\addspace}
+  \usebibmacro{date}% For the author-date style.  Tricky.
+}%
+
+\newbibmacro*{origpubl+loc+year}{% 16th ed.
+  \printlist{origlocation}%
+  \iflistundef{origpublisher}%
+  {\setunit*{\addcomma\addspace}}%
+  {\setunit*{\addcolon\addspace}}%
+  \printlist{origpublisher}%
+%  \setunit*{\addcomma\addspace}%
+%  \usebibmacro{cmsorigdate}%
+}
+
+\newbibmacro*{howpubl+loc+year}{%
+  \printlist{location}%
+  \iffieldundef{howpublished}%
+  {\setunit*{\addcomma\space}}%
+  {\setunit*{\addcolon\space}}%
+  \printfield{howpublished}%
+  \setunit*{\addcomma\space}%
+  \usebibmacro{date}%
+}%
+
+\newbibmacro*{inst+loc+year}{%
+  \printlist{location}%
+  \iflistundef{institution}%
+  {\setunit*{\addcomma\space}}%
+  {\setunit*{\addcolon\space}}%
+  \printlist{institution}%
+  \setunit*{\addcomma\space}%
+  \usebibmacro{date}%
+}%
+
+\newbibmacro*{originally+published+as}{% Punctuation fix now in 
+  \iffieldundef{userf}%                  \origfullcite for 0.8e. 
+  {\iffieldundef{reprinttitle}%
+    {}
+    {\bibstring{origpublin}%
+      \origpublcite{\thefield{reprinttitle}}%
+      \newunit}}
+  {\iffieldundef{origlanguage}%
+    {\bibstring{origpub}%
+      \origfullcite{\thefield{userf}}
+      \newunit}%
+    {\iftoggle{cms@postposit}%
+      {\bibstring{origedition}%
+        \setunit{\addspace}%
+        \printfield[edlang]{origlanguage}%
+        \addcolon%
+        \origfullcite{\thefield{userf}}%
+        \newunit}%
+      {\printfield[edlang]{origlanguage}%
+        \setunit{\addspace}%
+        \bibstring{origedition}%
+        \origfullcite{\thefield{userf}}
+        \newunit}}}}
+
+\newbibmacro*{org+publ+loc+year}{% What was wrong with \ifthenelse here?
+  \printlist{location}%
+  \iflistundef{organization}%
+  {\iflistundef{publisher}%
+    {\setunit*{\addcomma\addspace}}%
+    {\setunit*{\addcolon\addspace}}}%
+  {\setunit*{\addcolon\addspace}}%
+  \printlist{organization}%
+  \setunit*{\addcomma\space}%
+  \printlist{publisher}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{date}}
+
+\newbibmacro*{year+in+parens}{%
+  \iffieldundef{volume}%
+  {noformat}%
+  {parens}}
+
+\newbibmacro*{letter+date}{% New for 0.9
+  \iflistundef{origlocation}%
+  {}%
+  {\printlist{origlocation}%
+    \newcunit\newblock}%
+  \iftoggle{cms@switchdates}%
+  {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}%
+    {}%
+    {\cms@datelongalt}}%
+  {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}}%
+    {}%
+    {\cms@datelong}}}
+
+\newbibmacro*{unpubl+letter+date}{% For the Misc type.
+  \iflistundef{origlocation}%
+  {}%
+  {\printlist{origlocation}%
+    \newcunit\newblock}%
+  \iftoggle{cms@switchdates}%
+  {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}%
+    {}%
+    {\cms@datelongalt}}%
+  {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}}%
+    {\printdate}% For interviews and other dated non-letters
+    {\cms@datelong}}}
+
+\newbibmacro*{cmsbookdate}{%
+  \ifthenelse{\iffieldundef{year}\AND\iffieldundef{origyear}}%
+  {\newunit}%
+  {\iftoggle{cms@switchdates}%
+    {\iffieldundef{origyear}%
+      {\newunit}%
+      {\newcunit\printorigdate}}%
+    {\iffieldundef{year}%
+      {\newunit}%
+      {\newcunit\printdate}}}}
+
+\renewbibmacro*{date}{% Adding the test solved some issues in 0.9 with
+  \iftoggle{cms@switchdates}
+  {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}
+    \AND\iffieldundef{origday}}%
+    {}%
+    {\printorigdate}}%
+  {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}
+    \AND\iffieldundef{day}}%  punctuation in some entry types (Misc).  The 
+    {}%                   whole \printdate thing may need further work. 
+    {\printdate}}}
+
+\newcommand*{\cms@datelong}{% Modified for 0.9
+  \iffieldundef{origmonth}%
+  {\printfield{origyear}}%
+  {\printfield[letterday]{origday}\setunit{\nobreakspace}%
+    \mkbibmonth{\thefield{origmonth}}\setunit{\nobreakspace}%
+    \printfield{origyear}}}%
+
+\newcommand*{\cms@datelongalt}{% Modified for 0.9
+  \iffieldundef{month}%
+  {\printfield{year}}%
+  {\printfield[letterday]{day}\setunit{\nobreakspace}%
+    \mkbibmonth{\thefield{month}}\setunit{\nobreakspace}%
+    \printfield{year}}}%
+
+\newcommand*{\letterdatelong}{% Modified for 0.9
+  \iftoggle{cms@switchdates}% This one for users
+  {\iffieldundef{year}% Previous two for internal use
+    {}%
+    {\iffieldundef{month}%
+      {\printfield{year}}%
+      {\printfield[letterday]{day}\setunit{\nobreakspace}%
+        \mkbibmonth{\thefield{month}}\setunit{\nobreakspace}%
+        \printfield{year}}}}%
+  {\iffieldundef{origyear}%
+    {}%
+    {\iffieldundef{origmonth}%
+      {\printfield{origyear}}%
+      {\printfield[letterday]{origday}\setunit{\nobreakspace}%
+        \mkbibmonth{\thefield{origmonth}}\setunit{\nobreakspace}%
+        \printfield{origyear}}}}}%
+
+\newbibmacro*{cjournal+ser+vol+num}{%
+  \usebibmacro{journal+sub}%
+  \setunit*{\addspace}%
+  \printlist[periodplace]{location}%
+  \setunit*{\addspace}%
+  \iffieldundef{series}
+    {}
+    {\newcunit
+      \printfield[jourser]{series}%
+      \newcunit}%\setunit*{\addspace}?
+  \ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}%
+  {\iffieldundef{volume}%
+    {\newcunit%
+      \printfield[journum]{number}%
+      \clearfield{number}%
+      \setunit{\addcomma\addspace}}
+    {\printfield[jourvol]{volume}%
+      \setunit{\addcomma\addspace}}}%
+  {\printfield[jourvol]{volume}%
+    \newcunit%
+    \printfield[journum]{number}%
+    \clearfield{number}%
+    \setunit{\addcomma\addspace}}% need * here?
+  \printfield{eid}%
+  \newunit}
+
+\newbibmacro*{cperiodical+ser+vol+num}{% For periodical entries,
+  \printtext{% article subtype
+    \printfield{title}%
+    \setunit{\addcolon\addspace}%
+    \printfield[title]{subtitle}}% 
+  \setunit*{\addspace}%
+  \printlist[periodplace]{location}%
+  \setunit*{\addspace}%
+  \iffieldundef{series}
+  {}
+  {\newcunit
+    \printfield[jourser]{series}%
+    \newcunit}%\setunit*{\addspace}?
+  \ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}%
+  {\printfield[jourvol]{volume}%
+    \setunit{\addcomma\addspace}}%
+  {\printfield[jourvol]{volume}%
+    \setunit{\addcomma\addspace}% need * here?
+    \printfield[journum]{number}%
+    \clearfield{number}%
+    \setunit{\addcomma\addspace}}%
+  \printfield{eid}%
+  \newunit}
+
+\newbibmacro*{journal+sub}{%
+  \iffieldundef{journaltitle}
+    {}
+    {\printtext[journaltitle]{%
+       \printfield[noformat]{journaltitle}%
+       \setunit{\addcolon\addspace}%
+       \printfield[noformat]{journalsubtitle}}}}
+
+% \newbibmacro*{url+date}{% Changed for 0.9: No longer used?
+%   \printfield{url}%
+%   \iffieldundef{urlyear}
+%     {}
+%     {\setunit{\addspace}%
+%      \printtext[urldate]{\printurldate}}}
+
+\newbibmacro*{chap+pag}{%
+  \printfield{chapter}%
+  \setunit*{\addcomma\space}%
+  \printfield{pages}}
+
+\newbibmacro*{mag+news+date}{%
+  \ifnameundef{author}%
+  {\usebibmacro{date+issue}}%
+  {\usebibmacro{mag+date+issue}}}
+
+\newbibmacro*{date+issue}{%
+  \iffieldundef{issue}
+  {\iffieldundef{number}%
+    {\usebibmacro{date}}%
+    {\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}%
+    \usebibmacro{cmsyear}}}
+
+\newbibmacro*{mag+date+issue}{%
+  \usebibmacro{journal+sub}%
+  \setunit*{\addspace}%
+  \printlist[periodplace]{location}%
+  \newcunit\newblock
+  \printfield{usera}% For network ID and possible section of newspaper.
+  \newcunit\newblock
+  \usebibmacro{date+issue}}
+
+\newbibmacro*{cmsyear}{%
+  \iftoggle{cms@switchdates}%
+  {\printfield{origyear}}%
+  {\printfield{year}}}
+
+\newbibmacro*{cmsorigdate}{% New for 0.9
+  \iftoggle{cms@switchdates}%
+  {\printdate}%
+  {\printorigdate}}
+
+\newbibmacro*{periodical+date+issue}{% For periodical type &
+  \printtext[title]{% magazine subtype
+    \printfield[noformat]{title}%
+    \setunit{\addcolon\addspace}%
+    \printfield[noformat]{subtitle}}%
+  \setunit*{\addspace}%
+  \printlist[periodplace]{location}%
+  \newcunit\newblock
+  \printfield{usera}% For network ID and possible section of newspaper.
+  \newcunit\newblock
+  \usebibmacro{date+issue}}
+
+\newbibmacro*{cmtitle+mstitle+vol+part+title+stitle}{%
+  \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
+  \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}}}}
+
+\renewbibmacro*{postnote}{%
+  \iffieldundef{postnote}%
+  {}%
+  {\setunit{\postnotedelim}%
+  \printfield{postnote}}}
+
+\newbibmacro*{part+editor+translator}{%
+  \ifnameundef{namea}%
+  {\ifnameundef{nameb}%
+    {}
+    {\bibstring{bytranslator}\space%
+    \printnames[bytranslator]{nameb}}}%
+{\ifnamesequal{namea}{nameb}%
+  {\bibstring{byeditortr}\space%
+    \printnames[byeditor]{namea}}%
+  {\bibstring{byeditor}\space%
+    \printnames[byeditor]{namea}%
+    \ifnameundef{nameb}%
+    {}
+    {\newunit
+      \bibstring{bytranslator}\space%
+      \printnames[bytranslator]{nameb}}}}}
+
+\newbibmacro*{compilestrg}{%
+  \ifthenelse{\value{namec}>1\OR\ifandothers{namec}}
+  {\bibstring{compilers}}
+  {\bibstring{compiler}}
+  \clearname{namec}}
+
+\newbibmacro*{transstrg}{%
+  \ifthenelse{\value{translator}>1\OR\ifandothers{translator}}
+    {\ifnamesequal{translator}{namec}%
+      {\bibstring{transcompilers}%
+        \clearname{namec}}%
+      {\bibstring{translators}}}%
+    {\ifnamesequal{translator}{namec}%
+      {\bibstring{transcompiler}%
+        \clearname{namec}}%
+      {\bibstring{translator}}}
+    \clearname{translator}}
+
+\newbibmacro*{parttransstrg}{%
+  \ifthenelse{\value{nameb}>1\OR\ifandothers{nameb}}
+    {\ifnamesequal{nameb}{namec}%
+      {\bibstring{transcompilers}%
+        \clearname{namec}}%
+      {\bibstring{translators}}}%
+    {\ifnamesequal{nameb}{namec}%
+      {\bibstring{transcompiler}%
+        \clearname{namec}}%
+      {\bibstring{translator}}}
+    \clearname{nameb}}
+
+\newbibmacro*{editstrg}{% Test added for 0.9
+  \ifthenelse{\iffieldundef{editortype}\OR
+    \iffieldequalstr{editortype}{editor}}
+  {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}}
+    {\ifthenelse{\ifnamesequal{editor}{translator}\AND
+        \ifnamesequal{editor}{namec}}
+      {\bibstring{editortranscompilers}%
+        \clearname{translator}%
+        \clearname{namec}}%
+      {\ifnamesequal{editor}{namec}%
+        {\bibstring{editorcompilers}%
+          \clearname{namec}}%
+        {\ifnamesequal{editor}{translator}%
+          {\bibstring{editortranslators}%
+            \clearname{translator}}%
+          {\bibstring{editors}}}}}%
+    {\ifthenelse{\ifnamesequal{editor}{translator}\AND
+        \ifnamesequal{editor}{namec}}
+      {\bibstring{editortranscompiler}%
+        \clearname{translator}%
+        \clearname{namec}}%
+      {\ifnamesequal{editor}{namec}%
+        {\bibstring{editorcompiler}%
+          \clearname{namec}}%
+        {\ifnamesequal{editor}{translator}%
+          {\bibstring{editortranslator}%
+            \clearname{translator}}%
+          {\bibstring{editor}}}}}}%
+  {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}}
+    {\bibstring{\thefield{editortype}s}}
+    {\bibstring{\thefield{editortype}}}}
+  \clearname{editor}}
+
+\newbibmacro*{parteditstrg}{%
+  \ifthenelse{\value{namea}>1\OR\ifandothers{namea}}
+    {\ifthenelse{\ifnamesequal{namea}{nameb}\AND
+        \ifnamesequal{namea}{namec}}
+      {\bibstring{editortranscompilers}%
+        \clearname{nameb}%
+        \clearname{namec}}%
+      {\ifnamesequal{namea}{namec}%
+        {\bibstring{editorcompilers}%
+          \clearname{namec}}%
+        {\ifnamesequal{namea}{nameb}%
+          {\bibstring{editortranslators}%
+            \clearname{nameb}}%
+          {\bibstring{editors}}}}}%
+    {\ifthenelse{\ifnamesequal{namea}{nameb}\AND
+        \ifnamesequal{namea}{namec}}
+      {\bibstring{editortranscompiler}%
+        \clearname{nameb}%
+        \clearname{namec}}%
+      {\ifnamesequal{namea}{namec}%
+        {\bibstring{editorcompiler}%
+          \clearname{namec}}%
+        {\ifnamesequal{namea}{nameb}%
+          {\bibstring{editortranslator}%
+            \clearname{nameb}}%
+          {\bibstring{editor}}}}}%
+    \clearname{namea}}
+
+\newbibmacro*{clearpublin}{%
+  \clearname{author}%
+  \clearname{namea}%
+  \clearname{nameb}%
+  \clearfield{nameaddon}%
+  \clearfield{title}%
+  \clearfield{subtitle}%
+  \clearfield{titleaddon}%
+  \clearfield{reprinttitle}%
+  \clearfield{usere}%
+  \clearlist{language}%
+}
+
+\endinput
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 6b2d48b7709..36b6b6e12c2 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.8.1.18 2012/07/05 11:03:42 dfussner Exp $
+% $Id: chicago-authordate.bbx,v 0.8.1.23 2012/12/06 11:40:16 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}[2012/07/05 v 1.7 biblatex
+\ProvidesFile{chicago-authordate.bbx}[2012/12/06 v 2.4 biblatex
 bibliography style]
 
 %%%% Initialize and format bibliography and los %%%%
@@ -1518,9 +1518,14 @@ bibliography style]
   \newunit\newblock
   \ifthenelse{\iffieldundef{urlyear}\AND\iffieldundef{urlmonth}}%
   {}%
-  {\printtext[urldate]{\printurldate}}%
+  {\printurldate}% Date fix
   \newunit\newblock
-  \printfield{doi}%
+  \iftoggle{cms@doionly}%
+  {\iffieldundef{doi}%
+    {}%
+    {\printfield{doi}%
+      \clearfield{url}}}%
+  {\printfield{doi}}%
   \newunit\newblock%
   \usebibmacro{eprint}%
   \newunit\newblock
@@ -2059,10 +2064,7 @@ bibliography style]
   \printfield{nameaddon}%
   \newunit\newblock
   \ifundef\bbx@lasthash{%
-  \printtext[title]{%
-    \printfield[noformat]{title}%
-    \setunit{\addcolon\addspace}%
-    \printfield[noformat]{subtitle}}%
+  \usebibmacro{video+title}% Simplifies trad style
   \iffieldundef{booktitle}% Comma after italics, period after quotes
   {\newcunit}
   {\newunit}%\setunit{\addspace}\newblock%
@@ -2073,10 +2075,7 @@ bibliography style]
   \usebibmacro{cmsbibsortdate}%
   \newunit\newblock
   \ifundef\bbx@lasthash{}{%
-  \printtext[title]{%
-    \printfield[noformat]{title}%
-    \setunit{\addcolon\addspace}%
-    \printfield[noformat]{subtitle}}%
+  \usebibmacro{video+title}% Simplifies trad style
   \iffieldundef{booktitle}% Comma after italics, period after quotes
   {\newcunit}
   {\newunit}%\setunit{\addspace}\newblock%
@@ -2173,11 +2172,16 @@ bibliography style]
 \newbibmacro*{bib+doi+url}{% 16th ed.
   \ifthenelse{\iffieldundef{urlyear}\AND\iffieldundef{urlmonth}}%
   {}%
-  {\printtext[urldate]{\printurldate}}%
+  {\printurldate}% Date fix
   \newunit\newblock
-  \iftoggle{cms@doi}%
-  {\printfield{doi}}%
-  {}%
+  \iftoggle{cms@doionly}%
+  {\iffieldundef{doi}%
+    {}%
+    {\printfield{doi}%
+      \clearfield{url}}}%
+  {\iftoggle{cms@doi}%
+    {\printfield{doi}}%
+    {}}%
   \newunit\newblock
   \iftoggle{cms@eprint}%
   {\usebibmacro{eprint}}%
@@ -2439,9 +2443,13 @@ bibliography style]
 \newbibmacro*{pubstate}{%
   \iftoggle{cms@reprint}%
   {\iftoggle{cms@switchdates}%
-    {}
+    {\iffieldundef{year}% Fix for consistency???
+      {}%
+      {\printtext{% 16th ed.
+          \usebibmacro{choosepubstring}%
+          \printdate\addperiod}\nopunct}}
     {\iffieldundef{origyear}%
-      {}
+      {}%
       {\printtext{% 16th ed.
           \usebibmacro{choosepubstring}%
           \printorigdate\addperiod}\nopunct}}}%
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 8ff2919f00f..b73c23d5fa4 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.8.1.19 2012/07/05 11:04:14 dfussner Exp $
+% $Id: chicago-authordate.cbx,v 0.8.1.25 2012/12/06 11:43:37 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.
+% author-date style of the Chicago Manual of Style, 16th edition.
 
-\ProvidesFile{chicago-authordate.cbx}[2012/07/05 v 1.7 biblatex citation style]
+\ProvidesFile{chicago-authordate.cbx}[2012/12/06 v 2.4 biblatex citation style]
 
 %%%% Biblatex initialization + Chicago options + Toggles %%%%
 
@@ -27,6 +27,7 @@
 
 \providetoggle{cms@url}% These are for the field-exclusion options
 \providetoggle{cms@doi}
+\providetoggle{cms@doionly}
 \providetoggle{cms@eprint}
 \providetoggle{cms@isbn}
 \providetoggle{cms@numbermonth}
@@ -55,7 +56,10 @@
   {\csuse{cms@opt@avdate@#1}}
   {\blx@err@invopt{avdate=#1}{}}}
 \def\cms@opt@avdate@true{%
-  \DeclareLabelyear[music,review,video]{eventyear,origyear,year,urlyear}%
+  \@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4
+  {\DeclareLabelyear[music,review,video]{\field{eventyear}%
+      \field{origyear} \field{year} \field{urlyear}}}%
+  {\DeclareLabelyear[music,review,video]{eventyear,origyear,year,urlyear}}%
   \toggletrue{cms@avdate}}%
 \def\cms@opt@avdate@false{%
   \togglefalse{cms@avdate}}
@@ -64,12 +68,6 @@
   \ifcsdef{cms@opt@cmsdate@#1}% labelyear. Sorting will be an issue.
   {\csuse{cms@opt@cmsdate@#1}}
   {\blx@err@invopt{cmsdate=#1}{}}}
-\def\cms@opt@cmsdate@on{%
-  \toggletrue{cms@origlabel}}
-\def\cms@opt@cmsdate@new{%
-  \toggletrue{cms@bothlabelnew}}
-\def\cms@opt@cmsdate@old{%
-  \toggletrue{cms@bothlabelold}}
 
 \DeclareEntryOption{cmsdate}[off]{% Trying to implement origyear as
   \ifcsdef{cms@opt@cmsdate@#1}% labelyear. Sorting will be an issue.
@@ -131,7 +129,15 @@
 \DeclareBibliographyOption{url}[true]{%
   \settoggle{cms@url}{#1}}
 \DeclareBibliographyOption{doi}[true]{%
-  \settoggle{cms@doi}{#1}}
+  \ifcsdef{cms@opt@doi@#1}%
+  {\csuse{cms@opt@doi@#1}}
+  {\blx@err@invopt{doi=#1}{}}}
+\def\cms@opt@doi@true{%
+  \toggletrue{cms@doi}}
+\def\cms@opt@doi@false{%
+  \togglefalse{cms@doi}}
+\def\cms@opt@doi@only{%
+  \toggletrue{cms@doionly}}
 \DeclareBibliographyOption{eprint}[true]{%
   \settoggle{cms@eprint}{#1}}
 \DeclareBibliographyOption{numbermonth}[true]{%
@@ -148,10 +154,18 @@
 
 \DeclareEntryOption{isbn}[true]{%
   \settoggle{cms@isbn}{#1}}
+\DeclareEntryOption{doi}[true]{%
+  \ifcsdef{cms@opt@doi@#1}%
+  {\iftoggle{cms@doi}%
+    {\togglefalse{cms@doi}%
+      \iftoggle{cms@doionly}%
+      {\togglefalse{cms@doionly}}% !!
+      {}}%
+    {\toggletrue{cms@doi}}% !!
+    \csuse{cms@opt@doi@#1}}
+  {\blx@err@invopt{doi=#1}{}}}
 \DeclareEntryOption{url}[true]{%
   \settoggle{cms@url}{#1}}
-\DeclareEntryOption{doi}[true]{%
-  \settoggle{cms@doi}{#1}}
 \DeclareEntryOption{eprint}[true]{%
   \settoggle{cms@eprint}{#1}}
 \DeclareEntryOption{numbermonth}[true]{%
@@ -197,8 +211,12 @@
   }
 }
 
-\DeclareLabelname{shortauthor,author,shorteditor,namea,editor,%
-nameb,translator,namec}
+\@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4
+{\DeclareLabelname{\field{shortauthor} \field{author}%
+    \field{shorteditor} \field{namea} \field{editor}%
+    \field{nameb} \field{translator} \field{namec}}}
+{\DeclareLabelname{shortauthor,author,shorteditor,namea,%
+    editor,nameb,translator,namec}}
 
 \DeclareEntryOption{switchdates}[true]{%
   \settoggle{cms@switchdates}{#1}}
@@ -742,7 +760,13 @@ nameb,translator,namec}
   \iftoggle{cms@noibid}%
   {\blx@ibidreset%
     \usebibmacro{cite}}%
-  {\toggletrue{cms@inlineibid}}}
+  {\ifthenelse{\iffieldundef{prenote}\AND%
+      \iffieldundef{postnote}}%
+    {\blx@ibidreset%
+      \usebibmacro{cite}%
+      \PackageWarning{biblatex-chicago}%
+      {Empty Ibidem citation}}%
+    {\toggletrue{cms@inlineibid}}}}
 
 %%%% Citation Commands, internal and external %%%%
 
@@ -851,7 +875,7 @@ nameb,translator,namec}
 
 \DeclareListFormat{language}{%
   \ifthenelse{\value{listcount}=1}%
-  {\bibleftbracket\bibstring{inlang}\addspace%
+  {\bibleftbracket\bibstring{inlang}%\addspace - for inflected langs.
     \ifbibstring{#1}
     {\bibstring{#1}}
     {\ifbibstring{lang#1}
@@ -1187,9 +1211,11 @@ nameb,translator,namec}
   {\printfield{userd}\addspace #1}}
 
 \DeclareFieldFormat[music]{origdate}{% 16th ed.
-  \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}}%
-  {\bibstring{recorded}\space #1}%
-  {\printfield{userd}\addspace #1}}
+  \iftoggle{cms@reprint}% Date fix
+  {#1}%
+  {\ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}}%
+    {\bibstring{recorded}\space #1}%
+    {\printfield{userd}\addspace #1}}}
 
 \DeclareFieldFormat[music]{eventdate}{% 16th ed.
   \iffieldundef{userd}%
@@ -1770,24 +1796,30 @@ nameb,translator,namec}
 \newbibmacro*{music+origdate}{%
   \iftoggle{cms@reprint}% 16th ed.
   {}%
-  {\iftoggle{cms@switchdates}%
+  {\iftoggle{cms@switchdates}% Date fix
     {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}%
       {}%
-      {\printtext[origdate]{\usebibmacro{cmsorigdate}}}}%
+      {\usebibmacro{cmsorigdate}}}%
     {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}}%
       {}%
-      {\printtext[origdate]{\usebibmacro{cmsorigdate}}}}}}%
+      {\usebibmacro{cmsorigdate}}}}}%
 
-\newbibmacro*{music+eventdate}{%
+\newbibmacro*{music+eventdate}{% Date fix
   \ifthenelse{\iffieldundef{eventyear}\AND\iffieldundef{eventmonth}}%
   {}%
-  {\printtext[eventdate]{\printeventdate}}}
+  {\printeventdate}}
 
 \newbibmacro*{ser+num}{%
   \printfield{series}%
   \printfield[sernum]{number}%
   \newunit}
 
+\newbibmacro*{video+title}{% Simplifies trad style.
+  \printtext[title]{%
+    \printfield[noformat]{title}%
+    \setunit{\addcolon\addspace}%
+    \printfield[noformat]{subtitle}}}
+
 \newbibmacro*{italtitle+stitle}{%
   \printtext[title]{%
     \printfield[noformat]{title}%
@@ -2055,12 +2087,12 @@ nameb,translator,namec}
        \setunit{\addcolon\addspace}%
        \printfield[noformat]{journalsubtitle}}}}
 
-\newbibmacro*{url+date}{% Changed for 0.9
-  \printfield{url}%
-  \iffieldundef{urlyear}
-    {}
-    {\setunit{\addspace}%
-     \printtext[urldate]{\printurldate}}}
+% \newbibmacro*{url+date}{% Changed for 0.9: No longer called?
+%   \printfield{url}%
+%   \iffieldundef{urlyear}
+%     {}
+%     {\setunit{\addspace}%
+%      \printtext[urldate]{\printurldate}}}
 
 \newbibmacro*{chap+pag}{%
   \printfield{chapter}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.bbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.bbx
index 02dc9423276..15b959db4ff 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.bbx
@@ -1,11 +1,11 @@
-% $Id: chicago-authordate15.bbx,v 0.8.1.15 2012/07/05 10:39:57 dfussner Exp $
+% $Id: chicago-authordate15.bbx,v 0.8.1.16 2012/12/06 12:17:19 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,
 % _15th_ edition.
 
 \ProvidesFile{chicago-authordate15.bbx}
-[2012/07/05 v 1.7 biblatex bibliography style]
+[2012/12/06 v 2.4 biblatex bibliography style]
 
 %%%% Initialize and format bibliography and los %%%%
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.cbx
index 715ab6a4efc..390c0b9d176 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.cbx
@@ -1,11 +1,11 @@
-% $Id: chicago-authordate15.cbx,v 0.8.1.15 2012/07/05 10:39:31 dfussner Exp $
+% $Id: chicago-authordate15.cbx,v 0.8.1.20 2012/12/06 12:16:45 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-authordate15.cbx}
-[2012/07/05 v 1.7 biblatex citation style]
+[2012/12/06 v 2.4 biblatex citation style]
 
 %%%% Biblatex initialization + Chicago options + Toggles %%%%
 
@@ -191,8 +191,12 @@
   }
 }
 
-\DeclareLabelname{shortauthor,author,shorteditor,namea,editor,%
-nameb,translator,namec}
+\@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4
+{\DeclareLabelname{\field{shortauthor} \field{author}%
+    \field{shorteditor} \field{namea} \field{editor}%
+    \field{nameb} \field{translator} \field{namec}}}
+{\DeclareLabelname{shortauthor,author,shorteditor,namea,%
+    editor,nameb,translator,namec}}
 
 \DeclareEntryOption{switchdates}[true]{%
   \settoggle{cms@switchdates}{#1}}
@@ -771,7 +775,7 @@ nameb,translator,namec}
 
 \DeclareListFormat{language}{%
   \ifthenelse{\value{listcount}=1}%
-  {\bibleftbracket\bibstring{inlang}\addspace%
+  {\bibleftbracket\bibstring{inlang}%\addspace - for inflected langs.
     \ifbibstring{#1}
     {\bibstring{#1}}
     {\ifbibstring{lang#1}
@@ -1898,7 +1902,7 @@ nameb,translator,namec}
   \printtext{% article subtype
     \printfield{title}%
     \setunit{\addcolon\addspace}%
-    \printfield{subtitle}}% 
+    \printfield[title]{subtitle}}% 
   \setunit*{\addspace}%
   \printlist[periodplace]{location}%
   \setunit*{\addspace}%
@@ -1930,8 +1934,8 @@ nameb,translator,namec}
   \printfield{url}%
   \ifthenelse{\iffieldundef{urlyear}\AND\iffieldundef{urlmonth}}%
     {}%
-    {\setunit{\addspace}%
-     \printtext[urldate]{\printurldate}}}
+    {\setunit{\addspace}% Date fix
+     \printurldate}}
 
 \newbibmacro*{chap+pag}{%
   \printfield{chapter}%
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 e5093e0efc2..0e41d319d0e 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.7.20 2012/07/05 10:50:42 dfussner Exp $
+% $Id: chicago-notes.bbx,v 0.9.7.24 2012/12/06 11:50:31 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}[2012/07/05 v 1.7 biblatex bibliography style]
+\ProvidesFile{chicago-notes.bbx}[2012/12/06 v 2.4 biblatex bibliography style]
 
 %%%% Initialize and format bibliography and los %%%%
 
@@ -1410,9 +1410,14 @@
   \newunit\newblock
   \iffieldundef{urlyear}
   {}
-  {\printtext[urldate]{\printurldate}}%
+  {\printurldate}% Date fix
   \newunit\newblock
-  \printfield{doi}%
+  \iftoggle{cms@doionly}%
+  {\iffieldundef{doi}%
+    {}%
+    {\printfield{doi}%
+      \clearfield{url}}}%
+  {\printfield{doi}}%
   \newunit\newblock
   \usebibmacro{eprint}%
   \newunit\newblock
@@ -1941,11 +1946,16 @@
 \newbibmacro*{bib+doi+url}{% 16th ed.
   \iffieldundef{urlyear}
   {}
-  {\printtext[urldate]{\printurldate}}%
+  {\printurldate}% Date fix
   \newunit\newblock
-  \iftoggle{cms@doi}%
-  {\printfield{doi}}%
-  {}%
+  \iftoggle{cms@doionly}%
+  {\iffieldundef{doi}%
+    {}%
+    {\printfield{doi}%
+      \clearfield{url}}}%
+  {\iftoggle{cms@doi}%
+    {\printfield{doi}}%
+    {}}%
   \newunit\newblock
   \iftoggle{cms@eprint}%
   {\usebibmacro{eprint}}%
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 eb980243c43..bd39d98c705 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.7.34 2012/07/05 10:50:34 dfussner Exp $
+% $Id: chicago-notes.cbx,v 0.9.7.40 2012/12/06 11:58:41 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}[2012/07/05 v 1.7 biblatex citation style]
+\ProvidesFile{chicago-notes.cbx}[2012/12/06 v 2.4 biblatex citation style]
 
 %%%% Biblatex initialization + Chicago options + Toggles %%%%
 
@@ -18,6 +18,7 @@
 
 \providetoggle{cms@url}% These are for the field-exclusion options
 \providetoggle{cms@doi}
+\providetoggle{cms@doionly}
 \providetoggle{cms@eprint}
 \providetoggle{cms@isbn}
 \providetoggle{cms@numbermonth}
@@ -100,7 +101,15 @@
 \DeclareBibliographyOption{url}[true]{%
   \settoggle{cms@url}{#1}}
 \DeclareBibliographyOption{doi}[true]{%
-  \settoggle{cms@doi}{#1}}
+  \ifcsdef{cms@opt@doi@#1}%
+  {\csuse{cms@opt@doi@#1}}
+  {\blx@err@invopt{doi=#1}{}}}
+\def\cms@opt@doi@true{%
+  \toggletrue{cms@doi}}
+\def\cms@opt@doi@false{%
+  \togglefalse{cms@doi}}
+\def\cms@opt@doi@only{%
+  \toggletrue{cms@doionly}}
 \DeclareBibliographyOption{eprint}[true]{%
   \settoggle{cms@eprint}{#1}}
 \DeclareBibliographyOption{numbermonth}[true]{%
@@ -131,7 +140,15 @@
 \DeclareEntryOption{url}[true]{%
   \settoggle{cms@url}{#1}}
 \DeclareEntryOption{doi}[true]{%
-  \settoggle{cms@doi}{#1}}
+  \ifcsdef{cms@opt@doi@#1}%
+  {\iftoggle{cms@doi}%
+    {\togglefalse{cms@doi}%
+      \iftoggle{cms@doionly}%
+      {\togglefalse{cms@doionly}}% !!
+      {}}%
+    {\toggletrue{cms@doi}}% !!
+    \csuse{cms@opt@doi@#1}}
+  {\blx@err@invopt{doi=#1}{}}}
 \DeclareEntryOption{eprint}[true]{%
   \settoggle{cms@eprint}{#1}}
 \DeclareEntryOption{numbermonth}[true]{%
@@ -321,11 +338,11 @@
 
 \newbibmacro*{cms:shorthandintro}{% For changing the citedas phrase
   \iffieldundef{shorthandintro}%
-  {\setunit{\addspace}%
+  {\addspace%\setunit{\addspace}% Fix for after postnote field
     \printtext[parens]{%
       \bibstring{citedas}\space%
       \printfield{shorthand}}}%
-  {\setunit{\addspace}%
+  {\addspace%\setunit{\addspace}% Ditto
     \printfield{shorthandintro}}}
 
 \newbibmacro*{cite:ibid}{%
@@ -588,6 +605,24 @@
 
 \DeclareMultiCiteCommand{\citetitles}{citetitle}{\multicitedelim}
 
+\DeclareCiteCommand{\textcite}[\cbx@textcite\cbx@textcite@i]
+  {\boolfalse{citetracker}%
+   \gdef\cbx@savedkeys{}}
+  {\printnames{labelname}%
+   \xappto\cbx@savedkeys{\thefield{entrykey},}}
+  {\multinamedelim}
+  {\protected@xappto\cbx@savedcites{%
+     [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}}
+
+\DeclareMultiCiteCommand{\textcites}[\cbx@textcite\cbx@textcites@i]
+  {\textcite}{\multinamedelim}
+
+\newrobustcmd{\cbx@textcite}[2]{\def\cbx@savedcites{#1}#2\cbx@savedcites}
+\newrobustcmd{\cbx@textcite@i}{%
+  \iffootnote{\newcunit\bibstring{in}\addspace\headlesscite}{\footcite}}
+\newrobustcmd{\cbx@textcites@i}{%
+  \iffootnote{\newcunit\bibstring{in}\addspace\cites}{\footcites}}
+
 %%%% Drivers for the Long Note Format %%%%
 
 \DeclareBibliographyDriver{cite:article}{%
@@ -1606,9 +1641,14 @@
   \setunit{\addcomma\addspace}%
   \iffieldundef{urlyear}%
   {}%
-  {\printtext[urldate]{\printurldate}}%
+  {\printurldate}% Date fix
   \newcunit\newblock
-  \printfield{doi}%
+  \iftoggle{cms@doionly}%
+  {\iffieldundef{doi}%
+    {}%
+    {\printfield{doi}%
+      \clearfield{url}}}%
+  {\printfield{doi}}%
   \newcunit\newblock
   \usebibmacro{eprint}%
   \newcunit\newblock
@@ -2087,9 +2127,9 @@
   \usebibmacro{cnotefield}%
   \newcunit\newblock
   \usebibmacro{cpubl+loc+year}%
-  \usebibmacro{fullpostnote}%
   \newcunit\newblock
-  \printfield{type}%
+  \printfield{type}% Order of this and next?
+  \usebibmacro{fullpostnote}%
   \newcunit\newblock
   \usebibmacro{caddendum}%
   \newcunit\newblock
@@ -2106,7 +2146,7 @@
 
 \DeclareListFormat{language}{%
   \ifthenelse{\value{listcount}=1}%
-  {\bibleftbracket\bibstring{inlang}\addspace%
+  {\bibleftbracket\bibstring{inlang}%\addspace - for inflected langs.
     \ifbibstring{#1}
     {\bibstring{#1}}
     {\ifbibstring{lang#1}
@@ -2162,32 +2202,6 @@
   {#1\isdot}%
   {\mkbibquote{#1\isdot}}}
 
-\newcommand*{\long@kludge}{% 16th edition places commas after these
-  \ifboolexpr{%              punctuation marks.
-    (
-    test {\ifpunctmark{?}}
-    or
-    test {\ifpunctmark{!}}
-    )
-    and
-    not togl {cms@fullnote}%test {\ifcitation}
-  }%
-  {\spacefactor\blx@sf@dot}%\blx@postpunct\addperiod}%
-  {\isdot}}%
-
-\newcommand*{\short@kludge}{% 16th edition places commas after these
-  \ifboolexpr{%               punctuation marks. Needed?
-    (
-    test {\ifpunctmark{?}}
-    or
-    test {\ifpunctmark{!}}
-    )
-    and
-    not test {\iffieldundef{postnote}}
-  }%
-  {\isdot\midsentence}%
-  {\isdot}}%
-
 \DeclareFieldFormat[article]{lostitle}{%
   \iffieldundef{title}%
   {#1\isdot}%
@@ -2405,13 +2419,6 @@
 
 %%%% Other Field Formats %%%%
 
-% \InitializeCitationStyle{\numgdef{\cbx@resetcount}{\cbx@resetcount+1}}
-% \DeclareFieldFormat{bibhyperlink}{%
-%   \bibhyperlink{\iffootnote{f}{t}:\cbx@resetcount:\thefield{entrykey}}{#1}}
-% \DeclareFieldFormat{bibhypertarget}{%
-%   \bibhypertarget{\iffootnote{f}{t}:\cbx@resetcount:\thefield{entrykey}}{#1}}
-% \newcommand*{\cbx@resetcount}{0}
-
 \DeclareNumChars*{:}% For proper ibidem with multi-volume works.
 
 \DeclareFieldFormat{letterday}{\mkbibcurdinal{#1}}
@@ -2466,9 +2473,11 @@
   {\printfield{userd}\addspace #1}}
 
 \DeclareFieldFormat[music]{origdate}{% 16th ed.
-  \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}}%
-  {\bibstring{recorded}\space #1}%
-  {\printfield{userd}\addspace #1}}
+  \iftoggle{cms@reprint}% Date fix
+  {#1}%
+  {\ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}}%
+    {\bibstring{recorded}\space #1}%
+    {\printfield{userd}\addspace #1}}}
 
 \DeclareFieldFormat[music]{eventdate}{% 16th ed.
   \iffieldundef{userd}%
@@ -3149,12 +3158,12 @@
   {}%
   {\iffieldundef{origyear}%
     {}%
-    {\printtext[origdate]{\usebibmacro{cmsorigdate}}}}}
+    {\usebibmacro{cmsorigdate}}}}% Date fix
 
 \newbibmacro*{music+eventdate}{%
   \iffieldundef{eventyear}%
   {}%
-  {\printtext[eventdate]{\printeventdate}}}
+  {\printeventdate}}% Date fix
 
 \newbibmacro*{ctitle+stitle}{%
   \printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
@@ -3586,11 +3595,16 @@
 \newbibmacro*{cite+doi+url}{% 16th ed.
   \iffieldundef{urlyear}
   {}
-  {\printtext[urldate]{\printurldate}}%
+  {\printurldate}% Date fix
   \newcunit\newblock
-  \iftoggle{cms@doi}%
-  {\printfield{doi}}%
-  {}%
+  \iftoggle{cms@doionly}%
+  {\iffieldundef{doi}%
+    {}%
+    {\printfield{doi}%
+      \clearfield{url}}}%
+  {\iftoggle{cms@doi}%
+    {\printfield{doi}}%
+    {}}%
   \newcunit\newblock
   \iftoggle{cms@eprint}%
   {\usebibmacro{eprint}}%
@@ -3859,8 +3873,12 @@
             {\printnames[labelname]{namec}}%
             {}}}}}}}%
 
-\DeclareLabelname{shortauthor,author,shorteditor,namea,%
-  editor,nameb,translator,namec}
+\@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4
+{\DeclareLabelname{\field{shortauthor} \field{author}%
+    \field{shorteditor} \field{namea} \field{editor}%
+    \field{nameb} \field{translator} \field{namec}}}
+{\DeclareLabelname{shortauthor,author,shorteditor,namea,%
+    editor,nameb,translator,namec}}
 
 \DeclareDataInheritance{collection}{suppcollection}{%
   \inherit{title}{title}
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.bbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.bbx
index 216e91b145b..4000aed9950 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.bbx
@@ -1,11 +1,11 @@
-% $Id: chicago-notes15.bbx,v 0.9.7.13 2012/07/05 10:35:12 dfussner Exp $
+% $Id: chicago-notes15.bbx,v 0.9.7.14 2012/12/06 12:15:47 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, _15th_ edition.
 
 
 \ProvidesFile{chicago-notes15.bbx}
-[2012/07/05 v 1.7 biblatex bibliography style]
+[2012/12/06 v 2.4 biblatex bibliography style]
 
 %%%% Initialize and format bibliography and los %%%%
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.cbx
index 93a7d6ba6ec..4d09088a2f4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.cbx
@@ -1,11 +1,11 @@
-% $Id: chicago-notes15.cbx,v 0.9.7.18 2012/07/05 10:35:21 dfussner Exp $
+% $Id: chicago-notes15.cbx,v 0.9.7.21 2012/12/06 12:14:29 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,
 % _15th_ edition.
 
-\ProvidesFile{chicago-notes15.cbx}[2012/07/05 v 1.7 biblatex citation style]
+\ProvidesFile{chicago-notes15.cbx}[2012/12/06 v 2.4 biblatex citation style]
 
 %%%% Biblatex initialization + Chicago options + Toggles %%%%
 
@@ -2030,7 +2030,7 @@
 
 \DeclareListFormat{language}{%
   \ifthenelse{\value{listcount}=1}%
-  {\bibleftbracket\bibstring{inlang}\addspace%
+  {\bibleftbracket\bibstring{inlang}%\addspace - for inflected langs.
     \ifbibstring{#1}
     {\bibstring{#1}}
     {\ifbibstring{lang#1}
@@ -3402,8 +3402,8 @@
   \printfield{url}%
   \iffieldundef{urlyear}
     {}
-    {\setunit{\addspace}%
-     \printtext[urldate]{\printurldate}}}
+    {\setunit{\addspace}% Date fix
+     \printurldate}}
 
 \newbibmacro*{chap+pag}{%
   \printfield{chapter}%
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 c3ee6e682d5..4835b7cb453 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.27 2012/07/05 11:08:46 dfussner Exp $	
+% $Id: cms-american.lbx,v 0.10.1.30 2012/12/06 12:04:24 dfussner Exp $	
 
-\ProvidesFile{cms-american.lbx}[2012/07/05 v 1.7 biblatex localization]
+\ProvidesFile{cms-american.lbx}[2012/12/06 v 2.4 biblatex localization]
 
 \InheritBibliographyExtras{american}
 
@@ -311,7 +311,7 @@
   pseudonym = {{pseud\adddot}{pseud\adddot}},
   patentfiled = {{filed}{filed}},
   patentissued = {{issued}{issued}},
-  inlang = {{in}{in}},
+  inlang = {{in\addspace}{in\addspace}},
   langrussian    = {{Russian}{Russian}},
   fromrussian    = {{from the Russian}{from the Russian}}
   edamerican     = {{American}{American}},
@@ -809,7 +809,7 @@
 \protected\gdef\lbx@cms@mkbibrangetrunc@long#1#2{%
   \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
   {}
-  {\printtext{%
+  {\printtext[#2date]{%
     \iffieldsequal{#2year}{#2endyear}
     {\csuse{mkbibdate#1}{}{#2month}{#2day}}
     {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
@@ -832,7 +832,7 @@
 \protected\gdef\lbx@cms@mkbibrangetrunc@short#1#2{%
   \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
   {}
-  {\printtext{%
+  {\printtext[#2date]{%
       \iffieldsequal{#2year}{#2endyear}
       {\csuse{mkbibdate#1}{}{#2month}{#2day}}
       {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
@@ -846,7 +846,7 @@
 \protected\gdef\lbx@cms@mkbibrangefull#1#2{%
   \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
   {}%
-  {\printtext{%
+  {\printtext[#2date]{%
       \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
       \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}
       {}
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx
new file mode 100644
index 00000000000..cb4b5511806
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx
@@ -0,0 +1,73 @@
+% $Id: cms-british.lbx,v 0.4 2012/12/06 12:10:09 dfussner Exp $	
+
+\ProvidesFile{cms-british.lbx}[2012/12/06 v 2.4 biblatex localization]
+
+\InheritBibliographyExtras{british}
+
+\DeclareBibliographyExtras{%
+  \savecommand\cms@datelong
+  \savecommand\cms@datelongalt
+  \savecommand\mkbibrangecomp
+  \savecommand\mkbibrangeterse
+  \savecommand\mkbibrangefull
+  \protected\def\mkbibrangecomp{%
+    \lbx@cms@mkbibrangetrunc{long}}%
+  \protected\def\mkbibrangeterse{%
+    \lbx@cms@mkbibrangetrunc{short}}%
+  \protected\def\mkbibrangefull{%
+    \lbx@cms@mkbibrangefull}
+  \def\cms@datelong{\printorigdate}%
+  \def\cms@datelongalt{\printdate}}%
+
+\UndeclareBibliographyExtras{%
+  \restorecommand\cms@datelong
+  \restorecommand\cms@datelongalt
+  \restorecommand\mkbibrangecomp%
+  \restorecommand\mkbibrangefull%
+  \restorecommand\mkbibrangeterse}%
+
+\InheritBibliographyStrings{cms-american}
+
+\protected\gdef\lbx@cms@mkbibrangetrunc#1#2{%  DATE FIX
+  \iffieldundef{#2year}%
+  {\iffieldundef{#2month}
+    {}
+    {\printtext[#2date]{%
+        \iffieldsequal{#2month}{#2endmonth}
+        {\csuse{mkbibdate#1}{}{}{#2day}}
+        {\csuse{mkbibdate#1}{}{#2month}{#2day}}%
+        \iffieldundef{#2endyear}
+        {\iffieldundef{#2endmonth}
+          {}
+          {\bibdatedash
+            \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}}}
+        {\iffieldequalstr{#2endyear}{}
+          {\mbox{\bibdatedash}}
+          {\bibdatedash
+            \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+  {\printtext[#2date]{%
+      \iffieldsequal{#2year}{#2endyear}
+      {\iffieldsequal{#2month}{#2endmonth}
+        {\csuse{mkbibdate#1}{}{}{#2day}}
+        {\csuse{mkbibdate#1}{}{#2month}{#2day}}}
+      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+      \iffieldundef{#2endyear}
+      {}
+      {\iffieldequalstr{#2endyear}{}
+        {\mbox{\bibdatedash}}
+        {\bibdatedash
+          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+
+\protected\gdef\lbx@cms@mkbibrangefull#1#2{%
+  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
+  {}%
+  {\printtext[#2date]{%
+      \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}
+      {}
+      {\iffieldequalstr{#2endyear}{}
+        {\mbox{\bibdatedash}}
+        {\bibdatedash
+          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+
+\endinput
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 9555cc2fad9..25de5e7b404 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.20 2012/07/05 11:08:56 dfussner Exp $	
+% $Id: cms-french.lbx,v 0.9.5.23 2012/12/06 12:05:19 dfussner Exp $	
 
-\ProvidesFile{cms-french.lbx}[2012/07/05 v 1.7 biblatex localization]
+\ProvidesFile{cms-french.lbx}[2012/12/06 v 2.4 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Some strings still missing
@@ -318,7 +318,7 @@
   pseudonym = {{pseudonym}{pseudonym}},% ?
   patentfiled = {{d\'epos\'e}{d\'epos\'e}},
   patentissued = {{d\'elivr\'e}{d\'elivr\'e}},
-  inlang = {{en}{en}},
+  inlang = {{en\addspace}{en\addspace}},
   langrussian = {{russe}{russe}},
   fromrussian    = {{du russe}{du russe}}
   edamerican     = {{am\'ericaine}{am\'ericaine}},
@@ -786,7 +786,7 @@
   \iffieldundef{#2year}%
   {\iffieldundef{#2month}
     {}
-    {\printtext{%
+    {\printtext[#2date]{%
         \iffieldsequal{#2month}{#2endmonth}
         {\csuse{mkbibdate#1}{}{}{#2day}}
         {\csuse{mkbibdate#1}{}{#2month}{#2day}}%
@@ -799,7 +799,7 @@
           {\mbox{\bibdatedash}}
           {\bibdatedash
             \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-  {\printtext{%
+  {\printtext[#2date]{%
       \iffieldsequal{#2year}{#2endyear}
       {\iffieldsequal{#2month}{#2endmonth}
         {\csuse{mkbibdate#1}{}{}{#2day}}
@@ -815,7 +815,7 @@
 \protected\gdef\lbx@cms@mkbibrangefull#1#2{%
   \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
   {}%
-  {\printtext{%
+  {\printtext[#2date]{%
       \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
       \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}
       {}
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 ccbeb71d6ba..1daac95fd30 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.20 2012/07/05 11:09:04 dfussner Exp $	
+% $Id: cms-german.lbx,v 0.9.5.23 2012/12/06 12:06:28 dfussner Exp $	
 
-\ProvidesFile{cms-german.lbx}[2012/07/05 v 1.7 biblatex localization]
+\ProvidesFile{cms-german.lbx}[2012/12/06 v 2.4 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated strings and formatting decisions need review by native
@@ -326,7 +326,7 @@
   pseudonym = {{Pseud\adddot}{Pseud\adddot}},
   patentfiled = {{eingereicht}{eingereicht}},% Are these 2 correct?
   patentissued = {{erteilt}{erteilt}},% ?
-  inlang = {{auf}{auf}},
+  inlang = {{auf\addspace}{auf\addspace}},
   langrussian = {{Russisch}{Russisch}},
   fromrussian = {{aus dem Russischen}{aus dem Russischen}},
   edamerican     = {{amerikanische}{amerikanische}},
@@ -946,7 +946,7 @@
   \iffieldundef{#2year}%
   {\iffieldundef{#2month}
     {}
-    {\printtext{%
+    {\printtext[#2date]{%
         \iffieldsequal{#2month}{#2endmonth}
         {\csuse{mkbibdate#1}{}{}{#2day}}
         {\csuse{mkbibdate#1}{}{#2month}{#2day}}%
@@ -959,7 +959,7 @@
           {\mbox{\bibdatedash}}
           {\bibdatedash
             \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-  {\printtext{%
+  {\printtext[#2date]{%
       \iffieldsequal{#2year}{#2endyear}
       {\iffieldsequal{#2month}{#2endmonth}
         {\csuse{mkbibdate#1}{}{}{#2day}}
@@ -975,7 +975,7 @@
 \protected\gdef\lbx@cms@mkbibrangefull#1#2{%
   \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
   {}%
-  {\printtext{%
+  {\printtext[#2date]{%
       \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
       \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}
       {}
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-icelandic.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-icelandic.lbx
new file mode 100644
index 00000000000..77bda016fa2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-icelandic.lbx
@@ -0,0 +1,498 @@
+% $Id: cms-icelandic.lbx,v 0.6 2012/12/06 12:11:26 dfussner Exp $	
+
+\ProvidesFile{cms-icelandic.lbx}[2012/12/06 v 2.4 biblatex localization]
+
+% STATUS OF THIS FILE
+% - Translated by a native speaker (Baldur Kristinsson).
+% - Depends on icelandic.lbx from the biblatex project
+% - Many bibstrings remain untranslated.
+% - Needs fine tuning, since declension of Icelandic nouns (names + titles)
+%   makes straight translations difficult in some cases.
+% - Last worked on: 2012-06-15
+% - Date handling altered by dfussner, along with a few other small
+%   fixes.  I have added placeholders for 9 audio-visual strings, but
+%   need help from a native speaker to provide the actual strings.
+%   See "bydirector," "cbydirector," "byconductor," "cbyconductor,"
+%   "byproducer," "cbyproducer," "broadcast," "recorded," and "on."
+
+\InheritBibliographyExtras{icelandic}
+
+\DeclareBibliographyExtras{%
+  \savecommand\cms@datelong
+  \savecommand\cms@datelongalt
+  \savecommand\mkbibrangecomp
+  \savecommand\mkbibrangeterse
+  \savecommand\mkbibrangefull
+  \protected\def\mkbibrangecomp{%
+    \lbx@cms@mkbibrangetrunc{long}}%
+  \protected\def\mkbibrangeterse{%
+    \lbx@cms@mkbibrangetrunc{short}}%
+  \protected\def\mkbibrangefull{%
+    \lbx@cms@mkbibrangefull}
+  \def\cms@datelong{\printorigdate}%
+  \def\cms@datelongalt{\printdate}}%
+
+\UndeclareBibliographyExtras{%
+  \restorecommand\cms@datelong
+  \restorecommand\cms@datelongalt
+  \restorecommand\mkbibrangecomp%
+  \restorecommand\mkbibrangefull%
+  \restorecommand\mkbibrangeterse}%
+
+\NewBibliographyString{bynone}
+\NewBibliographyString{bycompiler}
+\NewBibliographyString{byconductor}
+\NewBibliographyString{bydirector}
+\NewBibliographyString{byproducer}
+\NewBibliographyString{byeditorcp}
+\NewBibliographyString{byeditortrcp}
+\NewBibliographyString{byeditortrcpco}
+\NewBibliographyString{byeditortrcpan}
+\NewBibliographyString{byeditortrcpin}
+\NewBibliographyString{byeditortrcpfo}
+\NewBibliographyString{byeditortrcpaf}
+\NewBibliographyString{byeditortrcpcoin}
+\NewBibliographyString{byeditortrcpcofo}
+\NewBibliographyString{byeditortrcpcoaf}
+\NewBibliographyString{byeditortrcpanin}
+\NewBibliographyString{byeditortrcpanfo}
+\NewBibliographyString{byeditortrcpanaf}
+\NewBibliographyString{byeditorcpco}
+\NewBibliographyString{byeditorcpan}
+\NewBibliographyString{byeditorcpin}
+\NewBibliographyString{byeditorcpfo}
+\NewBibliographyString{byeditorcpaf}
+\NewBibliographyString{byeditorcpcoin}
+\NewBibliographyString{byeditorcpcofo}
+\NewBibliographyString{byeditorcpcoaf}
+\NewBibliographyString{byeditorcpanin}
+\NewBibliographyString{byeditorcpanfo}
+\NewBibliographyString{byeditorcpanaf}
+\NewBibliographyString{bytranslatorcp}
+\NewBibliographyString{bytranslatorcpco}
+\NewBibliographyString{bytranslatorcpan}
+\NewBibliographyString{bytranslatorcpin}
+\NewBibliographyString{bytranslatorcpfo}
+\NewBibliographyString{bytranslatorcpaf}
+\NewBibliographyString{bytranslatorcpcoin}
+\NewBibliographyString{bytranslatorcpcofo}
+\NewBibliographyString{bytranslatorcpcoaf}
+\NewBibliographyString{bytranslatorcpanin}
+\NewBibliographyString{bytranslatorcpanfo}
+\NewBibliographyString{bytranslatorcpanaf}
+\NewBibliographyString{bycompilerco}
+\NewBibliographyString{bycompileran}
+\NewBibliographyString{bycompilerin}
+\NewBibliographyString{bycompilerfo}
+\NewBibliographyString{bycompileraf}
+\NewBibliographyString{bycompilercoin}
+\NewBibliographyString{bycompilercofo}
+\NewBibliographyString{bycompilercoaf}
+\NewBibliographyString{bycompileranin}
+\NewBibliographyString{bycompileranfo}
+\NewBibliographyString{bycompileranaf}
+\NewBibliographyString{cbynone}
+\NewBibliographyString{cbyauthor}
+\NewBibliographyString{cbyeditor}
+\NewBibliographyString{cbytranslator}
+\NewBibliographyString{cbycompiler}
+\NewBibliographyString{cbyredactor}
+\NewBibliographyString{cbycommentator}
+\NewBibliographyString{cbyannotator}
+\NewBibliographyString{cbyfounder}
+\NewBibliographyString{cbycontinuator}
+\NewBibliographyString{cbycollaborator}
+\NewBibliographyString{cbyconductor}
+\NewBibliographyString{cbydirector}
+\NewBibliographyString{cbyproducer}
+\NewBibliographyString{cbyeditortr}
+\NewBibliographyString{cbyeditorcp}
+\NewBibliographyString{cbyeditorco}
+\NewBibliographyString{cbyeditoran}
+\NewBibliographyString{cbyeditorin}
+\NewBibliographyString{cbyeditorfo}
+\NewBibliographyString{cbyeditoraf}
+\NewBibliographyString{cbyeditortrcp}
+\NewBibliographyString{cbyeditortrco}
+\NewBibliographyString{cbyeditortran}
+\NewBibliographyString{cbyeditortrin}
+\NewBibliographyString{cbyeditortrfo}
+\NewBibliographyString{cbyeditortraf}
+\NewBibliographyString{cbyeditortrcpco}
+\NewBibliographyString{cbyeditortrcpan}
+\NewBibliographyString{cbyeditortrcpin}
+\NewBibliographyString{cbyeditortrcpfo}
+\NewBibliographyString{cbyeditortrcpaf}
+\NewBibliographyString{cbyeditorcoin}
+\NewBibliographyString{cbyeditorcofo}
+\NewBibliographyString{cbyeditorcoaf}
+\NewBibliographyString{cbyeditoranin}
+\NewBibliographyString{cbyeditoranfo}
+\NewBibliographyString{cbyeditoranaf}
+\NewBibliographyString{cbyeditortrcoin}
+\NewBibliographyString{cbyeditortrcofo}
+\NewBibliographyString{cbyeditortrcoaf}
+\NewBibliographyString{cbyeditortranin}
+\NewBibliographyString{cbyeditortranfo}
+\NewBibliographyString{cbyeditortranaf}
+\NewBibliographyString{cbyeditortrcpcoin}
+\NewBibliographyString{cbyeditortrcpcofo}
+\NewBibliographyString{cbyeditortrcpcoaf}
+\NewBibliographyString{cbyeditortrcpanin}
+\NewBibliographyString{cbyeditortrcpanfo}
+\NewBibliographyString{cbyeditortrcpanaf}
+\NewBibliographyString{cbyeditorcpco}
+\NewBibliographyString{cbyeditorcpan}
+\NewBibliographyString{cbyeditorcpin}
+\NewBibliographyString{cbyeditorcpfo}
+\NewBibliographyString{cbyeditorcpaf}
+\NewBibliographyString{cbyeditorcpcoin}
+\NewBibliographyString{cbyeditorcpcofo}
+\NewBibliographyString{cbyeditorcpcoaf}
+\NewBibliographyString{cbyeditorcpanin}
+\NewBibliographyString{cbyeditorcpanfo}
+\NewBibliographyString{cbyeditorcpanaf}
+\NewBibliographyString{cbytranslatorcp}
+\NewBibliographyString{cbytranslatorco}
+\NewBibliographyString{cbytranslatoran}
+\NewBibliographyString{cbytranslatorin}
+\NewBibliographyString{cbytranslatorfo}
+\NewBibliographyString{cbytranslatoraf}
+\NewBibliographyString{cbytranslatorcpco}
+\NewBibliographyString{cbytranslatorcpan}
+\NewBibliographyString{cbytranslatorcpin}
+\NewBibliographyString{cbytranslatorcpfo}
+\NewBibliographyString{cbytranslatorcpaf}
+\NewBibliographyString{cbytranslatorcoin}
+\NewBibliographyString{cbytranslatorcofo}
+\NewBibliographyString{cbytranslatorcoaf}
+\NewBibliographyString{cbytranslatoranin}
+\NewBibliographyString{cbytranslatoranfo}
+\NewBibliographyString{cbytranslatoranaf}
+\NewBibliographyString{cbytranslatorcpcoin}
+\NewBibliographyString{cbytranslatorcpcofo}
+\NewBibliographyString{cbytranslatorcpcoaf}
+\NewBibliographyString{cbytranslatorcpanin}
+\NewBibliographyString{cbytranslatorcpanfo}
+\NewBibliographyString{cbytranslatorcpanaf}
+\NewBibliographyString{cbycompilerco}
+\NewBibliographyString{cbycompileran}
+\NewBibliographyString{cbycompilerin}
+\NewBibliographyString{cbycompilerfo}
+\NewBibliographyString{cbycompileraf}
+\NewBibliographyString{cbycompilercoin}
+\NewBibliographyString{cbycompilercofo}
+\NewBibliographyString{cbycompilercoaf}
+\NewBibliographyString{cbycompileranin}
+\NewBibliographyString{cbycompileranfo}
+\NewBibliographyString{cbycompileranaf}
+\NewBibliographyString{partvolume}
+\NewBibliographyString{by}
+\NewBibliographyString{of}
+\NewBibliographyString{on}
+\NewBibliographyString{afterwordto}
+\NewBibliographyString{forewordto}
+\NewBibliographyString{introductionto}
+\NewBibliographyString{origpub}
+\NewBibliographyString{origpublin}
+\NewBibliographyString{origpubyear}
+\NewBibliographyString{origreleaseyear}
+\NewBibliographyString{origshownyear}
+\NewBibliographyString{origedition}
+\NewBibliographyString{revisededition}
+\NewBibliographyString{broadcast}
+\NewBibliographyString{recorded}
+\NewBibliographyString{numbers}
+\NewBibliographyString{nodate}
+\NewBibliographyString{pseudonym}
+\NewBibliographyString{patentfiled}
+\NewBibliographyString{patentissued}
+\NewBibliographyString{inlang}
+\NewBibliographyString{langrussian}
+\NewBibliographyString{fromrussian}
+\NewBibliographyString{edamerican}
+\NewBibliographyString{edbrazilian}
+\NewBibliographyString{eddanish}
+\NewBibliographyString{eddutch}
+\NewBibliographyString{edenglish}
+\NewBibliographyString{edfrench}
+\NewBibliographyString{edgerman}
+\NewBibliographyString{edgreek}
+\NewBibliographyString{editalian}
+\NewBibliographyString{edlatin}
+\NewBibliographyString{ednorwegian}
+\NewBibliographyString{edportuguese}
+\NewBibliographyString{edrussian}
+\NewBibliographyString{edspanish}
+\NewBibliographyString{edswedish}
+\NewBibliographyString{review}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{section}
+\NewBibliographyString{sections}
+\NewBibliographyString{compiler}
+\NewBibliographyString{compilers}
+\NewBibliographyString{conductor}
+\NewBibliographyString{conductors}
+\NewBibliographyString{director}
+\NewBibliographyString{directors}
+\NewBibliographyString{none}
+\NewBibliographyString{nones}
+\NewBibliographyString{producer}
+\NewBibliographyString{producers}
+\NewBibliographyString{transcompiler}
+\NewBibliographyString{transcompilers}
+\NewBibliographyString{editortranscompiler}
+\NewBibliographyString{editorcompiler}
+\NewBibliographyString{editortranslator}
+\NewBibliographyString{editortranscompilers}
+\NewBibliographyString{editorcompilers}
+\NewBibliographyString{editortranslators}
+
+\DeclareBibliographyStrings{%
+  inherit = {icelandic},
+  afterwordto = {{eftirm\'ali vi}{eftirm\'ali vi}},
+  forewordto = {{form\'ali vi}{form\'ali vi}},
+  introductionto = {{inngangur a}{inngangur a}},
+  partvolume = {{\addspace hl\adddot}{\addspace hl\adddot}},
+  by = {{eftir}{eftir}},
+  of = {{af}{af}},
+%  on = {{}{}},
+  compiler = {{ritstj\adddot}{ritstj\adddot}},% Same as editor
+  compilers = {{ritstj\adddot}{ritstj\adddot}},
+  transcompiler = {{ritstj\adddot\addabbrvspace og \'y\adddot}%
+    {ritstj\adddot\addabbrvspace og \'y\adddot}},
+  transcompilers = {{ritstj\adddot\addabbrvspace og \'y\adddot}%
+    {ritstj\adddot\addabbrvspace og \'y\adddot}},
+  editortranscompiler = {{ritstj\adddot\addabbrvspace og \'y\adddot}%
+    {ritstj\adddot\addabbrvspace og \'y\adddot}},
+  editorcompiler = {{ritstj\adddot}{ritstj\adddot}},
+  editortranslator = {{ritstj\adddot\addabbrvspace og \'y\adddot}%
+    {ritstj\adddot\addabbrvspace og \'y\adddot}},
+  editortranscompilers = {{ritstj\adddot\addabbrvspace og \'y\adddot}%
+    {ritstj\adddot\addabbrvspace og \'y\adddot}},
+  editorcompilers = {{ritstj\adddot}{ritstj\adddot}},
+  editortranslators = {{ritstj\adddot\addabbrvspace og \'y\adddot}%
+    {ritstj\adddot\addabbrvspace og \'y\adddot}},
+  conductor = {{stj\'ornandi}{stj\'ornandi}},
+  conductors = {{stj\'ornenduur}{stj\'ornendur}},
+  director = {{leikstj\adddot}{leikstj\adddot}},
+  directors = {{leikstj\adddot}{leikstj\adddot}},
+  none = {{}{}},
+  nones = {{}{}},
+  producer = {{framleiandi}{framl\adddot}},
+  producers = {{framleiendur}{framl\adddot}},
+  editor = {{ritstj\adddot}{ritstj\adddot}},
+  editors = {{ritstj\adddot}{ritstj\adddot}},
+  ibidem = {{sama heimild}{s\adddot h\adddot}},
+  origpub = {{upphaflega birt sem}%
+    {upph\adddot\ birt sem}},
+  origpublin = {{birtist upphaflega \'{\i}}%
+    {birtist upph\adddot \'{\i}}},
+  origpubyear = {{birtist upphaflega \'ari}%
+    {birtist upph\adddot\ \'ari}},
+  origreleaseyear = {{upphaflegt \'ut\'ar\addspace}%
+    {upph\adddot \'utg\'afu\'ar\addspace}},
+  origshownyear = {{upphaflega s\'ynt \'ari}%
+    {upph\adddot\ s\'ynt \'ari}},
+  origedition = {{\'utg\'afa\addcolon}%
+    {\'utg\adddot\addcolon}},
+  revisededition = {{endurskou \'utg\'afa}%
+    {endursk\adddot \'utg\adddot}},
+%  broadcast = {{}{}},
+%  recorded = {{}{}},
+  numbers = {{nr\adddot}{nr\adddot}},
+  nodate = {{\'an \'ars}{\'an \'ars}},
+  pseudonym = {{dulnefni}{dulnefni}},
+  patentfiled = {{lagt fram til skr\'aningar}{lagt fram til skr\'aningar}},%
+  patentissued = {{veitt}{veitt}},% ?
+  inlang = {{}{}}, % if this is translated "\'a",%
+%  it would lead to "\'a r\'ussneska", etc.
+  langrussian = {{r\'ussneska}{r\'ussneska}},
+  fromrussian = {{\'ur r\'ussnesku}{\'ur r\'ussnesku}},
+  edamerican     = {{bandar\'{\i}sk}{bandar\'{\i}sk}},
+  edbrazilian    = {{brasil\'{\i}sk}{brasil\'{\i}sk}},
+  eddanish       = {{d\"onsk}{d\"onsk}},
+  eddutch        = {{hollensk}{hollensk}},
+  edenglish      = {{bresk}{bresk}},
+  edfrench       = {{fr\"onsk}{fr\"onsk}},
+  edgerman       = {{\'ysk}{\'ysk}},
+  edgreek        = {{gr\'{\i}sk}{gr\'{\i}sk}},
+  editalian      = {{\'{\i}t\"olsk}{\'{\i}t\"olsk}},
+  edlatin        = {{latnesk}{latnesk}},
+  ednorwegian    = {{norsk}{norsk}},
+  edportuguese   = {{port\'ug\"olsk}{port\'ug\"olsk}},
+  edrussian      = {{r\'ussnesk}{r\'ussnesk}},
+  edspanish      = {{sp\ae{}nsk}{sp\ae{}nsk}},
+  edswedish      = {{s\ae{}nsk}{s\ae{}nsk}},
+  translator = {{\'y\adddot}{\'y\adddot}},
+  translators = {{\'y\adddot}{\'y\adddot}},
+  redactor = {{ritstj\adddot}{ritstj\adddot}}, % same as editor
+  redactors = {{ritstj\adddot}{ritstj\adddot}},
+  founder          = {{stofnandi}{stofnandi}},
+  founders         = {{stofnendur}{stofnendur}},
+  continuator      = {{haldi \'afram af}{haldi \'afram af}},
+  continuators     = {{haldi \'afram af}{haldi \'afram af}},
+  collaborator     = {{samstarfsmaur}{samstarfsmaur}},
+  collaborators    = {{samstarfsmenn}{samstarfsmenn}},
+  annotator        = {{me sk\'yringum eftir}{me sk\'yringum eftir}},
+  annotators       = {{me sk\'yringum eftir}{me sk\'yringum eftir}},
+  review = {{ritd\'omur}{ritd\'omur}},
+  reviewof = {{ritd\'omur um}{ritd\'omur um}},
+  reprint = {{endurprentun}{endurpr\adddot}},
+  shorthands = {{skammstafanir}{skammstafanir}},
+  newseries = {{n\'y ritr\"o}{n\adddot rr\adddot}},
+  bynone = {{}{}},
+  cbynone = {{}{}},
+  cbyauthor         = {{eftir}{eftir}},
+  cbyeditor         = {{ritstj\adddot}{ritstj\adddot}},
+  cbycompiler       = {{teki saman af}{teki saman af}},
+  cbyredactor       = {{endurskoa af}{endurskoa af}},
+% The following translations have been taken directly from my version of
+% icelandic.lbx for biblatex (without the "c" in front).
+  cbytranslator     = {{\'y\adddot\addspace\lbx@lfromlang}%
+    {\'y\adddot\addspace\lbx@sfromlang}},%
+  cbycommentator    = {{sk\'yringar:}{sk\'yringar:}},
+  cbyannotator      = {{sk\'yringar:}{sk\'yringar:}},
+%  cbyconductor      = {{}{}},
+%  cbydirector       = {{}{}},
+%  cbyproducer       = {{}{}},
+  cbyeditortr       = {{\'utg.~og \'y\adddot \lbx@lfromlang}%
+                      {\'utg.~og \'y\adddot}},
+  cbyeditorco       = {{\'utg.~og sk\'yringar:}%
+                      {\'utg.~og sk\'yringar:}},
+  cbyeditoran       = {{\'utg.~og sk\'yringar:}%
+                      {\'utg. og sk\'yringar:}},
+  cbyeditorin       = {{\'utg. og  inng\adddot:}%
+                      {\'utg. og  inng\adddot:}},
+  cbyeditorfo       = {{\'utg. og  form\'ali:}%
+                      {\'utg. og  form\'ali:}},
+  cbyeditoraf       = {{\'utg. og  eftirm\'ali:}%
+                      {\'utg. og  eftirm\'ali:}},
+  cbyeditortrco     = {{\'utg., \'y\adddot \lbx@sfromlang\ og sk\'yringar:}%
+                      {\'utg., \'y\adddot \lbx@sfromlang\ og sk\'yringar:}},
+  cbyeditortran     = {{\'utg., \'y\adddot \lbx@sfromlang\ og sk\'yringar:}%
+                      {\'utg., \'y\adddot \lbx@sfromlang\ og sk\'yringar:}},
+  cbyeditortrin     = {{\'utg., \'y\adddot \lbx@sfromlang\ og  inng\adddot:}%
+                      {\'utg., \'y\adddot \lbx@sfromlang\ og  inng\adddot:}},
+  cbyeditortrfo     = {{\'utg., \'y\adddot \lbx@sfromlang\ og  form\'ali:}%
+                      {\'utg., \'y\adddot \lbx@sfromlang\ og  form\'ali:}},
+  cbyeditortraf     = {{\'utg., \'y\adddot \lbx@sfromlang\ og  eftirm\'ali:}%
+                      {\'utg., \'y\adddot \lbx@sfromlang\ og  eftirm\'ali:}},
+  cbyeditorcoin     = {{\'utg., sk\'yringar og  inng\adddot:}%
+                      {\'utg., sk\'yringar og  inng\adddot:}},
+  cbyeditorcofo     = {{\'utg., sk\'yringar og  form\'ali:}%
+                      {\'utg., sk\'yringar og  form\'ali:}},
+  cbyeditorcoaf     = {{\'utg., sk\'yringar og  eftirm\'ali:}%
+                      {\'utg., sk\'yringar og  eftirm\'ali:}},
+  cbyeditoranin     = {{\'utg., sk\'yringar og  inng\adddot:}%
+                      {\'utg., sk\'yringar og  inng\adddot:}},
+  cbyeditoranfo     = {{\'utg., sk\'yringar og  form\'ali:}%
+                      {\'utg., sk\'yringar og  form\'ali:}},
+  cbyeditoranaf     = {{\'utg., sk\'yringar og  eftirm\'ali:}%
+                      {\'utg., sk\'yringar og  eftirm\'ali:}},
+  cbyeditortrcoin   = {{\'utg., \'y\adddot \lbx@sfromlang\ og  sk\'yringar og inng\adddot:}%
+                      {\'utg., \'y\adddot \lbx@sfromlang\ og  sk\'yringar og inng\adddot:}},
+  cbyeditortrcofo   = {{\'utg., \'y\adddot \lbx@sfromlang\ og  sk\'yringar og form\'ali:}%
+                      {\'utg., \'y\adddot \lbx@sfromlang\ og  sk\'yringar og form\'ali:}},
+  cbyeditortrcoaf   = {{\'utg., \'y\adddot \lbx@sfromlang\ og  sk\'yringar og eftirm\'ali:}%
+                      {\'utg., \'y\adddot \lbx@sfromlang\ og  sk\'yringar og eftirm\'ali:}},
+  cbyeditortranin   = {{\'utg., \'y\adddot \lbx@sfromlang\ og  sk\'yringar og inng\adddot:}%
+                      {\'utg., \'y\adddot \lbx@sfromlang\ og  sk\'yringar og inng\adddot:}}, 
+  cbyeditortranfo   = {{\'utg., \'y\adddot \lbx@sfromlang\ og  sk\'yringar og form\'ali:}%
+                      {\'utg., \'y\adddot \lbx@sfromlang\ og  sk\'yringar og form\'ali:}},
+  cbyeditortranaf   = {{\'utg., \'y\adddot \lbx@sfromlang\ og  sk\'yringar og eftirm\'ali:}%
+                      {\'utg., \'y\adddot \lbx@sfromlang\ og  sk\'yringar og eftirm\'ali:}}, 
+  cbytranslatorco   = {{\'y\adddot \lbx@lfromlang\ og sk\'yringar:}%
+                      {\'y\adddot \lbx@lfromlang\ og sk\'yringar:}},
+  cbytranslatoran   = {{\'y\adddot \lbx@lfromlang\ og sk\'yringar:}%
+                      {\'y\adddot \lbx@lfromlang\ og sk\'yringar:}}, 
+  cbytranslatorin   = {{\'y\adddot \lbx@lfromlang\ og  inng\adddot:}%
+                      {\'y\adddot \lbx@lfromlang\ og  inng\adddot:}},
+  cbytranslatorfo   = {{\'y\adddot \lbx@lfromlang\ og  form\'ali:}%
+                      {\'y\adddot \lbx@lfromlang\ og  form\'ali:}},
+  cbytranslatoraf   = {{\'y\adddot \lbx@lfromlang\ og  eftirm\'ali:}%
+                      {\'y\adddot \lbx@lfromlang\ og  eftirm\'ali:}},
+  cbytranslatorcoin = {{\'y\adddot \lbx@lfromlang, sk\'yringar og  inng\adddot:}%
+                      {\'y\adddot \lbx@lfromlang, sk\'yringar og  inng\adddot:}},
+  cbytranslatorcofo = {{\'y\adddot \lbx@lfromlang, sk\'yringar og  form\'ali:}%
+                      {\'y\adddot \lbx@lfromlang, sk\'yringar og  form\'ali:}},
+  cbytranslatorcoaf = {{\'y\adddot \lbx@lfromlang, sk\'yringar og  eftirm\'ali:}%
+                      {\'y\adddot \lbx@lfromlang, sk\'yringar og  eftirm\'ali:}},
+  cbytranslatoranin = {{\'y\adddot \lbx@lfromlang, sk\'yringar og  inng\adddot:}%
+                      {\'y\adddot \lbx@lfromlang, sk\'yringar og  inng\adddot:}},
+  cbytranslatoranfo = {{\'y\adddot \lbx@lfromlang, sk\'yringar og  form\'ali:}%
+                      {\'y\adddot \lbx@lfromlang, sk\'yringar og  form\'ali:}},
+  cbytranslatoranaf = {{\'y\adddot \lbx@lfromlang, sk\'yringar og  eftirm\'ali:}%
+                      {\'y\adddot \lbx@lfromlang, sk\'yringar og  eftirm\'ali:}},
+  % Missing: cbycompilerco, cbycompileran, cbycompilerin, cbycompilerfo, cbycompileraf,
+  %          cbycompilercoin, cbycompilercofo, cbycompilercoaf, cbycompileranin,
+  %          cbycompileranfo, cbycompileranaf
+  volume = {{bindi}{bindi}},
+  volumes = {{bindi}{bindi}},
+  jourvol = {{\'arg\adddot}{\'arg\adddot}},
+  jourser = {{ritr\"o}{rr\adddot}},
+  oldseries = {{g\"omul ritr\"o}{g\adddot rr\adddot}},
+  edition = {{\'utg\adddot}{\'utg\adddot}},
+  page = {{bls\adddot}{bls\adddot}},
+  pages = {{bls\adddot}{bls\adddot}},
+  column = {{d\'alkur}{dlk\adddot}},
+  columns = {{d\'alkar}{dlk\adddot}},
+  line = {{l\'{\i}na}{l\adddot}},
+  lines = {{l\'{\i}nur}{l\adddot}},
+  paragraph = {{mgr\adddot}{mgr\adddot}},
+  paragraphs = {{mgr\adddot}{mgr\adddot}},
+  section = {{\S}{\S}},
+  sections = {{\S\S}{\S\S}},
+  verse = {{erindi}{er\adddot}},
+  verses = {{erindi}{er\adddot}},
+  number = {{nr\adddot}{nr\adddot}},
+  chapter = {{kafli}{k\adddot}},
+%  byconductor = {{}{}},
+%  bydirector = {{}{}},
+%  byproducer = {{}{}},
+  % A lot of keys already present in in icelandic.lbx omitted here
+}
+
+\protected\gdef\lbx@cms@mkbibrangetrunc#1#2{%  DATE FIX
+  \iffieldundef{#2year}%
+  {\iffieldundef{#2month}
+    {}
+    {\printtext[#2date]{%
+        \iffieldsequal{#2month}{#2endmonth}
+        {\csuse{mkbibdate#1}{}{}{#2day}}
+        {\csuse{mkbibdate#1}{}{#2month}{#2day}}%
+        \iffieldundef{#2endyear}
+        {\iffieldundef{#2endmonth}
+          {}
+          {\bibdatedash
+            \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}}}
+        {\iffieldequalstr{#2endyear}{}
+          {\mbox{\bibdatedash}}
+          {\bibdatedash
+            \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+  {\printtext[#2date]{%
+      \iffieldsequal{#2year}{#2endyear}
+      {\iffieldsequal{#2month}{#2endmonth}
+        {\csuse{mkbibdate#1}{}{}{#2day}}
+        {\csuse{mkbibdate#1}{}{#2month}{#2day}}}
+      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+      \iffieldundef{#2endyear}
+      {}
+      {\iffieldequalstr{#2endyear}{}
+        {\mbox{\bibdatedash}}
+        {\bibdatedash
+          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+
+\protected\gdef\lbx@cms@mkbibrangefull#1#2{%
+  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
+  {}%
+  {\printtext[#2date]{%
+      \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}
+      {}
+      {\iffieldequalstr{#2endyear}{}
+        {\mbox{\bibdatedash}}
+        {\bibdatedash
+          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+
+\endinput
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 49861be8f5e..5f96c95e8e6 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-german.lbx,v 0.9.5.20 2012/07/05 11:09:04 dfussner Exp $	
+% $Id: cms-german.lbx,v 0.9.5.23 2012/12/06 12:06:28 dfussner Exp $	
 
-\ProvidesFile{cms-ngerman.lbx}[2012/07/05 v 1.7 biblatex localization]
+\ProvidesFile{cms-ngerman.lbx}[2012/12/06 v 2.4 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated strings and formatting decisions need review by native
@@ -326,7 +326,7 @@
   pseudonym = {{Pseud\adddot}{Pseud\adddot}},
   patentfiled = {{eingereicht}{eingereicht}},% Are these 2 correct?
   patentissued = {{erteilt}{erteilt}},% ?
-  inlang = {{auf}{auf}},
+  inlang = {{auf\addspace}{auf\addspace}},
   langrussian = {{Russisch}{Russisch}},
   fromrussian = {{aus dem Russischen}{aus dem Russischen}},
   edamerican     = {{amerikanische}{amerikanische}},
@@ -946,7 +946,7 @@
   \iffieldundef{#2year}%
   {\iffieldundef{#2month}
     {}
-    {\printtext{%
+    {\printtext[#2date]{%
         \iffieldsequal{#2month}{#2endmonth}
         {\csuse{mkbibdate#1}{}{}{#2day}}
         {\csuse{mkbibdate#1}{}{#2month}{#2day}}%
@@ -959,7 +959,7 @@
           {\mbox{\bibdatedash}}
           {\bibdatedash
             \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-  {\printtext{%
+  {\printtext[#2date]{%
       \iffieldsequal{#2year}{#2endyear}
       {\iffieldsequal{#2month}{#2endmonth}
         {\csuse{mkbibdate#1}{}{}{#2day}}
@@ -975,7 +975,7 @@
 \protected\gdef\lbx@cms@mkbibrangefull#1#2{%
   \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
   {}%
-  {\printtext{%
+  {\printtext[#2date]{%
       \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
       \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}
       {}
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx
new file mode 100644
index 00000000000..0d51cd11176
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx
@@ -0,0 +1,14 @@
+% $Id: cms-norsk.lbx,v 1.2 2012/12/06 11:34:59 dfussner Exp $
+
+\ProvidesFile{cms-norsk.lbx}[2012/12/06 v 2.4 biblatex localization]
+
+% STATUS OF THIS FILE
+% - Placeholder for cms-norwegian.lbx, as in standard biblatex.
+% - Strings in cms-norwegian.lbx translated by a native speaker
+%   (H{\aa}kon Malmedal).
+% - Date handling there modified by dfussner.
+
+\InheritBibliographyExtras{cms-norwegian}
+\InheritBibliographyStrings{cms-norwegian}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norwegian.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norwegian.lbx
new file mode 100644
index 00000000000..c79e0abd76b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norwegian.lbx
@@ -0,0 +1,755 @@
+% $Id: cms-norwegian.lbx,v 1.2 2012/12/06 11:34:06 dfussner Exp $
+
+\ProvidesFile{cms-norwegian.lbx}[2012/12/06 v 2.4 biblatex localization]
+
+% STATUS OF THIS FILE
+% - Translated by a native speaker (H{\aa}kon Malmedal).
+% - Date handling modified by dfussner.
+
+\InheritBibliographyExtras{norwegian}
+
+\DeclareBibliographyExtras{%
+  \savecommand\cms@datelong
+  \savecommand\cms@datelongalt
+  \savecommand\mkbibrangecomp
+  \savecommand\mkbibrangeterse
+  \savecommand\mkbibrangefull
+  \protected\def\mkbibrangecomp{%
+    \lbx@cms@mkbibrangetrunc{long}}%
+  \protected\def\mkbibrangeterse{%
+    \lbx@cms@mkbibrangetrunc{short}}%
+  \protected\def\mkbibrangefull{%
+    \lbx@cms@mkbibrangefull}
+  \def\cms@datelong{\printorigdate}%
+  \def\cms@datelongalt{\printdate}}%
+
+\UndeclareBibliographyExtras{%
+  \restorecommand\cms@datelong
+  \restorecommand\cms@datelongalt
+  \restorecommand\mkbibrangecomp%
+  \restorecommand\mkbibrangefull%
+  \restorecommand\mkbibrangeterse}%
+
+\NewBibliographyString{bynone}
+\NewBibliographyString{bycompiler}
+\NewBibliographyString{byconductor}
+\NewBibliographyString{bydirector}
+\NewBibliographyString{byproducer}
+\NewBibliographyString{byeditorcp}
+\NewBibliographyString{byeditortrcp}
+\NewBibliographyString{byeditortrcpco}
+\NewBibliographyString{byeditortrcpan}
+\NewBibliographyString{byeditortrcpin}
+\NewBibliographyString{byeditortrcpfo}
+\NewBibliographyString{byeditortrcpaf}
+\NewBibliographyString{byeditortrcpcoin}
+\NewBibliographyString{byeditortrcpcofo}
+\NewBibliographyString{byeditortrcpcoaf}
+\NewBibliographyString{byeditortrcpanin}
+\NewBibliographyString{byeditortrcpanfo}
+\NewBibliographyString{byeditortrcpanaf}
+\NewBibliographyString{byeditorcpco}
+\NewBibliographyString{byeditorcpan}
+\NewBibliographyString{byeditorcpin}
+\NewBibliographyString{byeditorcpfo}
+\NewBibliographyString{byeditorcpaf}
+\NewBibliographyString{byeditorcpcoin}
+\NewBibliographyString{byeditorcpcofo}
+\NewBibliographyString{byeditorcpcoaf}
+\NewBibliographyString{byeditorcpanin}
+\NewBibliographyString{byeditorcpanfo}
+\NewBibliographyString{byeditorcpanaf}
+\NewBibliographyString{bytranslatorcp}
+\NewBibliographyString{bytranslatorcpco}
+\NewBibliographyString{bytranslatorcpan}
+\NewBibliographyString{bytranslatorcpin}
+\NewBibliographyString{bytranslatorcpfo}
+\NewBibliographyString{bytranslatorcpaf}
+\NewBibliographyString{bytranslatorcpcoin}
+\NewBibliographyString{bytranslatorcpcofo}
+\NewBibliographyString{bytranslatorcpcoaf}
+\NewBibliographyString{bytranslatorcpanin}
+\NewBibliographyString{bytranslatorcpanfo}
+\NewBibliographyString{bytranslatorcpanaf}
+\NewBibliographyString{bycompilerco}
+\NewBibliographyString{bycompileran}
+\NewBibliographyString{bycompilerin}
+\NewBibliographyString{bycompilerfo}
+\NewBibliographyString{bycompileraf}
+\NewBibliographyString{bycompilercoin}
+\NewBibliographyString{bycompilercofo}
+\NewBibliographyString{bycompilercoaf}
+\NewBibliographyString{bycompileranin}
+\NewBibliographyString{bycompileranfo}
+\NewBibliographyString{bycompileranaf}
+\NewBibliographyString{cbynone}
+\NewBibliographyString{cbyauthor}
+\NewBibliographyString{cbyeditor}
+\NewBibliographyString{cbytranslator}
+\NewBibliographyString{cbycompiler}
+\NewBibliographyString{cbyredactor}
+\NewBibliographyString{cbycommentator}
+\NewBibliographyString{cbyannotator}
+\NewBibliographyString{cbyfounder}
+\NewBibliographyString{cbycontinuator}
+\NewBibliographyString{cbycollaborator}
+\NewBibliographyString{cbyconductor}
+\NewBibliographyString{cbydirector}
+\NewBibliographyString{cbyproducer}
+\NewBibliographyString{cbyeditortr}
+\NewBibliographyString{cbyeditorcp}
+\NewBibliographyString{cbyeditorco}
+\NewBibliographyString{cbyeditoran}
+\NewBibliographyString{cbyeditorin}
+\NewBibliographyString{cbyeditorfo}
+\NewBibliographyString{cbyeditoraf}
+\NewBibliographyString{cbyeditortrcp}
+\NewBibliographyString{cbyeditortrco}
+\NewBibliographyString{cbyeditortran}
+\NewBibliographyString{cbyeditortrin}
+\NewBibliographyString{cbyeditortrfo}
+\NewBibliographyString{cbyeditortraf}
+\NewBibliographyString{cbyeditortrcpco}
+\NewBibliographyString{cbyeditortrcpan}
+\NewBibliographyString{cbyeditortrcpin}
+\NewBibliographyString{cbyeditortrcpfo}
+\NewBibliographyString{cbyeditortrcpaf}
+\NewBibliographyString{cbyeditorcoin}
+\NewBibliographyString{cbyeditorcofo}
+\NewBibliographyString{cbyeditorcoaf}
+\NewBibliographyString{cbyeditoranin}
+\NewBibliographyString{cbyeditoranfo}
+\NewBibliographyString{cbyeditoranaf}
+\NewBibliographyString{cbyeditortrcoin}
+\NewBibliographyString{cbyeditortrcofo}
+\NewBibliographyString{cbyeditortrcoaf}
+\NewBibliographyString{cbyeditortranin}
+\NewBibliographyString{cbyeditortranfo}
+\NewBibliographyString{cbyeditortranaf}
+\NewBibliographyString{cbyeditortrcpcoin}
+\NewBibliographyString{cbyeditortrcpcofo}
+\NewBibliographyString{cbyeditortrcpcoaf}
+\NewBibliographyString{cbyeditortrcpanin}
+\NewBibliographyString{cbyeditortrcpanfo}
+\NewBibliographyString{cbyeditortrcpanaf}
+\NewBibliographyString{cbyeditorcpco}
+\NewBibliographyString{cbyeditorcpan}
+\NewBibliographyString{cbyeditorcpin}
+\NewBibliographyString{cbyeditorcpfo}
+\NewBibliographyString{cbyeditorcpaf}
+\NewBibliographyString{cbyeditorcpcoin}
+\NewBibliographyString{cbyeditorcpcofo}
+\NewBibliographyString{cbyeditorcpcoaf}
+\NewBibliographyString{cbyeditorcpanin}
+\NewBibliographyString{cbyeditorcpanfo}
+\NewBibliographyString{cbyeditorcpanaf}
+\NewBibliographyString{cbytranslatorcp}
+\NewBibliographyString{cbytranslatorco}
+\NewBibliographyString{cbytranslatoran}
+\NewBibliographyString{cbytranslatorin}
+\NewBibliographyString{cbytranslatorfo}
+\NewBibliographyString{cbytranslatoraf}
+\NewBibliographyString{cbytranslatorcpco}
+\NewBibliographyString{cbytranslatorcpan}
+\NewBibliographyString{cbytranslatorcpin}
+\NewBibliographyString{cbytranslatorcpfo}
+\NewBibliographyString{cbytranslatorcpaf}
+\NewBibliographyString{cbytranslatorcoin}
+\NewBibliographyString{cbytranslatorcofo}
+\NewBibliographyString{cbytranslatorcoaf}
+\NewBibliographyString{cbytranslatoranin}
+\NewBibliographyString{cbytranslatoranfo}
+\NewBibliographyString{cbytranslatoranaf}
+\NewBibliographyString{cbytranslatorcpcoin}
+\NewBibliographyString{cbytranslatorcpcofo}
+\NewBibliographyString{cbytranslatorcpcoaf}
+\NewBibliographyString{cbytranslatorcpanin}
+\NewBibliographyString{cbytranslatorcpanfo}
+\NewBibliographyString{cbytranslatorcpanaf}
+\NewBibliographyString{cbycompilerco}
+\NewBibliographyString{cbycompileran}
+\NewBibliographyString{cbycompilerin}
+\NewBibliographyString{cbycompilerfo}
+\NewBibliographyString{cbycompileraf}
+\NewBibliographyString{cbycompilercoin}
+\NewBibliographyString{cbycompilercofo}
+\NewBibliographyString{cbycompilercoaf}
+\NewBibliographyString{cbycompileranin}
+\NewBibliographyString{cbycompileranfo}
+\NewBibliographyString{cbycompileranaf}
+\NewBibliographyString{cfromamerican}
+\NewBibliographyString{cfrombrazilian}
+\NewBibliographyString{cfromdanish}
+\NewBibliographyString{cfromdutch}
+\NewBibliographyString{cfromenglish}
+\NewBibliographyString{cfromfrench}
+\NewBibliographyString{cfromgerman}
+\NewBibliographyString{cfromgreek}
+\NewBibliographyString{cfromitalian}
+\NewBibliographyString{cfromlatin}
+\NewBibliographyString{cfromnorwegian}
+\NewBibliographyString{cfromportuguese}
+\NewBibliographyString{cfromrussian}
+\NewBibliographyString{cfromspanish}
+\NewBibliographyString{cfromswedish}
+\NewBibliographyString{partvolume}
+\NewBibliographyString{by}
+\NewBibliographyString{of}
+\NewBibliographyString{on}
+\NewBibliographyString{afterwordto}
+\NewBibliographyString{forewordto}
+\NewBibliographyString{introductionto}
+\NewBibliographyString{origpub}
+\NewBibliographyString{origpublin}
+\NewBibliographyString{origpubyear}
+\NewBibliographyString{origpubyearalt}
+\NewBibliographyString{origreleaseyear}
+\NewBibliographyString{origshownyear}
+\NewBibliographyString{origedition}
+\NewBibliographyString{revisededition}
+\NewBibliographyString{broadcast}
+\NewBibliographyString{recorded}
+\NewBibliographyString{numbers}
+\NewBibliographyString{nodate}
+\NewBibliographyString{pseudonym}
+\NewBibliographyString{patentfiled}% Needed for CMS style patent entries
+\NewBibliographyString{patentissued}%
+\NewBibliographyString{inlang}
+\NewBibliographyString{langrussian}
+\NewBibliographyString{fromrussian}
+\NewBibliographyString{edamerican}
+\NewBibliographyString{edbrazilian}
+\NewBibliographyString{eddanish}
+\NewBibliographyString{eddutch}
+\NewBibliographyString{edenglish}
+\NewBibliographyString{edfrench}
+\NewBibliographyString{edgerman}
+\NewBibliographyString{edgreek}
+\NewBibliographyString{editalian}
+\NewBibliographyString{edlatin}
+\NewBibliographyString{ednorwegian}
+\NewBibliographyString{edportuguese}
+\NewBibliographyString{edrussian}
+\NewBibliographyString{edspanish}
+\NewBibliographyString{edswedish}
+\NewBibliographyString{review}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{section}
+\NewBibliographyString{sections}
+\NewBibliographyString{compiler}
+\NewBibliographyString{compilers}
+\NewBibliographyString{conductor}
+\NewBibliographyString{conductors}
+\NewBibliographyString{director}
+\NewBibliographyString{directors}
+\NewBibliographyString{none}
+\NewBibliographyString{nones}
+\NewBibliographyString{producer}
+\NewBibliographyString{producers}
+\NewBibliographyString{transcompiler}
+\NewBibliographyString{transcompilers}
+\NewBibliographyString{editortranscompiler}
+\NewBibliographyString{editorcompiler}
+\NewBibliographyString{editortranslator}
+\NewBibliographyString{editortranscompilers}
+\NewBibliographyString{editorcompilers}
+\NewBibliographyString{editortranslators}
+
+\DeclareBibliographyStrings{%
+  inherit = {norwegian},
+  afterwordto = {{etterord til}{etterord til}},
+  forewordto = {{forord til}{forord til}},
+  introductionto = {{innledning til}{innl\adddot\space til}},
+  partvolume = {{\addspace del}{\addspace del}},
+  by = {{av}{av}},
+  of = {{av}{av}},
+  on = {{p{\aa}}{p{\aa}}},
+  compiler = {{komp\adddot}{komp\adddot}},
+  compilers = {{komp\adddot}{komp\adddot}},
+  transcompiler = {{overs\adddot\addspace og komp\adddot}%
+    {overs\adddot\addspace og komp\adddot}},
+  transcompilers = {{overs\adddot\addspace og komp\adddot}%
+    {overs\adddot\addspace og komp\adddot}},
+  editortranscompiler = {{red\adddot\addcomma\addspace
+      overs\adddot\addcomma\addspace og komp\adddot}%
+    {red\adddot\addcomma\addspace
+      overs\adddot\addcomma\addspace og komp\adddot}},
+  editorcompiler = {{red\adddot\addspace og komp\adddot}%
+    {red\adddot\addspace og komp\adddot}},
+  editortranslator = {{red\adddot\addspace og overs\adddot}%
+    {red\adddot\addspace og overs\adddot}},
+  editortranscompilers = {{red\adddot\addcomma\addspace
+      overs\adddot\addcomma\addspace og komp\adddot}%
+    {red\adddot\addcomma\addspace
+      overs\adddot\addcomma\addspace og komp\adddot}},
+  editorcompilers = {{red\adddot\addspace og komp\adddot}%
+    {red\adddot\addspace og komp\adddot}},
+  editortranslators = {{red\adddot\addspace og overs\adddot}%
+    {red\adddot\addspace og overs\adddot}},
+  conductor = {{dir\adddot}{dir\adddot}},
+  conductors = {{dir\adddot}{dir\adddot}},
+  director = {{regi}{regi}},
+  directors = {{regi}{regi}},
+  none = {{}{}},
+  nones = {{}{}},
+  producer = {{prod\adddot}{prod\adddot}},
+  producers = {{prod\adddot}{prod\adddot}},
+  editor = {{red\adddot}{red\adddot}},
+  editors = {{red\adddot}{red\adddot}},
+  ibidem = {{sst\adddot}{sst\adddot}},
+  origpub = {{opprinnelig utgitt som}%
+    {oppr\adddot\ utg\adddot\ som}},
+  origpublin = {{opprinnelig utgitt i\addspace}%
+    {oppr\adddot\ utg\adddot\addspace i\addspace}},
+  origpubyear = {{opprinnelig utgitt i\addspace}%
+    {oppr\adddot\ utg\adddot\addspace}},
+  origpubyearalt = {{f{\o}rst utgitt\addspace}%
+    {f{\o}rst utg\adddot\addspace}},
+  origreleaseyear = {{opprinnelig utgitt i\addspace}%
+    {oppr\adddot\ utg\adddotspace}},
+  origshownyear = {{opprinnelig vist i\addspace}%
+    {oppr\adddot\ vist\addspace}},
+  origedition ={{utgave\addcolon\addspace}%
+    {utg\adddot\addcolon\addspace}},
+  revisededition = {{rev\adddot\addspace utg\adddot}%
+    {rev\adddot\addspace utg\adddot}},
+  broadcast = {{kringkastet}{kringkastet}},
+  recorded = {{spilt inn}{spilt inn}},
+  numbers = {{nr\adddot}{nr\adddot}},
+  nodate = {{udatert}{udatert}},
+  pseudonym = {{pseud\adddot}{pseud\adddot}},
+  patentfiled = {{s{\o}kt}{s{\o}kt}},
+  patentissued = {{meddelt}{meddelt}},
+  inlang = {{p{\aa}\addspace}{p{\aa}\addspace}},
+  edamerican     = {{amerikansk}{amerikansk}},
+  edbrazilian    = {{brasiliansk}{brasiliansk}},
+  eddanish       = {{dansk}{dansk}},
+  eddutch        = {{nederlandsk}{nederlandsk}},
+  edenglish      = {{engelsk}{engelsk}},
+  edfrench       = {{fransk}{fransk}},
+  edgerman       = {{tysk}{tysk}},
+  edgreek        = {{gresk}{gresk}},
+  editalian      = {{italiensk}{italiensk}},
+  edlatin        = {{latin}{latin}},
+  ednorwegian    = {{norsk}{norsk}},
+  edportuguese   = {{portugisisk}{portugisisk}},
+  edrussian      = {{russisk}{russisk}}
+  edspanish      = {{spansk}{spansk}},
+  edswedish      = {{svensk}{svensk}},
+  translator       = {{overs\adddot}{overs\adddot}},
+  translators      = {{overs\adddot}{overs\adddot}},
+  redactor         = {{bearb\adddot}{bearb\adddot}},
+  redactors        = {{bearb\adddot}{bearb\adddot}},
+  founder          = {{grunnl\adddot}{grunnl\adddot}},
+  founders         = {{grunnl\adddot}{grunnl\adddot}},
+  continuator      = {{videref\adddot}{videref\adddot}},
+  continuators     = {{videref\adddot}{videref\adddot}},
+  collaborator     = {{samarb\adddot}{samarb\adddot}},
+  collaborators    = {{samarb\adddot}{samarb\adddot}},
+  annotator        = {{forkl\adddot}{forkl\adddot}},
+  annotators       = {{forkl\adddot}{forkl\adddot}},
+  review = {{omtale}{omtale}},
+  reviewof = {{omtale av}{omtale av}},
+  cbynone = {{}{}},
+  cbyauthor = {{av}{av}},
+  cbyeditor = {{red\adddot}{red\adddot}},
+  cbytranslator     = {{overs\adddot\addspace\lbx@cfromlang}%
+    {overs\adddot\addspace\lbx@cfromlang}},
+  cbycompiler = {{komp\adddot}{komp\adddot}},
+  cbyredactor = {{bearb\adddot}{bearb\adddot}},
+  cbycommentator = {{komm\adddot}{komm\adddot}},
+  cbyannotator = {{forkl\addot}{forkl\addot}},
+  cbyfounder        = {{grunnl\adddot}{grunnl\adddot}},
+  cbycontinuator    = {{videref\adddot}{videref\adddot}},
+  cbycollaborator   = {{i samarb\adddotspace med}%
+    {i samarb\adddotspace med}},
+  cbyconductor = {{dir\adddot}{dir\adddot}},
+  cbydirector = {{regi}{regi}},
+  cbyproducer = {{prod\adddot}{prod\adddot}},
+  cbyeditortr    = {{red\adddot\space og
+      overs\adddot\addspace\lbx@cfromlang}%
+    {red\adddot\space og overs\adddot\addspace\lbx@cfromlang}},
+  cbyeditorcp = {{red\adddot\space og komp\adddot}%
+    {red\adddot\space og komp\adddot}},
+  cbyeditorco    = {{red\adddot\space og komm\adddot}%
+    {red\adddot\space og komm\adddot}},
+  cbyeditoran = {{red\adddot\space og forkl\adddot}%
+    {red\adddot\space og forkl\adddot}},
+  cbyeditorin = {{red.,\addabbrvspace med innl., av}%
+    {red.,\addabbrvspace med innl., av}},
+  cbyeditorfo = {{red.,\addabbrvspace med forord, av}%
+    {red.,\addabbrvspace med forord, av}},
+  cbyeditoraf = {{red.,\addabbrvspace med etterord, av}%
+    {red.,\addabbrvspace med etterord, av}},
+  cbyeditortrcp = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang og
+      komp\adddot}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp\adddot}},
+  cbyeditortrco = {{red.,\addabbrvspace
+    overs\adddot\addspace\lbx@fromlang\space og
+    komm\adddot}%
+  {red.,\addabbrvspace
+    overs\adddot\addspace\lbx@fromlang\space og komm\adddot}},
+  cbyeditortran = {{red.,\addabbrvspace
+    overs\adddot\addspace\lbx@fromlang\space og
+    forkl\adddot}%
+  {red.,\addabbrvspace
+    overs\adddot\addspace\lbx@fromlang\space og forkl\adddot}},
+  cbyeditortrin = {{red\adddotspace og overs\adddot\ \lbx@sfromlang, med innl., av}%
+    {red\adddotspace og overs\adddot\ \lbx@sfromlang, med innl., av}},
+  cbyeditortrfo = {{red\adddotspace og overs\adddot\ \lbx@sfromlang, med forord, av}%
+    {red\adddotspace og overs\adddot\ \lbx@sfromlang, med forord, av}},
+  cbyeditortraf = {{red\adddotspace og overs\adddot\ \lbx@sfromlang, med etterord, av}%
+    {red\adddotspace og overs\adddot\ \lbx@sfromlang, med etterord, av}},
+  cbyeditorcpco = {{red.,\addabbrvspace komp. og komm\adddot}%
+    {red.,\addabbrvspace komp. og komm\adddot}},
+  cbyeditorcpan = {{red.,\addabbrvspace komp. og forkl\adddot}%
+    {red.,\addabbrvspace komp. og forkl\adddot}},
+  cbyeditorcpin = {{red\adddot\space og komp., med innl., av}%
+    {red\adddot\space og komp., med innl., av}},
+  cbyeditorcpfo = {{red\adddot\space og komp., med forord, av}%
+    {red\adddot\space og komp., med forord, av}},
+  cbyeditorcpaf = {{red\adddot\space og komp., med etterord, av}%
+    {red\adddot\space og komp., med etterord, av}},
+  cbyeditorcpcoin = {{red.,\addabbrvspace komp. og komm., med innl., av}%
+    {red.,\addabbrvspace komp. og komm., med innl., av}},
+  cbyeditorcpcofo = {{red.,\addabbrvspace komp. og komm., med forord, av}%
+    {red.,\addabbrvspace komp. og komm., med forord, av}},
+  cbyeditorcpcoaf = {{red.,\addabbrvspace komp. og komm., med etterord, av}%
+    {red.,\addabbrvspace komp. og komm., med etterord, av}},
+  cbyeditorcpanin = {{red.,\addabbrvspace komp. og forkl., med innl., av}%
+    {red.,\addabbrvspace komp. og forkl., med innl., av}},
+  cbyeditorcpanfo = {{red.,\addabbrvspace komp. og forkl., med forord, av}%
+    {red.,\addabbrvspace komp. og forkl., med forord, av}},
+  cbyeditorcpanaf = {{red.,\addabbrvspace komp. og forkl., med etterord, av}%
+    {red.,\addabbrvspace komp. og forkl., med etterord, av}},
+  cbyeditortrcpco = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang,
+      komp. og komm\adddot}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm\adddot}},
+  cbyeditortrcpan = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang,
+      komp. og forkl\adddot}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl\adddot}},
+  cbyeditortrcpin = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp., med innl., av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp.,
+      med innl., av}},
+  cbyeditortrcpfo = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp., med forord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp.,
+      med forord, av}},
+  cbyeditortrcpaf = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp., med etterord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp.,
+      med etterord, av}},
+  cbyeditortrcpcoin = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang,
+      komp. og komm., med innl., av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm., med innl., av}},
+  cbyeditortrcpcofo = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang,
+      komp. og komm., med forord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm., med forord, av}},
+  cbyeditortrcpcoaf = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang,
+      komp. og komm., med etterord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm., med etterord, av}},
+  cbyeditortrcpanin = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang,
+      komp. og forkl., med innl., av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl., med innl., av}},
+  cbyeditortrcpanfo = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang,
+      komp. og forkl., med forord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl., med forord, av}},
+  cbyeditortrcpanaf = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang,
+      komp. og forkl., med etterord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl., med etterord, av}},
+  cbyeditorcoin = {{red\adddot\space og komm., med innl., av}%
+    {red\adddot\space og komm., med innl., av}},
+  cbyeditorcofo = {{red\adddot\space og komm., med forord, av}%
+    {red\adddot\space og komm., med forord, av}},
+  cbyeditorcoaf = {{red\adddot\space og komm., med etterord, av}%
+    {red\adddot\space og komm., med etterord, av}},
+  cbyeditoranin = {{red\adddot\space og forkl., med innl., av}%
+    {red\adddot\space og forkl., med innl., av}},
+  cbyeditoranfo = {{red\adddot\space og forkl., med forord, av}%
+    {red\adddot\space og forkl., med forord, av}},
+  cbyeditoranaf = {{red\adddot\space og forkl., med etterord, av}%
+    {red\adddot\space og forkl., med etterord, av}},
+  cbyeditortrcoin = {{red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og komm., med innl., av}%
+  {red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og komm., med innl., av}},
+  cbyeditortrcofo = {{red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og komm., med forord, av}%
+  {red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og komm., med forord, av}},
+  cbyeditortrcoaf = {{red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og komm., med etterord, av}%
+  {red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og komm., med etterord, av}},
+  cbyeditortranin = {{red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og forkl., med innl., av}%
+  {red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og forkl., med innl., av}},
+  cbyeditortranfo = {{red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og forkl., med forord, av}%
+  {red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og forkl., med forord, av}},
+  cbyeditortranaf = {{red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og forkl., med etterord, av}%
+  {red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og forkl., med etterord, av}},
+  cbytranslatorcp = {{overs\adddot\addspace\lbx@fromlang\ og komp\adddot}%
+    {overs\adddot\addspace\lbx@fromlang\ og komp\adddot}},
+  cbytranslatorco = {{overs\adddot\addspace\lbx@fromlang\ og komm\adddot}%
+    {overs\adddot\addspace\lbx@fromlang\ og komm\adddot}},
+  cbytranslatoran = {{overs\adddot\addspace\lbx@fromlang\ og forkl\adddot}%
+    {overs\adddot\addspace\lbx@fromlang\ og forkl\adddot}},
+  cbytranslatorin = {{overs\adddot\addspace\lbx@fromlang, med innl., av}%
+    {overs\adddot\addspace\lbx@fromlang, med innl., av}},
+  cbytranslatorfo = {{overs\adddot\addspace\lbx@fromlang, med forord, av}%
+    {overs\adddot\addspace\lbx@fromlang, med forord, av}},
+  cbytranslatoraf = {{overs\adddot\addspace\lbx@fromlang, med etterord, av}%
+    {overs\adddot\addspace\lbx@fromlang, med etterord, av}},
+  cbytranslatorcoin = {{overs\adddot\addspace\lbx@fromlang\ og komm.,
+      med innl., av}%
+    {overs\adddot\addspace\lbx@fromlang\ og komm., med innl., av}},
+  cbytranslatorcofo = {{overs\adddot\addspace\lbx@fromlang\ og komm.,
+      med forord, av}%
+    {overs\adddot\addspace\lbx@fromlang\ og komm., med forord, av}},
+  cbytranslatorcoaf = {{overs\adddot\addspace\lbx@fromlang\ og komm.,
+      med etterord, av}%
+    {overs\adddot\addspace\lbx@fromlang\ og komm., med etterord, av}},
+  cbytranslatoranin = {{overs\adddot\addspace\lbx@fromlang\ og forkl.,
+      med innl., av}%
+    {overs\adddot\addspace\lbx@fromlang\ og forkl., med innl., av}},
+  cbytranslatoranfo = {{overs\adddot\addspace\lbx@fromlang\ og forkl.,
+      med forord, av}%
+    {overs\adddot\addspace\lbx@fromlang\ og forkl., med forord, av}},
+  cbytranslatoranaf = {{overs\adddot\addspace\lbx@fromlang\ og forkl.,
+      med etterord, av}%
+    {overs\adddot\addspace\lbx@fromlang\ og forkl., med etterord, av}},
+  cbytranslatorcpco = {{overs\adddot\addspace\lbx@fromlang, komp. og komm\adddot}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og komm\adddot}},
+  cbytranslatorcpan = {{overs\adddot\addspace\lbx@fromlang, komp. og forkl\adddot}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og forkl\adddot}},
+  cbytranslatorcpin = {{overs\adddot\addspace\lbx@fromlang\ og komp.,
+      med innl., av}%
+    {overs\adddot\addspace\lbx@fromlang\ og komp., med innl., av}},
+  cbytranslatorcpfo = {{overs\adddot\addspace\lbx@fromlang\ og komp.,
+      med forord, av}%
+    {overs\adddot\addspace\lbx@fromlang\ og komp., med forord, av}},
+  cbytranslatorcpaf = {{overs\adddot\addspace\lbx@fromlang\ og komp.,
+      med etterord, av}%
+    {overs\adddot\addspace\lbx@fromlang\ og komp., med etterord, av}},
+  cbytranslatorcpcoin = {{overs\adddot\addspace\lbx@fromlang, komp. og komm., med innl., av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og komm.,
+      med innl., av}},
+  cbytranslatorcpcofo = {{overs\adddot\addspace\lbx@fromlang, komp. og komm., med forord, av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og komm.,
+      med forord, av}},
+  cbytranslatorcpcoaf = {{overs\adddot\addspace\lbx@fromlang, komp. og komm., med etterord, av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og komm.,
+      med etterord, av}},
+  cbytranslatorcpanin = {{overs\adddot\addspace\lbx@fromlang, komp. og forkl., med innl., av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og forkl.,
+      med innl., av}},
+  cbytranslatorcpanfo = {{overs\adddot\addspace\lbx@fromlang, komp. og forkl., med forord, av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og forkl.,
+      med forord, av}},
+  cbytranslatorcpanaf = {{overs\adddot\addspace\lbx@fromlang, komp. og forkl., med etterord, av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og forkl.,
+      med etterord, av}},
+  cbycompilerco = {{komp\adddot\space og komm\adddot}%
+    {komp\adddot\space og komm\adddot}},
+  cbycompileran = {{komp\adddot\space og forkl\adddot}%
+    {komp\adddot\space og forkl\adddot}},
+  cbycompilerin = {{komp.,\addabbrvspace med innl., av}%
+    {komp.,\addabbrvspace med innl., av}},
+  cbycompilerfo = {{komp.,\addabbrvspace med forord, av}%
+    {komp.,\addabbrvspace med forord, av}},
+  cbycompileraf = {{komp.,\addabbrvspace med etterord, av}%
+    {komp.,\addabbrvspace med etterord, av}},
+  cbycompilercoin = {{komp\adddot\space og komm., med innl., av}%
+    {komp\adddot\space og komm., med innl., av}},
+  cbycompilercofo = {{komp\adddot\space og komm., med forord, av}%
+    {komp\adddot\space og komm., med forord, av}},
+  cbycompilercoaf = {{komp\adddot\space og komm., med etterord, av}%
+    {komp\adddot\space og komm., med etterord, av}},
+  cbycompileranin = {{komp\adddot\space og forkl., med innl., av}%
+    {komp\adddot\space og forkl., med innl., av}},
+  cbycompileranfo = {{komp\adddot\space og forkl., med forord, av}%
+    {komp\adddot\space og forkl., med forord, av}},
+  cbycompileranaf = {{komp\adddot\space og forkl., med etterord, av}%
+    {komp\adddot\space og forkl., med etterord, av}},
+  volume = {{bd\adddot}{bd\adddot}},
+  volumes = {{bd\adddot}{bd\adddot}},
+  jourvol = {{{\aa}rg\adddot}{{\aa}rg\adddot}},
+  jourser = {{ser\adddot}{ser\adddot}},
+  oldseries = {{gl\adddotspace ser\adddot}{gl\adddotspace ser\adddot}},
+  edition = {{utg\adddot}{utg\adddot}},
+  page = {{s\adddot}{s\adddot}},
+  pages = {{s\adddot}{s\adddot}},
+  column = {{sp\adddot}{sp\adddot}},
+  columns = {{sp\adddot}{sp\adddot}},
+  line = {{l\adddot}{l\adddot}},
+  lines = {{l\adddot}{l\adddot}},
+  paragraph = {{avsn\adddot}{avsn\adddot}},
+  paragraphs = {{avsn\adddot}{avsn\adddot}},
+  section = {{avsn\adddot}{avsn\adddot}},
+  sections = {{avsn\adddot}{avsn\adddot}},
+  verse = {{v\adddot}{v\adddot}},
+  verses = {{v\adddot}{v\adddot}},
+  number = {{nr\adddot}{nr\adddot}},
+  chapter = {{kap\adddot}{kap\adddot}},
+  cfromamerican     = {{fra amerikansk-engelsk av}{fra amerikansk-engelsk av}},
+  cfrombrazilian    = {{fra brasiliansk-portugisisk av}{fra brasiliansk-portugisisk av}},
+  cfromdanish       = {{fra dansk av}{fra dansk av}},
+  cfromdutch        = {{fra nederlandsk av}{fra nederlandsk av}},
+  cfromenglish      = {{fra engelsk av}{fra engelsk av}},
+  cfromfrench       = {{fra fransk av}{fra fransk av}},
+  cfromgerman       = {{fra tysk av}{fra tysk av}},
+  cfromgreek        = {{fra gresk av}{fra gresk av}},
+  cfromitalian      = {{fra italiensk av}{fra italiensk av}},
+  cfromlatin        = {{fra latin av}{fra latin av}},
+  cfromnorwegian    = {{fra norsk av}{fra norsk av}},
+  cfromportuguese   = {{fra portugisisk av}{fra portugisisk av}},
+  cfromrussian      = {{fra russisk av}{fra russisk av}},
+  cfromspanish      = {{fra spansk av}{fra spansk av}},
+  cfromswedish      = {{fra svensk av}{fra svensk av}},
+  bynone = {{}{}},
+  byconductor = {{dirigert av}{dir\adddot}},
+  bydirector = {{regissert av}{regi}},
+  byproducer = {{produsert av}{prod\adddot}},
+  byeditorcp = {{redigert og kompilert av}{red\adddot\space og komp\adddot}},
+  byeditortrcp = {{redigert, oversatt \lbx@fromlang og kompilert av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp\adddot}},
+  byeditortrcpco = {{redigert, oversatt \lbx@fromlang, kompilert og kommentert av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm\adddot}},
+  byeditortrcpan = {{redigert, oversatt \lbx@fromlang, kompilert og forklart av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl\adddot}},
+  byeditortrcpin = {{redigert, oversatt \lbx@fromlang og kompilert, med innledning, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp\adddot,
+      med innledning, av}},
+  byeditortrcpfo = {{redigert, oversatt \lbx@fromlang og kompilert, med forord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp\adddot,
+      med forord, av}},
+  byeditortrcpaf = {{redigert, oversatt \lbx@fromlang og kompilert, med etterord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp\adddot,
+      med etterord, av}},
+  byeditortrcpcoin = {{redigert, oversatt \lbx@fromlang, kompilert og kommentert, med innledning, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm\adddot, med innledning, av}},
+  byeditortrcpcofo = {{redigert, oversatt \lbx@fromlang, kompilert og kommentert, med forord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm\adddot, med forord, av}},
+  byeditortrcpcoaf = {{redigert, oversatt \lbx@fromlang, kompilert og kommentert, med etterord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm\adddot, med etterord, av}},
+  byeditortrcpanin = {{redigert, oversatt \lbx@fromlang, kompilert og forklart, med innledning, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl\adddot, med innledning, av}},
+  byeditortrcpanfo = {{redigert, oversatt \lbx@fromlang, kompilert og forklart, med forord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl\adddot, med forord, av}},
+  byeditortrcpanaf = {{redigert, oversatt \lbx@fromlang, kompilert og forklart, med etterord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl\adddot, med etterord, av}},
+  byeditorcpco = {{redigert, kompilert og kommentert av}%
+    {red.,\addabbrvspace komp. og komm\adddot}},
+  byeditorcpan = {{redigert, kompilert og forklart av}%
+    {red.,\addabbrvspace komp. og forkl\adddot}},
+  byeditorcpin = {{redigert og kompilert, med innledning, av}%
+    {red\adddot\space og komp., med innledning, av}},
+  byeditorcpfo = {{redigert og kompilert, med forord, av}%
+    {red\adddot\space og komp., med forord, av}},
+  byeditorcpaf = {{redigert og kompilert, med etterord, av}%
+    {red\adddot\space og komp., med etterord, av}},
+  byeditorcpcoin = {{redigert, kompilert og kommentert, med innledning, av}%
+    {red.,\addabbrvspace komp. og komm., med innledning, av}},
+  byeditorcpcofo = {{redigert, kompilert og kommentert, med forord,
+      av}%
+    {red.,\addabbrvspace komp. og komm., med forord, av}},
+  byeditorcpcoaf = {{redigert, kompilert og kommentert, med etterord, av}%
+    {red.,\addabbrvspace komp. og komm., med etterord, av}},
+  byeditorcpanin = {{redigert, kompilert og forklart, med innledning, av}%
+    {red.,\addabbrvspace komp. og forkl., med innledning, av}},
+  byeditorcpanfo = {{redigert, kompilert og forklart, med forord,
+      av}%
+    {red.,\addabbrvspace komp. og forkl., med forord, av}},
+  byeditorcpanaf = {{redigert, kompilert og forklart, med etterord, av}%
+    {red.,\addabbrvspace komp. og forkl., med etterord, av}},
+  bytranslatorcp = {{oversatt \lbx@fromlang\ og kompilert av}%
+    {overs\adddot\addspace\lbx@fromlang\ og komp\adddot}},
+  bytranslatorcpco = {{oversatt \lbx@fromlang, kompilert og kommentert av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og komm\adddot}},
+  bytranslatorcpan = {{oversatt \lbx@fromlang, kompilert og forklart av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og forkl\adddot}},
+  bytranslatorcpin = {{oversatt \lbx@fromlang\  og kompilert, med innledning, av}%
+    {overs\adddot\addspace\lbx@fromlang\ og komp., med innledning, av}},
+  bytranslatorcpfo = {{oversatt \lbx@fromlang\ og kompilert, med forord, av}%
+    {overs\adddot\addspace\lbx@fromlang\ og komp., med forord, av}},
+  bytranslatorcpaf = {{oversatt \lbx@fromlang\ og kompilert, med etterord, av}%
+    {overs\adddot\addspace\lbx@fromlang\ og komp., med etterord, av}},
+  bytranslatorcpcoin = {{oversatt \lbx@fromlang, kompilert og kommentert,
+      med innledning, av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og komm., med innledning, av}},
+  bytranslatorcpcofo = {{oversatt \lbx@fromlang, kompilert og kommentert,
+      med forord, av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og komm.,
+      med forord, av}},
+  bytranslatorcpcoaf = {{oversatt \lbx@fromlang, kompilert og kommentert,
+      med etterord, av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og komm., med etterord, av}},
+  bytranslatorcpanin = {{oversatt \lbx@fromlang, kompilert og forklart,
+      med innledning, av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og forkl., med innledning, av}},
+  bytranslatorcpanfo = {{oversatt \lbx@fromlang, kompilert og forklart,
+      med forord, av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og forkl.,
+      med forord, av}},
+  bytranslatorcpanaf = {{oversatt \lbx@fromlang, kompilert og forklart,
+      med etterord, av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og forkl.,
+      med etterord, av}},
+  bycompilerco = {{kompilert og kommentert av}%
+    {komp\adddot\space og komm\adddot}},
+  bycompileran = {{kompilert og forklart av}%
+    {komp\adddot\space og forkl\adddot}},
+  bycompilerin = {{kompilert, med innledning, av}%
+    {komp\adddot, med innledning, av}},
+  bycompilerfo = {{kompilert, med forord, av}%
+    {komp\adddot, med forord, av}},
+  bycompileraf = {{kompilert, med etterord, av}%
+    {komp\adddot, med etterord, av}},
+  bycompilercoin = {{kompilert og kommentert, med innledning, av}%
+    {komp\adddot\space og komm\adddot, med innledning, av}},
+  bycompilercofo = {{kompilert og kommentert, med forord, av}%
+    {komp\adddot\space og komm\adddot, med forord, av}},
+  bycompilercoaf = {{kompilert og kommentert, med etterord, av}%
+    {komp\adddot\space og komm\adddot, med etterord, av}},
+  bycompileranin = {{kompilert og forklart, med innledning, av}%
+    {komp\adddot\space og forkl\adddot, med innledning, av}},
+  bycompileranfo = {{kompilert og forklart, med forord, av}%
+    {komp\adddot\space og forkl\adddot, med forord, av}},
+  bycompileranaf = {{kompilert og forklart, med etterord, av}%
+    {komp\adddot\space og forkl\adddot, med etterord, av}},
+}
+
+\protected\gdef\lbx@cms@mkbibrangetrunc#1#2{%  DATE FIX
+  \iffieldundef{#2year}%
+  {\iffieldundef{#2month}
+    {}
+    {\printtext[#2date]{%
+        \iffieldsequal{#2month}{#2endmonth}
+        {\csuse{mkbibdate#1}{}{}{#2day}}
+        {\csuse{mkbibdate#1}{}{#2month}{#2day}}%
+        \iffieldundef{#2endyear}
+        {\iffieldundef{#2endmonth}
+          {}
+          {\bibdatedash
+            \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}}}
+        {\iffieldequalstr{#2endyear}{}
+          {\mbox{\bibdatedash}}
+          {\bibdatedash
+            \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+  {\printtext[#2date]{%
+      \iffieldsequal{#2year}{#2endyear}
+      {\iffieldsequal{#2month}{#2endmonth}
+        {\csuse{mkbibdate#1}{}{}{#2day}}
+        {\csuse{mkbibdate#1}{}{#2month}{#2day}}}
+      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+      \iffieldundef{#2endyear}
+      {}
+      {\iffieldequalstr{#2endyear}{}
+        {\mbox{\bibdatedash}}
+        {\bibdatedash
+          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+
+\protected\gdef\lbx@cms@mkbibrangefull#1#2{%
+  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
+  {}%
+  {\printtext[#2date]{%
+      \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}
+      {}
+      {\iffieldequalstr{#2endyear}{}
+        {\mbox{\bibdatedash}}
+        {\bibdatedash
+          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-nynorsk.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-nynorsk.lbx
new file mode 100644
index 00000000000..26418fd213f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-nynorsk.lbx
@@ -0,0 +1,755 @@
+% $Id: cms-nynorsk.lbx,v 1.2 2012/12/06 11:32:01 dfussner Exp $
+
+\ProvidesFile{cms-nynorsk.lbx}[2012/12/06 v 2.4 biblatex localization]
+
+% STATUS OF THIS FILE
+% - Translated by a native speaker (H{\aa}kon Malmedal).
+% - Date handling modified by dfussner.
+
+\InheritBibliographyExtras{nynorsk}
+
+\DeclareBibliographyExtras{%
+  \savecommand\cms@datelong
+  \savecommand\cms@datelongalt
+  \savecommand\mkbibrangecomp
+  \savecommand\mkbibrangeterse
+  \savecommand\mkbibrangefull
+  \protected\def\mkbibrangecomp{%
+    \lbx@cms@mkbibrangetrunc{long}}%
+  \protected\def\mkbibrangeterse{%
+    \lbx@cms@mkbibrangetrunc{short}}%
+  \protected\def\mkbibrangefull{%
+    \lbx@cms@mkbibrangefull}
+  \def\cms@datelong{\printorigdate}%
+  \def\cms@datelongalt{\printdate}}%
+
+\UndeclareBibliographyExtras{%
+  \restorecommand\cms@datelong
+  \restorecommand\cms@datelongalt
+  \restorecommand\mkbibrangecomp%
+  \restorecommand\mkbibrangefull%
+  \restorecommand\mkbibrangeterse}%
+
+\NewBibliographyString{bynone}
+\NewBibliographyString{bycompiler}
+\NewBibliographyString{byconductor}
+\NewBibliographyString{bydirector}
+\NewBibliographyString{byproducer}
+\NewBibliographyString{byeditorcp}
+\NewBibliographyString{byeditortrcp}
+\NewBibliographyString{byeditortrcpco}
+\NewBibliographyString{byeditortrcpan}
+\NewBibliographyString{byeditortrcpin}
+\NewBibliographyString{byeditortrcpfo}
+\NewBibliographyString{byeditortrcpaf}
+\NewBibliographyString{byeditortrcpcoin}
+\NewBibliographyString{byeditortrcpcofo}
+\NewBibliographyString{byeditortrcpcoaf}
+\NewBibliographyString{byeditortrcpanin}
+\NewBibliographyString{byeditortrcpanfo}
+\NewBibliographyString{byeditortrcpanaf}
+\NewBibliographyString{byeditorcpco}
+\NewBibliographyString{byeditorcpan}
+\NewBibliographyString{byeditorcpin}
+\NewBibliographyString{byeditorcpfo}
+\NewBibliographyString{byeditorcpaf}
+\NewBibliographyString{byeditorcpcoin}
+\NewBibliographyString{byeditorcpcofo}
+\NewBibliographyString{byeditorcpcoaf}
+\NewBibliographyString{byeditorcpanin}
+\NewBibliographyString{byeditorcpanfo}
+\NewBibliographyString{byeditorcpanaf}
+\NewBibliographyString{bytranslatorcp}
+\NewBibliographyString{bytranslatorcpco}
+\NewBibliographyString{bytranslatorcpan}
+\NewBibliographyString{bytranslatorcpin}
+\NewBibliographyString{bytranslatorcpfo}
+\NewBibliographyString{bytranslatorcpaf}
+\NewBibliographyString{bytranslatorcpcoin}
+\NewBibliographyString{bytranslatorcpcofo}
+\NewBibliographyString{bytranslatorcpcoaf}
+\NewBibliographyString{bytranslatorcpanin}
+\NewBibliographyString{bytranslatorcpanfo}
+\NewBibliographyString{bytranslatorcpanaf}
+\NewBibliographyString{bycompilerco}
+\NewBibliographyString{bycompileran}
+\NewBibliographyString{bycompilerin}
+\NewBibliographyString{bycompilerfo}
+\NewBibliographyString{bycompileraf}
+\NewBibliographyString{bycompilercoin}
+\NewBibliographyString{bycompilercofo}
+\NewBibliographyString{bycompilercoaf}
+\NewBibliographyString{bycompileranin}
+\NewBibliographyString{bycompileranfo}
+\NewBibliographyString{bycompileranaf}
+\NewBibliographyString{cbynone}
+\NewBibliographyString{cbyauthor}
+\NewBibliographyString{cbyeditor}
+\NewBibliographyString{cbytranslator}
+\NewBibliographyString{cbycompiler}
+\NewBibliographyString{cbyredactor}
+\NewBibliographyString{cbycommentator}
+\NewBibliographyString{cbyannotator}
+\NewBibliographyString{cbyfounder}
+\NewBibliographyString{cbycontinuator}
+\NewBibliographyString{cbycollaborator}
+\NewBibliographyString{cbyconductor}
+\NewBibliographyString{cbydirector}
+\NewBibliographyString{cbyproducer}
+\NewBibliographyString{cbyeditortr}
+\NewBibliographyString{cbyeditorcp}
+\NewBibliographyString{cbyeditorco}
+\NewBibliographyString{cbyeditoran}
+\NewBibliographyString{cbyeditorin}
+\NewBibliographyString{cbyeditorfo}
+\NewBibliographyString{cbyeditoraf}
+\NewBibliographyString{cbyeditortrcp}
+\NewBibliographyString{cbyeditortrco}
+\NewBibliographyString{cbyeditortran}
+\NewBibliographyString{cbyeditortrin}
+\NewBibliographyString{cbyeditortrfo}
+\NewBibliographyString{cbyeditortraf}
+\NewBibliographyString{cbyeditortrcpco}
+\NewBibliographyString{cbyeditortrcpan}
+\NewBibliographyString{cbyeditortrcpin}
+\NewBibliographyString{cbyeditortrcpfo}
+\NewBibliographyString{cbyeditortrcpaf}
+\NewBibliographyString{cbyeditorcoin}
+\NewBibliographyString{cbyeditorcofo}
+\NewBibliographyString{cbyeditorcoaf}
+\NewBibliographyString{cbyeditoranin}
+\NewBibliographyString{cbyeditoranfo}
+\NewBibliographyString{cbyeditoranaf}
+\NewBibliographyString{cbyeditortrcoin}
+\NewBibliographyString{cbyeditortrcofo}
+\NewBibliographyString{cbyeditortrcoaf}
+\NewBibliographyString{cbyeditortranin}
+\NewBibliographyString{cbyeditortranfo}
+\NewBibliographyString{cbyeditortranaf}
+\NewBibliographyString{cbyeditortrcpcoin}
+\NewBibliographyString{cbyeditortrcpcofo}
+\NewBibliographyString{cbyeditortrcpcoaf}
+\NewBibliographyString{cbyeditortrcpanin}
+\NewBibliographyString{cbyeditortrcpanfo}
+\NewBibliographyString{cbyeditortrcpanaf}
+\NewBibliographyString{cbyeditorcpco}
+\NewBibliographyString{cbyeditorcpan}
+\NewBibliographyString{cbyeditorcpin}
+\NewBibliographyString{cbyeditorcpfo}
+\NewBibliographyString{cbyeditorcpaf}
+\NewBibliographyString{cbyeditorcpcoin}
+\NewBibliographyString{cbyeditorcpcofo}
+\NewBibliographyString{cbyeditorcpcoaf}
+\NewBibliographyString{cbyeditorcpanin}
+\NewBibliographyString{cbyeditorcpanfo}
+\NewBibliographyString{cbyeditorcpanaf}
+\NewBibliographyString{cbytranslatorcp}
+\NewBibliographyString{cbytranslatorco}
+\NewBibliographyString{cbytranslatoran}
+\NewBibliographyString{cbytranslatorin}
+\NewBibliographyString{cbytranslatorfo}
+\NewBibliographyString{cbytranslatoraf}
+\NewBibliographyString{cbytranslatorcpco}
+\NewBibliographyString{cbytranslatorcpan}
+\NewBibliographyString{cbytranslatorcpin}
+\NewBibliographyString{cbytranslatorcpfo}
+\NewBibliographyString{cbytranslatorcpaf}
+\NewBibliographyString{cbytranslatorcoin}
+\NewBibliographyString{cbytranslatorcofo}
+\NewBibliographyString{cbytranslatorcoaf}
+\NewBibliographyString{cbytranslatoranin}
+\NewBibliographyString{cbytranslatoranfo}
+\NewBibliographyString{cbytranslatoranaf}
+\NewBibliographyString{cbytranslatorcpcoin}
+\NewBibliographyString{cbytranslatorcpcofo}
+\NewBibliographyString{cbytranslatorcpcoaf}
+\NewBibliographyString{cbytranslatorcpanin}
+\NewBibliographyString{cbytranslatorcpanfo}
+\NewBibliographyString{cbytranslatorcpanaf}
+\NewBibliographyString{cbycompilerco}
+\NewBibliographyString{cbycompileran}
+\NewBibliographyString{cbycompilerin}
+\NewBibliographyString{cbycompilerfo}
+\NewBibliographyString{cbycompileraf}
+\NewBibliographyString{cbycompilercoin}
+\NewBibliographyString{cbycompilercofo}
+\NewBibliographyString{cbycompilercoaf}
+\NewBibliographyString{cbycompileranin}
+\NewBibliographyString{cbycompileranfo}
+\NewBibliographyString{cbycompileranaf}
+\NewBibliographyString{cfromamerican}
+\NewBibliographyString{cfrombrazilian}
+\NewBibliographyString{cfromdanish}
+\NewBibliographyString{cfromdutch}
+\NewBibliographyString{cfromenglish}
+\NewBibliographyString{cfromfrench}
+\NewBibliographyString{cfromgerman}
+\NewBibliographyString{cfromgreek}
+\NewBibliographyString{cfromitalian}
+\NewBibliographyString{cfromlatin}
+\NewBibliographyString{cfromnorwegian}
+\NewBibliographyString{cfromportuguese}
+\NewBibliographyString{cfromrussian}
+\NewBibliographyString{cfromspanish}
+\NewBibliographyString{cfromswedish}
+\NewBibliographyString{partvolume}
+\NewBibliographyString{by}
+\NewBibliographyString{of}
+\NewBibliographyString{on}
+\NewBibliographyString{afterwordto}
+\NewBibliographyString{forewordto}
+\NewBibliographyString{introductionto}
+\NewBibliographyString{origpub}
+\NewBibliographyString{origpublin}
+\NewBibliographyString{origpubyear}
+\NewBibliographyString{origpubyearalt}
+\NewBibliographyString{origreleaseyear}
+\NewBibliographyString{origshownyear}
+\NewBibliographyString{origedition}
+\NewBibliographyString{revisededition}
+\NewBibliographyString{broadcast}
+\NewBibliographyString{recorded}
+\NewBibliographyString{numbers}
+\NewBibliographyString{nodate}
+\NewBibliographyString{pseudonym}
+\NewBibliographyString{patentfiled}% Needed for CMS style patent entries
+\NewBibliographyString{patentissued}%
+\NewBibliographyString{inlang}
+\NewBibliographyString{langrussian}
+\NewBibliographyString{fromrussian}
+\NewBibliographyString{edamerican}
+\NewBibliographyString{edbrazilian}
+\NewBibliographyString{eddanish}
+\NewBibliographyString{eddutch}
+\NewBibliographyString{edenglish}
+\NewBibliographyString{edfrench}
+\NewBibliographyString{edgerman}
+\NewBibliographyString{edgreek}
+\NewBibliographyString{editalian}
+\NewBibliographyString{edlatin}
+\NewBibliographyString{ednorwegian}
+\NewBibliographyString{edportuguese}
+\NewBibliographyString{edrussian}
+\NewBibliographyString{edspanish}
+\NewBibliographyString{edswedish}
+\NewBibliographyString{review}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{section}
+\NewBibliographyString{sections}
+\NewBibliographyString{compiler}
+\NewBibliographyString{compilers}
+\NewBibliographyString{conductor}
+\NewBibliographyString{conductors}
+\NewBibliographyString{director}
+\NewBibliographyString{directors}
+\NewBibliographyString{none}
+\NewBibliographyString{nones}
+\NewBibliographyString{producer}
+\NewBibliographyString{producers}
+\NewBibliographyString{transcompiler}
+\NewBibliographyString{transcompilers}
+\NewBibliographyString{editortranscompiler}
+\NewBibliographyString{editorcompiler}
+\NewBibliographyString{editortranslator}
+\NewBibliographyString{editortranscompilers}
+\NewBibliographyString{editorcompilers}
+\NewBibliographyString{editortranslators}
+
+\DeclareBibliographyStrings{%
+  inherit = {nynorsk},
+  afterwordto = {{etterord til}{etterord til}},
+  forewordto = {{f{\o}reord til}{f{\o}reord til}},
+  introductionto = {{innleiing til}{innl\adddot\space til}},
+  partvolume = {{\addspace del}{\addspace del}},
+  by = {{av}{av}},
+  of = {{av}{av}},
+  on = {{p{\aa}}{p{\aa}}},
+  compiler = {{komp\adddot}{komp\adddot}},
+  compilers = {{komp\adddot}{komp\adddot}},
+  transcompiler = {{oms\adddot\addspace og komp\adddot}%
+    {oms\adddot\addspace og komp\adddot}},
+  transcompilers = {{oms\adddot\addspace og komp\adddot}%
+    {oms\adddot\addspace og komp\adddot}},
+  editortranscompiler = {{red\adddot\addcomma\addspace
+      oms\adddot\addcomma\addspace og komp\adddot}%
+    {red\adddot\addcomma\addspace
+      oms\adddot\addcomma\addspace og komp\adddot}},
+  editorcompiler = {{red\adddot\addspace og komp\adddot}%
+    {red\adddot\addspace og komp\adddot}},
+  editortranslator = {{red\adddot\addspace og oms\adddot}%
+    {red\adddot\addspace og oms\adddot}},
+  editortranscompilers = {{red\adddot\addcomma\addspace
+      oms\adddot\addcomma\addspace og komp\adddot}%
+    {red\adddot\addcomma\addspace
+      oms\adddot\addcomma\addspace og komp\adddot}},
+  editorcompilers = {{red\adddot\addspace og komp\adddot}%
+    {red\adddot\addspace og komp\adddot}},
+  editortranslators = {{red\adddot\addspace og oms\adddot}%
+    {red\adddot\addspace og oms\adddot}},
+  conductor = {{dir\adddot}{dir\adddot}},
+  conductors = {{dir\adddot}{dir\adddot}},
+  director = {{regi}{regi}},
+  directors = {{regi}{regi}},
+  none = {{}{}},
+  nones = {{}{}},
+  producer = {{prod\adddot}{prod\adddot}},
+  producers = {{prod\adddot}{prod\adddot}},
+  editor = {{red\adddot}{red\adddot}},
+  editors = {{red\adddot}{red\adddot}},
+  ibidem = {{sst\adddot}{sst\adddot}},
+  origpub = {{opphavleg utgitt som}%
+    {opph\adddot\ utg\adddot\ som}},
+  origpublin = {{opphavleg utgitt i\addspace}%
+    {opph\adddot\ utg\adddot\addspace i\addspace}},
+  origpubyear = {{opphavleg utgitt i\addspace}%
+    {opph\adddot\ utg\adddot\addspace}},
+  origpubyearalt = {{fyrst utgitt\addspace}%
+    {fyrst utg\adddot\addspace}},
+  origreleaseyear = {{opphavleg utgitt i\addspace}%
+    {opph\adddot\ utg\adddotspace}},
+  origshownyear = {{opphavleg synt fram i\addspace}%
+    {opph\adddot\ synt fram\addspace}},
+  origedition ={{utg{\aa}ve\addcolon\addspace}%
+    {utg\adddot\addcolon\addspace}},
+  revisededition = {{rev\adddot\addspace utg\adddot}%
+    {rev\adddot\addspace utg\adddot}},
+  broadcast = {{kringkasta}{kringkasta}},
+  recorded = {{spelt inn}{spelt inn}},
+  numbers = {{nr\adddot}{nr\adddot}},
+  nodate = {{udatert}{udatert}},
+  pseudonym = {{pseud\adddot}{pseud\adddot}},
+  patentfiled = {{s{\o}kt}{s{\o}kt}},
+  patentissued = {{meldt}{meldt}},
+  inlang = {{p{\aa}\addspace}{p{\aa}\addspace}},
+  edamerican     = {{amerikansk}{amerikansk}},
+  edbrazilian    = {{brasiliansk}{brasiliansk}},
+  eddanish       = {{dansk}{dansk}},
+  eddutch        = {{nederlandsk}{nederlandsk}},
+  edenglish      = {{engelsk}{engelsk}},
+  edfrench       = {{fransk}{fransk}},
+  edgerman       = {{tysk}{tysk}},
+  edgreek        = {{gresk}{gresk}},
+  editalian      = {{italiensk}{italiensk}},
+  edlatin        = {{latin}{latin}},
+  ednorwegian    = {{norsk}{norsk}},
+  edportuguese   = {{portugisisk}{portugisisk}},
+  edrussian      = {{russisk}{russisk}}
+  edspanish      = {{spansk}{spansk}},
+  edswedish      = {{svensk}{svensk}},
+  translator       = {{oms\adddot}{oms\adddot}},
+  translators      = {{oms\adddot}{oms\adddot}},
+  redactor         = {{omarb\adddot}{omarb\adddot}},
+  redactors        = {{omarb\adddot}{omarb\adddot}},
+  founder          = {{grunnl\adddot}{grunnl\adddot}},
+  founders         = {{grunnl\adddot}{grunnl\adddot}},
+  continuator      = {{vidaref\adddot}{vidaref\adddot}},
+  continuators     = {{vidaref\adddot}{vidaref\adddot}},
+  collaborator     = {{samarb\adddot}{samarb\adddot}},
+  collaborators    = {{samarb\adddot}{samarb\adddot}},
+  annotator        = {{forkl\adddot}{forkl\adddot}},
+  annotators       = {{forkl\adddot}{forkl\adddot}},
+  review = {{omtale}{omtale}},
+  reviewof = {{omtale av}{omtale av}},
+  cbynone = {{}{}},
+  cbyauthor = {{av}{av}},
+  cbyeditor = {{red\adddot}{red\adddot}},
+  cbytranslator     = {{oms\adddot\addspace\lbx@cfromlang}%
+    {oms\adddot\addspace\lbx@cfromlang}},
+  cbycompiler = {{komp\adddot}{komp\adddot}},
+  cbyredactor = {{omarb\adddot}{omarb\adddot}},
+  cbycommentator = {{komm\adddot}{komm\adddot}},
+  cbyannotator = {{forkl\addot}{forkl\addot}},
+  cbyfounder        = {{grunnl\adddot}{grunnl\adddot}},
+  cbycontinuator    = {{vidaref\adddot}{vidaref\adddot}},
+  cbycollaborator   = {{i samarb\adddotspace med}%
+    {i samarb\adddotspace med}},
+  cbyconductor = {{dir\adddot}{dir\adddot}},
+  cbydirector = {{regi}{regi}},
+  cbyproducer = {{prod\adddot}{prod\adddot}},
+  cbyeditortr    = {{red\adddot\space og
+      oms\adddot\addspace\lbx@cfromlang}%
+    {red\adddot\space og oms\adddot\addspace\lbx@cfromlang}},
+  cbyeditorcp = {{red\adddot\space og komp\adddot}%
+    {red\adddot\space og komp\adddot}},
+  cbyeditorco    = {{red\adddot\space og komm\adddot}%
+    {red\adddot\space og komm\adddot}},
+  cbyeditoran = {{red\adddot\space og forkl\adddot}%
+    {red\adddot\space og forkl\adddot}},
+  cbyeditorin = {{red.,\addabbrvspace med innl., av}%
+    {red.,\addabbrvspace med innl., av}},
+  cbyeditorfo = {{red.,\addabbrvspace med f{\o}reord, av}%
+    {red.,\addabbrvspace med f{\o}reord, av}},
+  cbyeditoraf = {{red.,\addabbrvspace med etterord, av}%
+    {red.,\addabbrvspace med etterord, av}},
+  cbyeditortrcp = {{red.,\addabbrvspace oms.\addspace\lbx@fromlang og
+      komp\adddot}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang og komp\adddot}},
+  cbyeditortrco = {{red.,\addabbrvspace
+    oms\adddot\addspace\lbx@fromlang\space og
+    komm\adddot}%
+  {red.,\addabbrvspace
+    oms\adddot\addspace\lbx@fromlang\space og komm\adddot}},
+  cbyeditortran = {{red.,\addabbrvspace
+    oms\adddot\addspace\lbx@fromlang\space og
+    forkl\adddot}%
+  {red.,\addabbrvspace
+    oms\adddot\addspace\lbx@fromlang\space og forkl\adddot}},
+  cbyeditortrin = {{red\adddotspace og oms\adddot\ \lbx@sfromlang, med innl., av}%
+    {red\adddotspace og oms\adddot\ \lbx@sfromlang, med innl., av}},
+  cbyeditortrfo = {{red\adddotspace og oms\adddot\ \lbx@sfromlang, med f{\o}reord, av}%
+    {red\adddotspace og oms\adddot\ \lbx@sfromlang, med f{\o}reord, av}},
+  cbyeditortraf = {{red\adddotspace og oms\adddot\ \lbx@sfromlang, med etterord, av}%
+    {red\adddotspace og oms\adddot\ \lbx@sfromlang, med etterord, av}},
+  cbyeditorcpco = {{red.,\addabbrvspace komp. og komm\adddot}%
+    {red.,\addabbrvspace komp. og komm\adddot}},
+  cbyeditorcpan = {{red.,\addabbrvspace komp. og forkl\adddot}%
+    {red.,\addabbrvspace komp. og forkl\adddot}},
+  cbyeditorcpin = {{red\adddot\space og komp., med innl., av}%
+    {red\adddot\space og komp., med innl., av}},
+  cbyeditorcpfo = {{red\adddot\space og komp., med f{\o}reord, av}%
+    {red\adddot\space og komp., med f{\o}reord, av}},
+  cbyeditorcpaf = {{red\adddot\space og komp., med etterord, av}%
+    {red\adddot\space og komp., med etterord, av}},
+  cbyeditorcpcoin = {{red.,\addabbrvspace komp. og komm., med innl., av}%
+    {red.,\addabbrvspace komp. og komm., med innl., av}},
+  cbyeditorcpcofo = {{red.,\addabbrvspace komp. og komm., med f{\o}reord, av}%
+    {red.,\addabbrvspace komp. og komm., med f{\o}reord, av}},
+  cbyeditorcpcoaf = {{red.,\addabbrvspace komp. og komm., med etterord, av}%
+    {red.,\addabbrvspace komp. og komm., med etterord, av}},
+  cbyeditorcpanin = {{red.,\addabbrvspace komp. og forkl., med innl., av}%
+    {red.,\addabbrvspace komp. og forkl., med innl., av}},
+  cbyeditorcpanfo = {{red.,\addabbrvspace komp. og forkl., med f{\o}reord, av}%
+    {red.,\addabbrvspace komp. og forkl., med f{\o}reord, av}},
+  cbyeditorcpanaf = {{red.,\addabbrvspace komp. og forkl., med etterord, av}%
+    {red.,\addabbrvspace komp. og forkl., med etterord, av}},
+  cbyeditortrcpco = {{red.,\addabbrvspace oms.\addspace\lbx@fromlang,
+      komp. og komm\adddot}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og komm\adddot}},
+  cbyeditortrcpan = {{red.,\addabbrvspace oms.\addspace\lbx@fromlang,
+      komp. og forkl\adddot}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og forkl\adddot}},
+  cbyeditortrcpin = {{red.,\addabbrvspace oms.\addspace\lbx@fromlang og komp., med innl., av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang og komp.,
+      med innl., av}},
+  cbyeditortrcpfo = {{red.,\addabbrvspace oms.\addspace\lbx@fromlang og komp., med f{\o}reord, av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang og komp.,
+      med f{\o}reord, av}},
+  cbyeditortrcpaf = {{red.,\addabbrvspace oms.\addspace\lbx@fromlang og komp., med etterord, av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang og komp.,
+      med etterord, av}},
+  cbyeditortrcpcoin = {{red.,\addabbrvspace oms.\addspace\lbx@fromlang,
+      komp. og komm., med innl., av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og komm., med innl., av}},
+  cbyeditortrcpcofo = {{red.,\addabbrvspace oms.\addspace\lbx@fromlang,
+      komp. og komm., med f{\o}reord, av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og komm., med f{\o}reord, av}},
+  cbyeditortrcpcoaf = {{red.,\addabbrvspace oms.\addspace\lbx@fromlang,
+      komp. og komm., med etterord, av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og komm., med etterord, av}},
+  cbyeditortrcpanin = {{red.,\addabbrvspace oms.\addspace\lbx@fromlang,
+      komp. og forkl., med innl., av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og forkl., med innl., av}},
+  cbyeditortrcpanfo = {{red.,\addabbrvspace oms.\addspace\lbx@fromlang,
+      komp. og forkl., med f{\o}reord, av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og forkl., med f{\o}reord, av}},
+  cbyeditortrcpanaf = {{red.,\addabbrvspace oms.\addspace\lbx@fromlang,
+      komp. og forkl., med etterord, av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og forkl., med etterord, av}},
+  cbyeditorcoin = {{red\adddot\space og komm., med innl., av}%
+    {red\adddot\space og komm., med innl., av}},
+  cbyeditorcofo = {{red\adddot\space og komm., med f{\o}reord, av}%
+    {red\adddot\space og komm., med f{\o}reord, av}},
+  cbyeditorcoaf = {{red\adddot\space og komm., med etterord, av}%
+    {red\adddot\space og komm., med etterord, av}},
+  cbyeditoranin = {{red\adddot\space og forkl., med innl., av}%
+    {red\adddot\space og forkl., med innl., av}},
+  cbyeditoranfo = {{red\adddot\space og forkl., med f{\o}reord, av}%
+    {red\adddot\space og forkl., med f{\o}reord, av}},
+  cbyeditoranaf = {{red\adddot\space og forkl., med etterord, av}%
+    {red\adddot\space og forkl., med etterord, av}},
+  cbyeditortrcoin = {{red.,\addabbrvspace oms\adddot\addspace\lbx@fromlang\space og komm., med innl., av}%
+  {red.,\addabbrvspace oms\adddot\addspace\lbx@fromlang\space og komm., med innl., av}},
+  cbyeditortrcofo = {{red.,\addabbrvspace oms\adddot\addspace\lbx@fromlang\space og komm., med f{\o}reord, av}%
+  {red.,\addabbrvspace oms\adddot\addspace\lbx@fromlang\space og komm., med f{\o}reord, av}},
+  cbyeditortrcoaf = {{red.,\addabbrvspace oms\adddot\addspace\lbx@fromlang\space og komm., med etterord, av}%
+  {red.,\addabbrvspace oms\adddot\addspace\lbx@fromlang\space og komm., med etterord, av}},
+  cbyeditortranin = {{red.,\addabbrvspace oms\adddot\addspace\lbx@fromlang\space og forkl., med innl., av}%
+  {red.,\addabbrvspace oms\adddot\addspace\lbx@fromlang\space og forkl., med innl., av}},
+  cbyeditortranfo = {{red.,\addabbrvspace oms\adddot\addspace\lbx@fromlang\space og forkl., med f{\o}reord, av}%
+  {red.,\addabbrvspace oms\adddot\addspace\lbx@fromlang\space og forkl., med f{\o}reord, av}},
+  cbyeditortranaf = {{red.,\addabbrvspace oms\adddot\addspace\lbx@fromlang\space og forkl., med etterord, av}%
+  {red.,\addabbrvspace oms\adddot\addspace\lbx@fromlang\space og forkl., med etterord, av}},
+  cbytranslatorcp = {{oms\adddot\addspace\lbx@fromlang\ og komp\adddot}%
+    {oms\adddot\addspace\lbx@fromlang\ og komp\adddot}},
+  cbytranslatorco = {{oms\adddot\addspace\lbx@fromlang\ og komm\adddot}%
+    {oms\adddot\addspace\lbx@fromlang\ og komm\adddot}},
+  cbytranslatoran = {{oms\adddot\addspace\lbx@fromlang\ og forkl\adddot}%
+    {oms\adddot\addspace\lbx@fromlang\ og forkl\adddot}},
+  cbytranslatorin = {{oms\adddot\addspace\lbx@fromlang, med innl., av}%
+    {oms\adddot\addspace\lbx@fromlang, med innl., av}},
+  cbytranslatorfo = {{oms\adddot\addspace\lbx@fromlang, med f{\o}reord, av}%
+    {oms\adddot\addspace\lbx@fromlang, med f{\o}reord, av}},
+  cbytranslatoraf = {{oms\adddot\addspace\lbx@fromlang, med etterord, av}%
+    {oms\adddot\addspace\lbx@fromlang, med etterord, av}},
+  cbytranslatorcoin = {{oms\adddot\addspace\lbx@fromlang\ og komm.,
+      med innl., av}%
+    {oms\adddot\addspace\lbx@fromlang\ og komm., med innl., av}},
+  cbytranslatorcofo = {{oms\adddot\addspace\lbx@fromlang\ og komm.,
+      med f{\o}reord, av}%
+    {oms\adddot\addspace\lbx@fromlang\ og komm., med f{\o}reord, av}},
+  cbytranslatorcoaf = {{oms\adddot\addspace\lbx@fromlang\ og komm.,
+      med etterord, av}%
+    {oms\adddot\addspace\lbx@fromlang\ og komm., med etterord, av}},
+  cbytranslatoranin = {{oms\adddot\addspace\lbx@fromlang\ og forkl.,
+      med innl., av}%
+    {oms\adddot\addspace\lbx@fromlang\ og forkl., med innl., av}},
+  cbytranslatoranfo = {{oms\adddot\addspace\lbx@fromlang\ og forkl.,
+      med f{\o}reord, av}%
+    {oms\adddot\addspace\lbx@fromlang\ og forkl., med f{\o}reord, av}},
+  cbytranslatoranaf = {{oms\adddot\addspace\lbx@fromlang\ og forkl.,
+      med etterord, av}%
+    {oms\adddot\addspace\lbx@fromlang\ og forkl., med etterord, av}},
+  cbytranslatorcpco = {{oms\adddot\addspace\lbx@fromlang, komp. og komm\adddot}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og komm\adddot}},
+  cbytranslatorcpan = {{oms\adddot\addspace\lbx@fromlang, komp. og forkl\adddot}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og forkl\adddot}},
+  cbytranslatorcpin = {{oms\adddot\addspace\lbx@fromlang\ og komp.,
+      med innl., av}%
+    {oms\adddot\addspace\lbx@fromlang\ og komp., med innl., av}},
+  cbytranslatorcpfo = {{oms\adddot\addspace\lbx@fromlang\ og komp.,
+      med f{\o}reord, av}%
+    {oms\adddot\addspace\lbx@fromlang\ og komp., med f{\o}reord, av}},
+  cbytranslatorcpaf = {{oms\adddot\addspace\lbx@fromlang\ og komp.,
+      med etterord, av}%
+    {oms\adddot\addspace\lbx@fromlang\ og komp., med etterord, av}},
+  cbytranslatorcpcoin = {{oms\adddot\addspace\lbx@fromlang, komp. og komm., med innl., av}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og komm.,
+      med innl., av}},
+  cbytranslatorcpcofo = {{oms\adddot\addspace\lbx@fromlang, komp. og komm., med f{\o}reord, av}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og komm.,
+      med f{\o}reord, av}},
+  cbytranslatorcpcoaf = {{oms\adddot\addspace\lbx@fromlang, komp. og komm., med etterord, av}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og komm.,
+      med etterord, av}},
+  cbytranslatorcpanin = {{oms\adddot\addspace\lbx@fromlang, komp. og forkl., med innl., av}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og forkl.,
+      med innl., av}},
+  cbytranslatorcpanfo = {{oms\adddot\addspace\lbx@fromlang, komp. og forkl., med f{\o}reord, av}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og forkl.,
+      med f{\o}reord, av}},
+  cbytranslatorcpanaf = {{oms\adddot\addspace\lbx@fromlang, komp. og forkl., med etterord, av}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og forkl.,
+      med etterord, av}},
+  cbycompilerco = {{komp\adddot\space og komm\adddot}%
+    {komp\adddot\space og komm\adddot}},
+  cbycompileran = {{komp\adddot\space og forkl\adddot}%
+    {komp\adddot\space og forkl\adddot}},
+  cbycompilerin = {{komp.,\addabbrvspace med innl., av}%
+    {komp.,\addabbrvspace med innl., av}},
+  cbycompilerfo = {{komp.,\addabbrvspace med f{\o}reord, av}%
+    {komp.,\addabbrvspace med f{\o}reord, av}},
+  cbycompileraf = {{komp.,\addabbrvspace med etterord, av}%
+    {komp.,\addabbrvspace med etterord, av}},
+  cbycompilercoin = {{komp\adddot\space og komm., med innl., av}%
+    {komp\adddot\space og komm., med innl., av}},
+  cbycompilercofo = {{komp\adddot\space og komm., med f{\o}reord, av}%
+    {komp\adddot\space og komm., med f{\o}reord, av}},
+  cbycompilercoaf = {{komp\adddot\space og komm., med etterord, av}%
+    {komp\adddot\space og komm., med etterord, av}},
+  cbycompileranin = {{komp\adddot\space og forkl., med innl., av}%
+    {komp\adddot\space og forkl., med innl., av}},
+  cbycompileranfo = {{komp\adddot\space og forkl., med f{\o}reord, av}%
+    {komp\adddot\space og forkl., med f{\o}reord, av}},
+  cbycompileranaf = {{komp\adddot\space og forkl., med etterord, av}%
+    {komp\adddot\space og forkl., med etterord, av}},
+  volume = {{bd\adddot}{bd\adddot}},
+  volumes = {{bd\adddot}{bd\adddot}},
+  jourvol = {{{\aa}rg\adddot}{{\aa}rg\adddot}},
+  jourser = {{ser\adddot}{ser\adddot}},
+  oldseries = {{gl\adddotspace ser\adddot}{gl\adddotspace ser\adddot}},
+  edition = {{utg\adddot}{utg\adddot}},
+  page = {{s\adddot}{s\adddot}},
+  pages = {{s\adddot}{s\adddot}},
+  column = {{sp\adddot}{sp\adddot}},
+  columns = {{sp\adddot}{sp\adddot}},
+  line = {{l\adddot}{l\adddot}},
+  lines = {{l\adddot}{l\adddot}},
+  paragraph = {{avsn\adddot}{avsn\adddot}},
+  paragraphs = {{avsn\adddot}{avsn\adddot}},
+  section = {{avsn\adddot}{avsn\adddot}},
+  sections = {{avsn\adddot}{avsn\adddot}},
+  verse = {{v\adddot}{v\adddot}},
+  verses = {{v\adddot}{v\adddot}},
+  number = {{nr\adddot}{nr\adddot}},
+  chapter = {{kap\adddot}{kap\adddot}},
+  cfromamerican     = {{fr{\aa} amerikansk-engelsk av}{fr{\aa} amerikansk-engelsk av}},
+  cfrombrazilian    = {{fr{\aa} brasiliansk-portugisisk av}{fr{\aa} brasiliansk-portugisisk av}},
+  cfromdanish       = {{fr{\aa} dansk av}{fr{\aa} dansk av}},
+  cfromdutch        = {{fr{\aa} nederlandsk av}{fr{\aa} nederlandsk av}},
+  cfromenglish      = {{fr{\aa} engelsk av}{fr{\aa} engelsk av}},
+  cfromfrench       = {{fr{\aa} fransk av}{fr{\aa} fransk av}},
+  cfromgerman       = {{fr{\aa} tysk av}{fr{\aa} tysk av}},
+  cfromgreek        = {{fr{\aa} gresk av}{fr{\aa} gresk av}},
+  cfromitalian      = {{fr{\aa} italiensk av}{fr{\aa} italiensk av}},
+  cfromlatin        = {{fr{\aa} latin av}{fr{\aa} latin av}},
+  cfromnorwegian    = {{fr{\aa} norsk av}{fr{\aa} norsk av}},
+  cfromportuguese   = {{fr{\aa} portugisisk av}{fr{\aa} portugisisk av}},
+  cfromrussian      = {{fr{\aa} russisk av}{fr{\aa} russisk av}},
+  cfromspanish      = {{fr{\aa} spansk av}{fr{\aa} spansk av}},
+  cfromswedish      = {{fr{\aa} svensk av}{fr{\aa} svensk av}},
+  bynone = {{}{}},
+  byconductor = {{dirigert av}{dir\adddot}},
+  bydirector = {{regissert av}{regi}},
+  byproducer = {{produsert av}{prod\adddot}},
+  byeditorcp = {{redigert og kompilert av}{red\adddot\space og komp\adddot}},
+  byeditortrcp = {{redigert, omsett \lbx@fromlang og kompilert av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang og komp\adddot}},
+  byeditortrcpco = {{redigert, omsett \lbx@fromlang, kompilert og kommentert av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og komm\adddot}},
+  byeditortrcpan = {{redigert, omsett \lbx@fromlang, kompilert og forklart av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og forkl\adddot}},
+  byeditortrcpin = {{redigert, omsett \lbx@fromlang og kompilert, med innleiing, av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang og komp\adddot,
+      med innleiing, av}},
+  byeditortrcpfo = {{redigert, omsett \lbx@fromlang og kompilert, med f{\o}reord, av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang og komp\adddot,
+      med f{\o}reord, av}},
+  byeditortrcpaf = {{redigert, omsett \lbx@fromlang og kompilert, med etterord, av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang og komp\adddot,
+      med etterord, av}},
+  byeditortrcpcoin = {{redigert, omsett \lbx@fromlang, kompilert og kommentert, med innleiing, av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og komm\adddot, med innleiing, av}},
+  byeditortrcpcofo = {{redigert, omsett \lbx@fromlang, kompilert og kommentert, med f{\o}reord, av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og komm\adddot, med f{\o}reord, av}},
+  byeditortrcpcoaf = {{redigert, omsett \lbx@fromlang, kompilert og kommentert, med etterord, av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og komm\adddot, med etterord, av}},
+  byeditortrcpanin = {{redigert, omsett \lbx@fromlang, kompilert og forklart, med innleiing, av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og forkl\adddot, med innleiing, av}},
+  byeditortrcpanfo = {{redigert, omsett \lbx@fromlang, kompilert og forklart, med f{\o}reord, av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og forkl\adddot, med f{\o}reord, av}},
+  byeditortrcpanaf = {{redigert, omsett \lbx@fromlang, kompilert og forklart, med etterord, av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og forkl\adddot, med etterord, av}},
+  byeditorcpco = {{redigert, kompilert og kommentert av}%
+    {red.,\addabbrvspace komp. og komm\adddot}},
+  byeditorcpan = {{redigert, kompilert og forklart av}%
+    {red.,\addabbrvspace komp. og forkl\adddot}},
+  byeditorcpin = {{redigert og kompilert, med innleiing, av}%
+    {red\adddot\space og komp., med innleiing, av}},
+  byeditorcpfo = {{redigert og kompilert, med f{\o}reord, av}%
+    {red\adddot\space og komp., med f{\o}reord, av}},
+  byeditorcpaf = {{redigert og kompilert, med etterord, av}%
+    {red\adddot\space og komp., med etterord, av}},
+  byeditorcpcoin = {{redigert, kompilert og kommentert, med innleiing, av}%
+    {red.,\addabbrvspace komp. og komm., med innleiing, av}},
+  byeditorcpcofo = {{redigert, kompilert og kommentert, med f{\o}reord,
+      av}%
+    {red.,\addabbrvspace komp. og komm., med f{\o}reord, av}},
+  byeditorcpcoaf = {{redigert, kompilert og kommentert, med etterord, av}%
+    {red.,\addabbrvspace komp. og komm., med etterord, av}},
+  byeditorcpanin = {{redigert, kompilert og forklart, med innleiing, av}%
+    {red.,\addabbrvspace komp. og forkl., med innleiing, av}},
+  byeditorcpanfo = {{redigert, kompilert og forklart, med f{\o}reord,
+      av}%
+    {red.,\addabbrvspace komp. og forkl., med f{\o}reord, av}},
+  byeditorcpanaf = {{redigert, kompilert og forklart, med etterord, av}%
+    {red.,\addabbrvspace komp. og forkl., med etterord, av}},
+  bytranslatorcp = {{omsett \lbx@fromlang\ og kompilert av}%
+    {oms\adddot\addspace\lbx@fromlang\ og komp\adddot}},
+  bytranslatorcpco = {{omsett \lbx@fromlang, kompilert og kommentert av}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og komm\adddot}},
+  bytranslatorcpan = {{omsett \lbx@fromlang, kompilert og forklart av}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og forkl\adddot}},
+  bytranslatorcpin = {{omsett \lbx@fromlang\  og kompilert, med innleiing, av}%
+    {oms\adddot\addspace\lbx@fromlang\ og komp., med innleiing, av}},
+  bytranslatorcpfo = {{omsett \lbx@fromlang\ og kompilert, med f{\o}reord, av}%
+    {oms\adddot\addspace\lbx@fromlang\ og komp., med f{\o}reord, av}},
+  bytranslatorcpaf = {{omsett \lbx@fromlang\ og kompilert, med etterord, av}%
+    {oms\adddot\addspace\lbx@fromlang\ og komp., med etterord, av}},
+  bytranslatorcpcoin = {{omsett \lbx@fromlang, kompilert og kommentert,
+      med innleiing, av}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og komm., med innleiing, av}},
+  bytranslatorcpcofo = {{omsett \lbx@fromlang, kompilert og kommentert,
+      med f{\o}reord, av}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og komm.,
+      med f{\o}reord, av}},
+  bytranslatorcpcoaf = {{omsett \lbx@fromlang, kompilert og kommentert,
+      med etterord, av}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og komm., med etterord, av}},
+  bytranslatorcpanin = {{omsett \lbx@fromlang, kompilert og forklart,
+      med innleiing, av}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og forkl., med innleiing, av}},
+  bytranslatorcpanfo = {{omsett \lbx@fromlang, kompilert og forklart,
+      med f{\o}reord, av}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og forkl.,
+      med f{\o}reord, av}},
+  bytranslatorcpanaf = {{omsett \lbx@fromlang, kompilert og forklart,
+      med etterord, av}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og forkl.,
+      med etterord, av}},
+  bycompilerco = {{kompilert og kommentert av}%
+    {komp\adddot\space og komm\adddot}},
+  bycompileran = {{kompilert og forklart av}%
+    {komp\adddot\space og forkl\adddot}},
+  bycompilerin = {{kompilert, med innleiing, av}%
+    {komp\adddot, med innleiing, av}},
+  bycompilerfo = {{kompilert, med f{\o}reord, av}%
+    {komp\adddot, med f{\o}reord, av}},
+  bycompileraf = {{kompilert, med etterord, av}%
+    {komp\adddot, med etterord, av}},
+  bycompilercoin = {{kompilert og kommentert, med innleiing, av}%
+    {komp\adddot\space og komm\adddot, med innleiing, av}},
+  bycompilercofo = {{kompilert og kommentert, med f{\o}reord, av}%
+    {komp\adddot\space og komm\adddot, med f{\o}reord, av}},
+  bycompilercoaf = {{kompilert og kommentert, med etterord, av}%
+    {komp\adddot\space og komm\adddot, med etterord, av}},
+  bycompileranin = {{kompilert og forklart, med innleiing, av}%
+    {komp\adddot\space og forkl\adddot, med innleiing, av}},
+  bycompileranfo = {{kompilert og forklart, med f{\o}reord, av}%
+    {komp\adddot\space og forkl\adddot, med f{\o}reord, av}},
+  bycompileranaf = {{kompilert og forklart, med etterord, av}%
+    {komp\adddot\space og forkl\adddot, med etterord, av}},
+}
+
+\protected\gdef\lbx@cms@mkbibrangetrunc#1#2{%  DATE FIX
+  \iffieldundef{#2year}%
+  {\iffieldundef{#2month}
+    {}
+    {\printtext[#2date]{%
+        \iffieldsequal{#2month}{#2endmonth}
+        {\csuse{mkbibdate#1}{}{}{#2day}}
+        {\csuse{mkbibdate#1}{}{#2month}{#2day}}%
+        \iffieldundef{#2endyear}
+        {\iffieldundef{#2endmonth}
+          {}
+          {\bibdatedash
+            \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}}}
+        {\iffieldequalstr{#2endyear}{}
+          {\mbox{\bibdatedash}}
+          {\bibdatedash
+            \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+  {\printtext[#2date]{%
+      \iffieldsequal{#2year}{#2endyear}
+      {\iffieldsequal{#2month}{#2endmonth}
+        {\csuse{mkbibdate#1}{}{}{#2day}}
+        {\csuse{mkbibdate#1}{}{#2month}{#2day}}}
+      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+      \iffieldundef{#2endyear}
+      {}
+      {\iffieldequalstr{#2endyear}{}
+        {\mbox{\bibdatedash}}
+        {\bibdatedash
+          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+
+\protected\gdef\lbx@cms@mkbibrangefull#1#2{%
+  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
+  {}%
+  {\printtext[#2date]{%
+      \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}
+      {}
+      {\iffieldequalstr{#2endyear}{}
+        {\mbox{\bibdatedash}}
+        {\bibdatedash
+          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+
+\endinput
author	Karl Berry <karl@freefriends.org>	2012-12-08 17:16:40 +0000
committer	Karl Berry <karl@freefriends.org>	2012-12-08 17:16:40 +0000
commit	d5550a5b1dfc527de0b394ca1af3dff46548c6e3 (patch)
tree	c75e4296b600e2d2effb0dd168a9c3e6aacf229d
parent	d70e4e2f7daa386b9f77c0ff1d5a61b0c2c4b7f3 (diff)