biblatex-chicago (16jan18)

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

23 files changed, 4375 insertions, 11292 deletions

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 48fe68bdc97..8bb142ce521 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty
@@ -1,6 +1,6 @@
-% $Id: biblatex-chicago.sty,v 0.1.1.61 2017/04/19 13:08:02 dfussner Exp $
+% $Id: biblatex-chicago.sty,v 0.1.1.63 2018/01/10 17:37:15 dfussner Exp $
 
-% Copyright (c) 2009-2017 David Fussner.  This package is
+% Copyright (c) 2009-2018 David Fussner.  This package is
 % author-maintained.
 %
 % This work may be copied, distributed and/or modified under the
@@ -13,7 +13,7 @@
 % but not limited to, the implied warranties of merchantability and
 % fitness for a particular purpose.
 
-\ProvidesPackage{biblatex-chicago}[2017/04/19 v 3.7 biblatex style]
+\ProvidesPackage{biblatex-chicago}[2018/01/10 v 3.10 biblatex style]
 
 \RequirePackage{etoolbox}
 
@@ -65,7 +65,8 @@
     pagetracker=true,autocite=footnote,abbreviate=false,alldates=comp,
     citetracker=true,ibidtracker=constrict,usetranslator=true,
     usenamec=true,loccittracker=constrict,dateabbrev=false,
-    maxbibnames=10,minbibnames=7,sorting=cms,sortcase=false}}
+    maxbibnames=10,minbibnames=7,sorting=cms,sortcase=false,
+    uniquework=true}}
 
 \def\cms@authordatetrad{%
   \RequirePackage[style=chicago-authordate-trad]{biblatex}%
@@ -138,6 +139,7 @@
     {\DeclareLanguageMapping{american}{cms-american}}}}%
 {\DeclareLanguageMapping{english}{cms-american}}
 
+\DeclareLanguageMapping{brazilian}{cms-brazilian}
 \DeclareLanguageMapping{british}{cms-british}
 \DeclareLanguageMapping{german}{cms-german}
 \DeclareLanguageMapping{french}{cms-french}
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
index 6cdc32a3563..d48dec31cf1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad.cbx
@@ -1,11 +1,11 @@
-% $Id: chicago-authordate-trad.cbx,v 0.8.3.10 2017/03/22 13:52:18 dfussner Exp $
+% $Id: chicago-authordate-trad.cbx,v 0.9.1.4 2018/01/11 09:55:09 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 (trad) style of the Chicago Manual of Style, 16th edition.
 
-\ProvidesFile{chicago-authordate-trad.cbx}[2016/06/07 v 3.4 biblatex
+\ProvidesFile{chicago-authordate-trad.cbx}[2018/01/11 v 3.10 biblatex
 citation style]
 
 \RequireCitationStyle{chicago-dates-common}
@@ -110,6 +110,21 @@ citation style]
   {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
   {\ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}}
 
+\DeclareFieldFormat[report]{title}{%
+  \iffieldequalstr{entrysubtype}{unpublished}%
+  {\MakeSentenceCase*{#1}}%
+  {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}}%
+
+\DeclareFieldFormat[report]{citetitle}{%
+  \iffieldequalstr{entrysubtype}{unpublished}%
+  {\MakeSentenceCase*{#1}}%
+  {\mkbibemph{\MakeSentenceCase{#1}}\isdot}}
+
+\DeclareFieldFormat[report]{lostitle}{%
+  \iffieldequalstr{entrysubtype}{unpublished}%
+  {\MakeSentenceCase*{#1}}%
+  {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}}
+
 \DeclareFieldFormat[review,suppperiodical]{title}{%
   \ifcapital{\MakeCapital{#1\isdot}}%
   {#1\isdot}}
@@ -167,13 +182,13 @@ citation style]
   {}%
   {\printtext{%
     \printfield{title}%
-    \setunit{\addcolon\addspace}%
+    \setunit{\subtitlepunct}%
     \printfield[subtitle]{subtitle}}}}
 
 \newbibmacro*{italtitle+stitle}{%
   \printtext{%
     \printfield{title}%
-    \setunit{\addcolon\addspace}%
+    \setunit{\subtitlepunct}%
     \printfield[subtitle]{subtitle}}%
   \setunit{\ptitleaddonpunct}%
   \printfield{titleaddon}%
@@ -184,10 +199,17 @@ citation style]
 \newbibmacro*{mag+news+title}{%
   \printtext{%
        \printfield{title}%
-       \setunit{\addcolon\addspace}%
+       \setunit{\subtitlepunct}%
        \printfield[subtitle]{subtitle}}%
      \setunit{\ptitleaddonpunct}%\setunit{\addcomma\addspace}
-     \printfield{titleaddon}%
+     \ifboolexpr{%
+       togl {cms@related}%
+       and
+       test {\iffieldequalstr{relatedtype}{reviewof}}%
+     }%
+     {\usebibmacro{related:init}%
+       \usebibmacro{related}}%
+     {\printfield{titleaddon}}%
      }%\newcunit\newblock
 
 \newbibmacro*{issuetitle}{%
@@ -200,11 +222,30 @@ citation style]
     {}%
     \printtext{%
       \printfield{issuetitle}%
-      \setunit{\addcolon\addspace}%
+      \setunit{\subtitlepunct}%
       \printfield[issuesubtitle]{issuesubtitle}}}}
 
 %%%% Related macros that can't reside in common.cbx %%%%
 
+\newbibmacro*{related:reviewof}[1]{%
+  \entrydata*{#1}{%
+    \let\newunit\newcunit% FIXME??
+    \iffieldundef{title}%
+    {}%
+    {\printtext{%
+        \printfield{title}%
+        \setunit{\subtitlepunct}%
+        \printfield[subtitle]{subtitle}}}%
+    \newcunit%
+    \ifnameundef{author}%
+    {\newcunit%
+      \usebibmacro{byeditor+others}}%
+    {\bibstring{by}\addspace%
+      \printnames[byauthor]{author}%
+      \newcunit\usebibmacro{byeditor+others}}%
+    \setunit{\ctitleaddonpunct}%
+    \printfield{titleaddon}}}
+
 \DeclareFieldFormat{title:hook}{%
   \begingroup
   \mkrelatedstring%
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 a44568292f9..7032fd8b019 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.2.24 2017/03/25 14:08:25 dfussner Exp $
+% $Id: chicago-authordate.bbx,v 0.9.1.13 2018/01/11 09:25:52 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}[2016/06/07 v 3.4 biblatex
+\ProvidesFile{chicago-authordate.bbx}[2018/01/11 v 3.10 biblatex
 bibliography style]
 
 %%%% Initialize and format bibliography and los %%%%
@@ -142,15 +142,24 @@ bibliography style]
   \togglefalse{cms@headlessnote}}%
 
 \AtEveryBibitem{%
+  \global\csundef{@cmsst}%
   \iffieldequalstr{pubstate}{reprint}%
   {\toggletrue{cms@reprint}}%
   {\togglefalse{cms@reprint}}}%
 
 \AtEveryLositem{%
+  \global\csundef{@cmsst}%
   \iffieldequalstr{pubstate}{reprint}%
   {\toggletrue{cms@reprint}}%
   {\togglefalse{cms@reprint}}}%
 
+\AtEveryBiblistitem{shortjournal}{%
+  \global\csundef{@cmsst}%
+  \ifthenelse{\ifentrytype{jurisdiction}\OR%
+    \ifentrytype{legal}\OR\ifentrytype{legislation}}%
+  {\clearlist{location}}%
+  {}}%
+
 \InitializeBibliographyStyle{%
   \let\bbx@lasthash\undefined}%
 
@@ -480,13 +489,13 @@ bibliography style]
   \iffieldundef{journaltitle}%
   {\printtext[title]{%
       \printfield[tnoformat]{title}%
-      \setunit{\addcolon\addspace}%
+      \setunit{\subtitlepunct}%
       \printfield[stnoformat]{subtitle}}%
     \setunit*{\addspace}%
     \printlist[periodplace]{location}}%
   {\printtext[journaltitle]{%
       \printfield[jtnoformat]{journaltitle}%
-      \setunit{\addcolon\addspace}%
+      \setunit{\subtitlepunct}%
       \printfield[sjtnoformat]{journalsubtitle}}%
     \setunit*{\addspace}%
     \printlist[periodplace]{location}}%
@@ -499,6 +508,81 @@ bibliography style]
       \step[fieldsource=shorttitle, final]
       \step[fieldset=shortjournal, origfieldval]
     }
+    \map{
+      \step[fieldsource=pubstate, match={forthcoming}, final]
+      \step[fieldset=year, origfieldval, final]
+      \step[fieldsource=year, match=\regexp{(forthcoming)},
+      replace=\regexp{\\bibstring\{$1\}}]%$
+      \step[fieldset=pubstate, null]
+    }
+    \map{
+      \pertype{article}
+      \pertype{periodical}
+      \pertype{review}
+      \pertype{suppperiodical}
+      \step[fieldsource=entrysubtype, match={newspaper},
+      replace={magazine}]
+    }
+    \map{
+      \pertype{jurisdiction}
+      \pertype{legal}
+      \pertype{legislation}
+      \step[fieldsource=journaltitle, final]
+      \step[fieldset=shortjournal, origfieldval]
+    }
+    \map[overwrite]{
+      \pertype{jurisdiction}
+      \step[fieldsource=shortjournal, match=\regexp{[^\\adddot][a-z]}, final]
+      \step[fieldset=shortjournal, fieldvalue=\addnbspace, append]
+    }
+    \map{
+      \pertype{legislation}
+      \step[fieldsource=title, match=\regexp{Const}, final]
+      \step[fieldset=entrysubtype, fieldvalue=constitution]
+    }
+    \map{
+      \pertype{legislation}
+      \step[fieldsource=entrysubtype, match=\regexp{canada}, final]
+      \step[fieldsource=bookpagination, match={section},
+      replace={canadasection}]
+      \step[fieldsource=pagination, match={section},
+      replace={canadasection}]
+    }
+    \map[overwrite]{
+      \step[fieldsource=subtitle, final]
+      \step[fieldsource=title,
+      match=\regexp{\\(mkbib|en)quote\{.+((\?|\!)\})$},%$
+      final]
+      \step[fieldset=title, fieldvalue=\csgdef{@cmsst}{\@ne}, append]
+    }
+    \map[overwrite]{
+      \step[fieldsource=booksubtitle, final]
+      \step[fieldsource=booktitle,
+      match=\regexp{\\(mkbib|en)quote\{.+((\?|\!)\})$},%$
+      final]
+      \step[fieldset=booktitle, fieldvalue=\csgdef{@cmsst}{\@ne}, append]
+    }
+    \map[overwrite]{
+      \step[fieldsource=issuesubtitle, final]
+      \step[fieldsource=issuetitle,
+      match=\regexp{\\(mkbib|en)quote\{.+((\?|\!)\})$},%$
+      final]
+      \step[fieldset=issuetitle, fieldvalue=\csgdef{@cmsst}{\@ne}, append]
+    }
+    \map[overwrite]{
+      \step[fieldsource=journalsubtitle, final]
+      \step[fieldsource=journaltitle,
+      match=\regexp{\\(mkbib|en)quote\{.+((\?|\!)\})$},%$
+      final]
+      \step[fieldset=journaltitle, fieldvalue=\csgdef{@cmsst}{\@ne}, append]
+    }
+    \map[overwrite]{
+      \step[fieldsource=mainsubtitle, final]
+      \step[fieldsource=maintitle,
+      match=\regexp{\\(mkbib|en)quote\{.+((\?|\!)\})$},%$
+      final]
+      \step[fieldset=maintitle, fieldvalue=\csgdef{@cmsst}{\@ne}, append]
+    }    
   }
 }%
 
@@ -542,7 +626,11 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldequalstr{relatedtype}{reviewof}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -586,7 +674,11 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldequalstr{relatedtype}{reviewof}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -687,7 +779,7 @@ bibliography style]
       {\bibstring{in}\setunit{\addspace}}%
       \printtext{%
         \printfield{maintitle}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[mainsubtitle]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}%
@@ -698,7 +790,7 @@ bibliography style]
       \setunit{\addspace}%
       \printtext{%
         \printfield{maintitle}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[mainsubtitle]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}%
@@ -1523,6 +1615,450 @@ bibliography style]
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
+\DeclareBibliographyDriver{jurisdiction}{%
+  \iffieldequalstr{entrysubtype}{square}% FIXME?
+  {\usebibmacro{bibindex}%
+    \usebibmacro{clegis+news+title}%
+    \setunit{\addspace}%
+    \usebibmacro{language+transtitle}%
+    \setunit{\addcomma\addspace}%
+    \usebibmacro{byauthor}%
+    \setunit{\addcomma\addspace}%
+    \usebibmacro{cpart+editor+translator}%
+    \newcunit%
+    \usebibmacro{issuetitle}%
+    \setunit{\addcomma\addspace}%
+    \usebibmacro{cbyeditor+others}%
+    \setunit{\addcomma\addspace}%
+    \printfield[juridnum]{number}%
+    \newcunit%
+    \iffieldundef{year}%
+    {}%
+    {\printtext[brackets]{%
+      \begingroup% Better ideas?
+      \let\abx@bibmonth\blx@imc@bibsstring%
+      \usebibmacro{date}\endgroup}}%
+    \setunit*{\addspace}%
+    \printfield[jourvol]{volume}%
+    \setunit{\addnbspace}%
+    \iffieldundef{shortjournal}%
+    {}%
+    {\printtext[shortjournal]{%
+      \printfield[jtsnoformat]{shortjournal}}}%
+    \iffieldundef{issue}%
+    {\printfield[jurisdictionser]{series}}%
+    {\setunit{\addspace}%
+      \printfield{issue}}% Better ideas?
+    \usebibmacro{juridpostnote}%
+    \setunit{\addcomma\addspace}%
+    \printfield{note}%
+    \setunit{\addspace}%
+    \printlist{location}%
+    \setunit{\addspace}%
+    \usebibmacro{cms:shorthandintro}%
+    \setunit{\addspace}\newblock
+    \printfield{addendum}%
+    \newcunit\newblock
+    \iftoggle{cms@isbn}%
+    {\printfield{issn}}%
+    {}%
+    \newcunit\newblock
+    \usebibmacro{cite+doi+url}%
+    \newcunit\newblock
+    \usebibmacro{pageref}%
+    \newcunit\newblock
+    \iftoggle{cms@related}%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}%
+      \newcunit}%
+    {}%
+    \usebibmacro{finentry}}
+  {\iffieldequalstr{entrysubtype}{round}% FIXME?
+    {\usebibmacro{bibindex}%
+      \usebibmacro{clegis+news+title}%
+      \setunit{\addspace}%
+      \usebibmacro{language+transtitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{byauthor}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cpart+editor+translator}%
+      \newcunit%
+      \usebibmacro{issuetitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cbyeditor+others}%
+      \setunit{\addcomma\addspace}%
+      \printfield[juridnum]{number}%
+      \newcunit%
+      \iffieldundef{year}%
+      {}%
+      {\printtext[parens]{%
+        \begingroup% Better ideas?
+        \let\abx@bibmonth\blx@imc@bibsstring%
+        \usebibmacro{date}\endgroup}}%
+      \setunit*{\addspace}%
+      \printfield[jourvol]{volume}%
+      \setunit{\addnbspace}%
+      \iffieldundef{shortjournal}%
+      {}%
+      {\printtext[shortjournal]{%
+        \printfield[jtsnoformat]{shortjournal}}}%
+      \iffieldundef{issue}%
+      {\printfield[jurisdictionser]{series}}%
+      {\setunit{\addspace}%
+        \printfield{issue}}% Better ideas?
+      \usebibmacro{juridpostnote}%
+      \setunit{\addcomma\addspace}%
+      \printfield{note}%
+      \setunit{\addspace}%
+      \printlist{location}%
+      \setunit{\addspace}%
+      \usebibmacro{cms:shorthandintro}%
+      \setunit{\addspace}\newblock
+      \printfield{addendum}%
+      \newcunit\newblock
+      \iftoggle{cms@isbn}%
+      {\printfield{issn}}%
+      {}%
+      \newcunit\newblock
+      \usebibmacro{cite+doi+url}%
+      \newcunit\newblock
+      \usebibmacro{pageref}%
+      \newcunit\newblock
+      \iftoggle{cms@related}%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {}%
+      \usebibmacro{finentry}}
+    {\usebibmacro{bibindex}%
+      \usebibmacro{clegis+news+title}%
+      \setunit{\addspace}%
+      \usebibmacro{language+transtitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{byauthor}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cpart+editor+translator}%
+      \newcunit%
+      \usebibmacro{issuetitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cbyeditor+others}%
+      \setunit{\addcomma\addspace}%
+      \printfield[juridnum]{number}%
+      \newcunit%
+      \printfield[jourvol]{volume}%
+      \setunit*{\addnbspace}%
+      \iffieldundef{shortjournal}%
+      {}%
+      {\printtext[shortjournal]{%
+        \printfield[jtsnoformat]{shortjournal}}}%
+      \iffieldundef{issue}%
+      {\printfield[jurisdictionser]{series}}%
+      {\setunit{\addspace}%
+        \printfield{issue}}% Better ideas?
+      \setunit{\addspace}%
+      \printlist{origpublisher}%
+      \usebibmacro{juridpostnote}%
+      \setunit{\addcomma\addspace}%
+      \printlist{origlocation}%
+      \setunit{\addcomma\addspace}%
+      \printfield{note}%
+      \setunit{\addspace}%
+      \ifboolexpr{%
+        test {\iffieldundef{year}}%
+        and
+        test {\iflistundef{location}}%
+      }%
+      {}%
+      {\printtext[parens]{%
+        \printlist{location}%
+        \setunit*{\addspace}%
+        \begingroup% Better ideas?
+        \let\abx@bibmonth\blx@imc@bibsstring%
+        \usebibmacro{date}\endgroup}}%
+      \setunit{\addspace}%
+      \usebibmacro{cms:shorthandintro}%
+      \setunit{\addspace}\newblock
+      \printfield{addendum}%
+      \newcunit\newblock
+      \iftoggle{cms@isbn}%
+      {\printfield{issn}}%
+      {}%
+      \newcunit\newblock
+      \usebibmacro{cite+doi+url}%
+      \newcunit\newblock
+      \usebibmacro{pageref}%
+      \newcunit\newblock
+      \iftoggle{cms@related}%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {}%
+      \usebibmacro{finentry}}}}
+
+\DeclareBibliographyDriver{legal}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \setunit{\addspace}%
+  \printfield{nameaddon}%
+  \newcunit\newblock
+  \usebibmacro{clegis+news+title}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{byauthor}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{cpart+editor+translator}%
+  \newcunit%
+  \usebibmacro{issuetitle}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{cbyeditor+others}%
+  \setunit{\addcomma\addspace}%
+  \printfield[juridnum]{number}%
+  \newcunit%
+  \iffieldundef{year}%
+  {}%
+  {\printtext{%
+    \begingroup% Better ideas?
+    \let\abx@bibmonth\blx@imc@bibsstring%
+    \usebibmacro{date}\endgroup}}%
+  \newcunit%\setunit*{\addspace}%
+  \printfield[jourvol]{volume}%
+  \setunit*{\addnbspace}%
+  \iffieldundef{shortjournal}%
+  {}%
+  {\printtext[shortjournal]{%
+    \printfield[jtsnoformat]{shortjournal}}}%
+  \setunit{\addspace}%
+  \printfield{series}%
+  \setunit{\addspace}%
+  \printfield{issue}%
+  \newcunit%
+  \printfield{part}%
+  \newcunit%
+  \printfield{chapter}%
+  \usebibmacro{juridpostnote}%
+  \setunit{\addcomma\addspace}%
+  \printfield{note}%
+  \setunit{\addspace}%
+  \printlist{location}%
+  \setunit{\addspace}%
+  \usebibmacro{cms:shorthandintro}%
+  \setunit{\addspace}\newblock%
+  \printfield{addendum}%
+  \newcunit\newblock
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \iftoggle{cms@related}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{legislation}{%
+  \iffieldequalstr{entrysubtype}{uk}% FIXME?
+  {\usebibmacro{bibindex}%
+    \usebibmacro{author/editor}%
+    \setunit{\addspace}%
+    \printfield{nameaddon}%
+    \newcunit\newblock
+    \usebibmacro{clegis+news+title}%
+    \setunit{\addspace}%
+    \usebibmacro{language+transtitle}%
+    \setunit{\addcomma\addspace}%
+    \usebibmacro{byauthor}%
+    \setunit{\addcomma\addspace}%
+    \usebibmacro{cpart+editor+translator}%
+    \newcunit%
+    \usebibmacro{issuetitle}%
+    \setunit{\addcomma\addspace}%
+    \usebibmacro{cbyeditor+others}%
+    \setunit{\addcomma\addspace}%
+    \printfield[juridnum]{number}%
+    \setunit{\addcomma\addspace}%
+    \printfield{note}%
+    \newcunit%
+    \iffieldundef{year}%
+    {}%
+    {\printtext{%
+      \begingroup% Better ideas?
+      \let\abx@bibmonth\blx@imc@bibsstring%
+      \usebibmacro{date}\endgroup}}%
+    \newcunit%\setunit*{\addspace}%
+    \printfield[jourvol]{volume}%
+    \setunit*{\addnbspace}%
+    \iffieldundef{shortjournal}%
+    {}%
+    {\printtext[shortjournal]{%
+      \printfield[jtsnoformat]{shortjournal}}}%
+    \setunit{\addspace}%
+    \printfield{series}%
+    \setunit{\addspace}%
+    \printfield{issue}%
+    \newcunit%
+    \printfield{part}%
+    \newcunit%
+    \printfield{chapter}%
+    \usebibmacro{juridpostnote}%
+    \setunit{\addspace}%
+    \printlist{location}%
+    \setunit{\addspace}%
+    \usebibmacro{cms:shorthandintro}%
+    \setunit{\addspace}\newblock%
+    \printfield{addendum}%
+    \newcunit\newblock
+    \iftoggle{cms@isbn}%
+    {\printfield{issn}}%
+    {}%
+    \newcunit\newblock
+    \usebibmacro{cite+doi+url}%
+    \newcunit\newblock
+    \usebibmacro{pageref}%
+    \newcunit\newblock
+    \iftoggle{cms@related}%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}%
+      \newcunit}%
+    {}%
+    \usebibmacro{finentry}}
+  {\iffieldequalstr{entrysubtype}{hansard}% FIXME?
+    {\usebibmacro{bibindex}%
+      \usebibmacro{author/editor}%
+      \setunit{\addspace}%
+      \printfield{nameaddon}%
+      \newcunit\newblock
+      \usebibmacro{clegis+news+title}%
+      \setunit{\addspace}%
+      \usebibmacro{language+transtitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{byauthor}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cpart+editor+translator}%
+      \newcunit%
+      \usebibmacro{issuetitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cbyeditor+others}%
+      \setunit{\addcomma\addspace}%
+      \printfield[juridnum]{number}%
+      \setunit{\addcomma\addspace}%
+      \printfield{note}%
+      \newcunit%
+      \printfield[jourvol]{volume}%
+      \setunit*{\addnbspace}%
+      \iffieldundef{shortjournal}%
+      {}%
+      {\printtext[shortjournal]{%
+        \printfield[jtsnoformat]{shortjournal}}}%
+      \setunit{\addspace}%
+      \printfield[hansardser]{series}%
+      \setunit{\addspace}%
+      \iffieldundef{year}%
+      {}%
+      {\printtext[parens]{%
+        \begingroup% Better ideas?
+        \let\abx@bibmonth\blx@imc@bibsstring%
+        \usebibmacro{date}\endgroup}}%
+      \usebibmacro{juridpostnote}%
+      \setunit{\addspace}%
+      \printlist{location}%
+      \setunit{\addspace}%
+      \usebibmacro{cms:shorthandintro}%
+      \setunit{\addspace}\newblock%
+      \printfield{addendum}%
+      \newcunit\newblock
+      \iftoggle{cms@isbn}%
+      {\printfield{issn}}%
+      {}%
+      \newcunit\newblock
+      \usebibmacro{cite+doi+url}%
+      \newcunit\newblock
+      \usebibmacro{pageref}%
+      \newcunit\newblock
+      \iftoggle{cms@related}%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {}%
+      \usebibmacro{finentry}}
+    {\usebibmacro{bibindex}%
+      \usebibmacro{author/editor}%
+      \setunit{\addspace}%
+      \printfield{nameaddon}%
+      \newcunit\newblock
+      \usebibmacro{clegis+news+title}%
+      \setunit{\addspace}%
+      \usebibmacro{language+transtitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{byauthor}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cpart+editor+translator}%
+      \newcunit%
+      \usebibmacro{issuetitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cbyeditor+others}%
+      \setunit{\addspace}% FIXME?
+      \printfield[juridnum]{number}%
+      \setunit{\addcomma\addspace}%
+      \printfield{note}%
+      \newcunit%
+      \printfield[jourvol]{volume}%
+      \setunit*{\addnbspace}%
+      \iffieldundef{shortjournal}%
+      {}%
+      {\printtext[shortjournal]{%
+        \printfield[jtsnoformat]{shortjournal}}}%
+      \newcunit%
+      \printfield{series}%
+      \setunit{\addspace}%
+      \printfield{issue}%
+      \newcunit%
+      \printfield{part}%
+      \newcunit%
+      \printfield{chapter}%
+      \usebibmacro{juridpostnote}%
+      \setunit{\addspace}%
+      \ifboolexpr{%
+        test {\iffieldundef{year}}%
+        and
+        test {\iffieldundef{usera}}%
+        and
+        test {\iflistundef{location}}%
+      }%
+      {}%
+      {\printtext[parens]{%
+          \printlist{location}%
+          \setunit*{\addspace}%
+          \printfield{usera}%
+          \setunit*{\addspace}%
+          \begingroup% Better ideas?
+          \let\abx@bibmonth\blx@imc@bibsstring%
+          \usebibmacro{date}\endgroup}}%
+      \setunit{\addspace}%
+      \usebibmacro{cms:shorthandintro}%
+      \setunit{\addspace}\newblock%
+      \printfield{addendum}%
+      \newcunit\newblock
+      \iftoggle{cms@isbn}%
+      {\printfield{issn}}%
+      {}%
+      \newcunit\newblock
+      \usebibmacro{cite+doi+url}%
+      \newcunit\newblock
+      \usebibmacro{pageref}%
+      \newcunit\newblock
+      \iftoggle{cms@related}%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {}%
+      \usebibmacro{finentry}}}}
+
 \DeclareBibliographyDriver{letter}{%
   \usebibmacro{bibindex}%
   \usebibmacro{shorthand:author}%
@@ -1688,7 +2224,7 @@ bibliography style]
   \iffieldundef{entrysubtype}%
   {\ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}}%
   {\printfield{title}%
-    \setunit{\addcolon\addspace}%
+    \setunit{\subtitlepunct}%
     \printfield[noformat]{subtitle}%
     \setunit{\ctitleaddonpunct}%
     \printfield{titleaddon}%
@@ -1782,7 +2318,7 @@ bibliography style]
       {\bibstring{in}\setunit{\addspace}}%
       \printtext{%
         \printfield{maintitle}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[mainsubtitle]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}%
@@ -1793,7 +2329,7 @@ bibliography style]
       \setunit{\addspace}%
       \printtext{%
         \printfield{maintitle}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[mainsubtitle]{mainsubtitle}}%
       \setunit{ctitleaddonpunct}%
       \printfield{maintitleaddon}}}%
@@ -1936,7 +2472,7 @@ bibliography style]
         \printdate}}%
     {\bibstring{patentfiled}\setunit{\addspace}%
       \printorigdate%\usebibmacro{date}%
-      \setunit{\addcomma\addspace\bibstring{and}%
+      \setunit{\finalandcomma\addspace\bibstring{and}%
         \addspace\bibstring{patentissued}\addspace}%
       \usebibmacro{date}}}%
   \newcunit\newblock
@@ -1968,7 +2504,7 @@ bibliography style]
   }%
   {\printtext[title]{% magazine subtype
     \printfield[tnoformat]{title}%
-    \setunit{\addcolon\addspace}%
+    \setunit{\subtitlepunct}%
     \printfield[stnoformat]{subtitle}}%
   \setunit*{\addspace}%
   \printlist[periodplace]{location}%
@@ -2022,7 +2558,7 @@ bibliography style]
   }%
   {\printtext[title]{% magazine subtype
     \printfield[tnoformat]{title}%
-    \setunit{\addcolon\addspace}%
+    \setunit{\subtitlepunct}%
     \printfield[stnoformat]{subtitle}}%
   \setunit*{\addspace}%
   \printlist[periodplace]{location}%
@@ -2269,18 +2805,32 @@ bibliography style]
   \printfield{nameaddon}%
   \newunit\newblock
   \ifundef{\bbx@lasthash}%
-  {\printfield{title}%
-  \setunit{\addcolon\addspace}%
-  \printfield[noformat]{subtitle}%
-  \newunit}%
+  {\ifboolexpr{%
+      togl {cms@related}%
+      and
+      test {\iffieldequalstr{relatedtype}{reviewof}}%
+    }%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}}%
+    {\printfield{title}%
+      \setunit{\subtitlepunct}%
+      \printfield[noformat]{subtitle}%
+      \newunit}}%
   {}%
   \usebibmacro{cmsbibsortdate}%
   \newunit\newblock
   \ifundef{\bbx@lasthash}%
   {}%
-  {\printfield{title}%
-  \setunit{\addcolon\addspace}%
-  \printfield[noformat]{subtitle}}%
+  {\ifboolexpr{%
+      togl {cms@related}%
+      and
+      test {\iffieldequalstr{relatedtype}{reviewof}}%
+    }%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}}%
+    {\printfield{title}%
+      \setunit{\subtitlepunct}%
+      \printfield[noformat]{subtitle}}}%
   \setunit{\ptitleaddonpunct}%
   \printfield{titleaddon}%
   \newcunit\newblock
@@ -2317,7 +2867,11 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldequalstr{relatedtype}{reviewof}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -2456,9 +3010,17 @@ bibliography style]
   \setunit*{\addcomma\addspace}\newblock%
   \printfield{note}%
   \setunit*{\addcomma\addspace}\newblock%
+  \printfield{eventtitle}%
+  \setunit*{\ctitleaddonpunct}\newblock%
+  \printfield{eventtitleaddon}%
+  \setunit*{\addcomma\addspace}%
+  \printfield{venue}%
+  \setunit*{\addcomma\addspace}%
   \printlist{location}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{date}%
+  \iffieldundef{eventmonth}%
+  {\usebibmacro{date}}%
+  {\printeventdate}%
   \newunit\newblock
   \usebibmacro{pubstate}%
   \newunit\newblock
@@ -2527,7 +3089,7 @@ bibliography style]
       {\bibstring{in}\setunit{\addspace}}%
       \printtext{%
         \printfield{maintitle}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[mainsubtitle]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}%
@@ -2538,7 +3100,7 @@ bibliography style]
       \setunit{\addspace}%
       \printtext{%
         \printfield{maintitle}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[mainsubtitle]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}%
@@ -2580,7 +3142,15 @@ bibliography style]
 %%%% Other Formatting Macros %%%%
 
 \newbibmacro*{bib+doi+url}{% 16th ed.
-  \ifthenelse{\iffieldundef{urlyear}\AND\iffieldundef{urlmonth}}%
+  \ifboolexpr{%
+    not togl {cms@url}%
+    or
+    (
+    test {\iffieldundef{urlyear}}%
+    and
+    test {\iffieldundef{urlmonth}}%
+    )
+    }%
   {}%
   {\printurldate}% Date fix
   \iffieldundef{addendum}%
@@ -2674,10 +3244,10 @@ bibliography style]
       {\iffieldundef{eventyear}%
         {\iffieldundef{origyear}%
           {\printfield{labelyear}%
-            \iffieldundef{extrayear}%
+            \iffieldundef{extradate}%
             {}%
             {\setunit*{}%
-              \printfield{extrayear}}%
+              \printfield{extradate}}%
             \iffieldundef{urlendyear}%
             {\clearfield{urlyear}}%
             {\ifboolexpr{%
@@ -2694,10 +3264,10 @@ bibliography style]
                   {}}%
                 \usebibmacro{cms@test@labelend}}}}%
           {\printfield{labelyear}%
-            \iffieldundef{extrayear}%
+            \iffieldundef{extradate}%
             {}%
             {\setunit*{}%
-              \printfield{extrayear}}%
+              \printfield{extradate}}%
             \iffieldundef{origendyear}%
             {\clearfield{origyear}}%
             {\ifboolexpr{%
@@ -2714,10 +3284,10 @@ bibliography style]
                   {}}%
                 \usebibmacro{cms@test@labelend}}}}}%
         {\printfield{labelyear}%
-          \iffieldundef{extrayear}%
+          \iffieldundef{extradate}%
           {}%
           {\setunit*{}%
-            \printfield{extrayear}}%
+            \printfield{extradate}}%
           \iffieldundef{eventendyear}%
           {\clearfield{eventyear}}%
           {\ifboolexpr{%
@@ -2734,10 +3304,10 @@ bibliography style]
                 {}}%
               \usebibmacro{cms@test@labelend}}}}}%
       {\printfield{labelyear}%
-        \iffieldundef{extrayear}%
+        \iffieldundef{extradate}%
         {}%
         {\setunit*{}%
-          \printfield{extrayear}}%
+          \printfield{extradate}}%
         \iffieldundef{endyear}% DATE FIX
         {\clearfield{year}}%
         {\ifboolexpr{%
@@ -2773,10 +3343,10 @@ bibliography style]
       {\iffieldundef{year}%
         {\iffieldundef{eventyear}%
           {\printfield{labelyear}%
-            \iffieldundef{extrayear}%
+            \iffieldundef{extradate}%
             {}%
             {\setunit*{}%
-              \printfield{extrayear}}%
+              \printfield{extradate}}%
             \iffieldundef{urlendyear}%
             {\clearfield{urlyear}}%
             {\ifboolexpr{%
@@ -2793,10 +3363,10 @@ bibliography style]
                   {}}%
                 \usebibmacro{cms@test@labelend}}}}%
           {\printfield{labelyear}%
-            \iffieldundef{extrayear}%
+            \iffieldundef{extradate}%
             {}%
             {\setunit*{}%
-              \printfield{extrayear}}%
+              \printfield{extradate}}%
             \iffieldundef{eventendyear}%
             {\clearfield{eventyear}}%
             {\ifboolexpr{%
@@ -2813,10 +3383,10 @@ bibliography style]
                   {}}%
                 \usebibmacro{cms@test@labelend}}}}}%
         {\printfield{labelyear}%
-          \iffieldundef{extrayear}%
+          \iffieldundef{extradate}%
           {}%
           {\setunit*{}%
-            \printfield{extrayear}}%
+            \printfield{extradate}}%
           \iffieldundef{endyear}%
           {\clearfield{year}}%
           {\ifboolexpr{%
@@ -2833,10 +3403,10 @@ bibliography style]
                 {}}%
               \usebibmacro{cms@test@labelend}}}}}%
       {\printfield{labelyear}%
-        \iffieldundef{extrayear}%
+        \iffieldundef{extradate}%
         {}%
         {\setunit*{}%
-          \printfield{extrayear}}%
+          \printfield{extradate}}%
         \iffieldundef{origendyear}% DATE FIX
         {\clearfield{origyear}}%
         {\ifboolexpr{%
@@ -2872,10 +3442,10 @@ bibliography style]
       {\iffieldundef{origyear}%
         {\iffieldundef{year}%
           {\printfield{labelyear}%
-            \iffieldundef{extrayear}%
+            \iffieldundef{extradate}%
             {}%
             {\setunit*{}%
-              \printfield{extrayear}}%
+              \printfield{extradate}}%
             \iffieldundef{urlendyear}%
             {\clearfield{urlyear}}%
             {\ifboolexpr{%
@@ -2892,10 +3462,10 @@ bibliography style]
                   {}}%
                 \usebibmacro{cms@test@labelend}}}}%
           {\printfield{labelyear}%
-            \iffieldundef{extrayear}%
+            \iffieldundef{extradate}%
             {}%
             {\setunit*{}%
-              \printfield{extrayear}}%
+              \printfield{extradate}}%
             \iffieldundef{endyear}%
             {\clearfield{year}}%
             {\ifboolexpr{%
@@ -2912,10 +3482,10 @@ bibliography style]
                   {}}%
                 \usebibmacro{cms@test@labelend}}}}}%
         {\printfield{labelyear}%
-          \iffieldundef{extrayear}%
+          \iffieldundef{extradate}%
           {}%
           {\setunit*{}%
-            \printfield{extrayear}}%
+            \printfield{extradate}}%
           \iffieldundef{origendyear}%
           {\clearfield{origyear}}%
           {\ifboolexpr{%
@@ -2932,10 +3502,10 @@ bibliography style]
                 {}}%
               \usebibmacro{cms@test@labelend}}}}}%
       {\printfield{labelyear}%
-        \iffieldundef{extrayear}%
+        \iffieldundef{extradate}%
         {}%
         {\setunit*{}%
-          \printfield{extrayear}}%
+          \printfield{extradate}}%
         \iffieldundef{eventendyear}% DATE FIX
         {\clearfield{eventyear}}%
         {\ifboolexpr{%
@@ -3026,7 +3596,7 @@ bibliography style]
     {\iffieldundef{origyear}%
       {\iftoggle{cms@ordate}% ???
         {}%
-        {\clearfield{extrayear}}%
+        {\clearfield{extradate}}%
         \usebibmacro{standard+labelyear+extrayear}}%
       {\iftoggle{cms@ordate}%
         {\usebibmacro{origfirst+labelyear+extrayear}}%
@@ -3058,7 +3628,7 @@ bibliography style]
     {\iffieldundef{origyear}%
       {\iftoggle{cms@ordate}%
         {}%
-        {\clearfield{extrayear}}%
+        {\clearfield{extradate}}%
         \usebibmacro{standard+labelyear+extrayear}}%
       {\iftoggle{cms@ordate}% ???
         {\iffieldundef{year}%
@@ -3073,7 +3643,7 @@ bibliography style]
             \bibopenparen%
             \usebibmacro{origyear+endyear}%
             \bibcloseparen%
-            \clearfield{extrayear}\setunit*{\addspace}%
+            \clearfield{extradate}\setunit*{\addspace}%
             \usebibmacro{standard+labelyear+extrayear}}}%
         \clearfield{origyear}%
         \clearfield{year}}}}}%
@@ -3245,7 +3815,7 @@ bibliography style]
       {\bibstring{in}\setunit{\addspace}}% Volume-less treatment?
       \printtext{%
         \printfield{maintitle}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[mainsubtitle]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}%
@@ -3256,7 +3826,7 @@ bibliography style]
       \setunit{\addspace}%
       \printtext{%
         \printfield{maintitle}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[mainsubtitle]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}}%
@@ -3270,7 +3840,7 @@ bibliography style]
     {\usebibmacro{cms-in:}}%
     \printtext{%
       \printfield{booktitle}%
-      \setunit{\addcolon\addspace}%
+      \setunit{\subtitlepunct}%
       \printfield[booksubtitle]{booksubtitle}}%
     \setunit{\ctitleaddonpunct}%
     \printfield{booktitleaddon}%
@@ -3285,7 +3855,7 @@ bibliography style]
     {\usebibmacro{cms-in:}% Volume-less treatment?
       \printtext{%
         \printfield{maintitle}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[mainsubtitle]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}%
@@ -3297,7 +3867,7 @@ bibliography style]
       \setunit{\addspace}%
       \printtext{%
         \printfield{maintitle}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[mainsubtitle]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}}%
@@ -3329,7 +3899,13 @@ bibliography style]
   \newunit}%
 
 \newbibmacro*{journal+issue+year+pages}{%
-  \iftoggle{cms@numbermonth}{}{\clearfield{month}}%
+  \ifboolexpr{%
+    not togl {cms@numbermonth}%
+    or
+    test {\ifcsstring{blx@dateformat@date}{year}}%
+    }%
+    {\clearfield{month}}%
+    {}%
   \usebibmacro{cjournal+ser+vol+num}%
   \setunit{\addspace}%
   \ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month}%
@@ -3349,7 +3925,13 @@ bibliography style]
   \printfield{pages}}%
 
 \newbibmacro*{periodical+issue+year+pages}{%
-  \iftoggle{cms@numbermonth}{}{\clearfield{month}}%
+  \ifboolexpr{%
+    not togl {cms@numbermonth}%
+    or
+    test {\ifcsstring{blx@dateformat@date}{year}}%
+  }%
+  {\clearfield{month}}%
+  {}%
   \usebibmacro{cperiodical+ser+vol+num}%
   \setunit{\addspace}%
   \ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month}%
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 b6b25b969a2..f0abe6ed187 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
@@ -1,11 +1,11 @@
-% $Id: chicago-authordate.cbx,v 0.8.3.13 2017/03/22 13:40:56 dfussner Exp $
+% $Id: chicago-authordate.cbx,v 0.9.1.4 2018/01/11 09:29:25 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}[2016/06/07 v 3.4 biblatex
+\ProvidesFile{chicago-authordate.cbx}[2018/01/11 v 3.10 biblatex
 citation style]
 
 \RequireCitationStyle{chicago-dates-common}
@@ -78,6 +78,21 @@ citation style]
 
 \DeclareFieldAlias[misc]{lostitle}[misc]{title}
 
+\DeclareFieldFormat[report]{title}{%
+  \iffieldequalstr{entrysubtype}{unpublished}%
+  {\mkbibquote{#1\isdot}}%
+  {\mkbibemph{#1}\isdot}}%
+
+\DeclareFieldFormat[report]{citetitle}{%
+  \iffieldequalstr{entrysubtype}{unpublished}%
+  {\mkbibquote{#1\isdot}}%
+  {\mkbibemph{#1}\isdot}}
+
+\DeclareFieldFormat[report]{lostitle}{%
+  \iffieldequalstr{entrysubtype}{unpublished}%
+  {\mkbibquote{#1\isdot}}%
+  {\mkbibemph{#1}\isdot}}
+
 \DeclareFieldFormat[review,suppperiodical]{title}{%
   \ifcapital{\MakeCapital{#1\isdot}}%
   {#1\isdot}}
@@ -124,13 +139,13 @@ citation style]
   {}%
   {\printtext[title]{%
       \printfield[tnoformat]{title}%
-      \setunit{\addcolon\addspace}%
+      \setunit{\subtitlepunct}%
       \printfield[stnoformat]{subtitle}}}}
 
 \newbibmacro*{italtitle+stitle}{%
   \printtext[title]{%
     \printfield[tnoformat]{title}%
-    \setunit{\addcolon\addspace}%
+    \setunit{\subtitlepunct}%
     \printfield[stnoformat]{subtitle}}%
   \setunit{\ptitleaddonpunct}%
   \printfield{titleaddon}%
@@ -141,10 +156,17 @@ citation style]
 \newbibmacro*{mag+news+title}{%
   \printtext[title]{%
        \printfield[noformat]{title}%
-       \setunit{\addcolon\addspace}%
+       \setunit{\subtitlepunct}%
        \printfield[noformat]{subtitle}}%
      \setunit{\ptitleaddonpunct}%\setunit{\addcomma\addspace}
-     \printfield{titleaddon}%
+     \ifboolexpr{%
+       togl {cms@related}%
+       and
+       test {\iffieldequalstr{relatedtype}{reviewof}}%
+     }%
+     {\usebibmacro{related:init}%
+       \usebibmacro{related}}%
+     {\printfield{titleaddon}}%
      }%\newcunit\newblock
 
 \newbibmacro*{issuetitle}{%
@@ -157,11 +179,30 @@ citation style]
     {}%
     \printtext[issuetitle]{%
       \printfield[itnoformat]{issuetitle}%
-      \setunit{\addcolon\addspace}%
+      \setunit{\subtitlepunct}%
       \printfield[sitnoformat]{issuesubtitle}}}}
 
 %%%% Related macros that can't reside in common.cbx %%%%
 
+\newbibmacro*{related:reviewof}[1]{%
+  \entrydata*{#1}{%
+    \let\newunit\newcunit% FIXME??
+    \iffieldundef{title}%
+    {}%
+    {\printtext[title]{%
+        \printfield[tnoformat]{title}%
+        \setunit{\subtitlepunct}%
+        \printfield[stnoformat]{subtitle}}}%
+    \newcunit%
+    \ifnameundef{author}%
+    {\newcunit%
+      \usebibmacro{byeditor+others}}%
+    {\bibstring{by}\addspace%
+      \printnames[byauthor]{author}%
+      \newcunit\usebibmacro{byeditor+others}}%
+    \setunit{\ctitleaddonpunct}%
+    \printfield{titleaddon}}}
+
 \DeclareFieldFormat{title:hook}{%
   \begingroup
   \mkrelatedstring%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.bbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.bbx
deleted file mode 100644
index 5c6563948d0..00000000000
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.bbx
+++ /dev/null
@@ -1,2614 +0,0 @@
-% $Id: chicago-authordate15.bbx,v 0.8.1.18 2014/08/14 14:11:21 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}
-[2014/08/15 v 2.9a biblatex bibliography style]
-
-%%%% Initialize and format bibliography and los %%%%
-
-\DeclareFieldFormat{shorthandwidth}{#1}
-
-\newlength{\lositemsep}
-
-\defbibenvironment{bibliography}% New for 0.9a
-  {\list
-     {}
-     {\setlength{\leftmargin}{\bibhang}%
-      \setlength{\itemindent}{-\leftmargin}%
-      \setlength{\itemsep}{\bibitemsep}%
-      \setlength{\parsep}{\bibparsep}}}
-  {\endlist}
-  {\item}
-
-\defbibenvironment{shorthands}
-  {\list
-     {\printfield[shorthandwidth]{shorthand}}%
-     {\setlength{\labelwidth}{\shorthandwidth}%
-      \setlength{\leftmargin}{\labelwidth}%
-      \setlength{\labelsep}{\biblabelsep}%
-      \addtolength{\leftmargin}{\labelsep}%
-      \setlength{\itemsep}{\lositemsep}%
-      \setlength{\parsep}{\bibparsep}%
-      \renewcommand*{\makelabel}[1]{##1\hss}}}
-  {\endlist}
-  {\item}
-
-\defbibenvironment{shorthand}
-  {\list
-     {\printfield[shorthandwidth]{shorthand}}%
-     {\setlength{\labelwidth}{\shorthandwidth}%
-      \setlength{\leftmargin}{\labelwidth}%
-      \setlength{\labelsep}{\biblabelsep}%
-      \addtolength{\leftmargin}{\labelsep}%
-      \setlength{\itemsep}{\lositemsep}%
-      \setlength{\parsep}{\bibparsep}%
-      \renewcommand*{\makelabel}[1]{##1\hss}}}
-  {\endlist}
-  {\item}
-
-\defbibenvironment{losnotes}
-  {\list
-     {\printfield[shorthandwidth]{shorthand}}%
-     {\footnotesize%
-      \setlength{\labelwidth}{\shorthandwidth}%
-      \setlength{\leftmargin}{\labelwidth}%
-      \setlength{\labelsep}{.3\biblabelsep}%
-      \addtolength{\leftmargin}{\labelsep}%
-      \setlength{\itemsep}{\lositemsep}%
-      \setlength{\parsep}{\bibparsep}%
-      \renewcommand*{\makelabel}[1]{##1\hss}}}
-  {\endlist}
-  {\item}
-
-\defbibenvironment{losendnotes}
-  {\list
-     {\printfield[shorthandwidth]{shorthand}}%
-     {\enotesize%
-      \setlength{\labelwidth}{\shorthandwidth}%
-      \setlength{\leftmargin}{\labelwidth}%
-      \setlength{\labelsep}{.3\biblabelsep}%
-      \addtolength{\leftmargin}{\labelsep}%
-      \setlength{\itemsep}{\lositemsep}%
-      \setlength{\parsep}{\bibparsep}%
-      \renewcommand*{\makelabel}[1]{##1\hss}}}
-  {\endlist\nopunct\vspace{-\baselineskip}}% Kludges for endnotes
-  {\item}
-
-\AtBeginBibliography{%
-  \togglefalse{cms@headlessnote}}%
-
-\AtEveryBibitem{%
-  \iffieldequalstr{entrytype}{patent}%
-  {\toggletrue{cms@origlabel}}%
-  {}%
-  \iffieldequalstr{pubstate}{reprint}%
-  {\toggletrue{cms@reprint}}%
-  {\togglefalse{cms@reprint}}}%
-
-\AtEveryLositem{%
-  \iffieldequalstr{pubstate}{reprint}%
-  {\toggletrue{cms@reprint}}%
-  {\togglefalse{cms@reprint}}}%
-
-\InitializeBibliographyStyle{%
-  \let\bbx@lasthash\undefined}%
-
-%%%% Bibliography-specific bibstrings %%%%
-
-%% Now in *.lbx %%
-
-%%%% Author, Editor, Translator, and Compiler  Macros %%%%
-
-\renewbibmacro*{name:last-first}[4]{%
-  \ifuseprefix
-  {\usebibmacro{name:delim}{#3#1}%
-    \usebibmacro{name:hook}{#3#1}%
-    \ifblank{#3}{}{%
-      \ifcapital
-      {\mkbibnameprefix{\MakeCapital{#3}}\isdot}
-      {\mkbibnameprefix{#3}\isdot}%
-      \ifpunctmark{'}{}{\addhighpenspace}}%
-    \mkbibnamelast{#1}\isdot
-    \ifblank{#2}{}{\addcomma\addlowpenspace\mkbibnamefirst{#2}\isdot}%
-    \ifblank{#4}{}{\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot}}
-  {\usebibmacro{name:delim}{#1}%
-    \usebibmacro{name:hook}{#1}%
-    \mkbibnamelast{#1}\isdot%
-    \ifblank{#2#3#4}{}{\addcomma}%
-    \ifblank{#2}{}{\addlowpenspace\mkbibnamefirst{#2}\isdot}%
-    \ifblank{#3}{}{\addlowpenspace\mkbibnameprefix{#3}\isdot}%
-    \ifblank{#4}{}{\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot}}}
-
-\renewbibmacro*{name:first-last}[4]{%
-  \usebibmacro{name:delim}{#2#3#1}%
-  \usebibmacro{name:hook}{#2#3#1}%
-  \ifblank{#2}{}{\mkbibnamefirst{#2}\isdot\addlowpenspace}%
-  \ifblank{#3}{}{%
-    \mkbibnameprefix{#3}\isdot
-    \ifpunctmark{'}
-    {}
-    {\ifuseprefix{\addhighpenspace}{\addlowpenspace}}}%
-  \mkbibnamelast{#1}\isdot
-  \ifblank{#4}{}{%
-    \iftoggle{cms@jrcomma}%
-    {\ifnumeral{#4}%
-      {\addlowpenspace\mkbibnameaffix{#4}\isdot}%
-      {\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot%
-        \ifboolexpr{
-          test{\ifnumless{\value{listcount}}{\value{listtotal}}}
-          and
-          test{\ifnumless{\value{listcount}}{\value{maxnames}}}
-        }
-        {\addcomma}%
-        {}}}%
-    {\addlowpenspace\mkbibnameaffix{#4}\isdot}}}
-
-\newbibmacro*{author/editors/translators}{%
-  \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}%
-    {\usebibmacro{author}}%
-    {\ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{namea}}%
-       {\usebibmacro{parteditor}}%
-       {\ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{editor}}%
-         {\usebibmacro{editor}}%
-         {\ifthenelse{\ifusetranslator\AND\NOT\ifnameundef{nameb}}%
-           {\usebibmacro{parttranslator}}%
-           {\ifthenelse{\ifusetranslator\AND\NOT\ifnameundef{translator}}%
-             {\usebibmacro{translator}}%
-             {\ifnameundef{namec}%
-               {\let\bbx@lasthash\undefined}%
-               {\usebibmacro{compiler}}}}}}}}
-
-\renewbibmacro*{author/editor}{%
-  \ifuseauthor%
-    {\usebibmacro{author}}%
-    {\ifuseeditor%
-      {\ifnameundef{namea}%
-        {\usebibmacro{moreeditor}}%
-        {\usebibmacro{parteditor}}}%
-      {\ifusetranslator%
-        {\ifnameundef{nameb}%
-          {\usebibmacro{moretranslator}}%
-          {\usebibmacro{parttranslator}}}%
-        {\iftoggle{cms@usecompiler}%
-          {\usebibmacro{compiler}}%
-          {\let\bbx@lasthash\undefined%
-            \settoggle{cms@usecompiler}{true}}}}}}
-
-\renewbibmacro*{author}{%
-  \iftoggle{cms@headlessnote}%
-  {\usebibmacro{justauthor}}%
-  {\usebibmacro{moreauthor}}}
-
-\newbibmacro*{allauthor}{%
-  \ifnameundef{author}%
-  {\ifnameundef{editor}%
-    {\ifnameundef{translator}%
-      {\ifnameundef{namec}%
-        {\let\bbx@lasthash\undefined}%
-        {\ifthenelse{\iffieldequals{namehash}{\bbx@lasthash}\AND\NOT
-            \iffirstonpage}
-               {\bibnamedash\addcomma\space}
-               {\printnames[sortname]{namec}\addcomma\space
-                 \savefield{namehash}{\bbx@lasthash}}%
-               \usebibmacro{compilestrg}}}%
-           {\ifthenelse{\iffieldequals{namehash}{\bbx@lasthash}\AND\NOT
-               \iffirstonpage}
-             {\bibnamedash\addcomma\space}
-             {\printnames[sortname]{translator}\addcomma\space
-               \savefield{namehash}{\bbx@lasthash}}%
-             \usebibmacro{transstrg}}}%
-         {\ifthenelse{\iffieldequals{namehash}{\bbx@lasthash}\AND\NOT
-             \iffirstonpage}
-           {\bibnamedash\addcomma\space}
-           {\printnames{editor}\addcomma\space
-             \savefield{namehash}{\bbx@lasthash}}%
-           \usebibmacro{editstrg}}}%
-       {\ifthenelse{\iffieldequals{namehash}{\bbx@lasthash}\AND\NOT
-           \iffirstonpage}
-         {\iffieldundef{nameaddon}%
-           {\bibnamedash\addperiod\addspace}
-           {\bibnamedash\addspace}}%
-         {\iffieldequalstr{authortype}{anon}%
-           {\bibleftbracket\printnames{author}\bibrightbracket%
-             \savefield{namehash}{\bbx@lasthash}}%
-           {\iffieldequalstr{authortype}{anon?}%
-             {\bibleftbracket\printnames{author}\addquestion\bibrightbracket%
-               \savefield{namehash}{\bbx@lasthash}}%
-             {\printnames{author}%
-             \savefield{namehash}{\bbx@lasthash}}}}}}
-
-\newbibmacro*{justauthor}{%
-  \ifnameundef{author}
-  {\let\bbx@lasthash\undefined}
-  {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-      \iffirstonpage}
-    {\iffieldundef{nameaddon}%
-      {\bibnamedash\addperiod\addspace}
-      {\bibnamedash\addspace}}
-    {\iffieldequalstr{authortype}{anon}%
-      {\bibleftbracket\printnames{author}\bibrightbracket%
-        \savefield{fullhash}{\bbx@lasthash}}%
-      {\iffieldequalstr{authortype}{anon?}%
-        {\bibleftbracket\printnames{author}\addquestion\bibrightbracket%
-          \savefield{fullhash}{\bbx@lasthash}}%
-        {\printnames{author}%
-          \savefield{fullhash}{\bbx@lasthash}}}}}}
-
-\newbibmacro*{moreauthor}{%
-  \ifnameundef{author}
-  {\usebibmacro{pickeditor}}
-  {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-      \iffirstonpage}
-    {\iffieldundef{nameaddon}%
-      {\bibnamedash\addperiod\addspace}%
-      {\bibnamedash\addspace}}%
-    {\iffieldequalstr{authortype}{anon}%
-      {\bibleftbracket\printnames{author}\bibrightbracket%
-        \savefield{fullhash}{\bbx@lasthash}}%
-      {\iffieldequalstr{authortype}{anon?}%
-        {\bibleftbracket\printnames{author}\addquestion\bibrightbracket%
-          \savefield{fullhash}{\bbx@lasthash}}%
-        {\printnames{author}%
-          \savefield{fullhash}{\bbx@lasthash}}}}}}
-
-\newbibmacro*{pickeditor}{%
-  \ifnameundef{namea}
-  {\usebibmacro{moreeditor}}%
-  {\usebibmacro{parteditor}}}
-
-\newbibmacro*{moreeditor}{%
-  \ifnameundef{editor}
-    {\usebibmacro{picktranslator}}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-                 \iffirstonpage}
-       {\bibnamedash\editordelim}%
-       {\printnames{editor}\editordelim%
-        \savefield{fullhash}{\bbx@lasthash}}%
-     \usebibmacro{editstrg}}}
-
-\renewbibmacro*{editor}{%
-  \ifnameundef{editor}
-    {\let\bbx@lasthash\undefined}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-                 \iffirstonpage}
-       {\bibnamedash\editordelim}%
-       {\printnames{editor}\editordelim%
-        \savefield{fullhash}{\bbx@lasthash}}%
-     \usebibmacro{editstrg}}}
-
-\newbibmacro*{parteditor}{%
-  \ifnameundef{namea}
-    {\let\bbx@lasthash\undefined}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-                 \iffirstonpage}
-       {\bibnamedash\addcomma\addspace}
-       {\printnames[sortname]{namea}\addcomma\space
-        \savefield{fullhash}{\bbx@lasthash}}%
-     \usebibmacro{parteditstrg}}}
-
-\newbibmacro*{picktranslator}{%
-  \ifnameundef{nameb}
-  {\usebibmacro{moretranslator}}%
-  {\usebibmacro{parttranslator}}}
-
-\newbibmacro*{moretranslator}{%
-  \ifnameundef{translator}
-    {\usebibmacro{compiler}}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-                 \iffirstonpage}
-       {\bibnamedash\addcomma\addspace}
-       {\printnames[sortname]{translator}\addcomma\space
-        \savefield{fullhash}{\bbx@lasthash}}%
-     \usebibmacro{transstrg}}}
-
-\newbibmacro*{parttranslator}{%
-  \ifnameundef{nameb}
-    {\let\bbx@lasthash\undefined}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-                 \iffirstonpage}
-       {\bibnamedash\addcomma\addspace}
-       {\printnames[sortname]{nameb}\addcomma\space
-        \savefield{fullhash}{\bbx@lasthash}}%
-     \usebibmacro{parttransstrg}}}
-
-\newbibmacro*{compiler}{%
-  \ifnameundef{namec}
-    {\let\bbx@lasthash\undefined}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-                 \iffirstonpage}
-       {\bibnamedash\addcomma\addspace}
-       {\printnames[sortname]{namec}\addcomma\space
-        \savefield{fullhash}{\bbx@lasthash}}%
-     \usebibmacro{compilestrg}}}
-
-\renewcommand*{\revsdnamedelim}{\addcomma}
-
-\DeclareNameAlias{author}{sortname}% Needed in 0.9
-\DeclareNameAlias{editor}{sortname}
-\DeclareNameAlias{translator}{sortname}
-
-%%%% Drivers for Bibliography entries and Shorthands %%%%
-
-\DeclareBibliographyDriver{shorthands}{%
-  \iftoggle{cms@los}%
-  {\ifnameundef{labelname}
-    {\mkbibemph{\bibstring{see}}%
-      \addspace%
-      \usebibmacro{shorthand:label}}%
-    {\mkbibemph{\bibstring{see}}%
-      \addspace%
-      \usebibmacro{author/editor}}%
-    \finentry}%
-  {\iftoggle{cms@fullshhand}%
-    {\usedriver{\frenchspacing}%
-      {\thefield{entrytype}}%
-      \finentry}%
-    {\ifnameundef{labelname}
-      {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT%
-          \iffieldequalstr{entrytype}{periodical}}%
-        {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}%
-            \newcunit}}%
-        {\iffieldequalstr{entrytype}{manual}%
-          {\printtext[bibhyperref]{\printlist{organization}\newcunit}}%
-          {}}}
-      {\usebibmacro{author/editor}%
-        \setunit{\addcomma\space}}%
-      \printfield[lostitle]{title}%
-      \finentry}}}
-
-\DeclareBibliographyDriver{shorthand}{%
-  \iftoggle{cms@los}%
-  {\ifnameundef{labelname}
-    {\mkbibemph{\bibstring{see}}%
-      \addspace%
-      \usebibmacro{shorthand:label}}%
-    {\mkbibemph{\bibstring{see}}%
-      \addspace%
-      \usebibmacro{author/editor}}%
-    \finentry}%
-  {\iftoggle{cms@fullshhand}%
-    {\usedriver{\frenchspacing}%
-      {\thefield{entrytype}}%
-      \finentry}%
-    {\ifnameundef{labelname}
-      {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT%
-          \iffieldequalstr{entrytype}{periodical}}%
-        {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}%
-            \newcunit}}%
-        {\iffieldequalstr{entrytype}{manual}%
-          {\printtext[bibhyperref]{\printlist{organization}\newcunit}}%
-          {}}}
-      {\usebibmacro{author/editor}%
-        \setunit{\addcomma\space}}%
-      \printfield[lostitle]{title}%
-      \finentry}}}
-
-\DeclareBibliographyDriver{article}{%
-  \iffieldequalstr{entrysubtype}{magazine}%
-  {\usebibmacro{bibindex}%
-  \usebibmacro{mag+news+author}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{cmsbibsortdate}%
-  \newunit\newblock
-  \usebibmacro{mag+news+title}%
-  \setunit{\addspace}%
-  \usebibmacro{language+transtitle}%
-  \newunit\newblock%
-  \usebibmacro{bibreprint}%
-  \newunit\newblock%
-  \usebibmacro{issuetitle}%
-  \setunit*{\addcomma\addspace}%
-  \usebibmacro{byeditor+others}%
-  \newunit\newblock
-  \printfield{note}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{mag+news+date}%
-  \newcunit\newblock
-  \usebibmacro{chap+pag}%
-  \newunit\newblock
-  \usebibmacro{pubstate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{issn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-  {\usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{cmsbibsortdate}%
-  \newunit\newblock
-  \usebibmacro{mag+news+title}%
-  \setunit{\addspace}%
-  \usebibmacro{language+transtitle}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \usebibmacro{bibreprint}%
-  \newunit\newblock
-  \usebibmacro{issuetitle}%
-  \setunit*{\addcomma\addspace}%
-  \usebibmacro{byeditor+others}%
-  \newunit\newblock
-  \printfield{note}%
-  \setunit*{\addcomma\addspace}\newblock% (changed for 0.7)??
-  \usebibmacro{journal+issue+year+pages}%
-  \newunit\newblock
-  \usebibmacro{pubstate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{issn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}}
-
-\DeclareBibliographyDriver{artwork}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{cmsbibsortdate}%
-  \newunit\newblock
-  \usebibmacro{italtitle+stitle}%
-  \newcunit\newblock
-  \usebibmacro{date}%
-  \newcunit
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \usebibmacro{byeditor+others}%
-  \newunit\newblock
-  \usebibmacro{bibreprint}%
-  \newunit\newblock
-  \printfield{howpublished}%
-  \newunit\newblock
-  \printfield{type}%
-  \newcunit\newblock
-  \printfield{version}%
-  \newcunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{institution+organization}%
-  \setunit*{\addcomma\addspace}\newblock
-  \printlist{location}%
-  \newunit\newblock
-  \usebibmacro{pubstate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{audio}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{cmsbibsortdate}%
-  \newunit\newblock
-  \usebibmacro{italtitle+stitle}%
-  \newcunit\newblock
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \usebibmacro{part+editor+translator}%
-  \newcunit%\setunit{\addperiod\addspace}%
-  \usebibmacro{chapinscore}%
-  \usebibmacro{btitle+bstitle}%
-  \iffieldundef{booktitle}
-  {\setunit{\addperiod\addspace}}% Fix customc?
-  {\setunit{\addcomma\addspace}}%
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}
-    \clearfield{volumes}}%
-  \newunit% unit, not cunit?
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{byeditor+others}%
-  \newunit% ??? Editorpunct maybe not right here?
-  \iffieldundef{maintitle}
-  {}
-  {\iffieldundef{volume}
-    {\usebibmacro{cms-in:}%
-      \printtext{%
-        \printfield{maintitle}%
-        \setunit{\addcolon\addspace}%
-        \printfield[maintitle]{mainsubtitle}}%
-      \newcunit
-      \printfield{maintitleaddon}}
-    {\printfield{volume}%
-      \printfield{part}%
-      \setunit{\addspace}
-      \bibstring{ofseries}%
-      \setunit{\addspace}
-      \printtext{%
-        \printfield{maintitle}%
-        \setunit{\addcolon\addspace}%
-        \printfield[maintitle]{mainsubtitle}}%
-      \newcunit
-      \printfield{maintitleaddon}}}
-  \newcunit\newblock
-  \printfield{pages}%
-  \newunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-  \printfield{volumes}%
-  \newunit\newblock
-  \usebibmacro{ser+num}%
-  \newunit\newblock
-  \usebibmacro{origpubl+loc+year}% from 16th ed.
-  \newunit\newblock
-  \usebibmacro{bibreprint}%\printorigdate%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{publ+loc+year}%
-  \newunit
-  \printfield{type}%
-  \newunit\newblock
-  \usebibmacro{pubstate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{isan}%
-    \setunit*{\addcomma\addspace}\newblock%
-    \printfield{ismn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}%
-
-\DeclareBibliographyDriver{book}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{cmsbibsortdate}%
-  \newunit\newblock
-  \usebibmacro{italtitle+stitle}%
-  \newunit\newblock
-  \iffieldundef{maintitle}%
-  {\iffieldundef{edition}%
-    {}%
-    {\usebibmacro{edition}%
-      \newunit
-      \printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}%
-      \newunit
-      \printfield{volumes}%
-      \clearfield{volumes}}}%
-  {}%
-  \newcunit\newblock
-  \usebibmacro{byauthor}
-  \newunit\newblock
-  \usebibmacro{part+editor+translator}%
-  \newunit\newblock
-  \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
-  \newcunit
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}%
-    \clearfield{volumes}}%
-  \usebibmacro{editorpunct}%
-  \usebibmacro{byeditor+others}%
-  \usebibmacro{editorpunct}%
-  \iftoggle{cms@bookpages}%
-  {}%
-  {\clearfield{pages}}%
-  \usebibmacro{chap+pag}%
-  \newunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-  \printfield{volumes}%
-  \newunit\newblock
-  \usebibmacro{ser+num}%
-  \newunit\newblock
-  \usebibmacro{origpubl+loc+year}% from 16th ed.
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{bibreprint}%
-  \newunit\newblock
-  \usebibmacro{publ+loc+year}%
-  \newcunit\newblock
-  \printlist[][-\value{listtotal}]{lista}%
-  \newunit\newblock
-  \usebibmacro{pubstate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{bookinbook}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{cmsbibsortdate}%
-  \newunit\newblock
-  \usebibmacro{italtitle+stitle}%
-  \newunit\newblock
-  \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}%
-  {\iffieldundef{edition}%
-    {}%
-    {\usebibmacro{edition}%
-      \newunit
-      \printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}%
-      \newunit
-      \printfield{volumes}%
-      \clearfield{volumes}}}%
-  {}%
-  \newcunit\newblock
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \usebibmacro{part+editor+translator}%
-  \setunit*{\addperiod\addspace}%
-  \usebibmacro{cms-in:}%
-  \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
-  \newcunit
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}%
-    \clearfield{volumes}}%
-  \newcunit
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{editorpunct}
-  \usebibmacro{byeditor+others}%
-  \newcunit\newblock
-  \usebibmacro{chap+pag}%
-  \newunit\newblock
-  \printfield{edition}%
-  \newunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-  \printfield{volumes}%
-  \newunit\newblock
-  \usebibmacro{ser+num}%
-  \newunit\newblock
-  \usebibmacro{origpubl+loc+year}% from 16th ed.
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{bibreprint}%
-  \newunit\newblock
-  \usebibmacro{publ+loc+year}%
-  \newunit\newblock
-  \usebibmacro{pubstate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{booklet}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{cmsbibsortdate}%
-  \newunit\newblock
-  \usebibmacro{italtitle+stitle}%
-  \newcunit\newblock
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{bibreprint}%
-  \newunit\newblock
-  \usebibmacro{howpubl+loc+year}%
-  \newunit\newblock
-  \usebibmacro{chap+pag}%
-  \newunit\newblock
-  \usebibmacro{pubstate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{collection}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{cmsbibsortdate}%
-  \newunit\newblock
-  \usebibmacro{italtitle+stitle}%
-  \newunit\newblock
-  \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
-  \usebibmacro{editorpunct}%
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \usebibmacro{editorpunct}%
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \usebibmacro{editorpunct}%
-    \printfield{volumes}%
-    \clearfield{volumes}}%
-  \usebibmacro{editorpunct}%
-  \usebibmacro{bytranslator+others}%
-  \newunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-  \printfield{volumes}%
-  \newunit\newblock
-  \usebibmacro{ser+num}%
-  \newunit\newblock
-  \usebibmacro{origpubl+loc+year}% from 16th ed.
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{bibreprint}%
-  \newunit\newblock
-  \usebibmacro{publ+loc+year}%
-  \newunit\newblock
-  \usebibmacro{pubstate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{customc}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \newunit\newblock
-  \printfield{nameaddon}%
-  \setunit*{\addspace}%
-  \usebibmacro{italtitle+stitle}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{image}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{cmsbibsortdate}%
-  \newunit\newblock
-  \usebibmacro{italtitle+stitle}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{date}%
-  \newcunit
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \usebibmacro{byeditor+others}%
-  \newunit\newblock
-  \usebibmacro{bibreprint}%
-  \newunit\newblock
-  \printfield{howpublished}%
-  \newunit\newblock
-  \printfield{type}%
-  \newcunit\newblock
-  \printfield{version}%
-  \newcunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{institution+organization}%
-  \setunit*{\addcomma\addspace}\newblock
-  \printlist{location}%
-  \newunit\newblock
-  \usebibmacro{pubstate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{inbook}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{cmsbibsortdate}%
-  \newunit\newblock
-  \usebibmacro{italtitle+stitle}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{byauthor}%
-  \setunit{\addperiod\addspace}%
-  \usebibmacro{part+editor+translator}%
-  \setunit{\addperiod\addspace}%
-  \usebibmacro{chapincoll}%
-  \usebibmacro{cms-in:}%
-  \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
-  \newcunit
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}
-    \clearfield{volumes}}%
-  \newcunit
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{byeditor+others}%
-  \newcunit\newblock
-  \printfield{pages}%
-  \newunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-  \printfield{volumes}%
-  \newunit\newblock
-  \usebibmacro{ser+num}%
-  \newunit\newblock
-  \usebibmacro{origpubl+loc+year}% from 16th ed.
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{bibreprint}%
-  \newunit\newblock
-  \usebibmacro{publ+loc+year}%
-  \newunit\newblock
-  \usebibmacro{pubstate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}%
-
-\DeclareBibliographyDriver{incollection}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{cmsbibsortdate}%
-  \newunit\newblock
-  \usebibmacro{italtitle+stitle}% All italtitle now?
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{byauthor}%
-  \setunit{\addperiod\addspace}%
-  \usebibmacro{part+editor+translator}%
-  \iffieldundef{crossref}%
-  {\iffieldundef{xref}%
-  {\setunit{\addperiod\addspace}% Moved here.
-  \usebibmacro{chapincoll}%
-  \usebibmacro{cms-in:}%
-  \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
-  \newcunit
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}
-    \clearfield{volumes}}%
-  \newcunit
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{byeditor+others}%
-  \newcunit\newblock
-  \printfield{pages}%
-  \newunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-  \printfield{volumes}%
-  \newunit\newblock
-  \usebibmacro{ser+num}%
-  \newunit\newblock
-  \usebibmacro{origpubl+loc+year}% from 16th ed.
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{bibreprint}%
-  \newunit\newblock
-  \usebibmacro{publ+loc+year}%
-  \newunit\newblock
-  \usebibmacro{pubstate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
-  \bibxrefcite{\thefield{xref}}
-  \usebibmacro{bibpostxref}%
-  \usebibmacro{finentry}}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
-  \bibxrefcite{\thefield{crossref}}%
-  \usebibmacro{bibpostxref}%
-  \usebibmacro{finentry}}}
-
-\DeclareBibliographyDriver{inproceedings}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{cmsbibsortdate}%
-  \newunit\newblock
-  \usebibmacro{italtitle+stitle}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{byauthor}%
-  \setunit{\addperiod\addspace}%
-  \usebibmacro{part+editor+translator}%
-  \iffieldundef{crossref}%
-  {\iffieldundef{xref}%
-  {\setunit{\addperiod\addspace}%
-    \usebibmacro{chapincoll}%
-    \usebibmacro{cms-in:}%
-  \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
-  \newcunit\newblock
-  \usebibmacro{byeditor+others}%
-  \newcunit\newblock
-  \printfield{pages}%
-  \newunit\newblock
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-  \printfield{volumes}%
-  \newunit\newblock
-  \usebibmacro{ser+num}%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{bibreprint}%
-  \newunit\newblock
-  \usebibmacro{org+publ+loc+year}%
-  \newunit\newblock
-  \usebibmacro{pubstate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
-  \bibxrefcite{\thefield{xref}}
-  \usebibmacro{bibpostxref}%
-  \usebibmacro{finentry}}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
-  \bibxrefcite{\thefield{crossref}}%
-  \usebibmacro{bibpostxref}%
-  \usebibmacro{finentry}}}
-
-\DeclareBibliographyDriver{inreference}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{reference+title}%{italtitle+stitle}
-  \newunit\newblock
-  \usebibmacro{cmsbibsortdate}%
-  \newunit\newblock
-  \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}%
-  {\iffieldundef{edition}%
-    {}%
-    {\usebibmacro{edition}%
-      \newunit
-      \printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}%
-      \newunit
-      \printfield{volumes}%
-      \clearfield{volumes}}}%
-  {}%
-  \newunit\newblock
-  \usebibmacro{part+editor+translator}%
-  \setunit*{\addperiod\addspace}% need asterisk?
-  \usebibmacro{alt-in:}%
-  \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
-  \newcunit
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}%
-    \clearfield{volumes}}%
-  \newcunit
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{editorpunct}
-  \usebibmacro{byeditor+others}%
-  \newcunit\newblock
-  \usebibmacro{chap+pag}%
-  \newunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-  \printfield{volumes}%
-  \newunit\newblock
-  \usebibmacro{ser+num}%
-  \newunit\newblock
-  \usebibmacro{origpubl+loc+year}% from 16th ed.
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{bibreprint}%
-  \newunit\newblock
-  \usebibmacro{publ+loc+year}%
-  \newcunit\newblock
-  \printlist[][-\value{listtotal}]{lista}%
-  \setunit{\addspace}%
-  \ifnameundef{author}%
-  {}%
-  {\printtext[parens]{%
-      \bibstring{by}%
-      \addspace%
-      \printnames[byauthor]{author}}}%
-  \newunit\newblock
-  \usebibmacro{pubstate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{letter}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{cmsbibsortdate}%
-  \newunit\newblock
-  \printtext[title]{%
-    \printfield[noformat]{title}}%
-  \newcunit\newblock%
-  \printfield{titleaddon}%
-  \setunit*{\addcomma\addspace}%
-  \usebibmacro{letter+date}%
-  \setunit{\addspace}%
-  \usebibmacro{language+transtitle}%
-  \newunit\newblock%\bibsentence
-  \usebibmacro{part+editor+translator}%
-  \setunit*{\addperiod\addspace}%
-  \iffieldundef{crossref}%
-  {\iffieldundef{xref}%
-  {\usebibmacro{chapincoll}%
-  \usebibmacro{cms-in:}%
-  \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
-  \newcunit
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}
-    \clearfield{volumes}}%
-  \newcunit
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{byeditor+others}%
-  \newcunit\newblock
-  \printfield{pages}%
-  \newunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-  \printfield{volumes}%
-  \newunit\newblock
-  \usebibmacro{ser+num}%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{bibreprint}%
-  \newunit\newblock
-  \usebibmacro{publ+loc+year}%
-  \newunit\newblock
-  \usebibmacro{pubstate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}%
-{\ifpunctmark{*}% Attempt to fix issues with n.d. Changed for 0.9.
-  {\setunit{\nopunct\addspace\bibsentence}}%
-  {}%
-  \bibxrefcite{\thefield{xref}}
-  \usebibmacro{bibpostxref}%
-  \usebibmacro{finentry}}}%
-{\ifpunctmark{*}% Likewise.
-  {\setunit{\nopunct\addspace\bibsentence}}%
-  {}%
-  \bibxrefcite{\thefield{crossref}}%
-  \usebibmacro{bibpostxref}%
-  \usebibmacro{finentry}}}
-
-\DeclareBibliographyDriver{manual}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author+org}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{cmsbibsortdate}%
-  \newunit\newblock
-  \usebibmacro{italtitle+stitle}%
-  \newunit\newblock
-  \usebibmacro{edition}%
-  \newcunit
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \usebibmacro{ser+num}%
-  \newunit\newblock
-  \printfield{type}%
-  \newunit
-  \printfield{note}%
-  \newunit\newblock%
-  \usebibmacro{bibreprint}%
-  \newunit\newblock
-  \usebibmacro{org+publ+loc+year}%
-  \newunit\newblock
-  \usebibmacro{pubstate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{misc}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{cmsbibsortdate}%
-  \newunit\newblock
-  \iffieldundef{entrysubtype}%
-  {\usebibmacro{italtitle+stitle}}%
-  {\printfield{title}%
-    \setunit{\addcolon\addspace}%
-    \printfield[noformat]{subtitle}%
-    \newcunit\newblock%
-    \printfield{titleaddon}%
-    \setunit{\addspace}%
-    \usebibmacro{language+transtitle}%
-    \newcunit\newblock%
-    \usebibmacro{unpubl+letter+date}}%
-  \newcunit%
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \usebibmacro{byeditor+others}%
-  \newunit\newblock
-  \usebibmacro{bibreprint}%
-  \newunit\newblock
-  \printfield{howpublished}%
-  \newunit\newblock
-  \printfield{type}%
-  \newunit\newblock
-  \printfield{version}%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{institution+organization}%
-  \setunit*{\addcomma\addspace}\newblock
-  \printlist{location}%
-  \iffieldundef{entrysubtype}%
-  {\newcunit\newblock%
-    \usebibmacro{date}}%
-  {}%
-  \newunit\newblock
-  \usebibmacro{pubstate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{music}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{cmsbibsortdate}%
-  \newunit\newblock
-  \usebibmacro{italtitle+stitle}%
-  \newcunit%
-  \usebibmacro{byauthor}%
-  \setunit*{\addperiod\addspace}%
-  \printeventdate%
-  \newunit\newblock
-  \usebibmacro{part+editor+translator}%
-  \newunit\newblock
-  \usebibmacro{chapinscore}%
-  \usebibmacro{btitle+bstitle}%
-  \iffieldundef{booktitle}
-  {\newunit}% Fix customc?
-  {\newcunit}%
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}
-    \clearfield{volumes}}%
-  \newunit% unit, not cunit?
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{byeditor+others}%
-  \newunit% ??? Editorpunct maybe not right here?
-  \iffieldundef{maintitle}
-  {}
-  {\iffieldundef{volume}
-    {\usebibmacro{cms-in:}%
-      \printtext{%
-        \printfield{maintitle}%
-        \setunit{\addcolon\addspace}%
-        \printfield[maintitle]{mainsubtitle}}%
-      \newcunit
-      \printfield{maintitleaddon}}
-    {\printfield{volume}%
-      \printfield{part}%
-      \setunit{\addspace}
-      \bibstring{ofseries}%
-      \setunit{\addspace}
-      \printtext{%
-        \printfield{maintitle}%
-        \setunit{\addcolon\addspace}%
-        \printfield[maintitle]{mainsubtitle}}%
-      \newcunit
-      \printfield{maintitleaddon}}}
-  \newcunit\newblock
-  \printfield{pages}%
-  \newunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-  \printfield{volumes}%
-  \newunit\newblock
-  \printfield{version}%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{music+ser+num}%
-  \newunit
-  \usebibmacro{music+publisher}%
-%  \setunit*{\addspace}%\newblock
-  \usebibmacro{date}%
-  \setunit{\ifthenelse{\iffieldundef{howpublished}\AND%
-      \iffieldundef{pubstate}}%
-    {\newunit}{\space\bibstring{by}\space}}%
-  \printlist{publisher}%
-  \newunit
-  \usebibmacro{institution+organization}%
-  \setunit*{\addcomma\addspace}\newblock
-  \printlist{location}%
-  \newunit\newblock
-  \printfield{type}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{iswc}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{online}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{cmsbibsortdate}%
-  \newunit\newblock
-  \usebibmacro{italtitle+stitle}%
-  \newcunit%
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{bibreprint}%
-  \newunit\newblock
-  \printlist{organization}%
-  \newunit\newblock
-  \usebibmacro{date}%
-  \newunit\newblock
-  \iftoggle{cms@doi}%
-  {\printfield{doi}}%
-  {}%
-  \newunit\newblock
-  \usebibmacro{eprint}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
-  \newunit\newblock
-  \usebibmacro{pubstate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{patent}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author+holder}% + holder?
-  \newunit\newblock
-  \usebibmacro{cmscitesortdate}%
-  \newunit\newblock
-  \usebibmacro{italtitle+stitle}%{title}?
-  \setunit{\addperiod\addspace}%
-  \printfield{note}%
-  \setunit{\addperiod\addspace}%
-  \usebibmacro{bibreprint}%
-  \newunit\newblock
-  \printfield{type}%
-  \setunit{\addspace}%
-  \printfield{number}%
-  \iflistundef{location}
-    {}
-    {\setunit*{\addspace}%
-     \printtext[parens]{%
-       \printlist[][-\value{listtotal}]{location}}}%
-  \newcunit\newblock
-  \printfield{version}%
-  \newcunit\newblock
-  \iftoggle{cms@switchdates}%
-  {\bibstring{patentfiled}%
-    \setunit{\addspace}%
-    \printdate%
-    \setunit{\addcomma\addspace}%
-    \bibstring{and}%
-    \addspace\bibstring{patentissued}\addspace%
-    \printorigdate}%
-  {\iffieldundef{origyear}%
-    {\iffieldundef{year}%
-      {}%
-      {\bibstring{patentfiled}\setunit{\addspace}%
-        \printdate}}%
-    {\bibstring{patentfiled}\setunit{\addspace}%
-      \printorigdate%\usebibmacro{date}%
-      \setunit{\addcomma\addspace\bibstring{and}%
-        \addspace\bibstring{patentissued}\addspace}%
-      \usebibmacro{date}}}%
-  \newcunit\newblock
-  \printfield{addendum}%
-  \newunit\newblock
-  \usebibmacro{pubstate}%
-  \newunit\newblock
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{periodical}{%
-  \iffieldequalstr{entrysubtype}{magazine}%
-  {\usebibmacro{bibindex}%
-  \usebibmacro{editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \ifundef\bbx@lasthash{%
-  \printtext[title]{% magazine subtype
-    \printfield[noformat]{title}%
-    \setunit{\addcolon\addspace}%
-    \printfield[noformat]{subtitle}}%
-  \setunit*{\addspace}%
-  \printlist[periodplace]{location}%
-  \clearlist{location}%
-  \clearfield{title}%
-  \clearfield{subtitle}%
-  \newunit\newblock}{}%
-  \usebibmacro{cmsbibsortdate}%
-  \newunit\newblock
-  \usebibmacro{issuetitle}%
-  \setunit{\addspace}%
-  \usebibmacro{language+transtitle}%
-  \newunit\newblock%
-  \usebibmacro{byeditor+others}%
-  \newunit\newblock
-  \usebibmacro{bibreprint}%
-  \newunit\newblock
-  \printfield{note}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{periodical+date+issue}%
-  \newcunit\newblock
-  \usebibmacro{chap+pag}%
-  \newunit\newblock
-  \usebibmacro{pubstate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{issn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-  {\usebibmacro{bibindex}%
-  \usebibmacro{editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \ifundef\bbx@lasthash{%
-  \printtext[title]{% magazine subtype
-    \printfield[noformat]{title}%
-    \setunit{\addcolon\addspace}%
-    \printfield[noformat]{subtitle}}%
-  \setunit*{\addspace}%
-  \printlist[periodplace]{location}%
-  \clearlist{location}%
-  \clearfield{title}%
-  \clearfield{subtitle}%
-  \newunit\newblock}{}%
-  \usebibmacro{cmsbibsortdate}%
-  \newunit\newblock
-  \usebibmacro{issuetitle}%
-  \setunit{\addspace}%
-  \usebibmacro{language+transtitle}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \usebibmacro{byeditor+others}%
-  \newunit\newblock
-  \usebibmacro{bibreprint}%
-  \newunit\newblock
-  \printfield{note}%
-  \setunit*{\addcomma\addspace}\newblock% (changed for 0.7)??
-  \usebibmacro{periodical+issue+year+pages}%
-  \newunit\newblock
-  \usebibmacro{pubstate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{issn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}}
-
-\DeclareBibliographyDriver{proceedings}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{cmsbibsortdate}%
-  \newunit\newblock
-  \usebibmacro{italtitle+stitle}%
-  \newunit\newblock
-  \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
-  \usebibmacro{editorpunct}%
-  \usebibmacro{bytranslator+others}%
-  \newunit\newblock
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-  \printfield{volumes}%
-  \newunit\newblock
-  \usebibmacro{ser+num}%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{bibreprint}%
-  \newunit\newblock
-  \usebibmacro{org+publ+loc+year}%
-  \newunit\newblock
-  \usebibmacro{pubstate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{reference}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{reference+title}%{italtitle+stitle}
-  \newunit\newblock
-  \usebibmacro{cmsbibsortdate}%
-  \newunit\newblock
-  \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}%
-  {\iffieldundef{edition}%
-    {}%
-    {\usebibmacro{edition}%
-      \newunit
-      \printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}%
-      \newunit
-      \printfield{volumes}%
-      \clearfield{volumes}}}%
-  {}%
-  \newunit\newblock
-  \usebibmacro{part+editor+translator}%
-  \setunit*{\addperiod\addspace}% need asterisk?
-  \usebibmacro{alt-in:}%
-  \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
-  \newcunit
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}%
-    \clearfield{volumes}}%
-  \newcunit
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{editorpunct}
-  \usebibmacro{byeditor+others}%
-  \newcunit\newblock
-  \usebibmacro{chap+pag}%
-  \newunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-  \printfield{volumes}%
-  \newunit\newblock
-  \usebibmacro{ser+num}%
-  \newunit\newblock
-  \usebibmacro{origpubl+loc+year}% from 16th ed.
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{bibreprint}%
-  \newunit\newblock
-  \usebibmacro{publ+loc+year}%
-  \newunit\newblock
-  \usebibmacro{pubstate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{report}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{cmsbibsortdate}%
-  \newunit\newblock
-  \usebibmacro{italtitle+stitle}%
-  \newcunit
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \usebibmacro{ser+num}%
-  \newunit\newblock
-  \printfield{type}%
-  \newunit
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{bibreprint}%
-  \newunit\newblock
-  \usebibmacro{inst+loc+year}%
-  \newunit\newblock
-  \usebibmacro{pubstate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{isrn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{review}{%
-  \usebibmacro{bibindex}%
-  \iffieldequalstr{entrysubtype}{magazine}%
-  {\usebibmacro{mag+news+author}}%
-  {\usebibmacro{author/editor}}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{cmsbibsortdate}%
-  \newunit\newblock
-  \printfield{title}%
-  \setunit{\addcolon\addspace}%
-  \printfield[noformat]{subtitle}%
-  \setunit{\addspace}%
-  \printfield{titleaddon}%
-  \setunit{\addspace}%
-  \usebibmacro{language+transtitle}%
-  \newunit\newblock%
-  \usebibmacro{bibreprint}%
-  \newunit\newblock
-  \usebibmacro{issuetitle}%
-  \setunit*{\addcomma\addspace}%
-  \usebibmacro{byeditor+others}%
-  \newunit\newblock
-  \printfield{note}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iffieldequalstr{entrysubtype}{magazine}
-  {\usebibmacro{mag+news+date}%
-  \newcunit\newblock
-  \usebibmacro{chap+pag}}%
-  {\usebibmacro{journal+issue+year+pages}}%
-  \newunit\newblock
-  \usebibmacro{pubstate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{issn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{suppbook}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{cmsbibsortdate}%
-  \newunit\newblock
-  \usebibmacro{inforaft}%
-  \setunit{\addspace}\newblock
-  \usebibmacro{italtitle+stitle}%
-  \newunit
-  \iffieldundef{maintitle}%
-  {\iffieldundef{edition}%
-    {}%
-    {\usebibmacro{edition}%
-      \newunit
-      \printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}%
-      \newunit
-      \printfield{volumes}%
-      \clearfield{volumes}}}%
-  {}%
-  \newcunit
-  \usebibmacro{bybookauthor}%
-  \newunit\newblock
-  \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
-  \newcunit%
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}
-    \clearfield{volumes}}%
-  \usebibmacro{editorpunct}%
-  \usebibmacro{byeditor+others}%
-  \newcunit\newblock% \usebibmacro{editorpunct}
-  \usebibmacro{chap+pag}%
-  \newunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-  \printfield{volumes}%
-  \newunit\newblock
-  \usebibmacro{ser+num}%
-  \newunit\newblock
-  \usebibmacro{origpubl+loc+year}% from 16th ed.
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{bibreprint}%
-  \newunit\newblock
-  \usebibmacro{publ+loc+year}%
-  \newunit\newblock
-  \usebibmacro{pubstate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyAlias{suppcollection}{suppbook}
-
-\DeclareBibliographyAlias{suppperiodical}{review}
-
-\DeclareBibliographyDriver{thesis}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{cmsbibsortdate}%
-  \newunit\newblock
-  \usebibmacro{italtitle+stitle}%
-  \newcunit%
-  \usebibmacro{byauthor}%
-  \setunit{\addperiod\addspace}%
-  \printfield{note}%
-  \setunit{\addperiod\addspace}\newblock%
-  \usebibmacro{bibreprint}%
-  \newunit\newblock
-  \usebibmacro{type+inst+year}%
-  \newunit\newblock
-  \usebibmacro{pubstate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{unpublished}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{cmsbibsortdate}%
-  \newunit\newblock
-  \usebibmacro{italtitle+stitle}%
-  \newcunit%usebibmacro{byauthorpunct}% Why does this work?  No idea.
-  \usebibmacro{byauthor}% Same in thesis type, as well.
-  \setunit{\addperiod\addspace}%
-  \usebibmacro{bibreprint}%
-  \newunit\newblock
-  \printfield{howpublished}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{note}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printlist{location}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{date}%
-  \newunit\newblock
-  \usebibmacro{pubstate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@url}
-  {\usebibmacro{url+date}}%
-  {}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{video}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{cmsbibsortdate}%
-  \newunit\newblock
-  \printtext{%
-    \printfield{title}%
-    \setunit{\addcolon\addspace}%
-    \printfield[title]{subtitle}}%
-  \iffieldundef{booktitle}% Comma after italics, period after quotes
-  {\newcunit}
-  {\newunit}%\setunit{\addspace}\newblock%
-  \printfield{titleaddon}%\usebibmacro{title+stitle}%
-  \setunit{\addspace}\newblock%\bibsentence
-  \usebibmacro{language+transtitle}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{byauthor}%
-  \setunit{\addperiod\addspace}%
-  \usebibmacro{part+editor+translator}%
-  \setunit{\addperiod\addspace}%
-  \usebibmacro{chapinscore}%
-  \usebibmacro{btitle+bstitle}%
-  \iffieldundef{booktitle}
-  {\setunit{\addperiod\addspace}}% Fix customc?
-  {\setunit{\addcomma\addspace}}%
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}
-    \clearfield{volumes}}%
-  \newunit
-  \printfield{type}%
-  \newunit% unit, not cunit?
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{byeditor+others}%
-  \newunit% ??? Editorpunct maybe not right here?
-  \iffieldundef{maintitle}
-  {}
-  {\iffieldundef{volume}
-    {\usebibmacro{cms-in:}%
-      \printtext{%
-        \printfield{maintitle}%
-        \setunit{\addcolon\addspace}%
-        \printfield[maintitle]{mainsubtitle}}%
-      \newcunit
-      \printfield{maintitleaddon}}
-    {\printfield{volume}%
-      \printfield{part}%
-      \setunit{\addspace}
-      \bibstring{ofseries}%
-      \setunit{\addspace}
-      \printtext{%
-        \printfield{maintitle}%
-        \setunit{\addcolon\addspace}%
-        \printfield[maintitle]{mainsubtitle}}%
-      \newcunit
-      \printfield{maintitleaddon}}}
-  \newcunit\newblock
-  \printfield{pages}%
-  \newunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-  \printfield{volumes}%
-  \newunit\newblock
-  \usebibmacro{ser+num}%
-  \newunit\newblock
-  \usebibmacro{origpubl+loc+year}% from 16th ed.
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{publ+loc+year}%
-  \newunit\newblock
-  \usebibmacro{pubstate}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{isan}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}%
-
-%%%% Other Formatting Macros %%%%
-
-\newbibmacro*{bib+doi+url}{% For biblatex field exclusion
-  \iftoggle{cms@doi}%
-  {\printfield{doi}}%
-  {}%
-  \newunit\newblock
-  \iftoggle{cms@eprint}%
-  {\usebibmacro{eprint}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@url}%
-  {\usebibmacro{url+date}}%
-  {}}
-
-\newbibmacro*{shorthand:label}{% Test this
-  \iffieldequalstr{entrysubtype}{magazine}% Simplifies .bib creation
-    {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}}}%
-    {\iffieldequalstr{entrytype}{manual}%
-      {\printtext[bibhyperref]{\printlist{organization}}}%
-      {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}}}%
-
-\newbibmacro*{labelyear+extrayear}{%
-  \ifthenelse{\iffieldundef{labelyear}\OR%
-    \iffieldequalstr{labelyear}{nodate}}%
-    {\ifboolexpr{
-        test {\iffieldequalstr{entrytype}{misc}}
-        or
-        test {\iffieldequalstr{entrytype}{inreference}}
-        or
-        test {\iffieldequalstr{entrytype}{reference}}
-        or
-        not togl {cms@nodates}}%
-      {}%
-      {\bibstring{nodate}}}%
-    {\iffieldundef{year}%
-      {\iffieldundef{eventyear}
-        {\iffieldundef{origyear}%
-          {\printfield{labelyear}%
-            \iffieldundef{extrayear}%
-            {}%
-            {\setunit*{}%
-              \printfield{extrayear}}%
-            \iffieldundef{urlendyear}%
-            {\clearfield{urlyear}}%
-            {\ifboolexpr{
-                test {\iffieldequalstr{urlendyear}{}}%
-                and
-                not togl {cms@datedash}%
-              }
-              {\mbox{\bibdatedash}%
-                \clearfield{urlyear}}%
-              {\iffieldundef{urlmonth}%
-                {\clearfield{urlyear}}%
-                {\iffieldsequal{urlyear}{urlendyear}%
-                  {\clearfield{urlyear}\clearfield{urlendyear}}%
-                  {}}}}}%
-          {\printfield{labelyear}%
-            \iffieldundef{extrayear}%
-            {}%
-            {\setunit*{}%
-              \printfield{extrayear}}%
-            \iffieldundef{origendyear}%
-            {\clearfield{origyear}}%
-            {\ifboolexpr{
-                test {\iffieldequalstr{origendyear}{}}%
-                and
-                not togl {cms@datedash}%
-              }
-              {\mbox{\bibdatedash}%
-                \clearfield{origyear}}%
-              {\iffieldundef{origmonth}%
-                {\clearfield{origyear}}%
-                {\iffieldsequal{origyear}{origendyear}%
-                  {\clearfield{origyear}\clearfield{origendyear}}%
-                  {}}}}}}%
-        {\printfield{labelyear}%
-          \iffieldundef{extrayear}%
-          {}%
-          {\setunit*{}%
-            \printfield{extrayear}}%
-          \iffieldundef{eventendyear}%
-          {\clearfield{eventyear}}%
-          {\ifboolexpr{
-              test {\iffieldequalstr{eventendyear}{}}%
-              and
-              not togl {cms@datedash}%
-            }
-            {\mbox{\bibdatedash}%
-              \clearfield{eventyear}}%
-            {\iffieldundef{eventmonth}%
-              {\clearfield{eventyear}}%
-              {\iffieldsequal{eventyear}{eventendyear}%
-                {\clearfield{eventyear}{eventendyear}}%
-                {}}}}}}%
-      {\printfield{labelyear}%
-        \iffieldundef{extrayear}%
-        {}%
-        {\setunit*{}%
-          \printfield{extrayear}}%
-        \iffieldundef{endyear}% DATE FIX
-        {\clearfield{year}}%
-        {\ifboolexpr{
-            test {\iffieldequalstr{endyear}{}}%
-            and
-            not togl {cms@datedash}%
-          }
-          {\mbox{\bibdatedash}%
-            \clearfield{year}}%
-          {\iffieldundef{month}%
-            {\clearfield{year}}%
-            {\iffieldsequal{year}{endyear}%
-              {\clearfield{year}\clearfield{endyear}}%
-              {}}}}}}}%
-
-\newbibmacro*{cmsbibsortdate}{% Attempt to solve date-related problems
-  \ifboolexpr{%
-    test {\iffieldundef{origyear}}
-    or
-    not test {\iffieldint{origyear}}
-  }%
-  {\usebibmacro{cmsbibyear}}%
-  {\iffieldint{year}%
-    {\ifboolexpr{% Needed for date ranges - video type, esp.
-        test {\iffieldundef{endyear}}%
-        or
-        not test {\iffieldnum{endyear}}
-      }%
-      {\ifthenelse{\thefield{origyear}>\thefield{year}}%
-        {\toggletrue{cms@switchdates}%
-          \usebibmacro{cmsbibyear}}%
-        {\usebibmacro{cmsbibyear}}}%
-      {\ifthenelse{\thefield{origyear}>\thefield{endyear}}%
-        {\toggletrue{cms@switchdates}%
-          \usebibmacro{cmsbibyear}}%
-        {\usebibmacro{cmsbibyear}}}}%
-    {\usebibmacro{cmsbibyear}}}}
-
-\newbibmacro*{cmsbibyear}{%
-  \iftoggle{cms@origlabel}%
-  {\usebibmacro{origyear+labelyear}}%
-  {\iftoggle{cms@bothlabelnew}%
-    {\usebibmacro{bothyear+newstyle}}%
-    {\iftoggle{cms@bothlabelold}%
-      {\usebibmacro{bothyear+oldstyle}}%
-      {\usebibmacro{labelyear+extrayear}}}}%
-  \ifcsdef{@cms@tempdate}%
-  {\toggletrue{\@cms@tempdate}}%
-  {}}
-
-\newbibmacro*{origyear+labelyear}{%
-  \iftoggle{cms@switchdates}%
-  {\usebibmacro{labelyear+extrayear}%
-    \iffieldundef{endyear}% DATE FIX
-    {\clearfield{year}}%
-    {}}%
-  {\iffieldundef{origyear}
-    {\usebibmacro{labelyear+extrayear}}%
-    {\printtext{%
-        \printfield{origyear}}%
-      \iffieldundef{origendyear}% DATE FIX
-      {\clearfield{origyear}}%
-      {}}}}
-
-\newbibmacro*{bothyear+newstyle}{%
-  \iftoggle{cms@switchdates}%
-  {\usebibmacro{labelyear+extrayear}\addslash%
-    \setunit{}% Need * here?
-    \printfield{origyear}%
-    \iffieldundef{endyear}% DATE FIX
-    {\clearfield{year}}%
-    {}%
-    \iffieldundef{origendyear}% DATE FIX
-    {\clearfield{origyear}}%
-    {}}%
-  {\iffieldundef{origyear}%
-    {\usebibmacro{labelyear+extrayear}}%
-    {\printtext{% Why?
-        \printfield{origyear}\addslash%
-        \setunit*{}%
-        \printfield{labelyear}}%
-      \iffieldundef{origendyear}% DATE FIX
-      {\clearfield{origyear}}%
-      {}%
-      \iffieldundef{endyear}% DATE FIX
-      {\clearfield{year}}%
-      {}}}}
-
-\newbibmacro*{bothyear+oldstyle}{%
-  \iftoggle{cms@switchdates}%
-  {\printtext{%
-      \bibopenbracket%
-      \usebibmacro{labelyear+extrayear}%
-      \bibclosebracket%
-      \setunit{\addspace}\printfield{origyear}}%
-    \iffieldundef{endyear}% DATE FIX
-    {\clearfield{year}}%
-    {}%
-    \iffieldundef{origendyear}% DATE FIX
-    {\clearfield{origyear}}%
-    {}}%
-  {\iffieldundef{origyear}
-    {\usebibmacro{labelyear+extrayear}}%
-    {\printtext{%
-        \printfield[brackets]{origyear}%
-        \setunit*{\addspace}\printfield{labelyear}}%
-      \iffieldundef{origendyear}% DATE FIX
-      {\clearfield{origyear}}%
-      {}%
-      \iffieldundef{endyear}% DATE FIX
-      {\clearfield{year}}%
-      {}}}}
-
-\newbibmacro*{pubstate}{%
-  \iftoggle{cms@reprint}%
-  {\iftoggle{cms@switchdates}%
-    {}
-    {\iffieldundef{origyear}%
-      {}
-      {\printtext[parens]{%
-          \usebibmacro{choosepubstring}%
-          \printorigdate\addperiod}\nopunct}}}%
-  {\printfield{pubstate}}}
-
-\newbibmacro*{choosepubstring}{%
-  \iffieldequalstr{entrytype}{video}%
-  {\iffieldequalstr{entrysubtype}{tv}%
-    {\bibstring{origshownyear}}%
-    {\bibstring{origreleaseyear}}}%
-  {\bibstring{origpubyear}}}%
-
-\newbibmacro*{bibreprint}{%
-  \iftoggle{cms@reprint}%
-  {\iffieldundef{origyear}%
-    {\bibstring{reprint}}%
-    {\iftoggle{cms@switchdates}%
-      {\bibstring{reprint}}%
-      {}}}%
-  {}}
-
-\newbibmacro*{bibpostxref}{%
-  \iffieldundef{postnote}%
-  {\iffieldundef{chapter}%
-    {\iffieldundef{pages}%
-      {}%
-      {\postnotedelim%  Extra space?
-        \printfield{pages}}}%
-    {\postnotedelim%
-      \printfield{chapter}}}%
-  {\postnotedelim%
-    \printfield{postnote}}}
-
-\newbibmacro*{mtitle+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*{mtitle+mstitle+vol+part+btitle+bstitle}{%
-  \usebibmacro{btitle+bstitle}%
-  \iffieldundef{booktitle}
-  {\setunit{\addperiod\addspace}}% Fix customc?
-  {\setunit{\addcomma\addspace}}%
-  \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*{journal+issue+year+pages}{%
-  \iftoggle{cms@numbermonth}{}{\clearfield{month}}%
-  \usebibmacro{cjournal+ser+vol+num}%
-  \setunit{\addspace}%
-  \ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month}
-    \AND\iffieldundef{number}}%
-  {\iftoggle{cms@postposit}% Kludge for French colon spacing.
-    {\setunit{\addcolon\addspace}}%
-    {\setunit{\addcolon}}}% This may not be universally correct.
-  {\printtext[parens]{%  Perhaps if it's wrong use magazine subtype?
-      \iffieldundef{issue}
-      {\usebibmacro{date}%
-        \printfield{number}}%
-      {\printfield{issue}%
-        \setunit{\addspace}%
-        \usebibmacro{cmsyear}}}%
-    \setunit{\addcolon\addspace}}
-  \printfield{pages}}
-
-\newbibmacro*{periodical+issue+year+pages}{%
-  \iftoggle{cms@numbermonth}{}{\clearfield{month}}%
-  \usebibmacro{cperiodical+ser+vol+num}%
-  \setunit{\addspace}%
-  \ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month}
-    \AND\iffieldundef{number}}%
-  {\iftoggle{cms@postposit}%
-    {\setunit{\addcolon\addspace}}%
-    {\setunit{\addcolon}}}%
-  {\printtext[parens]{%
-      \iffieldundef{issue}
-      {\usebibmacro{date}%
-        \printfield{number}}%
-      {\printfield{issue}%
-        \setunit{\addspace}%
-        \usebibmacro{cmsyear}}}%
-    \setunit{\addcolon\addspace}}
-  \printfield{pages}}
-
-\newbibmacro*{bycompiler}{%
-  \ifnameundef{namec}
-    {}
-    {\bibstring{cbycompiler}\addspace
-     \printnames[bycompiler]{namec}}}
-
-\renewbibmacro*{byeditor}{%
-  \ifnameundef{editor}
-    {}
-    {\usebibmacro{cbytypestrg}{editor}{editor}%
-     \setunit{\addspace}%
-     \printnames[byeditor]{editor}%
-     \usebibmacro{editorpunct}}%
-  \usebibmacro{byeditorx}}
-
-\renewbibmacro*{byeditorx}{%
-  \ifnameundef{editora}
-    {}
-    {\usebibmacro{cbytypestrg}{editora}{editor}%
-     \setunit{\addspace}%
-     \printnames[byeditora]{editora}%
-     \usebibmacro{editorpunct}}%
-  \ifnameundef{editorb}
-    {}
-    {\usebibmacro{cbytypestrg}{editorb}{editor}%
-     \setunit{\addspace}%
-     \printnames[byeditorb]{editorb}%
-     \usebibmacro{editorpunct}}%
-  \ifnameundef{editorc}
-    {}
-    {\usebibmacro{cbytypestrg}{editorc}{editor}%
-     \setunit{\addspace}%
-     \printnames[byeditorc]{editorc}%
-     \usebibmacro{editorpunct}}}
-
-\renewbibmacro*{byeditor+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}%
-     \setunit{\addspace}%
-     \printnames[byeditor]{editor}%
-     \clearname{editor}%
-     \usebibmacro{editorpunct}%
-     \usebibmacro{byeditorx}}%
-   {\usebibmacro{byeditor}}%
-  \usebibmacro{bytranslator+others}}
-
-\renewbibmacro*{bytranslator+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}%
-     \usebibmacro{editorpunct}}%
-  \usebibmacro{bycompiler+others}}
-
-\newbibmacro*{bycompiler+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}%
-     \usebibmacro{editorpunct}}%
-  \usebibmacro{byothers}}
-
-\newbibmacro*{byothers}{% Changed for 0.9
-  \usebibmacro{cbytranslator}%
-  \usebibmacro{editorpunct}%
-  \usebibmacro{bycompiler}%
-  \usebibmacro{editorpunct}%
-%  \usebibmacro{byredactor}%
-%  \usebibmacro{editorpunct}%
-  \usebibmacro{withcommentator}%
-  \usebibmacro{editorpunct}%
-  \usebibmacro{withannotator}%
-  \usebibmacro{editorpunct}%
-  \usebibmacro{withintroduction}%
-  \usebibmacro{editorpunct}%
-  \usebibmacro{withforeword}%
-  \usebibmacro{editorpunct}%
-  \usebibmacro{withafterword}}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.cbx
deleted file mode 100644
index 3cc6554a665..00000000000
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.cbx
+++ /dev/null
@@ -1,2247 +0,0 @@
-% $Id: chicago-authordate15.cbx,v 0.8.1.22 2014/08/14 14:11:29 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}
-[2014/08/15 v 2.9a 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@nodates}
-\providetoggle{cms@datedash}
-
-\providetoggle{cms@url}% These are for the field-exclusion options
-\providetoggle{cms@doi}
-\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{entrytype}{patent}%
-  {\toggletrue{cms@origlabel}}%
-  {}%
-  \iffieldequalstr{pubstate}{reprint}%
-  {\toggletrue{cms@reprint}}%
-  {\togglefalse{cms@reprint}}}%
-
-\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}{}}}
-\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.
-  {\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]{%
-  \settoggle{cms@doi}{#1}}
-\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]{%
-  \settoggle{cms@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}%
-
-%% From 16th ed. %%
-
-\@ifpackagelater{biblatex}{2013/03/30}% For biblatex 2.6 ff.
-{\ExecuteBibliographyOptions{labeldate=true}}%
-{\ExecuteBibliographyOptions{labelyear=true}}%
-
-\@ifpackagelater{biblatex}{2014/02/20}% For biblatex 2.9 ff.
-{\global\toggletrue{cms@datedash}}%
-{\global\togglefalse{cms@datedash}}%
-
-\DeclareDataInheritance{collection}{suppcollection}{%
-  \inherit{title}{title}
-  \inherit{subtitle}{subtitle}
-  \inherit{titleaddon}{titleaddon}}
-
-\DeclareDataInheritance{mvbook}{incollection}{% ???
-  \inherit{title}{maintitle}
-  \inherit{subtitle}{mainsubtitle}
-  \inherit{titleaddon}{maintitleaddon}
-  \noinherit{shorttitle}
-  \noinherit{sorttitle}
-  \noinherit{indextitle}
-  \noinherit{indexsorttitle}
-}
-
-\DeclareDataInheritance{book,collection}{letter}{% ???
-  \inherit{title}{booktitle}
-  \inherit{subtitle}{booksubtitle}
-  \inherit{titleaddon}{booktitleaddon}
-  \noinherit{shorttitle}
-  \noinherit{sorttitle}
-  \noinherit{indextitle}
-  \noinherit{indexsorttitle}
-}
-
-\DeclareDataInheritance{mvbook,mvcollection}{letter}{% ???
-  \inherit{title}{maintitle}
-  \inherit{subtitle}{mainsubtitle}
-  \inherit{titleaddon}{maintitleaddon}
-  \noinherit{shorttitle}
-  \noinherit{sorttitle}
-  \noinherit{indextitle}
-  \noinherit{indexsorttitle}
-}
-
-\DeclareDataInheritance{*}{*}{%
-  \noinherit{namea}
-  \noinherit{nameb}
-  \noinherit{sortyear}
-  \noinherit{sortname}
-  \noinherit{sorttitle}}
-
-\DeclareDataInheritance{mvbook,mvcollection,mvproceedings,mvreference}%
-{*}{% ???
-  \noinherit{year}
-  \noinherit{month}
-  \noinherit{day}
-  \noinherit{endyear}
-  \noinherit{endmonth}
-  \noinherit{endday}
-  \noinherit{origyear}
-  \noinherit{origmonth}
-  \noinherit{origday}
-  \noinherit{origendyear}
-  \noinherit{origendmonth}
-  \noinherit{origendday}}
-
-% 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}
-
-%%%% Initialize and define bibstrings %%%%
-
-%%%% Now 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}{%
-  \ifthenelse{\iffieldundef{labelyear}\OR%
-    \iffieldequalstr{labelyear}{nodate}}%
-  {\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}%
-            {}%
-            {\ifboolexpr{
-                test {\iffieldequalstr{urlendyear}{}}%
-                and
-                not togl {cms@datedash}%
-              }
-              {\mbox{\bibdatedash}}%
-              {}}}%
-          {\printfield{labelyear}%
-            \iffieldundef{extrayear}%
-            {}%
-            {\setunit*{}%
-              \printfield{extrayear}}%
-            \iffieldundef{origendyear}%
-            {}%
-            {\ifboolexpr{
-                test {\iffieldequalstr{origendyear}{}}%
-                and
-                not togl {cms@datedash}%
-              }
-              {\mbox{\bibdatedash}}%
-              {}}}}
-        {\printfield{labelyear}%
-          \iffieldundef{extrayear}%
-          {}%
-          {\setunit*{}%
-            \printfield{extrayear}}%
-          \iffieldundef{eventendyear}%
-          {}%
-          {\ifboolexpr{
-              test {\iffieldequalstr{eventendyear}{}}%
-              and
-              not togl {cms@datedash}%
-            }
-            {\mbox{\bibdatedash}}%
-            {}}}}
-      {\printfield{labelyear}%
-        \iffieldundef{extrayear}%
-        {}%
-        {\setunit*{}%
-          \printfield{extrayear}}%
-        \iffieldundef{endyear}% DATE FIX
-        {}%
-        {\ifboolexpr{
-            test {\iffieldequalstr{endyear}{}}%
-            and
-            not togl {cms@datedash}%
-          }
-          {\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+newstyle}}%
-    {\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+newstyle}{%
-  \iftoggle{cms@switchdates}%
-  {\usebibmacro{cite:labelyear+extrayear}/\printfield{origyear}}%
-  {\iffieldundef{origyear}%
-    {\usebibmacro{cite:labelyear+extrayear}}%
-    {\printtext[bibhyperref]{%
-        \printfield{origyear}/\printfield{labelyear}}}}}
-
-\newbibmacro*{cite:bothyear+oldstyle}{%
-  \iftoggle{cms@switchdates}%
-  {\printtext[bibhyperref]{%
-      \bibopenbracket%
-      \usebibmacro{cite:labelyear+extrayear}%
-      \bibclosebracket%
-      \addspace\printfield{origyear}}}%
-  {\iffieldundef{origyear}%
-    {\usebibmacro{cite:labelyear+extrayear}}%
-    {\printtext[bibhyperref]{%
-        \printfield[brackets]{origyear}%
-        \addspace\printfield{labelyear}}}}}
-
-\newbibmacro*{cite:save}{%
-  \savefield{entrykey}{\cbx@lastkey}}
-
-\newbibmacro*{cite:ibid}{%
-  \iftoggle{cms@noibid}%
-  {\blx@ibidreset%
-    \usebibmacro{cite}}%
-  {\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}
-
-\DeclareFieldFormat[artwork]{lostitle}{%
-  \iffieldundef{entrysubtype}%
-  {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
-  {\MakeSentenceCase*{#1}\isdot}}
-
-\DeclareFieldFormat[book]{title}{%
-  \mkbibemph{\MakeSentenceCase*{#1}}\isdot}
-
-\DeclareFieldAlias[book]{citetitle}[book]{title}
-
-\DeclareFieldFormat[book]{lostitle}{%
-  \mkbibemph{\MakeSentenceCase*{#1}}\isdot}
-
-\DeclareFieldAlias[bookinbook]{title}[book]{title}
-
-\DeclareFieldAlias[bookinbook]{citetitle}[book]{title}
-
-\DeclareFieldAlias[bookinbook]{lostitle}[book]{lostitle}
-
-\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}[article]{title}
-
-\DeclareFieldAlias[image]{citetitle}[article]{title}
-
-\DeclareFieldAlias[image]{lostitle}[article]{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}
-
-\DeclareFieldAlias[patent]{citetitle}[article]{title}
-
-\DeclareFieldAlias[patent]{lostitle}[article]{lostitle}
-
-\DeclareFieldAlias[unpublished]{title}[article]{title}
-
-\DeclareFieldAlias[unpublished]{citetitle}[article]{title}
-
-\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]{title}
-
-\DeclareFieldAlias[manual]{lostitle}[book]{lostitle}
-
-\DeclareFieldAlias[report]{title}[book]{title}
-
-\DeclareFieldAlias[report]{citetitle}[book]{title}
-
-\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}}
-
-\DeclareFieldFormat[video]{citetitle}{%
-  \iffieldundef{booktitle}%
-  {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
-  {\MakeSentenceCase*{#1}\isdot}}
-
-\DeclareFieldFormat[video]{lostitle}{%
-  \iffieldundef{booktitle}%
-  {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
-  {\MakeSentenceCase*{#1}\isdot}}
-
-\DeclareFieldAlias[music]{title}[video]{title}
-
-\DeclareFieldAlias[music]{citetitle}[video]{citetitle}
-
-\DeclareFieldAlias[music]{lostitle}[video]{lostitle}
-
-\DeclareFieldAlias[audio]{title}[video]{title}
-
-\DeclareFieldAlias[audio]{citetitle}[video]{citetitle}
-
-\DeclareFieldAlias[audio]{lostitle}[video]{lostitle}
-
-%%%% Other Field Formats %%%%
-
-\DeclareNumChars*{:}%
-
-\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{nameaddon}{\mkbibbrackets{#1\bibsentence}}% ?!
-
-\DeclareFieldFormat[customc]{nameaddon}{% For cross-refs
-  \ifbibstring{#1}%
-  {\mkbibemph{\bibstring{#1}}}%
-  {#1}}%
-
-\DeclareFieldFormat{edition}{% New in 0.8
-  \ifinteger{#1}
-  {\mkbibordinal{#1}~\bibstring{edition}}%
-  {\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\addspace\bibstring{partvolume}~#1}
-
-\DeclareFieldAlias[review]{volume}[article]{volume}
-
-\DeclareFieldAlias[suppperiodical]{volume}[article]{volume}
-
-%%%% Commands, for users and internal %%%%
-
-\newcommand*{\cbytypeeditor}{%
-  \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{cbytranslator}\space}}%
-
-\newcommand{\partedit}{%
-  \iftoggle{cms@postposit}% Kludge to make it work in French.
-  {\bibstring{cbyeditoralt}\addspace}%
-  {\bibstring{cbyeditor}\addspace}}%
-
-\newcommand{\partcomp}{%
-  {\bibstring{cbycompiler}\space}}%
-
-\newcommand{\parteditandcomp}{%
-  {\bibstring{cbyeditorcp}\space}}%
-
-\newcommand{\parttransandcomp}{%
-  {\bibstring{cbytranslatorcp}\space}}%
-
-\newcommand{\partedittransandcomp}{%
-  {\bibstring{cbyeditortrcp}\space}}%
-
-\newcommand{\parteditandtrans}{%
-  {\bibstring{cbyeditortr}\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}
-    {}
-    {\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}%
-      {}%
-      {\ifboolexpr{
-          test {\iflistequals{organization}{\bbx@lasthash}}
-          and
-          not test {\iffirstonpage}
-        }%
-        {\bibnamedash\addperiod\addspace}%
-        {\printlist{organization}%
-          \savelist{organization}{\bbx@lasthash}}}}%
-    {\usebibmacro{editor}}}%
-  {\usebibmacro{author/editor}}}
-
-\newbibmacro*{cbytypestrg}[2]{%
-  \iffieldundef{#1type}
-    {\bibstring{cby#2}}
-    {\bibstring{cby\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{cbytranslator}%
-    \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}%
-  {}
-  {\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}%
-    {\newcunit}%
-    {\printfield{pubstate}\setunit{\addspace}}}%
-  {\printfield{howpublished}\setunit{\addspace}}}%
-
-\newbibmacro*{ser+num}{%
-  \printfield{series}%
-  \printfield[sernum]{number}%
-  \newunit}
-
-\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
-  \printfield{url}%
-  \ifthenelse{\iffieldundef{urlyear}\AND\iffieldundef{urlmonth}}%
-    {}%
-    {\setunit{\addspace}% Date fix
-     \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*{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{cbytranslator}\space%
-    \printnames[bytranslator]{nameb}}}%
-{\ifnamesequal{namea}{nameb}%
-  {\bibstring{cbyeditortr}\space%
-    \printnames[byeditor]{namea}}%
-  {\bibstring{cbyeditor}\space%
-    \printnames[byeditor]{namea}%
-    \ifnameundef{nameb}%
-    {}
-    {\newunit
-      \bibstring{cbytranslator}\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-dates-common.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common.cbx
index c0473ea82a6..6b8e1a41737 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common.cbx
@@ -1,4 +1,4 @@
-% $Id: chicago-dates-common.cbx,v 0.9.1.33 2017/05/02 14:30:17 dfussner Exp $
+% $Id: chicago-dates-common.cbx,v 0.10.1.15 2018/01/11 09:49:53 dfussner Exp $
 
 % This is a biblatex citation style file, adapted from Lehman's
 % authoryear-comp.cbx.  It is heavily modified, and contains the
@@ -6,7 +6,7 @@
 % for the two author-date styles of the Chicago Manual of Style, 16th
 % edition.
 
-\ProvidesFile{chicago-dates-common.cbx}[2017/05/02 v 3.7 biblatex
+\ProvidesFile{chicago-dates-common.cbx}[2018/01/11 v 3.10 biblatex
 citation style]
 
 %%%% Biblatex initialization + Chicago options + Toggles %%%%
@@ -31,6 +31,8 @@ citation style]
 \providetoggle{cms@datedash}
 \providetoggle{cms@modpostnote}
 \providetoggle{cms@ukord}
+\providetoggle{cms@fullnote}% For the legal entry types
+\providetoggle{cms@shortnote}% Ditto
 
 \providetoggle{cms@url}% These are for the field-exclusion options
 \providetoggle{cms@doi}
@@ -39,6 +41,7 @@ citation style]
 \providetoggle{cms@isbn}
 \providetoggle{cms@numbermonth}
 \providetoggle{cms@bookpages}
+\providetoggle{cms@addendum}
 \providetoggle{cms@hidevolumes}% Modify Volume fix
 \providetoggle{cms@comprange}
 
@@ -51,6 +54,10 @@ citation style]
 \providetoggle{cms@annotation}% Keep
 \providetoggle{cms@postposit}% Keep
 \providetoggle{cms@fullshhand}%
+\providetoggle{cms@allshort}% For legal types
+\providetoggle{cms@noneshort}% Ditto
+\providetoggle{cms@legalnotes}% Ditto
+\providetoggle{cms@supranotes}% Ditto
 \providetoggle{cms@vol}%
 \providetoggle{cms@crossref}%
 \providetoggle{cms@bookcrossref}
@@ -58,11 +65,13 @@ citation style]
 \providetoggle{cms@genallnames}
 \providetoggle{cms@xrefurl}
 \providetoggle{cms@related}
+\providetoggle{cms@linkit}
 
 \AtEveryCitekey{%
   \iffieldundef{userc}%
   {}%
   {\nocite{\thefield{userc}}}%
+  \global\csundef{@cmsst}%
   \iffieldequalstr{pubstate}{reprint}%
   {\toggletrue{cms@reprint}}%
   {\togglefalse{cms@reprint}}}%
@@ -161,9 +170,33 @@ citation style]
 \DeclareEntryOption[boolean]{genallnames}[true]{%
   \settoggle{cms@genallnames}{#1}}%
 
+\DeclareBibliographyOption[boolean]{hypertitle}[true]{%
+  \settoggle{cms@linkit}{#1}}%
+
+\DeclareEntryOption[boolean]{hypertitle}[true]{%
+  \settoggle{cms@linkit}{#1}}%
+
 \DeclareBibliographyOption[boolean]{annotation}[true]{%
   \global\settoggle{cms@annotation}{#1}}%
 
+\DeclareBibliographyOption[boolean]{short}[true]{%
+  \global\settoggle{cms@allshort}{#1}}
+
+\DeclareBibliographyOption[boolean]{noneshort}[true]{%
+  \global\settoggle{cms@noneshort}{#1}}
+
+\DeclareEntryOption[boolean]{noneshort}[true]{%
+  \settoggle{cms@noneshort}{#1}}
+
+\DeclareBibliographyOption[boolean]{legalnotes}[true]{%
+  \global\settoggle{cms@legalnotes}{#1}}
+
+\DeclareBibliographyOption[boolean]{supranotes}[true]{%
+  \global\settoggle{cms@supranotes}{#1}}
+
+\DeclareEntryOption[boolean]{supranotes}[true]{%
+  \global\settoggle{cms@supranotes}{#1}}
+
 \DeclareBibliographyOption[boolean]{cmslos}[true]{%
   \global\settoggle{cms@los}{#1}}%
 
@@ -409,7 +442,7 @@ citation style]
   \settoggle{cms@hidevolumes}{#1}}%
 
 \ExecuteBibliographyOptions{includeall,hidevolumes,booklongxref,related,%
-  ctitleaddon,ptitleaddon,journalabbrev=notes}%
+  ctitleaddon,ptitleaddon,journalabbrev=notes,legalnotes,supranotes}%
 
 \@ifpackagelater{biblatex}{2016/09/01}% For biblatex 2.6 ff.
 {\ExecuteBibliographyOptions{labeldateparts=true}}%
@@ -417,12 +450,21 @@ citation style]
   {\ExecuteBibliographyOptions{labeldate=true}}
   {\ExecuteBibliographyOptions{labelyear=true}}}%
 
+\iftoggle{cms@legalnotes}%
+{\ExecuteBibliographyOptions[jurisdiction,legal,legislation]{skipbib}}%
+{}%
+
 \@ifpackagelater{biblatex}{2016/09/01}% For biblatex 3.5 ff.
 {\global\togglefalse{cms@datedash}}
 {\@ifpackagelater{biblatex}{2014/02/20}% For biblatex 2.9 ff.
   {\global\toggletrue{cms@datedash}}%
   {\global\togglefalse{cms@datedash}}}%
 
+\DeclareLabeltitle[legislation]{%
+  \field{shorttitle}%
+  \field{titleaddon}%
+  \field{title}}%
+
 \DeclareDataInheritance{collection}{suppcollection}{%
   \inherit{title}{title}
   \inherit{subtitle}{subtitle}
@@ -500,7 +542,7 @@ citation style]
 
 % More authordate options %
 
-\DeclareSortingScheme{cms}{% Updated to >2.0 format
+\DeclareSortingTemplate{cms}{% Updated to >3.7 format
   \sort{
     \field{presort}
   }
@@ -536,7 +578,7 @@ citation style]
   }
 }
 
-\DeclareSortingScheme{shortjournal}{%
+\DeclareSortingTemplate{shortjournal}{%
   \sort{
     \field{shortjournal}
   }
@@ -922,11 +964,11 @@ citation style]
 \newbibmacro*{cite:shorthand}{%
   \iftoggle{cms@los}%
   {\iffieldequals{fullhash}{\cbx@lasthash}%
-    {\printtext[bibhyperref]{%
+    {\printtext[cmshyper]{%
         \setunit{\compcitedelim}%
         \usebibmacro{cmscitesortdate}}}%
-    {\printtext[bibhyperref]{%
-        \printfield{shorthand}%
+    {\printfield{shorthand}%
+      \printtext[cmshyper]{%
         \setunit{\nameyeardelim}%
         \usebibmacro{cmscitesortdate}}%
       \savefield{fullhash}{\cbx@lasthash}}}%
@@ -936,11 +978,11 @@ citation style]
 \newbibmacro*{cite:shorthand+title}{%
   \iftoggle{cms@los}%
   {\iffieldequals{fullhash}{\cbx@lasthash}%
-    {\printtext[bibhyperref]{%
+    {\printtext[cmshyper]{%
         \setunit{\multicitedelim}%
         \usebibmacro{cite:label}}}%
-    {\printtext[bibhyperref]{%
-        \printfield{shorthand}%
+    {\printfield{shorthand}%
+      \printtext[cmshyper]{%
         \setunit{\cms@testspace}% FIXME
         \usebibmacro{cite:label}}%
       \savefield{fullhash}{\cbx@lasthash}}}%
@@ -966,12 +1008,12 @@ citation style]
         togl {cms@bibjtabb}%
         ))
       }%
-      {\printtext[bibhyperref]{\printfield[shortjournal]{shortjournal}}}%
-      {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}}}}%
+      {\printtext[cmshyper]{\printfield[shortjournal]{shortjournal}}}%
+      {\printtext[cmshyper]{\printfield[journaltitle]{journaltitle}}}}%
     {\ifentrytype{manual}%
-      {\printtext[bibhyperref]{\printlist{organization}}}%
-      {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}}}%
-  {\printtext[bibhyperref]{\printfield{label}}}}%
+      {\printtext[cmshyper]{\printlist{organization}}}%
+      {\printtext[cmshyper]{\printfield[citetitle]{labeltitle}}}}}%
+  {\printtext[cmshyper]{\printfield{label}}}}%
 
 \newbibmacro*{cite:labelyear+extrayear}{%
   \ifboolexpr{ (
@@ -1012,10 +1054,10 @@ citation style]
       {\iffieldundef{eventyear}%
         {\iffieldundef{origyear}%
           {\printfield{labelyear}%
-            \iffieldundef{extrayear}%
+            \iffieldundef{extradate}%
             {}%
             {\setunit*{}%
-              \printfield{extrayear}}%
+              \printfield{extradate}}%
             \iffieldundef{urlendyear}%
             {}%
             {\ifboolexpr{%
@@ -1026,10 +1068,10 @@ citation style]
               {\mbox{\bibdatedash}}%
               {\usebibmacro{cms@test@labelend}}}}%
           {\printfield{labelyear}%
-            \iffieldundef{extrayear}%
+            \iffieldundef{extradate}%
             {}%
             {\setunit*{}%
-              \printfield{extrayear}}%
+              \printfield{extradate}}%
             \iffieldundef{origendyear}%
             {}%
             {\ifboolexpr{%
@@ -1040,10 +1082,10 @@ citation style]
               {\mbox{\bibdatedash}}%
               {\usebibmacro{cms@test@labelend}}}}}%
         {\printfield{labelyear}%
-          \iffieldundef{extrayear}%
+          \iffieldundef{extradate}%
           {}%
           {\setunit*{}%
-            \printfield{extrayear}}%
+            \printfield{extradate}}%
           \iffieldundef{eventendyear}%
           {}%
           {\ifboolexpr{%
@@ -1054,10 +1096,10 @@ citation style]
             {\mbox{\bibdatedash}}%
             {\usebibmacro{cms@test@labelend}}}}}%
       {\printfield{labelyear}%
-        \iffieldundef{extrayear}%
+        \iffieldundef{extradate}%
         {}%
         {\setunit*{}%
-          \printfield{extrayear}}%
+          \printfield{extradate}}%
         \iffieldundef{endyear}% DATE FIX
         {}%
         {\ifboolexpr{%
@@ -1089,10 +1131,10 @@ citation style]
       {\iffieldundef{year}%
         {\iffieldundef{eventyear}%
           {\printfield{labelyear}%
-            \iffieldundef{extrayear}%
+            \iffieldundef{extradate}%
             {}%
             {\setunit*{}%
-              \printfield{extrayear}}%
+              \printfield{extradate}}%
             \iffieldundef{urlendyear}%
             {}%
             {\ifboolexpr{%
@@ -1103,10 +1145,10 @@ citation style]
               {\mbox{\bibdatedash}}%
               {\usebibmacro{cms@test@labelend}}}}%
           {\printfield{labelyear}%
-            \iffieldundef{extrayear}%
+            \iffieldundef{extradate}%
             {}%
             {\setunit*{}%
-              \printfield{extrayear}}%
+              \printfield{extradate}}%
             \iffieldundef{eventendyear}%
             {}%
             {\ifboolexpr{%
@@ -1117,10 +1159,10 @@ citation style]
               {\mbox{\bibdatedash}}%
               {\usebibmacro{cms@test@labelend}}}}}%
         {\printfield{labelyear}%
-          \iffieldundef{extrayear}%
+          \iffieldundef{extradate}%
           {}%
           {\setunit*{}%
-            \printfield{extrayear}}%
+            \printfield{extradate}}%
           \iffieldundef{endyear}%
           {}%
           {\ifboolexpr{%
@@ -1131,10 +1173,10 @@ citation style]
             {\mbox{\bibdatedash}}%
             {\usebibmacro{cms@test@labelend}}}}}%
       {\printfield{labelyear}%
-        \iffieldundef{extrayear}%
+        \iffieldundef{extradate}%
         {}%
         {\setunit*{}%
-          \printfield{extrayear}}%
+          \printfield{extradate}}%
         \iffieldundef{origendyear}% DATE FIX
         {}%
         {\ifboolexpr{%
@@ -1166,10 +1208,10 @@ citation style]
       {\iffieldundef{origyear}%
         {\iffieldundef{year}%
           {\printfield{labelyear}%
-            \iffieldundef{extrayear}%
+            \iffieldundef{extradate}%
             {}%
             {\setunit*{}%
-              \printfield{extrayear}}%
+              \printfield{extradate}}%
             \iffieldundef{urlendyear}%
             {}%
             {\ifboolexpr{%
@@ -1180,10 +1222,10 @@ citation style]
               {\mbox{\bibdatedash}}%
               {\usebibmacro{cms@test@labelend}}}}%
           {\printfield{labelyear}%
-            \iffieldundef{extrayear}%
+            \iffieldundef{extradate}%
             {}%
             {\setunit*{}%
-              \printfield{extrayear}}%
+              \printfield{extradate}}%
             \iffieldundef{endyear}%
             {}%
             {\ifboolexpr{%
@@ -1194,10 +1236,10 @@ citation style]
               {\mbox{\bibdatedash}}%
               {\usebibmacro{cms@test@labelend}}}}}%
         {\printfield{labelyear}%
-          \iffieldundef{extrayear}%
+          \iffieldundef{extradate}%
           {}%
           {\setunit*{}%
-            \printfield{extrayear}}%
+            \printfield{extradate}}%
           \iffieldundef{origendyear}%
           {}%
           {\ifboolexpr{%
@@ -1208,10 +1250,10 @@ citation style]
             {\mbox{\bibdatedash}}%
             {\usebibmacro{cms@test@labelend}}}}}%
       {\printfield{labelyear}%
-        \iffieldundef{extrayear}%
+        \iffieldundef{extradate}%
         {}%
         {\setunit*{}%
-          \printfield{extrayear}}%
+          \printfield{extradate}}%
         \iffieldundef{eventendyear}% DATE FIX
         {}%
         {\ifboolexpr{%
@@ -1263,7 +1305,7 @@ citation style]
       {\iftoggle{cms@bothlabelold}%
         {\usebibmacro{cite:bothyear+oldstyle}}%
         {\iftoggle{cms@fulldate}%
-          {\newcunit\printdate}%
+          {\newcunit\printtext[bibhyperref]{\printdate}}% Consistency(?)
           {\usebibmacro{cite:labelyear+extrayear}}}}}}%
   \ifcsdef{@cms@tempdate}%
   {\toggletrue{\@cms@tempdate}}%
@@ -1288,7 +1330,7 @@ citation style]
     {\iffieldundef{origyear}%
       {\iftoggle{cms@ordate}% ???
         {}%
-        {\clearfield{extrayear}}%
+        {\clearfield{extradate}}%
         \usebibmacro{cite:standard+labelyear+extrayear}}%
       {\iftoggle{cms@ordate}%
         {\usebibmacro{cite:origfirst+labelyear+extrayear}}%
@@ -1318,7 +1360,7 @@ citation style]
     {\iffieldundef{origyear}% ???
       {\iftoggle{cms@ordate}%
         {}%
-        {\clearfield{extrayear}}%
+        {\clearfield{extradate}}%
         \usebibmacro{cite:standard+labelyear+extrayear}}%
       {\iftoggle{cms@ordate}% Added test for year field ???
         {\iffieldundef{year}%
@@ -1333,7 +1375,7 @@ citation style]
             \bibopenparen%
             \usebibmacro{origyear+endyear}%
             \bibcloseparen%
-            \clearfield{extrayear}\addspace%
+            \clearfield{extradate}\addspace%
             \usebibmacro{cite:standard+labelyear+extrayear}}}}}}}%
 
 \newbibmacro*{cite:save}{%
@@ -1401,6 +1443,571 @@ citation style]
   {}%
   {\usebibmacro{postnote}}
 
+%%% Commands, macros and formats for the Legal entry types %%%
+  
+\DeclareCiteCommand{\footfullcite}[\mkbibfootnote]
+  {\usebibmacro{prenote}}%\bibsentence
+  {\usebibmacro{citeindex}%
+    \toggletrue{cms@fullnote}%
+    \togglefalse{cms@shortnote}%
+    \usebibmacro{cite:full}%
+    \usebibmacro{footcite:save}%
+    \usebibmacro{cite:save}}
+  {\multicitedelim}
+  {}
+
+\DeclareCiteCommand{\fullcite}
+  {\usebibmacro{prenote}}%\bibsentence
+  {\usebibmacro{citeindex}%
+    \toggletrue{cms@fullnote}%
+    \togglefalse{cms@shortnote}%
+    \usebibmacro{cite:full}%
+    \usebibmacro{footcite:save}%
+    \usebibmacro{cite:save}}
+  {\multicitedelim}
+  {}
+
+\DeclareCiteCommand{\parenfullcite}[\mkbibparens]
+  {\usebibmacro{prenote}}%\bibsentence
+  {\usebibmacro{citeindex}%
+    \toggletrue{cms@fullnote}%
+    \togglefalse{cms@shortnote}%
+    \usebibmacro{cite:full}%
+    \usebibmacro{footcite:save}%
+    \usebibmacro{cite:save}}
+  {\multicitedelim}
+  {}
+
+\newbibmacro*{cite:full}{%
+  \iftoggle{cms@noneshort}%
+  {\ifboolexpr{%
+      test {\ifciteibid}%
+      and
+      not test {\iffirstonpage}%
+      and
+      not togl {cms@noibid}%
+    }%
+    {\togglefalse{cms@fullnote}%
+      \toggletrue{cms@shortnote}%
+      \usebibmacro{legal:ibid}}%
+    {\usebibmacro{cite:driver}}}%
+  {\ifboolexpr{%
+      test {\ifciteseen}%
+      or
+      togl {cms@allshort}%
+    }%
+    {\togglefalse{cms@fullnote}%
+      \toggletrue{cms@shortnote}%
+      \ifboolexpr{%
+        test {\ifciteibid}%
+        and
+        not test {\iffirstonpage}%
+        and
+        not togl {cms@noibid}%
+      }%
+      {\usebibmacro{legal:ibid}}%
+      {\usebibmacro{cite:short}}}%
+    {\usebibmacro{cite:driver}}}}
+
+\newbibmacro*{cite:driver}{%
+  \printtext[bibhypertarget]{%
+    \usedriver
+      {\DeclareNameAlias{sortname}{default}\frenchspacing}%
+      {\thefield{entrytype}}}}%
+
+\newbibmacro*{cite:short}{%
+  \iffieldundef{shorthand}%
+  {\ifentrytype{jurisdiction}%
+    {\usebibmacro{cite:short:jurisdiction}}%
+    {\ifentrytype{legal}%
+      {\usebibmacro{cite:short:legal}}%
+      {\ifentrytype{legislation}%
+        {\usebibmacro{cite:short:legislation}}%
+        {\usebibmacro{cite}}}}}
+  {\usebibmacro{cite:shorthand:legal}}}%
+
+\newbibmacro*{cite:short:jurisdiction}{%
+  \iffieldundef{labeltitle}%
+  {}%
+  {\ifboolexpr{%
+    togl {cms@allshort}%
+    or
+    test {\ifbibliography}%
+  }%
+  {\printtext[bibhyperref]{%
+      \printfield[citetitle]{labeltitle}}}%
+  {\printtext[cmshyperlink]{%
+      \printfield[citetitle]{labeltitle}}}}%
+  \newcunit% Fixme: giving us a duplicate comma
+  \printfield[jourvol]{volume}%
+  \setunit*{\addnbspace}%
+  \iffieldundef{shortjournal}% Test eliminates spurious comma
+  {}%
+  {\printtext[shortjournal]{%
+      \printfield[jtsnoformat]{shortjournal}}}%
+  \iffieldundef{issue}%
+  {\printfield[jurisdictionser]{series}}%
+  {\setunit{\addspace}%
+    \printfield{issue}}% Better ideas?
+  \usebibmacro{juridpostnote}}%
+
+\newbibmacro*{cite:short:legal}{%
+  \iffieldundef{labeltitle}%
+  {}%
+  {\ifboolexpr{%
+    togl {cms@allshort}%
+    or
+    test {\ifbibliography}%
+  }%
+  {\printtext[bibhyperref]{%
+      \printfield[citetitle]{labeltitle}}}%
+  {\printtext[cmshyperlink]{%
+      \printfield[citetitle]{labeltitle}}}}%
+  \newcunit% Fixme: giving us a duplicate comma
+  \printfield[jourvol]{volume}%
+  \setunit*{\addnbspace}%
+  \iffieldundef{shortjournal}% Test eliminates spurious comma
+  {}%
+  {\printtext[shortjournal]{%
+      \printfield[jtsnoformat]{shortjournal}}}%
+  \printfield[legalser]{series}%
+  \setunit{\addspace}%
+  \printfield{issue}%
+  \ifboolexpr{%
+    togl {cms@supranotes}%
+    and
+    test {\iffootnote}%
+  }%
+  {\newcunit%
+    \printtext{\bibstring{supranote}\addnbspace%
+      \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}}% ??
+  {}%
+  \usebibmacro{juridpostnote}}%
+
+\newbibmacro*{cite:short:legislation}{%
+  \iffieldequalstr{entrysubtype}{constitution}%
+  {\usebibmacro{clegis+news+title}%
+    \setunit{\addspace}%
+    \printfield[juridnum]{number}%
+    \newcunit%
+    \printfield{part}%
+    \newcunit%
+    \printfield{chapter}}%
+  {\iffieldequalstr{labeltitlesource}{shorttitle}%
+    {\ifboolexpr{%
+        togl {cms@allshort}%
+        or
+        test {\ifbibliography}%
+      }%
+      {\printtext[bibhyperref]{%
+          \printfield[citetitle]{labeltitle}}}%
+      {\printtext[cmshyperlink]{%
+          \printfield[citetitle]{labeltitle}}}}%
+    {\ifboolexpr{%
+        test {\iffieldundef{shortjournal}}%
+        or
+        (
+        not test {\iffieldundef{volume}}%
+        and
+        not test {\iffieldint{volume}}%
+        )
+      }%
+      {\ifboolexpr{%
+          test {\iffieldundef{entrysubtype}}%
+          and
+          not test {\iflistundef{location}}
+        }%
+        {\printlist{location}%
+          \setunit{\addspace}}%
+        {}%
+        \ifboolexpr{%
+          togl {cms@allshort}%
+          or
+          test {\ifbibliography}%
+        }%
+        {\printtext[bibhyperref]{%
+            \printfield[citetitle]{labeltitle}}}%
+        {\printtext[cmshyperlink]{%
+            \printfield[citetitle]{labeltitle}}}%
+        \setunit{\addspace}%
+        \printfield[juridnum]{number}%
+        \newcunit%
+        \printfield{part}%
+        \newcunit%
+        \printfield{chapter}}%
+      {\printfield{note}%
+        \newcunit%
+        \printfield[jourvol]{volume}%
+        \setunit*{\addnbspace}%
+        \iffieldundef{shortjournal}% Test eliminates spurious comma
+        {}%
+        {\printtext[shortjournal]{%
+            \printfield[jtsnoformat]{shortjournal}}}%
+        \printfield[legislationser]{series}%
+        \setunit{\addspace}%
+        \printfield{issue}%
+        \newcunit%
+        \printfield{part}%
+        \newcunit%
+        \printfield{chapter}%
+      }}}%
+  \newcunit%
+  \ifboolexpr{%
+    togl {cms@supranotes}%
+    and
+    test {\iffootnote}%
+    and
+    (
+    test {\iffieldequalstr{entrysubtype}{un}}%
+    or
+    test {\iffieldequalstr{entrysubtype}{hearing}}%
+    )
+  }%
+  {\newcunit%
+    \printtext{\bibstring{supranote}\addnbspace%
+      \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}}% ??
+  {}%
+  \usebibmacro{juridpostnote}}%
+
+\newbibmacro*{cite:shorthand:legal}{%
+  \iftoggle{cms@allshort}%
+  {\printtext[bibhyperref]{%
+      \printfield{shorthand}}}%
+  {\printtext[cmshyperlink]{%
+      \printfield{shorthand}}}%
+  \ifboolexpr{%
+    test {\iffootnote}%
+    and
+    (
+    test {\ifentrytype{legal}}%
+    or
+    (
+    test {\ifentrytype{legislation}}%
+    and
+    (
+    test {\iffieldequalstr{entrysubtype}{un}}%
+    or
+    test {\iffieldequalstr{entrysubtype}{hearing}}%
+    )))
+  }%
+  {\newcunit%
+    \printtext{\bibstring{supranote}\addnbspace%
+      \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+      \newcunit}}% ??
+  {\newcunit}% ??
+  \iffieldundef{postnote}%
+  {\global\togglefalse{cms@fullnote}%
+    \global\togglefalse{cms@shortnote}}%
+  {\usebibmacro{semel:postnote}%
+    \global\togglefalse{cms@fullnote}%
+    \global\togglefalse{cms@shortnote}}}%
+
+\newbibmacro*{cms:shorthandintro}{% For changing the citedas phrase
+  \iffieldundef{shorthand}%
+  {}%
+  {\iffieldundef{shorthandintro}%
+    {\ifthenelse{\ifentrytype{jurisdiction}\OR\ifentrytype{legal}\OR%
+        \ifentrytype{legislation}}%
+      {\printtext[brackets]{%
+        \bibstring{hereinafter}\addspace%
+        \printfield{shorthand}}}%
+      {\printtext[parens]{%
+        \bibstring{citedas}\addspace%
+        \printfield{shorthand}}}}%
+    {%\addspace%\setunit{\addspace}% Ditto
+      \printfield{shorthandintro}}}}
+
+\newbibmacro*{footcite:save}{%
+  \ifboolexpr{%
+    test {\iffootnote}%
+    and
+    (
+    test {\ifentrytype{legal}}%
+    or
+    (
+    test {\ifentrytype{legislation}}%
+    and
+    (
+    test {\iffieldequalstr{entrysubtype}{un}}%
+    or
+    test {\iffieldequalstr{entrysubtype}{hearing}}%
+    )))
+  }%
+  {\csxdef{cbx@f@\thefield{entrykey}}{\the\value{instcount}}%
+    \label{cbx@\the\value{instcount}}}%
+  {}}%
+
+\newbibmacro*{legal:ibid}{%
+  \ifboolexpr{%
+    togl {cms@noibid}%
+    or
+    test {\ifbibliography}% Needed for inheritshorthand option
+  }%
+  {\global\toggletrue{cms@shortnote}%
+    \global\togglefalse{cms@fullnote}%
+    \usebibmacro{cite:short}%
+    \usebibmacro{cite:save}}%
+  {\printtext[bibhyperlink]{%
+      \bibsstring[\mkbibemph]{ibidem}}%\bibstring[\mkibid]{ibidem}
+    \ifboolexpr{%
+      test {\ifloccit}%
+      or
+      (
+      test {\ifciteibid}%
+      and
+      test {\iffieldequalcs{postnote}{cms@pnsaved}}%
+      and
+      not test {\ifdefvoid{\blx@loccittracker}}% Package option=false
+      )
+    }%
+    {\global\toggletrue{cms@loccit}}%
+    {}}\usebibmacro{postnote}}% FIXME?
+
+\newbibmacro*{clegis+news+title}{%
+  \ifthenelse{\iffieldundef{title}\AND\iffieldundef{subtitle}\AND%
+    \iffieldundef{titleaddon}}%
+  {}%
+  {\printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
+      \printfield[noformat]{title}%
+      \setunit{\subtitlepunct}%
+      \printfield[noformat]{subtitle}}%
+    \setunit{\ctitleaddonpunct}%
+    \printfield{titleaddon}%
+  }}%\newcunit\newblock}
+
+\newbibmacro*{cpart+editor+translator}{%
+  \ifnameundef{namea}%
+  {\ifnameundef{nameb}%
+    {}%
+    {\bibstring{cbytranslator}\addspace%
+      \printnames[bytranslator]{nameb}}}%
+  {\ifthenelse{\iffieldundef{nameatype}\OR%
+      \iffieldequalstr{nameatype}{editor}}%
+    {\ifnamesequal{namea}{nameb}%
+      {\bibstring{cbyeditortr}\addspace%
+        \printnames[byeditor]{namea}}%
+      {\bibstring{cbyeditor}\addspace% Need this \space here?
+        \printnames[byeditor]{namea}%
+        \ifnameundef{nameb}%
+        {}%
+        {\newcunit%
+          \bibstring{cbytranslator}\addspace%
+          \printnames[bytranslator]{nameb}}}}%
+    {\usebibmacro{cbytypestrg}{namea}{editor}%
+      \setunit{\addspace}%
+      \printnames[byeditor]{namea}%
+      \ifnameundef{nameb}%
+      {}%
+      {\newunit%
+        \bibstring{cbytranslator}\addspace%
+        \printnames[bytranslator]{nameb}}}}}
+
+\newbibmacro*{juridpostnote}{%
+  \iftoggle{cms@fullnote}%
+  {\iffieldundef{issue}%
+    {\iffieldundef{shortjournal}%
+      {\setunit{\addcomma\addspace}}%
+      {\ifthenelse{\iffieldundef{part}\AND\iffieldundef{chapter}}%
+        {\setunit{\addspace}}%
+        {\ifpunctmark{*}{\setunit{\addspace}}{\newcunit}}}%
+      \printfield{pages}%
+      \iffieldundef{postnote}%
+      {}%
+      {\ifthenelse{\ifentrytype{legislation}\OR\ifentrytype{legal}}%
+        {\newcunit}%
+        {\setunit*{\addcomma\addspace}}%
+        \usebibmacro{semel:postnote}}}%
+    {\iffieldundef{postnote}%
+      {\iffieldundef{pages}%
+        {}%
+        {\newcunit%
+          \printfield{pages}}}%
+      {\newcunit%
+        \usebibmacro{semel:postnote}}}}%
+  {\iffieldundef{issue}%
+    {\iffieldundef{postnote}%
+      {\iffieldundef{pages}%
+        {}%
+        {\iffieldundef{shortjournal}%
+          {\setunit{\addcomma\addspace}}%
+          {\ifthenelse{\iffieldundef{part}\AND\iffieldundef{chapter}}%
+            {\setunit{\addspace}}%
+            {\ifpunctmark{*}{\setunit{\addspace}}{\newcunit}}}%
+          \printfield{pages}}}%
+      {\iffieldundef{shortjournal}%
+        {\setunit{\addcomma\addspace}}%
+        {\ifthenelse{\iffieldundef{part}\AND\iffieldundef{chapter}}%
+          {\setunit{\addspace}}%
+          {\ifpunctmark{*}{\setunit{\addspace}}{\newcunit}}}%
+        \usebibmacro{semel:postnote}}}% See below for alternate test here
+    {\iffieldundef{postnote}%
+      {\iffieldundef{pages}%
+        {}%
+        {\newcunit%
+          \printfield{pages}}}%
+      {\newcunit%
+        \usebibmacro{semel:postnote}}}%
+    \global\togglefalse{cms@fullnote}%
+    \global\togglefalse{cms@shortnote}}}%
+
+\newbibmacro*{semel:postnote}{% Fix to print postnote only once
+  \printfield{postnote}% Old form broke \ifloccit
+  \global\let\cms@pnsaved\abx@field@postnote%
+  \global\let\abx@field@postnote\undefined%
+  \AtNextCitekey{\ifciteibid{}{\global\let\cms@pnsaved\undefined}}}%
+
+\newbibmacro*{cite+doi+url}{% 16th ed.
+  \ifboolexpr{%
+    togl {cms@url}%
+    and
+    not test {\iffieldundef{urlyear}}%
+    }%
+  {\printurldate}% Date fix
+  {}%
+  \newcunit\newblock
+  \iftoggle{cms@doionly}%
+  {\iffieldundef{doi}%
+    {}%
+    {\printfield{doi}%
+      \clearfield{url}}}%
+  {\ifboolexpr{%
+      togl {cms@doi}%
+      and
+      not test {\iffieldundef{doi}}%
+    }%
+    {\printfield{doi}}%
+    {}}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@eprint}%
+    and
+    not test {\iffieldundef{eprint}}%
+  }%
+  {\usebibmacro{eprint}}%
+  {}%
+  \newcunit\newblock
+  \ifboolexpr{%
+    togl {cms@url}%
+    and
+    not test {\iffieldundef{url}}%
+  }%
+  {\printfield{url}}%
+  {}}%
+
+\DeclareListFormat[jurisdiction]{location}{%
+  \iffieldundef{entrysubtype}%
+  {\usebibmacro{list:delim}{#1}%
+    #1\isdot%
+    \usebibmacro{list:andothers}}%
+  {\ifthenelse{\value{listcount}<\value{listtotal}}%
+    {\mkbibparens{#1}\addspace}%
+    {\mkbibparens{#1\isdot}}}}%
+
+\DeclareListFormat[jurisdiction]{origlocation}{%
+  \ifthenelse{\value{listcount}<\value{listtotal}}%
+  {#1\isdot\addcomma\addspace}%
+  {#1\isdot}}
+
+\DeclareListFormat[jurisdiction]{origpublisher}{%
+  \ifthenelse{\value{listcount}<\value{listtotal}}%
+  {\mkbibparens{#1}\addspace}%
+  {\mkbibparens{#1\isdot}}}
+
+\newrobustcmd*{\mkjuridprefix}[1]{%
+  \ifboolexpr{% FIXME: Is this always right?
+    test {\iftoggle{cms@fullnote}}%
+    and
+    test {\ifentrytype{jurisdiction}}%
+    }%
+  {\iffieldundef{issue}%
+    {#1}%
+    {\printtext{at}\addspace *#1}}%
+  {\iffieldundef{issue}%
+    {\printtext{at}\addspace #1}% FIXME: Make it a bibstring?
+    {\ifentrytype{jurisdiction}%
+      {\printtext{at}\addspace *#1}%
+      {\printtext{at}\addspace #1}}}}%
+
+\DeclareFieldFormat[jurisdiction,legal,legislation]{postnote}{%
+  \iftoggle{cms@comprange}%
+  {\iffieldundef{pagination}%
+    {\mkcomprange[\mkjuridprefix]{#1}}%
+    {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
+  {\iffieldundef{pagination}%
+    {\mkjuridprefix{#1}}%
+    {\mkpageprefix[pagination]{#1}}}}%
+
+\DeclareFieldFormat[jurisdiction,legal]{title}{#1\isdot}
+
+\DeclareFieldFormat[legislation]{title}{%
+  \iffieldequalstr{entrysubtype}{hearing}%
+  {\mkbibemph{#1}\isdot}%
+  {#1\isdot}}
+
+\DeclareFieldFormat[jurisdiction]{citetitle}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldFormat[jurisdiction,legal]{lostitle}{#1\isdot}
+
+\DeclareFieldFormat[legislation]{lostitle}{%
+  \iffieldequalstr{entrysubtype}{hearing}%
+  {\mkbibemph{#1}\isdot}%
+  {#1\isdot}}
+
+\DeclareFieldFormat[legal]{citetitle}{#1\isdot}
+
+\DeclareFieldFormat[legislation]{citetitle}{%
+  \iffieldequalstr{entrysubtype}{hearing}%
+  {\mkbibemph{#1}\isdot}%
+  {#1\isdot}}
+
+\DeclareFieldFormat[jurisdiction,legal,legislation]{journaltitle}{%
+  \iffieldundef{shortjournal}%
+  {#1\isdot}%
+  {\mkbibemph{#1}\isdot}}
+
+\DeclareFieldFormat[jurisdiction,legal,legislation]{shortjournal}{#1\isdot}
+
+\DeclareFieldFormat{jurisdictionser}{%
+  \ifinteger{#1}%
+  {\mkjuridordinal{#1}}%
+  {\ifbibstring{#1}{\bibstring{#1}}{#1}}}%
+
+\DeclareFieldFormat{legislationser}{%
+  \iffieldequalstr{entrysubtype}{hansard}%
+  {\ifinteger{#1}%
+    {\addspace\mkbibparens{\mkjuridordinal{#1}\addspace\bibsstring{jourser}}}%
+    {\ifbibstring{#1}%
+      {\addspace\mkbibparens{\bibstring{#1}}}%
+      {\addspace\mkbibparens{#1}}}}%
+  {\iffieldequalstr{entrysubtype}{uk}%
+    {\addspace #1\isdot}%
+    {\addcomma\addspace #1\isdot}}}%
+
+\DeclareFieldFormat{legalser}{\addspace #1\isdot}%
+
+\DeclareFieldFormat{hansardser}{%
+  \ifinteger{#1}%
+  {\mkbibparens{\mkjuridordinal{#1}\addspace\bibsstring{jourser}}}%
+  {\ifbibstring{#1}{\mkbibparens{\bibstring{#1}}}{\mkbibparens{#1}}}}%
+
+\DeclareFieldFormat{juridnum}{\bibcpstring{number}\addspace #1}%
+
+\DeclareFieldFormat{jourvol}{#1}
+
+\DeclareFieldFormat[jurisdiction,legal,legislation]{addendum}{%
+  \ifcapital{\mkbibparens{\MakeCapital{#1\isdot}}}{\mkbibparens{#1\isdot}}}
+
+\DeclareFieldFormat[legal,legislation]{part}{%
+  \ifnumerals{#1}%
+  {\bibsstring{part}~#1}%
+  {#1\isdot}}%
+
+\DeclareFieldFormat[legal,legislation]{chapter}{%
+  \ifthenelse{\iffieldequalstr{entrysubtype}{uk}\OR%
+    \iffieldequalstr{entrysubtype}{hansard}}%
+  {c\adddotspace #1}%
+  {\bibsstring{chapter}~#1}}%
+
 %%% Textcite commands taken verbatim from authoryear-comp.cbx %%% 
 
 \DeclareCiteCommand{\cbx@textcite}
@@ -1611,9 +2218,9 @@ citation style]
 
 \DeclareListFormat{lista}{% 
   \ifthenelse{\value{listtotal}<2}%
-  {s\adddot v\adddot\addspace\mkbibquote{#1\isdot}}%
+  {\bibsstring{subverbo}\addspace\mkbibquote{#1\isdot}}%
   {\ifthenelse{\value{listcount}=1}%
-    {s\adddot vv\adddot\addspace \mkbibquote{#1\isdot}\addcomma}%
+    {\bibsstring{subverbis}\addspace\mkbibquote{#1\isdot}\addcomma}%
     {\ifthenelse{\value{listcount}<\value{listtotal}}%
       {\addspace\mkbibquote{#1\isdot}\addcomma}%
       {\addspace\mkbibquote{#1\isdot}}}}}
@@ -1645,10 +2252,10 @@ citation style]
 \DeclareFieldFormat[inreference]{postnote}{%
   \iftoggle{cms@comprange}%
   {\iffieldundef{pagination}%
-    {s\adddot v\adddot\addnbspace\mkbibquote{#1}}%
+    {\bibsstring{subverbo}\addnbspace\mkbibquote{#1}}%
     {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
   {\iffieldundef{pagination}%
-    {s\adddot v\adddot\addnbspace\mkbibquote{#1}}%
+    {\bibsstring{subverbo}\addnbspace\mkbibquote{#1}}%
     {\mkpageprefix[pagination]{#1}}}}%
 
 \DeclareFieldFormat{pages}{%
@@ -1662,12 +2269,26 @@ citation style]
 
 \DeclareFieldFormat{bibnote}{\MakeCapital{#1}}
 
-\DeclareFieldFormat{edlang}{%
+% \DeclareFieldFormat{edlang}{%
+%   \ifbibstring{#1}%
+%   {\bibstring{#1}}%
+%   {\ifbibstring{ed#1}%
+%     {\bibstring{ed#1}}%
+%     {\ifcapital{\MakeCapital{#1}}{#1}}}}
+
+\DeclareListFormat{edlang}{% Required for feminine forms in some
+  \usebibmacro{list:delim}{% languages
+    \ifbibstring{#1}%
+    {\bibxstring{#1}}%
+    {\ifbibstring{ed#1}%
+      {\bibxstring{ed#1}}%
+      {\ifcapital{\MakeCapital{#1}}{#1}}}}%
   \ifbibstring{#1}%
   {\bibstring{#1}}%
   {\ifbibstring{ed#1}%
     {\bibstring{ed#1}}%
-    {\ifcapital{\MakeCapital{#1}}{#1}}}}
+    {\ifcapital{\MakeCapital{#1}}{#1}}}%
+  \usebibmacro{list:andothers}}
 
 \DeclareFieldFormat[customc]{title}{%
   \iffieldundef{nameaddon}%
@@ -1760,12 +2381,12 @@ citation style]
   \iftoggle{cms@reprint}% Date fix
   {#1}%
   {\ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}}%
-    {\bibstring{recorded}\space #1}%
+    {\bibstring{discrecorded}\space #1}%
     {\printfield{userd}\addspace #1}}}
 
 \DeclareFieldFormat[music]{eventdate}{% 16th ed.
   \iffieldundef{userd}%
-  {\bibstring{recorded}\space #1}%
+  {\bibstring{songrecorded}\space #1}%
   {\printfield{userd}\addspace #1}}
 
 \DeclareFieldFormat[video]{eventdate}{% 16th ed.
@@ -1838,6 +2459,19 @@ citation style]
 
 \DeclareFieldAlias[suppperiodical]{volume}[article]{volume}
 
+\DeclareFieldFormat{cmshyper}{% Control the number of elements hyperlinked.
+  \ifboolexpr{%
+    (
+    not test {\iffieldequalstr{entrysubtype}{classical}}%
+    or
+    togl {blx@skipbib}%
+    )
+    and
+    not togl {cms@linkit}%
+  }%
+  {#1}%
+  {\bibhyperref{#1}}}%
+
 %%%% Related field formats from biblatex.def %%%%
 
 \DeclareFieldFormat{related:origpubas}{#1}% This and next remove parens
@@ -1854,7 +2488,9 @@ citation style]
   {\ifcapital%
     {\MakeCapital{#1}}%
     {#1}}%
-  \printunit{\relatedpunct}}%
+  \ifentrytype{jurisdiction}%
+  {\newcunit}%
+  {\printunit{\relatedpunct}}}%
 
 \DeclareFieldFormat{relatedstring:reprintfrom}{% For notes + bib
   \ifboolexpr{%
@@ -1909,6 +2545,17 @@ citation style]
   {\setunit*{\addspace}}%
   {\setunit*{\addcomma\addspace}}}
 
+\renewcommand*{\subtitlepunct}{% Follows CMS16 spec.
+  \ifboolexpr{%
+    test {\ifterm}%
+    and
+    not test {\ifcsdef{@cmsst}}%
+  }%
+  {\addspace}%
+  {\addcolon\addspace%
+    \global\csundef{@cmsst}}%
+}
+
 \newcommand{\postvolpunct}{\addcolon}%
 
 \newcommand{\parttrans}{%
@@ -1987,18 +2634,30 @@ citation style]
     {\addcomma\addspace}%
     {\addcomma\addspace\bibstring{and}\addspace}}}
 
-\renewcommand*{\postnotedelim}{%
-  \iftoggle{cms@inlineibid}%
-  {\togglefalse{cms@inlineibid}%
-    \iffieldundef{prenote}% Bug fix
-    {}%
-    {\cms@testspace}}%
-  {\iffieldequalstr{entrysubtype}{classical}% For Notes+Bib, too?
-    {\NumCheckSetup{\DeclareNumChars*{abcdeABCDE}}%
-      \iffieldpages{postnote}%
-      {\cms@testspace}%
-      {\addcomma\addspace}}%
-    {\addcomma\addspace}}}
+\renewcommand*{\postnotedelim}{% Cf. N&B style
+  \ifboolexpr{%
+    test {\ifciteibid}%
+    and
+    (
+    test {\ifentrytype{jurisdiction}}%
+    or
+    test {\ifentrytype{legal}}%
+    or
+    test {\ifentrytype{legislation}}%
+    )
+  }%
+  {\addspace}%
+  {\iftoggle{cms@inlineibid}%
+    {\togglefalse{cms@inlineibid}%
+      \iffieldundef{prenote}% Bug fix
+      {}%
+      {\cms@testspace}}%
+    {\iffieldequalstr{entrysubtype}{classical}% For Notes+Bib, too?
+      {\NumCheckSetup{\DeclareNumChars*{abcdeABCDE}}%
+        \iffieldpages{postnote}%
+        {\cms@testspace}%
+        {\addcomma\addspace}}%
+      {\addcomma\addspace}}}}
 
 \newcommand*{\postnotewrapper}{%
   \iftoggle{cms@modpostnote}%
@@ -2038,46 +2697,67 @@ citation style]
   {\addperiod\addspace}%
   {\addcomma\addspace}}
 
-\newcommand*{\lbx@cfromlang}{%
+\DeclareListFormat{cfromoriglanguage}{% Needed for notes, to provide
+  \begingroup% final {by}.
+  \blx@bibstringnormal%
+  \usebibmacro{list:delim}{%
+    \ifbibstring{from#1}%
+      {\bibxlstring{cfrom#1}}%
+      {\ifbibstring{clang#1}%
+         {\bibxlstring{lang#1}}%
+         {#1}}}%
+  \ifbibstring{cfrom#1}%
+  {\ifboolexpr{%
+      test {\ifnumless{\value{listcount}}{\value{liststop}}}%
+      or
+      test \ifmoreitems%
+     }%
+     {\bibstring{from#1}}%
+     {\bibstring{cfrom#1}}}%
+    {\ifbibstring{lang#1}%
+       {\biblstring{lang#1}}%
+       {#1}}%
+ \usebibmacro{list:andotherlangs}%
+ \endgroup}
+
+\newbibmacro*{list:andotherlangs}{% Final {by} after {andmore}
+  \ifboolexpr{%
+    test {\ifnumequal{\value{listcount}}{\value{liststop}}}%
+    and
+    test \ifmoreitems%
+  }%
+    {\ifnumgreater{\value{liststop}}{1}%
+       {\finalandcomma}%
+       {}%
+     \printdelim{andmoredelim}\bibstring{andmore}\addspace\bibstring{by}}%
+    {}}
+
+\newcommand*{\lbx@cfromlang}{% Because the cbytranslator string can't
+  \iffieldundef{userf}% have {by} in it unless there's an origlanguage.
+  {\iflistundef{origlanguage}%
+    {\unspace}%
+    {\printlist[cfromoriglanguage]{origlanguage}}}%
+  {\unspace}}%
+
+\renewcommand*{\lbx@fromlang}{%
   \iffieldundef{userf}%
-  {\iffieldundef{origlanguage}%
+  {\iflistundef{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}}}}%
+    {\printlist[lfromoriglanguage]{origlanguage}}}%
+  {\unspace}}%
 
 \renewcommand*{\lbx@lfromlang}{%
   \iffieldundef{userf}%
-  {\iffieldundef{origlanguage}%
+  {\iflistundef{origlanguage}%
     {\unspace}%
-    {\biblstring{from\thefield{origlanguage}}}}%
+    {\printlist[lfromoriglanguage]{origlanguage}}}%
   {\unspace}}%
 
 \renewcommand*{\lbx@sfromlang}{%
   \iffieldundef{userf}%
-  {\iffieldundef{origlanguage}%
+  {\iflistundef{origlanguage}%
     {\unspace}%
-    {\bibsstring{from\thefield{origlanguage}}}}%
+    {\printlist[sfromoriglanguage]{origlanguage}}}%
   {\unspace}}%
 
 %%%% Formatting macros, called both by cbx and bbx %%%%
@@ -2546,7 +3226,7 @@ citation style]
       \usebibmacro{endrelated}%
       \newunit}}%
   {\usebibmacro{begrelated}%
-    \iffieldundef{origlanguage}%
+    \iflistundef{origlanguage}%
     {\bibstring{origpub}%
       \origfullcite{\thefield{userf}}%
       \usebibmacro{endrelated}%
@@ -2554,12 +3234,12 @@ citation style]
     {\iftoggle{cms@postposit}%
       {\bibstring{origedition}%
         \setunit{\addspace}%
-        \printfield[edlang]{origlanguage}%
+        \printlist[edlang]{origlanguage}%
         \addcolon%
         \origfullcite{\thefield{userf}}%
         \usebibmacro{endrelated}%
         \newunit}%
-      {\printfield[edlang]{origlanguage}%
+      {\printlist[edlang]{origlanguage}%
         \setunit{\addspace}%
         \bibstring{origedition}%
         \origfullcite{\thefield{userf}}%
@@ -2685,7 +3365,7 @@ citation style]
           \printfield[jtsnoformat]{shortjournal}}}%
       {\printtext[journaltitle]{%
           \printfield[jtnoformat]{journaltitle}%
-          \setunit{\addcolon\addspace}%
+          \setunit{\subtitlepunct}%
           \printfield[sjtnoformat]{journalsubtitle}}}}}%
 
 \newbibmacro*{chap+pag}{%
@@ -2759,7 +3439,7 @@ citation style]
         \printfield[tnoformat]{shorttitle}}}%
     {\printtext[title]{%
         \printfield[tnoformat]{title}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[stnoformat]{subtitle}}}}%
   \setunit*{\addspace}%
   \printlist[periodplace]{location}%
@@ -2801,7 +3481,7 @@ citation style]
         \printfield[tnoformat]{shorttitle}}}%
     {\printtext[title]{%
         \printfield[tnoformat]{title}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[stnoformat]{subtitle}}}}%
   \setunit*{\addspace}%
   \printlist[periodplace]{location}%
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 e0d5e5a59af..b132de4700c 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.8.28 2016/06/07 07:43:24 dfussner Exp $
+% $Id: chicago-notes.bbx,v 0.10.1.14 2018/01/11 09:17:35 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}[2016/06/07 v 3.4 biblatex bibliography style]
+\ProvidesFile{chicago-notes.bbx}[2018/01/11 v 3.10 biblatex bibliography style]
 
 %%%% Initialize and format bibliography and los %%%%
 
@@ -13,7 +13,11 @@
 
 \DeclareFieldFormat{shorthandwidth}{#1}
 
-\DeclareFieldFormat{shortjournalwidth}{\mkbibemph{\textbf{#1}}\isdot}
+\DeclareFieldFormat{shortjournalwidth}{%
+  \ifthenelse{\ifentrytype{jurisdiction}\OR%
+    \ifentrytype{legal}\OR\ifentrytype{legislation}}%
+  {\textbf{#1}\isdot}%
+  {\mkbibemph{\textbf{#1}}\isdot}}%
 
 \newlength{\lositemsep}
 
@@ -123,7 +127,10 @@
   {\item}
 
 \defbibcheck{shortjournal}{% Only one list
-  \iffieldundef{shortjournal}%
+  \ifthenelse{\iffieldundef{shortjournal}\OR%
+    \iffieldsequal{journaltitle}{shortjournal}\OR%
+    \(\iffieldundef{journaltitle}\AND\(\ifentrytype{legal}\OR%
+    \ifentrytype{legislation}\OR\ifentrytype{jurisdiction}\)\)}%
   {\skipentry}%
   {\ifcsdef{\strfield{shortjournal}}%
     {\skipentry}%
@@ -145,6 +152,7 @@
   }%
 
 \AtEveryBibitem{%
+  \global\csundef{@cmsst}%
   \iffieldequalstr{pubstate}{reprint}%
   {\toggletrue{cms@reprint}}%
   {\togglefalse{cms@reprint}}%
@@ -173,6 +181,7 @@
       {}}}}%
 
 \AtEveryLositem{%
+  \global\csundef{@cmsst}%
   \iffieldequalstr{pubstate}{reprint}%
   {\toggletrue{cms@reprint}}%
   {\togglefalse{cms@reprint}}%
@@ -200,6 +209,13 @@
       {\toggletrue{cms@switchdates}}%
       {}}}}%
 
+\AtEveryBiblistitem{shortjournal}{%
+  \global\csundef{@cmsst}%
+  \ifthenelse{\ifentrytype{jurisdiction}\OR%
+    \ifentrytype{legal}\OR\ifentrytype{legislation}}%
+  {\clearlist{location}}%
+  {}}%
+
 \InitializeBibliographyStyle{%
   \let\bbx@lasthash\undefined}
 
@@ -470,13 +486,13 @@
   \iffieldundef{journaltitle}%
   {\printtext[title]{%
       \printfield[tnoformat]{title}%
-      \setunit{\addcolon\addspace}%
+      \setunit{\subtitlepunct}%
       \printfield[stnoformat]{subtitle}}%
     \setunit*{\addspace}%
     \printlist[periodplace]{location}}%
   {\printtext[journaltitle]{%
       \printfield[jtnoformat]{journaltitle}%
-      \setunit{\addcolon\addspace}%
+      \setunit{\subtitlepunct}%
       \printfield[sjtnoformat]{journalsubtitle}}%
     \setunit*{\addspace}%
     \printlist[periodplace]{location}}%
@@ -489,6 +505,80 @@
       \step[fieldsource=shorttitle, final]
       \step[fieldset=shortjournal, origfieldval]
     }
+    \map{
+      \pertype{jurisdiction}
+      \pertype{legal}
+      \pertype{legislation}
+      \step[fieldsource=journaltitle, final]
+      \step[fieldset=shortjournal, origfieldval]
+    }
+    \map[overwrite]{
+      \pertype{jurisdiction}
+      \step[fieldsource=shortjournal, match=\regexp{[^\\adddot][a-z]}, final]
+      \step[fieldset=shortjournal, fieldvalue=\addnbspace, append]
+    }
+    \map{
+      \pertype{legislation}
+      \step[fieldsource=title, match=\regexp{Const}, final]
+      \step[fieldset=entrysubtype, fieldvalue=constitution]
+    }
+    \map{
+      \pertype{legislation}
+      \step[fieldsource=entrysubtype, match=\regexp{canada}, final]
+      \step[fieldsource=bookpagination, match={section},
+      replace={canadasection}]
+      \step[fieldsource=pagination, match={section},
+      replace={canadasection}]
+    }
+    \map{
+      \step[fieldsource=pubstate, match={forthcoming}, final]
+      \step[fieldset=year, origfieldval, final]
+      \step[fieldsource=year, match=\regexp{(forthcoming)},
+      replace=\regexp{\\bibstring\{$1\}}]%$
+    }
+    \map{
+      \pertype{article}
+      \pertype{periodical}
+      \pertype{review}
+      \pertype{suppperiodical}
+      \step[fieldsource=entrysubtype, match={newspaper},
+      replace={magazine}]
+    }
+    \map[overwrite]{
+      \step[fieldsource=subtitle, final]
+      \step[fieldsource=title,
+      match=\regexp{\\(mkbib|en)quote\{.+((\?|\!)\})$},%$
+      final]
+      \step[fieldset=title, fieldvalue=\csgdef{@cmsst}{\@ne}, append]
+    }
+    \map[overwrite]{
+      \step[fieldsource=booksubtitle, final]
+      \step[fieldsource=booktitle,
+      match=\regexp{\\(mkbib|en)quote\{.+((\?|\!)\})$},%$
+      final]
+      \step[fieldset=booktitle, fieldvalue=\csgdef{@cmsst}{\@ne}, append]
+    }
+    \map[overwrite]{
+      \step[fieldsource=issuesubtitle, final]
+      \step[fieldsource=issuetitle,
+      match=\regexp{\\(mkbib|en)quote\{.+((\?|\!)\})$},%$
+      final]
+      \step[fieldset=issuetitle, fieldvalue=\csgdef{@cmsst}{\@ne}, append]
+    }
+    \map[overwrite]{
+      \step[fieldsource=journalsubtitle, final]
+      \step[fieldsource=journaltitle,
+      match=\regexp{\\(mkbib|en)quote\{.+((\?|\!)\})$},%$
+      final]
+      \step[fieldset=journaltitle, fieldvalue=\csgdef{@cmsst}{\@ne}, append]
+    }
+    \map[overwrite]{
+      \step[fieldsource=mainsubtitle, final]
+      \step[fieldsource=maintitle,
+      match=\regexp{\\(mkbib|en)quote\{.+((\?|\!)\})$},%$
+      final]
+      \step[fieldset=maintitle, fieldvalue=\csgdef{@cmsst}{\@ne}, append]
+    }
   }
 }%
 
@@ -543,7 +633,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldequalstr{relatedtype}{reviewof}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -581,7 +675,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldequalstr{relatedtype}{reviewof}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -660,7 +758,7 @@
     {\usebibmacro{cms-in:}%
       \printtext[maintitle]{%
         \printfield[noformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[noformat]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}
@@ -671,7 +769,7 @@
       \setunit{\addspace}
       \printtext[maintitle]{%
         \printfield[noformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[noformat]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}
@@ -1450,6 +1548,12 @@
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
+\DeclareBibliographyAlias{jurisdiction}{cite:jurisdiction}
+
+\DeclareBibliographyAlias{legal}{cite:legal}
+
+\DeclareBibliographyAlias{legislation}{cite:legislation}
+
 \DeclareBibliographyDriver{letter}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
@@ -1598,7 +1702,7 @@
   \iffieldundef{entrysubtype}%
   {\usebibmacro{italtitle+stitle}}%
   {\printfield{title}%
-    \setunit{\addcolon\addspace}%
+    \setunit{\subtitlepunct}%
     \printfield[noformat]{subtitle}%
     \setunit{\ctitleaddonpunct}%
     \printfield{titleaddon}%
@@ -1673,7 +1777,7 @@
     {\usebibmacro{cms-in:}%
       \printtext[maintitle]{%
         \printfield[noformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[noformat]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}
@@ -1684,7 +1788,7 @@
       \setunit{\addspace}
       \printtext[maintitle]{%
         \printfield[noformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[noformat]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}
@@ -1811,7 +1915,7 @@
       \printdate}}%
   {\bibstring{patentfiled}\setunit{\addspace}%
     \usebibmacro{cmsorigdate}%
-    \setunit{\addcomma\addspace\bibstring{and}%
+    \setunit{\finalandcomma\addspace\bibstring{and}%
       \addspace\bibstring{patentissued}\addspace}%
     \usebibmacro{date}}%
   \newcunit\newblock
@@ -2040,7 +2144,9 @@
   \setunit{\addspace}%
   \printfield{nameaddon}%
   \newunit\newblock
-  \usebibmacro{italtitle+stitle}%
+  \iffieldequalstr{entrysubtype}{unpublished}%
+  {\usebibmacro{title+stitle}}%
+  {\usebibmacro{italtitle+stitle}}%
   \newunit% 16th ed.
   \usebibmacro{byauthor}%
   \newunit\newblock
@@ -2082,9 +2188,16 @@
   \setunit{\addspace}%
   \printfield{nameaddon}% 16th ed.
   \newunit\newblock
-  \printfield{title}%
-  \setunit{\addcolon\addspace}%
-  \printfield[noformat]{subtitle}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    test {\iffieldequalstr{relatedtype}{reviewof}}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}}%
+  {\printfield{title}%
+    \setunit{\subtitlepunct}%
+    \printfield[noformat]{subtitle}}%
   \setunit{\ptitleaddonpunct}%
   \printfield{titleaddon}%
   \setunit{\addspace}%
@@ -2114,7 +2227,11 @@
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
-  \iftoggle{cms@related}%
+  \ifboolexpr{%
+    togl {cms@related}%
+    and
+    not test {\iffieldequalstr{relatedtype}{reviewof}}%
+  }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newunit}%
@@ -2230,9 +2347,17 @@
   \setunit*{\addcomma\addspace}\newblock%
   \printfield{note}%
   \setunit*{\addcomma\addspace}\newblock%
+  \printfield{eventtitle}%
+  \setunit*{\ctitleaddonpunct}\newblock%
+  \printfield{eventtitleaddon}%
+  \setunit*{\addcomma\addspace}%
+  \printfield{venue}%
+  \setunit*{\addcomma\addspace}%
   \printlist{location}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{date}%
+  \iffieldundef{eventyear}%
+  {\usebibmacro{date}}%
+  {\printeventdate}%
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
@@ -2256,7 +2381,7 @@
   \newunit\newblock
   \printtext[title]{%
     \printfield[noformat]{title}%
-    \setunit{\addcolon\addspace}%
+    \setunit{\subtitlepunct}%
     \printfield[noformat]{subtitle}}%
   \iffieldundef{booktitle}% Comma after italics, period after quotes
   {\setunit{\ctitleaddonpunct}}%
@@ -2287,7 +2412,7 @@
     {\usebibmacro{cms-in:}%
       \printtext[maintitle]{%
         \printfield[noformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[noformat]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}%
@@ -2298,7 +2423,7 @@
       \setunit{\addspace}
       \printtext[maintitle]{%
         \printfield[noformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[noformat]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}%
@@ -2338,9 +2463,13 @@
 %%%% Other Formatting Macros %%%%
 
 \newbibmacro*{bib+doi+url}{% 16th ed.
-  \iffieldundef{urlyear}%
-  {}%
+  \ifboolexpr{%
+    togl {cms@url}%
+    and
+    not test {\iffieldundef{urlyear}}%
+    }%
   {\printurldate}% Date fix
+  {}%
   \iffieldundef{addendum}% Punctuation fixes in 0.9.9c
   {\newunit\newblock}%
   {\newcunit\newblock}%
@@ -2466,7 +2595,7 @@
     {\usebibmacro{cms-in:}% 16th ed (Also 15th?)
       \printtext[maintitle]{%
         \printfield[noformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[noformat]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}
@@ -2477,7 +2606,7 @@
       \setunit{\addspace}
       \printtext[maintitle]{%
         \printfield[noformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[noformat]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}}
@@ -2491,7 +2620,7 @@
     {\usebibmacro{cms-in:}% 16th ed (also 15th?)
       \printtext[maintitle]{%
         \printfield[noformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[noformat]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}
       \printfield{maintitleaddon}%
@@ -2503,7 +2632,7 @@
       \setunit{\addspace}
       \printtext[maintitle]{%
         \printfield[noformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[noformat]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}}
@@ -2751,7 +2880,7 @@
      \setcounter{bbx:relatedtotal}{0}%
      \def\do##1{%
        \entrydata{##1}{%
-         \ifrelatedloop
+         \ifrelatedloop%
            {}%
            {\stepcounter{bbx:relatedtotal}%
             \gappto{\bbx@tempa}{##1,}}}}%
@@ -2769,13 +2898,13 @@
             {\printtext{\relateddelim}}%
             {}}%
         \ifbibmacroundef{related:\strfield{relatedtype}}%
-          {\appto{\do}{\usebibmacro{related:default}}}
+          {\appto{\do}{\usebibmacro{related:default}}}%
           {\appto{\do}{\usebibmacro*{related:\strfield{relatedtype}}}}%
         \iffieldformatundef{related:\strfield{relatedtype}}%
-          {\def\bbx@tempa{related}}
+          {\def\bbx@tempa{related}}%
           {\def\bbx@tempa{related:\strfield{relatedtype}}}%
-        \iffieldformatundef{relatedstring:\strfield{relatedtype}}
-          {\def\bbx@tempb{relatedstring:default}}
+        \iffieldformatundef{relatedstring:\strfield{relatedtype}}%
+          {\def\bbx@tempb{relatedstring:default}}%
           {\def\bbx@tempb{relatedstring:\strfield{relatedtype}}}%
         \printtext[\bbx@tempa]{%
           \usebibmacro{begrelatedloop}%
@@ -2798,6 +2927,6 @@
           \docsvfield{related}%
           \usebibmacro{endrelatedloop}}}%
        {}%
-     \usebibmacro{endrelated}}}
+     \usebibmacro{endrelated}}}%
 
 \endinput
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 141fb2c5d9a..2839e02015b 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
@@ -1,11 +1,11 @@
-% $Id: chicago-notes.cbx,v 0.9.8.44 2017/03/22 18:41:31 dfussner Exp $
+% $Id: chicago-notes.cbx,v 0.11.1.33 2018/01/10 16:41:54 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}[2016/06/07 v 3.4 biblatex citation style]
+\ProvidesFile{chicago-notes.cbx}[2018/01/10 v 3.10 biblatex citation style]
 
 %%%% Biblatex initialization + Chicago options + Toggles %%%%
 
@@ -50,6 +50,9 @@
 \providetoggle{cms@loccit}
 \providetoggle{cms@annotation}
 \providetoggle{cms@postposit}
+\providetoggle{cms@legalnotes}% For legal types
+\providetoggle{cms@supranotes}% Ditto
+\providetoggle{cms@noneshort}% Ditto
 \providetoggle{cms@vol}
 \providetoggle{cms@postvol}
 \providetoggle{cms@usedvol}
@@ -71,6 +74,7 @@
   {}%
   {\nocite{\thefield{userc}}}%
   \global\togglefalse{cms@loccit}%
+  \global\csundef{@cmsst}%
   \iffieldequalstr{pubstate}{reprint}%
   {\toggletrue{cms@reprint}}%
   {\togglefalse{cms@reprint}}%
@@ -116,8 +120,26 @@
 \DeclareBibliographyOption{noibid}[true]{%
   \global\toggletrue{cms@noibid}}
 
-\DeclareBibliographyOption{short}[true]{%
-  \global\toggletrue{cms@allshort}}
+\DeclareBibliographyOption[boolean]{short}[true]{%
+  \global\settoggle{cms@allshort}{#1}}
+
+\DeclareBibliographyOption[boolean]{legalnotes}[true]{%
+  \global\settoggle{cms@legalnotes}{#1}}
+
+\DeclareBibliographyOption[boolean]{supranotes}[true]{%
+  \global\settoggle{cms@supranotes}{#1}}
+
+\DeclareEntryOption[boolean]{supranotes}[true]{%
+  \global\settoggle{cms@supranotes}{#1}}
+
+\DeclareBibliographyOption[boolean]{noneshort}[true]{%
+  \global\settoggle{cms@noneshort}{#1}}
+
+\DeclareTypeOption[boolean]{noneshort}[true]{%
+  \settoggle{cms@noneshort}{#1}}
+
+\DeclareEntryOption[boolean]{noneshort}[true]{%
+  \settoggle{cms@noneshort}{#1}}
 
 \DeclareBibliographyOption{shorthandibid}[true]{%
   \global\toggletrue{cms@shorthandibid}}
@@ -380,6 +402,65 @@
       Please see biblatex-chicago.pdf for valid\MessageBreak
       option keys}}}%
 
+% Adding a disambiguating field to short notes otherwise identical %
+
+\DeclareBibliographyOption[string]{shortextrafield}{%
+  \def\cms@xfield{#1}}%
+
+\DeclareTypeOption[string]{shortextrafield}{%
+  \def\cms@xfield{#1}}%
+
+\DeclareEntryOption[string]{shortextrafield}{%
+  \def\cms@xfield{#1}}%
+
+\DeclareBibliographyOption[string]{shortextraformat}{%
+  \def\cms@xformat{#1}}%
+
+\DeclareTypeOption[string]{shortextraformat}{%
+  \def\cms@xformat{#1}}%
+
+\DeclareEntryOption[string]{shortextraformat}{%
+  \def\cms@xformat{#1}}%
+
+\DeclareBibliographyOption[string]{shortextrapunct}[comma]{%
+  \ifcsdef{cms@opt@shxp@#1}%
+    {\csuse{cms@opt@shxp@#1}}%
+    {\csuse{cms@opt@shxp@period}\cms@warning@noline%
+      {'shortextrapunct=#1' is not a valid option.\MessageBreak
+        The default - 'comma' - has been set.\MessageBreak
+        Please see biblatex-chicago.pdf for valid\MessageBreak
+        option keys}}}%
+\def\cms@opt@shxp@none{%
+  \let\shortextrapunct\@empty}%
+\def\cms@opt@shxp@comma{%
+  \def\shortextrapunct{\addcomma\addspace}}%
+\def\cms@opt@shxp@colon{%
+  \def\shortextrapunct{\addcolon\addspace}}%
+\def\cms@opt@shxp@space{%
+  \def\shortextrapunct{\addspace}}%
+\def\cms@opt@shxp@semicolon{%
+  \def\shortextrapunct{\addsemicolon\addspace}}%
+\def\cms@opt@shxp@period{%
+  \def\shortextrapunct{\addperiod\addspace}}%
+
+\DeclareTypeOption[string]{shortextrapunct}[comma]{%
+  \ifcsdef{cms@opt@shxp@#1}%
+    {\csuse{cms@opt@shxp@#1}}%
+    {\csuse{cms@opt@shxp@period}\cms@warning@noline%
+      {'shortextrapunct=#1' is not a valid option.\MessageBreak
+        The default - 'comma' - has been set.\MessageBreak
+        Please see biblatex-chicago.pdf for valid\MessageBreak
+        option keys}}}%
+
+\DeclareEntryOption[string]{shortextrapunct}[comma]{%
+  \ifcsdef{cms@opt@shxp@#1}%
+    {\csuse{cms@opt@shxp@#1}}%
+    {\csuse{cms@opt@shxp@period}\cms@warning@noline%
+      {'shortextrapunct=#1' is not a valid option.\MessageBreak
+        The default - 'comma' - has been set.\MessageBreak
+        Please see biblatex-chicago.pdf for valid\MessageBreak
+        option keys}}}%
+  
 % Controlling punctuation before titleaddon fields %
 
 \DeclareBibliographyOption[string]{ptitleaddon}[period]{%
@@ -479,7 +560,12 @@
         option keys}}}%
 
 \ExecuteBibliographyOptions{includeall,completenotes,hidevolumes,%
-  related,booklongxref,ptitleaddon,ctitleaddon,shorthandpunct,urlnotes}
+  related,booklongxref,ptitleaddon,ctitleaddon,shorthandpunct,urlnotes,%
+  legalnotes,supranotes,shortextrapunct}
+
+\iftoggle{cms@legalnotes}%
+{\ExecuteBibliographyOptions[jurisdiction,legal,legislation]{skipbib}}%
+{}%
 
 % For author-date compatibility %
 
@@ -553,7 +639,21 @@
   {\global\togglefalse{cms@noidem}}}%
 
 \newbibmacro*{cite}{%
-  \ifciteseen%
+  \ifboolexpr{%
+    test {\ifciteseen}%
+    and
+    (
+    not togl {cms@noneshort}% Intended for Bluebook citations
+    or
+    (
+    test {\ifciteibid}%
+    and
+    not test {\iffirstonpage}%
+    and
+    not togl {cms@noibid}%
+    )
+    )
+  }%
     {\ifboolexpr{%
         test {\iffieldundef{shorthand}}%
         or
@@ -599,6 +699,7 @@
          {\global\toggletrue{cms@fullnote}%
            \global\togglefalse{cms@shortnote}%
            \usebibmacro{cite:full}%
+           \usebibmacro{footcite:save}% FIXME!!
            \usebibmacro{cite:save}}}}}%
 
 \newbibmacro*{cite:full}{%
@@ -608,6 +709,15 @@
       {cite:\thefield{entrytype}}}}%
 
 \newbibmacro*{cite:short}{%
+  \ifentrytype{jurisdiction}%
+  {\usebibmacro{cite:short:jurisdiction}}%
+  {\ifentrytype{legal}%
+    {\usebibmacro{cite:short:legal}}%
+    {\ifentrytype{legislation}%
+      {\usebibmacro{cite:short:legislation}}%
+      {\usebibmacro{cite:short:cms}}}}}%
+
+\newbibmacro*{cite:short:cms}{% was cite:short
   \usebibmacro{allshort+firstcite+xref}%
   \ifthenelse{\ifnameundef{labelname}\OR%
     \ifentrytype{inreference}\OR%
@@ -659,16 +769,250 @@
         {\printnames{labelname}%\usebibmacro{choose+labelname}%
           \isdot\classicpunct}}}}%
   \ifboolexpr{%
+    (
+    test {\ifentrytype{review}}%
+    or
+    test {\ifentrytype{suppperiodical}}%
+    )
+    and
+    test {\iffieldequalstr{relatedtype}{reviewof}}%
+    and
+    togl {cms@citerel}%
+  }%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}}%
+  {\ifboolexpr{%
+      togl {cms@allshort}%
+      or
+      test {\ifbibliography}%
+    }%
+    {\printtext[bibhyperref]{%
+        \printfield[citetitle]{labeltitle}}}%
+    {\printtext[cmshyperlink]{%
+        \printfield[citetitle]{labeltitle}}}%
+    \ifboolexpr{%
+      test {\ifuniquework}%
+      or
+      test {\ifcsundef{cms@xfield}}%
+    }%
+    {}%
+    {\setunit{\shortextrapunct}%
+      \usebibmacro{shortnote+extrafield}}}}%:\thefield{entrytype}?
+
+\newbibmacro*{shortnote+extrafield}{% Disambiguate otherwise identical
+  \iffieldundef{\csuse{cms@xfield}}% short notes
+  {\iflistundef{\csuse{cms@xfield}}%
+    {\ifnameundef{\csuse{cms@xfield}}%
+      {\ifcsstring{cms@xfield}{date}%
+        {\printtext[\csuse{cms@xformat}]{\printdate}}%
+        {\ifcsstring{cms@xfield}{origdate}%
+          {\printtext[\csuse{cms@xformat}]{\printorigdate}}%
+          {\ifcsstring{cms@xfield}{eventdate}%
+            {\printtext[\csuse{cms@xformat}]{\printeventdate}}%
+            {\ifcsstring{cms@xfield}{urldate}%
+              {\printtext[\csuse{cms@xformat}]{\printurldate}}%
+              {\printtext[\csuse{cms@xformat}]{\cms@xfield}}}}}}%
+      {\printtext[\csuse{cms@xformat}]{%
+          \printnames[default]{\csuse{cms@xfield}}}}}%
+    {\printtext[\csuse{cms@xformat}]{%
+        \printlist{\csuse{cms@xfield}}}}}%
+  {\ifboolexpr{%
+      test {\ifcsstring{cms@xfield}{month}}%
+      or
+      test {\ifcsstring{cms@xfield}{origmonth}}%
+      or
+      test {\ifcsstring{cms@xfield}{eventmonth}}%
+      or
+      test {\ifcsstring{cms@xfield}{urlmonth}}%
+    }%
+    {\printtext[\csuse{cms@xformat}]{%
+        \mkbibmonth{\thefield{\csuse{cms@xfield}}}}}%
+    {\ifboolexpr{%
+        test {\ifcsstring{cms@xfield}{day}}%
+        or
+        test {\ifcsstring{cms@xfield}{origday}}%
+        or
+        test {\ifcsstring{cms@xfield}{eventday}}%
+        or
+        test {\ifcsstring{cms@xfield}{urlday}}%
+      }%
+      {\printtext[\csuse{cms@xformat}]{%
+          \printfield[letterday]{\csuse{cms@xfield}}}}%
+      {\printtext[\csuse{cms@xformat}]{%
+          \printfield{\csuse{cms@xfield}}}}}}}%
+
+\newbibmacro*{footcite:save}{%
+  \ifboolexpr{%
+    test {\iffootnote}%
+    and
+    (
+    test {\ifentrytype{legal}}%
+    or
+    (
+    test {\ifentrytype{legislation}}%
+    and
+    (
+    test {\iffieldequalstr{entrysubtype}{un}}%
+    or
+    test {\iffieldequalstr{entrysubtype}{hearing}}%
+    )))
+  }%
+  {\csxdef{cbx@f@\thefield{entrykey}}{\the\value{instcount}}%
+    \label{cbx@\the\value{instcount}}}%
+  {}}%
+
+\newbibmacro*{cite:short:jurisdiction}{%
+  \iffieldundef{labeltitle}%
+  {}%
+  {\ifboolexpr{%
     togl {cms@allshort}%
     or
     test {\ifbibliography}%
   }%
   {\printtext[bibhyperref]{%
-    \printfield[citetitle]{labeltitle}}}%
+      \printfield[citetitle]{labeltitle}}}%
   {\printtext[cmshyperlink]{%
-    \printfield[citetitle]{labeltitle}}}}%:\thefield{entrytype}?
+      \printfield[citetitle]{labeltitle}}}}%
+  \newcunit% Fixme: giving us a duplicate comma
+  \printfield[jourvol]{volume}%
+  \setunit*{\addnbspace}%
+  \iffieldundef{shortjournal}% Test eliminates spurious comma
+  {}%
+  {\printtext[shortjournal]{%
+      \printfield[jtsnoformat]{shortjournal}}}%
+  \iffieldundef{issue}%
+  {\printfield[jurisdictionser]{series}}%
+  {\setunit{\addspace}%
+    \printfield{issue}}% Better ideas?
+  % \newcunit%
+  \usebibmacro{juridpostnote}}%
+
+\newbibmacro*{cite:short:legal}{%
+  \iffieldundef{labeltitle}%
+  {}%
+  {\ifboolexpr{%
+    togl {cms@allshort}%
+    or
+    test {\ifbibliography}%
+  }%
+  {\printtext[bibhyperref]{%
+      \printfield[citetitle]{labeltitle}}}%
+  {\printtext[cmshyperlink]{%
+      \printfield[citetitle]{labeltitle}}}}%
+  \newcunit% Fixme: giving us a duplicate comma
+  \printfield[jourvol]{volume}%
+  \setunit*{\addnbspace}%
+  \iffieldundef{shortjournal}% Test eliminates spurious comma
+  {}%
+  {\printtext[shortjournal]{%
+      \printfield[jtsnoformat]{shortjournal}}}%
+  \printfield[legalser]{series}%
+  \setunit{\addspace}%
+  \printfield{issue}%
+  % \newcunit%
+  \ifboolexpr{%
+    togl {cms@supranotes}%
+    and
+    test {\iffootnote}%
+  }%
+  {\newcunit%
+    \printtext{\bibstring{supranote}\addnbspace%
+      \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}}% ??
+  {}%
+  \usebibmacro{juridpostnote}}%
+
+\newbibmacro*{cite:short:legislation}{%
+  \iffieldequalstr{entrysubtype}{constitution}%
+  {\usebibmacro{clegis+news+title}%
+    \setunit{\addspace}%
+    \printfield[juridnum]{number}%
+    \newcunit%
+    \printfield{part}%
+    \newcunit%
+    \printfield{chapter}}%
+  {\iffieldequalstr{labeltitlesource}{shorttitle}%
+    {\ifboolexpr{%
+        togl {cms@allshort}%
+        or
+        test {\ifbibliography}%
+      }%
+      {\printtext[bibhyperref]{%
+          \printfield[citetitle]{labeltitle}}}%
+      {\printtext[cmshyperlink]{%
+          \printfield[citetitle]{labeltitle}}}}%
+    {\ifboolexpr{%
+        test {\iffieldundef{shortjournal}}%
+        or
+        (
+        not test {\iffieldundef{volume}}%
+        and
+        not test {\iffieldint{volume}}%
+        )
+      }%
+      {\ifboolexpr{%
+          test {\iffieldundef{entrysubtype}}%
+          and
+          not test {\iflistundef{location}}
+        }%
+        {\printlist{location}%
+          \setunit{\addspace}}%
+        {}%
+        \ifboolexpr{%
+          togl {cms@allshort}%
+          or
+          test {\ifbibliography}%
+        }%
+        {\printtext[bibhyperref]{%
+            \printfield[citetitle]{labeltitle}}}%
+        {\printtext[cmshyperlink]{%
+            \printfield[citetitle]{labeltitle}}}%
+        \setunit{\addspace}%
+        \printfield[juridnum]{number}%
+        \newcunit%
+        \printfield{part}%
+        \newcunit%
+        \printfield{chapter}}%
+      {\printfield{note}%
+        \newcunit%
+        \printfield[jourvol]{volume}%
+        \setunit*{\addnbspace}%
+        \iffieldundef{shortjournal}% Test eliminates spurious comma
+        {}%
+        {\printtext[shortjournal]{%
+            \printfield[jtsnoformat]{shortjournal}}}%
+        \printfield[legislationser]{series}%
+        \setunit{\addspace}%
+        \printfield{issue}%
+        \newcunit%
+        \printfield{part}%
+        \newcunit%
+        \printfield{chapter}%
+      }}}%
+  \newcunit%
+  \ifboolexpr{%
+    togl {cms@supranotes}%
+    and
+    test {\iffootnote}%
+    and
+    (
+    test {\iffieldequalstr{entrysubtype}{un}}%
+    or
+    test {\iffieldequalstr{entrysubtype}{hearing}}%
+    )
+  }%
+  {\newcunit%
+    \printtext{\bibstring{supranote}\addnbspace%
+      \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}}}% ??
+  {}%
+  \usebibmacro{juridpostnote}}%
 
 \newbibmacro*{cite:shorthand}{%
+  \ifthenelse{\ifentrytype{jurisdiction}\OR\ifentrytype{legal}\OR%
+    \ifentrytype{legislation}}%
+  {\usebibmacro{cite:shorthand:legal}}%
+  {\usebibmacro{cite:shorthand:cms}}}
+
+\newbibmacro*{cite:shorthand:cms}{%
   \usebibmacro{allshort+firstcite+xref}%
   \iftoggle{cms@allshort}%
   {\printtext[bibhyperref]{%
@@ -676,17 +1020,55 @@
   {\printtext[cmshyperlink]{%
       \printfield{shorthand}}}}
 
+\newbibmacro*{cite:shorthand:legal}{%
+  \usebibmacro{allshort+firstcite+xref}%
+  \iftoggle{cms@allshort}%
+  {\printtext[bibhyperref]{%
+      \printfield{shorthand}}}%
+  {\printtext[cmshyperlink]{%
+      \printfield{shorthand}}}%
+  \ifboolexpr{%
+    test {\iffootnote}%
+    and
+    (
+    test {\ifentrytype{legal}}%
+    or
+    (
+    test {\ifentrytype{legislation}}%
+    and
+    (
+    test {\iffieldequalstr{entrysubtype}{un}}%
+    or
+    test {\iffieldequalstr{entrysubtype}{hearing}}%
+    )))
+  }%
+  {\newcunit%
+    \printtext{\bibstring{supranote}\addnbspace%
+      \ref{cbx@\csuse{cbx@f@\thefield{entrykey}}}%
+      \newcunit}}% ??
+  {}}%
+
 \newbibmacro*{cms:shorthandintro}{% For changing the citedas phrase
   \iffieldundef{shorthand}%
   {}%
   {\iffieldundef{shorthandintro}%
-    {%\addspace%\setunit{\addspace}% Fix for after postnote field
-      \printtext[parens]{%
-        \bibstring{citedas}\addspace%
+    {\ifthenelse{\ifentrytype{jurisdiction}\OR\ifentrytype{legal}\OR%
+        \ifentrytype{legislation}}%
+      {\printtext[brackets]{%
+        \bibstring{hereinafter}\addspace%
         \printfield{shorthand}}}%
+      {\printtext[parens]{%
+        \bibstring{citedas}\addspace%
+        \printfield{shorthand}}}}%
     {%\addspace%\setunit{\addspace}% Ditto
       \printfield{shorthandintro}}}}
 
+\newbibmacro*{choose:ibidstring}{%
+  \ifthenelse{\ifentrytype{jurisdiction}\OR\ifentrytype{legal}\OR%
+    \ifentrytype{legislation}}%
+  {\bibsstring[\mkbibemph]{ibidem}}%
+  {\bibstring[\mkibid]{ibidem}}}
+
 \newbibmacro*{cite:ibid}{%
   \ifboolexpr{%
     togl {cms@noibid}%
@@ -699,9 +1081,9 @@
     \usebibmacro{cite:save}}%
   {\iftoggle{cms@allshort}%
     {\printtext[bibhyperref]{%
-        \bibstring[\mkibid]{ibidem}}}%
+        \usebibmacro{choose:ibidstring}}}%\bibstring[\mkibid]{ibidem}
     {\printtext[cmshyperlink]{%
-        \bibstring[\mkibid]{ibidem}}}%
+        \usebibmacro{choose:ibidstring}}}%\bibstring[\mkibid]{ibidem}
     \ifboolexpr{%
       test {\ifloccit}%
       or
@@ -944,8 +1326,9 @@
   {\usebibmacro{citeindex}%
     \toggletrue{cms@fullnote}%
     \togglefalse{cms@shortnote}%
-   \usebibmacro{cite:full}%
-   \usebibmacro{cite:save}}
+    \usebibmacro{cite:full}%
+    \usebibmacro{footcite:save}%
+    \usebibmacro{cite:save}}
   {\multicitedelim}
   {}
 
@@ -954,8 +1337,9 @@
   {\usebibmacro{citeindex}%
     \toggletrue{cms@fullnote}%
     \togglefalse{cms@shortnote}%
-   \usebibmacro{cite:full}
-   \usebibmacro{cite:save}}
+    \usebibmacro{cite:full}%
+    \usebibmacro{footcite:save}%
+    \usebibmacro{cite:save}}
   {\multicitedelim}
   {}
 
@@ -1053,9 +1437,13 @@
   {\usebibmacro{prenote}}%\usebibmacro{hlcprenote}}
   {\usebibmacro{citeindex}%
     \ifboolexpr{%
+      (
       test {\ifciteseen}%
       or
       togl {cms@allshort}%
+      )
+      and
+      not togl {cms@noneshort}%
     }%
     {\usebibmacro{cite:short}}
     {\renewbibmacro*{author/editor}{\usebibmacro{choose+surname}}%
@@ -1336,7 +1724,11 @@
   \newcunit\newblock
   \usebibmacro{pageref}%
   \newcunit\newblock
-  \iftoggle{cms@citerel}%
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldequalstr{relatedtype}{reviewof}}%
+    }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newcunit}%
@@ -1376,7 +1768,11 @@
   \newcunit\newblock
   \usebibmacro{pageref}%
   \newcunit\newblock
-  \iftoggle{cms@citerel}%
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldequalstr{relatedtype}{reviewof}}%
+    }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newcunit}%
@@ -1455,7 +1851,7 @@
       {\bibstring{in}\setunit{\addspace}}%
       \printtext[maintitle]{%
         \printfield[mtnoformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[smtnoformat]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}
@@ -1467,7 +1863,7 @@
       \setunit{\addspace}
       \printtext[maintitle]{%
         \printfield[mtnoformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[smtnoformat]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}
       \printfield{maintitleaddon}}}
@@ -2119,6 +2515,450 @@
   {}%
   \usebibmacro{finentry}}
 
+\DeclareBibliographyDriver{cite:jurisdiction}{%
+  \iffieldequalstr{entrysubtype}{square}% FIXME?
+  {\usebibmacro{bibindex}%
+    \usebibmacro{clegis+news+title}%
+    \setunit{\addspace}%
+    \usebibmacro{language+transtitle}%
+    \setunit{\addcomma\addspace}%
+    \usebibmacro{byauthor}%
+    \setunit{\addcomma\addspace}%
+    \usebibmacro{cpart+editor+translator}%
+    \newcunit%
+    \usebibmacro{issuetitle}%
+    \setunit{\addcomma\addspace}%
+    \usebibmacro{cbyeditor+others}%
+    \setunit{\addcomma\addspace}%
+    \printfield[juridnum]{number}%
+    \newcunit%
+    \iffieldundef{year}%
+    {}%
+    {\printtext[brackets]{%
+      \begingroup% Better ideas?
+      \let\abx@bibmonth\blx@imc@bibsstring%
+      \usebibmacro{date}\endgroup}}%
+    \setunit*{\addspace}%
+    \printfield[jourvol]{volume}%
+    \setunit{\addnbspace}%
+    \iffieldundef{shortjournal}%
+    {}%
+    {\printtext[shortjournal]{%
+      \printfield[jtsnoformat]{shortjournal}}}%
+    \iffieldundef{issue}%
+    {\printfield[jurisdictionser]{series}}%
+    {\setunit{\addspace}%
+      \printfield{issue}}% Better ideas?
+    \usebibmacro{juridpostnote}%
+    \setunit{\addcomma\addspace}%
+    \printfield{note}%
+    \setunit{\addspace}%
+    \printlist{location}%
+    \setunit{\shorthandpunct}%
+    \usebibmacro{cms:shorthandintro}% Moved before addendum
+    \setunit{\addspace}\newblock
+    \printfield{addendum}%
+    \newcunit\newblock
+    \iftoggle{cms@isbn}%
+    {\printfield{issn}}%
+    {}%
+    \newcunit\newblock
+    \usebibmacro{cite+doi+url}%
+    \newcunit\newblock
+    \usebibmacro{pageref}%
+    \newcunit\newblock
+    \iftoggle{cms@citerel}%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}%
+      \newcunit}%
+    {}%
+    \usebibmacro{finentry}}
+  {\iffieldequalstr{entrysubtype}{round}% FIXME?
+    {\usebibmacro{bibindex}%
+      \usebibmacro{clegis+news+title}%
+      \setunit{\addspace}%
+      \usebibmacro{language+transtitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{byauthor}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cpart+editor+translator}%
+      \newcunit%
+      \usebibmacro{issuetitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cbyeditor+others}%
+      \setunit{\addcomma\addspace}%
+      \printfield[juridnum]{number}%
+      \newcunit%
+      \iffieldundef{year}%
+      {}%
+      {\printtext[parens]{%
+        \begingroup% Better ideas?
+        \let\abx@bibmonth\blx@imc@bibsstring%
+        \usebibmacro{date}\endgroup}}%
+      \setunit*{\addspace}%
+      \printfield[jourvol]{volume}%
+      \setunit{\addnbspace}%
+      \iffieldundef{shortjournal}%
+      {}%
+      {\printtext[shortjournal]{%
+        \printfield[jtsnoformat]{shortjournal}}}%
+      \iffieldundef{issue}%
+      {\printfield[jurisdictionser]{series}}%
+      {\setunit{\addspace}%
+        \printfield{issue}}% Better ideas?
+      \usebibmacro{juridpostnote}%
+      \setunit{\addcomma\addspace}%
+      \printfield{note}%
+      \setunit{\addspace}%
+      \printlist{location}%
+      \setunit{\shorthandpunct}%
+      \usebibmacro{cms:shorthandintro}% Moved before addendum
+      \setunit{\addspace}\newblock
+      \printfield{addendum}%
+      \newcunit\newblock
+      \iftoggle{cms@isbn}%
+      {\printfield{issn}}%
+      {}%
+      \newcunit\newblock
+      \usebibmacro{cite+doi+url}%
+      \newcunit\newblock
+      \usebibmacro{pageref}%
+      \newcunit\newblock
+      \iftoggle{cms@citerel}%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {}%
+      \usebibmacro{finentry}}
+    {\usebibmacro{bibindex}%
+      \usebibmacro{clegis+news+title}%
+      \setunit{\addspace}%
+      \usebibmacro{language+transtitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{byauthor}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cpart+editor+translator}%
+      \newcunit%
+      \usebibmacro{issuetitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cbyeditor+others}%
+      \setunit{\addcomma\addspace}%
+      \printfield[juridnum]{number}%
+      \newcunit%
+      \printfield[jourvol]{volume}%
+      \setunit*{\addnbspace}%
+      \iffieldundef{shortjournal}%
+      {}%
+      {\printtext[shortjournal]{%
+        \printfield[jtsnoformat]{shortjournal}}}%
+      \iffieldundef{issue}%
+      {\printfield[jurisdictionser]{series}}%
+      {\setunit{\addspace}%
+        \printfield{issue}}% Better ideas?
+      \setunit{\addspace}%
+      \printlist{origpublisher}% Extra reporters, same pagination
+      \usebibmacro{juridpostnote}%
+      \setunit{\addcomma\addspace}%
+      \printlist{origlocation}% Extra reporters, different pagination
+      \setunit{\addcomma\addspace}%
+      \printfield{note}%
+      \setunit{\addspace}%
+      \ifboolexpr{%
+        test {\iffieldundef{year}}%
+        and
+        test {\iflistundef{location}}%
+      }%
+      {}%
+      {\printtext[parens]{%
+        \printlist{location}%
+        \setunit*{\addspace}%
+        \begingroup% Better ideas?
+        \let\abx@bibmonth\blx@imc@bibsstring%
+        \usebibmacro{date}\endgroup}}%
+      \setunit{\shorthandpunct}%
+      \usebibmacro{cms:shorthandintro}% Moved before addendum
+      \setunit{\addspace}\newblock
+      \printfield{addendum}%
+      \newcunit\newblock
+      \iftoggle{cms@isbn}%
+      {\printfield{issn}}%
+      {}%
+      \newcunit\newblock
+      \usebibmacro{cite+doi+url}%
+      \newcunit\newblock
+      \usebibmacro{pageref}%
+      \newcunit\newblock
+      \iftoggle{cms@citerel}%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {}%
+      \usebibmacro{finentry}}}}
+
+\DeclareBibliographyDriver{cite:legal}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \setunit{\addspace}%
+  \printfield{nameaddon}%
+  \newcunit\newblock
+  \usebibmacro{clegis+news+title}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{byauthor}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{cpart+editor+translator}%
+  \newcunit%
+  \usebibmacro{issuetitle}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{cbyeditor+others}%
+  \setunit{\addcomma\addspace}%
+  \printfield[juridnum]{number}%
+  \newcunit%
+  \iffieldundef{year}%
+  {}%
+  {\printtext{%
+    \begingroup% Better ideas?
+    \let\abx@bibmonth\blx@imc@bibsstring%
+    \usebibmacro{date}\endgroup}}%
+  \newcunit%\setunit*{\addspace}%
+  \printfield[jourvol]{volume}%
+  \setunit*{\addnbspace}%
+  \iffieldundef{shortjournal}%
+  {}%
+  {\printtext[shortjournal]{%
+    \printfield[jtsnoformat]{shortjournal}}}%
+  \setunit{\addspace}%
+  \printfield{series}%
+  \setunit{\addspace}%
+  \printfield{issue}%
+  \newcunit%
+  \printfield{part}%
+  \newcunit%
+  \printfield{chapter}%
+  \usebibmacro{juridpostnote}%
+  \setunit{\addcomma\addspace}%
+  \printfield{note}%
+  \setunit{\addspace}%
+  \printlist{location}%
+  \setunit{\shorthandpunct}%
+  \usebibmacro{cms:shorthandintro}% Moved before addendum
+  \setunit{\addspace}\newblock%
+  \printfield{addendum}%
+  \newcunit\newblock
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
+  \newcunit\newblock
+  \usebibmacro{cite+doi+url}%
+  \newcunit\newblock
+  \usebibmacro{pageref}%
+  \newcunit\newblock
+  \iftoggle{cms@citerel}%
+  {\usebibmacro{related:init}%
+    \usebibmacro{related}%
+    \newcunit}%
+  {}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{cite:legislation}{%
+  \iffieldequalstr{entrysubtype}{uk}% FIXME?
+  {\usebibmacro{bibindex}%
+    \usebibmacro{author/editor}%
+    \setunit{\addspace}%
+    \printfield{nameaddon}%
+    \newcunit\newblock
+    \usebibmacro{clegis+news+title}%
+    \setunit{\addspace}%
+    \usebibmacro{language+transtitle}%
+    \setunit{\addcomma\addspace}%
+    \usebibmacro{byauthor}%
+    \setunit{\addcomma\addspace}%
+    \usebibmacro{cpart+editor+translator}%
+    \newcunit%
+    \usebibmacro{issuetitle}%
+    \setunit{\addcomma\addspace}%
+    \usebibmacro{cbyeditor+others}%
+    \setunit{\addcomma\addspace}%
+    \printfield[juridnum]{number}%
+    \setunit{\addcomma\addspace}%
+    \printfield{note}% Needed here?
+    \newcunit%
+    \iffieldundef{year}%
+    {}%
+    {\printtext{%
+      \begingroup% Better ideas?
+      \let\abx@bibmonth\blx@imc@bibsstring%
+      \usebibmacro{date}\endgroup}}%
+    \newcunit%\setunit*{\addspace}%
+    \printfield[jourvol]{volume}%
+    \setunit*{\addnbspace}%
+    \iffieldundef{shortjournal}%
+    {}%
+    {\printtext[shortjournal]{%
+      \printfield[jtsnoformat]{shortjournal}}}%
+    \setunit{\addspace}%
+    \printfield{series}%
+    \setunit{\addspace}%
+    \printfield{issue}%
+    \newcunit%
+    \printfield{part}%
+    \newcunit%
+    \printfield{chapter}%
+    \usebibmacro{juridpostnote}%
+    \setunit{\addspace}%
+    \printlist{location}%
+    \setunit{\shorthandpunct}%
+    \usebibmacro{cms:shorthandintro}% Moved before addendum
+    \setunit{\addspace}\newblock%
+    \printfield{addendum}%
+    \newcunit\newblock
+    \iftoggle{cms@isbn}%
+    {\printfield{issn}}%
+    {}%
+    \newcunit\newblock
+    \usebibmacro{cite+doi+url}%
+    \newcunit\newblock
+    \usebibmacro{pageref}%
+    \newcunit\newblock
+    \iftoggle{cms@citerel}%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}%
+      \newcunit}%
+    {}%
+    \usebibmacro{finentry}}
+  {\iffieldequalstr{entrysubtype}{hansard}% FIXME?
+    {\usebibmacro{bibindex}%
+      \usebibmacro{author/editor}%
+      \setunit{\addspace}%
+      \printfield{nameaddon}%
+      \newcunit\newblock
+      \usebibmacro{clegis+news+title}%
+      \setunit{\addspace}%
+      \usebibmacro{language+transtitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{byauthor}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cpart+editor+translator}%
+      \newcunit%
+      \usebibmacro{issuetitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cbyeditor+others}%
+      \setunit{\addcomma\addspace}%
+      \printfield[juridnum]{number}%
+      \setunit{\addcomma\addspace}%
+      \printfield{note}% Needed here?
+      \newcunit%
+      \printfield[jourvol]{volume}%
+      \setunit*{\addnbspace}%
+      \iffieldundef{shortjournal}%
+      {}%
+      {\printtext[shortjournal]{%
+        \printfield[jtsnoformat]{shortjournal}}}%
+      \setunit{\addspace}%
+      \printfield[hansardser]{series}%
+      \setunit{\addspace}%
+      \iffieldundef{year}%
+      {}%
+      {\printtext[parens]{%
+        \begingroup% Better ideas?
+        \let\abx@bibmonth\blx@imc@bibsstring%
+        \usebibmacro{date}\endgroup}}%
+      \usebibmacro{juridpostnote}%
+      \setunit{\addspace}%
+      \printlist{location}%
+      \setunit{\shorthandpunct}%
+      \usebibmacro{cms:shorthandintro}% Moved before addendum
+      \setunit{\addspace}\newblock%
+      \printfield{addendum}%
+      \newcunit\newblock
+      \iftoggle{cms@isbn}%
+      {\printfield{issn}}%
+      {}%
+      \newcunit\newblock
+      \usebibmacro{cite+doi+url}%
+      \newcunit\newblock
+      \usebibmacro{pageref}%
+      \newcunit\newblock
+      \iftoggle{cms@citerel}%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {}%
+      \usebibmacro{finentry}}
+    {\usebibmacro{bibindex}%
+      \usebibmacro{author/editor}%
+      \setunit{\addspace}%
+      \printfield{nameaddon}%
+      \newcunit\newblock
+      \usebibmacro{clegis+news+title}%
+      \setunit{\addspace}%
+      \usebibmacro{language+transtitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{byauthor}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cpart+editor+translator}%
+      \newcunit%
+      \usebibmacro{issuetitle}%
+      \setunit{\addcomma\addspace}%
+      \usebibmacro{cbyeditor+others}%
+      \setunit{\addspace}% FIXME?
+      \printfield[juridnum]{number}%
+      \setunit{\addcomma\addspace}%
+      \printfield{note}% Needed here?
+      \newcunit%
+      \printfield[jourvol]{volume}%
+      \setunit*{\addnbspace}%
+      \iffieldundef{shortjournal}%
+      {}%
+      {\printtext[shortjournal]{%
+        \printfield[jtsnoformat]{shortjournal}}}%
+      \newcunit%
+      \printfield{series}%
+      \setunit{\addspace}%
+      \printfield{issue}%
+      \newcunit%
+      \printfield{part}%
+      \newcunit%
+      \printfield{chapter}%
+      \usebibmacro{juridpostnote}%
+      \setunit{\addspace}%
+      \ifboolexpr{%
+        test {\iffieldundef{year}}%
+        and
+        test {\iffieldundef{usera}}%
+        and
+        test {\iflistundef{location}}%
+      }%
+      {}%
+      {\printtext[parens]{%
+          \printlist{location}%
+          \setunit*{\addspace}%
+          \printfield{usera}%
+          \setunit*{\addspace}%
+          \begingroup% Better ideas?
+          \let\abx@bibmonth\blx@imc@bibsstring%
+          \usebibmacro{date}\endgroup}}%
+      \setunit{\shorthandpunct}%
+      \usebibmacro{cms:shorthandintro}%
+      \setunit{\addspace}\newblock%
+      \printfield{addendum}%
+      \newcunit\newblock
+      \iftoggle{cms@isbn}%
+      {\printfield{issn}}%
+      {}%
+      \newcunit\newblock
+      \usebibmacro{cite+doi+url}%
+      \newcunit\newblock
+      \usebibmacro{pageref}%
+      \newcunit\newblock
+      \iftoggle{cms@citerel}%
+      {\usebibmacro{related:init}%
+        \usebibmacro{related}%
+        \newcunit}%
+      {}%
+      \usebibmacro{finentry}}}}
+
 \DeclareBibliographyDriver{cite:letter}{%
   \usebibmacro{bibindex}%
   \savefield{fullhash}{\bbx@lasthash}%
@@ -2246,7 +3086,7 @@
   \iffieldundef{entrysubtype}%
   {\usebibmacro{citaltitle+stitle}}%
   {\printfield{title}%
-    \setunit{\addcolon\addspace}%
+    \setunit{\subtitlepunct}%
     \printfield[noformat]{subtitle}%
     \setunit{\ctitleaddonpunct}%
     \printfield{titleaddon}%
@@ -2321,7 +3161,7 @@
       {\bibstring{in}\setunit{addspace}}%
       \printtext[maintitle]{%
         \printfield[mtnoformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[smtnoformat]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}
@@ -2333,7 +3173,7 @@
       \setunit{\addspace}
       \printtext[maintitle]{%
         \printfield[mtnoformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[smtnoformat]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}
@@ -2466,7 +3306,7 @@
       \printdate}}%
   {\bibstring{patentfiled}\setunit{\addspace}%
     \usebibmacro{cmsorigdate}%
-    \setunit{\addcomma\addspace\bibstring{and}%
+    \setunit{\finalandcomma\addspace\bibstring{and}%
       \addspace\bibstring{patentissued}\addspace}%
   \usebibmacro{date}}%
   \usebibmacro{caddendum}}%
@@ -2687,7 +3527,9 @@
   \setunit{\addspace}%
   \printfield{nameaddon}%
   \setunit{\addcomma\addspace}\newblock
-  \usebibmacro{citaltitle+stitle}%
+  \iffieldequalstr{entrysubtype}{unpublished}%
+  {\usebibmacro{ctitle+stitle}}%
+  {\usebibmacro{citaltitle+stitle}}%
   \newcunit
   \usebibmacro{byauthor}%
   \newcunit%
@@ -2731,9 +3573,16 @@
   \setunit{\addspace}%
   \printfield{nameaddon}% 16th ed.
   \newcunit\newblock
-  \printfield{title}%
-  \setunit{\addcolon\addspace}%
-  \printfield[noformat]{subtitle}%
+  \ifboolexpr{%
+    test {\iffieldequalstr{relatedtype}{reviewof}}%
+    and
+    togl {cms@citerel}%
+    }%
+    {\usebibmacro{related:init}%
+      \usebibmacro{related}}%
+    {\printfield{title}%
+      \setunit{\subtitlepunct}%
+      \printfield[noformat]{subtitle}}%
   \setunit{\ctitleaddonpunct}%
   \printfield{titleaddon}%
   \setunit{\addspace}%
@@ -2764,7 +3613,11 @@
   \newcunit\newblock
   \usebibmacro{pageref}%
   \newcunit\newblock
-  \iftoggle{cms@citerel}%
+  \ifboolexpr{%
+    togl {cms@citerel}%
+    and
+    not test {\iffieldequalstr{relatedtype}{reviewof}}%
+    }%
   {\usebibmacro{related:init}%
     \usebibmacro{related}%
     \newcunit}%
@@ -2880,9 +3733,17 @@
     \newcunit\newblock
     \usebibmacro{cnotefield}%
     \newcunit\newblock
+    \printfield{eventtitle}%
+    \setunit{\ctitleaddonpunct}%
+    \printfield{eventtitleaddon}%
+    \newcunit%
+    \printfield{venue}%
+    \newcunit%
     \printlist{location}%
     \newcunit\newblock
-    \usebibmacro{date}}%
+    \iffieldundef{eventyear}%
+    {\usebibmacro{date}}%
+    {\printeventdate}}%
   \usebibmacro{caddendum}%
   \usebibmacro{fullpostnote}%
   \newcunit\newblock
@@ -2930,7 +3791,7 @@
       {\bibstring{in}\setunit{\addspace}}%
       \printtext[maintitle]{%
         \printfield[mtnoformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[smtnoformat]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}
@@ -2942,7 +3803,7 @@
       \setunit{\addspace}
       \printtext[maintitle]{%
         \printfield[mtnoformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[smtnoformat]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}
@@ -3015,13 +3876,32 @@
     {#1}%
     {\multipubsdelim #1\isdot}}}
 
+\DeclareListFormat[jurisdiction]{location}{%
+  \iffieldundef{entrysubtype}%
+  {\usebibmacro{list:delim}{#1}%
+    #1\isdot%
+    \usebibmacro{list:andothers}}%
+  {\ifthenelse{\value{listcount}<\value{listtotal}}%
+    {\mkbibparens{#1}\addspace}%
+    {\mkbibparens{#1\isdot}}}}%
+
+\DeclareListFormat[jurisdiction]{origlocation}{%
+  \ifthenelse{\value{listcount}<\value{listtotal}}%
+  {#1\isdot\addcomma\addspace}%
+  {#1\isdot}}
+
+\DeclareListFormat[jurisdiction]{origpublisher}{%
+  \ifthenelse{\value{listcount}<\value{listtotal}}%
+  {\mkbibparens{#1}\addspace}%
+  {\mkbibparens{#1\isdot}}}
+
 \DeclareListFormat{periodplace}{\mkbibparens{#1}}
 
 \DeclareListFormat{lista}{% 
   \ifthenelse{\value{listtotal}<2}%
-  {s\adddot v\adddot\addspace\mkbibquote{#1\isdot}}%
+  {\bibsstring{subverbo}\addspace\mkbibquote{#1\isdot}}%
   {\ifthenelse{\value{listcount}=1}%
-    {s\adddot vv\adddot\addspace \mkbibquote{#1\isdot}\addcomma}%
+    {\bibsstring{subverbis}\addspace\mkbibquote{#1\isdot}\addcomma}%
     {\ifthenelse{\value{listcount}<\value{listtotal}}%
       {\addspace\mkbibquote{#1\isdot}\addcomma}%
       {\addspace\mkbibquote{#1\isdot}}}}}
@@ -3101,10 +3981,34 @@
 \DeclareFieldFormat[inreference]{postnote}{%
   \iftoggle{cms@comprange}%
   {\iffieldundef{pagination}%
-    {s\adddot v\adddot\addspace\mkbibquote{#1}}%
+    {\bibsstring{subverbo}\addspace\mkbibquote{#1}}%
     {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
   {\iffieldundef{pagination}%
-    {s\adddot v\adddot\addspace\mkbibquote{#1}}%
+    {\bibsstring{subverbo}\addspace\mkbibquote{#1}}%
+    {\mkpageprefix[pagination]{#1}}}}%
+
+\newrobustcmd*{\mkjuridprefix}[1]{%
+  \ifboolexpr{% FIXME: Is this always right?
+    test {\iftoggle{cms@fullnote}}%
+    and
+    test {\ifentrytype{jurisdiction}}%
+    }%
+  {\iffieldundef{issue}%
+    {#1}%
+    {\printtext{at}\addspace *#1}}%
+  {\iffieldundef{issue}%
+    {\printtext{at}\addspace #1}% FIXME: Make it a bibstring?
+    {\ifentrytype{jurisdiction}%
+      {\printtext{at}\addspace *#1}%
+      {\printtext{at}\addspace #1}}}}%
+
+\DeclareFieldFormat[jurisdiction,legal,legislation]{postnote}{%
+  \iftoggle{cms@comprange}%
+  {\iffieldundef{pagination}%
+    {\mkcomprange[\mkjuridprefix]{#1}}%
+    {\mkcomprange[{\mkpageprefix[pagination]}]{#1}}}%
+  {\iffieldundef{pagination}%
+    {\mkjuridprefix{#1}}%
     {\mkpageprefix[pagination]{#1}}}}%
 
 \DeclareFieldFormat{pages}{%
@@ -3116,12 +4020,26 @@
     {#1\isdot}%
     {\mkpageprefix[bookpagination]{#1}}}}%
 
-\DeclareFieldFormat{edlang}{%
+% \DeclareFieldFormat{edlang}{%
+%   \ifbibstring{#1}%
+%   {\bibstring{#1}}%
+%   {\ifbibstring{ed#1}%
+%     {\bibstring{ed#1}}%
+%     {\ifcapital{\MakeCapital{#1}}{#1}}}}
+
+\DeclareListFormat{edlang}{% Required for feminine forms in some
+  \usebibmacro{list:delim}{% languages
+    \ifbibstring{#1}%
+    {\bibxstring{#1}}%
+    {\ifbibstring{ed#1}%
+      {\bibxstring{ed#1}}%
+      {\ifcapital{\MakeCapital{#1}}{#1}}}}%
   \ifbibstring{#1}%
   {\bibstring{#1}}%
   {\ifbibstring{ed#1}%
     {\bibstring{ed#1}}%
-    {\ifcapital{\MakeCapital{#1}}{#1}}}}
+    {\ifcapital{\MakeCapital{#1}}{#1}}}%
+  \usebibmacro{list:andothers}}
 
 \DeclareFieldFormat[suppbook,suppcollection]{title}{\mkbibemph{#1}\isdot}
 
@@ -3173,6 +4091,21 @@
 \DeclareFieldFormat[review,suppperiodical]{lostitle}{%
   \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}
 
+\DeclareFieldFormat[report]{title}{%
+  \iffieldequalstr{entrysubtype}{unpublished}%
+  {\mkbibquote{#1\isdot}}%
+  {\mkbibemph{#1}\isdot}}%
+
+\DeclareFieldFormat[report]{citetitle}{%
+  \iffieldequalstr{entrysubtype}{unpublished}%
+  {\mkbibquote{#1\isdot}}%
+  {\mkbibemph{#1}\isdot}}
+
+\DeclareFieldFormat[report]{lostitle}{%
+  \iffieldequalstr{entrysubtype}{unpublished}%
+  {\mkbibquote{#1\isdot}}%
+  {\mkbibemph{#1}\isdot}}
+
 \DeclareFieldFormat[audio,music,video]{title}{%
   \iffieldundef{booktitle}%
   {\mkbibemph{#1}\isdot}%
@@ -3188,6 +4121,29 @@
   {\mkbibemph{#1}\isdot}%
   {\mkbibquote{#1\isdot}}}
 
+\DeclareFieldFormat[jurisdiction,legal]{title}{#1\isdot}
+
+\DeclareFieldFormat[legislation]{title}{%
+  \iffieldequalstr{entrysubtype}{hearing}%
+  {\mkbibemph{#1}\isdot}%
+  {#1\isdot}}
+
+\DeclareFieldFormat[jurisdiction]{citetitle}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldFormat[jurisdiction,legal]{lostitle}{#1\isdot}
+
+\DeclareFieldFormat[legislation]{lostitle}{%
+  \iffieldequalstr{entrysubtype}{hearing}%
+  {\mkbibemph{#1}\isdot}%
+  {#1\isdot}}
+
+\DeclareFieldFormat[legal]{citetitle}{#1\isdot}
+
+\DeclareFieldFormat[legislation]{citetitle}{%
+  \iffieldequalstr{entrysubtype}{hearing}%
+  {\mkbibemph{#1}\isdot}%
+  {#1\isdot}}
+
 %%%% Other Field Formats %%%%
 
 \DeclareNumChars*{:}% For proper ibidem with multi-volume works.
@@ -3256,12 +4212,12 @@
   \iftoggle{cms@reprint}% Date fix
   {#1}%
   {\ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}}%
-    {\bibstring{recorded}\addspace #1}%
+    {\bibstring{discrecorded}\addspace #1}% Can now match gender
     {\printfield{userd}\addspace #1}}}
 
 \DeclareFieldFormat[music]{eventdate}{% 16th ed.
   \iffieldundef{userd}%
-  {\bibstring{recorded}\addspace #1}%
+  {\bibstring{songrecorded}\addspace #1}% Can now match gender
   {\printfield{userd}\addspace #1}}
 
 \DeclareFieldFormat[video]{eventdate}{% 16th ed.
@@ -3314,6 +4270,13 @@
 
 \DeclareFieldAlias{maintitleaddon}{titleaddon}
 
+\DeclareFieldFormat[jurisdiction,legal,legislation]{journaltitle}{%
+  \iffieldundef{shortjournal}%
+  {#1\isdot}%
+  {\mkbibemph{#1}\isdot}}
+
+\DeclareFieldFormat[jurisdiction,legal,legislation]{shortjournal}{#1\isdot}
+
 \DeclareFieldFormat{journaltitle}{\mkbibemph{#1}\isdot}
 
 \DeclareFieldFormat{issuetitle}{\mkbibquote{#1\isdot}}
@@ -3329,6 +4292,29 @@
     \bibstring{jourser}}%
   {\ifbibstring{#1}{\bibstring{#1}}{#1}}}%
 
+\DeclareFieldFormat{jurisdictionser}{%
+  \ifinteger{#1}%
+  {\mkjuridordinal{#1}}%
+  {\ifbibstring{#1}{\bibstring{#1}}{#1}}}%
+
+\DeclareFieldFormat{legislationser}{%
+  \iffieldequalstr{entrysubtype}{hansard}%
+  {\ifinteger{#1}%
+    {\addspace\mkbibparens{\mkjuridordinal{#1}\addspace\bibsstring{jourser}}}%
+    {\ifbibstring{#1}%
+      {\addspace\mkbibparens{\bibstring{#1}}}%
+      {\addspace\mkbibparens{#1}}}}%
+  {\iffieldequalstr{entrysubtype}{uk}%
+    {\addspace #1\isdot}%
+    {\addcomma\addspace #1\isdot}}}%
+
+\DeclareFieldFormat{legalser}{\addspace #1\isdot}%
+
+\DeclareFieldFormat{hansardser}{%
+  \ifinteger{#1}%
+  {\mkbibparens{\mkjuridordinal{#1}\addspace\bibsstring{jourser}}}%
+  {\ifbibstring{#1}{\mkbibparens{\bibstring{#1}}}{\mkbibparens{#1}}}}%
+
 \DeclareFieldFormat{journum}{% Revised for 0.9.5
   \ifboolexpr{%
     test {\ifnumerals{#1}}%
@@ -3338,6 +4324,8 @@
   {\bibstring{numbers}\addspace #1}%
   {\bibstring{number}\addspace #1}}%
 
+\DeclareFieldFormat{juridnum}{\bibcpstring{number}\addspace #1}%
+
 \DeclareFieldFormat{jourvol}{#1}
 
 \DeclareFieldFormat{sernum}{%
@@ -3350,6 +4338,9 @@
 \DeclareFieldFormat{addendum}{%
   \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}
 
+\DeclareFieldFormat[jurisdiction,legal,legislation]{addendum}{%
+  \ifcapital{\mkbibparens{\MakeCapital{#1\isdot}}}{\mkbibparens{#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.
 
@@ -3365,6 +4356,17 @@
   {\bibstring{partvolume}~#1}%
   {\ifcapital{\MakeCapital{#1}}{#1}}}
 
+\DeclareFieldFormat[legal,legislation]{part}{%
+  \ifnumerals{#1}%
+  {\bibsstring{part}~#1}%
+  {#1\isdot}}%
+
+\DeclareFieldFormat[legal,legislation]{chapter}{%
+  \ifthenelse{\iffieldequalstr{entrysubtype}{uk}\OR%
+    \iffieldequalstr{entrysubtype}{hansard}}%
+  {c\adddotspace #1}%
+  {\bibsstring{chapter}~#1}}%
+
 %% This tries to get hyperlinks from shortened cross-ref'd notes to %%
 %% long notes working properly.  Used in short and shorthand cites. %%
 
@@ -3449,7 +4451,9 @@
   {\ifcapital%
     {\MakeCapital{#1}}%
     {#1}}%
-  \printunit{\relatedpunct}}%
+  \ifentrytype{jurisdiction}%
+  {\newcunit}%
+  {\printunit{\relatedpunct}}}%
 
 \DeclareFieldFormat{relatedstring:reprintfrom}{% For notes + bib
   \ifboolexpr{%
@@ -3475,6 +4479,17 @@
 \renewcommand*{\iffinalcitedelim}{%
   \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}
 
+\renewcommand*{\subtitlepunct}{% Follows CMS16 spec.
+  \ifboolexpr{%
+    test {\ifterm}%
+    and
+    not test {\ifcsdef{@cmsst}}%
+  }%
+  {\addspace}%
+  {\addcolon\addspace%
+    \global\csundef{@cmsst}}%
+}
+
 \newcommand{\custpunct}{%
   \iftoggle{cms@fullnote}%
   {\iffieldequalstr{type}{plain}%
@@ -3637,22 +4652,34 @@
     {\addcomma\addspace\bibstring{and}\addspace}}}%
 
 \renewcommand*{\postnotedelim}{%
-  \iftoggle{cms@shortnote}%
-  {\iffieldequalstr{entrysubtype}{classical}%
-    {\NumCheckSetup{\DeclareNumChars*{abcdeABCDE}}% Makes classical
-      \iffieldpages{postnote}% test more accurate. See 17.253.
-      {\addspace}%
-      {\addcomma\addspace}}%
-    {\addcomma\addspace}}% 16th ed -- no more volumes test.
-  {\iftoggle{cms@fullnote}%
-    {\ifthenelse{\(\ifentrytype{article}\OR
-        \ifentrytype{review}\OR
-        \ifentrytype{periodical}\OR
-        \ifentrytype{suppperiodical}\)\AND\NOT
-        \iffieldequalstr{entrysubtype}{magazine}}%
-      {\addcolon\addspace}%
-      {\addcomma\addspace}}%
-    {\addcomma\addspace}}}%
+  \ifboolexpr{%
+    test {\ifciteibid}%
+    and
+    (
+    test {\ifentrytype{jurisdiction}}%
+    or
+    test {\ifentrytype{legal}}%
+    or
+    test {\ifentrytype{legislation}}%
+    )
+  }%
+  {\addspace}%
+  {\iftoggle{cms@shortnote}%
+    {\iffieldequalstr{entrysubtype}{classical}%
+      {\NumCheckSetup{\DeclareNumChars*{abcdeABCDE}}% Makes classical
+        \iffieldpages{postnote}% test more accurate. See 17.253.
+        {\addspace}%
+        {\addcomma\addspace}}%
+      {\addcomma\addspace}}% 16th ed -- no more volumes test.
+    {\iftoggle{cms@fullnote}%
+      {\ifthenelse{\(\ifentrytype{article}\OR
+          \ifentrytype{review}\OR
+          \ifentrytype{periodical}\OR
+          \ifentrytype{suppperiodical}\)\AND\NOT
+          \iffieldequalstr{entrysubtype}{magazine}}%
+        {\addcolon\addspace}%
+        {\addcomma\addspace}}%
+      {\addcomma\addspace}}}}%
 
 \newcommand*{\postnotewrapper}{%
   \iftoggle{cms@modpostnote}%
@@ -3700,47 +4727,68 @@
   {\addperiod\addspace}%
   {\addcomma\addspace}}
 
-\newcommand*{\lbx@cfromlang}{% Needed to eliminate "by" after "trans."
-  \iffieldundef{userf}%
-  {\iffieldundef{origlanguage}%
+\DeclareListFormat{cfromoriglanguage}{% Needed for notes, to provide
+  \begingroup% final {by}.
+  \blx@bibstringnormal%
+  \usebibmacro{list:delim}{%
+    \ifbibstring{from#1}%
+      {\bibxlstring{cfrom#1}}%
+      {\ifbibstring{clang#1}%
+         {\bibxlstring{lang#1}}%
+         {#1}}}%
+  \ifbibstring{cfrom#1}%
+  {\ifboolexpr{%
+      test {\ifnumless{\value{listcount}}{\value{liststop}}}%
+      or
+      test \ifmoreitems%
+     }%
+     {\bibstring{from#1}}%
+     {\bibstring{cfrom#1}}}%
+    {\ifbibstring{lang#1}%
+       {\biblstring{lang#1}}%
+       {#1}}%
+ \usebibmacro{list:andotherlangs}%
+ \endgroup}
+
+\newbibmacro*{list:andotherlangs}{% Final {by} after {andmore}
+  \ifboolexpr{%
+    test {\ifnumequal{\value{listcount}}{\value{liststop}}}%
+    and
+    test \ifmoreitems%
+  }%
+    {\ifnumgreater{\value{liststop}}{1}%
+       {\finalandcomma}%
+       {}%
+     \printdelim{andmoredelim}\bibstring{andmore}\addspace\bibstring{by}}%
+    {}}
+
+\newcommand*{\lbx@cfromlang}{% Because the cbytranslator string can't
+  \iffieldundef{userf}% have {by} in it unless there's an origlanguage.
+  {\iflistundef{origlanguage}%
     {\unspace}%
-    {\bibstring{cfrom\thefield{origlanguage}}}}%
+    {\printlist[cfromoriglanguage]{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@fromlang}{%
+  \iffieldundef{userf}%
+  {\iflistundef{origlanguage}%
+    {\unspace}%
+    {\printlist[lfromoriglanguage]{origlanguage}}}%
+  {\unspace}}%
 
 \renewcommand*{\lbx@lfromlang}{%
   \iffieldundef{userf}%
-  {\iffieldundef{origlanguage}%
+  {\iflistundef{origlanguage}%
     {\unspace}%
-    {\biblstring{from\thefield{origlanguage}}}}%
-  {\unspace}}
+    {\printlist[lfromoriglanguage]{origlanguage}}}%
+  {\unspace}}%
 
 \renewcommand*{\lbx@sfromlang}{%
   \iffieldundef{userf}%
-  {\iffieldundef{origlanguage}%
+  {\iflistundef{origlanguage}%
     {\unspace}%
-    {\bibsstring{from\thefield{origlanguage}}}}%
-  {\unspace}}
+    {\printlist[sfromoriglanguage]{origlanguage}}}%
+  {\unspace}}%
 
 %%%% Formatting macros, called both by cbx and bbx %%%%
 
@@ -4319,7 +5367,7 @@
   {}%
   {\printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
       \printfield[tnoformat]{title}%
-      \setunit{\addcolon\addspace}%
+      \setunit{\subtitlepunct}%
       \printfield[stnoformat]{subtitle}}}%
   \setunit{\ctitleaddonpunct}%
   \printfield{titleaddon}}%
@@ -4332,7 +5380,7 @@
   {}%
   {\printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
       \printfield[tnoformat]{title}%
-      \setunit{\addcolon\addspace}%
+      \setunit{\subtitlepunct}%
       \printfield[stnoformat]{subtitle}}}%
   \setunit{\ctitleaddonpunct}%
   \printfield{titleaddon}%
@@ -4343,7 +5391,7 @@
 \newbibmacro*{title+stitle}{%
   \printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
     \printfield[noformat]{title}%
-    \setunit{\addcolon\addspace}%
+    \setunit{\subtitlepunct}%
     \printfield[noformat]{subtitle}}%
   \setunit{\ptitleaddonpunct}%
   \printfield{titleaddon}}%
@@ -4354,7 +5402,7 @@
 \newbibmacro*{italtitle+stitle}{%
   \printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
     \printfield[noformat]{title}%
-    \setunit{\addcolon\addspace}%
+    \setunit{\subtitlepunct}%
     \printfield[noformat]{subtitle}}%
   \setunit{\ptitleaddonpunct}%
   \printfield{titleaddon}%
@@ -4365,21 +5413,47 @@
 \newbibmacro*{mag+news+title}{%
   \printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
        \printfield[noformat]{title}%
-       \setunit{\addcolon\addspace}%
+       \setunit{\subtitlepunct}%
        \printfield[noformat]{subtitle}}%
      \setunit{\ptitleaddonpunct}%
-     \printfield{titleaddon}%
+     \ifboolexpr{%
+       test {\iffieldequalstr{relatedtype}{reviewof}}%
+       and
+       togl {cms@related}%
+     }%
+     {\usebibmacro{related:init}%
+       \usebibmacro{related}}%
+     {\printfield{titleaddon}}%
      }%\newcunit\newblock}
 
 \newbibmacro*{cmag+news+title}{%
   \printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
        \printfield[noformat]{title}%
-       \setunit{\addcolon\addspace}%
+       \setunit{\subtitlepunct}%{\addcolon\addspace}%
        \printfield[noformat]{subtitle}}%
      \setunit{\ctitleaddonpunct}%
-     \printfield{titleaddon}%
+     \ifboolexpr{%
+       test {\iffieldequalstr{relatedtype}{reviewof}}%
+       and
+       togl {cms@citerel}%
+     }%
+     {\usebibmacro{related:init}%
+       \usebibmacro{related}}%
+     {\printfield{titleaddon}}%
      }%\newcunit\newblock}
 
+\newbibmacro*{clegis+news+title}{%
+  \ifthenelse{\iffieldundef{title}\AND\iffieldundef{subtitle}\AND%
+    \iffieldundef{titleaddon}}%
+  {}%
+  {\printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
+      \printfield[noformat]{title}%
+      \setunit{\subtitlepunct}%
+      \printfield[noformat]{subtitle}}%
+    \setunit{\ctitleaddonpunct}%
+    \printfield{titleaddon}%
+  }}%\newcunit\newblock}
+
 \newbibmacro*{language+transtitle}{%
   \iffieldundef{usere}%
   {\printlist[][-\value{listtotal}]{language}}%
@@ -4395,7 +5469,7 @@
     {}%
     \printtext[issuetitle]{%
       \printfield[itnoformat]{issuetitle}%
-      \setunit{\addcolon\addspace}%
+      \setunit{\subtitlepunct}%
       \printfield[sitnoformat]{issuesubtitle}}}}
 
 \newbibmacro*{btitle+bstitle}{%
@@ -4407,7 +5481,7 @@
     {\usebibmacro{cms-in:}}%
     \printtext[booktitle]{%
       \printfield[btnoformat]{booktitle}%
-      \setunit{\addcolon\addspace}%
+      \setunit{\subtitlepunct}%
       \printfield[sbtnoformat]{booksubtitle}}%
     \setunit{\ctitleaddonpunct}%
     \printfield{booktitleaddon}%
@@ -4531,7 +5605,7 @@
       \usebibmacro{endrelated}%
       \newunit}}%
   {\usebibmacro{begrelated}%
-    \iffieldundef{origlanguage}%
+    \iflistundef{origlanguage}%
     {\bibstring{origpub}%
       \origfullcite{\thefield{userf}}%
       \usebibmacro{endrelated}%
@@ -4539,12 +5613,12 @@
     {\iftoggle{cms@postposit}%
       {\bibstring{origedition}%
         \setunit{\addspace}%
-        \printfield[edlang]{origlanguage}%
+        \printlist[edlang]{origlanguage}%
         \addcolon%
         \origfullcite{\thefield{userf}}%
         \usebibmacro{endrelated}%
         \newunit}%
-      {\printfield[edlang]{origlanguage}%
+      {\printlist[edlang]{origlanguage}%
         \setunit{\addspace}%
         \bibstring{origedition}%
         \origfullcite{\thefield{userf}}%
@@ -4822,7 +5896,7 @@
       \printfield[tnoformat]{shorttitle}}}%
   {\printtext[title]{%
       \printfield[tnoformat]{title}%
-      \setunit{\addcolon\addspace}%
+      \setunit{\subtitlepunct}%
       \printfield[stnoformat]{subtitle}}}%
   \setunit*{\addspace}%
   \printlist[periodplace]{location}%
@@ -4861,14 +5935,18 @@
           \printfield[jtsnoformat]{shortjournal}}}%
       {\printtext[journaltitle]{%
           \printfield[jtnoformat]{journaltitle}%
-          \setunit{\addcolon\addspace}%
+          \setunit{\subtitlepunct}%
           \printfield[sjtnoformat]{journalsubtitle}}}}}%
 
 \newbibmacro*{cite+doi+url}{% 16th ed.
   \iftoggle{cms@url@innotes}%
-  {\iffieldundef{urlyear}%
-    {}%
+  {\ifboolexpr{% Fix printing of urldate when url=false
+      togl {cms@url}%
+      and
+      not test {\iffieldundef{urlyear}}%
+      }%
     {\printurldate}% Date fix
+    {}%
     \newcunit\newblock
     \iftoggle{cms@doionly}%
     {\iffieldundef{doi}%
@@ -4954,7 +6032,7 @@
       \printfield[tnoformat]{shorttitle}}}%
   {\printtext[title]{%
       \printfield[tnoformat]{title}%
-      \setunit{\addcolon\addspace}%
+      \setunit{\subtitlepunct}%
       \printfield[stnoformat]{subtitle}}}%
   \setunit*{\addspace}%
   \printlist[periodplace]{location}%
@@ -4972,7 +6050,7 @@
       {\bibstring{in}\setunit{\addspace}}%
       \printtext[maintitle]{%
         \printfield[mtnoformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[smtnoformat]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}%
@@ -4984,7 +6062,7 @@
       \setunit{\addspace}%
       \printtext[maintitle]{%
         \printfield[mtnoformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[smtnoformat]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}}
@@ -5000,7 +6078,7 @@
       {\bibstring{in}\setunit{\addspace}}%
       \printtext[maintitle]{%
         \printfield[mtnoformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[smtnoformat]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}%
@@ -5013,7 +6091,7 @@
       \setunit{\addspace}%
       \printtext[maintitle]{%
         \printfield[mtnoformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
+        \setunit{\subtitlepunct}%
         \printfield[smtnoformat]{mainsubtitle}}%
       \setunit{\ctitleaddonpunct}%
       \printfield{maintitleaddon}}}}
@@ -5082,6 +6160,54 @@
   {\postnotewrapper%delim% Don't need \ifbibliography test w/ following
     \usebibmacro{semel:postnote}}}
 
+\newbibmacro*{juridpostnote}{%
+  \iftoggle{cms@fullnote}%
+  {\iffieldundef{issue}%
+    {\iffieldundef{shortjournal}%
+      {\setunit{\addcomma\addspace}}%
+      {\ifthenelse{\iffieldundef{part}\AND\iffieldundef{chapter}}%
+        {\setunit{\addspace}}%
+        {\ifpunctmark{*}{\setunit{\addspace}}{\newcunit}}}%
+      \printfield{pages}%
+      \iffieldundef{postnote}%
+      {}%
+      {\ifthenelse{\ifentrytype{legislation}\OR\ifentrytype{legal}}%
+        {\newcunit}%
+        {\setunit*{\addcomma\addspace}}%
+        \usebibmacro{semel:postnote}}}%
+    {\iffieldundef{postnote}%
+      {\iffieldundef{pages}%
+        {}%
+        {\newcunit%
+          \printfield{pages}}}%
+      {\newcunit%
+        \usebibmacro{semel:postnote}}}}%
+  {\iffieldundef{issue}%
+    {\iffieldundef{postnote}%
+      {\iffieldundef{pages}%
+        {}%
+        {\iffieldundef{shortjournal}%
+          {\setunit{\addcomma\addspace}}%
+          {\ifthenelse{\iffieldundef{part}\AND\iffieldundef{chapter}}%
+            {\setunit{\addspace}}%
+            {\ifpunctmark{*}{\setunit{\addspace}}{\newcunit}}}%
+          \printfield{pages}}}%
+      {\iffieldundef{shortjournal}%
+        {\setunit{\addcomma\addspace}}%
+        {\ifthenelse{\iffieldundef{part}\AND\iffieldundef{chapter}}%
+          {\setunit{\addspace}}%
+          {\ifpunctmark{*}{\setunit{\addspace}}{\newcunit}}}%
+        \usebibmacro{semel:postnote}}}% See below for alternate test here
+    {\iffieldundef{postnote}%
+      {\iffieldundef{pages}%
+        {}%
+        {\newcunit%
+          \printfield{pages}}}%
+      {\newcunit%
+        \usebibmacro{semel:postnote}}}%
+    \global\togglefalse{cms@fullnote}%
+    \global\togglefalse{cms@shortnote}}}%
+
 \newbibmacro*{volfullpostnote}{%
   \iftoggle{cms@postvol}%
   {\ifboolexpr{(
@@ -5369,7 +6495,11 @@
   {\usebibmacro{prenote}}}
 
 \newbibmacro*{choose+surname}{%
-  \ifciteseen%
+  \ifboolexpr{%
+    test {\ifciteseen}%
+    and
+    not togl {cms@noneshort}%
+    }%
   {}%
   {\printnames{labelname}\savefield{fullhash}{\bbx@lasthash}%
     \ifthenelse{\iffieldequalstr{labelnamesource}{shortauthor}\OR%
@@ -5407,6 +6537,11 @@
 {\DeclareLabelname{shortauthor,author,shorteditor,namea,%
     editor,nameb,translator,namec}}
 
+\DeclareLabeltitle[legislation]{%
+  \field{shorttitle}%
+  \field{titleaddon}%
+  \field{title}}%
+
 \DeclareDataInheritance{collection}{suppcollection}{%
   \inherit{title}{title}
   \inherit{subtitle}{subtitle}
@@ -5482,7 +6617,7 @@
   \noinherit{origendmonth}
   \noinherit{origendday}}
 
-\DeclareSortingScheme{cms}{% Updated for biblatex > 2.0
+\DeclareSortingTemplate{cms}{% Updated for biblatex > 3.7
   \sort{
     \field{presort}
   }
@@ -5516,7 +6651,7 @@
   }
 }
 
-\DeclareSortingScheme{shortjournal}{%
+\DeclareSortingTemplate{shortjournal}{%
   \sort{
     \field{shortjournal}
   }
@@ -5675,6 +6810,41 @@
 
 %%%% Related macros from biblatex.def %%%%
 
+\newbibmacro*{related:reviewof}[1]{%
+  \iftoggle{cms@shortnote}%
+  {\entrydata{#1}{%
+      \ifboolexpr{%
+        togl {cms@allshort}%
+        or
+        test {\ifbibliography}%
+      }%
+      {\printtext[bibhyperref]{%
+          \printfield[citetitle]{labeltitle}}}%
+      {\printtext[cmshyperlink]{%
+          \printfield[citetitle]{labeltitle}}}}}%
+  {\entrydata*{#1}{%
+      \let\newunit\newcunit%
+      % \bibstring{reviewof}%
+      \iffieldundef{title}%
+      {}%
+      {\printtext[title]{%
+          \printfield[tnoformat]{title}%
+          \setunit{\subtitlepunct}%
+          \printfield[stnoformat]{subtitle}}}%
+      \newcunit%
+      \ifnameundef{author}%
+      {\newcunit%
+        \ifbibliography%
+        {\usebibmacro{byeditor+others}}%
+        {\usebibmacro{cbyeditor+others}}}%
+      {\bibstring{by}\addspace%
+        \printnames[byauthor]{author}%
+        \ifbibliography%
+        {\newcunit\usebibmacro{byeditor+others}}%
+        {\newcunit\usebibmacro{cbyeditor+others}}}%
+      \setunit{\ctitleaddonpunct}%
+      \printfield{titleaddon}}}}%
+
 \renewbibmacro*{related:origpubas}[1]{%
   \entrydata*{#1}{%
     \usebibmacro{at+every+item}%
@@ -5703,7 +6873,7 @@
 
 \renewbibmacro*{related:default}[1]{%
   \entrydata*{#1}{%
-    \usedriver
+    \usedriver%
       {\ifnameundef{savedauthor}%
          {\ifnameundef{savededitor}%
             {}%
@@ -5719,7 +6889,7 @@
           \renewbibmacro*{pageref}{}%
           \toggletrue{cms@fullnote}%
           \togglefalse{cms@shortnote}}%
-      {cite:\thefield{entrytype}}}}
+      {cite:\thefield{entrytype}}}}%
 
 \renewbibmacro*{related:multivolume}[1]{%
   \entrydata*{#1}{%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.bbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.bbx
deleted file mode 100644
index f9947981869..00000000000
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.bbx
+++ /dev/null
@@ -1,2180 +0,0 @@
-% $Id: chicago-notes15.bbx,v 0.9.7.15 2014/08/14 14:30:19 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}
-[2014/08/15 v 2.9a biblatex bibliography style]
-
-%%%% Initialize and format bibliography and los %%%%
-
-\DeclareFieldFormat{shorthandwidth}{#1}
-
-\newlength{\lositemsep}
-
-\defbibenvironment{bibliography}% New for 0.9a
-  {\list
-     {}
-     {\setlength{\leftmargin}{\bibhang}%
-      \setlength{\itemindent}{-\leftmargin}%
-      \setlength{\itemsep}{\bibitemsep}%
-      \setlength{\parsep}{\bibparsep}}}
-  {\endlist}
-  {\item}
-
-\defbibenvironment{shorthands}
-  {\list
-     {\printfield[shorthandwidth]{shorthand}}%
-     {\setlength{\labelwidth}{\shorthandwidth}%
-      \setlength{\leftmargin}{\labelwidth}%
-      \setlength{\labelsep}{\biblabelsep}%
-      \addtolength{\leftmargin}{\labelsep}%
-      \setlength{\itemsep}{\lositemsep}%
-      \setlength{\parsep}{\bibparsep}%
-      \renewcommand*{\makelabel}[1]{##1\hss}}}
-  {\endlist}
-  {\item}
-
-\defbibenvironment{shorthand}
-  {\list
-     {\printfield[shorthandwidth]{shorthand}}%
-     {\setlength{\labelwidth}{\shorthandwidth}%
-      \setlength{\leftmargin}{\labelwidth}%
-      \setlength{\labelsep}{\biblabelsep}%
-      \addtolength{\leftmargin}{\labelsep}%
-      \setlength{\itemsep}{\lositemsep}%
-      \setlength{\parsep}{\bibparsep}%
-      \renewcommand*{\makelabel}[1]{##1\hss}}}
-  {\endlist}
-  {\item}
-
-\AtBeginBibliography{%
-  \togglefalse{cms@headlessnote}%
-  \togglefalse{cms@shortnote}%
-  \togglefalse{cms@fullnote}%
-  \togglefalse{cms@allshort}%
-  }%
-
-\AtEveryBibitem{%
-  \iffieldequalstr{pubstate}{reprint}%
-  {\toggletrue{cms@reprint}}%
-  {\togglefalse{cms@reprint}}%
-  \ifboolexpr{%
-    test {\iffieldundef{origyear}}
-    or
-    test {\iffieldundef{year}}
-    or
-    not test {\iffieldint{year}}
-    or
-    not test {\iffieldint{origyear}}
-    or
-    togl {cms@switchdates}
-  }%
-  {}%
-  {\ifboolexpr{%
-      test {\iffieldundef{endyear}}%
-      or
-      not test {\iffieldnum{endyear}}
-    }%
-    {\ifthenelse{\thefield{origyear}>\thefield{year}}%
-      {\toggletrue{cms@switchdates}}%
-      {}}%
-    {\ifthenelse{\thefield{origyear}>\thefield{endyear}}%
-      {\toggletrue{cms@switchdates}}%
-      {}}}}%
-
-\InitializeBibliographyStyle{%
-  \let\bbx@lasthash\undefined}
-
-%%%% Bibliography-specific bibstrings %%%%
-
-%% Now in *.lbx %%
-
-%%%% Author, Editor, Translator, and Compiler  Macros %%%%
-
-\renewbibmacro*{name:last-first}[4]{%
-  \ifuseprefix
-  {\usebibmacro{name:delim}{#3#1}%
-    \usebibmacro{name:hook}{#3#1}%
-    \ifblank{#3}{}{%
-      \ifcapital
-      {\mkbibnameprefix{\MakeCapital{#3}}\isdot}
-      {\mkbibnameprefix{#3}\isdot}%
-      \ifpunctmark{'}{}{\addhighpenspace}}%
-    \mkbibnamelast{#1}\isdot
-    \ifblank{#2}{}{\addcomma\addlowpenspace\mkbibnamefirst{#2}\isdot}%
-    \ifblank{#4}{}{\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot}}
-  {\usebibmacro{name:delim}{#1}%
-    \usebibmacro{name:hook}{#1}%
-    \mkbibnamelast{#1}\isdot%
-    \ifblank{#2#3#4}{}{\addcomma}%
-    \ifblank{#2}{}{\addlowpenspace\mkbibnamefirst{#2}\isdot}%
-    \ifblank{#3}{}{\addlowpenspace\mkbibnameprefix{#3}\isdot}%
-    \ifblank{#4}{}{\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot}}}
-
-\renewbibmacro*{name:first-last}[4]{%
-  \usebibmacro{name:delim}{#2#3#1}%
-  \usebibmacro{name:hook}{#2#3#1}%
-  \ifblank{#2}{}{\mkbibnamefirst{#2}\isdot\addlowpenspace}%
-  \ifblank{#3}{}{%
-    \mkbibnameprefix{#3}\isdot
-    \ifpunctmark{'}
-    {}
-    {\ifuseprefix{\addhighpenspace}{\addlowpenspace}}}%
-  \mkbibnamelast{#1}\isdot
-  \ifblank{#4}{}{%
-    \iftoggle{cms@jrcomma}%
-    {\ifnumeral{#4}%
-      {\addlowpenspace\mkbibnameaffix{#4}\isdot}%
-      {\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot%
-        \ifboolexpr{
-          test{\ifnumless{\value{listcount}}{\value{listtotal}}}
-          and
-          test{\ifnumless{\value{listcount}}{\value{maxnames}}}
-        }
-        {\addcomma}%
-        {}}}%
-    {\addlowpenspace\mkbibnameaffix{#4}\isdot}}}
-
-\newbibmacro*{author/editors/translators}{%
-  \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}%
-    {\usebibmacro{author}}%
-    {\ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{namea}}%
-       {\usebibmacro{parteditor}}%
-       {\ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{editor}}%
-         {\usebibmacro{editor}}%
-         {\ifthenelse{\ifusetranslator\AND\NOT\ifnameundef{nameb}}%
-           {\usebibmacro{parttranslator}}%
-           {\ifthenelse{\ifusetranslator\AND\NOT\ifnameundef{translator}}%
-             {\usebibmacro{translator}}%
-             {\ifnameundef{namec}%
-               {\let\bbx@lasthash\undefined}%
-               {\usebibmacro{compiler}}}}}}}}
-
-\renewbibmacro*{author/editor}{%
-  \ifuseauthor%
-    {\usebibmacro{author}}%
-    {\ifuseeditor%
-      {\ifnameundef{namea}%
-        {\usebibmacro{moreeditor}}%
-        {\usebibmacro{parteditor}}}%
-      {\ifusetranslator%
-        {\ifnameundef{nameb}%
-          {\usebibmacro{moretranslator}}%
-          {\usebibmacro{parttranslator}}}%
-        {\iftoggle{cms@usecompiler}%
-          {\usebibmacro{compiler}}%
-          {\let\bbx@lasthash\undefined%
-            \settoggle{cms@usecompiler}{true}}}}}}
-
-\renewbibmacro*{author}{%
-  \iftoggle{cms@headlessnote}%
-  {\usebibmacro{justauthor}}%
-  {\usebibmacro{moreauthor}}}
-
-\newbibmacro*{allauthor}{%
-  \ifnameundef{author}%
-  {\ifnameundef{editor}%
-    {\ifnameundef{translator}%
-      {\ifnameundef{namec}%
-        {\let\bbx@lasthash\undefined}%
-        {\ifthenelse{\iffieldequals{namehash}{\bbx@lasthash}\AND\NOT
-            \iffirstonpage}
-               {\bibnamedash\addcomma\space}
-               {\printnames[sortname]{namec}\addcomma\space
-                 \savefield{namehash}{\bbx@lasthash}}%
-               \usebibmacro{compilestrg}}}%
-           {\ifthenelse{\iffieldequals{namehash}{\bbx@lasthash}\AND\NOT
-               \iffirstonpage}
-             {\bibnamedash\addcomma\space}
-             {\printnames[sortname]{translator}\addcomma\space
-               \savefield{namehash}{\bbx@lasthash}}%
-             \usebibmacro{transstrg}}}%
-         {\ifthenelse{\iffieldequals{namehash}{\bbx@lasthash}\AND\NOT
-             \iffirstonpage}
-           {\bibnamedash\addcomma\space}
-           {\printnames{editor}\addcomma\space
-             \savefield{namehash}{\bbx@lasthash}}%
-           \usebibmacro{editstrg}}}%
-       {\ifthenelse{\iffieldequals{namehash}{\bbx@lasthash}\AND\NOT
-           \iffirstonpage}
-         {\iffieldundef{nameaddon}%
-           {\bibnamedash\addperiod\addspace}
-           {\bibnamedash\addspace}}%
-         {\iffieldequalstr{authortype}{anon}%
-           {\bibleftbracket\printnames{author}\bibrightbracket%
-             \savefield{namehash}{\bbx@lasthash}}%
-           {\iffieldequalstr{authortype}{anon?}%
-             {\bibleftbracket\printnames{author}\addquestion\bibrightbracket%
-               \savefield{namehash}{\bbx@lasthash}}%
-             {\printnames{author}%
-             \savefield{namehash}{\bbx@lasthash}}}}}}
-
-\newbibmacro*{justauthor}{%
-  \ifnameundef{author}
-  {\let\bbx@lasthash\undefined}
-  {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-      \iffirstonpage}
-    {\iffieldundef{nameaddon}%
-      {\bibnamedash\addperiod\addspace}
-      {\bibnamedash\addspace}}
-    {\iffieldequalstr{authortype}{anon}%
-      {\bibleftbracket\printnames{author}\bibrightbracket%
-        \savefield{fullhash}{\bbx@lasthash}}%
-      {\iffieldequalstr{authortype}{anon?}%
-        {\bibleftbracket\printnames{author}\addquestion\bibrightbracket%
-          \savefield{fullhash}{\bbx@lasthash}}%
-        {\printnames{author}%
-          \savefield{fullhash}{\bbx@lasthash}}}}}}
-
-\newbibmacro*{moreauthor}{%
-  \ifnameundef{author}
-  {\usebibmacro{pickeditor}}
-  {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-      \iffirstonpage}
-    {\iffieldundef{nameaddon}%
-      {\bibnamedash\addperiod\addspace}
-      {\bibnamedash\addspace}}
-    {\iffieldequalstr{authortype}{anon}%
-      {\bibleftbracket\printnames{author}\bibrightbracket%
-        \savefield{fullhash}{\bbx@lasthash}}%
-      {\iffieldequalstr{authortype}{anon?}%
-        {\bibleftbracket\printnames{author}\addquestion\bibrightbracket%
-          \savefield{fullhash}{\bbx@lasthash}}%
-        {\printnames{author}%
-          \savefield{fullhash}{\bbx@lasthash}}}}}}
-
-\newbibmacro*{pickeditor}{%
-  \ifnameundef{namea}
-  {\usebibmacro{moreeditor}}%
-  {\usebibmacro{parteditor}}}
-
-\newbibmacro*{moreeditor}{%
-  \ifnameundef{editor}
-    {\usebibmacro{picktranslator}}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-                 \iffirstonpage}
-       {\bibnamedash\editordelim}%\addcomma\addspace
-       {\printnames{editor}\editordelim%\addcomma\space
-        \savefield{fullhash}{\bbx@lasthash}}%
-     \usebibmacro{editstrg}}}
-
-\renewbibmacro*{editor}{%
-  \ifnameundef{editor}
-    {\let\bbx@lasthash\undefined}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-                 \iffirstonpage}
-       {\bibnamedash\editordelim}%\addcomma\addspace
-       {\printnames{editor}\editordelim%\addcomma\space
-        \savefield{fullhash}{\bbx@lasthash}}%
-     \usebibmacro{editstrg}}}
-
-\newbibmacro*{parteditor}{%
-  \ifnameundef{namea}
-    {\let\bbx@lasthash\undefined}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-                 \iffirstonpage}
-       {\bibnamedash\addcomma\addspace}
-       {\printnames[sortname]{namea}\addcomma\space
-        \savefield{fullhash}{\bbx@lasthash}}%
-     \usebibmacro{parteditstrg}}}
-
-\newbibmacro*{picktranslator}{%
-  \ifnameundef{nameb}
-  {\usebibmacro{moretranslator}}%
-  {\usebibmacro{parttranslator}}}
-
-\newbibmacro*{moretranslator}{%
-  \ifnameundef{translator}
-    {\usebibmacro{compiler}}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-                 \iffirstonpage}
-       {\bibnamedash\addcomma\addspace}
-       {\printnames[sortname]{translator}\addcomma\space
-        \savefield{fullhash}{\bbx@lasthash}}%
-     \usebibmacro{transstrg}}}
-
-\newbibmacro*{parttranslator}{%
-  \ifnameundef{nameb}
-    {\let\bbx@lasthash\undefined}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-                 \iffirstonpage}
-       {\bibnamedash\addcomma\addspace}
-       {\printnames[sortname]{nameb}\addcomma\space
-        \savefield{fullhash}{\bbx@lasthash}}%
-     \usebibmacro{parttransstrg}}}
-
-\newbibmacro*{compiler}{%
-  \ifnameundef{namec}
-    {\let\bbx@lasthash\undefined}
-    {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-                 \iffirstonpage}
-       {\bibnamedash\addcomma\addspace}
-       {\printnames[sortname]{namec}\addcomma\space
-        \savefield{fullhash}{\bbx@lasthash}}%
-     \usebibmacro{compilestrg}}}
-
-\renewcommand*{\revsdnamedelim}{\addcomma}
-
-\DeclareNameAlias{author}{sortname}% Needed in 0.9
-\DeclareNameAlias{editor}{sortname}
-\DeclareNameAlias{translator}{sortname}
-
-%%%% Drivers for Bibliography entries and Shorthands %%%%
-
-\DeclareBibliographyDriver{shorthands}{%
-  \ifnameundef{labelname}
-  {\iffieldequalstr{entrysubtype}{magazine}%
-    {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}%
-        \newcunit}}%
-    {\iffieldequalstr{entrytype}{manual}%
-      {\printtext[bibhyperref]{\printlist{organization}\newcunit}}%
-      {}}}%
-  {\usebibmacro{author/editor}%
-    \setunit{\addcomma\space}}%
-  \printfield[lostitle]{title}%
-  \finentry}
-
-\DeclareBibliographyDriver{shorthand}{%
-  \ifnameundef{labelname}
-  {\iffieldequalstr{entrysubtype}{magazine}%
-    {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}%
-        \newcunit}}%
-    {\iffieldequalstr{entrytype}{manual}%
-      {\printtext[bibhyperref]{\printlist{organization}\newcunit}}%
-      {}}}%
-  {\usebibmacro{author/editor}%
-    \setunit{\addcomma\space}}%
-  \printfield[lostitle]{title}%
-  \finentry}
-
-\DeclareBibliographyDriver{article}{%
-  \iffieldequalstr{entrysubtype}{magazine}%
-  {\usebibmacro{bibindex}%
-  \usebibmacro{mag+news+author}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{mag+news+title}%
-  \setunit{\addspace}%
-  \usebibmacro{language+transtitle}%
-  \newunit\newblock%
-  \usebibmacro{issuetitle}%
-  \setunit*{\addcomma\addspace}%
-  \usebibmacro{byeditor+others}%
-  \newunit\newblock
-  \printfield{note}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{mag+news+date}%
-  \newcunit\newblock
-  \usebibmacro{chap+pag}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{issn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-  {\usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{mag+news+title}%
-  \setunit{\addspace}%
-  \usebibmacro{language+transtitle}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \usebibmacro{issuetitle}%
-  \setunit*{\addcomma\addspace}%
-  \usebibmacro{byeditor+others}%
-  \newunit\newblock
-  \printfield{note}%
-  \setunit*{\addcomma\addspace}\newblock% (changed for 0.7)??
-  \usebibmacro{journal+issue+year+pages}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{issn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}}
-
-\DeclareBibliographyDriver{artwork}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{italtitle+stitle}%
-  \newcunit\newblock
-  \usebibmacro{date}%
-  \newcunit
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \usebibmacro{byeditor+others}%
-  \newunit\newblock
-  \printfield{howpublished}%
-  \newunit\newblock
-  \printfield{type}%
-  \newcunit\newblock
-  \printfield{version}%
-  \newcunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{institution+organization}%
-  \setunit*{\addcomma\addspace}\newblock
-  \printlist{location}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{audio}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{italtitle+stitle}%
-  \newcunit\newblock
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \usebibmacro{part+editor+translator}%
-  \newcunit%\setunit{\addperiod\addspace}%
-  \usebibmacro{chapinscore}%
-  \usebibmacro{btitle+bstitle}%
-  \iffieldundef{booktitle}
-  {\setunit{\addperiod\addspace}}% Fix customc?
-  {\setunit{\addcomma\addspace}}%
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}
-    \clearfield{volumes}}%
-  \newunit% unit, not cunit?
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{byeditor+others}%
-  \newunit% ??? Editorpunct maybe not right here?
-  \iffieldundef{maintitle}
-  {}
-  {\iffieldundef{volume}
-    {\usebibmacro{cms-in:}%
-      \printtext[maintitle]{%
-        \printfield[noformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
-        \printfield[noformat]{mainsubtitle}}%
-      \newcunit
-      \printfield{maintitleaddon}}
-    {\printfield{volume}%
-      \printfield{part}%
-      \setunit{\addspace}
-      \bibstring{ofseries}%
-      \setunit{\addspace}
-      \printtext[maintitle]{%
-        \printfield[noformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
-        \printfield[noformat]{mainsubtitle}}%
-      \newcunit
-      \printfield{maintitleaddon}}}
-  \newcunit\newblock
-  \printfield{pages}%
-  \newunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-  \printfield{volumes}%
-  \newunit\newblock
-  \usebibmacro{ser+num}%
-  \newunit\newblock
-  \usebibmacro{cmsorigdate}%\printorigdate%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{publ+loc+year}%
-  \newunit
-  \printfield{type}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{isan}%
-    \setunit*{\addcomma\addspace}\newblock%
-    \printfield{ismn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}%
-
-\DeclareBibliographyDriver{book}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{italtitle+stitle}%
-  \newunit\newblock
-  \iffieldundef{maintitle}%
-  {\iffieldundef{edition}%
-    {}%
-    {\usebibmacro{edition}%
-      \newunit
-      \printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}%
-      \newunit
-      \printfield{volumes}%
-      \clearfield{volumes}}}%
-  {}%
-  \newcunit\newblock
-  \usebibmacro{byauthor}
-  \newunit\newblock
-  \usebibmacro{part+editor+translator}%
-  \newunit\newblock
-  \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
-  \newcunit
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}%
-    \clearfield{volumes}}%
-  \usebibmacro{editorpunct}%
-  \usebibmacro{byeditor+others}%
-  \usebibmacro{editorpunct}%\newcunit\newblock
-  \iftoggle{cms@bookpages}%
-  {}%
-  {\clearfield{pages}}%
-  \usebibmacro{chap+pag}%
-  \newunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-  \printfield{volumes}%
-  \newunit\newblock
-  \usebibmacro{ser+num}%
-  \newunit\newblock
-  \usebibmacro{cmsorigdate}%\printorigdate%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{publ+loc+year}%
-  \newcunit
-  \printlist[][-\value{listtotal}]{lista}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{bookinbook}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{italtitle+stitle}%
-  \newunit\newblock
-  \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}%
-  {\iffieldundef{edition}%
-    {}%
-    {\usebibmacro{edition}%
-      \newunit
-      \printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}%
-      \newunit
-      \printfield{volumes}%
-      \clearfield{volumes}}}%
-  {}%
-  \newcunit\newblock
-  \newcunit\newblock
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \usebibmacro{part+editor+translator}%
-  \setunit*{\addperiod\addspace}%
-  \usebibmacro{cms-in:}%
-  \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
-  \newcunit
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}%
-    \clearfield{volumes}}%
-  \newcunit
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{editorpunct}
-  \usebibmacro{byeditor+others}%
-  \newcunit\newblock
-  \usebibmacro{chap+pag}%
-  \newunit\newblock
-  \printfield{edition}%
-  \newunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-  \printfield{volumes}%
-  \newunit\newblock
-  \usebibmacro{ser+num}%
-  \newunit\newblock
-  \usebibmacro{cmsorigdate}%\printorigdate%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{publ+loc+year}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{booklet}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{italtitle+stitle}%
-  \newcunit\newblock
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{howpubl+loc+year}%
-  \newunit\newblock
-  \usebibmacro{chap+pag}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{collection}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{italtitle+stitle}%
-  \newunit\newblock
-  \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
-  \usebibmacro{editorpunct}%
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \usebibmacro{editorpunct}%
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \usebibmacro{editorpunct}%
-    \printfield{volumes}%
-    \clearfield{volumes}}%
-  \usebibmacro{editorpunct}%
-  \usebibmacro{bytranslator+others}%
-  \newunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-  \printfield{volumes}%
-  \newunit\newblock
-  \usebibmacro{ser+num}%
-  \newunit\newblock
-  \usebibmacro{cmsorigdate}%\printorigdate%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{publ+loc+year}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{customc}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \newunit\newblock
-  \printfield{nameaddon}%
-  \setunit*{\addspace}%
-  \usebibmacro{italtitle+stitle}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{image}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{title+stitle}%
-  \setunit{\addspace}\newblock%
-  \usebibmacro{language+transtitle}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{date}%
-  \newcunit
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \usebibmacro{byeditor+others}%
-  \newunit\newblock
-  \printfield{howpublished}%
-  \newunit\newblock
-  \printfield{type}%
-  \newcunit\newblock
-  \printfield{version}%
-  \newcunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{institution+organization}%
-  \setunit*{\addcomma\addspace}\newblock
-  \printlist{location}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{inbook}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{title+stitle}%
-  \setunit{\addspace}\newblock%\bibsentence
-  \usebibmacro{language+transtitle}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{byauthor}%
-  \setunit{\addperiod\addspace}%
-  \usebibmacro{part+editor+translator}%
-  \setunit{\addperiod\addspace}%
-  \usebibmacro{chapincoll}%
-  \usebibmacro{cms-in:}%
-  \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
-  \newcunit
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}
-    \clearfield{volumes}}%
-  \newcunit
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{byeditor+others}%
-  \newcunit\newblock
-  \printfield{pages}%
-  \newunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-  \printfield{volumes}%
-  \newunit\newblock
-  \usebibmacro{ser+num}%
-  \newunit\newblock
-  \usebibmacro{cmsorigdate}%\printorigdate%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{publ+loc+year}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}%
-
-\DeclareBibliographyDriver{incollection}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{title+stitle}%
-  \setunit{\addspace}\newblock%\bibsentence
-  \usebibmacro{language+transtitle}%
-  \newcunit\newblock
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \usebibmacro{part+editor+translator}%
-  \iffieldundef{crossref}%
-  {\iffieldundef{xref}%
-  {\newunit\newblock
-  \usebibmacro{chapincoll}%
-  \usebibmacro{cms-in:}%
-  \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
-  \newcunit
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}
-    \clearfield{volumes}}%
-  \newcunit
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{byeditor+others}%
-  \newcunit\newblock
-  \printfield{pages}%
-  \newunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-  \printfield{volumes}%
-  \newunit\newblock
-  \usebibmacro{ser+num}%
-  \newunit\newblock
-  \usebibmacro{cmsorigdate}%\printorigdate%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{publ+loc+year}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
-  \usebibmacro{chapincoll}%
-  \bibxrefcite{\thefield{xref}}%
-  \usebibmacro{bibpostxref}%
-  \usebibmacro{finentry}}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
-  \usebibmacro{chapincoll}%
-  \bibxrefcite{\thefield{crossref}}%
-  \usebibmacro{bibpostxref}%
-  \usebibmacro{finentry}}}
-
-\DeclareBibliographyDriver{inproceedings}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{title+stitle}%
-  \setunit{\addspace}\newblock%
-  \usebibmacro{language+transtitle}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{byauthor}%
-  \setunit{\addperiod\addspace}%
-  \usebibmacro{part+editor+translator}%
-  \iffieldundef{crossref}%
-  {\iffieldundef{xref}%
-  {\setunit{\addperiod\addspace}%
-    \usebibmacro{chapincoll}%
-    \usebibmacro{cms-in:}%
-  \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
-  \newcunit\newblock
-  \usebibmacro{byeditor+others}%
-  \newcunit\newblock
-  \printfield{pages}%
-  \newunit\newblock
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-  \printfield{volumes}%
-  \newunit\newblock
-  \usebibmacro{ser+num}%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{org+publ+loc+year}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
-  \usebibmacro{chapincoll}%
-  \bibxrefcite{\thefield{xref}}%
-  \usebibmacro{bibpostxref}%
-  \usebibmacro{finentry}}}%
-{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
-  \usebibmacro{chapincoll}%
-  \bibxrefcite{\thefield{crossref}}%
-  \usebibmacro{bibpostxref}%
-  \usebibmacro{finentry}}}
-
-\DeclareBibliographyDriver{inreference}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{italtitle+stitle}%
-  \newunit\newblock
-  \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}%
-  {\iffieldundef{edition}%
-    {}%
-    {\usebibmacro{edition}%
-      \newunit
-      \printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}%
-      \newunit
-      \printfield{volumes}%
-      \clearfield{volumes}}}%
-  {}%
-  \newunit\newblock
-  \usebibmacro{part+editor+translator}%
-  \setunit*{\addperiod\addspace}% need asterisk?
-  \usebibmacro{alt-in:}%
-  \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
-  \newcunit
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}%
-    \clearfield{volumes}}%
-  \newcunit
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{editorpunct}
-  \usebibmacro{byeditor+others}%
-  \newcunit\newblock
-  \usebibmacro{chap+pag}%
-  \newunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-  \printfield{volumes}%
-  \newunit\newblock
-  \usebibmacro{ser+num}%
-  \newunit\newblock
-  \usebibmacro{cmsorigdate}%\printorigdate%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{publ+loc+year}%
-  \newcunit\newblock
-  \printlist[][-\value{listtotal}]{lista}%
-  \setunit{\addspace}%
-  \ifnameundef{author}%
-  {}%
-  {\printtext[parens]{%
-      \bibstring{by}%
-      \addspace%
-      \printnames[byauthor]{author}}}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{letter}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \printtext[title]{%
-    \printfield[noformat]{title}}%
-  \newcunit\newblock%
-  \printfield{titleaddon}%
-  \setunit*{\addcomma\addspace}%
-  \usebibmacro{letter+date}%
-  \setunit{\addspace}%
-  \usebibmacro{language+transtitle}%
-  \newunit\newblock%\bibsentence
-  \usebibmacro{part+editor+translator}%
-  \setunit*{\addperiod\addspace}%
-  \iffieldundef{crossref}%
-  {\iffieldundef{xref}%
-  {\usebibmacro{chapincoll}%
-  \usebibmacro{cms-in:}%
-  \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
-  \newcunit
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}
-    \clearfield{volumes}}%
-  \newcunit
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{byeditor+others}%
-  \newcunit\newblock
-  \printfield{pages}%
-%  \newunit\newblock
-%  \printfield{edition}%
-  \newunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-  \printfield{volumes}%
-  \newunit\newblock
-  \usebibmacro{ser+num}%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{publ+loc+year}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}%
-{\ifpunctmark{*}% Attempt to fix issues with n.d. Changed for 0.9.
-  {\setunit{\nopunct\addspace\bibsentence}}%
-  {}%
-  \usebibmacro{chapincoll}%
-  \bibxrefcite{\thefield{xref}}%
-  \usebibmacro{bibpostxref}%
-  \usebibmacro{finentry}}}%
-{\ifpunctmark{*}% Likewise.
-  {\setunit{\nopunct\addspace\bibsentence}}%
-  {}%
-  \usebibmacro{chapincoll}%
-  \bibxrefcite{\thefield{crossref}}%
-  \usebibmacro{bibpostxref}%
-  \usebibmacro{finentry}}}
-
-\DeclareBibliographyDriver{manual}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{bibauthor+org}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{italtitle+stitle}%
-  \newunit\newblock
-  \usebibmacro{edition}%
-  \newcunit
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \usebibmacro{ser+num}%
-  \newunit\newblock
-  \printfield{type}%
-  \newunit
-  \printfield{note}%
-  \newunit\newblock%
-  \usebibmacro{org+publ+loc+year}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{misc}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \iffieldundef{entrysubtype}%
-  {\usebibmacro{italtitle+stitle}}%
-  {\printfield{title}%
-    \setunit{\addcolon\addspace}%
-    \printfield[noformat]{subtitle}%
-    \newcunit\newblock%
-    \printfield{titleaddon}%
-    \setunit{\addspace}%
-    \usebibmacro{language+transtitle}%
-    \newcunit\newblock%
-    \usebibmacro{unpubl+letter+date}}%
-  \newcunit%
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \usebibmacro{byeditor+others}%
-  \newunit\newblock
-  \printfield{howpublished}%
-  \newunit\newblock
-  \printfield{type}%
-  \newunit\newblock
-  \printfield{version}%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{institution+organization}%
-  \setunit*{\addcomma\addspace}\newblock
-  \printlist{location}%
-  \iffieldundef{entrysubtype}%
-  {\newcunit\newblock
-    \usebibmacro{date}}%
-  {}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{music}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{italtitle+stitle}%
-  \newcunit%
-  \usebibmacro{byauthor}%
-  \setunit*{\addperiod\addspace}
-  \printeventdate%
-  \newunit\newblock
-  \usebibmacro{part+editor+translator}%
-  \newunit\newblock
-  \usebibmacro{chapinscore}%
-  \usebibmacro{btitle+bstitle}%
-  \iffieldundef{booktitle}
-  {\newunit}% Fix customc?
-  {\newcunit}%
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}
-    \clearfield{volumes}}%
-  \newunit% unit, not cunit?
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{byeditor+others}%
-  \newunit% ??? Editorpunct maybe not right here?
-  \iffieldundef{maintitle}
-  {}
-  {\iffieldundef{volume}
-    {\usebibmacro{cms-in:}%
-      \printtext[maintitle]{%
-        \printfield[noformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
-        \printfield[noformat]{mainsubtitle}}%
-      \newcunit
-      \printfield{maintitleaddon}}
-    {\printfield{volume}%
-      \printfield{part}%
-      \setunit{\addspace}
-      \bibstring{ofseries}%
-      \setunit{\addspace}
-      \printtext[maintitle]{%
-        \printfield[noformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
-        \printfield[noformat]{mainsubtitle}}%
-      \newcunit
-      \printfield{maintitleaddon}}}
-  \newcunit\newblock
-  \printfield{pages}%
-  \newunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-  \printfield{volumes}%
-  \newunit\newblock
-  \printfield{version}%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{music+ser+num}%
-  \newunit
-  \usebibmacro{music+publisher}%
-%  \setunit*{\addspace}%\newblock
-  \usebibmacro{date}%
-  \setunit*{\ifthenelse{\iffieldundef{howpublished}\AND%
-      \iffieldundef{pubstate}}%
-    {\addperiod\addspace}{\space\bibstring{by}\space}}%
-  \printlist{publisher}%
-  \newunit
-  \usebibmacro{institution+organization}%
-  \setunit*{\addcomma\addspace}\newblock
-  \printlist{location}%
-  \newunit\newblock
-  \printfield{type}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{iswc}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{online}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{title+stitle}%
-  \setunit{\addspace}%
-  \usebibmacro{language+transtitle}%
-  \newcunit%
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \printlist{organization}%
-  \newunit\newblock
-  \usebibmacro{date}%
-  \newunit\newblock
-  \iftoggle{cms@doi}%
-  {\printfield{doi}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{patent}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author+holder}% + holder?
-  \newunit\newblock
-  \usebibmacro{title}%
-  \setunit{\addspace}\newblock%
-  \usebibmacro{language+transtitle}%
-  \setunit{\addperiod\addspace}%
-  \printfield{note}%
-  \setunit{\addperiod\addspace}%
-  \printfield{type}%
-  \setunit{\addspace}%
-  \printfield{number}%
-  \iflistundef{location}
-    {}
-    {\setunit*{\addspace}%
-     \printtext[parens]{%
-       \printlist[][-\value{listtotal}]{location}}}%
-  \newcunit\newblock
-  \printfield{version}%
-  \iffieldundef{origyear}%
-  {\iffieldundef{year}%
-    {}%
-    {\bibstring{patentfiled}\setunit{\addspace}% Issued -> filed
-      \printdate}}%
-  {\bibstring{patentfiled}\setunit{\addspace}%
-    \usebibmacro{cmsorigdate}%
-    \setunit{\addcomma\addspace\bibstring{and}%
-      \addspace\bibstring{patentissued}\addspace}%
-    \usebibmacro{date}}%
-  \newcunit\newblock
-  \printfield{addendum}%
-  \newunit\newblock
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{periodical}{%
-  \iffieldequalstr{entrysubtype}{magazine}%
-  {\usebibmacro{bibindex}%
-  \usebibmacro{editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{issuetitle}%
-  \setunit{\addspace}%
-  \usebibmacro{language+transtitle}%
-  \newunit\newblock%
-  \usebibmacro{byeditor+others}%
-  \newunit\newblock
-  \printfield{note}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{periodical+date+issue}%
-  \newcunit\newblock
-  \usebibmacro{chap+pag}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{issn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-  {\usebibmacro{bibindex}%
-  \usebibmacro{editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{issuetitle}%
-  \setunit{\addspace}%
-  \usebibmacro{language+transtitle}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \usebibmacro{byeditor+others}%
-  \newunit\newblock
-  \printfield{note}%
-  \setunit*{\addcomma\addspace}\newblock% (changed for 0.7)??
-  \usebibmacro{periodical+issue+year+pages}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{issn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}}
-
-\DeclareBibliographyDriver{proceedings}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{italtitle+stitle}%
-  \newunit\newblock
-  \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
-  \usebibmacro{editorpunct}%
-  \usebibmacro{bytranslator+others}%
-  \newunit\newblock
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-  \printfield{volumes}%
-  \newunit\newblock
-  \usebibmacro{ser+num}%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{org+publ+loc+year}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{reference}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{italtitle+stitle}%
-  \newunit\newblock
-  \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}%
-  {\iffieldundef{edition}%
-    {}%
-    {\usebibmacro{edition}%
-      \newunit
-      \printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}%
-      \newunit
-      \printfield{volumes}%
-      \clearfield{volumes}}}%
-  {}%
-  \newunit\newblock
-  \usebibmacro{part+editor+translator}%
-  \setunit*{\addperiod\addspace}% need asterisk?
-  \usebibmacro{alt-in:}%
-  \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
-  \newcunit
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}%
-    \clearfield{volumes}}%
-  \newcunit
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{editorpunct}
-  \usebibmacro{byeditor+others}%
-  \newcunit\newblock
-  \usebibmacro{chap+pag}%
-  \newunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-  \printfield{volumes}%
-  \newunit\newblock
-  \usebibmacro{ser+num}%
-  \newunit\newblock
-  \usebibmacro{cmsorigdate}%\printorigdate%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{publ+loc+year}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{report}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{italtitle+stitle}%
-  \newcunit
-  \usebibmacro{byauthor}%
-  \newunit\newblock
-  \usebibmacro{ser+num}%
-  \newunit\newblock
-  \printfield{type}%
-  \newunit
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{inst+loc+year}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{isrn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{review}{%
-  \usebibmacro{bibindex}%
-  \iffieldequalstr{entrysubtype}{magazine}%
-  {\usebibmacro{mag+news+author}}%
-  {\usebibmacro{author/editor}}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \printfield{title}%
-  \setunit{\addcolon\addspace}%
-  \printfield[noformat]{subtitle}%
-  \setunit{\addspace}%
-  \printfield{titleaddon}%
-  \setunit{\addspace}%
-  \usebibmacro{language+transtitle}%
-  \newunit\newblock%
-  \usebibmacro{issuetitle}%
-  \setunit*{\addcomma\addspace}%
-  \usebibmacro{byeditor+others}%
-  \newunit\newblock
-  \printfield{note}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iffieldequalstr{entrysubtype}{magazine}
-  {\usebibmacro{mag+news+date}%
-  \newcunit\newblock
-  \usebibmacro{chap+pag}}%
-  {\usebibmacro{journal+issue+year+pages}}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{issn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{suppbook}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{inforaft}%
-  \setunit{\addspace}\newblock
-  \usebibmacro{italtitle+stitle}%
-  \newunit
-  \iffieldundef{maintitle}%
-  {\iffieldundef{edition}%
-    {}%
-    {\usebibmacro{edition}%
-      \newunit
-      \printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}%
-      \newunit
-      \printfield{volumes}%
-      \clearfield{volumes}}}%
-  {}%
-  \newcunit
-  \usebibmacro{bybookauthor}%
-  \newunit\newblock
-  \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
-  \newcunit%
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}
-    \clearfield{volumes}}%
-  \usebibmacro{editorpunct}%
-  \usebibmacro{byeditor}%
-  \newcunit\newblock%\usebibmacro{editorpunct}
-  \usebibmacro{chap+pag}%
-  \newunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-  \printfield{volumes}%
-  \newunit\newblock
-  \usebibmacro{ser+num}%
-  \newunit\newblock
-  \usebibmacro{cmsorigdate}%\printorigdate%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{publ+loc+year}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyAlias{suppcollection}{suppbook}
-
-\DeclareBibliographyAlias{suppperiodical}{review}
-
-\DeclareBibliographyDriver{thesis}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{title+stitle}%
-  \setunit{\addspace}%\newblock%
-  \usebibmacro{language+transtitle}%
-  \newcunit%
-  \usebibmacro{byauthor}%
-  \setunit{\addperiod\addspace}%
-  \printfield{note}%
-  \setunit{\addperiod\addspace}\newblock%
-  \usebibmacro{type+inst+year}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{unpublished}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \usebibmacro{title+stitle}%
-  \setunit{\addspace}\newblock%
-  \usebibmacro{language+transtitle}%
-  \newcunit%usebibmacro{byauthorpunct}% Why does this work?  No idea.
-  \usebibmacro{byauthor}% Same in thesis type, as well.
-  \setunit{\addperiod\addspace}%
-  \printfield{howpublished}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{note}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printlist{location}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{date}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@url}
-  {\usebibmacro{url+date}}%
-  {}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{video}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newunit\newblock
-  \printtext[title]{%
-    \printfield[noformat]{title}%
-    \setunit{\addcolon\addspace}%
-    \printfield[noformat]{subtitle}}%
-  \iffieldundef{booktitle}% Comma after italics, period after quotes
-  {\newcunit}
-  {\newunit}%\setunit{\addspace}\newblock%
-  \printfield{titleaddon}%\usebibmacro{title+stitle}%
-  \setunit{\addspace}\newblock%\bibsentence
-  \usebibmacro{language+transtitle}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{byauthor}%
-  \setunit{\addperiod\addspace}%
-  \usebibmacro{part+editor+translator}%
-  \setunit{\addperiod\addspace}%
-  \usebibmacro{chapinscore}%
-  \usebibmacro{btitle+bstitle}%
-  \iffieldundef{booktitle}
-  {\setunit{\addperiod\addspace}}% Fix customc?
-  {\setunit{\addcomma\addspace}}%
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}
-    \clearfield{volumes}}%
-  \newunit
-  \printfield{type}%
-  \newunit% unit, not cunit?
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{byeditor+others}%
-  \newunit% ??? Editorpunct maybe not right here?
-  \iffieldundef{maintitle}
-  {}
-  {\iffieldundef{volume}
-    {\usebibmacro{cms-in:}%
-      \printtext[maintitle]{%
-        \printfield[noformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
-        \printfield[noformat]{mainsubtitle}}%
-      \newcunit
-      \printfield{maintitleaddon}}
-    {\printfield{volume}%
-      \printfield{part}%
-      \setunit{\addspace}
-      \bibstring{ofseries}%
-      \setunit{\addspace}
-      \printtext[maintitle]{%
-        \printfield[noformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
-        \printfield[noformat]{mainsubtitle}}%
-      \newcunit
-      \printfield{maintitleaddon}}}
-  \newcunit\newblock
-  \printfield{pages}%
-  \newunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newunit
-  \printfield{volumes}%
-  \newunit\newblock
-  \usebibmacro{ser+num}%
-  \newunit\newblock
-  \usebibmacro{cmsorigdate}%\printorigdate%
-  \newunit\newblock
-  \printfield{note}%
-  \newunit\newblock
-  \usebibmacro{publ+loc+year}%
-  \newunit\newblock
-  \printfield{addendum}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@isbn}%
-  {\printfield{isan}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{bib+doi+url}%
-  \newunit\newblock
-  \usebibmacro{pageref}%
-  \newunit\newblock
-  \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}%
-
-%%%% Other Formatting Macros %%%%
-
-\newbibmacro*{bib+doi+url}{% For biblatex field exclusion
-  \iftoggle{cms@doi}%
-  {\printfield{doi}}%
-  {}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \iftoggle{cms@url}%
-  {\usebibmacro{url+date}}%
-  {}}
-
-\newbibmacro*{bibpostxref}{%
-  \iffieldundef{postnote}%
-  {\iffieldundef{chapter}%
-    {\iffieldundef{pages}%
-      {}%
-      {\postnotedelim%  Extra space?
-        \printfield{pages}}}%
-    {\postnotedelim%
-      \printfield{chapter}}}%
-  {\postnotedelim%
-    \printfield{postnote}}}
-
-\newbibmacro*{mtitle+mstitle+vol+part+title+stitle}{%
-  \iffieldundef{maintitle}
-  {}
-  {\iffieldundef{volume}
-    {\usebibmacro{cms-in:}%
-      \printtext[maintitle]{%
-        \printfield[noformat]{maintitle}%
-      \setunit{\addcolon\addspace}%
-      \printfield[noformat]{mainsubtitle}}%
-    \newcunit
-    \printfield{maintitleaddon}}
-  {\printfield{volume}%
-    \printfield{part}%
-    \setunit{\addspace}
-    \bibstring{ofseries}%
-    \setunit{\addspace}
-    \printtext[maintitle]{%
-      \printfield[noformat]{maintitle}%
-      \setunit{\addcolon\addspace}%
-      \printfield[noformat]{mainsubtitle}}%
-    \newcunit
-    \printfield{maintitleaddon}}}}
-
-\newbibmacro*{mtitle+mstitle+vol+part+btitle+bstitle}{%
-  \usebibmacro{btitle+bstitle}%
-  \iffieldundef{booktitle}
-  {\setunit{\addperiod\addspace}}% Fix customc?
-  {\setunit{\addcomma\addspace}}%
-  \iffieldundef{maintitle}
-  {}
-  {\iffieldundef{volume}
-    {\usebibmacro{cms-in:}%
-      \printtext[maintitle]{%
-        \printfield[noformat]{maintitle}%
-      \setunit{\addcolon\addspace}%
-      \printfield[noformat]{mainsubtitle}}%
-    \newcunit
-    \printfield{maintitleaddon}}
-  {\printfield{volume}%
-    \printfield{part}%
-    \setunit{\addspace}
-    \bibstring{ofseries}%
-    \setunit{\addspace}
-    \printtext[maintitle]{%
-      \printfield[noformat]{maintitle}%
-      \setunit{\addcolon\addspace}%
-      \printfield[noformat]{mainsubtitle}}%
-    \newcunit
-    \printfield{maintitleaddon}}}}
-
-\newbibmacro*{journal+issue+year+pages}{%
-  \usebibmacro{cjournal+ser+vol+num}%
-  \ifboolexpr{% 16th ed.
-    test {\iffieldundef{issue}}
-    and
-    test {\iffieldundef{year}}
-    and
-    not togl {cms@switchdates}
-  }%
-  {\iffieldundef{number}%
-    {\setunit{\addcolon}\printfield{pages}}%
-    {\newcunit\printfield{pages}}}%
-  {\setunit{\addspace}%
-    \printtext[parens]{%
-      \iffieldundef{issue}
-      {\usebibmacro{number+or+month}}%
-      {\printfield{issue}%
-        \setunit{\addspace}%
-        \usebibmacro{cmsyear}}}%
-    \setunit{\addcolon\addspace}
-    \printfield{pages}}}
-
-\newbibmacro*{periodical+issue+year+pages}{%
-  \usebibmacro{cperiodical+ser+vol+num}%
-  \ifboolexpr{% 16th ed.
-    test {\iffieldundef{issue}}
-    and
-    test {\iffieldundef{year}}
-    and
-    not togl {cms@switchdates}
-  }%
-  {\iffieldundef{number}%
-    {\setunit{\addcolon}\printfield{pages}}%
-    {\newcunit\printfield{pages}}}%
-  {\setunit{\addspace}%
-    \printtext[parens]{%
-      \iffieldundef{issue}
-      {\usebibmacro{number+or+month}}%
-      {\printfield{issue}%
-        \setunit{\addspace}%
-        \usebibmacro{cmsyear}}}%
-    \setunit{\addcolon\addspace}
-    \printfield{pages}}}
-
-\newbibmacro*{bycompiler}{%
-  \ifnameundef{namec}
-    {}
-    {\bibstring{bycompiler}\addspace
-     \printnames[bycompiler]{namec}}}
-
-\renewbibmacro*{byeditor}{%
-  \ifnameundef{editor}
-    {}
-    {\usebibmacro{bytypestrg}{editor}{editor}%
-     \setunit{\addspace}%
-     \printnames[byeditor]{editor}%
-     \usebibmacro{editorpunct}}%
-  \usebibmacro{byeditorx}}
-
-\renewbibmacro*{byeditorx}{%
-  \ifnameundef{editora}
-    {}
-    {\usebibmacro{bytypestrg}{editora}{editor}%
-     \setunit{\addspace}%
-     \printnames[byeditora]{editora}%
-     \usebibmacro{editorpunct}}%
-  \ifnameundef{editorb}
-    {}
-    {\usebibmacro{bytypestrg}{editorb}{editor}%
-     \setunit{\addspace}%
-     \printnames[byeditorb]{editorb}%
-     \usebibmacro{editorpunct}}%
-  \ifnameundef{editorc}
-    {}
-    {\usebibmacro{bytypestrg}{editorc}{editor}%
-     \setunit{\addspace}%
-     \printnames[byeditorc]{editorc}%
-     \usebibmacro{editorpunct}}}
-
-\renewbibmacro*{byeditor+others}{%
-  \ifthenelse{\NOT\ifnameundef{editor}\AND
-    \(\iffieldundef{editortype}\OR
-    \iffieldequalstr{editortype}{editor}\)}
-    {\def\@tempa{byeditor}%
-     \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}%
-     \setunit{\addspace}%
-     \printnames[byeditor]{editor}%
-     \clearname{editor}%
-     \usebibmacro{editorpunct}%
-     \usebibmacro{byeditorx}}%
-   {\usebibmacro{byeditor}}%
-  \usebibmacro{bytranslator+others}}
-
-\renewbibmacro*{bytranslator+others}{%
-  \ifnameundef{translator}
-    {}
-    {\def\@tempa{bytranslator}%
-      \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}%
-     \usebibmacro{editorpunct}}%
-  \usebibmacro{bycompiler+others}}
-
-\newbibmacro*{bycompiler+others}{%
-  \ifnameundef{namec}
-    {}
-    {\def\@tempa{bycompiler}%
-     \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}%
-     \usebibmacro{editorpunct}}%
-  \usebibmacro{byothers}}
-
-\newbibmacro*{byothers}{% Changed for 0.9
-  \usebibmacro{bytranslator}%
-  \usebibmacro{editorpunct}%
-  \usebibmacro{bycompiler}%
-  \usebibmacro{editorpunct}%
-%  \usebibmacro{byredactor}%
-%  \usebibmacro{editorpunct}%
-  \usebibmacro{withcommentator}%
-  \usebibmacro{editorpunct}%
-  \usebibmacro{withannotator}%
-  \usebibmacro{editorpunct}%
-  \usebibmacro{withintroduction}%
-  \usebibmacro{editorpunct}%
-  \usebibmacro{withforeword}%
-  \usebibmacro{editorpunct}%
-  \usebibmacro{withafterword}}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.cbx
deleted file mode 100644
index ca84169b50d..00000000000
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.cbx
+++ /dev/null
@@ -1,3816 +0,0 @@
-% $Id: chicago-notes15.cbx,v 0.9.7.22 2013/10/21 14:51: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}[2013/10/21 v 2.8 biblatex citation style]
-
-%%%% Biblatex initialization + Chicago options + Toggles %%%%
-
-\providecommand*{\mkibid}[1]{#1}
-
-%\providetoggle{cms@oneyear}% Needed for author-date
-\providetoggle{cms@reprint}% ditto
-\providetoggle{cms@switchdates}% ditto
-
-\providetoggle{cms@jrcomma}% For comma before Jr./Sr.
-
-\providetoggle{cms@url}% These are for the field-exclusion options
-\providetoggle{cms@doi}
-\providetoggle{cms@isbn}
-\providetoggle{cms@numbermonth}
-\providetoggle{cms@bookpages}
-
-\providetoggle{cms@headlessnote}
-\providetoggle{cms@fullnote}
-\providetoggle{cms@shortnote}
-\providetoggle{cms@allshort}
-\providetoggle{cms@noibid}
-\providetoggle{cms@usecompiler}
-\providetoggle{cms@shorthandibid}
-\providetoggle{cms@printshhand}
-\providetoggle{cms@origpublished}
-\providetoggle{cms@loccit}
-\providetoggle{cms@annotation}
-\providetoggle{cms@postposit}
-
-\AtEveryCitekey{%
-  \iffieldundef{userc}%
-  {}%
-  {\nocite{\thefield{userc}}}%
-  \global\togglefalse{cms@loccit}%
-  \iffieldequalstr{pubstate}{reprint}%
-  {\toggletrue{cms@reprint}}%
-  {\togglefalse{cms@reprint}}%
-  \ifboolexpr{%
-    test {\iffieldundef{origyear}}
-    or
-    test {\iffieldundef{year}}
-    or
-    not test {\iffieldint{year}}
-    or
-    not test {\iffieldint{origyear}}
-    or
-    togl {cms@switchdates}
-  }%
-  {}%
-  {\ifboolexpr{%
-      test {\iffieldundef{endyear}}%
-      or
-      not test {\iffieldnum{endyear}}
-    }%
-    {\ifthenelse{\thefield{origyear}>\thefield{year}}%
-      {\toggletrue{cms@switchdates}}%
-      {}}%
-    {\ifthenelse{\thefield{origyear}>\thefield{endyear}}%
-      {\toggletrue{cms@switchdates}}%
-      {}}}}%
-
-\DeclareBibliographyOption{annotation}[true]{%
-  \global\toggletrue{cms@annotation}}
-
-\DeclareBibliographyOption{noibid}[true]{%
-  \global\toggletrue{cms@noibid}}
-
-\DeclareBibliographyOption{short}[true]{%
-  \global\toggletrue{cms@allshort}}
-
-\DeclareBibliographyOption{shorthandibid}[true]{%
-  \global\toggletrue{cms@shorthandibid}}
-
-\DeclareBibliographyOption{usecompiler}[true]{%
-  \settoggle{cms@usecompiler}{#1}}
-
-\DeclareEntryOption{usecompiler}[true]{%
-  \settoggle{cms@usecompiler}{#1}}
-
-\DeclareBibliographyOption{juniorcomma}[true]{%
-  \settoggle{cms@jrcomma}{#1}}
-
-\DeclareEntryOption{juniorcomma}[true]{%
-  \settoggle{cms@jrcomma}{#1}}
-
-% The field-exclusion options %
-
-\DeclareBibliographyOption{isbn}[true]{%
-  \settoggle{cms@isbn}{#1}}
-\DeclareBibliographyOption{url}[true]{%
-  \settoggle{cms@url}{#1}}
-\DeclareBibliographyOption{doi}[true]{%
-  \settoggle{cms@doi}{#1}}
-\DeclareBibliographyOption{numbermonth}[true]{%
-  \settoggle{cms@numbermonth}{#1}}
-\DeclareBibliographyOption{bookpages}[true]{%
-  \settoggle{cms@bookpages}{#1}}
-\DeclareBibliographyOption{includeall}[true]{%
-  \settoggle{cms@isbn}{#1}%
-  \settoggle{cms@url}{#1}%
-  \settoggle{cms@doi}{#1}%
-  \settoggle{cms@numbermonth}{#1}%
-  \settoggle{cms@bookpages}{#1}}
-
-\DeclareEntryOption{isbn}[true]{%
-  \settoggle{cms@isbn}{#1}}
-\DeclareEntryOption{url}[true]{%
-  \settoggle{cms@url}{#1}}
-\DeclareEntryOption{doi}[true]{%
-  \settoggle{cms@doi}{#1}}
-\DeclareEntryOption{numbermonth}[true]{%
-  \settoggle{cms@numbermonth}{#1}}
-\DeclareEntryOption{bookpages}[true]{%
-  \settoggle{cms@bookpages}{#1}}
-
-\ExecuteBibliographyOptions{includeall}
-
-% For author-date compatibility %
-
-\DeclareEntryOption{switchdates}[true]{%
-  \settoggle{cms@switchdates}{#1}}
-
-\DeclareEntryOption{cmsdate}{}%
-
-\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}
-
-%%%% Initialize and define bibstrings %%%%
-
-%%%% Now in cms-*.lbx %%%%
-
-%%%% Cite macros for use by the citation commands %%%%
-
-\newbibmacro*{cite:init}{%
-  \global\let\cbx@lastkey\undefined}
-
-\newbibmacro*{cite:save}{%
-  \savefield{entrykey}{\cbx@lastkey}}
-
-\newbibmacro*{cite}{%
-  \ifciteseen%
-    {\iffieldundef{shorthand}%
-       {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
-          {\usebibmacro{cite:ibid}}%
-          {\global\toggletrue{cms@shortnote}%
-            \global\togglefalse{cms@fullnote}%
-            \usebibmacro{cite:short}%
-           \usebibmacro{cite:save}}}%
-       {\iftoggle{cms@shorthandibid}%
-         {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
-           {\usebibmacro{cite:ibid}}%
-           {\usebibmacro{cite:shorthand}%
-             \usebibmacro{cite:save}}}%
-         {\usebibmacro{cite:shorthand}%
-           \usebibmacro{cite:save}}}}%
-    {\iftoggle{cms@allshort}%
-      {\global\toggletrue{cms@shortnote}%
-        \global\togglefalse{cms@fullnote}%
-        \global\toggletrue{cms@printshhand}%
-        \usebibmacro{cite:short}%
-        \usebibmacro{cite:save}}%
-      {\global\toggletrue{cms@fullnote}%
-        \global\togglefalse{cms@shortnote}%
-        \usebibmacro{cite:full}%
-        \usebibmacro{cite:save}}}}%
-
-\newbibmacro*{crosscite}{%
-  \ifciteseen
-    {\iffieldundef{shorthand}
-       {\ifthenelse{\iffieldequals{entrykey}{\cbx@lastkey}\AND
-                    \NOT\iffirstonpage}
-          {\usebibmacro{cite:ibid}}%
-          {\global\toggletrue{cms@shortnote}%
-            \global\toggletrue{cms@fullnote}%
-            \usebibmacro{cite:short}%
-            \usebibmacro{fullpostnote}%
-           \usebibmacro{cite:save}}}%
-       {\global\togglefalse{cms@shortnote}%
-         \global\togglefalse{cms@fullnote}%
-         \usebibmacro{cite:shorthand}%
-        \usebibmacro{cite:init}}}%
-    {\iftoggle{cms@allshort}%
-      {\global\toggletrue{cms@shortnote}%
-        \usebibmacro{cite:short}%
-        \usebibmacro{fullpostnote}%
-        \usebibmacro{cite:save}}%
-      {\global\toggletrue{cms@fullnote}%
-        \usebibmacro{cite:crossfull}%
-        \usebibmacro{cite:save}}}}%
-
-\newbibmacro*{cite:full}{%
-  \printtext[bibhypertarget]{%
-    \usedriver
-      {\DeclareNameAlias{sortname}{default}\frenchspacing}
-      {cite:\thefield{entrytype}}%
-   \iffieldundef{shorthand}
-     {}%
-     {\usebibmacro{cms:shorthandintro}}}}
-
-\newbibmacro*{cite:crossfull}{%
-  \printtext[bibhypertarget]{%
-    \usedriver
-      {\DeclareNameAlias{sortname}{default}\frenchspacing}
-      {cite:crossfull}%
-   \iffieldundef{shorthand}
-     {}
-     {\usebibmacro{cms:shorthandintro}}}}
-
-\newbibmacro*{cite:short}{%
-  \ifthenelse{\ifnameundef{labelname}\OR%
-    \iffieldequalstr{entrytype}{inreference}\OR%
-    \iffieldequalstr{entrytype}{reference}}%
-  {\iffieldequalstr{entrysubtype}{magazine}% Simplify .bib creation
-    {\ifuseauthor%
-      {\printfield[journaltitle]{journaltitle}\isdot\newcunit}%
-      {}}%
-    {\iffieldequalstr{entrytype}{manual}%
-      {\printlist{organization}\isdot\newcunit}%
-      {}}}%
-  {\iffieldequalstr{authortype}{anon}%
-    {\bibleftbracket\printnames{labelname}%
-      \bibrightbracket\classicpunct}%
-    {\iffieldequalstr{authortype}{anon?}%
-      {\bibleftbracket\printnames{labelname}?%
-        \bibrightbracket\classicpunct}%
-      {\printnames{labelname}%
-        \isdot\classicpunct}}}%
-  \ifboolexpr{%
-    togl {cms@allshort}%
-    or
-    test {\ifbibliography}
-  }%
-  {\printtext[bibhyperref]{%
-    \printfield[citetitle]{labeltitle}}}%
-  {\printtext[bibhyperlink]{%
-    \printfield[citetitle]{labeltitle}}}}%:\thefield{entrytype}?
-
-\newbibmacro*{cite:shorthand}{%
-  \iftoggle{cms@allshort}%
-  {\printtext[bibhyperref]{%
-      \printfield{shorthand}}}%
-  {\printtext[bibhyperlink]{%
-      \printfield{shorthand}}}}
-
-\newbibmacro*{cms:shorthandintro}{% For changing the citedas phrase
-  \iffieldundef{shorthandintro}%
-  {\addperiod\space%
-    \bibstring{citedas}\space%
-    \printfield{shorthand}}%
-  {\addperiod\space%
-    \printfield{shorthandintro}}}
-
-\newbibmacro*{cite:ibid}{%
-  \iftoggle{cms@noibid}
-  {\global\toggletrue{cms@shortnote}%
-    \global\togglefalse{cms@fullnote}%
-    \usebibmacro{cite:short}%
-    \usebibmacro{cite:save}}%
-  {\iftoggle{cms@allshort}%
-    {\printtext[bibhyperref]{%
-        \bibstring[\mkibid]{ibidem}}}%
-    {\printtext[bibhyperlink]{%
-        \bibstring[\mkibid]{ibidem}}}%
-    \ifloccit
-    {\global\toggletrue{cms@loccit}}%
-    {}}}
-
-\newbibmacro*{cite:journal}{%
-  \ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
-  {\usebibmacro{cite:ibid}}%
-  {\iffieldundef{journaltitle}%
-    {\usebibmacro{cite:short}}%
-    {\iffieldequalstr{authortype}{anon}%
-      {\bibleftbracket\printnames{labelname}%
-        \bibrightbracket\newcunit}%
-      {\iffieldequalstr{authortype}{anon?}%
-        {\bibleftbracket\printnames{labelname}?%
-          \bibrightbracket\newcunit}%
-        {\printnames{labelname}%
-          \isdot\newcunit}}%
-      \printfield[journaltitle]{journaltitle}%
-      \iffieldundef{volume}%
-      {\iffieldundef{number}%
-        {\iffieldundef{issue}
-          {\newcunit%
-            \usebibmacro{number+or+month}}%
-          {\newcunit%
-            \printfield{issue}%
-            \setunit{\addspace}%
-            \usebibmacro{cmsyear}}}%
-        {\newcunit%
-          \printfield[journum]{number}}}%
-      {\toggletrue{cms@fullnote}%
-        \togglefalse{cms@shortnote}%
-        \setunit{\addspace}%
-        \printfield[jourvol]{volume}\setunit{\addcolon}}}}}
-
-%%%% Citation Commands, internal and external %%%%
-
-\DeclareCiteCommand{\cite}
-  {\usebibmacro{prenote}}
-  {\usebibmacro{citeindex}%
-   \usebibmacro{cite}}
-  {\multicitedelim}
-  {\usebibmacro{cite:postnote}}
-
-\DeclareCiteCommand{\xrefcite}
-  {}%\usebibmacro{clearalmostall}} (?)
-  {\usebibmacro{citeindex}%
-    \usebibmacro{cms-in:}%
-    \ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
-      \(\iffieldequalstr{entrytype}{collection}\OR%
-      \iffieldequalstr{entrytype}{proceedings}\)}%
-    {\clearname{author}%
-      \clearname{shortauthor}%
-      \clearname{labelname}}%
-    {}%
-    \usebibmacro{crosscite}}
-  {}
-  {}%\usebibmacro{xrefpostnote}}
-
-\DeclareCiteCommand{\bibxrefcite}
-  {}%\usebibmacro{clearalmostall}} (?)
-  {\usebibmacro{cms-in:}%
-    \ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
-      \(\iffieldequalstr{entrytype}{collection}\OR%
-      \iffieldequalstr{entrytype}{proceedings}\)}%
-    {\clearname{author}%
-      \clearname{shortauthor}%
-      \clearname{labelname}}%
-    {}%
-    \toggletrue{cms@shortnote}%
-    \togglefalse{cms@fullnote}%
-    \usebibmacro{cite:short}}
-  {}
-  {}
-
-\DeclareCiteCommand*{\cite}
-  {\usebibmacro{cite:init}%
-    \usebibmacro{prenote}}
-  {\usebibmacro{citeindex}%
-    \blx@ibidreset
-    \usebibmacro{cite}}
-  {\multicitedelim}
-  {\usebibmacro{postnote}}
-
-\DeclareCiteCommand{\parencite}[\mkbibparens]
-  {\usebibmacro{prenote}}
-  {\usebibmacro{citeindex}%
-   \usebibmacro{cite}}
-  {\multicitedelim}
-  {\usebibmacro{cite:postnote}}
-
-\DeclareCiteCommand{\footcite}[\mkbibfootnote]
-  {\usebibmacro{prenote}}%\bibsentence
-  {\usebibmacro{citeindex}%
-   \usebibmacro{cite}}
-  {\multicitedelim}
-  {\usebibmacro{cite:postnote}}
-
-\DeclareCiteCommand{\smartcite}
-  [\iffootnote{}{\mkbibfootnote}]
-  {\usebibmacro{prenote}}%\bibsentence
-  {\usebibmacro{citeindex}%
-   \usebibmacro{cite}}
-  {\multicitedelim}
-  {\usebibmacro{cite:postnote}}
-
-\DeclareMultiCiteCommand{\smartcites}[\iffootnote{}{\mkbibfootnote}]%
-{\smartcite}{\multicitedelim}
-
-\DeclareCiteCommand{\footfullcite}[\mkbibfootnote]
-  {\usebibmacro{prenote}}%\bibsentence
-  {\usebibmacro{citeindex}%
-    \toggletrue{cms@fullnote}%
-    \togglefalse{cms@shortnote}%
-   \usebibmacro{cite:full}%
-   \usebibmacro{cite:save}}
-  {\multicitedelim}
-  {}
-
-\DeclareCiteCommand{\fullcite}
-  {\usebibmacro{prenote}}%\bibsentence
-  {\usebibmacro{citeindex}%
-    \toggletrue{cms@fullnote}%
-    \togglefalse{cms@shortnote}%
-   \usebibmacro{cite:full}
-   \usebibmacro{cite:save}}
-  {\multicitedelim}
-  {}
-
-\DeclareCiteCommand{\origfullcite}
-  {\ifhyperref%
-    {\hypertarget{cite.\the\c@refsection @\abx@field@entrykey}{}}%
-    {}%
-    \nopunct\unspace}% Put \nopunct and \unspace here for 0.8e.
-  {\usedriver
-    {\DeclareNameAlias{sortname}{default}\clearfield{postnote}
-      \clearname{author}\clearfield{userf}\toggletrue{cms@fullnote}%
-      \toggletrue{cms@headlessnote}\frenchspacing}%
-    {cite:\thefield{entrytype}}}%
-  {\multicitedelim}%
-  {\finentry}% Helps with annotated bibliographies (?)
-
-\DeclareCiteCommand{\origpublcite}% Similar to above, w/o title.
-  {\ifhyperref%
-    {\hypertarget{cite.\the\c@refsection @\abx@field@entrykey}{}}%
-    {}%
-    \nopunct\unspace}% Put \nopunct and \unspace here for 0.8e.
-  {\usedriver
-    {\DeclareNameAlias{sortname}{default}\clearfield{postnote}%
-      \usebibmacro{clearpublin}%
-      \toggletrue{cms@fullnote}\toggletrue{cms@headlessnote}%
-      \toggletrue{cms@origpublished}\frenchspacing}%
-    {cite:\thefield{entrytype}}}%
-  {\multicitedelim}%
-  {\finentry}
-
-\DeclareCiteCommand{\headlessfullcite}
-  {\usebibmacro{hlprenote}}%
-  {\printtext[bibhypertarget]{%
-      \usedriver
-     {\DeclareNameAlias{sortname}{default}\clearname{author}%
-       \toggletrue{cms@fullnote}\toggletrue{cms@headlessnote}%
-       \usebibmacro{cite:save}}%
-     {cite:\thefield{entrytype}}}}%
-  {\multicitedelim}%
-  {}%\usebibmacro{finentry}}
-
-\DeclareCiteCommand{\headlesscite}
-  {\usebibmacro{hlcprenote}}
-  {\usebibmacro{citeindex}%
-    \toggletrue{cms@headlessnote}%
-    \clearname{author}%
-    \clearname{shortauthor}%
-    \clearname{labelname}%
-    \usebibmacro{cite}}
-  {\multicitedelim}
-  {\usebibmacro{cite:postnote}}
-
-\DeclareCiteCommand{\shortcite}
-  {\usebibmacro{prenote}}
-  {\toggletrue{cms@shortnote}%
-    \togglefalse{cms@fullnote}%
-    \usebibmacro{citeindex}%
-    \usebibmacro{cite:short}}
-  {\multicitedelim}
-  {\usebibmacro{postnote}}
-
-\DeclareCiteCommand{\citejournal}% Name?
-  {\usebibmacro{journalprenote}}
-  {\toggletrue{cms@shortnote}%
-    \togglefalse{cms@fullnote}%
-    \usebibmacro{citeindex}%
-    \usebibmacro{cite:journal}}
-  {\multicitedelim}
-  {\usebibmacro{fullpostnote}}
-
-\DeclareCiteCommand{\citeauthor}
-  {\boolfalse{citetracker}%
-   \boolfalse{pagetracker}%
-   \usebibmacro{prenote}}
-  {\toggletrue{cms@shortnote}%
-    \togglefalse{cms@fullnote}%
-    \ifciteindex
-     {\indexnames{labelname}}
-     {}%
-   \printnames{labelname}}
-  {\multicitedelim}
-  {\usebibmacro{postnote}}
-
-\DeclareMultiCiteCommand{\citetitles}{citetitle}{\multicitedelim}
-
-%%%% Drivers for the Long Note Format %%%%
-
-\DeclareBibliographyDriver{cite:article}{%
-  \iffieldequalstr{entrysubtype}{magazine}%
-  {\usebibmacro{bibindex}%
-  \usebibmacro{cmag+news+author}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newcunit\newblock
-  \usebibmacro{cmag+news+title}%
-  \setunit{\addspace}%
-  \usebibmacro{language+transtitle}%
-  \setunit{\addcomma\addspace}%\newblock%
-  \usebibmacro{issuetitle}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{cbyeditor+others}%
-  \setunit{\addcomma\addspace}%
-  \printfield{note}%
-  \setunit{\addcomma\addspace}\newblock
-  \usebibmacro{mag+news+date}%
-  \usebibmacro{fullpostnote}%
-  \newcunit\newblock
-  \printfield{addendum}%
-  \newcunit\newblock
-  \iftoggle{cms@isbn}%
-  {\printfield{issn}}%
-  {}%
-  \newcunit\newblock
-  \usebibmacro{cite+doi+url}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
-  {\usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newcunit\newblock
-  \usebibmacro{cmag+news+title}%
-  \setunit{\addspace}%
-  \usebibmacro{language+transtitle}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{byauthor}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{issuetitle}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{cbyeditor+others}%
-  \setunit{\addcomma\addspace}%
-  \printfield{note}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{cjournal+issue+year+pages}%
-  \usebibmacro{fullpostnote}%
-  \newcunit\newblock
-  \printfield{addendum}%
-  \newcunit\newblock
-  \iftoggle{cms@isbn}%
-  {\printfield{issn}}%
-  {}%
-  \newcunit\newblock
-  \usebibmacro{cite+doi+url}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}}
-
-\DeclareBibliographyDriver{cite:artwork}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \setunit{\addcomma\addspace}\newblock
-  \usebibmacro{citaltitle+stitle}%
-  \newcunit\newblock
-  \usebibmacro{date}%
-  \newcunit
-  \usebibmacro{byauthor}%
-  \newcunit\newblock
-  \usebibmacro{cbyeditor+others}%
-  \newcunit\newblock
-  \printfield{howpublished}%
-  \newcunit\newblock
-  \printfield{type}%
-  \newcunit\newblock
-  \printfield{version}%
-  \newcunit\newblock
-  \printfield{note}%
-  \newcunit\newblock
-  \usebibmacro{institution+organization}%
-  \newcunit\newblock
-  \printlist{location}%
-  \usebibmacro{fullpostnote}%
-  \newcunit\newblock
-  \printfield{addendum}%
-  \newcunit\newblock
-  \usebibmacro{cite+doi+url}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{cite:audio}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newcunit\newblock
-  \usebibmacro{ctitle+stitle}%
-  \setunit{\addspace}\newblock%
-  \usebibmacro{language+transtitle}%
-  \newcunit
-  \usebibmacro{byauthor}%
-  \newcunit
-  \usebibmacro{cpart+editor+translator}%
-  \newcunit
-  \usebibmacro{chapinscore}%
-  \usebibmacro{btitle+bstitle}%
-  \newcunit
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}
-    \clearfield{volumes}}%
-  \newcunit
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{cbyeditor+others}%
-  \iffieldundef{maintitle}
-  {}
-  {\iffieldundef{volume}
-    {\usebibmacro{cms-in:}%
-      \printtext[maintitle]{%
-        \printfield[noformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
-        \printfield[noformat]{mainsubtitle}}%
-      \newcunit
-      \printfield{maintitleaddon}}
-    {\printfield{volume}%
-      \printfield{part}%
-      \setunit{\addspace}
-      \bibstring{ofseries}%
-      \setunit{\addspace}
-      \printtext[maintitle]{%
-        \printfield[noformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
-        \printfield[noformat]{mainsubtitle}}%
-      \newcunit
-      \printfield{maintitleaddon}}}
-  \newcunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newcunit
-  \printfield{volumes}%
-  \newcunit\newblock
-  \usebibmacro{ser+num}%
-  \newcunit\newblock
-  \printfield{note}%
-  \newcunit\newblock
-  \usebibmacro{cpubl+loc+year}%
-  \newcunit
-  \printfield{type}%
-  \usebibmacro{fullpostnote}%
-  \newcunit\newblock
-  \printfield{addendum}%
-  \newcunit\newblock
-  \iftoggle{cms@isbn}%
-  {\printfield{isan}%
-    \newcunit\newblock
-    \printfield{ismn}}%
-  {}%
-  \newcunit\newblock%
-  \usebibmacro{cite+doi+url}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{cite:book}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newcunit\newblock
-  \usebibmacro{citaltitle+stitle}%
-  \newcunit
-  \iffieldundef{maintitle}%
-  {\iffieldundef{edition}%
-    {}%
-    {\usebibmacro{edition}%
-      \newcunit
-      \printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}%
-      \newcunit
-      \printfield{volumes}%
-      \clearfield{volumes}}}%
-  {}%
-  \newcunit
-  \usebibmacro{byauthor}%
-  \newcunit
-  \usebibmacro{cpart+editor+translator}%
-  \newcunit
-  \usebibmacro{cmtitle+mstitle+vol+part+title+stitle}%
-  \newcunit\newblock
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}
-    \clearfield{volumes}}%
-  \newcunit
-  \usebibmacro{cbyeditor+others}%
-  \newcunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newcunit
-  \printfield{volumes}%
-  \newcunit\newblock
-  \usebibmacro{ser+num}%
-  \newcunit\newblock
-  \printfield{note}%
-  \newcunit\newblock
-  \usebibmacro{cpubl+loc+year}%
-  \iftoggle{cms@bookpages}%
-  {}%
-  {\clearfield{pages}}%
-  \usebibmacro{fullpostnote}%
-  \newcunit\newblock
-  \printlist[][-\value{listtotal}]{lista}%
-  \newcunit\newblock
-  \printfield{addendum}%
-  \newcunit\newblock
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \newcunit\newblock
-  \usebibmacro{cite+doi+url}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{cite:bookinbook}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newcunit\newblock
-  \usebibmacro{citaltitle+stitle}%
-  \newcunit\newblock
-  \usebibmacro{byauthor}%
-  \newcunit
-  \usebibmacro{cpart+editor+translator}%
-  \setunit*{\addcomma\addspace}%
-  \usebibmacro{cms-in:}%
-  \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
-  \newcunit
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}
-    \clearfield{volumes}}%
-  \newcunit
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{cbyeditor+others}%
-  \newcunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newcunit
-  \printfield{volumes}%
-  \newcunit\newblock
-  \usebibmacro{ser+num}%
-  \newcunit\newblock
-  \printfield{note}%
-  \newcunit\newblock
-  \usebibmacro{cpubl+loc+year}%
-  \usebibmacro{fullpostnote}%
-  \newcunit\newblock
-  \printfield{addendum}%
-  \newcunit\newblock
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \newcunit\newblock
-  \usebibmacro{cite+doi+url}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{cite:booklet}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \setunit{\addcomma\addspace}\newblock
-  \usebibmacro{citaltitle+stitle}%
-  \newcunit\newblock
-  \usebibmacro{byauthor}%
-  \newcunit
-  \printfield{note}%
-  \setunit{\addspace}\newblock%
-  \printtext[parens]{%
-  \usebibmacro{howpubl+loc+year}}%
-  \usebibmacro{fullpostnote}%
-  \newcunit\newblock
-  \printfield{addendum}%
-  \newcunit\newblock
-  \usebibmacro{cite+doi+url}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{cite:collection}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \setunit{\addcomma\addspace}\newblock
-  \usebibmacro{citaltitle+stitle}%
-  \newcunit
-  \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
-  \newcunit\newblock
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}
-    \clearfield{volumes}}%
-  \newcunit
-  \usebibmacro{cbytranslator+others}%
-  \newcunit\newblock
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newcunit
-  \printfield{volumes}%
-  \newcunit\newblock
-  \usebibmacro{ser+num}%
-  \newcunit\newblock
-  \printfield{note}%
-  \newcunit\newblock
-  \usebibmacro{cpubl+loc+year}%
-  \usebibmacro{fullpostnote}%
-  \newcunit\newblock
-  \printfield{addendum}%
-  \newcunit\newblock
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \newcunit\newblock
-  \usebibmacro{cite+doi+url}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{cite:crossfull}{%
-  \usebibmacro{crefmtitle+mstitle+vol+part+title+stitle}%
-  \newcunit
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}
-    \clearfield{volumes}}%
-  \newcunit
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{cbyeditor+others}%
-  \newcunit\newblock
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newcunit
-  \printfield{volumes}%
-  \newcunit\newblock
-  \usebibmacro{ser+num}%
-  \newcunit\newblock
-  \printfield{note}%
-  \newcunit\newblock
-  \usebibmacro{cpubl+loc+year}%
-  \usebibmacro{fullpostnote}%
-  \newcunit\newblock
-  \printfield{addendum}%
-  \newcunit\newblock
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \newcunit\newblock
-  \usebibmacro{cite+doi+url}%
-  \newcunit\newblock
-  \usebibmacro{pageref}}%
-
-\DeclareBibliographyDriver{cite:customc}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \newcunit\newblock
-  \printfield{nameaddon}%
-  \setunit*{\addspace}%
-  \usebibmacro{italtitle+stitle}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{cite:image}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \setunit{\addcomma\addspace}\newblock
-  \usebibmacro{ctitle+stitle}%
-  \setunit{\addspace}\newblock%
-  \usebibmacro{language+transtitle}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{date}%
-  \newcunit
-  \usebibmacro{byauthor}%
-  \newcunit\newblock
-  \usebibmacro{cbyeditor+others}%
-  \newcunit\newblock
-  \printfield{howpublished}%
-  \newcunit\newblock
-  \printfield{type}%
-  \newcunit\newblock
-  \printfield{version}%
-  \newcunit\newblock
-  \printfield{note}%
-  \newcunit\newblock
-  \usebibmacro{institution+organization}%
-  \newcunit\newblock
-  \printlist{location}%
-  \usebibmacro{fullpostnote}%
-  \newcunit\newblock
-  \printfield{addendum}%
-  \newcunit\newblock
-  \usebibmacro{cite+doi+url}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{cite:inbook}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newcunit\newblock
-  \usebibmacro{ctitle+stitle}%
-  \setunit{\addspace}\newblock%
-  \usebibmacro{language+transtitle}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{byauthor}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{cpart+editor+translator}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{chapincoll}%
-  \usebibmacro{cms-in:}%
-  \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
-  \newcunit
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}
-    \clearfield{volumes}}%
-  \newcunit
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{cbyeditor+others}%
-  \newcunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newcunit
-  \printfield{volumes}%
-  \newcunit\newblock
-  \usebibmacro{ser+num}%
-  \newcunit\newblock
-  \printfield{note}%
-  \newcunit\newblock
-  \usebibmacro{cpubl+loc+year}%
-  \usebibmacro{fullpostnote}%
-  \newcunit\newblock
-  \printfield{addendum}%
-  \newcunit\newblock
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \newcunit\newblock
-  \usebibmacro{cite+doi+url}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{cite:incollection}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newcunit\newblock%
-  \usebibmacro{ctitle+stitle}%
-  \setunit{\addspace}\newblock%
-  \usebibmacro{language+transtitle}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{byauthor}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{cpart+editor+translator}%
-  \setunit{\addcomma\addspace}%
-  \iffieldundef{crossref}%
-  {\iffieldundef{xref}
-    {\usebibmacro{chapincoll}%
-      \usebibmacro{cms-in:}%
-      \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
-      \newcunit
-      \iffieldundef{edition}%
-      {}%
-      {\usebibmacro{edition}%
-        \newcunit
-        \iffieldundef{maintitle}
-        {\printfield{volume}%
-          \printfield{part}%
-          \clearfield{volume}%
-          \clearfield{part}}%
-        {}%
-        \newcunit
-        \printfield{volumes}
-        \clearfield{volumes}}%
-      \newcunit
-      \usebibmacro{bybookauthor}%
-      \usebibmacro{cbyeditor+others}%
-      \newcunit
-      \iffieldundef{maintitle}
-      {\printfield{volume}%
-        \printfield{part}}
-      {}%
-      \newcunit
-      \printfield{volumes}%
-      \newcunit\newblock
-      \usebibmacro{ser+num}%
-      \newcunit\newblock
-      \printfield{note}%
-      \newcunit\newblock
-      \usebibmacro{cpubl+loc+year}%
-      \usebibmacro{fullpostnote}%
-      \newcunit\newblock
-      \printfield{addendum}%
-      \newcunit\newblock
-      \iftoggle{cms@isbn}%
-      {\printfield{isbn}}%
-      {}%
-      \newcunit\newblock
-      \usebibmacro{cite+doi+url}%
-      \newcunit\newblock
-      \usebibmacro{pageref}%
-      \usebibmacro{finentry}}
-    {\ifterm{\iffieldundef{chapter}% New test needed to cope with
-      {\addspace\bibsentence}%     new chapter citing system.
-      {\setunit{\addspace\bibsentence}}}% All altered for 0.9c.
-      {\addcomma\addspace}% Perhaps need to alter it back
-      \usebibmacro{chapincoll}%
-      \xrefcite{\thefield{xref}}% Removed \addspace from each.
-      \usebibmacro{xrefpostnote}%
-      \usebibmacro{finentry}}}%
-  {\ifterm{\iffieldundef{chapter}% New test needed to cope with
-      {\addspace\bibsentence}%     new chapter citing system.
-      {\setunit{\addspace\bibsentence}}}%
-    {\addcomma\addspace}%
-    \usebibmacro{chapincoll}%
-    \xrefcite{\thefield{crossref}}%
-    \usebibmacro{xrefpostnote}%
-    \usebibmacro{finentry}}}
-
-\DeclareBibliographyDriver{cite:inproceedings}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newcunit\newblock
-  \usebibmacro{ctitle+stitle}%
-  \setunit{\addspace}\newblock%
-  \usebibmacro{language+transtitle}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{byauthor}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{cpart+editor+translator}%
-  \setunit{\addcomma\addspace}%
-  \iffieldundef{crossref}%
-  {\iffieldundef{xref}
-    {\usebibmacro{chapincoll}%
-      \usebibmacro{cms-in:}%
-      \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
-      \newcunit\newblock
-      \usebibmacro{cbyeditor+others}%
-      \newcunit\newblock
-      \iffieldundef{maintitle}
-      {\printfield{volume}%
-        \printfield{part}}
-      {}%
-      \newcunit
-      \printfield{volumes}%
-      \newcunit\newblock
-      \usebibmacro{ser+num}%
-      \newcunit\newblock
-      \printfield{note}%
-      \setunit{\addspace}\newblock%
-      \printtext[parens]{%
-        \usebibmacro{org+publ+loc+year}}%
-      \usebibmacro{fullpostnote}%
-      \newcunit\newblock
-      \printfield{addendum}%
-      \newcunit\newblock
-      \iftoggle{cms@isbn}%
-      {\printfield{isbn}}%
-      {}%
-      \newcunit\newblock
-      \usebibmacro{cite+doi+url}%
-      \newcunit\newblock
-      \usebibmacro{pageref}%
-      \usebibmacro{finentry}}
-    {\ifterm{\iffieldundef{chapter}% New test needed to cope with
-      {\addspace\bibsentence}%     new chapter citing system.
-      {\setunit{\addspace\bibsentence}}}% See incollection
-      {\addcomma\addspace}%
-      \usebibmacro{chapincoll}%
-      \xrefcite{\thefield{xref}}%
-      \usebibmacro{xrefpostnote}%
-      \usebibmacro{finentry}}}%
-  {\ifterm{\iffieldundef{chapter}% New test needed to cope with
-      {\addspace\bibsentence}%     new chapter citing system.
-      {\setunit{\addspace\bibsentence}}}%
-    {\addcomma\addspace}%
-    \usebibmacro{chapincoll}%
-    \xrefcite{\thefield{crossref}}%
-    \usebibmacro{xrefpostnote}%
-    \usebibmacro{finentry}}}
-
-\DeclareBibliographyDriver{cite:inreference}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{citaltitle+stitle}%
-  \newcunit\newblock
-  \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}%
-  {\iffieldundef{edition}%
-    {}%
-    {\usebibmacro{edition}%
-      \newcunit
-      \printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}%
-      \newcunit
-      \printfield{volumes}%
-      \clearfield{volumes}}}%
-  {}%
-  \newcunit
-  \usebibmacro{cpart+editor+translator}%
-  \setunit*{\addcomma\addspace}%
-  \usebibmacro{alt-in:}%
-  \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
-  \newcunit
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}
-    \clearfield{volumes}}%
-  \newcunit
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{cbyeditor+others}%
-  \newcunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newcunit
-  \printfield{volumes}%
-  \newcunit\newblock
-  \usebibmacro{ser+num}%
-  \newcunit\newblock
-  \printfield{note}%
-  \newcunit\newblock
-  \usebibmacro{cpubl+loc+year}%
-  \usebibmacro{inreffullpostnote}%
-  \setunit{\addspace}%
-  \ifnameundef{author}%
-  {}%
-  {\printtext[parens]{%
-      \bibstring{by}%
-      \addspace%
-      \printnames{author}}}%
-  \newcunit\newblock
-  \printfield{addendum}%
-  \newcunit\newblock
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \newcunit\newblock
-  \usebibmacro{cite+doi+url}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{cite:letter}{%
-  \usebibmacro{bibindex}%
-  \savefield{fullhash}{\bbx@lasthash}%
-  \printtext[title]{%
-    \printfield[noformat]{title}}%
-  \newcunit\newblock%
-  \printfield{titleaddon}%
-  \setunit*{\addcomma\addspace}%
-  \usebibmacro{letter+date}%
-  \setunit{\addspace}%
-  \usebibmacro{language+transtitle}%
-  \newcunit\newblock%
-  \usebibmacro{cpart+editor+translator}%
-  \setunit*{\addcomma\addspace}%
-  \iffieldundef{crossref}%
-  {\iffieldundef{xref}%
-    {\usebibmacro{chapincoll}%
-      \usebibmacro{cms-in:}%
-      \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
-      \newcunit
-      \iffieldundef{edition}%
-      {}%
-      {\usebibmacro{edition}%
-        \newcunit
-        \iffieldundef{maintitle}
-        {\printfield{volume}%
-          \printfield{part}%
-          \clearfield{volume}%
-          \clearfield{part}}%
-        {}%
-        \newcunit
-        \printfield{volumes}
-        \clearfield{volumes}}%
-      \newcunit
-      \usebibmacro{bybookauthor}%
-      \usebibmacro{cbyeditor+others}%
-      \newcunit
-      \iffieldundef{maintitle}
-      {\printfield{volume}%
-        \printfield{part}}
-      {}%
-      \newcunit
-      \printfield{volumes}%
-      \newcunit\newblock
-      \usebibmacro{ser+num}%
-      \newcunit\newblock
-      \printfield{note}%
-      \newcunit\newblock
-      \usebibmacro{cpubletter+loc+year}%
-      \usebibmacro{fullpostnote}%
-      \newcunit\newblock
-      \printfield{addendum}%
-      \newcunit\newblock
-      \iftoggle{cms@isbn}%
-      {\printfield{isbn}}%
-      {}%
-      \newcunit\newblock
-      \usebibmacro{cite+doi+url}%
-      \newcunit\newblock
-      \usebibmacro{pageref}%
-      \usebibmacro{finentry}}%
-    {\ifterm{\iffieldundef{chapter}% New test needed to cope with
-      {\addspace\bibsentence}%     new chapter citing system.
-      {\setunit{\addspace\bibsentence}}}%
-    {\addcomma\addspace}%
-      \usebibmacro{chapincoll}%
-      \xrefcite{\thefield{xref}}%
-      \usebibmacro{xrefpostnote}%
-      \usebibmacro{finentry}}}%
-  {\ifterm{\iffieldundef{chapter}% New test needed to cope with
-      {\addspace\bibsentence}%     new chapter citing system.
-      {\setunit{\addspace\bibsentence}}}%
-    {\addcomma\addspace}%
-    \usebibmacro{chapincoll}%
-    \xrefcite{\thefield{crossref}}%
-    \usebibmacro{xrefpostnote}%
-    \usebibmacro{finentry}}}
-
-\DeclareBibliographyDriver{cite:manual}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author+org}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \setunit{\addcomma\addspace}\newblock%
-  \usebibmacro{citaltitle+stitle}%
-  \newcunit
-  \usebibmacro{edition}%
-  \newcunit
-  \usebibmacro{byauthor}%
-  \newcunit\newblock
-  \usebibmacro{ser+num}%
-  \newcunit\newblock
-  \printfield{type}%
-  \newcunit
-  \printfield{note}%
-  \setunit{\addspace}\newblock%
-  \printtext[parens]{%
-  \usebibmacro{org+publ+loc+year}}%
-  \usebibmacro{fullpostnote}%
-  \newcunit\newblock
-  \printfield{addendum}%
-  \newcunit\newblock
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \newcunit\newblock
-  \usebibmacro{cite+doi+url}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{cite:misc}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \setunit{\addcomma\addspace}\newblock
-  \iffieldundef{entrysubtype}%
-  {\usebibmacro{citaltitle+stitle}}%
-  {\printfield{title}%
-    \setunit{\addcolon\addspace}%
-    \printfield[noformat]{subtitle}%
-    \newcunit\newblock%
-    \printfield{titleaddon}%
-    \setunit{\addspace}%
-    \usebibmacro{language+transtitle}%
-    \newcunit\newblock
-    \usebibmacro{unpubl+letter+date}}%
-  \newcunit
-  \usebibmacro{byauthor}%
-  \newcunit\newblock
-  \usebibmacro{cbyeditor+others}%
-  \newcunit\newblock
-  \printfield{howpublished}%
-  \newcunit\newblock
-  \printfield{type}%
-  \newcunit\newblock
-  \printfield{version}%
-  \newcunit\newblock
-  \printfield{note}%
-  \newcunit\newblock
-  \usebibmacro{institution+organization}%
-  \newcunit\newblock
-  \printlist{location}%
-  \iffieldundef{entrysubtype}%
-  {\newcunit\newblock
-    \usebibmacro{date}}%
-  {}%
-  \usebibmacro{fullpostnote}%
-  \newcunit\newblock
-  \printfield{addendum}%
-  \newcunit\newblock
-  \usebibmacro{cite+doi+url}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{cite:music}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \setunit{\addcomma\addspace}\newblock
-  \usebibmacro{citaltitle+stitle}%
-  \newcunit
-  \usebibmacro{byauthor}%
-  \newcunit
-  \printeventdate%
-  \newcunit\newblock
-  \usebibmacro{cpart+editor+translator}%
-  \newcunit
-  \usebibmacro{chapinscore}%
-  \usebibmacro{btitle+bstitle}%
-  \newcunit
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}
-    \clearfield{volumes}}%
-  \newcunit
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{cbyeditor+others}%
-  \iffieldundef{maintitle}
-  {}
-  {\iffieldundef{volume}
-    {\usebibmacro{cms-in:}%
-      \printtext[maintitle]{%
-        \printfield[noformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
-        \printfield[noformat]{mainsubtitle}}%
-      \newcunit
-      \printfield{maintitleaddon}}
-    {\printfield{volume}%
-      \printfield{part}%
-      \setunit{\addspace}
-      \bibstring{ofseries}%
-      \setunit{\addspace}
-      \printtext[maintitle]{%
-        \printfield[noformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
-        \printfield[noformat]{mainsubtitle}}%
-      \newcunit
-      \printfield{maintitleaddon}}}
-  \newcunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newcunit
-  \printfield{volumes}%
-  \newcunit\newblock
-  \printfield{version}%
-  \newcunit\newblock
-  \printfield{note}%
-  \newcunit\newblock
-  \usebibmacro{music+ser+num}%
-  \newcunit\newblock
-  \usebibmacro{music+publisher}%
-%  \setunit*{\addspace}%\newblock
-  \usebibmacro{date}%
-  \setunit*{\ifthenelse{\iffieldundef{howpublished}\AND%
-      \iffieldundef{pubstate}}%
-    {\addcomma\addspace}{\addspace}}%
-  \printlist{publisher}%
-  \newcunit
-  \usebibmacro{institution+organization}%
-  \newcunit\newblock
-  \printlist{location}%
-  \newcunit\newblock
-  \printfield{type}%
-  \usebibmacro{fullpostnote}%
-  \newcunit\newblock
-  \printfield{addendum}%
-  \newcunit\newblock
-  \iftoggle{cms@isbn}%
-  {\printfield{iswc}}%
-  {}%
-  \newcunit\newblock
-  \usebibmacro{cite+doi+url}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{cite:online}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \setunit{\addcomma\addspace}\newblock
-  \usebibmacro{ctitle+stitle}%
-  \setunit{\addspace}%
-  \usebibmacro{language+transtitle}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{byauthor}%
-  \setunit{\addcomma\addspace}%
-  \printfield{note}%
-  \setunit{\addcomma\addspace}%
-  \printlist{organization}%
-  \setunit{\addcomma\addspace}
-  \usebibmacro{date}%
-  \setunit{\addcomma\addspace}%
-  \iftoggle{cms@doi}%
-  {\printfield{doi}}%
-  {}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{url+date}%
-  \usebibmacro{fullpostnote}%
-  \newcunit\newblock
-  \printfield{addendum}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{cite:patent}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author+holder}% +holder?
-  \newcunit\newblock
-  \usebibmacro{ctitle+stitle}%
-  \setunit{\addspace}%
-  \usebibmacro{language+transtitle}%
-  \setunit{\addcomma\addspace}\newblock%
-  \printfield{note}%
-  \setunit{\addspace}%
-  \printtext[parens]{%
-  \printfield{type}%
-  \setunit*{\addspace}%
-  \printfield{number}%
-  \iflistundef{location}
-    {}
-    {\setunit*{\addspace}%
-     \printtext[parens]{%
-       \printlist[][-\value{listtotal}]{location}}}%
-  \newcunit\newblock
-  \printfield{version}%
-  \newcunit
-  \iffieldundef{origyear}%
-  {\iffieldundef{year}%
-    {}%
-    {\bibstring{patentfiled}\setunit{\addspace}% Changed to filed
-      \printdate}}%
-  {\bibstring{patentfiled}\setunit{\addspace}%
-    \usebibmacro{cmsorigdate}%
-    \setunit{\addcomma\addspace\bibstring{and}%
-      \addspace\bibstring{patentissued}\addspace}%
-  \usebibmacro{date}}%
-  \newcunit%
-  \printfield{addendum}}%
-  \usebibmacro{fullpostnote}%
-  \newcunit\newblock
-  \usebibmacro{cite+doi+url}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{cite:periodical}{%
-  \iffieldequalstr{entrysubtype}{magazine}%
-  {\usebibmacro{bibindex}%
-  \usebibmacro{editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newcunit\newblock
-  \usebibmacro{issuetitle}%
-  \setunit{\addspace}%
-  \usebibmacro{language+transtitle}%
-  \setunit{\addcomma\addspace}%\newblock%
-  \usebibmacro{cbyeditor+others}%
-  \setunit{\addcomma\addspace}%
-  \printfield{note}%
-  \setunit{\addcomma\addspace}\newblock
-  \usebibmacro{periodical+date+issue}%
-  \usebibmacro{fullpostnote}%
-  \newcunit\newblock
-  \printfield{addendum}%
-  \newcunit\newblock
-  \iftoggle{cms@isbn}%
-  {\printfield{issn}}%
-  {}%
-  \newcunit\newblock
-  \usebibmacro{cite+doi+url}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}%
-  {\usebibmacro{bibindex}%
-  \usebibmacro{editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newcunit\newblock
-  \usebibmacro{issuetitle}%
-  \setunit{\addspace}%
-  \usebibmacro{language+transtitle}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{byauthor}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{cbyeditor+others}%
-  \setunit{\addcomma\addspace}%
-  \printfield{note}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{cperiodical+issue+year+pages}%
-  \usebibmacro{fullpostnote}%
-  \newcunit\newblock
-  \printfield{addendum}%
-  \newcunit\newblock
-  \iftoggle{cms@isbn}%
-  {\printfield{issn}}%
-  {}%
-  \newcunit\newblock
-  \usebibmacro{cite+doi+url}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}}
-
-\DeclareBibliographyDriver{cite:proceedings}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \setunit{\addcomma\addspace}\newblock%
-  \usebibmacro{citaltitle+stitle}%
-  \newcunit
-  \usebibmacro{cmtitle+mstitle+vol+part+title+stitle}%
-  \newcunit\newblock
-  \usebibmacro{cbytranslator+others}%
-  \newcunit\newblock
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newcunit
-  \printfield{volumes}%
-  \newcunit\newblock
-  \usebibmacro{ser+num}%
-  \newcunit\newblock
-  \printfield{note}%
-  \setunit{\addspace}\newblock%
-  \printtext[parens]{%
-  \usebibmacro{org+publ+loc+year}}%
-  \usebibmacro{fullpostnote}%
-  \newcunit\newblock
-  \printfield{addendum}%
-  \newcunit\newblock
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \newcunit\newblock
-  \usebibmacro{cite+doi+url}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{cite:reference}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{citaltitle+stitle}%
-  \newcunit\newblock
-  \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}%
-  {\iffieldundef{edition}%
-    {}%
-    {\usebibmacro{edition}%
-      \newcunit
-      \printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}%
-      \newcunit
-      \printfield{volumes}%
-      \clearfield{volumes}}}%
-  {}%
-  \newcunit
-  \usebibmacro{cpart+editor+translator}%
-  \setunit*{\addcomma\addspace}%
-  \usebibmacro{alt-in:}%
-  \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
-  \newcunit
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}
-    \clearfield{volumes}}%
-  \newcunit
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{cbyeditor+others}%
-  \newcunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newcunit
-  \printfield{volumes}%
-  \newcunit\newblock
-  \usebibmacro{ser+num}%
-  \newcunit\newblock
-  \printfield{note}%
-  \newcunit\newblock
-  \usebibmacro{cpubl+loc+year}%
-  \usebibmacro{fullpostnote}%
-  \newcunit\newblock
-  \printfield{addendum}%
-  \newcunit\newblock
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \newcunit\newblock
-  \usebibmacro{cite+doi+url}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{cite:report}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \setunit{\addcomma\addspace}\newblock
-  \usebibmacro{citaltitle+stitle}%
-  \newcunit
-  \usebibmacro{byauthor}%
-  \newcunit\newblock
-  \usebibmacro{ser+num}%
-  \newcunit\newblock
-  \printfield{type}%
-  \newcunit
-  \printfield{note}%
-  \setunit{\addspace}\newblock%
-  \printtext[parens]{%
-  \usebibmacro{inst+loc+year}}%
-  \usebibmacro{fullpostnote}%
-  \newcunit\newblock
-  \printfield{addendum}%
-  \newcunit\newblock
-  \iftoggle{cms@isbn}%
-  {\printfield{isrn}}%
-  {}%
-  \newcunit\newblock
-  \usebibmacro{cite+doi+url}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{cite:review}{%
-  \usebibmacro{bibindex}%
-  \iffieldequalstr{entrysubtype}{magazine}
-  {\usebibmacro{cmag+news+author}}%
-  {\usebibmacro{author/editor}}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newcunit\newblock
-  \printfield{title}%
-  \setunit{\addcolon\addspace}%
-  \printfield[noformat]{subtitle}%
-  \newcunit\newblock
-  \printfield{titleaddon}%
-  \setunit{\addspace}%
-  \usebibmacro{language+transtitle}%
-  \setunit{\addcomma\addspace}%\newblock%
-  \usebibmacro{issuetitle}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{cbyeditor+others}%
-  \setunit{\addcomma\addspace}%
-  \printfield{note}%
-  \setunit{\addcomma\addspace}%
-  \iffieldequalstr{entrysubtype}{magazine}
-  {\usebibmacro{mag+news+date}}%
-  {\usebibmacro{cjournal+issue+year+pages}}%
-  \usebibmacro{fullpostnote}%
-  \newcunit\newblock
-  \printfield{addendum}%
-  \newcunit\newblock
-  \iftoggle{cms@isbn}%
-  {\printfield{issn}}%
-  {}%
-  \newcunit\newblock
-  \usebibmacro{cite+doi+url}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{cite:suppbook}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newcunit\newblock
-  \usebibmacro{inforaft}%
-  \setunit{\addspace}\newblock
-  \usebibmacro{citaltitle+stitle}%
-  \newcunit
-  \iffieldundef{maintitle}%
-  {\iffieldundef{edition}%
-    {}%
-    {\usebibmacro{edition}%
-      \newcunit
-      \printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}%
-      \newcunit
-      \printfield{volumes}%
-      \clearfield{volumes}}}%
-  {}%
-  \newcunit
-  \usebibmacro{bybookauthor}%
-  \newcunit\newblock
-  \usebibmacro{cmtitle+mstitle+vol+part+title+stitle}%
-  \newcunit
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}
-    \clearfield{volumes}}%
-  \newcunit
-  \usebibmacro{cbyeditor}%
-  \newcunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newcunit
-  \printfield{volumes}%
-  \newcunit\newblock
-  \usebibmacro{ser+num}%
-  \newcunit\newblock
-  \printfield{note}%
-  \newcunit\newblock
-  \usebibmacro{cpubl+loc+year}%
-  \usebibmacro{fullpostnote}%
-  \newcunit\newblock
-  \printfield{addendum}%
-  \newcunit\newblock
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \newcunit\newblock
-  \usebibmacro{cite+doi+url}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyAlias{cite:suppcollection}{cite:suppbook}
-
-\DeclareBibliographyAlias{cite:suppperiodical}{cite:review}
-
-\DeclareBibliographyDriver{cite:thesis}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \setunit{\addcomma\addspace}\newblock
-  \usebibmacro{ctitle+stitle}%
-  \setunit{\addspace}\newblock%
-  \usebibmacro{language+transtitle}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{byauthor}%
-  \setunit{\addcomma\addspace}%
-  \printfield{note}%
-  \setunit{\addspace}%
-  \printtext[parens]{%
-  \usebibmacro{type+inst+year}}%
-  \usebibmacro{fullpostnote}%
-  \newcunit\newblock
-  \printfield{addendum}%
-  \newcunit\newblock
-  \usebibmacro{cite+doi+url}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{cite:unpublished}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \setunit{\addcomma\addspace}\newblock
-  \usebibmacro{ctitle+stitle}%
-  \setunit{\addspace}%
-  \usebibmacro{language+transtitle}%
-  \setunit{\addcomma\addspace}%
-  \usebibmacro{byauthor}%
-  \setunit{\addspace}\newblock%
-  \printtext[parens]{%
-    \printfield{howpublished}%
-    \newcunit\newblock
-    \printfield{note}%
-    \newcunit\newblock
-    \printlist{location}%
-    \newcunit\newblock
-    \usebibmacro{date}}%
-  \usebibmacro{fullpostnote}%
-  \newcunit\newblock
-  \printfield{addendum}%
-  \newcunit\newblock
-  \iftoggle{cms@url}%
-  {\usebibmacro{url+date}}%
-  {}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{cite:video}{%
-  \usebibmacro{bibindex}%
-  \usebibmacro{author/editor}%
-  \setunit{\addspace}%
-  \printfield{nameaddon}%
-  \newcunit\newblock
-  \usebibmacro{ctitle+stitle}%
-  \setunit{\addspace}\newblock%
-  \usebibmacro{language+transtitle}%
-  \newcunit
-  \usebibmacro{byauthor}%
-  \newcunit
-  \usebibmacro{cpart+editor+translator}%
-  \newcunit
-  \usebibmacro{chapinscore}%
-  \usebibmacro{btitle+bstitle}%
-  \newcunit
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}%
-    \newcunit
-    \iffieldundef{maintitle}
-    {\printfield{volume}%
-      \printfield{part}%
-      \clearfield{volume}%
-      \clearfield{part}}%
-    {}%
-    \newcunit
-    \printfield{volumes}
-    \clearfield{volumes}}%
-  \newcunit
-  \printfield{type}%
-  \newcunit
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{cbyeditor+others}%
-  \iffieldundef{maintitle}
-  {}
-  {\iffieldundef{volume}
-    {\usebibmacro{cms-in:}%
-      \printtext[maintitle]{%
-        \printfield[noformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
-        \printfield[noformat]{mainsubtitle}}%
-      \newcunit
-      \printfield{maintitleaddon}}
-    {\printfield{volume}%
-      \printfield{part}%
-      \setunit{\addspace}
-      \bibstring{ofseries}%
-      \setunit{\addspace}
-      \printtext[maintitle]{%
-        \printfield[noformat]{maintitle}%
-        \setunit{\addcolon\addspace}%
-        \printfield[noformat]{mainsubtitle}}%
-      \newcunit
-      \printfield{maintitleaddon}}}
-  \newcunit
-  \iffieldundef{maintitle}
-    {\printfield{volume}%
-     \printfield{part}}
-    {}%
-  \newcunit
-  \printfield{volumes}%
-  \newcunit\newblock
-  \usebibmacro{ser+num}%
-  \newcunit\newblock
-  \printfield{note}%
-  \newcunit\newblock
-  \usebibmacro{cpubl+loc+year}%
-  \usebibmacro{fullpostnote}%
-  \newcunit\newblock
-  \printfield{addendum}%
-  \newcunit\newblock
-  \iftoggle{cms@isbn}%
-  {\printfield{isan}}%
-  {}%
-  \newcunit\newblock
-  \usebibmacro{cite+doi+url}%
-  \newcunit\newblock
-  \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
-
-%%%% 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}%
-  {}%
-  {\mkbibquote{#1\isdot}}}
-
-\DeclareFieldFormat[article]{citetitle}{%
-  \iffieldundef{title}%
-  {#1\isdot}%
-  {\mkbibquote{#1\isdot}}}
-
-\DeclareFieldFormat[article]{lostitle}{%
-  \iffieldundef{title}%
-  {#1\isdot}%
-  {\mkbibquote{#1\isdot}}}
-
-\DeclareFieldFormat[artwork]{title}{%
-  \iffieldundef{entrysubtype}%
-  {\mkbibemph{#1}\isdot}%
-  {#1\isdot}}
-
-\DeclareFieldFormat[artwork]{citetitle}{%
-  \iffieldundef{entrysubtype}%
-  {\mkbibemph{#1}\isdot}%
-  {#1\isdot}}
-
-\DeclareFieldFormat[artwork]{lostitle}{%
-  \iffieldundef{entrysubtype}%
-  {\mkbibemph{#1}\isdot}%
-  {#1\isdot}}
-
-\DeclareFieldFormat[book]{title}{\mkbibemph{#1}\isdot}
-
-\DeclareFieldFormat[book]{citetitle}{\mkbibemph{#1}\isdot}
-
-\DeclareFieldFormat[book]{lostitle}{\mkbibemph{#1}\isdot}
-
-\DeclareFieldFormat[periodical]{title}{\mkbibemph{#1}\isdot}
-
-\DeclareFieldFormat[periodical]{citetitle}{\mkbibemph{#1}\isdot}
-
-\DeclareFieldFormat[periodical]{lostitle}{\mkbibemph{#1}\isdot}
-
-\DeclareFieldAlias[image]{title}[article]{title}
-
-\DeclareFieldAlias[image]{citetitle}[article]{citetitle}
-
-\DeclareFieldAlias[image]{lostitle}[article]{lostitle}
-
-\DeclareFieldAlias[incollection]{title}[article]{title}
-
-\DeclareFieldAlias[incollection]{citetitle}[article]{citetitle}
-
-\DeclareFieldAlias[incollection]{lostitle}[article]{lostitle}
-
-\DeclareFieldFormat[letter]{title}{#1\isdot}
-
-\DeclareFieldFormat[letter]{citetitle}{#1\isdot}
-
-\DeclareFieldFormat[letter]{lostitle}{#1\isdot}
-
-\DeclareFieldAlias[inproceedings]{title}[article]{title}
-
-\DeclareFieldAlias[inproceedings]{citetitle}[article]{citetitle}
-
-\DeclareFieldAlias[inproceedings]{lostitle}[article]{lostitle}
-
-\DeclareFieldAlias[thesis]{title}[article]{title}
-
-\DeclareFieldAlias[thesis]{citetitle}[article]{citetitle}
-
-\DeclareFieldAlias[thesis]{lostitle}[article]{lostitle}
-
-\DeclareFieldAlias[patent]{title}[article]{title}
-
-\DeclareFieldAlias[patent]{citetitle}[article]{citetitle}
-
-\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{edlang}{%
-  \ifbibstring{#1}
-  {\bibstring{#1}}
-  {\ifbibstring{ed#1}
-    {\bibstring{ed#1}}
-    {\ifcapital{\MakeCapital{#1}}{#1}}}}
-
-\DeclareFieldAlias[inbook]{title}[article]{title}
-
-\DeclareFieldAlias[inbook]{citetitle}[article]{citetitle}
-
-\DeclareFieldAlias[inbook]{lostitle}[article]{lostitle}
-
-\DeclareFieldFormat[suppbook]{title}{\mkbibemph{#1}\isdot}
-
-\DeclareFieldFormat[suppbook]{citetitle}{%
-  \usebibmacro{inforaft}%
-  \addspace%
-  \mkbibemph{#1}\isdot}
-
-\DeclareFieldFormat[suppbook]{lostitle}{%
-  \usebibmacro{inforaft}%
-  \addspace%
-  \mkbibemph{#1}\isdot}
-
-\DeclareFieldFormat[customc]{title}{%
-  \iffieldundef{nameaddon}%
-  {\mkbibemph{\bibstring{see}}%
-    \addspace%
-    #1}%
-  {#1}}
-
-\DeclareFieldFormat[customc]{citetitle}{%
-  \iffieldundef{nameaddon}%
-  {\mkbibemph{\bibstring{see}}%
-    \addspace%
-    #1}%
-  {\printfield{nameaddon}\addspace #1}}
-
-\DeclareFieldAlias[suppcollection]{title}[suppbook]{title}
-
-\DeclareFieldAlias[suppcollection]{citetitle}[suppbook]{citetitle}
-
-\DeclareFieldAlias[suppcollection]{lostitle}[suppbook]{lostitle}
-
-\DeclareFieldFormat[booklet]{title}{\mkbibemph{#1}\isdot}
-
-\DeclareFieldFormat[booklet]{citetitle}{\mkbibemph{#1}\isdot}
-
-\DeclareFieldFormat[booklet]{lostitle}{\mkbibemph{#1}\isdot}
-
-\DeclareFieldFormat[manual]{title}{\mkbibemph{#1}\isdot}
-
-\DeclareFieldFormat[manual]{citetitle}{\mkbibemph{#1}\isdot}
-
-\DeclareFieldFormat[manual]{lostitle}{\mkbibemph{#1}\isdot}
-
-\DeclareFieldFormat[report]{title}{\mkbibemph{#1}\isdot}
-
-\DeclareFieldFormat[report]{citetitle}{\mkbibemph{#1}\isdot}
-
-\DeclareFieldFormat[report]{lostitle}{\mkbibemph{#1}\isdot}
-
-\DeclareFieldFormat[misc]{title}{%
-  \iffieldundef{entrysubtype}%
-  {\mkbibemph{#1}\isdot}%
-  {\ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}}
-
-\DeclareFieldFormat[misc]{citetitle}{%
-  \iffieldundef{entrysubtype}%
-  {\mkbibemph{#1}\isdot}%
-  {\ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}}
-
-\DeclareFieldFormat[misc]{lostitle}{%
-  \iffieldundef{entrysubtype}%
-  {\mkbibemph{#1}\isdot}%
-  {\ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}}
-
-\DeclareFieldFormat[review]{title}{%
-  \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}
-
-\DeclareFieldFormat[review]{citetitle}{%
-  \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}
-
-\DeclareFieldFormat[review]{lostitle}{%
-  \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}
-
-\DeclareFieldAlias[suppperiodical]{title}[review]{title}
-
-\DeclareFieldAlias[suppperiodical]{citetitle}[review]{citetitle}
-
-\DeclareFieldAlias[suppperiodical]{lostitle}[review]{lostitle}
-
-\DeclareFieldAlias[online]{title}[article]{title}
-
-\DeclareFieldAlias[online]{citetitle}[article]{citetitle}
-
-\DeclareFieldAlias[online]{lostitle}[article]{lostitle}
-
-\DeclareFieldFormat[video]{title}{%
-  \iffieldundef{booktitle}%
-  {\mkbibemph{#1}\isdot}%
-  {\mkbibquote{#1\isdot}}}
-
-\DeclareFieldFormat[video]{citetitle}{%
-  \iffieldundef{booktitle}%
-  {\mkbibemph{#1}\isdot}%
-  {\mkbibquote{#1\isdot}}}
-
-\DeclareFieldFormat[video]{lostitle}{%
-  \iffieldundef{booktitle}%
-  {\mkbibemph{#1}\isdot}%
-  {\mkbibquote{#1\isdot}}}
-
-\DeclareFieldAlias[music]{title}[video]{title}
-
-\DeclareFieldAlias[music]{citetitle}[video]{citetitle}
-
-\DeclareFieldAlias[music]{lostitle}[video]{lostitle}
-
-\DeclareFieldAlias[audio]{title}[video]{title}
-
-\DeclareFieldAlias[audio]{citetitle}[video]{citetitle}
-
-\DeclareFieldAlias[audio]{lostitle}[video]{lostitle}
-
-%%%% Other Field Formats %%%%
-
-\DeclareNumChars*{:}% For proper ibidem with multi-volume works.
-
-\DeclareFieldFormat{letterday}{\mkbibcurdinal{#1}}
-
-\DeclareFieldFormat{note}{%
-  \ifcapital{\MakeCapital{#1}}{#1}}%
-
-\DeclareFieldFormat[suppbook]{type}{%
-  \ifbibstring{#1}%
-  {\bibstring{#1}}%
-  {\ifcapital%
-    {\MakeCapital{#1\isdot}}%
-    {#1\isdot}}}
-
-\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{nameaddon}{\mkbibbrackets{#1\bibsentence}}% ?!
-
-\DeclareFieldFormat[customc]{nameaddon}{% For cross-refs
-  \ifbibstring{#1}%
-  {\mkbibemph{\bibstring{#1}}}%
-  {#1}}
-
-\DeclareFieldFormat{edition}{% New in 0.8
-  \ifinteger{#1}
-  {\mkbibordinal{#1}~\bibstring{edition}}%
-  {\ifcapital
-    {\MakeCapital{#1\isdot}}%
-    {#1\isdot}}}
-
-\DeclareFieldFormat{year}{% To cope with abbreviation n.d.
-  \iftoggle{cms@fullnote}%
-  {#1\bibsentence}%
-  {#1\isdot}}% (?)
-
-\DeclareFieldFormat[misc]{year}{#1\isdot}
-
-\DeclareFieldFormat[article]{year}{% To cope with abbreviation n.d.
-  \iffieldequalstr{entrysubtype}{magazine}%
-  {#1\isdot}
-  {#1\bibsentence}}
-
-\DeclareFieldAlias[review]{year}[article]{year}
-
-\DeclareFieldAlias[periodical]{year}[article]{year}
-
-\DeclareFieldAlias[suppperiodical]{year}[article]{year}
-
-\DeclareFieldFormat{usere}{[#1]} % Better than mkbibbrackets?
-
-\DeclareFieldFormat{titleaddon}{%
-  \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}%\custpunctc?
-
-\DeclareFieldAlias{booktitleaddon}{titleaddon}
-
-\DeclareFieldAlias{maintitleaddon}{titleaddon}
-
-\DeclareFieldFormat{issuetitle}{\mkbibquote{#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{series}{#1\isdot}
-
-\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\addspace\bibstring{partvolume}~#1}
-
-\DeclareFieldAlias[review]{volume}[article]{volume}
-
-\DeclareFieldAlias[suppperiodical]{volume}[article]{volume}
-
-%%%% Commands, for users and internal %%%%
-
-\newcommand*{\cbytypeeditor}{%
-  \iffieldundef{editortype}
-    {\bibstring{cbytypeeditor}}
-    {\bibstring{cbytype\thefield{editortype}}}}
-
-\renewcommand*{\multicitedelim}{\addsemicolon\space}
-
-\newcommand{\custpunct}{%
-  \iftoggle{cms@fullnote}%
-  {\iffieldequalstr{type}{plain}%
-    {}
-    {\addcomma}}%
-  {\iftoggle{cms@shortnote}
-    {\iffieldundef{postnote}%
-      {\ifthenelse{\value{multicitecount} < \value{multicitetotal}}%
-        {}
-        {\addperiod}}%
-      {\addcomma}}%
-    {\addperiod}}}
-
-\newcommand{\custpunctb}{%
-  \iftoggle{cms@fullnote}%
-  {\iffieldequalstr{userb}{plain}%
-    {}
-    {\addcomma}}%
-  {\iftoggle{cms@shortnote}
-    {\iffieldundef{postnote}%
-      {\ifthenelse{\value{multicitecount} < \value{multicitetotal}}%
-        {}
-        {\addperiod}}%
-      {\addcomma}}%
-    {\addperiod}}}
-
-\newcommand{\classicpunct}{%
-  \ifthenelse{\iffieldequalstr{entrysubtype}{classical}\OR%
-    \iffieldequalstr{entrytype}{letter}}%
-  {\setunit*{\addspace}}%
-  {\setunit*{\addcomma\addspace}}}
-
-\newcommand{\reprintpunct}{%
-  \iftoggle{cms@fullnote}%
-  {\setunit*{\addsemicolon\addspace}}%
-  {\setunit*{\addperiod\addspace}}}
-
-\newcommand{\encypunct}{% for named entries in an encyclopedia
-  \iftoggle{cms@fullnote}%
-  {\iffieldequalstr{entrytype}{book}%
-    {\ifthenelse{\iffieldundef{addendum}\AND\iffieldundef{doi}\AND
-        \iffieldundef{isbn}\AND\iffieldundef{url}}%
-      {\ifthenelse{\value{multicitecount} < \value{multicitetotal}}%
-        {}%
-        {\addperiod}}%
-      {\addcomma}}%
-    {\ifnameundef{author}%
-      {\ifthenelse{\iffieldundef{addendum}\AND\iffieldundef{doi}\AND
-          \iffieldundef{isbn}\AND\iffieldundef{url}}%
-        {\ifthenelse{\value{multicitecount} < \value{multicitetotal}}%
-          {}%
-          {\addperiod}}%
-        {\addcomma}}%
-      {}}}%
-  {\iffieldequalstr{entrytype}{book}%
-    {\addperiod}%
-    {\ifnameundef{author}%
-      {\addperiod}%
-      {}}}}
-
-\newcommand{\parttrans}{%
-  \iftoggle{cms@fullnote}%
-  {\bibstring{cbytranslator}\space}%
-  {\bibstring{bytranslator}\space}}
-
-\newcommand{\partedit}{%
-  \iftoggle{cms@postposit}% Kludge to make it work in French.
-  {\iftoggle{cms@fullnote}%
-    {\bibstring{cbyeditoralt}\addspace}%
-    {\bibstring{byeditoralt}\addspace}}%
-  {\iftoggle{cms@fullnote}%
-    {\bibstring{cbyeditor}\addspace}%
-    {\bibstring{byeditor}\addspace}}}
-
-\newcommand{\partcomp}{%
-  \iftoggle{cms@fullnote}%
-  {\bibstring{cbycompiler}\space}%
-  {\bibstring{bycompiler}\space}}
-
-\newcommand{\parteditandcomp}{%
-  \iftoggle{cms@fullnote}%
-  {\bibstring{cbyeditorcp}\space}%
-  {\bibstring{byeditorcp}\space}}
-
-\newcommand{\parttransandcomp}{%
-  \iftoggle{cms@fullnote}%
-  {\bibstring{cbytranslatorcp}\space}%
-  {\bibstring{bytranslatorcp}\space}}
-
-\newcommand{\partedittransandcomp}{%
-  \iftoggle{cms@fullnote}%
-  {\bibstring{cbyeditortrcp}\space}%
-  {\bibstring{byeditortrcp}\space}}
-
-\newcommand{\parteditandtrans}{%
-  \iftoggle{cms@fullnote}%
-  {\bibstring{cbyeditortr}\space}%
-  {\bibstring{byeditortr}\space}}
-
-\newcommand{\reprint}{%
-  \iftoggle{cms@fullnote}%
-  {\bibsstring{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@shortnote}%
-  {\iffieldequalstr{entrysubtype}{classical}%
-    {\NumCheckSetup{\DeclareNumChars*{abcdeABCDE}}% Makes classical
-      \iffieldpages{postnote}% test more accurate. See 17.253.
-      {\addspace}%
-      {\addcomma\addspace}}%
-    {\iffieldundef{volumes}%
-      {\addcomma\addspace}%
-      {\addspace}}}%
-  {\iftoggle{cms@fullnote}%
-    {\ifthenelse{\(\iffieldequalstr{entrytype}{article}\OR
-        \iffieldequalstr{entrytype}{review}\OR
-        \iffieldequalstr{entrytype}{periodical}\OR
-        \iffieldequalstr{entrytype}{suppperiodical}\)\AND\NOT
-        \iffieldequalstr{entrysubtype}{magazine}}%
-      {\addcolon\addspace}%
-      {\addcomma\addspace}}%
-    {\addcomma\addspace}}}%
-
-\newcommand*{\editordelim}{% Otherwise you get a spurious comma.
-  \iffieldequalstr{editortype}{none}%
-  {\addperiod\addspace}%
-  {\addcomma\addspace}}
-
-\newcommand*{\lbx@cfromlang}{% Needed to eliminate "by" after "trans."
-  \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
-  \togglefalse{cms@switchdates}
-  \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}
-    {}
-    {\printnames{author}%
-     \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}% Change for Video type?  Appears
-    {\newcunit\newblock}% to treat italicized title as booktitle in
-    {\newunit\newblock}}% available examples.
-  {\newcunit\newblock}}
-
-\newbibmacro*{edition}{%
-  \printfield{edition}%
-    \clearfield{edition}}%
-
-\newbibmacro*{inforaft}{%
-  \ifnameundef{introduction}%
-  {\ifnameundef{afterword}%
-    {\ifnameundef{foreword}%
-      {\printfield{type}}%
-      {\bibstring{forewordto}}}%
-    {\bibstring{afterwordto}}}%
-  {\bibstring{introductionto}}}
-
-\newbibmacro*{langlist:andothers}{%
-  \ifthenelse{\value{listcount}=\value{liststop}\AND
-              \ifmoreitems}
-    {\ifnum\value{liststop}>1 \finalandcomma\fi
-     \andmoredelim\bibstring{andmore}\bibrightbracket}
-    {}}
-
-\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}}}%
-  {\ifuseauthor%
-    {\usebibmacro{author}}%
-    {}}}
-
-\newbibmacro*{cmag+news+author}{%
-  \ifnameundef{author}%
-  {\usebibmacro{journal+sub}%
-    \setunit*{\addspace}%
-    \printlist[periodplace]{location}}%
-  {\ifuseauthor%
-    {\usebibmacro{author}}%
-    {}}}
-
-\newbibmacro*{type+inst+year}{%
-  \printfield{type}
-  \newcunit
-  \printlist{institution}%
-  \setunit*{\addcomma\space}%
-  \usebibmacro{cmsyear}}
-
-\newbibmacro*{institution+organization}{%
-  \iflistundef{organization}%
-  {\iflistundef{institution}%
-    {}%
-    {\printlist{institution}}}%
-  {\printlist{organization}%
-    \newcunit%
-    \printlist{institution}}}
-
-\newbibmacro*{bibauthor+org}{%
-  \ifnameundef{author}%
-  {\ifnameundef{editor}%
-    {\iflistundef{organization}%
-      {}%
-      {\ifboolexpr{
-          test {\iflistequals{organization}{\bbx@lasthash}}
-          and
-          not test {\iffirstonpage}
-        }%
-        {\bibnamedash\addperiod\addspace}%
-        {\printlist{organization}%
-          \savelist{organization}{\bbx@lasthash}}}}%
-    {\usebibmacro{editor}}}%
-  {\usebibmacro{author/editor}}}
-
-\newbibmacro*{author+org}{%
-  \ifnameundef{author}%
-  {\ifnameundef{editor}%
-    {\iflistundef{organization}%
-      {}%
-      {\printlist{organization}}}%
-    {\usebibmacro{editor}}}%
-  {\usebibmacro{author/editor}}}
-
-\newbibmacro*{cbytypestrg}[2]{%
-  \iffieldundef{#1type}
-    {\bibstring{cby#2}}
-    {\bibstring{cby\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{cbytranslator}%
-    \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}
-    {}
-    {\bibsstring{withcommentator}\addspace
-     \printnames[withcommentator]{commentator}}}
-
-\newbibmacro*{cwithannotator}{%
-  \ifnameundef{annotator}
-    {}
-    {\bibsstring{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%
-    \clearfield{chapter}}}
-
-\newbibmacro*{chapinscore}{%
-  \iffieldundef{chapter}%
-  {}
-  {\printfield{chapter}%
-    \addspace\bibstring{of}\setunit{\addspace}%
-    \clearfield{chapter}}}
-
-\newbibmacro*{ser+num}{%
-  \printfield{series}%
-  \printfield[sernum]{number}%
-  \newunit}
-
-\newbibmacro*{music+ser+num}{%
-  \iffieldundef{series}%
-  {\iffieldundef{number}%
-    {}%
-    {\printfield{number}}}
-  {\printfield{series}%
-    \setunit{\addspace}%
-    \printfield{number}}}%
-
-\newbibmacro*{music+publisher}{%
-  \iffieldundef{howpublished}%
-  {\iffieldundef{pubstate}%
-    {\newcunit}%
-    {\printfield{pubstate}\setunit{\addspace}}}%
-  {\printfield{howpublished}\setunit{\addspace}}}%
-
-\newbibmacro*{ctitle+stitle}{%
-  \printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
-    \printfield[noformat]{title}%
-    \setunit{\addcolon\addspace}%
-    \printfield[noformat]{subtitle}}%
-  \setunit{\addcomma\addspace}\newblock%
-  \printfield{titleaddon}}%
-%  \setunit{\addspace}}%
-%  \usebibmacro{language+transtitle}%
-%  \setunit*{\addcomma}\newblock}
-
-\newbibmacro*{citaltitle+stitle}{%
-  \printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
-    \printfield[noformat]{title}%
-    \setunit{\addcolon\addspace}%
-    \printfield[noformat]{subtitle}}%
-  \newcunit\newblock%
-  \printfield{titleaddon}%
-  \setunit{\addspace}%
-  \usebibmacro{language+transtitle}%
-  \newcunit\newblock}
-
-\newbibmacro*{title+stitle}{%
-  \printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
-    \printfield[noformat]{title}%
-    \setunit{\addcolon\addspace}%
-    \printfield[noformat]{subtitle}}%
-  \newunit%\setunit{\addspace}\newblock%
-  \printfield{titleaddon}}%
-%  \setunit{\addspace}}%
-%  \usebibmacro{language+transtitle}%
-%  \newunit\newblock}
-
-\newbibmacro*{italtitle+stitle}{%
-  \printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
-    \printfield[noformat]{title}%
-    \setunit{\addcolon\addspace}%
-    \printfield[noformat]{subtitle}}%
-  \newunit\newblock%
-  \printfield{titleaddon}%
-  \setunit{\addspace}%
-  \usebibmacro{language+transtitle}%
-  \newunit\newblock}
-
-\newbibmacro*{mag+news+title}{%
-  \printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
-       \printfield[noformat]{title}%
-       \setunit{\addcolon\addspace}%
-       \printfield[noformat]{subtitle}}%
-     \newunit%\setunit{\addcomma\addspace}
-     \printfield{titleaddon}%
-     }%\newcunit\newblock}
-
-\newbibmacro*{cmag+news+title}{%
-  \printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
-       \printfield[noformat]{title}%
-       \setunit{\addcolon\addspace}%
-       \printfield[noformat]{subtitle}}%
-     \setunit{\addcomma\addspace}%
-     \printfield{titleaddon}%
-     }%\newcunit\newblock}
-
-\newbibmacro*{language+transtitle}{%
-  \iffieldundef{usere}%
-  {\printlist[][-\value{listtotal}]{language}}%
-  {\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[issuetitle]{%
-      \printfield[noformat]{issuetitle}%
-      \setunit{\addcolon\addspace}%
-      \printfield[noformat]{issuesubtitle}}}}
-
-\newbibmacro*{btitle+bstitle}{%
-  \iffieldundef{booktitle}
-    {}
-    {\printtext[booktitle]{%
-       \printfield[noformat]{booktitle}%
-       \setunit{\addcolon\addspace}%
-       \printfield[noformat]{booksubtitle}}%
-     \newcunit
-     \printfield{booktitleaddon}}}
-
-\newbibmacro*{publ+loc+year}{% Revised for reprint
-  \ifboolexpr{
-    togl{cms@reprint}
-    and
-    not test {\iffieldequalstr{entrytype}{video}}
-  }%
-  {\bibstring{reprint}%
-    \newcunit}%
-  {}%
-  \printlist{location}%
-  \iflistundef{publisher}%
-  {\setunit*{\addcomma\addspace}}%
-  {\setunit*{\addcolon\addspace}}%
-  \printlist{publisher}%
-  \setunit*{\addcomma\addspace}%
-  \usebibmacro{date}%
-}
-
-\newbibmacro*{howpubl+loc+year}{% Revised for reprint
-  \usebibmacro{cmsorigdate}%
-  \reprintpunct%
-  \iftoggle{cms@reprint}%
-  {\reprint\newcunit}%
-  {}%
-  \printlist{location}%
-  \iffieldundef{howpublished}%
-  {\setunit*{\addcomma\space}}%
-  {\setunit*{\addcolon\space}}%
-  \printfield{howpublished}%
-  \setunit*{\addcomma\space}%
-  \usebibmacro{date}%
-}
-
-\newbibmacro*{inst+loc+year}{% Revised for reprint
-  \usebibmacro{cmsorigdate}%
-  \reprintpunct%
-  \iftoggle{cms@reprint}%
-  {\reprint\newcunit}%
-  {}%
-  \printlist{location}%
-  \iflistundef{institution}%
-  {\setunit*{\addcomma\space}}%
-  {\setunit*{\addcolon\space}}%
-  \printlist{institution}%
-  \setunit*{\addcomma\space}%
-  \usebibmacro{date}%
-}%
-
-\newbibmacro*{cpubl+loc+year}{% Revised for reprint
-  \ifboolexpr{
-    test {\iflistundef{location}}
-    and
-    test {\iflistundef{publisher}}
-    and
-    test {\iffieldundef{year}}
-    and
-    not togl {cms@reprint}
-  }%
-  {}%
-  {\setunit{\addspace}%
-    \printtext[parens]{%
-      \usebibmacro{cmsorigdate}%\printfield{origyear}%
-      \setunit*{\addsemicolon\addspace}%
-      \ifboolexpr{
-        togl {cms@reprint}
-        and
-        not test{\iffieldequalstr{entrytype}{video}}
-      }%
-      {\bibsstring{reprint}%
-        \newcunit}%
-      {}%
-      \printlist{location}%
-      \iflistundef{publisher}
-      {\setunit*{\addspace}}
-      {\setunit*{\addcolon\space}}%
-      \printlist{publisher}%
-      \setunit{\addcomma\space}%
-      \usebibmacro{date}}}}%
-
-\newbibmacro*{cpubletter+loc+year}{%
-    \setunit{\addspace}%
-    \printtext[parens]{%
-    \printlist{location}%
-  \iflistundef{publisher}
-    {\setunit*{\addspace}}
-    {\setunit*{\addcolon\space}}%
-  \printlist{publisher}%
-  \setunit{\addcomma\space}%
-  \usebibmacro{date}}}% Changed for 0.9
-
-\newbibmacro*{originally+published+as}{% Punctuation fix now in 
-  \iffieldundef{userf}%                  \origfullcite for 0.8e. 
-  {\iffieldundef{reprinttitle}%
-    {}
-    {\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?
-  \usebibmacro{cmsorigdate}%
-  \reprintpunct%
-  \iftoggle{cms@reprint}% Revised for reprint
-  {\reprint\newcunit}%
-  {}%
-  \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*{cjournal+issue+year+pages}{%
-  \usebibmacro{cjournal+ser+vol+num}%
-  \ifboolexpr{% 16th ed.
-    test {\iffieldundef{issue}}
-    and
-    test {\iffieldundef{year}}
-    and
-    not togl {cms@switchdates}
-  }%
-  {\iffieldundef{number}%
-    {\setunit{\addcolon}}%
-    {\addcomma\addspace}}% w/setunit colon appears
-  {\setunit{\addspace}%
-    \printtext[parens]{% parens is the default here
-      \iffieldundef{issue}
-      {\usebibmacro{number+or+month}}%
-      {\printfield{issue}%
-        \setunit{\addspace}%
-        \usebibmacro{cmsyear}}}}}
-
-\newbibmacro*{cperiodical+issue+year+pages}{% For periodicals,
-  \usebibmacro{cperiodical+ser+vol+num}% subtype article
-  \ifboolexpr{% 16th ed.
-    test {\iffieldundef{issue}}
-    and
-    test {\iffieldundef{year}}
-    and
-    not togl {cms@switchdates}
-  }%
-  {\iffieldundef{number}%
-    {\setunit{\addcolon}}%
-    {\addcomma\addspace}}%
-  {\setunit{\addspace}%
-    \printtext[parens]{% parens is the default here
-      \iffieldundef{issue}
-      {\usebibmacro{number+or+month}}%
-      {\printfield{issue}%
-        \setunit{\addspace}%
-        \usebibmacro{cmsyear}}}}}
-
-\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 Misc entries
-  \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}}}
-
-\renewbibmacro*{date}{% New for 0.9
-  \iftoggle{cms@switchdates}%
-  {\printorigdate}%
-  {\printdate}}
-
-\newbibmacro*{cmsorigdate}{% New for 0.9
-  \iftoggle{cms@switchdates}%
-  {\printdate}%
-  {\printorigdate}}
-
-\newbibmacro*{cmsyear}{%
-  \iftoggle{cms@switchdates}%
-  {\printfield{origyear}}%
-  {\printfield{year}}}
-
-\newbibmacro*{number+or+month}{%
-  \iffieldundef{number}%
-  {\usebibmacro{date}}%
-  {\iftoggle{cms@numbermonth}%
-    {\usebibmacro{date}}%
-    {\usebibmacro{cmsyear}}}}
-
-\newcommand*{\cms@datelong}{% Modified for 0.9
-  \iffieldundef{origmonth}%
-  {\printfield{origyear}}%
-  {\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}?
-  \printfield[jourvol]{volume}%
-  \setunit{\addcomma\addspace}% need * here?
-  \printfield[journum]{number}%
-  \setunit{\addcomma\addspace}%
-  \printfield{eid}%
-  \newunit}
-
-\newbibmacro*{cperiodical+ser+vol+num}{% For periodical entries,
-  \printtext[title]{% article subtype
-    \printfield[noformat]{title}%
-    \setunit{\addcolon\addspace}%
-    \printfield[noformat]{subtitle}}% 
-  \setunit*{\addspace}%
-  \printlist[periodplace]{location}%
-  \setunit*{\addspace}%
-  \iffieldundef{series}
-    {}
-    {\newcunit
-      \printfield[jourser]{series}%
-      \newcunit}%\setunit*{\addspace}?
-  \printfield[jourvol]{volume}%
-  \setunit{\addcomma\addspace}% need * here?
-  \printfield[journum]{number}%
-  \setunit{\addcomma\addspace}%
-  \printfield{eid}%
-  \newunit}
-
-\newbibmacro*{journal+sub}{%
-  \iffieldundef{journaltitle}
-    {}
-    {\printtext[journaltitle]{%
-       \printfield[noformat]{journaltitle}%
-       \setunit{\addcolon\addspace}%
-       \printfield[noformat]{journalsubtitle}}}}
-
-\newbibmacro*{cite+doi+url}{%
-  \iftoggle{cms@doi}%
-  {\printfield{doi}}%
-  {}%
-  \newcunit\newblock
-  \iftoggle{cms@url}%
-  {\usebibmacro{url+date}}%
-  {}}
-
-\newbibmacro*{url+date}{% Changed for 0.9
-  \printfield{url}%
-  \iffieldundef{urlyear}
-    {}
-    {\setunit{\addspace}% Date fix
-     \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}% For exclusion of month
-      {\usebibmacro{date}}%
-      {\usebibmacro{cmsyear}}%
-      \setunit{\addcomma\addspace}%
-      \printfield[journum]{number}}}%
-  {\printfield{issue}%
-    \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*{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}
-    {\usebibmacro{cms-in:}%
-      \printtext[maintitle]{%
-        \printfield[noformat]{maintitle}%
-      \setunit{\addcolon\addspace}%
-      \printfield[noformat]{mainsubtitle}}%
-    \newcunit
-    \printfield{maintitleaddon}}
-  {\printfield{volume}%
-    \printfield{part}%
-    \setunit{\addspace}
-    \bibstring{ofseries}%
-    \setunit{\addspace}
-    \printtext[maintitle]{%
-      \printfield[noformat]{maintitle}%
-      \setunit{\addcolon\addspace}%
-      \printfield[noformat]{mainsubtitle}}%
-    \newcunit
-    \printfield{maintitleaddon}}}}
-
-\newbibmacro*{crefmtitle+mstitle+vol+part+title+stitle}{%
-  \iffieldundef{booktitle}
-  {\usebibmacro{citaltitle+stitle}}%
-  {\usebibmacro{btitle+bstitle}}%
-  \newcunit% need this?
-  \iffieldundef{maintitle}
-  {}
-  {\iffieldundef{volume}
-    {\printtext[maintitle]{%
-        \printfield[noformat]{maintitle}%
-      \setunit{\addcolon\addspace}%
-      \printfield[noformat]{mainsubtitle}}%
-    \newcunit
-    \printfield{maintitleaddon}}
-  {\printfield{volume}%
-    \printfield{part}%
-    \setunit{\addspace}
-    \bibstring{ofseries}%
-    \setunit{\addspace}
-    \printtext[maintitle]{%
-      \printfield[noformat]{maintitle}%
-      \setunit{\addcolon\addspace}%
-      \printfield[noformat]{mainsubtitle}}%
-    \newcunit
-    \printfield{maintitleaddon}}}}
-
-\newbibmacro*{cmtitle+mstitle+vol+part+btitle+bstitle}{%
-  \usebibmacro{btitle+bstitle}%
-  \newcunit
-  \iffieldundef{maintitle}
-  {}
-  {\iffieldundef{volume}
-    {\usebibmacro{cms-in:}%
-      \printtext[maintitle]{%
-        \printfield[noformat]{maintitle}%
-      \setunit{\addcolon\addspace}%
-      \printfield[noformat]{mainsubtitle}}%
-    \newcunit
-    \printfield{maintitleaddon}}
-  {\printfield{volume}%
-    \printfield{part}%
-    \setunit{\addspace}
-    \bibstring{ofseries}%
-    \setunit{\addspace}
-    \printtext[maintitle]{%
-      \printfield[noformat]{maintitle}%
-      \setunit{\addcolon\addspace}%
-      \printfield[noformat]{mainsubtitle}}%
-    \newcunit
-    \printfield{maintitleaddon}}}}
-
-\newbibmacro{cite:postnote}{%
-  \iftoggle{cms@loccit}%
-  {}%
-  {\usebibmacro{postnote}}}
-
-\renewbibmacro*{postnote}{%
-  \iftoggle{cms@fullnote}%
-  {\global\togglefalse{cms@shortnote}%
-    \global\togglefalse{cms@fullnote}}
-  {\iftoggle{cms@printshhand}
-    {\iffieldundef{postnote}%
-      {\iffieldundef{shorthand}
-        {\global\togglefalse{cms@printshhand}%
-          \global\togglefalse{cms@shortnote}%
-          \global\togglefalse{cms@fullnote}}
-        {\usebibmacro{cms:shorthandintro}%
-          \global\togglefalse{cms@printshhand}%
-          \global\togglefalse{cms@shortnote}%
-          \global\togglefalse{cms@fullnote}}}
-      {\iffieldundef{shorthand}
-        {\postnotedelim%
-          \printfield{postnote}%
-          \global\togglefalse{cms@printshhand}%
-          \global\togglefalse{cms@shortnote}%
-          \global\togglefalse{cms@fullnote}}
-        {\postnotedelim%
-          \printfield{postnote}%
-          \usebibmacro{cms:shorthandintro}%
-          \global\togglefalse{cms@printshhand}%
-          \global\togglefalse{cms@shortnote}%
-          \global\togglefalse{cms@fullnote}}}}
-    {\iffieldundef{postnote}%
-      {\global\togglefalse{cms@shortnote}%
-        \global\togglefalse{cms@fullnote}}
-      {\postnotedelim%
-        \printfield{postnote}%
-        \global\togglefalse{cms@shortnote}%
-        \global\togglefalse{cms@fullnote}}}}}%
-
-\newbibmacro*{fullpostnote}{%
-  \iffieldundef{postnote}%
-  {\iffieldundef{chapter}%
-    {\iffieldundef{pages}%
-      {}%
-      {\postnotedelim%
-        \printfield{pages}}}%
-    {\postnotedelim%
-      \printfield{chapter}}}%
-  {\postnotedelim%
-    \printfield{postnote}}}
-
-\newbibmacro*{inreffullpostnote}{%
-  \iffieldundef{postnote}%
-  {\iffieldundef{chapter}%
-    {\iffieldundef{pages}%
-      {\newcunit%\addcomma\addspace% Change to axe spurious comma
-        \printlist[][-\value{listtotal}]{lista}}%
-      {\postnotedelim%
-        \printfield{pages}}}%
-    {\postnotedelim%
-      \printfield{chapter}}}%
-  {\postnotedelim%
-    \printfield{postnote}}}
-
-\newbibmacro*{xrefpostnote}{% Only for crossrefed (or xrefed) InCollection,
-  \iffieldundef{postnote}%    InProceedings, or CustomA entries
-  {\iffieldundef{chapter}%
-    {\iffieldundef{pages}%
-      {}%
-      {\addcomma\addspace%
-        \printfield{pages}}}%
-    {\addcomma\addspace%
-      \printfield{chapter}}}%
-  {}}% The postnote field already shows up because of the fullpostnote
-     % call.
-
-\newbibmacro*{hlprenote}{% Removes spurious comma after prenote in
-  \iffieldundef{prenote}%  \headlessfullnote citations.
-    {}
-    {\printfield{prenote}%
-     \nopunct}}% Do we need \unspace here?
-
-\newbibmacro*{hlcprenote}{% As previous, but for generalized \headlesscite
-  \iffieldundef{prenote}% command, rather than \headlessfullcite.
-    {\bibsentence}% Needed for Ibid to be capitalized.
-    {\printfield{prenote}%
-      \ifciteseen{\addspace}{\nopunct}}}% Do we need \unspace here?
-
-\newbibmacro*{journalprenote}{%
-  \iffieldundef{prenote}%
-  {\bibsentence}%
-  {\usebibmacro{prenote}}}
-
-%% From 16th ed. %%
-
-\DeclareDataInheritance{collection}{suppcollection}{%
-  \inherit{title}{title}
-  \inherit{subtitle}{subtitle}
-  \inherit{titleaddon}{titleaddon}}
-
-\DeclareDataInheritance{mvbook}{incollection}{% ???
-  \inherit{title}{maintitle}
-  \inherit{subtitle}{mainsubtitle}
-  \inherit{titleaddon}{maintitleaddon}
-  \noinherit{shorttitle}
-  \noinherit{sorttitle}
-  \noinherit{indextitle}
-  \noinherit{indexsorttitle}
-}
-
-\DeclareDataInheritance{book,collection}{letter}{% ???
-  \inherit{title}{booktitle}
-  \inherit{subtitle}{booksubtitle}
-  \inherit{titleaddon}{booktitleaddon}
-  \noinherit{shorttitle}
-  \noinherit{sorttitle}
-  \noinherit{indextitle}
-  \noinherit{indexsorttitle}
-}
-
-\DeclareDataInheritance{mvbook,mvcollection}{letter}{% ???
-  \inherit{title}{maintitle}
-  \inherit{subtitle}{mainsubtitle}
-  \inherit{titleaddon}{maintitleaddon}
-  \noinherit{shorttitle}
-  \noinherit{sorttitle}
-  \noinherit{indextitle}
-  \noinherit{indexsorttitle}
-}
-
-\DeclareDataInheritance{*}{*}{%
-  \noinherit{namea}
-  \noinherit{nameb}
-  \noinherit{sortyear}
-  \noinherit{sortname}
-  \noinherit{sorttitle}}
-
-\DeclareDataInheritance{mvbook,mvcollection,mvproceedings,mvreference}%
-{*}{% ???
-  \noinherit{year}
-  \noinherit{month}
-  \noinherit{day}
-  \noinherit{endyear}
-  \noinherit{endmonth}
-  \noinherit{endday}
-  \noinherit{origyear}
-  \noinherit{origmonth}
-  \noinherit{origday}
-  \noinherit{origendyear}
-  \noinherit{origendmonth}
-  \noinherit{origendday}}
-
-\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*{cpart+editor+translator}{%
-  \ifnameundef{namea}%
-  {\ifnameundef{nameb}%
-    {}
-    {\bibstring{cbytranslator}\space%
-    \printnames[bytranslator]{nameb}}}%
-{\ifnamesequal{namea}{nameb}%
-  {\bibstring{cbyeditortr}\space%
-    \printnames[byeditor]{namea}}%
-  {\bibstring{cbyeditor}\space% Need this \space here?
-    \printnames[byeditor]{namea}%
-    \ifnameundef{nameb}%
-    {}
-    {\newcunit
-      \bibstring{cbytranslator}\space%
-      \printnames[bytranslator]{nameb}}}}}
-
-\newbibmacro*{compilestrg}{%
-  \ifthenelse{\value{namec}>1\OR\ifandothers{namec}}
-  {\bibstring{compilers}}
-  {\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/cms-american.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx
index eb965b42cc4..c1358168318 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.38 2017/04/20 09:02:35 dfussner Exp $	
+% $Id: cms-american.lbx,v 0.10.2.8 2018/01/09 18:58:58 dfussner Exp $	
 
-\ProvidesFile{cms-american.lbx}[2016/06/01 v 3.4 biblatex localization]
+\ProvidesFile{cms-american.lbx}[2018/01/09 v 3.10 biblatex localization]
 
 \InheritBibliographyExtras{american}
 
@@ -11,6 +11,15 @@
   \savecommand\mkbibrangecomp%
   \savecommand\mkbibrangeterse%
   \savecommand\mkbibrangefull%
+  \protected\def\mkjuridordinal#1{%
+    \begingroup
+    \@tempcnta0#1\relax\number\@tempcnta
+    \@whilenum\@tempcnta>100\do{\advance\@tempcnta-100\relax}%
+    \ifnum\@tempcnta>20
+    \@whilenum\@tempcnta>9\do{\advance\@tempcnta-10\relax}%
+    \fi
+    \ifcase\@tempcnta th\or st\or d\or d\else th\fi
+    \endgroup}%
   \protected\def\mkdaterangecomp{%
     \lbx@cms@mkbibrangetrunc@long{long}}%
   \protected\def\mkdaterangeterse{%
@@ -182,19 +191,31 @@
 \NewBibliographyString{cbycompileranaf}
 \NewBibliographyString{cfromamerican}
 \NewBibliographyString{cfrombrazilian}
+\NewBibliographyString{cfrombulgarian}
+\NewBibliographyString{cfromcatalan}
+\NewBibliographyString{cfromcroatian}
+\NewBibliographyString{cfromczech}
 \NewBibliographyString{cfromdanish}
 \NewBibliographyString{cfromdutch}
 \NewBibliographyString{cfromenglish}
+\NewBibliographyString{cfromestonian}
+\NewBibliographyString{cfromfinnish}
 \NewBibliographyString{cfromfrench}
+\NewBibliographyString{cfromgalician}
 \NewBibliographyString{cfromgerman}
 \NewBibliographyString{cfromgreek}
 \NewBibliographyString{cfromitalian}
+\NewBibliographyString{cfromjapanese}
 \NewBibliographyString{cfromlatin}
 \NewBibliographyString{cfromnorwegian}
+\NewBibliographyString{cfrompolish}
 \NewBibliographyString{cfromportuguese}
 \NewBibliographyString{cfromrussian}
+\NewBibliographyString{cfromslovak}
+\NewBibliographyString{cfromslovene}
 \NewBibliographyString{cfromspanish}
 \NewBibliographyString{cfromswedish}
+\NewBibliographyString{cfromukrainian}
 \NewBibliographyString{partvolume}
 \NewBibliographyString{by}
 \NewBibliographyString{of}
@@ -211,34 +232,51 @@
 \NewBibliographyString{origedition}
 \NewBibliographyString{revisededition}
 \NewBibliographyString{broadcast}
-\NewBibliographyString{recorded}
+\NewBibliographyString{songrecorded}
+\NewBibliographyString{discrecorded}
 \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{edbulgarian}
+\NewBibliographyString{edcatalan}
+\NewBibliographyString{edcroatian}
+\NewBibliographyString{edczech}
 \NewBibliographyString{eddanish}
 \NewBibliographyString{eddutch}
 \NewBibliographyString{edenglish}
+\NewBibliographyString{edestonian}
+\NewBibliographyString{edfinnish}
 \NewBibliographyString{edfrench}
+\NewBibliographyString{edgalician}
 \NewBibliographyString{edgerman}
 \NewBibliographyString{edgreek}
 \NewBibliographyString{editalian}
+\NewBibliographyString{edjapanese}
 \NewBibliographyString{edlatin}
 \NewBibliographyString{ednorwegian}
+\NewBibliographyString{edpolish}
 \NewBibliographyString{edportuguese}
 \NewBibliographyString{edrussian}
+\NewBibliographyString{edslovak}
+\NewBibliographyString{edslovene}
 \NewBibliographyString{edspanish}
 \NewBibliographyString{edswedish}
+\NewBibliographyString{edukrainian}
 \NewBibliographyString{review}
 \NewBibliographyString{reviewof}
 \NewBibliographyString{section}
 \NewBibliographyString{sections}
+\NewBibliographyString{canadasection}% For legal citations
+\NewBibliographyString{canadasections}% Ditto
+\NewBibliographyString{supranote}% Ditto
+\NewBibliographyString{hereinafter}% Ditto
+\NewBibliographyString{subverbo}
+\NewBibliographyString{subverbis}
 \NewBibliographyString{compiler}
 \NewBibliographyString{compilers}
 \NewBibliographyString{conductor}
@@ -299,7 +337,7 @@
   producers = {{prods\adddot}{prods\adddot}},
   editor = {{ed\adddot}{ed\adddot}},
   editors = {{eds\adddot}{eds\adddot}},
-  ibidem = {{ibid\adddot}{ibid\adddot}},
+  ibidem = {{ibid\adddot}{id\adddot}},% Shorter for legal
   origpub = {{originally published as\addspace}%
     {orig\adddot\ pub\adddot\ as\addspace}},
   origpublin = {{originally published in\addspace}%
@@ -317,30 +355,40 @@
   revisededition = {{rev\adddot\addspace ed\adddot}%
     {rev\adddot\addspace ed\adddot}},
   broadcast = {{aired}{aired}},
-  recorded = {{recorded}{recorded}},
+  songrecorded = {{recorded}{recorded}},
+  discrecorded = {{recorded}{recorded}},
   numbers = {{nos\adddot}{nos\adddot}},
   nodate = {{{}n\adddot d\adddot}{{}n\adddot d\adddot}},
   pseudonym = {{pseud\adddot}{pseud\adddot}},
   patentfiled = {{filed}{filed}},
   patentissued = {{issued}{issued}},
   inlang = {{in\addspace}{in\addspace}},
-  langrussian    = {{Russian}{Russian}},
-  fromrussian    = {{from the Russian}{from the Russian}}
   edamerican     = {{American}{American}},
   edbrazilian    = {{Brazilian}{Brazilian}},
+  edbulgarian    = {{Bulgarian}{Bulgarian}},
+  edcatalan      = {{Catalan}{Catalan}},
+  edcroatian     = {{Croatian}{Croatian}},
+  edczech        = {{Czech}{Czech}},
   eddanish       = {{Danish}{Danish}},
   eddutch        = {{Dutch}{Dutch}},
   edenglish      = {{English}{English}},
+  edestonian     = {{Estonian}{Estonian}},
+  edfinnish      = {{Finnish}{Finnish}},
   edfrench       = {{French}{French}},
+  edgalician     = {{Galician}{Galician}},
   edgerman       = {{German}{German}},
   edgreek        = {{Greek}{Greek}},
   editalian      = {{Italian}{Italian}},
+  edjapanese     = {{Japanese}{Japanese}},
   edlatin        = {{Latin}{Latin}},
   ednorwegian    = {{Norwegian}{Norwegian}},
   edportuguese   = {{Portuguese}{Portuguese}},
-  edrussian      = {{Russian}{Russian}}
+  edrussian      = {{Russian}{Russian}},
+  edslovak       = {{Slovak}{Slovak}},
+  edslovene      = {{Slovene}{Slovene}},
   edspanish      = {{Spanish}{Spanish}},
   edswedish      = {{Swedish}{Swedish}},
+  edukrainian    = {{Ukrainian}{Ukrainian}},
   translator = {{trans\adddot}{trans\adddot}},
   translators = {{trans\adddot}{trans\adddot}},
   redactor = {{red\adddot}{red\adddot}},
@@ -648,31 +696,51 @@
   paragraphs = {{\P\P}{\P\P}},
   section = {{\S}{\S}},
   sections = {{\S\S}{\S\S}},
+  canadasection = {{s\adddot}{s\adddot}},% For legal citations
+  canadasections = {{s\adddot}{s\adddot}},% ditto
+  supranote = {{\mkbibemph{supra}\addspace note\addnbspace}% ditto
+    {\mkbibemph{supra}\addspace n\adddotspace}},
+  hereinafter = {{hereinafter}{hereinafter}},
+  subverbo = {{s\adddot v\adddot}{s\adddot v\adddot}},
+  subverbis = {{s\adddot vv\adddot}{s\adddot vv\adddot}},
   verse = {{v\adddot}{v\adddot}},
   verses = {{vv\adddot}{vv\adddot}},
   number = {{no\adddot}{no\adddot}},
-  chapter = {{chap\adddot}{chap\adddot}},
+  chapter = {{chap\adddot}{ch\adddot}},% for legal citations
+  part = {{part}{pt\adddot}},% ditto
   mathesis = {{master's thesis}{master's thesis}},
   phdthesis = {{PhD\addabbrvspace diss\adddot}{PhD\addabbrvspace diss\adddot}},
   techreport = {{technical report}{technical report}},
   cfromamerican     = {{from the American by}{from the American by}},
   cfrombrazilian    = {{from the Brazilian by}{from the Brazilian
       by}},
+  cfrombulgarian    = {{from the Bulgarian by}{from the Bulgarian by}},
+  cfromcatalan      = {{from the Catalan by}{from the Catalan by}},
+  cfromcroatian     = {{from the Croatian by}{from the Croatian by}},
+  cfromczech        = {{from the Czech by}{from the Czech by}},
   cfromdanish       = {{from the Danish by}{from the Danish by}},
   cfromdutch        = {{from the Dutch by}{from the Dutch by}},
   cfromenglish      = {{from the English by}{from the English by}},
+  cfromestonian     = {{from the Estonian by}{from the Estonian by}},
+  cfromfinnish      = {{from the Finnish by}{from the Finnish by}},
   cfromfrench       = {{from the French by}{from the French by}},
+  cfromgalician     = {{from the Galician by}{from the Galician by}},
   cfromgerman       = {{from the German by}{from the German by}},
   cfromgreek        = {{from the Greek by}{from the Greek by}},
   cfromitalian      = {{from the Italian by}{from the Italian by}},
+  cfromjapanese     = {{from the Japanese by}{from the Japanese by}},
   cfromlatin        = {{from the Latin by}{from the Latin by}},
   cfromnorwegian    = {{from the Norwegian by}{from the Norwegian
       by}},
+  cfrompolish       = {{from the Polish by}{from the Polish by}},
   cfromportuguese   = {{from the Portuguese by}{from the Portuguese
       by}},
   cfromrussian      = {{from the Russian by}{from the Russian by}},
+  cfromslovak       = {{from the Slovak by}{from the Slovak by}},
+  cfromslovene      = {{from the Slovene by}{from the Slovene by}},
   cfromspanish      = {{from the Spanish by}{from the Spanish by}},
   cfromswedish      = {{from the Swedish by}{from the Swedish by}},
+  cfromukrainian    = {{from the Ukrainian by}{from the Ukrainian by}},
   bynone = {{}{}},
   bycompiler = {{compiled by}{comp\adddot}},
   byconductor = {{directed by}{dir\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-brazilian.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-brazilian.lbx
new file mode 100644
index 00000000000..abe484542d6
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-brazilian.lbx
@@ -0,0 +1,791 @@
+% $Id: cms-brazilian.lbx,v 0.10.1.36 2016/06/01 11:02:59 dfussner Exp $	
+
+\ProvidesFile{cms-brazilian.lbx}[2018/01/09 v 3.10 biblatex localization]
+
+% STATUS OF THIS FILE
+% - Strings provided by native speaker Gustavo Barros.
+
+
+\DeclareRedundantLanguages{brazilian}{brazil,portuges}
+
+\InheritBibliographyExtras{brazilian}
+
+\DeclareBibliographyExtras{%
+  \toggletrue{cms@postposit}%
+  \savecommand\cms@datelong%
+  \savecommand\cms@datelongalt%
+  \savecommand\mkdaterangecomp%
+  \savecommand\mkdaterangeterse%
+  \savecommand\mkdaterangefull%
+  \protected\def\mkjuridordinal{\mkbibordinal}%
+  \protected\def\mkdaterangecomp{%
+    \lbx@cms@mkbibrangetrunc{long}}%
+  \protected\def\mkdaterangeterse{%
+    \lbx@cms@mkbibrangetrunc{short}}%
+  \protected\def\mkdaterangefull{%
+    \lbx@cms@mkbibrangefull}%
+  \def\cms@datelong{\printorigdate}%
+  \def\cms@datelongalt{\printdate}}%
+
+\UndeclareBibliographyExtras{%
+  \restorecommand\cms@datelong%
+  \restorecommand\cms@datelongalt%
+  \restorecommand\mkdaterangecomp%
+  \restorecommand\mkdaterangeterse%
+  \restorecommand\mkdaterangefull%
+  \togglefalse{cms@postposit}%
+}%
+
+\NewBibliographyString{organizer}
+\NewBibliographyString{organizers}
+\NewBibliographyString{byorganizer}
+\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{cbyorganizer}
+\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{cfrombulgarian}
+\NewBibliographyString{cfromcatalan}
+\NewBibliographyString{cfromcroatian}
+\NewBibliographyString{cfromczech}
+\NewBibliographyString{cfromdanish}
+\NewBibliographyString{cfromdutch}
+\NewBibliographyString{cfromenglish}
+\NewBibliographyString{cfromestonian}
+\NewBibliographyString{cfromfinnish}
+\NewBibliographyString{cfromfrench}
+\NewBibliographyString{cfromgalician}
+\NewBibliographyString{cfromgerman}
+\NewBibliographyString{cfromgreek}
+\NewBibliographyString{cfromitalian}
+\NewBibliographyString{cfromjapanese}
+\NewBibliographyString{cfromlatin}
+\NewBibliographyString{cfromnorwegian}
+\NewBibliographyString{cfrompolish}
+\NewBibliographyString{cfromportuguese}
+\NewBibliographyString{cfromrussian}
+\NewBibliographyString{cfromslovak}
+\NewBibliographyString{cfromslovene}
+\NewBibliographyString{cfromspanish}
+\NewBibliographyString{cfromswedish}
+% \NewBibliographyString{cfromukrainian}
+\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{songrecorded}
+\NewBibliographyString{discrecorded}
+\NewBibliographyString{numbers}
+\NewBibliographyString{nodate}
+\NewBibliographyString{pseudonym}
+\NewBibliographyString{patentfiled}% Needed for CMS style patent entries
+\NewBibliographyString{patentissued}%
+\NewBibliographyString{inlang}
+\NewBibliographyString{edamerican}
+\NewBibliographyString{edbrazilian}
+\NewBibliographyString{edbulgarian}
+\NewBibliographyString{edcatalan}
+\NewBibliographyString{edcroatian}
+\NewBibliographyString{edczech}
+\NewBibliographyString{eddanish}
+\NewBibliographyString{eddutch}
+\NewBibliographyString{edenglish}
+\NewBibliographyString{edestonian}
+\NewBibliographyString{edfinnish}
+\NewBibliographyString{edfrench}
+\NewBibliographyString{edgalician}
+\NewBibliographyString{edgerman}
+\NewBibliographyString{edgreek}
+\NewBibliographyString{editalian}
+\NewBibliographyString{edjapanese}
+\NewBibliographyString{edlatin}
+\NewBibliographyString{ednorwegian}
+\NewBibliographyString{edpolish}
+\NewBibliographyString{edportuguese}
+\NewBibliographyString{edrussian}
+\NewBibliographyString{edslovak}
+\NewBibliographyString{edslovene}
+\NewBibliographyString{edspanish}
+\NewBibliographyString{edswedish}
+% \NewBibliographyString{edukrainian}
+\NewBibliographyString{review}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{section}
+\NewBibliographyString{sections}
+\NewBibliographyString{canadasection}% For legal citations
+\NewBibliographyString{canadasections}% Ditto
+\NewBibliographyString{supranote}% Ditto
+\NewBibliographyString{hereinafter}% Ditto
+\NewBibliographyString{subverbo}
+\NewBibliographyString{subverbis}
+\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 = {brazilian},
+  afterwordto = {{posf\'acio a}{posf\adddot\addspace a}},  
+  forewordto = {{pref\'acio a}{pref\adddot\addspace a}},
+  introductionto = {{introdu\c{c}\~ao a}{introd\adddot\addspace a}},
+  partvolume = {{tomo}{tomo}},
+  by = {{por}{por}},
+  of = {{de}{de}},
+  on = {{em}{em}},
+  compiler = {{comp\adddot}{comp\adddot}},
+  compilers = {{comps\adddot}{comps\adddot}},
+  transcompiler = {{trad\adddot\addspace e comp\adddot}%
+	{trad\adddot\addspace e comp\adddot}},
+  transcompilers = {{trads\adddot\addspace e comps\adddot}%
+	{trads\adddot\addspace e comps\adddot}},
+  editortranscompiler = {{ed\adddot\addcomma\addspace trad\adddot\addspace e comp\adddot}%
+	{ed\adddot\addcomma\addspace trad\adddot\addspace e comp\adddot}},
+  editorcompiler = {{ed\adddot\addspace e comp\adddot}%
+	{ed\adddot\addspace e comp\adddot}},
+  editortranslator = {{ed\adddot\addspace e trad\adddot}%
+	{ed\adddot\addspace e trad\adddot}},
+  editortranscompilers = {{eds\adddot\addcomma\addspace trads\adddot\addspace e comps\adddot}%
+    {eds\adddot\addcomma\addspace trads\adddot\addspace e comps\adddot}},
+  editorcompilers = {{eds\adddot\addspace e comps\adddot}%
+    {eds\adddot\addspace e comps\adddot}},
+  editortranslators = {{eds\adddot\addspace e trads\adddot}%
+    {eds\adddot\addspace e trads\adddot}},
+  conductor = {{reg\adddot}{reg\adddot}},
+  conductors = {{regs\adddot}{regs\adddot}},
+  director = {{dir\adddot}{dir\adddot}},
+  directors = {{dirs\adddot}{dirs\adddot}},
+  none = {{}{}},
+  nones = {{}{}},
+  producer = {{prod\adddot}{prod\adddot}},
+  producers = {{prods\adddot}{prods\adddot}},
+  editor = {{ed\adddot}{ed\adddot}},
+  editors = {{eds\adddot}{eds\adddot}},
+  organizer = {{org\adddot}{org\adddot}},
+  organizers = {{orgs\adddot}{orgs\adddot}},
+  byorganizer = {{organizado por}{org\adddot\addspace por}},
+  ibidem = {{ibid\adddot}{ibid\adddot}},
+  origpub = {{originalmente publicado como\addspace}%
+    {orig\adddot\ pub\adddot\ como\addspace}},
+  origpublin = {{originalmente publicado em\addspace}%
+    {orig\adddot\ pub\adddot\addspace em\addspace}},
+  origpubyear = {{originalmente publicado em\addspace}%
+    {orig\adddot\ pub\adddot\addspace}},
+  origpubyearalt = {{originalmente publicado em\addspace}%
+    {orig\adddot\ pub\adddot\addspace}},
+  origreleaseyear = {{originalmente lan\c{c}ado em\addspace}%
+    {orig\adddot\ lan\c{c}ado\addspace}},
+  origshownyear = {{originalmente apresentado em\addspace}%
+    {orig\adddot\ apresentado\addspace}},
+  origedition ={{edi\c{c}\~ao}%
+    {ed\adddot\addcolon\addspace}},
+  revisededition = {{ed\adddot\addspace rev\adddot}%
+    {ed\adddot\addspace rev\adddot}},
+  broadcast = {{transmitido}{transmitido}},
+  songrecorded = {{gravada}{gravada}},
+  discrecorded = {{gravado}{gravado}},
+  numbers = {{n\textsuperscript{os}}{n\textsuperscript{os}}},
+  nodate = {{{}s\adddot d\adddot}{{}s\adddot d\adddot}},
+  pseudonym = {{pseud\adddot}{pseud\adddot}},
+  patentfiled = {{pedida}{pedida}},
+  patentissued = {{concedida}{concedida}},
+  inlang = {{em\addspace}{em\addspace}},
+  edamerican     = {{americana}{americana}},
+  edbrazilian    = {{brasileira}{brasileira}},
+  edbulgarian    = {{b\'ulgara}{b\'ulgara}},
+  edcatalan      = {{catal\~a}{catal\~a}},
+  edcroatian     = {{croata}{croata}},
+  edczech        = {{tcheca}{tcheca}},
+  eddanish       = {{dinamarquesa}{dinamarquesa}},
+  eddutch        = {{holandesa}{holandesa}},
+  edenglish      = {{inglesa}{inglesa}},
+  edfinnish      = {{finland\^esa}{finland\^esa}},
+  edestonian     = {{estoniana}{estoniana}},
+  edfrench       = {{francesa}{francesa}},
+  edgalician     = {{galega}{galega}},
+  edgerman       = {{alem\~a}{alem\~a}},
+  edgreek        = {{grega}{grega}},
+  editalian      = {{italiana}{italiana}},
+  edjapanese     = {{japon\^esa}{japon\^esa}},
+  edlatin        = {{latina}{latina}},
+  ednorwegian    = {{norueguesa}{norueguesa}},
+  edpolish       = {{polon\^esa}{polon\^esa}},
+  edportuguese   = {{portuguesa}{portuguesa}},
+  edrussian      = {{russa}{russa}},
+  edslovak       = {{eslovaca}{eslovaca}},
+  edslovene      = {{eslovena}{eslovena}},
+  edspanish      = {{espanhola}{espanhola}},
+  edswedish      = {{sueca}{sueca}},
+  translator = {{trad\adddot}{trad\adddot}},
+  translators = {{trads\adddot}{trads\adddot}},
+  redactor = {{red\adddot}{red\adddot}},
+  redactors = {{reds\adddot}{reds\adddot}},
+  founder   = {{fund\adddot}{fund\adddot}},
+  founders  = {{funds\adddot}{funds\adddot}},
+  continuator      = {{cont\adddot}{cont\adddot}},
+  continuators     = {{conts\adddot}{conts\adddot}},
+  collaborator     = {{col\adddot}{col\adddot}},
+  collaborators    = {{cols\adddot}{cols\adddot}},
+  annotator        = {{anot\adddot}{anot\adddot}},
+  annotators       = {{anots\adddot}{anots\adddot}},
+  review = {{resenha}{resenha}},
+  reviewof = {{resenha de}{resenha de}},
+  reprint = {{reimpress\~ao}{reimpr\adddot}},
+  shorthands = {{Abreviaturas}{Abreviaturas}},
+  newseries = {{n\adddot s\adddot}{n\adddot s\adddot}},
+  urlseen = {{acesso}{acesso}},
+  cbynone = {{}{}},
+  cbyauthor = {{por}{por}},
+  cbyeditor = {{ed\adddot}{ed\adddot}},
+  cbyorganizer = {{org\adddot}{org\adddot}},
+  cbytranslator = {{trad\adddot\addspace\lbx@cfromlang}%
+    {trad\adddot\addspace\lbx@cfromlang}},
+  cbycompiler = {{comp\adddot}{comp\adddot}},
+  cbyredactor = {{red\adddot}{red\adddot}},
+  cbycommentator = {{coment\adddot}{coment\adddot}},
+  cbyannotator = {{anot\addot}{anot\addot}},
+  cbyfounder        = {{fund\adddot}{fund\adddot}},
+  cbycontinuator    = {{cont\adddot}{cont\adddot}},
+  cbycollaborator   = {{em col\adddot\addspace com}%
+    {em col\adddot\addspace com}},
+  cbyconductor = {{reg\adddot}{reg\adddot}},
+  cbydirector = {{dir\adddot}{dir\adddot}},
+  cbyproducer = {{prod\adddot}{prod\adddot}},
+  cbyeditortr    = {{ed\adddot\addspace e trad\adddot\addspace\lbx@cfromlang}%
+    {ed\adddot\addspace e trad\adddot\addspace\lbx@cfromlang}},
+  cbyeditorcp = {{ed\adddot\addspace e comp\adddot}%
+    {ed\adddot\addspace e comp\adddot}},
+  cbyeditorco    = {{ed\adddot\addspace e coment\adddot}%
+    {ed\adddot\addspace e coment\adddot}},
+  cbyeditoran = {{ed\adddot\addspace e anot\adddot}%
+    {ed\adddot\addspace e anot\adddot}},
+  cbyeditorin = {{ed\adddot\addspace e introd\adddot\ por}%
+    {ed\adddot\addspace e introd\adddot\ por}},
+  cbyeditorfo = {{ed\adddot\addspace e pref\adddot\ por}%
+    {ed\adddot\addspace e pref\adddot\ por}},
+  cbyeditoraf = {{ed\adddot\addspace e posf\adddot\ por}%
+    {ed\adddot\addspace e posf\adddot\ por}},
+  cbyeditortrcp = {{ed.,\addabbrvspace trad\adddot\addspace\lbx@fromlang\addspace e comp\adddot}%
+    {ed.,\addabbrvspace trad\adddot\addspace\lbx@fromlang\ e comp\adddot}},
+  cbyeditortrco = {{ed.,\addabbrvspace trad\adddot\addspace\lbx@fromlang\addspace e coment\adddot}%
+    {ed.,\addabbrvspace trad\adddot\addspace\lbx@fromlang\addspace e coment\adddot}},
+  cbyeditortran = {{ed.,\addabbrvspace trad\adddot\addspace\lbx@fromlang\addspace e anot\adddot}%
+    {ed.,\addabbrvspace trad\adddot\addspace\lbx@fromlang\addspace e anot\adddot}},
+  cbyeditortrin = {{ed.,\addabbrvspace trad\adddot\addspace\lbx@fromlang e introd\adddot\ por}%
+    {ed.,\addabbrvspace trad\adddot\addspace\lbx@fromlang e introd\adddot\ por}},
+  cbyeditortrfo = {{ed.,\addabbrvspace trad\adddot\addspace\lbx@fromlang\addspace e pref\adddot\ por}%
+    {ed.,\addabbrvspace trad\adddot\addspace\lbx@fromlang\addspace e pref\adddot\ por}},
+  cbyeditortraf = {{ed.,\addabbrvspace trad.\addspace\lbx@fromlang\addspace e posf\adddot\ por}%
+    {ed.,\addabbrvspace trad\adddot\addspace\lbx@fromlang\addspace e posf\adddot\ por}},
+  cbyeditorcpco = {{ed.,\addabbrvspace comp\adddot\ e coment\adddot}%
+    {ed.,\addabbrvspace comp\adddot\ e coment\adddot}},
+  cbyeditorcpan = {{ed.,\addabbrvspace comp\adddot\ e anot\adddot}%
+    {ed.,\addabbrvspace comp\adddot\ e anot\adddot}},
+  cbyeditorcpin = {{ed.,\addabbrvspace comp\adddot\ e introd\adddot\ por}%
+    {ed.,\addabbrvspace comp\adddot\ e introd\adddot\ por}},
+  cbyeditorcpfo = {{ed.,\addabbrvspace comp\adddot\ e pref\adddot\ por}%
+    {ed.,\addabbrvspace comp\adddot\ e pref\adddot\ por}},
+  cbyeditorcpaf = {{ed.,\addabbrvspace comp\adddot\ e posf\adddot\ por}%
+    {ed.,\addabbrvspace comp\adddot\ e posf\adddot\ por}},
+  cbyeditorcpcoin = {{ed.,\addabbrvspace comp., coment\adddot\ e introd\adddot\ por}%
+    {ed.,\addabbrvspace comp., coment\adddot e introd\adddot\ por}},
+  cbyeditorcpcofo = {{ed.,\addabbrvspace comp., coment\adddot\ e pref\adddot\ por}%
+    {ed.,\addabbrvspace comp., coment\adddot\ e pref\adddot\ por}},
+  cbyeditorcpcoaf = {{ed.,\addabbrvspace comp., coment\adddot\ e posf\adddot\ por}%
+    {ed.,\addabbrvspace comp., coment\adddot\ e posf\adddot\ por}},
+  cbyeditorcpanin = {{ed.,\addabbrvspace comp., anot\adddot\ e introd\adddot\ por}%
+    {ed.,\addabbrvspace comp., anot\adddot\ e introd\adddot\ por}},
+  cbyeditorcpanfo = {{ed.,\addabbrvspace comp., anot\adddot\ e pref\adddot\ por}%
+    {ed.,\addabbrvspace comp., anot\adddot\ e pref\adddot\ por}},
+  cbyeditorcpanaf = {{ed.,\addabbrvspace comp., anot\adddot\ e posf\adddot\ por}%
+    {ed.,\addabbrvspace comp., anot\adddot\ e posf\adddot\ por}},
+  cbyeditortrcpco = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e coment\adddot}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e coment\adddot}},
+  cbyeditortrcpan = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e anot\adddot}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e anot\adddot}},
+  cbyeditortrcpin = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e introd\adddot\ por}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e introd\adddot\ por}},
+  cbyeditortrcpfo = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e pref\adddot\ por}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e pref\adddot\ por}},
+  cbyeditortrcpaf = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e posf\adddot\ por}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e posf\adddot\ por}},
+  cbyeditortrcpcoin = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e introd\adddot\ por}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e introd\adddot\ por}},
+  cbyeditortrcpcofo = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e pref\adddot\ por}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e pref\adddot\ por}},
+  cbyeditortrcpcoaf = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e posf\adddot\ por}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e posf\adddot\ por}},
+  cbyeditortrcpanin = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e introd\adddot\ por}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e introd\adddot\ por}},
+  cbyeditortrcpanfo = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e pref\adddot\ por}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e pref\adddot\ por}},
+  cbyeditortrcpanaf = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e posf\adddot\ por}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e posf\adddot\ por}},
+  cbyeditorcoin = {{ed.,\addabbrvspace coment\adddot\ e introd\adddot\ por}%
+    {ed.,\addabbrvspace coment\adddot\ e introd\adddot\ por}},
+  cbyeditorcofo = {{ed.,\addabbrvspace coment\adddot\ e pref\adddot\ por}%
+    {ed.,\addabbrvspace coment\adddot\ e pref\adddot\ por}},
+ cbyeditorcoaf = {{ed.,\addabbrvspace coment\adddot\ e posf\adddot\ por}%
+    {ed.,\addabbrvspace coment\adddot\ e posf\adddot\ por}},
+  cbyeditoranin = {{ed.,\addabbrvspace anot\adddot\ e introd\adddot\ por}%
+    {ed.,\addabbrvspace anot\adddot\ e introd\adddot\ por}},
+  cbyeditoranfo = {{ed.,\addabbrvspace anot\adddot\ e pref\adddot\ por}%
+    {ed.,\addabbrvspace anot\adddot\ e pref\adddot\ por}},
+  cbyeditoranaf = {{ed.,\addabbrvspace anot\adddot\ e posf\adddot\ por}%
+    {ed.,\addabbrvspace anot\adddot\ e posf\adddot\ por}},
+  cbyeditortrcoin = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, coment\adddot\ e introd\adddot\ por}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, coment\adddot\ e introd\adddot\ por}},
+  cbyeditortrcofo = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, coment\adddot\ e pref\adddot\ por}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, coment\adddot\ e pref\adddot\ por}},
+  cbyeditortrcoaf = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, coment\adddot\ e posf\adddot\ por}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, coment\adddot\ e posf\adddot\ por}},
+  cbyeditortranin = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, anot\adddot\ e introd\adddot\ por}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, anot\adddot\ e introd\adddot\ por}},
+  cbyeditortranfo = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, anot\adddot\ e pref\adddot\ por}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, anot\adddot\ e pref\adddot\ por}},
+  cbyeditortranaf = {{ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, anot\adddot\ e posf\adddot\ por}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, anot\adddot\ e posf\adddot\ por}},
+  cbytranslatorcp = {{trad\adddot\ \lbx@fromlang\ e comp\adddot}%
+    {trad\adddot\ \lbx@fromlang\ e comp\adddot}},
+  cbytranslatorco = {{trad\adddot\ \lbx@fromlang\ e coment\adddot}%
+    {trad\adddot\ \lbx@fromlang\ e coment\adddot}},
+  cbytranslatoran = {{trad\adddot\ \lbx@fromlang\ e anot\adddot}%
+    {trad\adddot\ \lbx@fromlang\ e anot\adddot}},
+  cbytranslatorin = {{trad\adddot\ \lbx@fromlang\addspace e introd\adddot\ por}%
+    {trad\adddot\ \lbx@fromlang\addspace e introd\adddot\ por}},
+  cbytranslatorfo = {{trad\adddot\ \lbx@fromlang\addspace e pref\adddot\ por}%
+    {trad\adddot\ \lbx@fromlang\addspace e pref\adddot\ por}},
+  cbytranslatoraf = {{trad\adddot\ \lbx@fromlang\addspace e posf\adddot\ por}%
+    {trad\adddot\ \lbx@fromlang\addspace e posf\adddot\ por}},
+  cbytranslatorcoin = {{trad\adddot\ \lbx@fromlang, coment\adddot\ e introd\adddot\ por}%
+    {trad\adddot\ \lbx@fromlang, coment\adddot\ e introd\adddot\ por}},
+  cbytranslatorcofo = {{trad\adddot\ \lbx@fromlang, coment\adddot\ e pref\adddot\ por}%
+    {trad\adddot\ \lbx@fromlang, coment\adddot\ e pref\adddot\ por}},
+  cbytranslatorcoaf = {{trad\adddot\ \lbx@fromlang, coment\adddot\ e posf\adddot\ por}%
+    {trad\adddot\ \lbx@fromlang, coment\adddot\ e posf\adddot\ por}},
+  cbytranslatoranin = {{trad\adddot\ \lbx@fromlang, anot\adddot\ e introd\adddot\ por}%
+    {trad\adddot\ \lbx@fromlang, anot\adddot\ e introd\adddot\ por}},
+  cbytranslatoranfo = {{trad\adddot\ \lbx@fromlang, anot\adddot\ e pref\adddot\ por}%
+    {trad\adddot\ \lbx@fromlang, anot\adddot\ e pref\adddot\ por}},
+  cbytranslatoranaf = {{trad\adddot\ \lbx@fromlang, anot\adddot\ e posf\adddot\ por}%
+    {trad\adddot\ \lbx@fromlang, anot\adddot\ e posf\adddot\ por}},
+  cbytranslatorcpco = {{trad\adddot\ \lbx@fromlang, comp\adddot\ e coment\adddot}%
+    {trad\adddot\ \lbx@fromlang, comp\adddot\ e coment\adddot}},
+  cbytranslatorcpan = {{trad\adddot\ \lbx@fromlang, comp\adddot\ e anot\adddot}%
+    {trad\adddot\ \lbx@fromlang, comp\adddot\ e anot\adddot}},
+  cbytranslatorcpin = {{trad\adddot\ \lbx@fromlang, comp\adddot\ e introd\adddot\ por}%
+    {trad\adddot\ \lbx@fromlang, comp\adddot\ e introd\adddot\ por}},
+  cbytranslatorcpfo = {{trad\adddot\ \lbx@fromlang, comp\adddot\ e pref\adddot\ por}%
+    {trad\adddot\ \lbx@fromlang, comp\adddot\ e pref\adddot\ por}},
+  cbytranslatorcpaf = {{trad\adddot\ \lbx@fromlang, comp\adddot\ e posf\adddot\ por}%
+    {trad\adddot\ \lbx@fromlang, comp\adddot\ e posf\adddot\ por}},
+  cbytranslatorcpcoin = {{trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e introd\adddot\ por}%
+    {trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e introd\adddot\ por}},
+  cbytranslatorcpcofo = {{trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e pref\adddot\ por}%
+    {trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e pref\adddot\ por}},
+  cbytranslatorcpcoaf = {{trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e posf\adddot\ por}%
+    {trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e posf\adddot\ por}},
+  cbytranslatorcpanin = {{trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e introd\adddot\ por}%
+    {trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e introd\adddot\ por}},
+  cbytranslatorcpanfo = {{trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e pref\adddot\ por}%
+    {trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e pref\adddot\ por}},
+  cbytranslatorcpanaf = {{trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e posf\adddot\ por}%
+    {trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e posf\adddot\ por}},
+  cbycompilerco = {{comp\adddot\ e coment\adddot}%
+    {comp\adddot\ e coment\adddot}},
+  cbycompileran = {{comp\adddot\ e anot\adddot}%
+    {comp\adddot\ e anot\adddot}},
+  cbycompilerin = {{comp\adddot\ e introd\adddot\ por}%
+    {comp\adddot\ e introd\adddot\ por}},
+  cbycompilerfo = {{comp\adddot\ e pref\adddot\ por}%
+    {comp\adddot\ e pref\adddot\ por}},
+  cbycompileraf = {{comp\adddot\ e posf\adddot\ por}%
+    {comp\adddot\ e posf\adddot\ por}},
+  cbycompilercoin = {{comp., coment\adddot\ e introd\adddot\ por}%
+    {comp., coment\adddot\ e introd\adddot\ por}},
+  cbycompilercofo = {{comp., coment\adddot\ e pref\adddot\ por}%
+    {comp., coment\adddot\ e pref\adddot\ por}},
+  cbycompilercoaf = {{comp., coment\adddot\ e posf\adddot\ por}%
+    {comp., coment\adddot\ e posf\adddot\ por}},
+  cbycompileranin = {{comp., anot\adddot\ e introd\adddot\ por}%
+    {comp., anot\adddot\ e introd\adddot\ por}},
+  cbycompileranfo = {{comp., anot\adddot\ e pref\adddot\ por}%
+    {comp., anot\adddot\ e pref\adddot\ por}},
+  cbycompileranaf = {{comp., anot\adddot\ e posf\adddot\ por}%
+    {comp., anot\adddot\ e posf\adddot\ por}},
+  volume = {{vol\adddot}{vol\adddot}},
+  volumes = {{vols\adddot}{vols\adddot}},
+  jourvol = {{vol\adddot}{vol\adddot}},
+  jourser = {{s\'er\adddot}{s\'er\adddot}},
+  oldseries = {{s\adddot a\adddot}{s\adddot a\adddot}},
+  edition = {{ed\adddot}{ed\adddot}},
+  page = {{p\adddot}{p\adddot}},
+  pages = {{pp\adddot}{pp\adddot}},
+  column = {{col\adddot}{col\adddot}},
+  columns = {{cols\adddot}{cols\adddot}},
+  line = {{line}{line}},
+  lines = {{lines}{lines}},
+  paragraph = {{par\adddot}{par\adddot}},
+  paragraphs = {{pars\adddot}{pars\adddot}},
+  section = {{\S}{\S}},
+  sections = {{\S\S}{\S\S}},
+  canadasection = {{s\adddot}{s\adddot}},% For legal citations
+  canadasections = {{s\adddot}{s\adddot}},% ditto
+  supranote = {{\mkbibemph{supra}\addspace nota\addnbspace}% ditto
+    {\mkbibemph{supra}\addspace nota\addnbspace}},
+  hereinafter = {{doravante}{doravante}},
+  subverbo = {{verbete}{verb\adddot}},
+  subverbis = {{verbetes}{verbs\adddot}},
+  verse = {{v\adddot}{v\adddot}},
+  verses = {{vv\adddot}{vv\adddot}},
+  number = {{n\textordmasculine}{n\textordmasculine}},
+  chapter = {{cap\adddot}{cap\adddot}},
+  mathesis = {{diss\adddot\ de mestrado}{diss\adddot\ de mestrado}},
+  phdthesis = {{tese de doutorado}{tese de doutorado}},
+  techreport = {{relat\'orio t\'ecnico}{relat\'orio t\'ecnico}},
+  cfromamerican     = {{do ingl\^es por}{do ingl\^es por}},
+  cfrombrazilian    = {{do portugu\^es por}{do portugu\^es por}},
+  cfrombulgarian    = {{do b\'ulgaro por}{do b\'ulgaro por}},
+  cfromcatalan      = {{do catal\~ao  por}{do catal\~ao por}},
+  cfromcroatian     = {{do croata por}{do croata por}},
+  cfromczech        = {{do tcheco por}{do tcheco por}},
+  cfromdanish       = {{do dinamarqu\^es por}{do dinamarqu\^es por}},
+  cfromdutch        = {{do holand\^es por}{do holand\^es por}},
+  cfromenglish      = {{do ingl\^es por}{do ingl\^es por}},
+  cfromestonian     = {{do estoniano por}{do estoniano  pr}},
+  cfromfinnish      = {{do finland\^es por}{do finland\^es por}},
+  cfromfrench       = {{do franc\^es por}{do franc\^es por}},
+  cfromgalician     = {{do galego por}{do galego por}},
+  cfromgerman       = {{do alem\~ao por}{do alem\~ao por}},
+  cfromgreek        = {{do grego por}{do grego por}},
+  cfromitalian      = {{do italiano por}{do italiano por}},
+  cfromlatin        = {{do latim por}{do latim por}},
+  cfromnorwegian    = {{do noruegu\^es por}{do noruegu\^es por}},
+  cfrompolish       = {{do polon\^es por}{do polon\^es por}},
+  cfromportuguese   = {{do portugu\^es por}{do portugu\^es por}},
+  cfromrussian      = {{do russo por}{do russo por}},
+  cfromslovak       = {{do eslovaco por}{do eslovaco por}},
+  cfromslovene      = {{do esloveno por}{do esloveno por}},
+  cfromspanish      = {{do espanhol por}{do espanhol por}},
+  cfromswedish      = {{do sueco por}{do sueco por}},
+  bynone = {{}{}},
+  bycompiler = {{compilado por}{comp\adddot}},
+  byconductor = {{regida por}{reg\adddot}},
+  bydirector = {{dirigido por}{dir\adddot}},
+  byproducer = {{produzido por}{prod\adddot}},
+  byproducer = {{produzido por}{prod\adddot}},
+  byeditorcp = {{editado e compilado por}{ed\adddot\addspace e comp\adddot}},
+  byeditortrcp = {{editado, traduzido \lbx@fromlang\ e compilado por}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang\ e comp\adddot}},
+  byeditortrcpco = {{editado, traduzido \lbx@fromlang, compilado e comentado por}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e coment\adddot}},
+  byeditortrcpan = {{editado, traduzido \lbx@fromlang, compilado e anotado por}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e anot\adddot}},
+  byeditortrcpin = {{editado, traduzido \lbx@fromlang, compilado e introduzido por}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e introd\adddot\ por}},
+  byeditortrcpfo = {{editado, traduzido \lbx@fromlang, compilado e prefaciado por}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e pref\adddot\ por}},
+  byeditortrcpaf = {{editado, traduzido \lbx@fromlang, compilado e posfaciado por}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp\adddot\ e posf\adddot\ por}},
+  byeditortrcpcoin = {{editado, traduzido \lbx@fromlang, compilado, comentado e introduzido por}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e introd\adddot\ por}},
+  byeditortrcpcofo = {{editado, traduzido \lbx@fromlang, compilado, comentado e prefaciado por}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e pref\adddot\ por}},
+  byeditortrcpcoaf = {{editado, traduzido \lbx@fromlang, compilado, comentado e posfaciado por}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e posf\adddot\ por}},
+  byeditortrcpanin = {{editado, traduzido \lbx@fromlang, compilado, anotado e introduzido por}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e introd\adddot\ por}},
+  byeditortrcpanfo = {{editado, traduzido \lbx@fromlang, compilado, anotado e prefaciado por}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e pref\adddot\ por}},
+  byeditortrcpanaf = {{editado, traduzido \lbx@fromlang, compilado, anotado e posfaciado por}%
+    {ed.,\addabbrvspace trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e posf\adddot\ por}},
+  byeditorcpco = {{editado, compilado e comentado por}%
+    {ed.,\addabbrvspace comp\adddot\ e coment\adddot}},
+  byeditorcpan = {{editado, compilado e anotado por}%
+    {ed.,\addabbrvspace comp\adddot\ e anot\adddot}},
+  byeditorcpin = {{editado, compilado e introduzido por}%
+    {ed.,\addabbrvspace comp\adddot\ e introd\adddot\ por}},
+  byeditorcpfo = {{editado, compilado e prefaciado por}%
+    {ed.,\addabbrvspace comp\adddot\ e pref\adddot\ por}},
+  byeditorcpaf = {{editado, compilado e posfaciado por}%
+    {ed.,\addabbrvspace comp\adddot\ e posf\adddot\ por}},
+  byeditorcpcoin = {{editado, compilado, comentado e introduzido por}%
+    {ed.,\addabbrvspace comp., coment\adddot\ e introd\adddot\ por}},
+  byeditorcpcofo = {{editado, compilado, comentado e prefaciado por}%
+    {ed.,\addabbrvspace comp., coment\adddot\ e pref\adddot\ por}},
+  byeditorcpcoaf = {{editado, compilado, comentado e posfaciado por}%
+    {ed.,\addabbrvspace comp., coment\adddot\ e posf\adddot\ por}},
+  byeditorcpanin = {{editado, compilado, anotado e introduzido por}%
+    {ed.,\addabbrvspace comp., anot\adddot\ e introd\adddot\ por}},
+  byeditorcpanfo = {{editado, compilado, anotado e prefaciado por}%
+    {ed.,\addabbrvspace comp., anot\adddot\ e pref\adddot\ por}},
+  byeditorcpanaf = {{editado, compilado, anotado e posfaciado por}%
+    {ed.,\addabbrvspace comp., anot\adddot\ e posf\adddot\ por}},
+  bytranslatorcp = {{traduzido \lbx@fromlang\ e compilado por}%
+    {trad\adddot\ \lbx@fromlang\ e comp\adddot}},
+  bytranslatorcpco = {{traduzido \lbx@fromlang, compilado e comentado por}%
+    {trad\adddot\ \addspace\lbx@fromlang, comp\adddot\ e coment\adddot}},
+  bytranslatorcpan = {{traduzido \lbx@fromlang, compilado e anotado por}%
+    {trad\adddot\ \lbx@fromlang, comp\adddot\ e anot\adddot}},
+  bytranslatorcpin = {{traduzido \lbx@fromlang, compilado e introduzido por}%
+    {trad\adddot\ \lbx@fromlang, comp\adddot\ e introd\adddot\ por}},
+  bytranslatorcpfo = {{traduzido \lbx@fromlang, compilado e prefaciado por}%
+    {trad\adddot\ \lbx@fromlang, comp\adddot\ e pref\adddot\ por}},
+  bytranslatorcpaf = {{traduzido \lbx@fromlang, compilado e posfaciado por}%
+    {trad\adddot\ \lbx@fromlang, comp\adddot\ e posf\adddot\ por}},
+  bytranslatorcpcoin = {{traduzido \lbx@fromlang, compilado, comentado e introduzido por}%
+    {trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e introd\adddot\ por}},
+  bytranslatorcpcofo = {{traduzido \lbx@fromlang, compilado, comentado e prefaciado por}%
+    {trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e pref\adddot\ por}},
+  bytranslatorcpcoaf = {{traduzido \lbx@fromlang, compilado, comentado e posfaciado por}%
+    {trad\adddot\ \lbx@fromlang, comp., coment\adddot\ e posf\adddot\ por}},
+  bytranslatorcpanin = {{traduzido \lbx@fromlang, compilado, anotado e introduzido por}%
+    {trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e introd\adddot\ por}},
+  bytranslatorcpanfo = {{traduzido \lbx@fromlang, compilado, anotado e prefaciado por}%
+    {trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e pref\adddot\ por}},
+  bytranslatorcpanaf = {{traduzido \lbx@fromlang, compilado, anotado e posfaciado por}%
+    {trad\adddot\ \lbx@fromlang, comp., anot\adddot\ e posf\adddot\ por}},
+  bycompilerco = {{compilado e comentado por}%
+    {comp\adddot\ e coment\adddot}},
+  bycompileran = {{compilado e anotado por}%
+    {comp\adddot\ e anot\adddot}},
+  bycompilerin = {{compilado e introduzido por}%
+    {comp\adddot\ e introd\adddot\ por}},
+  bycompilerfo = {{compilado e prefaciado por}%
+    {comp\adddot\ e pref\adddot\ por}},
+  bycompileraf = {{compilado e posfaciado por}%
+    {comp\adddot\ e posf\adddot\ por}},
+  bycompilercoin = {{compilado, comentado e introduzido por}%
+    {comp., coment\adddot\ e introd\adddot\ por}},
+  bycompilercofo = {{compilado, comentado e prefaciado por}%
+    {comp., coment\adddot\ e pref\adddot\ por}},
+  bycompilercoaf = {{compilado, comentado e posfaciado por}%
+    {comp., coment\adddot\ e posf\adddot\ por}},
+  bycompileranin = {{compilado, anotado e introduzido por}%
+    {comp., anot\adddot\ e introd\adddot\ por}},
+  bycompileranfo = {{compilado, anotado e prefaciado por}%
+    {comp., anot\adddot\ e pref\adddot\ por}},
+  bycompileranaf = {{compilado, anotado e posfaciado por}%
+    {comp., anot\adddot\ e posf\adddot\ por}},
+}
+
+\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}}%
+        {\ifthenelse{\iffieldundef{#2month}\AND\iffieldundef{#2day}}%
+          {\csuse{mkbibdate#1}{#2year}{}{}%
+            \clearfield{#2endyear}}% Clear up inheritance problem ???
+          {\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}}%
+  {}%
+  {\ifthenelse{\iffieldsequal{#2year}{#2endyear}\AND%
+      \iffieldundef{#2month}\AND\iffieldundef{#2day}}%
+    {\clearfield{#2endyear}}% Clear up inheritance problem ???
+    {}%
+    \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-british.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx
index 0d43f7bfa25..95695f1697f 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx
@@ -1,6 +1,6 @@
-% $Id: cms-british.lbx,v 0.12 2017/04/20 09:01:51 dfussner Exp $	
+% $Id: cms-british.lbx,v 0.13 2018/01/09 19:00:27 dfussner Exp $	
 
-\ProvidesFile{cms-british.lbx}[2016/06/01 v 3.4 biblatex localization]
+\ProvidesFile{cms-british.lbx}[2018/01/09 v 3.10 biblatex localization]
 
 \InheritBibliographyExtras{british}
 
@@ -13,6 +13,15 @@
   \savecommand\mkbibrangecomp%
   \savecommand\mkbibrangeterse%
   \savecommand\mkbibrangefull%
+  \protected\def\mkjuridordinal#1{%
+    \begingroup
+    \@tempcnta0#1\relax\number\@tempcnta
+    \@whilenum\@tempcnta>100\do{\advance\@tempcnta-100\relax}%
+    \ifnum\@tempcnta>20
+    \@whilenum\@tempcnta>9\do{\advance\@tempcnta-10\relax}%
+    \fi
+    \ifcase\@tempcnta th\or st\or d\or d\else th\fi
+    \endgroup}%
   \protected\def\mkdaterangecomp{%
     \lbx@cms@mkbibrangetrunc{long}}%
   \protected\def\mkdaterangeterse{%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-finnish.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-finnish.lbx
index 06c71d96c27..bb8be1c19e7 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-finnish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-finnish.lbx
@@ -1,6 +1,6 @@
-% $Id: cms-finnish.lbx,v 0.9 2017/04/20 08:48:31 dfussner Exp $	
+% $Id: cms-finnish.lbx,v 0.13 2018/01/09 19:01:03 dfussner Exp $	
 
-\ProvidesFile{cms-finnish.lbx}[2016/06/01 v 3.4 biblatex localization]
+\ProvidesFile{cms-finnish.lbx}[2018/01/09 v 3.10 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated by a native speaker (Antti-Juhani Kaijanaho).
@@ -24,24 +24,25 @@
   \savecommand\cms@datelongalt%
   \def\lbx@fromlang{%
     \iffieldundef{userf}%
-    {\iffieldundef{origlanguage}%
+    {\iflistundef{origlanguage}%
       {}% Removed \unspace here, following german.lbx
-      {\bibstring{from\thefield{origlanguage}}\addspace}}%
+      {\printlist[lfromoriglanguage]{origlanguage}\addspace}}%
     {}}%  Removed \unspace here, as above.
   \def\lbx@lfromlang{%
     \iffieldundef{userf}%
-    {\iffieldundef{origlanguage}%
+    {\iflistundef{origlanguage}%
       {}%
-      {\bibstring{from\thefield{origlanguage}}\addspace}}%
+      {\printlist[lfromoriglanguage]{origlanguage}\addspace}}%
     {}}%
   \def\lbx@sfromlang{%
     \iffieldundef{userf}%
-    {\iffieldundef{origlanguage}%
+    {\iflistundef{origlanguage}%
       {}%
-      {\bibstring{from\thefield{origlanguage}}\addspace}}%
+      {\printlist[sfromoriglanguage]{origlanguage}\addspace}}%
     {}}%
   \def\cms@datelong{\printorigdate}%
   \def\cms@datelongalt{\printdate}%
+  \protected\def\mkjuridordinal{\mkbibordinal}%
   \protected\def\mkdaterangecomp{%  DATE FIX
     \lbx@cms@mkbibrangetrunc{long}}%
   \protected\def\mkdaterangeterse{%
@@ -229,7 +230,8 @@
 \NewBibliographyString{origedition}
 \NewBibliographyString{revisededition}
 \NewBibliographyString{broadcast}
-\NewBibliographyString{recorded}
+\NewBibliographyString{songrecorded}
+\NewBibliographyString{discrecorded}
 \NewBibliographyString{numbers}
 \NewBibliographyString{nodate}
 \NewBibliographyString{pseudonym}
@@ -257,6 +259,12 @@
 \NewBibliographyString{reviewof}
 % \NewBibliographyString{section}
 % \NewBibliographyString{sections}
+\NewBibliographyString{canadasection}% For legal citations
+\NewBibliographyString{canadasections}% Ditto
+\NewBibliographyString{supranote}% Ditto
+\NewBibliographyString{hereinafter}% Ditto
+\NewBibliographyString{subverbo}
+\NewBibliographyString{subverbis}
 % \NewBibliographyString{compiler}
 % \NewBibliographyString{compilers}
 \NewBibliographyString{conductor}
@@ -335,7 +343,8 @@
   revisededition = {{uud\adddot\addspace p\adddot}%
     {uud\adddot\addspace p\adddot}},
   broadcast = {{l\"ahetetty}{l\"ahetetty}},
-  recorded = {{taltioitu}{taltioitu}},
+  songrecorded = {{taltioitu}{taltioitu}},
+  discrecorded = {{taltioitu}{taltioitu}},
   numbers = {{not\adddot}{not\adddot}},
   nodate = {{{}n\adddot d\adddot}{{}n\adddot d\adddot}},
   pseudonym = {{salanimi}{salan\adddot}},
@@ -666,6 +675,13 @@
   % paragraphs = {{\P\P}{\P\P}},
   % section = {{\S}{\S}},
   % sections = {{\S\S}{\S\S}},
+  canadasection = {{s\adddot}{s\adddot}},% For legal citations
+  canadasections = {{s\adddot}{s\adddot}},% ditto
+  supranote = {{\mkbibemph{supra}\addspace viite\addnbspace}% ditto
+    {\mkbibemph{supra}\addspace viite\addnbspace}},
+  hereinafter = {{jatkossa}{jatkossa}},
+  subverbo = {{s\adddot v\adddot}{s\adddot v\adddot}},
+  subverbis = {{s\adddot vv\adddot}{s\adddot vv\adddot}},
   % verse = {{v\adddot}{v\adddot}},
   % verses = {{vv\adddot}{vv\adddot}},
   % number = {{no\adddot}{no\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx
index 2b154187a5f..aae7f702bba 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.34 2017/04/20 08:52:54 dfussner Exp $	
+% $Id: cms-french.lbx,v 0.9.5.39 2018/01/10 16:38:12 dfussner Exp $	
 
-\ProvidesFile{cms-french.lbx}[2016/06/01 v 3.4 biblatex localization]
+\ProvidesFile{cms-french.lbx}[2018/01/09 v 3.10 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Some strings still missing
@@ -13,8 +13,6 @@
   \savecommand\postvolpunct%
   \renewcommand{\postvolpunct}{\addcolon\addspace}%
   \toggletrue{cms@postposit}%
-  \savecommand\mkbibnamelast%
-  \protected\def\mkbibnamelast#1{#1}% No small caps for Chicago (?)
   \savecommand\mkbibnamefamily%
   \protected\def\mkbibnamefamily#1{\textnohyphenation{#1}}%
   \savecommand\cms@datelong%
@@ -25,6 +23,7 @@
   \savecommand\mkbibrangecomp%
   \savecommand\mkbibrangeterse%
   \savecommand\mkbibrangefull%
+  \protected\def\mkjuridordinal{\mkbibordinal}%
   \protected\def\mkdaterangecomp{%
     \lbx@cms@mkbibrangetrunc{long}}%
   \protected\def\mkdaterangeterse{%
@@ -42,7 +41,6 @@
 
 \UndeclareBibliographyExtras{%
   \restorecommand\postvolpunct%
-  \restorecommand\mkbibnamelast%
   \restorecommand\mkbibnamefamily%
   \restorecommand\cms@datelong%
   \restorecommand\cms@datelongalt%
@@ -202,19 +200,31 @@
 \NewBibliographyString{cbycompileranaf}
 \NewBibliographyString{cfromamerican}
 \NewBibliographyString{cfrombrazilian}
+\NewBibliographyString{cfrombulgarian}
+\NewBibliographyString{cfromcatalan}
+\NewBibliographyString{cfromcroatian}
+\NewBibliographyString{cfromczech}
 \NewBibliographyString{cfromdanish}
 \NewBibliographyString{cfromdutch}
 \NewBibliographyString{cfromenglish}
+\NewBibliographyString{cfromestonian}
+\NewBibliographyString{cfromfinnish}
 \NewBibliographyString{cfromfrench}
+\NewBibliographyString{cfromgalician}
 \NewBibliographyString{cfromgerman}
 \NewBibliographyString{cfromgreek}
 \NewBibliographyString{cfromitalian}
+\NewBibliographyString{cfromjapanese}
 \NewBibliographyString{cfromlatin}
 \NewBibliographyString{cfromnorwegian}
+\NewBibliographyString{cfrompolish}
 \NewBibliographyString{cfromportuguese}
 \NewBibliographyString{cfromrussian}
+\NewBibliographyString{cfromslovak}
+\NewBibliographyString{cfromslovene}
 \NewBibliographyString{cfromspanish}
 \NewBibliographyString{cfromswedish}
+\NewBibliographyString{cfromukrainian}
 \NewBibliographyString{partvolume}
 \NewBibliographyString{by}
 \NewBibliographyString{of}
@@ -231,34 +241,51 @@
 \NewBibliographyString{origedition}
 \NewBibliographyString{revisededition}
 \NewBibliographyString{broadcast}
-\NewBibliographyString{recorded}
+\NewBibliographyString{songrecorded}% 2 strings to allow matching gender
+\NewBibliographyString{discrecorded}
 \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{edbulgarian}
+\NewBibliographyString{edcatalan}
+\NewBibliographyString{edcroatian}
+\NewBibliographyString{edczech}
 \NewBibliographyString{eddanish}
 \NewBibliographyString{eddutch}
 \NewBibliographyString{edenglish}
+\NewBibliographyString{edestonian}
+\NewBibliographyString{edfinnish}
 \NewBibliographyString{edfrench}
+\NewBibliographyString{edgalician}
 \NewBibliographyString{edgerman}
 \NewBibliographyString{edgreek}
 \NewBibliographyString{editalian}
+\NewBibliographyString{edjapanese}
 \NewBibliographyString{edlatin}
 \NewBibliographyString{ednorwegian}
+\NewBibliographyString{edpolish}
 \NewBibliographyString{edportuguese}
 \NewBibliographyString{edrussian}
+\NewBibliographyString{edslovak}
+\NewBibliographyString{edslovene}
 \NewBibliographyString{edspanish}
 \NewBibliographyString{edswedish}
+\NewBibliographyString{edukrainian}
 \NewBibliographyString{review}
 \NewBibliographyString{reviewof}
 \NewBibliographyString{section}
 \NewBibliographyString{sections}
+\NewBibliographyString{canadasection}% For legal citations
+\NewBibliographyString{canadasections}% Ditto
+\NewBibliographyString{supranote}% Ditto
+\NewBibliographyString{hereinafter}% Ditto
+\NewBibliographyString{subverbo}
+\NewBibliographyString{subverbis}
 \NewBibliographyString{compiler}
 \NewBibliographyString{compilers}
 \NewBibliographyString{conductor}
@@ -330,30 +357,41 @@
   revisededition = {{\'ed\adddot\ r\'ev\adddot}{\'ed\adddot\
       r\'ev\adddot}},
   broadcast = {{diffus\'ee}{diffus\'ee}},
-  recorded = {{enregistr\'e}{enregistr\'e}},
+  songrecorded = {{enregistr\'ee}{enregistr\'ee}},
+  discrecorded = {{enregistr\'e}{enregistr\'e}},
   numbers = {{n\textsuperscript{os}}{n\textsuperscript{os}}},% ?
   nodate = {{{}s\adddot d\adddot}{{}s\adddot d\adddot}},% ?
   pseudonym = {{pseudonym}{pseudonym}},% ?
   patentfiled = {{d\'epos\'e}{d\'epos\'e}},
   patentissued = {{d\'elivr\'e}{d\'elivr\'e}},
   inlang = {{en\addspace}{en\addspace}},
-  langrussian = {{russe}{russe}},
-  fromrussian    = {{du russe}{du russe}}
   edamerican     = {{am\'ericaine}{am\'ericaine}},
   edbrazilian    = {{br\'esilienne}{br\'esilienne}},
+  edbulgarian    = {{bulgare}{bulgare}},
+  edcatalan      = {{catalane}{catalane}},
+  edcroatian     = {{croate}{croate}},
+  edczech        = {{tch\`eque}{tch\`eque}},
   eddanish       = {{danoise}{danoise}},
   eddutch        = {{n\'eerlandaise}{n\'eerlandaise}},
   edenglish      = {{anglaise}{anglaise}},
+  edestonian     = {{estonienne}{estonienne}},
+  edfinnish      = {{finnoise}{finnoise}},
   edfrench       = {{fran\c{c}aise}{fran\c{c}aise}},
+  edgalician     = {{galicienne}{galicienne}},
   edgerman       = {{allemande}{allemande}},
   edgreek        = {{grecque}{grecque}},
   editalian      = {{italienne}{italienne}},
+  edjapanese     = {{japonaise}{japonaise}},
   edlatin        = {{latine}{latine}},
   ednorwegian    = {{norv\'egienne}{norv\'egienne}},
+  edpolish       = {{polonaise}{polonaise}},
   edportuguese   = {{portugaise}{portugaise}},
-  edrussian      = {{russe}{russe}}
+  edrussian      = {{russe}{russe}},
+  edslovak       = {{slovaque}{slovaque}},
+  edslovene      = {{slov\`ene}{slov\`ene}},
   edspanish      = {{espagnole}{espagnole}},
   edswedish      = {{su\'edoise}{su\'edoise}},
+  edukrainian    = {{ukrainienne}{ukrainienne}},
   translator = {{trad\adddot}{trad\adddot}},
   translators = {{trad\adddot}{trad\adddot}},
   redactor = {{r\'ed\adddot}{r\'ed\adddot}},
@@ -639,6 +677,13 @@
   paragraphs = {{par\adddot}{par\adddot}},
   section = {{\S}{\S}},
   sections = {{\S\S}{\S\S}},
+  canadasection = {{s\adddot}{s\adddot}},% For legal citations
+  canadasections = {{s\adddot}{s\adddot}},% ditto
+  supranote = {{\mkbibemph{supra}\addspace note\addnbspace}% ditto
+    {\mkbibemph{supra}\addspace n\adddotspace}},
+  hereinafter = {{ci-apr\`es}{ci-apr\`es}},
+  subverbo = {{s\adddot v\adddot}{s\adddot v\adddot}},
+  subverbis = {{s\adddot vv\adddot}{s\adddot vv\adddot}},
   verse = {{v\adddot}{v\adddot}},
   verses = {{v\adddot}{v\adddot}},
   number = {{n\textsuperscript{o}}{n\textsuperscript{o}}},
@@ -648,19 +693,31 @@
   techreport = {{rapport technique}{rapport technique}},
   cfromamerican     = {{de l'am\'ericain par}{de l'am\'ericain par}},
   cfrombrazilian    = {{du br\'esilien par}{du br\'esilien par}},
+  cfrombulgarian    = {{du bulgare par}{du bulgare par}},
+  cfromcatalan      = {{du catalan par}{du catalan par}},
+  cfromcroatian     = {{du croate par}{du croate par}},
+  cfromczech        = {{du tch\`eque par}{du tch\`eque par}},
   cfromdanish       = {{du danois par}{du danois par}},
   cfromdutch        = {{du n\'eerlandais par}{du n\'eerlandais par}},
   cfromenglish      = {{de l'anglais par}{de l'anglais par}},
+  cfromestonian     = {{de l'estonien par}{de l'estonien par}},
+  cfromfinnish      = {{du finnois par}{du finnois par}},
   cfromfrench       = {{du fran\c{c}ais par}{du fran\c{c}ais par}},
+  cfromgalician     = {{du galicien par}{du galicien par}},
   cfromgerman       = {{de l'allemand par}{de l'allemand par}},
   cfromgreek        = {{du grec par}{du grec par}},
   cfromitalian      = {{de l'italien par}{de l'italien par}},
+  cfromjapanese     = {{du japonais par}{du japonais par}},
   cfromlatin        = {{du latin par}{du latin par}},
   cfromnorwegian    = {{du norv\'egien par}{du norv\'egien par}},
+  cfrompolish       = {{du polonais par}{du polonais par}},
   cfromportuguese   = {{du portugais par}{du portugais par}},
   cfromrussian      = {{du russe par}{du russe par}},
+  cfromslovak       = {{du slovaque par}{du slovaque par}},
+  cfromslovene      = {{du slov\`ene par}{du slov\`ene par}},
   cfromspanish      = {{de l'espagnol par}{de l'espagnol par}},
   cfromswedish      = {{du su\'edois par}{du su\'edois par}},
+  cfromukrainian    = {{de l'ukrainien par}{de l'ukrainien par}},
   bynone = {{}{}},
   bycompiler = {{compil\'e par}{comp\adddot}},
   byconductor = {{sous la direction \smartof}%
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 9ae054b2822..73ac2cd225e 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.32 2017/04/20 08:55:30 dfussner Exp $	
+% $Id: cms-german.lbx,v 0.9.5.36 2018/01/09 19:01:32 dfussner Exp $	
 
-\ProvidesFile{cms-german.lbx}[2016/06/01 v 3.4 biblatex localization]
+\ProvidesFile{cms-german.lbx}[2018/01/09 v 3.10 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated strings and formatting decisions need review by native
@@ -20,23 +20,24 @@
   \savecommand\lbx@sfromlang%
   \savecommand\cms@datelong%
   \savecommand\cms@datelongalt%
+  \protected\def\mkjuridordinal{\mkbibordinal}%
   \def\lbx@fromlang{%
     \iffieldundef{userf}%
-    {\iffieldundef{origlanguage}%
+    {\iflistundef{origlanguage}%
       {}% Removed \unspace here, following german.lbx
-      {\bibstring{from\thefield{origlanguage}}\addspace}}%
+      {\printlist[lfromoriglanguage]{origlanguage}\addspace}}%
     {}}%  Removed \unspace here, as above.
   \def\lbx@lfromlang{%
     \iffieldundef{userf}%
-    {\iffieldundef{origlanguage}%
+    {\iflistundef{origlanguage}%
       {}%
-      {\bibstring{from\thefield{origlanguage}}\addspace}}%
+      {\printlist[lfromoriglanguage]{origlanguage}\addspace}}%
     {}}%
   \def\lbx@sfromlang{%
     \iffieldundef{userf}%
-    {\iffieldundef{origlanguage}%
+    {\iflistundef{origlanguage}%
       {}%
-      {\bibstring{from\thefield{origlanguage}}\addspace}}%
+      {\printlist[sfromoriglanguage]{origlanguage}\addspace}}%
     {}}%
   \def\cms@datelong{\printorigdate}%
   \def\cms@datelongalt{\printdate}%
@@ -227,34 +228,51 @@
 \NewBibliographyString{origedition}
 \NewBibliographyString{revisededition}
 \NewBibliographyString{broadcast}
-\NewBibliographyString{recorded}
+\NewBibliographyString{songrecorded}
+\NewBibliographyString{discrecorded}
 \NewBibliographyString{numbers}
 \NewBibliographyString{nodate}
 \NewBibliographyString{pseudonym}
 \NewBibliographyString{patentfiled}
 \NewBibliographyString{patentissued}
 \NewBibliographyString{inlang}
-\NewBibliographyString{langrussian}
-\NewBibliographyString{fromrussian}
 \NewBibliographyString{edamerican}
 \NewBibliographyString{edbrazilian}
+\NewBibliographyString{edbulgarian}
+\NewBibliographyString{edcatalan}
+\NewBibliographyString{edcroatian}
+\NewBibliographyString{edczech}
 \NewBibliographyString{eddanish}
 \NewBibliographyString{eddutch}
 \NewBibliographyString{edenglish}
+\NewBibliographyString{edestonian}
+\NewBibliographyString{edfinnish}
 \NewBibliographyString{edfrench}
+\NewBibliographyString{edgalician}
 \NewBibliographyString{edgerman}
 \NewBibliographyString{edgreek}
 \NewBibliographyString{editalian}
+\NewBibliographyString{edjapanese}
 \NewBibliographyString{edlatin}
 \NewBibliographyString{ednorwegian}
+\NewBibliographyString{edpolish}
 \NewBibliographyString{edportuguese}
 \NewBibliographyString{edrussian}
+\NewBibliographyString{edslovak}
+\NewBibliographyString{edslovene}
 \NewBibliographyString{edspanish}
 \NewBibliographyString{edswedish}
+\NewBibliographyString{edukrainian}
 \NewBibliographyString{review}
 \NewBibliographyString{reviewof}
 \NewBibliographyString{section}
 \NewBibliographyString{sections}
+\NewBibliographyString{canadasection}% For legal citations
+\NewBibliographyString{canadasections}% Ditto
+\NewBibliographyString{supranote}% Ditto
+\NewBibliographyString{hereinafter}% Ditto
+\NewBibliographyString{subverbo}
+\NewBibliographyString{subverbis}
 \NewBibliographyString{compiler}
 \NewBibliographyString{compilers}
 \NewBibliographyString{conductor}
@@ -332,7 +350,8 @@
   revisededition = {{\"uberarb\adddot\space Aufl\adddot}%
     {\"uberarb\adddot\space Aufl\adddot}},
   broadcast = {{\"ubertragen}{\"ubertragen}},
-  recorded = {{aufgenommen}{aufgenommen}},
+  songrecorded = {{aufgenommen}{aufgenommen}},
+  discrecorded = {{aufgenommen}{aufgenommen}},
   reprintfrom      = {{neu gedruckt nach}{neu gedruckt nach}},% FIXME
 % translationof    = {{}{}},% FIXME: missing
 % translationas    = {{}{}},% FIXME: missing
@@ -350,23 +369,33 @@
   patentfiled = {{eingereicht}{eingereicht}},% Are these 2 correct?
   patentissued = {{erteilt}{erteilt}},% ?
   inlang = {{auf\addspace}{auf\addspace}},
-  langrussian = {{Russisch}{Russisch}},
-  fromrussian = {{aus dem Russischen}{aus dem Russischen}},
   edamerican     = {{amerikanische}{amerikanische}},
   edbrazilian    = {{brasilianische}{brasilianische}},
+  edbulgarian    = {{bulgarische}{bulgarische}},
+  edcatalan      = {{katalanische}{katalanische}},
+  edcroatian     = {{kroatische}{kroatische}},
+  edczech        = {{tschechische}{tschechische}},
   eddanish       = {{d\"anische}{d\"anische}},
   eddutch        = {{niederl\"andische}{niederl\"andische}},
   edenglish      = {{englische}{englische}},
+  edestonian     = {{estnische}{estnische}},
+  edfinnish      = {{finnische}{finnische}},
   edfrench       = {{franz\"osische}{franz\"osische}},
+  edgalician     = {{galicische}{galicische}},
   edgerman       = {{deutsche}{deutsche}},
   edgreek        = {{griechische}{griechische}},
   editalian      = {{italienische}{italienische}},
+  edjapanese     = {{japanische}{japanische}},
   edlatin        = {{lateinische}{lateinische}},
   ednorwegian    = {{norwegische}{norwegische}},
+  edpolish       = {{polnische}{polnische}},
   edportuguese   = {{portugiesische}{portugiesische}},
   edrussian      = {{russische}{russische}},
+  edslovak       = {{slowakische}{slowakische}},
+  edslovene      = {{slowenische}{slowenische}},
   edspanish      = {{spanische}{spanische}},
   edswedish      = {{schwedische}{schwedische}},
+  edukrainian    = {{ukrainische}{ukrainische}},
   translator = {{\"Ubers\adddot}{\"Ubers\adddot}},
   translators = {{\"Ubers\adddot}{\"Ubers\adddot}},
   redactor = {{Bearb\adddot}{Bearb\adddot}},
@@ -765,6 +794,13 @@
   paragraphs = {{Abs\adddot}{Abs\adddot}},
   section = {{\S}{\S}},
   sections = {{\S\S}{\S\S}},
+  canadasection = {{s\adddot}{s\adddot}},% For legal citations
+  canadasections = {{s\adddot}{s\adddot}},% ditto
+  supranote = {{\mkbibemph{supra}\addspace Anmerkung\addnbspace}% ditto
+    {\mkbibemph{supra}\addspace Anm\adddotspace}},
+  hereinafter = {{im folgenden}{im folgenden}},
+  subverbo = {{s\adddot v\adddot}{s\adddot v\adddot}},
+  subverbis = {{s\adddot vv\adddot}{s\adddot vv\adddot}},
   verse = {{V\adddot}{V\adddot}},
   verses = {{V\adddot}{V\adddot}},
   number = {{Nr\adddot}{Nr\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-icelandic.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-icelandic.lbx
index 1effa853728..fbc5d3781d0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-icelandic.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-icelandic.lbx
@@ -1,6 +1,6 @@
-% $Id: cms-icelandic.lbx,v 0.12 2017/01/20 12:22:28 dfussner Exp $	
+% $Id: cms-icelandic.lbx,v 0.16 2018/01/09 19:01:57 dfussner Exp $	
 
-\ProvidesFile{cms-icelandic.lbx}[2016/06/01 v 3.4 biblatex localization]
+\ProvidesFile{cms-icelandic.lbx}[2018/01/09 v 3.10 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated by a native speaker (Baldur Kristinsson).
@@ -13,7 +13,8 @@
 %   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."
+%   "byproducer," "cbyproducer," "broadcast," "songrecorded,"
+%   "discrecorded," and "on."
 
 \InheritBibliographyExtras{icelandic}
 
@@ -26,6 +27,7 @@
   \savecommand\mkbibrangecomp%
   \savecommand\mkbibrangeterse%
   \savecommand\mkbibrangefull%
+  \protected\def\mkjuridordinal{\mkbibordinal}%
   \protected\def\mkdaterangecomp{%
     \lbx@cms@mkbibrangetrunc{long}}%
   \protected\def\mkdaterangeterse{%
@@ -213,34 +215,51 @@
 \NewBibliographyString{origedition}
 \NewBibliographyString{revisededition}
 \NewBibliographyString{broadcast}
-\NewBibliographyString{recorded}
+\NewBibliographyString{songrecorded}
+\NewBibliographyString{discrecorded}
 \NewBibliographyString{numbers}
 \NewBibliographyString{nodate}
 \NewBibliographyString{pseudonym}
 \NewBibliographyString{patentfiled}
 \NewBibliographyString{patentissued}
 \NewBibliographyString{inlang}
-\NewBibliographyString{langrussian}
-\NewBibliographyString{fromrussian}
 \NewBibliographyString{edamerican}
 \NewBibliographyString{edbrazilian}
+% \NewBibliographyString{edbulgarian}
+% \NewBibliographyString{edcatalan}
+% \NewBibliographyString{edcroatian}
+% \NewBibliographyString{edczech}
 \NewBibliographyString{eddanish}
 \NewBibliographyString{eddutch}
 \NewBibliographyString{edenglish}
+% \NewBibliographyString{edestonian}
+\NewBibliographyString{edfinnish}
 \NewBibliographyString{edfrench}
+\NewBibliographyString{edgalician}
 \NewBibliographyString{edgerman}
 \NewBibliographyString{edgreek}
 \NewBibliographyString{editalian}
+% \NewBibliographyString{edjapanese}
 \NewBibliographyString{edlatin}
 \NewBibliographyString{ednorwegian}
+\NewBibliographyString{edpolish}
 \NewBibliographyString{edportuguese}
 \NewBibliographyString{edrussian}
+% \NewBibliographyString{edslovak}
+% \NewBibliographyString{edslovene}
 \NewBibliographyString{edspanish}
 \NewBibliographyString{edswedish}
+% \NewBibliographyString{edukrainian}
 \NewBibliographyString{review}
 \NewBibliographyString{reviewof}
 \NewBibliographyString{section}
 \NewBibliographyString{sections}
+\NewBibliographyString{canadasection}% For legal citations
+\NewBibliographyString{canadasections}% Ditto
+\NewBibliographyString{supranote}% Ditto
+\NewBibliographyString{hereinafter}% Ditto
+\NewBibliographyString{subverbo}
+\NewBibliographyString{subverbis}
 \NewBibliographyString{compiler}
 \NewBibliographyString{compilers}
 \NewBibliographyString{conductor}
@@ -311,7 +330,8 @@
   revisededition = {{endurskou \'utg\'afa}%
     {endursk\adddot \'utg\adddot}},
 %  broadcast = {{}{}},
-%  recorded = {{}{}},
+%  songrecorded = {{}{}},
+%  discrecorded = {{}{}},
   numbers = {{nr\adddot}{nr\adddot}},
   nodate = {{\'an \'ars}{\'an \'ars}},
   pseudonym = {{dulnefni}{dulnefni}},
@@ -319,19 +339,19 @@
   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}},
+  edgalician     = {{galis\'isk}{galis\'isk}},
   edgerman       = {{\'ysk}{\'ysk}},
   edgreek        = {{gr\'{\i}sk}{gr\'{\i}sk}},
   editalian      = {{\'{\i}t\"olsk}{\'{\i}t\"olsk}},
   edlatin        = {{latnesk}{latnesk}},
   ednorwegian    = {{norsk}{norsk}},
+  edpolish       = {{p\'olsk}{p\'olsk}},
   edportuguese   = {{port\'ug\"olsk}{port\'ug\"olsk}},
   edrussian      = {{r\'ussnesk}{r\'ussnesk}},
   edspanish      = {{sp\ae{}nsk}{sp\ae{}nsk}},
@@ -455,6 +475,13 @@
   paragraphs = {{mgr\adddot}{mgr\adddot}},
   section = {{\S}{\S}},
   sections = {{\S\S}{\S\S}},
+  canadasection = {{s\adddot}{s\adddot}},% For legal citations
+  canadasections = {{s\adddot}{s\adddot}},% ditto
+  supranote = {{\mkbibemph{supra}\addspace athugasemd\addnbspace}% ditto
+    {\mkbibemph{supra}\addspace aths\adddotspace}},
+  hereinafter = {{h\'er eftir}{h\'er eftir}},
+  subverbo = {{s\adddot v\adddot}{s\adddot v\adddot}},
+  subverbis = {{s\adddot vv\adddot}{s\adddot vv\adddot}},
   verse = {{erindi}{er\adddot}},
   verses = {{erindi}{er\adddot}},
   number = {{nr\adddot}{nr\adddot}},
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 f8f5bd38687..a9f7691e0d0 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx
@@ -1,6 +1,6 @@
-% $Id: cms-ngerman.lbx,v 0.9.5.30 2017/01/19 14:51:38 dfussner Exp $	
+% $Id: cms-ngerman.lbx,v 0.9.5.36 2018/01/09 19:01:32 dfussner Exp $	
 
-\ProvidesFile{cms-ngerman.lbx}[2016/06/01 v 3.4 biblatex localization]
+\ProvidesFile{cms-ngerman.lbx}[2018/01/09 v 3.10 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated strings and formatting decisions need review by native
@@ -20,23 +20,24 @@
   \savecommand\lbx@sfromlang%
   \savecommand\cms@datelong%
   \savecommand\cms@datelongalt%
+  \protected\def\mkjuridordinal{\mkbibordinal}%
   \def\lbx@fromlang{%
     \iffieldundef{userf}%
-    {\iffieldundef{origlanguage}%
+    {\iflistundef{origlanguage}%
       {}% Removed \unspace here, following german.lbx
-      {\bibstring{from\thefield{origlanguage}}\addspace}}%
+      {\printlist[lfromoriglanguage]{origlanguage}\addspace}}%
     {}}%  Removed \unspace here, as above.
   \def\lbx@lfromlang{%
     \iffieldundef{userf}%
-    {\iffieldundef{origlanguage}%
+    {\iflistundef{origlanguage}%
       {}%
-      {\bibstring{from\thefield{origlanguage}}\addspace}}%
+      {\printlist[lfromoriglanguage]{origlanguage}\addspace}}%
     {}}%
   \def\lbx@sfromlang{%
     \iffieldundef{userf}%
-    {\iffieldundef{origlanguage}%
+    {\iflistundef{origlanguage}%
       {}%
-      {\bibstring{from\thefield{origlanguage}}\addspace}}%
+      {\printlist[sfromoriglanguage]{origlanguage}\addspace}}%
     {}}%
   \def\cms@datelong{\printorigdate}%
   \def\cms@datelongalt{\printdate}%
@@ -227,34 +228,51 @@
 \NewBibliographyString{origedition}
 \NewBibliographyString{revisededition}
 \NewBibliographyString{broadcast}
-\NewBibliographyString{recorded}
+\NewBibliographyString{songrecorded}
+\NewBibliographyString{discrecorded}
 \NewBibliographyString{numbers}
 \NewBibliographyString{nodate}
 \NewBibliographyString{pseudonym}
 \NewBibliographyString{patentfiled}
 \NewBibliographyString{patentissued}
 \NewBibliographyString{inlang}
-\NewBibliographyString{langrussian}
-\NewBibliographyString{fromrussian}
 \NewBibliographyString{edamerican}
 \NewBibliographyString{edbrazilian}
+\NewBibliographyString{edbulgarian}
+\NewBibliographyString{edcatalan}
+\NewBibliographyString{edcroatian}
+\NewBibliographyString{edczech}
 \NewBibliographyString{eddanish}
 \NewBibliographyString{eddutch}
 \NewBibliographyString{edenglish}
+\NewBibliographyString{edestonian}
+\NewBibliographyString{edfinnish}
 \NewBibliographyString{edfrench}
+\NewBibliographyString{edgalician}
 \NewBibliographyString{edgerman}
 \NewBibliographyString{edgreek}
 \NewBibliographyString{editalian}
+\NewBibliographyString{edjapanese}
 \NewBibliographyString{edlatin}
 \NewBibliographyString{ednorwegian}
+\NewBibliographyString{edpolish}
 \NewBibliographyString{edportuguese}
 \NewBibliographyString{edrussian}
+\NewBibliographyString{edslovak}
+\NewBibliographyString{edslovene}
 \NewBibliographyString{edspanish}
 \NewBibliographyString{edswedish}
+\NewBibliographyString{edukrainian}
 \NewBibliographyString{review}
 \NewBibliographyString{reviewof}
 \NewBibliographyString{section}
 \NewBibliographyString{sections}
+\NewBibliographyString{canadasection}% For legal citations
+\NewBibliographyString{canadasections}% Ditto
+\NewBibliographyString{supranote}% Ditto
+\NewBibliographyString{hereinafter}% Ditto
+\NewBibliographyString{subverbo}
+\NewBibliographyString{subverbis}
 \NewBibliographyString{compiler}
 \NewBibliographyString{compilers}
 \NewBibliographyString{conductor}
@@ -332,7 +350,8 @@
   revisededition = {{\"uberarb\adddot\space Aufl\adddot}%
     {\"uberarb\adddot\space Aufl\adddot}},
   broadcast = {{\"ubertragen}{\"ubertragen}},
-  recorded = {{aufgenommen}{aufgenommen}},
+  songrecorded = {{aufgenommen}{aufgenommen}},
+  discrecorded = {{aufgenommen}{aufgenommen}},
   reprintfrom      = {{neu gedruckt nach}{neu gedruckt nach}},% FIXME
 % translationof    = {{}{}},% FIXME: missing
 % translationas    = {{}{}},% FIXME: missing
@@ -350,23 +369,33 @@
   patentfiled = {{eingereicht}{eingereicht}},% Are these 2 correct?
   patentissued = {{erteilt}{erteilt}},% ?
   inlang = {{auf\addspace}{auf\addspace}},
-  langrussian = {{Russisch}{Russisch}},
-  fromrussian = {{aus dem Russischen}{aus dem Russischen}},
   edamerican     = {{amerikanische}{amerikanische}},
   edbrazilian    = {{brasilianische}{brasilianische}},
+  edbulgarian    = {{bulgarische}{bulgarische}},
+  edcatalan      = {{katalanische}{katalanische}},
+  edcroatian     = {{kroatische}{kroatische}},
+  edczech        = {{tschechische}{tschechische}},
   eddanish       = {{d\"anische}{d\"anische}},
   eddutch        = {{niederl\"andische}{niederl\"andische}},
   edenglish      = {{englische}{englische}},
+  edestonian     = {{estnische}{estnische}},
+  edfinnish      = {{finnische}{finnische}},
   edfrench       = {{franz\"osische}{franz\"osische}},
+  edgalician     = {{galicische}{galicische}},
   edgerman       = {{deutsche}{deutsche}},
   edgreek        = {{griechische}{griechische}},
   editalian      = {{italienische}{italienische}},
+  edjapanese     = {{japanische}{japanische}},
   edlatin        = {{lateinische}{lateinische}},
   ednorwegian    = {{norwegische}{norwegische}},
+  edpolish       = {{polnische}{polnische}},
   edportuguese   = {{portugiesische}{portugiesische}},
   edrussian      = {{russische}{russische}},
+  edslovak       = {{slowakische}{slowakische}},
+  edslovene      = {{slowenische}{slowenische}},
   edspanish      = {{spanische}{spanische}},
   edswedish      = {{schwedische}{schwedische}},
+  edukrainian    = {{ukrainische}{ukrainische}},
   translator = {{\"Ubers\adddot}{\"Ubers\adddot}},
   translators = {{\"Ubers\adddot}{\"Ubers\adddot}},
   redactor = {{Bearb\adddot}{Bearb\adddot}},
@@ -765,6 +794,13 @@
   paragraphs = {{Abs\adddot}{Abs\adddot}},
   section = {{\S}{\S}},
   sections = {{\S\S}{\S\S}},
+  canadasection = {{s\adddot}{s\adddot}},% For legal citations
+  canadasections = {{s\adddot}{s\adddot}},% ditto
+  supranote = {{\mkbibemph{supra}\addspace Anmerkung\addnbspace}% ditto
+    {\mkbibemph{supra}\addspace Anm\adddotspace}},
+  hereinafter = {{im folgenden}{im folgenden}},
+  subverbo = {{s\adddot v\adddot}{s\adddot v\adddot}},
+  subverbis = {{s\adddot vv\adddot}{s\adddot vv\adddot}},
   verse = {{V\adddot}{V\adddot}},
   verses = {{V\adddot}{V\adddot}},
   number = {{Nr\adddot}{Nr\adddot}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx
index 87fec55270e..63f6d319a84 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx
@@ -1,6 +1,6 @@
-% $Id: cms-norsk.lbx,v 1.8 2017/01/20 12:27:00 dfussner Exp $
+% $Id: cms-norsk.lbx,v 1.11 2018/01/09 19:02:41 dfussner Exp $
 
-\ProvidesFile{cms-norsk.lbx}[2016/06/01 v 3.4 biblatex localization]
+\ProvidesFile{cms-norsk.lbx}[2018/01/09 v 3.10 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated by a native speaker (H{\aa}kon Malmedal).
@@ -17,6 +17,7 @@
   \savecommand\mkbibrangecomp%
   \savecommand\mkbibrangeterse%
   \savecommand\mkbibrangefull%
+  \protected\def\mkjuridordinal{\mkbibordinal}%
   \protected\def\mkdaterangecomp{%
     \lbx@cms@mkbibrangetrunc{long}}%
   \protected\def\mkdaterangeterse{%
@@ -191,19 +192,31 @@
 \NewBibliographyString{cbycompileranaf}
 \NewBibliographyString{cfromamerican}
 \NewBibliographyString{cfrombrazilian}
+\NewBibliographyString{cfrombulgarian}
+\NewBibliographyString{cfromcatalan}
+\NewBibliographyString{cfromcroatian}
+\NewBibliographyString{cfromczech}
 \NewBibliographyString{cfromdanish}
 \NewBibliographyString{cfromdutch}
 \NewBibliographyString{cfromenglish}
+\NewBibliographyString{cfromestonian}
+\NewBibliographyString{cfromfinnish}
 \NewBibliographyString{cfromfrench}
+\NewBibliographyString{cfromgalician}
 \NewBibliographyString{cfromgerman}
 \NewBibliographyString{cfromgreek}
 \NewBibliographyString{cfromitalian}
+\NewBibliographyString{cfromjapanese}
 \NewBibliographyString{cfromlatin}
 \NewBibliographyString{cfromnorwegian}
+\NewBibliographyString{cfrompolish}
 \NewBibliographyString{cfromportuguese}
 \NewBibliographyString{cfromrussian}
+\NewBibliographyString{cfromslovak}
+\NewBibliographyString{cfromslovene}
 \NewBibliographyString{cfromspanish}
 \NewBibliographyString{cfromswedish}
+\NewBibliographyString{cfromukrainian}
 \NewBibliographyString{partvolume}
 \NewBibliographyString{by}
 \NewBibliographyString{of}
@@ -220,34 +233,51 @@
 \NewBibliographyString{origedition}
 \NewBibliographyString{revisededition}
 \NewBibliographyString{broadcast}
-\NewBibliographyString{recorded}
+\NewBibliographyString{songrecorded}
+\NewBibliographyString{discrecorded}
 \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{edbulgarian}
+\NewBibliographyString{edcatalan}
+\NewBibliographyString{edcroatian}
+\NewBibliographyString{edczech}
 \NewBibliographyString{eddanish}
 \NewBibliographyString{eddutch}
 \NewBibliographyString{edenglish}
+\NewBibliographyString{edestonian}
+\NewBibliographyString{edfinnish}
 \NewBibliographyString{edfrench}
+\NewBibliographyString{edgalician}
 \NewBibliographyString{edgerman}
 \NewBibliographyString{edgreek}
 \NewBibliographyString{editalian}
+\NewBibliographyString{edjapanese}
 \NewBibliographyString{edlatin}
 \NewBibliographyString{ednorwegian}
+\NewBibliographyString{edpolish}
 \NewBibliographyString{edportuguese}
 \NewBibliographyString{edrussian}
+\NewBibliographyString{edslovak}
+\NewBibliographyString{edslovene}
 \NewBibliographyString{edspanish}
 \NewBibliographyString{edswedish}
+\NewBibliographyString{edukrainian}
 \NewBibliographyString{review}
 \NewBibliographyString{reviewof}
 \NewBibliographyString{section}
 \NewBibliographyString{sections}
+\NewBibliographyString{canadasection}% For legal citations
+\NewBibliographyString{canadasections}% Ditto
+\NewBibliographyString{supranote}% Ditto
+\NewBibliographyString{hereinafter}% Ditto
+\NewBibliographyString{subverbo}
+\NewBibliographyString{subverbis}
 \NewBibliographyString{compiler}
 \NewBibliographyString{compilers}
 \NewBibliographyString{conductor}
@@ -326,7 +356,8 @@
   revisededition = {{rev\adddot\addspace utg\adddot}%
     {rev\adddot\addspace utg\adddot}},
   broadcast = {{kringkastet}{kringkastet}},
-  recorded = {{spilt inn}{spilt inn}},
+  songrecorded = {{spilt inn}{spilt inn}},
+  discrecorded = {{spilt inn}{spilt inn}},
   numbers = {{nr\adddot}{nr\adddot}},
   nodate = {{udatert}{udatert}},
   pseudonym = {{pseud\adddot}{pseud\adddot}},
@@ -335,19 +366,31 @@
   inlang = {{p{\aa}\addspace}{p{\aa}\addspace}},
   edamerican     = {{amerikansk}{amerikansk}},
   edbrazilian    = {{brasiliansk}{brasiliansk}},
+  edbulgarian    = {{bulgarsk}{bulgarsk}},
+  edcatalan      = {{katalansk}{katalansk}},
+  edcroatian     = {{kroatisk}{kroatisk}},
+  edczech        = {{tsjekkisk}{tsjekkisk}},
   eddanish       = {{dansk}{dansk}},
   eddutch        = {{nederlandsk}{nederlandsk}},
   edenglish      = {{engelsk}{engelsk}},
+  edestonian     = {{estisk}{estisk}},
+  edfinnish      = {{finsk}{finsk}},
   edfrench       = {{fransk}{fransk}},
+  edgalician     = {{galisisk}{galisisk}},
   edgerman       = {{tysk}{tysk}},
   edgreek        = {{gresk}{gresk}},
   editalian      = {{italiensk}{italiensk}},
+  edjapanese     = {{japansk}{japansk}},
   edlatin        = {{latin}{latin}},
   ednorwegian    = {{norsk}{norsk}},
+  edpolish       = {{polsk}{polsk}},
   edportuguese   = {{portugisisk}{portugisisk}},
-  edrussian      = {{russisk}{russisk}}
+  edrussian      = {{russisk}{russisk}},
+  edslovak       = {{slovakisk}{slovakisk}},
+  edslovene      = {{slovensk}{slovensk}},
   edspanish      = {{spansk}{spansk}},
   edswedish      = {{svensk}{svensk}},
+  edukrainian    = {{ukrainsk}{ukrainsk}},
   translator       = {{overs\adddot}{overs\adddot}},
   translators      = {{overs\adddot}{overs\adddot}},
   redactor         = {{bearb\adddot}{bearb\adddot}},
@@ -590,25 +633,45 @@
   paragraphs = {{avsn\adddot}{avsn\adddot}},
   section = {{avsn\adddot}{avsn\adddot}},
   sections = {{avsn\adddot}{avsn\adddot}},
+  canadasection = {{s\adddot}{s\adddot}},% For legal citations
+  canadasections = {{s\adddot}{s\adddot}},% ditto
+  supranote = {{\mkbibemph{supra}\addspace note\addnbspace}% ditto
+    {\mkbibemph{supra}\addspace n\adddotspace}},
+  hereinafter = {{heretter}{heretter}},
+  subverbo = {{s\adddot v\adddot}{s\adddot v\adddot}},
+  subverbis = {{s\adddot vv\adddot}{s\adddot vv\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}},
+  cfrombrazilian    = {{fra brasiliansk-portugisisk av}{fra
+      brasiliansk-portugisisk av}},
+  cfrombulgarian    = {{fra bulgarsk av}{fra bulgarsk av}},
+  cfromcatalan      = {{fra katalansk av}{fra katalansk av}},
+  cfromcroatian     = {{fra kroatisk av}{fra kroatisk av}},
+  cfromczech        = {{fra tsjekkisk av}{fra tsjekkisk av}},
   cfromdanish       = {{fra dansk av}{fra dansk av}},
   cfromdutch        = {{fra nederlandsk av}{fra nederlandsk av}},
   cfromenglish      = {{fra engelsk av}{fra engelsk av}},
+  cfromestonian     = {{fra estisk av}{fra estisk av}},
+  cfromfinnish      = {{fra finsk av}{fra finsk av}},
   cfromfrench       = {{fra fransk av}{fra fransk av}},
+  cfromgalician     = {{fra galisisk av}{fra galisisk av}},
   cfromgerman       = {{fra tysk av}{fra tysk av}},
   cfromgreek        = {{fra gresk av}{fra gresk av}},
   cfromitalian      = {{fra italiensk av}{fra italiensk av}},
+  cfromjapanese     = {{fra japansk av}{fra japansk av}},
   cfromlatin        = {{fra latin av}{fra latin av}},
   cfromnorwegian    = {{fra norsk av}{fra norsk av}},
+  cfrompolish       = {{fra polsk av}{fra polsk av}},
   cfromportuguese   = {{fra portugisisk av}{fra portugisisk av}},
   cfromrussian      = {{fra russisk av}{fra russisk av}},
+  cfromslovak       = {{fra slovakisk av}{fra slovakisk av}},
+  cfromslovene      = {{fra slovensk av}{fra slovensk av}},
   cfromspanish      = {{fra spansk av}{fra spansk av}},
   cfromswedish      = {{fra svensk av}{fra svensk av}},
+  cfromukrainian    = {{fra ukrainsk av}{fra ukrainsk av}},
   bynone = {{}{}},
   byconductor = {{dirigert av}{dir\adddot}},
   bydirector = {{regissert av}{regi}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norwegian.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norwegian.lbx
index 612ae96e0e2..caa5ce959c6 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norwegian.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norwegian.lbx
@@ -1,6 +1,6 @@
-% $Id: cms-norwegian.lbx,v 1.8 2017/01/20 13:28:24 dfussner Exp $
+% $Id: cms-norwegian.lbx,v 1.11 2018/01/09 19:03:01 dfussner Exp $
 
-\ProvidesFile{cms-norwegian.lbx}[2016/06/01 v 3.4 biblatex localization]
+\ProvidesFile{cms-norwegian.lbx}[2018/01/09 v 3.10 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated by a native speaker (H{\aa}kon Malmedal).
@@ -17,6 +17,7 @@
   \savecommand\mkbibrangecomp%
   \savecommand\mkbibrangeterse%
   \savecommand\mkbibrangefull%
+  \protected\def\mkjuridordinal{\mkbibordinal}%
   \protected\def\mkdaterangecomp{%
     \lbx@cms@mkbibrangetrunc{long}}%
   \protected\def\mkdaterangeterse{%
@@ -191,19 +192,31 @@
 \NewBibliographyString{cbycompileranaf}
 \NewBibliographyString{cfromamerican}
 \NewBibliographyString{cfrombrazilian}
+\NewBibliographyString{cfrombulgarian}
+\NewBibliographyString{cfromcatalan}
+\NewBibliographyString{cfromcroatian}
+\NewBibliographyString{cfromczech}
 \NewBibliographyString{cfromdanish}
 \NewBibliographyString{cfromdutch}
 \NewBibliographyString{cfromenglish}
+\NewBibliographyString{cfromestonian}
+\NewBibliographyString{cfromfinnish}
 \NewBibliographyString{cfromfrench}
+\NewBibliographyString{cfromgalician}
 \NewBibliographyString{cfromgerman}
 \NewBibliographyString{cfromgreek}
 \NewBibliographyString{cfromitalian}
+\NewBibliographyString{cfromjapanese}
 \NewBibliographyString{cfromlatin}
 \NewBibliographyString{cfromnorwegian}
+\NewBibliographyString{cfrompolish}
 \NewBibliographyString{cfromportuguese}
 \NewBibliographyString{cfromrussian}
+\NewBibliographyString{cfromslovak}
+\NewBibliographyString{cfromslovene}
 \NewBibliographyString{cfromspanish}
 \NewBibliographyString{cfromswedish}
+\NewBibliographyString{cfromukrainian}
 \NewBibliographyString{partvolume}
 \NewBibliographyString{by}
 \NewBibliographyString{of}
@@ -220,34 +233,51 @@
 \NewBibliographyString{origedition}
 \NewBibliographyString{revisededition}
 \NewBibliographyString{broadcast}
-\NewBibliographyString{recorded}
+\NewBibliographyString{songrecorded}
+\NewBibliographyString{discrecorded}
 \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{edbulgarian}
+\NewBibliographyString{edcatalan}
+\NewBibliographyString{edcroatian}
+\NewBibliographyString{edczech}
 \NewBibliographyString{eddanish}
 \NewBibliographyString{eddutch}
 \NewBibliographyString{edenglish}
+\NewBibliographyString{edestonian}
+\NewBibliographyString{edfinnish}
 \NewBibliographyString{edfrench}
+\NewBibliographyString{edgalician}
 \NewBibliographyString{edgerman}
 \NewBibliographyString{edgreek}
 \NewBibliographyString{editalian}
+\NewBibliographyString{edjapanese}
 \NewBibliographyString{edlatin}
 \NewBibliographyString{ednorwegian}
+\NewBibliographyString{edpolish}
 \NewBibliographyString{edportuguese}
 \NewBibliographyString{edrussian}
+\NewBibliographyString{edslovak}
+\NewBibliographyString{edslovene}
 \NewBibliographyString{edspanish}
 \NewBibliographyString{edswedish}
+\NewBibliographyString{edukrainian}
 \NewBibliographyString{review}
 \NewBibliographyString{reviewof}
 \NewBibliographyString{section}
 \NewBibliographyString{sections}
+\NewBibliographyString{canadasection}% For legal citations
+\NewBibliographyString{canadasections}% Ditto
+\NewBibliographyString{supranote}% Ditto
+\NewBibliographyString{hereinafter}% Ditto
+\NewBibliographyString{subverbo}
+\NewBibliographyString{subverbis}
 \NewBibliographyString{compiler}
 \NewBibliographyString{compilers}
 \NewBibliographyString{conductor}
@@ -326,7 +356,8 @@
   revisededition = {{rev\adddot\addspace utg\adddot}%
     {rev\adddot\addspace utg\adddot}},
   broadcast = {{kringkastet}{kringkastet}},
-  recorded = {{spilt inn}{spilt inn}},
+  songrecorded = {{spilt inn}{spilt inn}},
+  discrecorded = {{spilt inn}{spilt inn}},
   numbers = {{nr\adddot}{nr\adddot}},
   nodate = {{udatert}{udatert}},
   pseudonym = {{pseud\adddot}{pseud\adddot}},
@@ -335,19 +366,31 @@
   inlang = {{p{\aa}\addspace}{p{\aa}\addspace}},
   edamerican     = {{amerikansk}{amerikansk}},
   edbrazilian    = {{brasiliansk}{brasiliansk}},
+  edbulgarian    = {{bulgarsk}{bulgarsk}},
+  edcatalan      = {{katalansk}{katalansk}},
+  edcroatian     = {{kroatisk}{kroatisk}},
+  edczech        = {{tsjekkisk}{tsjekkisk}},
   eddanish       = {{dansk}{dansk}},
   eddutch        = {{nederlandsk}{nederlandsk}},
   edenglish      = {{engelsk}{engelsk}},
+  edestonian     = {{estisk}{estisk}},
+  edfinnish      = {{finsk}{finsk}},
   edfrench       = {{fransk}{fransk}},
+  edgalician     = {{galisisk}{galisisk}},
   edgerman       = {{tysk}{tysk}},
   edgreek        = {{gresk}{gresk}},
   editalian      = {{italiensk}{italiensk}},
+  edjapanese     = {{japansk}{japansk}},
   edlatin        = {{latin}{latin}},
   ednorwegian    = {{norsk}{norsk}},
+  edpolish       = {{polsk}{polsk}},
   edportuguese   = {{portugisisk}{portugisisk}},
-  edrussian      = {{russisk}{russisk}}
+  edrussian      = {{russisk}{russisk}},
+  edslovak       = {{slovakisk}{slovakisk}},
+  edslovene      = {{slovensk}{slovensk}},
   edspanish      = {{spansk}{spansk}},
   edswedish      = {{svensk}{svensk}},
+  edukrainian    = {{ukrainsk}{ukrainsk}},
   translator       = {{overs\adddot}{overs\adddot}},
   translators      = {{overs\adddot}{overs\adddot}},
   redactor         = {{bearb\adddot}{bearb\adddot}},
@@ -590,25 +633,45 @@
   paragraphs = {{avsn\adddot}{avsn\adddot}},
   section = {{avsn\adddot}{avsn\adddot}},
   sections = {{avsn\adddot}{avsn\adddot}},
+  canadasection = {{s\adddot}{s\adddot}},% For legal citations
+  canadasections = {{s\adddot}{s\adddot}},% ditto
+  supranote = {{\mkbibemph{supra}\addspace note\addnbspace}% ditto
+    {\mkbibemph{supra}\addspace n\adddotspace}},
+  hereinafter = {{heretter}{heretter}},
+  subverbo = {{s\adddot v\adddot}{s\adddot v\adddot}},
+  subverbis = {{s\adddot vv\adddot}{s\adddot vv\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}},
+  cfrombrazilian    = {{fra brasiliansk-portugisisk av}{fra
+      brasiliansk-portugisisk av}},
+  cfrombulgarian    = {{fra bulgarsk av}{fra bulgarsk av}},
+  cfromcatalan      = {{fra katalansk av}{fra katalansk av}},
+  cfromcroatian     = {{fra kroatisk av}{fra kroatisk av}},
+  cfromczech        = {{fra tsjekkisk av}{fra tsjekkisk av}},
   cfromdanish       = {{fra dansk av}{fra dansk av}},
   cfromdutch        = {{fra nederlandsk av}{fra nederlandsk av}},
   cfromenglish      = {{fra engelsk av}{fra engelsk av}},
+  cfromestonian     = {{fra estisk av}{fra estisk av}},
+  cfromfinnish      = {{fra finsk av}{fra finsk av}},
   cfromfrench       = {{fra fransk av}{fra fransk av}},
+  cfromgalician     = {{fra galisisk av}{fra galisisk av}},
   cfromgerman       = {{fra tysk av}{fra tysk av}},
   cfromgreek        = {{fra gresk av}{fra gresk av}},
   cfromitalian      = {{fra italiensk av}{fra italiensk av}},
+  cfromjapanese     = {{fra japansk av}{fra japansk av}},
   cfromlatin        = {{fra latin av}{fra latin av}},
   cfromnorwegian    = {{fra norsk av}{fra norsk av}},
+  cfrompolish       = {{fra polsk av}{fra polsk av}},
   cfromportuguese   = {{fra portugisisk av}{fra portugisisk av}},
   cfromrussian      = {{fra russisk av}{fra russisk av}},
+  cfromslovak       = {{fra slovakisk av}{fra slovakisk av}},
+  cfromslovene      = {{fra slovensk av}{fra slovensk av}},
   cfromspanish      = {{fra spansk av}{fra spansk av}},
   cfromswedish      = {{fra svensk av}{fra svensk av}},
+  cfromukrainian    = {{fra ukrainsk av}{fra ukrainsk av}},
   bynone = {{}{}},
   byconductor = {{dirigert av}{dir\adddot}},
   bydirector = {{regissert av}{regi}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-nynorsk.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-nynorsk.lbx
index 72269bd99ae..a529b84cd65 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-nynorsk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-nynorsk.lbx
@@ -1,6 +1,6 @@
-% $Id: cms-nynorsk.lbx,v 1.8 2017/01/20 13:31:25 dfussner Exp $
+% $Id: cms-nynorsk.lbx,v 1.11 2018/01/09 19:03:19 dfussner Exp $
 
-\ProvidesFile{cms-nynorsk.lbx}[2016/06/01 v 3.4 biblatex localization]
+\ProvidesFile{cms-nynorsk.lbx}[2018/01/09 v 3.10 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated by a native speaker (H{\aa}kon Malmedal).
@@ -17,6 +17,7 @@
   \savecommand\mkbibrangecomp%
   \savecommand\mkbibrangeterse%
   \savecommand\mkbibrangefull%
+  \protected\def\mkjuridordinal{\mkbibordinal}%
   \protected\def\mkdaterangecomp{%
     \lbx@cms@mkbibrangetrunc{long}}%
   \protected\def\mkdaterangeterse{%
@@ -191,19 +192,31 @@
 \NewBibliographyString{cbycompileranaf}
 \NewBibliographyString{cfromamerican}
 \NewBibliographyString{cfrombrazilian}
+\NewBibliographyString{cfrombulgarian}
+\NewBibliographyString{cfromcatalan}
+\NewBibliographyString{cfromcroatian}
+\NewBibliographyString{cfromczech}
 \NewBibliographyString{cfromdanish}
 \NewBibliographyString{cfromdutch}
 \NewBibliographyString{cfromenglish}
+\NewBibliographyString{cfromestonian}
+\NewBibliographyString{cfromfinnish}
 \NewBibliographyString{cfromfrench}
+\NewBibliographyString{cfromgalician}
 \NewBibliographyString{cfromgerman}
 \NewBibliographyString{cfromgreek}
 \NewBibliographyString{cfromitalian}
+\NewBibliographyString{cfromjapanese}
 \NewBibliographyString{cfromlatin}
 \NewBibliographyString{cfromnorwegian}
+\NewBibliographyString{cfrompolish}
 \NewBibliographyString{cfromportuguese}
 \NewBibliographyString{cfromrussian}
+\NewBibliographyString{cfromslovak}
+\NewBibliographyString{cfromslovene}
 \NewBibliographyString{cfromspanish}
 \NewBibliographyString{cfromswedish}
+\NewBibliographyString{cfromukrainian}
 \NewBibliographyString{partvolume}
 \NewBibliographyString{by}
 \NewBibliographyString{of}
@@ -220,34 +233,51 @@
 \NewBibliographyString{origedition}
 \NewBibliographyString{revisededition}
 \NewBibliographyString{broadcast}
-\NewBibliographyString{recorded}
+\NewBibliographyString{songrecorded}
+\NewBibliographyString{discrecorded}
 \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{edbulgarian}
+\NewBibliographyString{edcatalan}
+\NewBibliographyString{edcroatian}
+\NewBibliographyString{edczech}
 \NewBibliographyString{eddanish}
 \NewBibliographyString{eddutch}
 \NewBibliographyString{edenglish}
+\NewBibliographyString{edestonian}
+\NewBibliographyString{edfinnish}
 \NewBibliographyString{edfrench}
+\NewBibliographyString{edgalician}
 \NewBibliographyString{edgerman}
 \NewBibliographyString{edgreek}
 \NewBibliographyString{editalian}
+\NewBibliographyString{edjapanese}
 \NewBibliographyString{edlatin}
 \NewBibliographyString{ednorwegian}
+\NewBibliographyString{edpolish}
 \NewBibliographyString{edportuguese}
 \NewBibliographyString{edrussian}
+\NewBibliographyString{edslovak}
+\NewBibliographyString{edslovene}
 \NewBibliographyString{edspanish}
 \NewBibliographyString{edswedish}
+\NewBibliographyString{edukrainian}
 \NewBibliographyString{review}
 \NewBibliographyString{reviewof}
 \NewBibliographyString{section}
 \NewBibliographyString{sections}
+\NewBibliographyString{canadasection}% For legal citations
+\NewBibliographyString{canadasections}% Ditto
+\NewBibliographyString{supranote}% Ditto
+\NewBibliographyString{hereinafter}% Ditto
+\NewBibliographyString{subverbo}
+\NewBibliographyString{subverbis}
 \NewBibliographyString{compiler}
 \NewBibliographyString{compilers}
 \NewBibliographyString{conductor}
@@ -326,7 +356,8 @@
   revisededition = {{rev\adddot\addspace utg\adddot}%
     {rev\adddot\addspace utg\adddot}},
   broadcast = {{kringkasta}{kringkasta}},
-  recorded = {{spelt inn}{spelt inn}},
+  songrecorded = {{spelt inn}{spelt inn}},
+  discrecorded = {{spelt inn}{spelt inn}},
   numbers = {{nr\adddot}{nr\adddot}},
   nodate = {{udatert}{udatert}},
   pseudonym = {{pseud\adddot}{pseud\adddot}},
@@ -335,19 +366,31 @@
   inlang = {{p{\aa}\addspace}{p{\aa}\addspace}},
   edamerican     = {{amerikansk}{amerikansk}},
   edbrazilian    = {{brasiliansk}{brasiliansk}},
+  edbulgarian    = {{bulgarsk}{bulgarsk}},
+  edcatalan      = {{katalansk}{katalansk}},
+  edcroatian     = {{kroatisk}{kroatisk}},
+  edczech        = {{tsjekkisk}{tsjekkisk}},
   eddanish       = {{dansk}{dansk}},
   eddutch        = {{nederlandsk}{nederlandsk}},
   edenglish      = {{engelsk}{engelsk}},
+  edestonian     = {{estisk}{estisk}},
+  edfinnish      = {{finsk}{finsk}},
   edfrench       = {{fransk}{fransk}},
+  edgalician     = {{galisisk}{galisisk}},
   edgerman       = {{tysk}{tysk}},
   edgreek        = {{gresk}{gresk}},
   editalian      = {{italiensk}{italiensk}},
+  edjapanese     = {{japansk}{japansk}},
   edlatin        = {{latin}{latin}},
   ednorwegian    = {{norsk}{norsk}},
+  edpolish       = {{polsk}{polsk}},
   edportuguese   = {{portugisisk}{portugisisk}},
-  edrussian      = {{russisk}{russisk}}
+  edrussian      = {{russisk}{russisk}},
+  edslovak       = {{slovakisk}{slovakisk}},
+  edslovene      = {{slovensk}{slovensk}},
   edspanish      = {{spansk}{spansk}},
   edswedish      = {{svensk}{svensk}},
+  edukrainian    = {{ukrainsk}{ukrainsk}},
   translator       = {{oms\adddot}{oms\adddot}},
   translators      = {{oms\adddot}{oms\adddot}},
   redactor         = {{omarb\adddot}{omarb\adddot}},
@@ -590,25 +633,46 @@
   paragraphs = {{avsn\adddot}{avsn\adddot}},
   section = {{avsn\adddot}{avsn\adddot}},
   sections = {{avsn\adddot}{avsn\adddot}},
+  canadasection = {{s\adddot}{s\adddot}},% For legal citations
+  canadasections = {{s\adddot}{s\adddot}},% ditto
+  supranote = {{\mkbibemph{supra}\addspace note\addnbspace}% ditto
+    {\mkbibemph{supra}\addspace n\adddotspace}},
+  hereinafter = {{heretter}{heretter}},
+  subverbo = {{s\adddot v\adddot}{s\adddot v\adddot}},
+  subverbis = {{s\adddot vv\adddot}{s\adddot vv\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}},
+  cfromamerican     = {{fr{\aa} amerikansk-engelsk av}{fr{\aa}
+      amerikansk-engelsk av}},
+  cfrombrazilian    = {{fr{\aa} brasiliansk-portugisisk av}{fr{\aa}
+      brasiliansk-portugisisk av}},
+  cfrombulgarian    = {{fr{\aa} bulgarsk av}{fr{\aa} bulgarsk av}},
+  cfromcatalan      = {{fr{\aa} katalansk av}{fr{\aa} katalansk av}},
+  cfromcroatian     = {{fr{\aa} kroatisk av}{fr{\aa} kroatisk av}},
+  cfromczech        = {{fr{\aa} tsjekkisk av}{fr{\aa} tsjekkisk 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}},
+  cfromestonian     = {{fr{\aa} estisk av}{fr{\aa} estisk av}},
+  cfromfinnish      = {{fr{\aa} finsk av}{fr{\aa} finsk av}},
   cfromfrench       = {{fr{\aa} fransk av}{fr{\aa} fransk av}},
+  cfromgalician     = {{fr{\aa} galisisk av}{fr{\aa} galisisk 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}},
+  cfromjapanese     = {{fr{\aa} japansk av}{fr{\aa} japansk av}},
   cfromlatin        = {{fr{\aa} latin av}{fr{\aa} latin av}},
   cfromnorwegian    = {{fr{\aa} norsk av}{fr{\aa} norsk av}},
+  cfrompolish       = {{fr{\aa} polsk av}{fr{\aa} polsk av}},
   cfromportuguese   = {{fr{\aa} portugisisk av}{fr{\aa} portugisisk av}},
   cfromrussian      = {{fr{\aa} russisk av}{fr{\aa} russisk av}},
+  cfromslovene      = {{fr{\aa} slovakisk av}{fr{\aa} slovakisk av}},
+  cfromslovak       = {{fr{\aa} slovensk av}{fr{\aa} slovensk av}},
   cfromspanish      = {{fr{\aa} spansk av}{fr{\aa} spansk av}},
   cfromswedish      = {{fr{\aa} svensk av}{fr{\aa} svensk av}},
+  cfromukrainian    = {{fr{\aa} ukrainsk av}{fr{\aa} ukrainsk av}},
   bynone = {{}{}},
   byconductor = {{dirigert av}{dir\adddot}},
   bydirector = {{regissert av}{regi}},
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-swedish.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-swedish.lbx
index 762794d5545..4927caf5aa8 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-swedish.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-swedish.lbx
@@ -1,6 +1,6 @@
 % $Id$
 
-\ProvidesFile{cms-swedish.lbx}[2016/06/01 v 3.4 biblatex localization]
+\ProvidesFile{cms-swedish.lbx}[2018/01/09 v 3.10 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated by a native speaker (Stefan Bj\"{o}rk).
@@ -17,6 +17,7 @@
   \savecommand\mkbibrangecomp%
   \savecommand\mkbibrangeterse%
   \savecommand\mkbibrangefull%
+  \protected\def\mkjuridordinal{\mkbibordinal}%
   \protected\def\mkdaterangecomp{%
     \lbx@cms@mkbibrangetrunc{long}}%
   \protected\def\mkdaterangeterse{%
@@ -191,19 +192,31 @@
 \NewBibliographyString{cbycompileranaf}
 \NewBibliographyString{cfromamerican}
 \NewBibliographyString{cfrombrazilian}
+\NewBibliographyString{cfrombulgarian}
+\NewBibliographyString{cfromcatalan}
+\NewBibliographyString{cfromcroatian}
+\NewBibliographyString{cfromczech}
 \NewBibliographyString{cfromdanish}
 \NewBibliographyString{cfromdutch}
 \NewBibliographyString{cfromenglish}
+\NewBibliographyString{cfromestonian}
+\NewBibliographyString{cfromfinnish}
 \NewBibliographyString{cfromfrench}
+\NewBibliographyString{cfromgalician}
 \NewBibliographyString{cfromgerman}
 \NewBibliographyString{cfromgreek}
 \NewBibliographyString{cfromitalian}
+\NewBibliographyString{cfromjapanese}
 \NewBibliographyString{cfromlatin}
 \NewBibliographyString{cfromnorwegian}
+\NewBibliographyString{cfrompolish}
 \NewBibliographyString{cfromportuguese}
 \NewBibliographyString{cfromrussian}
+\NewBibliographyString{cfromslovak}
+\NewBibliographyString{cfromslovene}
 \NewBibliographyString{cfromspanish}
 \NewBibliographyString{cfromswedish}
+\NewBibliographyString{cfromukrainian}
 \NewBibliographyString{partvolume}
 \NewBibliographyString{by}
 \NewBibliographyString{of}
@@ -220,34 +233,51 @@
 \NewBibliographyString{origedition}
 \NewBibliographyString{revisededition}
 \NewBibliographyString{broadcast}
-\NewBibliographyString{recorded}
+\NewBibliographyString{songrecorded}
+\NewBibliographyString{discrecorded}
 \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{edbulgarian}
+\NewBibliographyString{edcatalan}
+\NewBibliographyString{edcroatian}
+\NewBibliographyString{edczech}
 \NewBibliographyString{eddanish}
 \NewBibliographyString{eddutch}
 \NewBibliographyString{edenglish}
+\NewBibliographyString{edestonian}
+\NewBibliographyString{edfinnish}
 \NewBibliographyString{edfrench}
+\NewBibliographyString{edgalician}
 \NewBibliographyString{edgerman}
 \NewBibliographyString{edgreek}
 \NewBibliographyString{editalian}
+\NewBibliographyString{edjapanese}
 \NewBibliographyString{edlatin}
 \NewBibliographyString{ednorwegian}
+\NewBibliographyString{edpolish}
 \NewBibliographyString{edportuguese}
 \NewBibliographyString{edrussian}
+\NewBibliographyString{edslovak}
+\NewBibliographyString{edslovene}
 \NewBibliographyString{edspanish}
 \NewBibliographyString{edswedish}
+\NewBibliographyString{edukrainian}
 \NewBibliographyString{review}
 \NewBibliographyString{reviewof}
 \NewBibliographyString{section}
 \NewBibliographyString{sections}
+\NewBibliographyString{canadasection}% For legal citations
+\NewBibliographyString{canadasections}% Ditto
+\NewBibliographyString{supranote}% Ditto
+\NewBibliographyString{hereinafter}% Ditto
+\NewBibliographyString{subverbo}
+\NewBibliographyString{subverbis}
 \NewBibliographyString{compiler}
 \NewBibliographyString{compilers}
 \NewBibliographyString{conductor}
@@ -326,7 +356,8 @@
   revisededition = {{reviderad utg{\aa}va\addspace}%
     {rev\adddot\addspace utg\adddot}},
   broadcast = {{kringkastet}{kringkastet}},
-  recorded = {{spilt inn}{spilt inn}},
+  songrecorded = {{spilt inn}{spilt inn}},
+  discrecorded = {{spilt inn}{spilt inn}},
   numbers = {{nr\adddot}{nr\adddot}},
   nodate = {{udatert}{udatert}},
   pseudonym = {{pseud\adddot}{pseud\adddot}},
@@ -335,19 +366,31 @@
   inlang = {{p{\aa}\addspace}{p{\aa}\addspace}},
   edamerican     = {{amerikanska}{amerikanska}},
   edbrazilian    = {{brasilianska}{brasilianska}},
+%  edbulgarian    = {{}{}},% FIXME: missing
+  edcatalan      = {{katalanska}{katalanska}},
+  edcroatian     = {{kroatiska}{kroatiska}},
+  edczech        = {{tjeckiska}{tjeckiska}},
   eddanish       = {{danska}{danska}},
-  eddutch        = {{nederländska}{nederländska}},
+  eddutch        = {{nederl\"andska}{nederl\"andska}},
   edenglish      = {{engelska}{engelska}},
+%  edestonian     = {{}{}},% FIXME: missing
+  edfinnish      = {{finska}{finska}},
   edfrench       = {{franska}{franska}},
+  edgalician     = {{galiciska}{galiciska}},
   edgerman       = {{tyska}{tyska}},
   edgreek        = {{grekiska}{grekiska}},
   editalian      = {{italienska}{italienska}},
+% edjapanese      = {{}{}},% FIXME: missing
   edlatin        = {{latin}{latin}},
   ednorwegian    = {{norska}{norska}},
+  edpolish       = {{polska}{polska}},
   edportuguese   = {{portugisiska}{portugisiska}},
-  edrussian      = {{ryska}{ryska}}
+  edrussian      = {{ryska}{ryska}},
+% edslovak      = {{}{}},% FIXME: missing
+% edslovene      = {{}{}},% FIXME: missing
   edspanish      = {{spanska}{spanska}},
   edswedish      = {{svenska}{svenska}},
+% edukrainian    = {{}{}},% FIXME: missing 
   translator       = {{\"{o}vers\adddot}{\"{o}vers\adddot}},
   translators      = {{\"{o}vers\adddot}{\"{o}vers\adddot}},
   redactor         = {{bearb\adddot}{bearb\adddot}},
@@ -590,25 +633,47 @@
   paragraphs = {{avsn\adddot}{avsn\adddot}},
   section = {{avsn\adddot}{avsn\adddot}},
   sections = {{avsn\adddot}{avsn\adddot}},
+  canadasection = {{s\adddot}{s\adddot}},% For legal citations
+  canadasections = {{s\adddot}{s\adddot}},% ditto
+  supranote = {{\mkbibemph{supra}\addspace not\addnbspace}% ditto
+    {\mkbibemph{supra}\addspace not\addnbspace}},
+  hereinafter = {{h\"adanefter}{h\"adanefter}},
+  subverbo = {{s\adddot v\adddot}{s\adddot v\adddot}},
+  subverbis = {{s\adddot vv\adddot}{s\adddot vv\adddot}},
   verse = {{v\adddot}{v\adddot}},
   verses = {{v\adddot}{v\adddot}},
   number = {{nr\adddot}{nr\adddot}},
   chapter = {{kap\adddot}{kap\adddot}},
   cfromamerican     = {{fr{\aa}n engelska av}{fr{\aa}n engelska av}},
-  cfrombrazilian    = {{fr{\aa}n portugisiska av}{fr{\aa}n portugisiska av}},
+  cfrombrazilian    = {{fr{\aa}n portugisiska av}{fr{\aa}n
+      portugisiska av}},
+% cfrombulgarian    = {{}{}},% FIXME: missing
+  cfromcatalan      = {{fr{\aa}n katalanska av}{fr{\aa}n katalanska av}},
+  cfromcroatian     = {{fr{\aa}n kroatiska av}{fr{\aa}n kroatiska av}},
+  cfromczech        = {{fr{\aa}n tjeckiska av}{fr{\aa}n tjeckiska av}},
   cfromdanish       = {{fr{\aa}n danska av}{fr{\aa}n danska av}},
-  cfromdutch        = {{fr{\aa}n nederländska av}{fr{\aa}n nederländska av}},
+  cfromdutch        = {{fr{\aa}n nederl\"andska av}{fr{\aa}n
+      nederl\"andska av}},
   cfromenglish      = {{fr{\aa}n engelska av}{fr{\aa}n engelska av}},
+% cfromestonian     = {{}{}},% FIXME: missing
+  cfromfinnish      = {{fr{\aa}n finska av}{fr{\aa}n finska av}},
   cfromfrench       = {{fr{\aa}n franska av}{fr{\aa}n franska av}},
+  cfromgalician     = {{fr{\aa}n galiciska av}{fr{\aa}n galiciska av}},
   cfromgerman       = {{fr{\aa}n tyska av}{fr{\aa}n tyska av}},
   cfromgreek        = {{fr{\aa}n grekiska av}{fr{\aa}n grekiska av}},
-  cfromitalian      = {{fr{\aa}n italienska av}{fr{\aa}n italienska av}},
+  cfromitalian      = {{fr{\aa}n italienska av}{fr{\aa}n italienska
+      av}},
+% cfromjapanese     = {{}{}},% FIXME: missing
   cfromlatin        = {{fr{\aa}n latin av}{fr{\aa}n latin av}},
   cfromnorwegian    = {{fr{\aa}n norska av}{fr{\aa}n norska av}},
+  cfrompolish       = {{fr{\aa}n polska av}{fr{\aa}n polska av}},
   cfromportuguese   = {{fr{\aa}n portugisiska av}{fr{\aa}n portugisiska av}},
   cfromrussian      = {{fr{\aa}n ryska av}{fr{\aa}n ryska av}},
+% cfromslovak     = {{}{}},% FIXME: missing
+% cfromslovene     = {{}{}},% FIXME: missing
   cfromspanish      = {{fr{\aa}n spanska av}{fr{\aa}n spanska av}},
   cfromswedish      = {{fr{\aa}n svenska av}{fr{\aa}n svenska av}},
+% cfromukrainian     = {{}{}},% FIXME: missing
   bynone = {{}{}},
   byconductor = {{dirigerad av}{dir\adddot}},
   bydirector = {{regisserad av}{regi}},