biblatex-chicago

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

19 files changed, 3823 insertions, 1400 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 c36619ae7f8..90984961343 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty
@@ -1,4 +1,4 @@
-% $Id: biblatex-chicago.sty,v 0.1.1.48 2013/03/12 14:19:12 dfussner Exp $
+% $Id: biblatex-chicago.sty,v 0.1.1.53 2013/10/29 14:10:24 dfussner Exp $
 
 % Copyright (c) 2009-2013 David Fussner.  This package is
 % author-maintained.
@@ -13,7 +13,7 @@
 % but not limited to, the implied warranties of merchantability and
 % fitness for a particular purpose.
 
-\ProvidesPackage{biblatex-chicago}[2013/03/12 v 2.5 biblatex style]
+\ProvidesPackage{biblatex-chicago}[2013/10/29 v 2.8 biblatex style]
 
 \RequirePackage{etoolbox}
 
@@ -50,7 +50,7 @@
 \def\cms@authordate{%
   \RequirePackage[style=chicago-authordate]{biblatex}%
   \ExecuteBibliographyOptions{%
-    pagetracker=true,autocite=inline,alldates=comp,labelyear=true,
+    pagetracker=true,autocite=inline,alldates=comp,
     uniquename=minfull,useeditor=true,usetranslator=true,usecompiler=true,
     ibidtracker=constrict,sorting=cms,punctfont,cmslos=true,nodates,
     uniquelist=minyear,maxbibnames=10,minbibnames=7,sortcase=false,
@@ -67,7 +67,7 @@
 \def\cms@authordatetrad{%
   \RequirePackage[style=chicago-authordate-trad]{biblatex}%
   \ExecuteBibliographyOptions{%
-    pagetracker=true,autocite=inline,alldates=comp,labelyear=true,
+    pagetracker=true,autocite=inline,alldates=comp,
     uniquename=minfull,useeditor=true,usetranslator=true,usecompiler=true,
     ibidtracker=constrict,sorting=cms,punctfont,cmslos=true,nodates,
     uniquelist=minyear,maxbibnames=10,minbibnames=7,sortcase=false,
@@ -76,7 +76,7 @@
 \def\cms@authordateold{%
   \RequirePackage[style=chicago-authordate15]{biblatex}%
   \ExecuteBibliographyOptions{%
-    pagetracker=true,autocite=inline,alldates=comp,labelyear=true,
+    pagetracker=true,autocite=inline,alldates=comp,
     uniquename=minfull,useeditor=true,usetranslator=true,usecompiler=true,
     ibidtracker=constrict,sorting=cms,punctfont,cmslos=true,nodates,
     uniquelist=minyear,maxbibnames=10,minbibnames=7,sortcase=false}}
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 c1db18e73e8..34c817312f4 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,10 +1,10 @@
-% $Id: chicago-authordate-trad.cbx,v 0.8.1.32 2013/03/12 12:40:45 dfussner Exp $
+% $Id: chicago-authordate-trad.cbx,v 0.8.1.42 2013/10/29 14:03:58 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-trad.cbx}[2013/03/12 v 2.5 biblatex
+\ProvidesFile{chicago-authordate-trad.cbx}[2013/10/29 v 2.8 biblatex
 citation style]
 
 %%%% Biblatex initialization + Chicago options + Toggles %%%%
@@ -23,6 +23,7 @@ citation style]
 \providetoggle{cms@los}
 %\providetoggle{cms@oneyear}
 \providetoggle{cms@avdate}
+\providetoggle{cms@ordate}
 \providetoggle{cms@nodates}
 \providetoggle{cms@authorparens}
 
@@ -33,6 +34,7 @@ citation style]
 \providetoggle{cms@isbn}
 \providetoggle{cms@numbermonth}
 \providetoggle{cms@bookpages}
+\providetoggle{cms@hidevolumes}% Modify Volume fix
 
 \providetoggle{cms@jrcomma}% Comma after Jr./Sr.
 
@@ -42,7 +44,10 @@ citation style]
 \providetoggle{cms@origpublished}% Keep
 \providetoggle{cms@annotation}% Keep
 \providetoggle{cms@postposit}% Keep
-\providetoggle{cms@fullshhand}
+\providetoggle{cms@fullshhand}%
+\providetoggle{cms@vol}%
+\providetoggle{cms@crossref}%
+\providetoggle{cms@bookcrossref}
 
 \AtEveryCitekey{%
   \iffieldundef{userc}%
@@ -57,18 +62,55 @@ citation style]
   {\csuse{cms@opt@avdate@#1}}
   {\blx@err@invopt{avdate=#1}{}}}
 \def\cms@opt@avdate@true{%
-  \@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4
-  {\DeclareLabelyear[music,review,video]{\field{eventyear}%
-      \field{origyear} \field{year} \field{urlyear}}}%
+  \@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4/2.5
+  {\@ifpackagelater{biblatex}{2013/03/30}% for biblatex 2.6 ff.
+    {\DeclareLabeldate[music,review,video]{\field{eventyear}%
+        \field{origyear} \field{year} \field{urlyear}}}%
+    {\DeclareLabelyear[music,review,video]{\field{eventyear}%
+        \field{origyear} \field{year} \field{urlyear}}}}%
   {\DeclareLabelyear[music,review,video]{eventyear,origyear,year,urlyear}}%
   \toggletrue{cms@avdate}}%
 \def\cms@opt@avdate@false{%
   \togglefalse{cms@avdate}}
 
-\DeclareBibliographyOption{cmsdate}{% Trying to implement origyear as
-  \ifcsdef{cms@opt@cmsdate@#1}% labelyear. Sorting will be an issue.
-  {\csuse{cms@opt@cmsdate@#1}}
+\DeclareBibliographyOption{cmsdate}[off]{% Trying to implement origyear as
+  \ifcsdef{cms@global@cmsdate@#1}% labelyear. Sorting will be an issue.
+  {\csuse{cms@global@cmsdate@#1}}
   {\blx@err@invopt{cmsdate=#1}{}}}
+\def\cms@global@cmsdate@on{%
+  \toggletrue{cms@origlabel}%
+  \ExecuteBibliographyOptions{cmsorigdate=true}}
+\def\cms@global@cmsdate@new{%
+  \toggletrue{cms@bothlabelnew}%
+  \ExecuteBibliographyOptions{cmsorigdate=true}}
+\def\cms@global@cmsdate@old{%
+  \toggletrue{cms@bothlabelold}%
+  \ExecuteBibliographyOptions{cmsorigdate=true}}
+\def\cms@global@cmsdate@both{%
+  \toggletrue{cms@bothlabelold}%
+  \ExecuteBibliographyOptions{cmsorigdate=true}}
+\def\cms@global@cmsdate@full{}%
+\def\cms@global@cmsdate@off{}
+
+\DeclareBibliographyOption{cmsorigdate}[true]{% ??? Also need new macros
+  \ifcsdef{cms@opt@origdate@#1}% for printing dates.  Worth it ???
+  {\csuse{cms@opt@origdate@#1}}%
+  {\blx@err@invopt{cmsorigdate=#1}{}}}
+\def\cms@opt@origdate@true{%
+  \@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4/2.5
+  {\@ifpackagelater{biblatex}{2013/03/30}% for biblatex 2.6 ff.
+    {\DeclareLabeldate{\field{origyear} \field{year}%
+        \field{eventyear} \field{urlyear}}%
+      \DeclareLabeldate[patent]{\field{year} \field{eventyear}%
+        \field{origyear} \field{urlyear}}}%
+    {\DeclareLabelyear{\field{origyear} \field{year}%
+        \field{eventyear} \field{urlyear}}%
+      \DeclareLabelyear[patent]{\field{year} \field{eventyear}%
+        \field{origyear} \field{urlyear}}}}%
+  {\DeclareLabelyear{origyear,year,eventyear,urlyear}%
+    \DeclareLabelyear[patent]{year,eventyear,origyear,urlyear}}%
+  \global\toggletrue{cms@ordate}}%
+\def\cms@opt@origdate@false{\togglefalse{cms@ordate}}%
 
 \DeclareEntryOption{cmsdate}[off]{% Trying to implement origyear as
   \ifcsdef{cms@opt@cmsdate@#1}% labelyear. Sorting will be an issue.
@@ -126,6 +168,45 @@ citation style]
 \DeclareBibliographyOption{headline}[true]{%
   \renewcommand{\MakeSentenceCase}{\@ifstar\relax\relax}}
 
+\DeclareBibliographyOption{longcrossref}[false]{%
+  \ifcsdef{cms@opt@lxref@#1}%
+  {\csuse{cms@opt@lxref@#1}}
+  {\blx@err@invopt{longcrossref=#1}{}}}
+\def\cms@opt@lxref@none{%
+  \togglefalse{cms@crossref}%
+  \togglefalse{cms@bookcrossref}}%
+\def\cms@opt@lxref@true{%
+  \toggletrue{cms@crossref}}%
+\def\cms@opt@lxref@false{%
+  \togglefalse{cms@crossref}}%
+\def\cms@opt@lxref@notes{%
+  \togglefalse{cms@crossref}}%
+\def\cms@opt@lxref@bib{%
+  \toggletrue{cms@crossref}}%
+
+\DeclareEntryOption{longcrossref}[false]{%
+  \ifcsdef{cms@opt@doi@#1}%
+  {\csuse{cms@opt@doi@#1}}
+  {\blx@err@invopt{doi=#1}{}}}
+
+\DeclareBibliographyOption{booklongxref}[true]{%
+  \ifcsdef{cms@opt@bklxref@#1}%
+  {\csuse{cms@opt@bklxref@#1}}
+  {\blx@err@invopt{booklongxref=#1}{}}}%
+\def\cms@opt@bklxref@true{%
+  \toggletrue{cms@bookcrossref}}%
+\def\cms@opt@bklxref@false{%
+  \togglefalse{cms@bookcrossref}}%
+\def\cms@opt@bklxref@notes{%
+  \togglefalse{cms@bookcrossref}}%
+\def\cms@opt@bklxref@bib{%
+  \toggletrue{cms@bookcrossref}}%
+
+\DeclareEntryOption{booklongxref}[true]{%
+  \ifcsdef{cms@opt@bklxref@#1}%
+  {\csuse{cms@opt@bklxref@#1}}
+  {\blx@err@invopt{booklongxref=#1}{}}}%
+
 % The field-exclusion options %
 
 \DeclareBibliographyOption{isbn}[true]{%
@@ -155,6 +236,8 @@ citation style]
   \settoggle{cms@eprint}{#1}%
   \settoggle{cms@numbermonth}{#1}%
   \settoggle{cms@bookpages}{#1}}
+\DeclareBibliographyOption{hidevolumes}[true]{%
+  \settoggle{cms@hidevolumes}{#1}}
 
 \DeclareEntryOption{isbn}[true]{%
   \settoggle{cms@isbn}{#1}}
@@ -176,8 +259,71 @@ citation style]
   \settoggle{cms@numbermonth}{#1}}
 \DeclareEntryOption{bookpages}[true]{%
   \settoggle{cms@bookpages}{#1}}
+\DeclareEntryOption{hidevolumes}[true]{%
+  \settoggle{cms@hidevolumes}{#1}}
+
+\ExecuteBibliographyOptions{includeall,hidevolumes,booklongxref}%
+
+\@ifpackagelater{biblatex}{2013/03/30}% For biblatex 2.6 ff.
+{\ExecuteBibliographyOptions{labeldate=true}}%
+{\ExecuteBibliographyOptions{labelyear=true}}%
+
+\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}
+}
 
-\ExecuteBibliographyOptions{includeall}%
+\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 %
 
@@ -203,7 +349,9 @@ citation style]
   }
   \sort{
     \field{sortyear}
+    \field{labelyear}
     \field{year}
+    \field{origyear}
   }
   \sort{
     \field{sorttitle}
@@ -298,8 +446,9 @@ citation style]
   {\iffieldequalstr{entrysubtype}{classical}% Similar to notes+bib
     {\iffieldundef{shorthand}%
       {\ifthenelse{\ifnameundef{labelname}\OR
-          \iffieldequalstr{entrytype}{inreference}\OR
-          \iffieldequalstr{entrytype}{reference}}% Simplified for CMS
+          \ifentrytype{inreference}\OR
+          \ifentrytype{reference}\OR
+          \ifentrytype{mvreference}}% Simplified for CMS
         {\usebibmacro{cite:label}%
           \setunit{\addspace}%
           \usebibmacro{cite:reinit}}
@@ -311,7 +460,7 @@ citation style]
           {\iffieldequals{namehash}{\cbx@lastyear}%
             {}%
             {\usebibmacro{cmsbracketname}% For names in []
-              \iffieldequalstr{entrytype}{customc}%
+              \ifentrytype{customc}%
               {\newcunit}%
               {\setunit{\addspace}}}%
             \usebibmacro{cite:label}%
@@ -321,8 +470,9 @@ citation style]
       {\usebibmacro{cite:shorthand+title}}}
     {\iffieldundef{shorthand}%
       {\ifthenelse{\ifnameundef{labelname}\OR
-          \iffieldequalstr{entrytype}{inreference}\OR
-          \iffieldequalstr{entrytype}{reference}}% Simplified for CMS
+          \ifentrytype{inreference}\OR
+          \ifentrytype{reference}\OR
+          \ifentrytype{mvreference}}% Simplified for CMS
         {\usebibmacro{cite:label}%
           \setunit{\addspace}%
           \usebibmacro{cmscitesortdate}%
@@ -405,8 +555,9 @@ citation style]
     {\usebibmacro{cmscitesortdate}}}%
   {\iffieldundef{shorthand}
     {\ifthenelse{\ifnameundef{labelname}\OR
-        \iffieldequalstr{entrytype}{inreference}\OR
-        \iffieldequalstr{entrytype}{reference}}%
+        \ifentrytype{inreference}\OR
+        \ifentrytype{reference}\OR
+        \ifentrytype{mvreference}}%
       {\iffieldequalstr{entrysubtype}{classical}%
         {\setunit{%
             \global\booltrue{cbx:parens}%
@@ -444,12 +595,13 @@ citation style]
       \iffieldequalstr{entrysubtype}{classical}%
       {\usebibmacro{cite:label}}
       {\usebibmacro{cmscitesortdate}}%
-      \savefield{namehash}{\cbx@lasthash}}}%
+      \savefield{namehash}{\cbx@lasthash}}%
+    \stepcounter{textcitecount}}% Added ???
   \setunit{%
     \ifbool{cbx:parens}%
     {\bibcloseparen\global\boolfalse{cbx:parens}}%
     {}%
-    \multicitedelim}}
+    \textcitedelim}}% Not \multicitedelim ???
 
 \newbibmacro*{textcite:citeshort}{%
   \iffieldequals{namehash}{\cbx@lasthash}
@@ -472,8 +624,9 @@ citation style]
       \printtext[bibhyperref]{%
         \printfield{shorthand}}}}%
   {\ifthenelse{\ifnameundef{labelname}\OR
-      \iffieldequalstr{entrytype}{inreference}\OR
-      \iffieldequalstr{entrytype}{reference}}%
+      \ifentrytype{inreference}\OR
+      \ifentrytype{reference}\OR
+      \ifentrytype{mvreference}}%
     {\iffieldundef{shorthand}
       {\iffieldequalstr{entrysubtype}{classical}%
         {\setunit{%
@@ -506,12 +659,13 @@ citation style]
         {\usebibmacro{cmscitesortdate}}}%
       {\printtext[bibhyperref]{%
           \printfield{shorthand}}}%
-      \savefield{namehash}{\cbx@lasthash}}}%
+      \savefield{namehash}{\cbx@lasthash}}%
+    \stepcounter{textcitecount}}% Added ???
   \setunit{%
     \ifbool{cbx:parens}
-    {\bibcloseparen\global\boolfalse{cbx:parens}}
+    {\bibcloseparen\global\boolfalse{cbx:parens}}%
     {}%
-    \multicitedelim}}
+    \textcitedelim}}% Not \multicitedelim ???
 
 \newbibmacro*{textcite:postnote}{%
   \iffieldundef{postnote}%
@@ -523,13 +677,13 @@ citation style]
   {\setunit{}%
     \printtext{%
       \ifbool{cbx:parens}
-      {\bibcloseparen\global\boolfalse{cbx:parens}}
+      {\bibcloseparen\global\boolfalse{cbx:parens}}%
       {}}}%
   {\setunit{%
       \ifbool{cbx:parens}
-      {\bibcloseparen\global\boolfalse{cbx:parens}}
+      {\bibcloseparen\global\boolfalse{cbx:parens}}%
       {}%
-      \multicitedelim}}}
+      \textcitedelim}}}% Not \multicitedelim ???
 
 \newbibmacro*{cite:shorthand}{%
   \iftoggle{cms@los}%
@@ -562,35 +716,40 @@ citation style]
 \newbibmacro*{cite:label}{% Test this
   \iffieldundef{label}%
   {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT%
-      \iffieldequalstr{entrytype}{periodical}}% Simplifies .bib creation
+      \ifentrytype{periodical}}% Simplifies .bib creation
     {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}}}%
-    {\iffieldequalstr{entrytype}{manual}%
+    {\ifentrytype{manual}%
       {\printtext[bibhyperref]{\printlist{organization}}}%
       {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}}}%
   {\printtext[bibhyperref]{\printfield{label}}}}
 
 \newbibmacro*{cite:labelyear+extrayear}{%
   \ifboolexpr{ (
-    test {\iffieldequalstr{entrytype}{music}}%
+    test {\ifentrytype{music}}%
     or
-    test {\iffieldequalstr{entrytype}{review}}%
+    test {\ifentrytype{review}}%
     or
-    test {\iffieldequalstr{entrytype}{video}}%
+    test {\ifentrytype{video}}%
     )
     and
-    togl {cms@avdate}
+    togl {cms@avdate}%
   }%
   {\usebibmacro{cite:av+labelyear+extrayear}}%
-  {\usebibmacro{cite:standard+labelyear+extrayear}}}
+  {\iftoggle{cms@ordate}%
+    {\usebibmacro{cite:origfirst+labelyear+extrayear}}%
+    {\usebibmacro{cite:standard+labelyear+extrayear}}}}
 
 \newbibmacro*{cite:standard+labelyear+extrayear}{%
-  \iffieldundef{labelyear}
+  \ifthenelse{\iffieldundef{labelyear}\OR%
+    \iffieldequalstr{labelyear}{nodate}}%
   {\ifboolexpr{
-      test {\iffieldequalstr{entrytype}{misc}}
+      test {\ifentrytype{misc}}
+      or
+      test {\ifentrytype{inreference}}
       or
-      test {\iffieldequalstr{entrytype}{inreference}}
+      test {\ifentrytype{reference}}
       or
-      test {\iffieldequalstr{entrytype}{reference}}
+      test {\ifentrytype{mvreference}}
       or
       not togl {cms@nodates}
     }%
@@ -641,14 +800,78 @@ citation style]
           {\mbox{\bibdatedash}}%
           {}}}}}}
 
+\newbibmacro*{cite:origfirst+labelyear+extrayear}{%
+  \ifthenelse{\iffieldundef{labelyear}\OR%
+    \iffieldequalstr{labelyear}{nodate}}%
+  {\ifboolexpr{
+      test {\ifentrytype{misc}}
+      or
+      test {\ifentrytype{inreference}}
+      or
+      test {\ifentrytype{reference}}
+      or
+      test {\ifentrytype{mvreference}}
+      or
+      not togl {cms@nodates}
+    }%
+    {}%
+    {\printtext[bibhyperref]{\bibstring{nodate}}}}% For CMS?
+  {\printtext[bibhyperref]{%
+      \iffieldundef{origyear}%
+      {\iffieldundef{year}
+        {\iffieldundef{eventyear}%
+          {\printfield{labelyear}%
+            \iffieldundef{extrayear}%
+            {}%
+            {\setunit*{}%
+              \printfield{extrayear}}%
+            \iffieldundef{urlendyear}%
+            {}%
+            {\iffieldequalstr{urlendyear}{}%
+              {\mbox{\bibdatedash}}%
+              {}}}%
+          {\printfield{labelyear}%
+            \iffieldundef{extrayear}%
+            {}%
+            {\setunit*{}%
+              \printfield{extrayear}}%
+            \iffieldundef{eventendyear}%
+            {}%
+            {\iffieldequalstr{eventendyear}{}%
+              {\mbox{\bibdatedash}}%
+              {}}}}
+        {\printfield{labelyear}%
+          \iffieldundef{extrayear}%
+          {}%
+          {\setunit*{}%
+            \printfield{extrayear}}%
+          \iffieldundef{endyear}%
+          {}%
+          {\iffieldequalstr{endyear}{}%
+            {\mbox{\bibdatedash}}%
+            {}}}}
+      {\printfield{labelyear}%
+        \iffieldundef{extrayear}%
+        {}%
+        {\setunit*{}%
+          \printfield{extrayear}}%
+        \iffieldundef{origendyear}% DATE FIX
+        {}%
+        {\iffieldequalstr{origendyear}{}%
+          {\mbox{\bibdatedash}}%
+          {}}}}}}
+
 \newbibmacro*{cite:av+labelyear+extrayear}{%
-  \iffieldundef{labelyear}
+  \ifthenelse{\iffieldundef{labelyear}\OR%
+    \iffieldequalstr{labelyear}{nodate}}%
   {\ifboolexpr{
-      test {\iffieldequalstr{entrytype}{misc}}
+      test {\ifentrytype{misc}}
+      or
+      test {\ifentrytype{inreference}}
       or
-      test {\iffieldequalstr{entrytype}{inreference}}
+      test {\ifentrytype{reference}}
       or
-      test {\iffieldequalstr{entrytype}{reference}}
+      test {\ifentrytype{mvreference}}
       or
       not togl {cms@nodates}
     }%
@@ -737,28 +960,67 @@ citation style]
   {}}
 
 \newbibmacro*{cite:origyear+labelyear}{%
-  \iftoggle{cms@switchdates}%
-  {\usebibmacro{cite:labelyear+extrayear}}
-  {\iffieldundef{origyear}%
-    {\clearfield{extrayear}\usebibmacro{cite:labelyear+extrayear}}%
-    {\printtext[bibhyperref]{%
-        \usebibmacro{origyear+endyear}}}}}
+  \ifboolexpr{ (
+    test {\ifentrytype{music}}%
+    or
+    test {\ifentrytype{review}}%
+    or
+    test {\ifentrytype{video}}%
+    )
+    and
+    togl {cms@avdate}%
+  }
+  {\usebibmacro{cite:av+labelyear+extrayear}}%
+  {\iftoggle{cms@switchdates}%
+    {\usebibmacro{cite:labelyear+extrayear}}
+    {\iffieldundef{origyear}%
+      {\iftoggle{cms@ordate}% ???
+        {}%
+        {\clearfield{extrayear}}%
+        \usebibmacro{cite:standard+labelyear+extrayear}}%
+      {\iftoggle{cms@ordate}%
+        {\usebibmacro{cite:origfirst+labelyear+extrayear}}%
+        {\printtext[bibhyperref]{%
+            \usebibmacro{origyear+endyear}}}}}}}
 
 \newbibmacro*{cite:bothyear+oldstyle}{%
-  \iftoggle{cms@switchdates}%
-  {\printtext[bibhyperref]{%
-      \bibopenparen%
-      \usebibmacro{cite:labelyear+extrayear}%
-      \bibcloseparen%
-      \addspace\usebibmacro{origyear+endyear}}}%
-  {\iffieldundef{origyear}%
-    {\clearfield{extrayear}\usebibmacro{cite:labelyear+extrayear}}%
+  \ifboolexpr{ (
+    test {\ifentrytype{music}}%
+    or
+    test {\ifentrytype{review}}%
+    or
+    test {\ifentrytype{video}}%
+    )
+    and
+    togl {cms@avdate}%
+  }
+  {\usebibmacro{cite:av+labelyear+extrayear}}%
+  {\iftoggle{cms@switchdates}%
     {\printtext[bibhyperref]{%
         \bibopenparen%
-        \usebibmacro{origyear+endyear}%
+        \usebibmacro{cite:labelyear+extrayear}%
         \bibcloseparen%
-        \clearfield{extrayear}\addspace%
-        \usebibmacro{cite:labelyear+extrayear}}}}}
+        \addspace\usebibmacro{origyear+endyear}}}%
+    {\iffieldundef{origyear}% ???
+      {\iftoggle{cms@ordate}%
+        {}%
+        {\clearfield{extrayear}}%
+        \usebibmacro{cite:standard+labelyear+extrayear}}%
+      {\iftoggle{cms@ordate}% Added test for year field ???
+        {\iffieldundef{year}%
+          {\usebibmacro{cite:origfirst+labelyear+extrayear}}%
+          {\printtext[bibhyperref]{%
+              \bibopenparen%
+              \usebibmacro{cite:origfirst+labelyear+extrayear}%
+              \bibcloseparen%
+              \setunit{\addspace}%\addspace% ???
+              \usebibmacro{year+endyear}}}}%
+        {\printtext[bibhyperref]{%
+            \bibopenparen%
+            \usebibmacro{origyear+endyear}%
+            \bibcloseparen%
+            \clearfield{extrayear}\addspace%
+            \usebibmacro{cite:standard+labelyear+extrayear}}}}}}}
 
 \newbibmacro*{cite:save}{%
   \savefield{entrykey}{\cbx@lastkey}}
@@ -825,13 +1087,45 @@ citation style]
   {}
   {\usebibmacro{postnote}}
 
-\DeclareCiteCommand{\textcite}
+%%% Textcite commands taken verbatim from authoryear-comp.cbx %%% 
+
+\DeclareCiteCommand{\cbx@textcite}
   {\usebibmacro{cite:init}}
   {\usebibmacro{citeindex}%
-    \usebibmacro{textcite}}
+   \usebibmacro{textcite}}
   {}
   {\usebibmacro{textcite:postnote}}
 
+\DeclareCiteCommand{\textcite}[\cbx@textcite@init\cbx@textcite]
+  {\gdef\cbx@savedkeys{}%
+   \citetrackerfalse%
+   \pagetrackerfalse%
+   \DeferNextCitekeyHook%
+   \usebibmacro{cite:init}}
+  {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+     {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}%
+      \global\clearfield{multipostnote}}
+     {}%
+   \xappto\cbx@savedkeys{\thefield{entrykey},}%
+   \iffieldequals{namehash}{\cbx@lasthash}
+     {}
+     {\stepcounter{textcitetotal}%
+      \savefield{namehash}{\cbx@lasthash}}}
+  {}
+  {\protected@xappto\cbx@savedcites{%
+     [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}}
+
+\newrobustcmd{\cbx@textcite@init}[2]{%
+  \setcounter{textcitetotal}{0}%
+  \setcounter{textcitecount}{0}%
+  \def\cbx@savedcites{#1}#2\cbx@savedcites\empty}
+
+\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\textcites}[\cbx@textcites@init\cbx@textcites]{\textcite}{}
+
+\let\cbx@textcites@init\cbx@textcite@init
+\pretocmd{\cbx@textcites@init}{\UseNextMultiCiteHook}{}{}
+
 \DeclareMultiCiteCommand{\cites}{\cite}{\setunit{\multicitedelim}}
 
 \DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}%
@@ -843,11 +1137,9 @@ citation style]
 \DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext]%
    {\footcitetext}{\setunit{\multicitedelim}}
 
-\DeclareMultiCiteCommand{\textcites}{\textcite}{}
-
 \DeclareCiteCommand{\bibxrefcite}
   {\usebibmacro{cite:init}}%\usebibmacro{clearalmostall}} (?)
-  {\usebibmacro{cms-in:}%
+  {\usebibmacro{xref-in:}%
     \blx@ibidreset% For authordate style
     \usebibmacro{cite}}
   {}
@@ -927,16 +1219,28 @@ citation style]
 
 %%%% Field Formats -- Title, Citetitle, Lostitle %%%%
 
-\DeclareFieldFormat[article]{title}{%
+\DeclareFieldFormat{title}{\mkbibemph{\MakeSentenceCase*{#1}}\isdot}
+
+\DeclareFieldFormat{citetitle}{\mkbibemph{\MakeSentenceCase*{#1}}\isdot}
+
+\DeclareFieldFormat{lostitle}{\mkbibemph{\MakeSentenceCase*{#1}}\isdot}
+
+\DeclareFieldFormat
+[article,inbook,incollection,inproceedings,online,patent,thesis,unpublished]
+{title}{%
   \iffieldundef{title}%
   {}%
   {\MakeSentenceCase*{#1}}}
 
-\DeclareFieldAlias[article]{citetitle}[article]{lostitle}
+\DeclareFieldFormat
+[article,inbook,incollection,inproceedings,online,patent,thesis,unpublished]
+{citetitle}{\MakeSentenceCase*{#1}}
 
-\DeclareFieldFormat[article]{lostitle}{\MakeSentenceCase*{#1}}
+\DeclareFieldFormat
+[article,inbook,incollection,inproceedings,online,patent,thesis,unpublished]
+{lostitle}{\MakeSentenceCase*{#1}}
 
-\DeclareFieldFormat[artwork]{title}{%
+\DeclareFieldFormat[artwork,image]{title}{%
   \iffieldundef{entrysubtype}%
   {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
   {\MakeSentenceCase*{#1}\isdot}}
@@ -945,54 +1249,15 @@ citation style]
 
 \DeclareFieldAlias[artwork]{lostitle}[artwork]{title}
 
-\DeclareFieldFormat[book]{title}{%
-  \mkbibemph{\MakeSentenceCase*{#1}}\isdot}
-
-\DeclareFieldAlias[book]{citetitle}[book]{title}
-
-\DeclareFieldAlias[book]{lostitle}[book]{title}
-
-\DeclareFieldAlias[bookinbook]{title}[book]{title}
-
-\DeclareFieldAlias[bookinbook]{citetitle}[book]{title}
-
-\DeclareFieldAlias[bookinbook]{lostitle}[book]{title}
-
-\DeclareFieldAlias[collection]{title}[book]{title}
-
-\DeclareFieldAlias[collection]{citetitle}[book]{title}
-
-\DeclareFieldAlias[collection]{lostitle}[book]{lostitle}
-
 \DeclareFieldFormat[periodical]{title}{\mkbibemph{#1}\isdot}
 
 \DeclareFieldFormat[periodical]{citetitle}{\mkbibemph{#1}\isdot}
 
 \DeclareFieldFormat[periodical]{lostitle}{\mkbibemph{#1}\isdot}
 
-\DeclareFieldAlias[image]{title}[artwork]{title}
-
 \DeclareFieldAlias[image]{citetitle}[artwork]{title}
 
-\DeclareFieldAlias[image]{lostitle}[artwork]{lostitle}
-
-\DeclareFieldAlias[incollection]{title}[article]{title}% Change article?
-
-\DeclareFieldAlias[incollection]{citetitle}[article]{title}
-
-\DeclareFieldAlias[incollection]{lostitle}[article]{lostitle}
-
-\DeclareFieldAlias[inreference]{title}[book]{title}
-
-\DeclareFieldAlias[inreference]{citetitle}[book]{title}
-
-\DeclareFieldAlias[inreference]{lostitle}[book]{lostitle}
-
-\DeclareFieldAlias[reference]{title}[book]{title}
-
-\DeclareFieldAlias[reference]{citetitle}[book]{title}
-
-\DeclareFieldAlias[reference]{lostitle}[book]{lostitle}
+\DeclareFieldAlias[image]{lostitle}[artwork]{title}
 
 \DeclareFieldFormat[letter]{title}{#1\isdot}
 
@@ -1000,29 +1265,7 @@ citation style]
 
 \DeclareFieldFormat[letter]{lostitle}{#1\isdot}
 
-\DeclareFieldAlias[inproceedings]{title}[article]{title}% As above
-
-\DeclareFieldAlias[inproceedings]{citetitle}[article]{title}
-
-\DeclareFieldAlias[inproceedings]{lostitle}[article]{lostitle}
-
-\DeclareFieldAlias[thesis]{title}[article]{title}
-
-\DeclareFieldAlias[thesis]{citetitle}[article]{title}
-
-\DeclareFieldAlias[thesis]{lostitle}[article]{lostitle}
-
-\DeclareFieldAlias[patent]{title}[article]{lostitle}% 16th ed.
-
-\DeclareFieldAlias[patent]{citetitle}[article]{title}
-
-\DeclareFieldAlias[patent]{lostitle}[article]{lostitle}
-
-\DeclareFieldAlias[unpublished]{title}[article]{title}
-
-\DeclareFieldAlias[unpublished]{citetitle}[article]{citetitle}
-
-\DeclareFieldAlias[unpublished]{lostitle}[article]{lostitle}
+\DeclareFieldFormat{prenote}{\ifcapital{\MakeCapital{#1}}{#1}}
 
 \DeclareFieldFormat{postnote}{% Removed \isdots -- required
   \iffieldundef{pagination}%    elsewhere also?
@@ -1048,18 +1291,12 @@ citation style]
     {\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}{%
+\DeclareFieldFormat[suppbook,suppcollection]{title}{%
   \mkbibemph{\MakeSentenceCase*{#1}}\isdot}
 
 \DeclareFieldAlias[suppbook]{citetitle}[suppbook]{lostitle}
 
-\DeclareFieldFormat[suppbook]{lostitle}{%
+\DeclareFieldFormat[suppbook,suppcollection]{lostitle}{%
   \usebibmacro{inforaft}%
   \addspace%
   \mkbibemph{\MakeSentenceCase*{#1}}\isdot}
@@ -1080,30 +1317,8 @@ citation style]
       #1}%
     {\printfield{nameaddon}\addspace #1}}}
 
-\DeclareFieldAlias[suppcollection]{title}[suppbook]{title}
-
 \DeclareFieldAlias[suppcollection]{citetitle}[suppbook]{lostitle}
 
-\DeclareFieldAlias[suppcollection]{lostitle}[suppbook]{lostitle}
-
-\DeclareFieldAlias[booklet]{title}[book]{title}
-
-\DeclareFieldAlias[booklet]{citetitle}[book]{citetitle}
-
-\DeclareFieldAlias[booklet]{lostitle}[book]{lostitle}
-
-\DeclareFieldAlias[manual]{title}[book]{title}
-
-\DeclareFieldAlias[manual]{citetitle}[book]{citetitle}
-
-\DeclareFieldAlias[manual]{lostitle}[book]{lostitle}
-
-\DeclareFieldAlias[report]{title}[book]{title}
-
-\DeclareFieldAlias[report]{citetitle}[book]{citetitle}
-
-\DeclareFieldAlias[report]{lostitle}[book]{lostitle}
-
 \DeclareFieldFormat[misc]{title}{%
   \iffieldundef{entrysubtype}%
   {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
@@ -1113,7 +1328,7 @@ citation style]
 
 \DeclareFieldAlias[misc]{lostitle}[misc]{title}
 
-\DeclareFieldFormat[review]{title}{%
+\DeclareFieldFormat[review,suppperiodical]{title}{%
   \ifcapital{\MakeCapital{#1\isdot}}%
   {#1\isdot}}
 
@@ -1121,23 +1336,15 @@ citation style]
 
 \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}{%
+\DeclareFieldFormat[audio,music,video]{title}{%
   \iffieldundef{booktitle}%
   {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
   {\MakeSentenceCase*{#1}\isdot}}
@@ -1146,14 +1353,10 @@ citation style]
 
 \DeclareFieldAlias[video]{lostitle}[video]{title}
 
-\DeclareFieldAlias[music]{title}[video]{title}
-
 \DeclareFieldAlias[music]{citetitle}[video]{title}
 
 \DeclareFieldAlias[music]{lostitle}[video]{title}
 
-\DeclareFieldAlias[audio]{title}[video]{title}
-
 \DeclareFieldAlias[audio]{citetitle}[video]{title}
 
 \DeclareFieldAlias[audio]{lostitle}[video]{title}
@@ -1167,36 +1370,20 @@ citation style]
 \DeclareFieldFormat{note}{%
   \ifcapital{\MakeCapital{#1}}{#1}}%
 
-\DeclareFieldFormat[suppbook]{type}{%
+\DeclareFieldFormat
+[audio,manual,music,patent,report,suppbook,suppcollection,video]
+{type}{%
   \ifbibstring{#1}%
   {\bibstring{#1}}%
   {\ifcapital%
     {\MakeCapital{#1}}%
     {#1}}}
 
-\DeclareFieldFormat[artwork]{type}{%
+\DeclareFieldFormat[artwork,image]{type}{%
   \ifcapital%
   {\MakeCapital{#1}}%
   {#1}}
 
-\DeclareFieldAlias[patent]{type}[suppbook]{type}
-
-\DeclareFieldAlias[manual]{type}[suppbook]{type}
-
-\DeclareFieldAlias[thesis]{type}[suppbook]{type}
-
-\DeclareFieldAlias[report]{type}[suppbook]{type}
-
-\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}{%
@@ -1205,6 +1392,26 @@ citation style]
     {\href{http://dx.doi.org/#1}{\nolinkurl{#1}}}
     {\nolinkurl{#1}}}
 
+\DeclareFieldFormat[music]{date}{% Generalize userd ???
+  \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{urlyear}%
+  \OR\NOT\iffieldundef{eventyear}\OR\NOT\iffieldundef{origyear}%
+  \OR\NOT\iffieldundef{urlmonth}\OR\NOT\iffieldundef{eventmonth}%
+  \OR\NOT\iffieldundef{origmonth}}%
+  {#1}%
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat[video]{date}{% Generalize userd ???
+  \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{urlyear}%
+    \OR\NOT\iffieldundef{eventyear}\OR\NOT\iffieldundef{urlmonth}%
+    \OR\NOT\iffieldundef{eventmonth}}%
+  {#1}%
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat{date}{% Generalize userd ???
+  \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{urlyear}}%
+  {#1}%
+  {\printfield{userd}\addspace #1}}
+
 \DeclareFieldFormat{urldate}{% 16th ed.
   \iffieldundef{userd}%
   {\bibstring{urlseen}\space #1}%
@@ -1251,7 +1458,7 @@ citation style]
 
 \DeclareFieldFormat{edition}{% New in 0.8
   \ifinteger{#1}
-  {\mkbibordinal{#1}~\bibstring{edition}}%
+  {\mkbibordedition{#1}~\bibstring{edition}}%
   {\ifcapital
     {\MakeCapital{#1\isdot}}%
     {#1\isdot}}}
@@ -1269,7 +1476,7 @@ citation style]
 
 \DeclareFieldFormat{jourser}{%
   \ifinteger{#1}%
-  {\mkbibordinal{#1}%
+  {\mkbibordseries{#1}%
     \addnbspace%
     \bibstring{jourser}}%
   {\ifbibstring{#1}{\bibstring{#1}}{#1}}}
@@ -1296,7 +1503,10 @@ citation style]
 
 \DeclareFieldFormat{annotation}{\par\nobreak \vskip \bibitemsep #1}
 
-\DeclareFieldFormat{part}{\addcomma\bibstring{partvolume}~#1}
+\DeclareFieldFormat{part}{%
+  \ifnumerals{#1}%
+  {\addcomma\addspace\bibstring{partvolume}~#1}%
+  {\addcomma\addspace\ifcapital{\MakeCapital{#1}}{#1}}}
 
 \DeclareFieldAlias[review]{volume}[article]{volume}
 
@@ -1311,6 +1521,9 @@ citation style]
 
 \renewcommand*{\multicitedelim}{\addsemicolon\space}
 
+\renewcommand*{\iffinalcitedelim}{%
+  \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}
+
 \renewcommand*{\nameyeardelim}{%
   \iffieldundef{origyear}% Is this test correct?
   {\iffieldundef{year}%
@@ -1326,10 +1539,12 @@ citation style]
 
 \newcommand{\classicpunct}{%
   \ifthenelse{\iffieldequalstr{entrysubtype}{classical}\OR%
-    \iffieldequalstr{entrytype}{letter}}%
+    \ifentrytype{letter}}%
   {\setunit*{\addspace}}%
   {\setunit*{\addcomma\addspace}}}
 
+\newcommand{\postvolpunct}{\addcolon}%
+
 \newcommand{\parttrans}{%
   {\bibstring{bytranslator}\space}}%
 
@@ -1375,7 +1590,10 @@ citation style]
 
 \renewcommand*{\postnotedelim}{%
   \iftoggle{cms@inlineibid}%
-  {\togglefalse{cms@inlineibid}}%
+  {\togglefalse{cms@inlineibid}%
+    \iffieldundef{prenote}% Bug fix
+    {}%
+    {\addspace}}%
   {\iffieldequalstr{entrysubtype}{classical}% For Notes+Bib, too?
     {\NumCheckSetup{\DeclareNumChars*{abcdeABCDE}}%
       \iffieldpages{postnote}%
@@ -1480,7 +1698,7 @@ citation style]
     \iffieldundef{maintitle}\AND\iffieldundef{issuetitle}\)%
     \OR\iffieldsequal{booktitle}{title}%  Changed these for crossrefed
     \OR\iffieldsequal{maintitle}{title}}% entries.  Create problems?
-  {\iffieldequalstr{entrytype}{video}%
+  {\ifentrytype{video}%
     {\newcunit\newblock}%
     {\newunit\newblock}}%
   {\newcunit\newblock}}
@@ -1769,11 +1987,10 @@ citation style]
   {\bibstring{in}%
     \setunit{\addspace}}}
 
-\newbibmacro*{alt-in:}{%
-  \iffieldundef{booktitle}%
-  {}
-  {\bibstring{in}%
-    \setunit{\addspace}}}
+\newbibmacro*{xref-in:}{%
+  \iffieldundef{volume}{}{\savefield{volume}{\cbx@incollvol}}%
+  \iffieldundef{part}{}{\savefield{part}{\cbx@incollpart}}%
+  \usebibmacro{cms-in:}}
 
 \newbibmacro*{chapincoll}{%
   \iffieldundef{chapter}%
@@ -1782,7 +1999,7 @@ citation style]
 
 \newbibmacro*{chapinscore}{%
   \iffieldundef{chapter}%
-  {\ifthenelse{\iffieldequalstr{entrytype}{music}%
+  {\ifthenelse{\ifentrytype{music}%
       \AND\NOT\iffieldundef{booktitle}}%
     {\bibstring{on}\setunit{\addspace}}%
     {}}%
@@ -1860,9 +2077,9 @@ citation style]
 \newbibmacro*{issuetitle}{%
   \iffieldundef{issuetitle}%
   {}
-  {\ifthenelse{\iffieldequalstr{entrytype}{article}\OR%
-      \iffieldequalstr{entrytype}{review}\OR%
-      \iffieldequalstr{entrytype}{suppperiodical}}% This test is for
+  {\ifthenelse{\ifentrytype{article}\OR%
+      \ifentrytype{review}\OR%
+      \ifentrytype{suppperiodical}}% This test is for
     {\usebibmacro{cms-in:}}% periodical entries
     {}%
     \printtext{%
@@ -1870,16 +2087,6 @@ citation style]
       \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}%
@@ -2041,32 +2248,6 @@ citation style]
         \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}%
@@ -2153,52 +2334,6 @@ citation style]
   \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}%
   {}%
@@ -2318,9 +2453,13 @@ citation style]
   \clearname{namea}%
   \clearname{nameb}%
   \clearfield{nameaddon}%
-  \clearfield{title}%
-  \clearfield{subtitle}%
-  \clearfield{titleaddon}%
+  \ifthenelse{\ifentrytype{periodical}\OR\ifentrytype{mvbook}\OR%
+    \ifentrytype{mvcollection}\OR\ifentrytype{mvproceedings}\OR%
+    \ifentrytype{mvreference}}%
+  {}%
+  {\clearfield{title}%
+    \clearfield{subtitle}%
+    \clearfield{titleaddon}}%
   \clearfield{reprinttitle}%
   \clearfield{usere}%
   \clearlist{language}%
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 6d3cfe411a8..c60c053a134 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
@@ -1,10 +1,10 @@
-% $Id: chicago-authordate.bbx,v 0.8.1.29 2013/03/13 19:05:02 dfussner Exp $
+% $Id: chicago-authordate.bbx,v 0.8.1.49 2013/10/29 14:04:23 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}[2013/03/12 v 2.5 biblatex
+\ProvidesFile{chicago-authordate.bbx}[2013/10/29 v 2.8 biblatex
 bibliography style]
 
 %%%% Initialize and format bibliography and los %%%%
@@ -222,10 +222,10 @@ bibliography style]
           \savefield{fullhash}{\bbx@lasthash}}}}}}
 
 \newbibmacro*{moreauthor}{%
-  \ifnameundef{author}
-  {\usebibmacro{pickeditor}}
-  {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
-      \iffirstonpage}
+  \ifnameundef{author}%
+  {\usebibmacro{pickeditor}}%
+  {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
+      \iffirstonpage}%
     {\iffieldundef{nameaddon}%
       {\bibnamedash\addperiod\addspace}%
       {\bibnamedash\addspace}}%
@@ -352,10 +352,10 @@ bibliography style]
       \finentry}%
     {\ifnameundef{labelname}
       {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT%
-          \iffieldequalstr{entrytype}{periodical}}%
+          \ifentrytype{periodical}}%
         {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}%
             \newcunit}}%
-        {\iffieldequalstr{entrytype}{manual}%
+        {\ifentrytype{manual}%
           {\printtext[bibhyperref]{\printlist{organization}\newcunit}}%
           {}}}
       {\usebibmacro{author/editor}%
@@ -379,7 +379,6 @@ bibliography style]
   \usebibmacro{part+editor+translator}%
   \newunit\newblock%
   \usebibmacro{bibreprint}%
-%  \newunit\newblock%
   \usebibmacro{issuetitle}%
   \setunit*{\addcomma\addspace}%
   \usebibmacro{byeditor+others}%
@@ -421,7 +420,6 @@ bibliography style]
   \usebibmacro{part+editor+translator}%
   \newunit\newblock%
   \usebibmacro{bibreprint}%
-%  \newunit\newblock
   \usebibmacro{issuetitle}%
   \setunit*{\addcomma\addspace}%
   \usebibmacro{byeditor+others}%
@@ -464,7 +462,6 @@ bibliography style]
   \usebibmacro{byeditor+others}%
   \newunit\newblock
   \usebibmacro{bibreprint}%
-%  \newunit\newblock
   \printfield{howpublished}%
   \newunit\newblock
   \printfield{type}%
@@ -518,7 +515,7 @@ bibliography style]
   \newunit% ??? Editorpunct maybe not right here?
   \iffieldundef{maintitle}
   {}
-  {\iffieldundef{volume}
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
     {\usebibmacro{cms-in:}%
       \printtext{%
         \printfield{maintitle}%
@@ -590,7 +587,17 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{part+editor+translator}%
   \newunit\newblock
-  \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bookcrossref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bookcrossref}%
+    }%
+  {\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
   \newcunit
   \iffieldundef{edition}%
   {}%
@@ -612,7 +619,6 @@ bibliography style]
   \printfield{note}%
   \newunit\newblock
   \usebibmacro{bibreprint}%
-%  \setunit*{\addcomma\addspace}\newblock
   \usebibmacro{publ+loc+year}%
   \newcunit\newblock
   \printlist[][-\value{listtotal}]{lista}%
@@ -630,7 +636,15 @@ bibliography style]
   \usebibmacro{pageref}%
   \newunit\newblock
   \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
+  \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{bookinbook}{%
   \usebibmacro{bibindex}%
@@ -654,8 +668,17 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{part+editor+translator}%
   \setunit*{\addperiod\addspace}%
-  \usebibmacro{cms-in:}%
-  \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bookcrossref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bookcrossref}%
+    }%
+  {\usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
   \iffieldundef{edition}%
   {}%
@@ -676,7 +699,6 @@ bibliography style]
   \printfield{note}%
   \newunit\newblock
   \usebibmacro{bibreprint}%
-%  \newunit\newblock
   \usebibmacro{publ+loc+year}%
   \newunit\newblock
   \usebibmacro{pubstate}%
@@ -692,7 +714,15 @@ bibliography style]
   \usebibmacro{pageref}%
   \newunit\newblock
   \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
+  \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{booklet}{%
   \usebibmacro{bibindex}%
@@ -711,7 +741,6 @@ bibliography style]
   \printfield{note}%
   \newunit\newblock
   \usebibmacro{bibreprint}%
-%  \newunit\newblock
   \usebibmacro{howpubl+loc+year}%
   \newunit\newblock
   \usebibmacro{chap+pag}%
@@ -739,7 +768,17 @@ bibliography style]
   \newunit\newblock
   \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
   \newunit\newblock
-  \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bookcrossref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bookcrossref}%
+    }%
+  {\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
   \usebibmacro{editorpunct}%
   \iffieldundef{edition}%
   {}%
@@ -756,7 +795,6 @@ bibliography style]
   \printfield{note}%
   \newunit\newblock
   \usebibmacro{bibreprint}%
-%  \newunit\newblock
   \usebibmacro{publ+loc+year}%
   \newunit\newblock
   \usebibmacro{pubstate}%
@@ -772,7 +810,15 @@ bibliography style]
   \usebibmacro{pageref}%
   \newunit\newblock
   \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
+  \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{customc}{%
   \usebibmacro{bibindex}%
@@ -802,7 +848,6 @@ bibliography style]
   \usebibmacro{byeditor+others}%
   \newunit\newblock
   \usebibmacro{bibreprint}%
-%  \newunit\newblock
   \printfield{howpublished}%
   \newunit\newblock
   \printfield{type}%
@@ -841,9 +886,18 @@ bibliography style]
   \usebibmacro{byauthor}%
   \setunit{\addperiod\addspace}%
   \usebibmacro{part+editor+translator}%
-  \setunit{\addperiod\addspace}%
+  \ifboolexpr{
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@crossref}%
+  }
+  {\ifboolexpr{
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@crossref}%
+    }
+  {\setunit{\addperiod\addspace}%
   \usebibmacro{chapincoll}%
-  \usebibmacro{cms-in:}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
   \iffieldundef{edition}%
@@ -862,7 +916,6 @@ bibliography style]
   \printfield{note}%
   \newunit\newblock
   \usebibmacro{bibreprint}%
-%  \newunit\newblock
   \usebibmacro{publ+loc+year}%
   \newunit\newblock
   \usebibmacro{pubstate}%
@@ -879,6 +932,14 @@ bibliography style]
   \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{incollection}{%
   \usebibmacro{bibindex}%
@@ -895,11 +956,18 @@ bibliography style]
   \usebibmacro{byauthor}%
   \setunit{\addperiod\addspace}%
   \usebibmacro{part+editor+translator}%
-  \iffieldundef{crossref}%
-  {\iffieldundef{xref}%
+  \ifboolexpr{
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@crossref}%
+  }
+  {\ifboolexpr{
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@crossref}%
+    }
   {\setunit{\addperiod\addspace}% Moved here.
   \usebibmacro{chapincoll}%
-  \usebibmacro{cms-in:}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
   \iffieldundef{edition}%
@@ -918,7 +986,6 @@ bibliography style]
   \printfield{note}%
   \newunit\newblock
   \usebibmacro{bibreprint}%
-%  \newunit\newblock
   \usebibmacro{publ+loc+year}%
   \newunit\newblock
   \usebibmacro{pubstate}%
@@ -959,11 +1026,18 @@ bibliography style]
   \usebibmacro{byauthor}%
   \setunit{\addperiod\addspace}%
   \usebibmacro{part+editor+translator}%
-  \iffieldundef{crossref}%
-  {\iffieldundef{xref}%
+  \ifboolexpr{
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@crossref}%
+  }
+  {\ifboolexpr{
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@crossref}%
+    }
   {\setunit{\addperiod\addspace}%
     \usebibmacro{chapincoll}%
-    \usebibmacro{cms-in:}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit\newblock
   \usebibmacro{byeditor+others}%
@@ -975,7 +1049,6 @@ bibliography style]
   \printfield{note}%
   \newunit\newblock
   \usebibmacro{bibreprint}%
-%  \newunit\newblock
   \usebibmacro{org+publ+loc+year}%
   \newunit\newblock
   \usebibmacro{pubstate}%
@@ -1015,7 +1088,6 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{part+editor+translator}%
   \setunit*{\addperiod\addspace}% need asterisk?
-  \usebibmacro{alt-in:}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
   \iffieldundef{edition}%
@@ -1037,7 +1109,6 @@ bibliography style]
   \printfield{note}%
   \newunit\newblock
   \usebibmacro{bibreprint}%
-%  \newunit\newblock
   \usebibmacro{publ+loc+year}%
   \newcunit\newblock
   \printlist[][-\value{listtotal}]{lista}%
@@ -1084,10 +1155,17 @@ bibliography style]
   \newunit\newblock%\bibsentence
   \usebibmacro{part+editor+translator}%
   \setunit*{\addperiod\addspace}%
-  \iffieldundef{crossref}%
-  {\iffieldundef{xref}%
+  \ifboolexpr{
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@crossref}%
+  }
+  {\ifboolexpr{
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@crossref}%
+    }
   {\usebibmacro{chapincoll}%
-  \usebibmacro{cms-in:}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
   \iffieldundef{edition}%
@@ -1104,7 +1182,6 @@ bibliography style]
   \printfield{note}%
   \newunit\newblock
   \usebibmacro{bibreprint}%
-%  \newunit\newblock
   \usebibmacro{publ+loc+year}%
   \newunit\newblock
   \usebibmacro{pubstate}%
@@ -1157,7 +1234,6 @@ bibliography style]
   \printfield{note}%
   \newunit\newblock%
   \usebibmacro{bibreprint}%
-%  \newunit\newblock
   \usebibmacro{org+publ+loc+year}%
   \newunit\newblock
   \usebibmacro{pubstate}%
@@ -1204,7 +1280,6 @@ bibliography style]
   \usebibmacro{byeditor+others}%
   \newunit\newblock
   \usebibmacro{bibreprint}%
-%  \newunit\newblock
   \printfield{howpublished}%
   \newunit\newblock
   \printfield{type}%
@@ -1264,7 +1339,7 @@ bibliography style]
   \newunit% ??? Editorpunct maybe not right here?
   \iffieldundef{maintitle}
   {}
-  {\iffieldundef{volume}
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
     {\usebibmacro{cms-in:}%
       \printtext{%
         \printfield{maintitle}%
@@ -1321,6 +1396,14 @@ bibliography style]
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
+\DeclareBibliographyAlias{mvbook}{book}
+
+\DeclareBibliographyAlias{mvcollection}{collection}
+
+\DeclareBibliographyAlias{mvproceedings}{proceedings}
+
+\DeclareBibliographyAlias{mvreference}{reference}
+
 \DeclareBibliographyDriver{online}{%
   \usebibmacro{bibindex}%
   \usebibmacro{shorthand:author}%
@@ -1336,7 +1419,6 @@ bibliography style]
   \usebibmacro{byauthor}%
   \newunit\newblock
   \usebibmacro{bibreprint}%
-%  \newunit\newblock
   \printlist{organization}% 16th ed.
   \newunit\newblock
   \printfield{note}%
@@ -1379,7 +1461,6 @@ bibliography style]
   \printfield{note}%
   \setunit{\addperiod\addspace}%
   \usebibmacro{bibreprint}%
-%  \newunit\newblock
   \printfield{type}%
   \setunit{\addspace}%
   \printfield{number}%
@@ -1446,7 +1527,6 @@ bibliography style]
   \usebibmacro{byeditor+others}%
   \newunit\newblock
   \usebibmacro{bibreprint}%
-%  \newunit\newblock
   \printfield{note}%
   \setunit*{\addcomma\addspace}\newblock%
   \usebibmacro{periodical+date+issue}%
@@ -1494,7 +1574,6 @@ bibliography style]
   \usebibmacro{byeditor+others}%
   \newunit\newblock
   \usebibmacro{bibreprint}%
-%  \newunit\newblock
   \printfield{note}%
   \setunit*{\addcomma\addspace}\newblock% (changed for 0.7)??
   \usebibmacro{periodical+issue+year+pages}%
@@ -1526,7 +1605,17 @@ bibliography style]
   \newunit\newblock
   \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
   \newunit\newblock
-  \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bookcrossref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bookcrossref}%
+    }%
+  {\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
   \newunit\newblock
   \usebibmacro{volume+or+volumes}%
   \newunit\newblock
@@ -1535,7 +1624,6 @@ bibliography style]
   \printfield{note}%
   \newunit\newblock
   \usebibmacro{bibreprint}%
-%  \newunit\newblock
   \usebibmacro{org+publ+loc+year}%
   \newunit\newblock
   \usebibmacro{pubstate}%
@@ -1551,7 +1639,15 @@ bibliography style]
   \usebibmacro{pageref}%
   \newunit\newblock
   \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
+  \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{reference}{%
   \usebibmacro{bibindex}%
@@ -1567,7 +1663,6 @@ bibliography style]
   \newunit\newblock
   \usebibmacro{part+editor+translator}%
   \setunit*{\addperiod\addspace}% need asterisk?
-  \usebibmacro{alt-in:}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
   \iffieldundef{edition}%
@@ -1589,7 +1684,6 @@ bibliography style]
   \printfield{note}%
   \newunit\newblock
   \usebibmacro{bibreprint}%
-%  \newunit\newblock
   \usebibmacro{publ+loc+year}%
   \newunit\newblock
   \usebibmacro{pubstate}%
@@ -1630,7 +1724,6 @@ bibliography style]
   \printfield{note}%
   \newunit\newblock
   \usebibmacro{bibreprint}%
-%  \newunit\newblock
   \usebibmacro{inst+loc+year}%
   \newunit\newblock
   \usebibmacro{pubstate}%
@@ -1679,7 +1772,6 @@ bibliography style]
   \usebibmacro{part+editor+translator}%
   \newunit\newblock%
   \usebibmacro{bibreprint}%
-%  \newunit\newblock
   \usebibmacro{issuetitle}%
   \setunit*{\addcomma\addspace}%
   \usebibmacro{byeditor+others}%
@@ -1756,7 +1848,6 @@ bibliography style]
   \printfield{note}%
   \newunit\newblock
   \usebibmacro{bibreprint}%
-%  \newunit\newblock
   \usebibmacro{publ+loc+year}%
   \newunit\newblock
   \usebibmacro{pubstate}%
@@ -1795,7 +1886,6 @@ bibliography style]
   \printfield{note}%
   \setunit{\addperiod\addspace}\newblock%
   \usebibmacro{bibreprint}%
-%  \newunit\newblock
   \usebibmacro{type+inst+year}%
   \newunit\newblock
   \usebibmacro{pubstate}%
@@ -1823,8 +1913,9 @@ bibliography style]
   \newunit%usebibmacro{byauthorpunct}% Why does this work?  No idea.
   \usebibmacro{byauthor}% Same in thesis type, as well. 16th ed.
   \setunit{\addperiod\addspace}%
+  \usebibmacro{byeditor+others}% Fix bug ???
+  \newunit\newblock
   \usebibmacro{bibreprint}%
-%  \newunit\newblock
   \printfield{howpublished}%
   \setunit*{\addcomma\addspace}\newblock%
   \printfield{note}%
@@ -1889,7 +1980,7 @@ bibliography style]
   \newunit% ??? Editorpunct maybe not right here?
   \iffieldundef{maintitle}
   {}
-  {\iffieldundef{volume}
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
     {\usebibmacro{cms-in:}%
       \printtext{%
         \printfield{maintitle}%
@@ -1980,34 +2071,39 @@ bibliography style]
 
 \newbibmacro*{shorthand:label}{% Test this
   \ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT%
-    \iffieldequalstr{entrytype}{periodical}}% Simplifies .bib creation
+    \ifentrytype{periodical}}% Simplifies .bib creation
     {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}}}%
-    {\iffieldequalstr{entrytype}{manual}%
+    {\ifentrytype{manual}%
       {\printtext[bibhyperref]{\printlist{organization}}}%
       {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}}}%
 
 \newbibmacro*{labelyear+extrayear}{%
   \ifboolexpr{ (
-    test {\iffieldequalstr{entrytype}{music}}%
+    test {\ifentrytype{music}}%
     or
-    test {\iffieldequalstr{entrytype}{review}}%
+    test {\ifentrytype{review}}%
     or
-    test {\iffieldequalstr{entrytype}{video}}%
+    test {\ifentrytype{video}}%
     )
     and
-    togl {cms@avdate}
+    togl {cms@avdate}%
   }%
   {\usebibmacro{av+labelyear+extrayear}}%
-  {\usebibmacro{standard+labelyear+extrayear}}}
+  {\iftoggle{cms@ordate}%
+    {\usebibmacro{origfirst+labelyear+extrayear}}%
+    {\usebibmacro{standard+labelyear+extrayear}}}}
 
 \newbibmacro*{standard+labelyear+extrayear}{%
-  \iffieldundef{labelyear}%
+  \ifthenelse{\iffieldundef{labelyear}\OR%
+    \iffieldequalstr{labelyear}{nodate}}% or new declaration ???
     {\ifboolexpr{
-        test {\iffieldequalstr{entrytype}{misc}}
+        test {\ifentrytype{misc}}
+        or
+        test {\ifentrytype{inreference}}
         or
-        test {\iffieldequalstr{entrytype}{inreference}}
+        test {\ifentrytype{reference}}
         or
-        test {\iffieldequalstr{entrytype}{reference}}
+        test {\ifentrytype{mvreference}}
         or
         not togl {cms@nodates}}%
       {}%
@@ -2057,7 +2153,7 @@ bibliography style]
               \clearfield{eventyear}}%
             {\iffieldundef{eventmonth}%
               {\clearfield{eventyear}}%
-              {\iffieldsequal{eventyear}{evendendyear}%
+              {\iffieldsequal{eventyear}{eventendyear}%
                 {\clearfield{eventyear}\clearfield{eventendyear}}%
                 {}}}}}}%
       {\printfield{labelyear}%
@@ -2076,14 +2172,96 @@ bibliography style]
               {\clearfield{year}\clearfield{endyear}}%
               {}}}}}}}
 
+\newbibmacro*{origfirst+labelyear+extrayear}{%
+  \ifthenelse{\iffieldundef{labelyear}\OR%
+    \iffieldequalstr{labelyear}{nodate}}%
+    {\ifboolexpr{
+        test {\ifentrytype{misc}}
+        or
+        test {\ifentrytype{inreference}}
+        or
+        test {\ifentrytype{reference}}
+        or
+        test {\ifentrytype{mvreference}}
+        or
+        not togl {cms@nodates}}%
+      {}%
+      {\bibstring{nodate}}}%
+    {\iffieldundef{origyear}%
+      {\iffieldundef{year}
+        {\iffieldundef{eventyear}%
+          {\printfield{labelyear}%
+            \iffieldundef{extrayear}%
+            {}%
+            {\setunit*{}%
+              \printfield{extrayear}}%
+            \iffieldundef{urlendyear}%
+            {\clearfield{urlyear}}%
+            {\iffieldequalstr{urlendyear}{}%
+              {\mbox{\bibdatedash}%
+                \clearfield{urlyear}}%
+              {\iffieldundef{urlmonth}%
+                {\clearfield{urlyear}}%
+                {\iffieldsequal{urlyear}{urlendyear}%
+                  {\clearfield{urlyear}\clearfield{urlendyear}}%
+                  {}}}}}%
+          {\printfield{labelyear}%
+            \iffieldundef{extrayear}%
+            {}%
+            {\setunit*{}%
+              \printfield{extrayear}}%
+            \iffieldundef{eventendyear}%
+            {\clearfield{eventyear}}%
+            {\iffieldequalstr{eventendyear}{}%
+              {\mbox{\bibdatedash}%
+                \clearfield{eventyear}}%
+              {\iffieldundef{eventmonth}%
+                {\clearfield{eventyear}}%
+                {\iffieldsequal{eventyear}{eventendyear}%
+                  {\clearfield{eventyear}\clearfield{eventendyear}}%
+                  {}}}}}}%
+        {\printfield{labelyear}%
+          \iffieldundef{extrayear}%
+          {}%
+          {\setunit*{}%
+            \printfield{extrayear}}%
+          \iffieldundef{endyear}%
+          {\clearfield{year}}%
+          {\iffieldequalstr{endyear}{}%
+            {\mbox{\bibdatedash}%
+              \clearfield{year}}%
+            {\iffieldundef{month}%
+              {\clearfield{year}}%
+              {\iffieldsequal{year}{endyear}%
+                {\clearfield{year}\clearfield{endyear}}%
+                {}}}}}}%
+      {\printfield{labelyear}%
+        \iffieldundef{extrayear}%
+        {}%
+        {\setunit*{}%
+          \printfield{extrayear}}%
+        \iffieldundef{origendyear}% DATE FIX
+        {\clearfield{origyear}}%
+        {\iffieldequalstr{origendyear}{}%
+          {\mbox{\bibdatedash}%
+            \clearfield{origyear}}%
+          {\iffieldundef{origmonth}%
+            {\clearfield{origyear}}%
+            {\iffieldsequal{origyear}{origendyear}%
+              {\clearfield{origyear}\clearfield{origendyear}}%
+              {}}}}}}}
+
 \newbibmacro*{av+labelyear+extrayear}{%
-  \iffieldundef{labelyear}%
+  \ifthenelse{\iffieldundef{labelyear}\OR%
+    \iffieldequalstr{labelyear}{nodate}}%
     {\ifboolexpr{
-        test {\iffieldequalstr{entrytype}{misc}}
+        test {\ifentrytype{misc}}
+        or
+        test {\ifentrytype{inreference}}
         or
-        test {\iffieldequalstr{entrytype}{inreference}}
+        test {\ifentrytype{reference}}
         or
-        test {\iffieldequalstr{entrytype}{reference}}
+        test {\ifentrytype{mvreference}}
         or
         not togl {cms@nodates}}%
       {}%
@@ -2154,11 +2332,23 @@ bibliography style]
 
 \newbibmacro*{origyear+endyear}{%
   \printfield{origyear}%
-  \iffieldundef{origendyear}%
+  \ifthenelse{\iffieldundef{origendyear}\OR%
+    \iffieldsequal{origyear}{origendyear}}% Same fix as in .lbx
   {}%
   {\iffieldequalstr{origendyear}{}%
     {\mbox{\bibdatedash}}%
-    {\bibdatedash\printfield{origendyear}}}}
+    {\bibdatedash\csuse{mkbibdatelong}{origendyear}{}{}}}}% ???
+
+% \printfield{origendyear}}}} Peculiar bug with this after \bibnamedash
+
+\newbibmacro*{year+endyear}{%
+  \printfield{year}%
+  \ifthenelse{\iffieldundef{endyear}\OR%
+    \iffieldsequal{year}{endyear}}% Same fix as in .lbx
+  {}%
+  {\iffieldequalstr{endyear}{}%
+    {\mbox{\bibdatedash}}%
+    {\bibdatedash\printfield{endyear}}}}
 
 \newbibmacro*{cmsbibsortdate}{% Attempt to solve date-related problems
   \ifboolexpr{%
@@ -2171,7 +2361,7 @@ bibliography style]
     {\ifboolexpr{% Needed for date ranges - video type, esp.
         test {\iffieldundef{endyear}}%
         or
-        not test {\iffieldnum{endyear}}
+        not test {\iffieldnum{endyear}}%
       }%
       {\ifthenelse{\thefield{origyear}>\thefield{year}}%
         {\toggletrue{cms@switchdates}%
@@ -2181,7 +2371,7 @@ bibliography style]
         {\toggletrue{cms@switchdates}%
           \usebibmacro{cmsbibyear}}%
         {\usebibmacro{cmsbibyear}}}}%
-    {\usebibmacro{cmsbibyear}}}}
+    {\usebibmacro{cmsbibyear}}}}%
 
 \newbibmacro*{cmsbibyear}{%
   \iftoggle{cms@origlabel}%
@@ -2196,34 +2386,71 @@ bibliography style]
   {}}
 
 \newbibmacro*{origyear+labelyear}{%
-  \iftoggle{cms@switchdates}%
-  {\usebibmacro{labelyear+extrayear}%
-    \clearfield{year}}%
-  {\iffieldundef{origyear}
-    {\clearfield{extrayear}\usebibmacro{labelyear+extrayear}}%
-    {\usebibmacro{origyear+endyear}}%
-      \clearfield{origyear}}}
+  \ifboolexpr{ (
+    test {\ifentrytype{music}}%
+    or
+    test {\ifentrytype{review}}%
+    or
+    test {\ifentrytype{video}}%
+    )
+    and
+    togl {cms@avdate}%
+  }
+  {\usebibmacro{av+labelyear+extrayear}}%
+  {\iftoggle{cms@switchdates}%
+    {\usebibmacro{labelyear+extrayear}}%
+    {\iffieldundef{origyear}%
+      {\iftoggle{cms@ordate}% ???
+        {}%
+        {\clearfield{extrayear}}%
+        \usebibmacro{standard+labelyear+extrayear}}%
+      {\iftoggle{cms@ordate}%
+        {\usebibmacro{origfirst+labelyear+extrayear}}%
+        {\usebibmacro{origyear+endyear}%
+          \clearfield{origyear}}}}}}
 
 \newbibmacro*{bothyear+oldstyle}{%
-  \iftoggle{cms@switchdates}%
-  {\printtext{%
-      \bibopenparen%
-      \usebibmacro{labelyear+extrayear}%
-      \bibcloseparen%
-      \setunit{\addspace}\usebibmacro{origyear+endyear}}%
-      \clearfield{year}%
-      \clearfield{origyear}}%
-  {\iffieldundef{origyear}
-    {\clearfield{extrayear}\usebibmacro{labelyear+extrayear}}%
+  \ifboolexpr{ (
+    test {\ifentrytype{music}}%
+    or
+    test {\ifentrytype{review}}%
+    or
+    test {\ifentrytype{video}}%
+    )
+    and
+    togl {cms@avdate}%
+  }
+  {\usebibmacro{av+labelyear+extrayear}}% \clearfield local to \printtext
+  {\iftoggle{cms@switchdates}%
     {\printtext{%
         \bibopenparen%
-        \usebibmacro{origyear+endyear}%
+        \usebibmacro{labelyear+extrayear}%
         \bibcloseparen%
-%        \printfield[parens]{origyear}%
-        \clearfield{extrayear}\setunit*{\addspace}%
-        \usebibmacro{labelyear+extrayear}}%
-      \clearfield{origyear}%
-      \clearfield{year}}}}
+        \setunit{\addspace}\usebibmacro{origyear+endyear}}%
+      \clearfield{year}%
+      \clearfield{origyear}}%
+    {\iffieldundef{origyear}
+      {\iftoggle{cms@ordate}%
+        {}%
+        {\clearfield{extrayear}}%
+        \usebibmacro{standard+labelyear+extrayear}}%
+      {\iftoggle{cms@ordate}% ???
+        {\iffieldundef{year}%
+          {\usebibmacro{origfirst+labelyear+extrayear}}%
+          {\printtext{%
+              \bibopenparen%
+              \usebibmacro{origfirst+labelyear+extrayear}%
+              \bibcloseparen%
+              \setunit*{\addspace}%
+              \usebibmacro{year+endyear}}}}%
+        {\printtext{%
+            \bibopenparen%
+            \usebibmacro{origyear+endyear}%
+            \bibcloseparen%
+            \clearfield{extrayear}\setunit*{\addspace}%
+            \usebibmacro{standard+labelyear+extrayear}}}%
+        \clearfield{origyear}%
+        \clearfield{year}}}}}
 
 \newbibmacro*{pubstate}{%
   \iftoggle{cms@reprint}%
@@ -2241,8 +2468,8 @@ bibliography style]
   {\printfield{pubstate}}}
 
 \newbibmacro*{choosepubstring}{%
-  \ifthenelse{\iffieldequalstr{entrytype}{video}\OR%
-    \iffieldequalstr{entrytype}{music}}%
+  \ifthenelse{\ifentrytype{video}\OR%
+    \ifentrytype{music}}%
   {\bibstring{origreleaseyear}}%
   {\bibstring{origpubyearalt}}}%
 
@@ -2255,19 +2482,24 @@ bibliography style]
       {}}}%
   {}}
 
-\newbibmacro*{volume+pages}{% Volume fix
-  \iffieldundef{maintitle}%
-  {\iffieldundef{volume}%
+\newbibmacro*{volume+pages}{% Volume fix (modified)
+  \ifboolexpr{
+    test {\iffieldundef{maintitle}}%
+    or
+    togl {cms@vol}%
+  }
+  {\global\togglefalse{cms@vol}%
+    \ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
     {\printfield{pages}%
       \newunit%
       \printfield{volumes}}%
     {\iffieldundef{part}%
       {\iffieldundef{pages}%
-        {}%
+        {\printfield{volume}}% Still print this w/o part or pages???
         {\ifthenelse{\iffieldnums{pages}%
-            \AND\iffieldundef{bookpagination}}%
+            \AND\iffieldundef{bookpagination}\AND\iffieldnums{volume}}%
           {\printfield[default]{volume}%
-            \addcolon%
+            \postvolpunct%
             \printfield{pages}}%
           {\printfield{volume}%
             \addcomma\addspace%
@@ -2276,89 +2508,184 @@ bibliography style]
         \printfield{part}%
         \newcunit%
         \printfield{pages}}}}%
-  {\printfield{pages}%
-    \newunit%
-    \printfield{volumes}}}%
+  {\ifboolexpr{
+      togl {cms@hidevolumes}%
+      and
+      (
+      not test {\iffieldundef{volume}}%
+      or
+      not test {\iffieldundef{part}}%
+      )
+    }%
+    {\printfield{pages}}%
+    {\printfield{pages}%
+      \newunit%
+      \printfield{volumes}}}}%
 
 \newbibmacro*{bibpostxref}{% Volume fix
-  \iffieldundef{pages}%
-  {\iffieldundef{volume}%
-    {}%
-    {\iffieldundef{part}%
-      {\newcunit\printfield{volume}}%
-      {\newcunit\printfield{volume}%
-        \printfield{part}}}}%
-  {\iffieldundef{volume}%
-    {\newcunit\printfield{pages}}%
-    {\iffieldundef{part}%
-      {\ifthenelse{\iffieldnums{pages}%
-          \AND\iffieldundef{bookpagination}}%
-        {\newcunit\printfield[default]{volume}%
-          \addcolon%
-          \printfield{pages}}%
-        {\newcunit\printfield{volume}%
-          \addcomma\addspace%
-          \printfield{pages}}}%
-      {\newcunit\printfield{volume}%
-        \printfield{part}%
-        \newcunit%
-        \printfield{pages}}}}}
-
-\newbibmacro*{volume+or+volumes}{% Volume fix
+  \iffieldundef{chapter}%
+  {\iffieldundef{pages}%
+    {\iffieldundef{volume}%
+      {\iffieldundef{part}%
+        {}%
+        {\newcunit\printfield{part}}}%
+      {\ifboolexpr{
+          test {\ifcsdef{cbx@incollvol}}%
+          and
+          test {\iffieldequalcs{volume}{cbx@incollvol}}%
+        }%
+        {\iffieldundef{part}%
+          {}%
+          {\ifboolexpr{
+              test {\ifcsdef{cbx@incollpart}}%
+              and
+              test {\iffieldequalcs{part}{cbx@incollpart}}%
+            }%
+            {}%
+            {\newcunit\printfield{part}}}}%
+        {\iffieldundef{part}%
+          {\newcunit\printfield{volume}}%
+          {\newcunit\printfield{volume}\printfield{part}}}}}%
+    {\iffieldundef{volume}%
+      {\iffieldundef{part}%
+        {\newcunit\printfield{pages}}%
+        {\newcunit\printfield{part}\newcunit\printfield{pages}}}%
+      {\ifboolexpr{
+          test {\ifcsdef{cbx@incollvol}}%
+          and
+          test {\iffieldequalcs{volume}{cbx@incollvol}}%
+        }%
+        {\iffieldundef{part}%
+          {\newcunit\printfield{pages}}%
+          {\ifboolexpr{
+              test {\ifcsdef{cbx@incollpart}}%
+              and
+              test {\iffieldequalcs{part}{cbx@incollpart}}%
+            }%
+            {\newcunit\printfield{pages}}%
+            {\newcunit\printfield{part}\newcunit\printfield{pages}}}}%
+        {\iffieldundef{part}%
+          {\ifthenelse{\iffieldnums{pages}%
+              \AND\iffieldundef{bookpagination}\AND\iffieldnums{volume}}%
+            {\newcunit\printfield[default]{volume}%
+              \postvolpunct%
+              \printfield{pages}}%
+            {\newcunit\printfield{volume}%
+              \addcomma\addspace%
+              \printfield{pages}}}%
+          {\newcunit\printfield{volume}%
+            \printfield{part}%
+            \newcunit%
+            \printfield{pages}}}}}}%
+  {\newcunit\printfield{chapter}}}
+
+\newbibmacro*{volume+or+volumes}{% Volume fix (modified)
   \iffieldundef{maintitle}%
-  {\iffieldundef{volume}%
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
     {\printfield{volumes}}%
     {\printfield{volume}%
       \printfield{part}}}%
-  {\printfield{volumes}}}
+  {\ifboolexpr{
+      togl {cms@hidevolumes}%
+      and
+      (
+      not test {\iffieldundef{volume}}%
+      or
+      not test {\iffieldundef{part}}%
+      )
+    }%
+    {}%
+    {\printfield{volumes}}}}
 
 \newbibmacro*{mtitle+mstitle+vol+part+title+stitle}{%
   \iffieldundef{maintitle}
   {}
-  {\iffieldundef{volume}
-    {\printtext{%
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}% Test ???
+    {\usebibmacro{cms-in:}% Volume-less treatment?
+      \printtext{%
         \printfield{maintitle}%
-      \setunit{\addcolon\addspace}%
-      \printfield[maintitle]{mainsubtitle}}%
-    \newcunit
-    \printfield{maintitleaddon}}
-  {\printfield{volume}%
-    \printfield{part}%
-    \setunit{\addspace}
-    \bibstring{ofseries}%
-    \setunit{\addspace}
+        \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*{btitle+bstitle}{% InIn fix from N&B
+  \iffieldundef{booktitle}
+  {}
+  {\ifthenelse{\ifentrytype{audio}\OR\ifentrytype{music}\OR%
+      \ifentrytype{video}}%
+    {}%
+    {\usebibmacro{cms-in:}}%
     \printtext{%
-      \printfield{maintitle}%
+      \printfield{booktitle}%
       \setunit{\addcolon\addspace}%
-      \printfield[maintitle]{mainsubtitle}}%
+      \printfield[booktitle]{booksubtitle}}%
     \newcunit
-    \printfield{maintitleaddon}}}}
+    \printfield{booktitleaddon}%
+    \setunit*{\addcomma\addspace}}}
 
 \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{%
+  {\ifthenelse{\(\iffieldundef{volume}\AND\iffieldundef{part}\)\OR%
+    \(\iffieldundef{booktitle}\AND\NOT\ifentrytype{bookinbook}\)}%
+    {\usebibmacro{cms-in:}% Volume-less treatment?
+      \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}}}}
+        \setunit{\addcolon\addspace}%
+        \printfield[maintitle]{mainsubtitle}}%
+      \newcunit
+      \printfield{maintitleaddon}%
+      \toggletrue{cms@vol}}
+    {\printfield{volume}%
+      \printfield{part}%
+      \setunit{\addspace}
+      \bibstring{ofseries}%
+      \setunit{\addspace}
+      \printtext{%
+        \printfield{maintitle}%
+        \setunit{\addcolon\addspace}%
+        \printfield[maintitle]{mainsubtitle}}%
+      \newcunit
+      \printfield{maintitleaddon}}}}
+
+\newbibmacro*{cjournal+ser+vol+num}{% Moved to bbx
+  \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*{journal+issue+year+pages}{%
   \iftoggle{cms@numbermonth}{}{\clearfield{month}}%
@@ -2366,9 +2693,9 @@ bibliography style]
   \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.
+  {\iffieldundef{bookpagination}% Removed kludge for French colon spacing?
+    {\setunit{\postvolpunct}}%
+    {\setunit{\addcolon\addspace}}}% This may not be universally correct.
   {\printtext[parens]{%  Perhaps if it's wrong use magazine subtype?
       \iffieldundef{issue}
       {\usebibmacro{date}%
@@ -2385,9 +2712,9 @@ bibliography style]
   \setunit{\addspace}%
   \ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month}
     \AND\iffieldundef{number}}%
-  {\iftoggle{cms@postposit}%
-    {\setunit{\addcolon\addspace}}%
-    {\setunit{\addcolon}}}%
+  {\iffieldundef{bookpagination}% Removed kludge for French ???
+    {\setunit{\postvolpunct}}%
+    {\setunit{\addcolon\addspace}}}%
   {\printtext[parens]{%
       \iffieldundef{issue}
       {\usebibmacro{date}%
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 19742ff22be..08a623d20db 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
@@ -1,10 +1,10 @@
-% $Id: chicago-authordate.cbx,v 0.8.1.32 2013/03/12 12:35:38 dfussner Exp $
+% $Id: chicago-authordate.cbx,v 0.8.1.57 2013/10/29 14:04:11 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}[2013/03/12 v 2.5 biblatex citation style]
+\ProvidesFile{chicago-authordate.cbx}[2013/10/29 v 2.8 biblatex citation style]
 
 %%%% Biblatex initialization + Chicago options + Toggles %%%%
 
@@ -22,6 +22,7 @@
 \providetoggle{cms@los}
 %\providetoggle{cms@oneyear}
 \providetoggle{cms@avdate}
+\providetoggle{cms@ordate}
 \providetoggle{cms@nodates}
 \providetoggle{cms@authorparens}
 
@@ -32,6 +33,7 @@
 \providetoggle{cms@isbn}
 \providetoggle{cms@numbermonth}
 \providetoggle{cms@bookpages}
+\providetoggle{cms@hidevolumes}% Modify Volume fix
 
 \providetoggle{cms@jrcomma}% Comma after Jr./Sr.
 
@@ -41,7 +43,10 @@
 \providetoggle{cms@origpublished}% Keep
 \providetoggle{cms@annotation}% Keep
 \providetoggle{cms@postposit}% Keep
-\providetoggle{cms@fullshhand}
+\providetoggle{cms@fullshhand}%
+\providetoggle{cms@vol}%
+\providetoggle{cms@crossref}%
+\providetoggle{cms@bookcrossref}
 
 \AtEveryCitekey{%
   \iffieldundef{userc}%
@@ -56,18 +61,55 @@
   {\csuse{cms@opt@avdate@#1}}
   {\blx@err@invopt{avdate=#1}{}}}
 \def\cms@opt@avdate@true{%
-  \@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4
-  {\DeclareLabelyear[music,review,video]{\field{eventyear}%
-      \field{origyear} \field{year} \field{urlyear}}}%
+  \@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4/2.5
+  {\@ifpackagelater{biblatex}{2013/03/30}% for biblatex 2.6 ff.
+    {\DeclareLabeldate[music,review,video]{\field{eventyear}%
+        \field{origyear} \field{year} \field{urlyear}}}%
+    {\DeclareLabelyear[music,review,video]{\field{eventyear}%
+        \field{origyear} \field{year} \field{urlyear}}}}%
   {\DeclareLabelyear[music,review,video]{eventyear,origyear,year,urlyear}}%
   \toggletrue{cms@avdate}}%
 \def\cms@opt@avdate@false{%
   \togglefalse{cms@avdate}}
 
-\DeclareBibliographyOption{cmsdate}{% Trying to implement origyear as
-  \ifcsdef{cms@opt@cmsdate@#1}% labelyear. Sorting will be an issue.
-  {\csuse{cms@opt@cmsdate@#1}}
+\DeclareBibliographyOption{cmsdate}[off]{% Trying to implement origyear as
+  \ifcsdef{cms@global@cmsdate@#1}% labelyear. Sorting will be an issue.
+  {\csuse{cms@global@cmsdate@#1}}
   {\blx@err@invopt{cmsdate=#1}{}}}
+\def\cms@global@cmsdate@on{%
+  \toggletrue{cms@origlabel}%
+  \ExecuteBibliographyOptions{cmsorigdate=true}}
+\def\cms@global@cmsdate@new{%
+  \toggletrue{cms@bothlabelnew}%
+  \ExecuteBibliographyOptions{cmsorigdate=true}}
+\def\cms@global@cmsdate@old{%
+  \toggletrue{cms@bothlabelold}%
+  \ExecuteBibliographyOptions{cmsorigdate=true}}
+\def\cms@global@cmsdate@both{%
+  \toggletrue{cms@bothlabelold}%
+  \ExecuteBibliographyOptions{cmsorigdate=true}}
+\def\cms@global@cmsdate@full{}%
+\def\cms@global@cmsdate@off{}
+
+\DeclareBibliographyOption{cmsorigdate}[true]{% ??? Also need new macros
+  \ifcsdef{cms@opt@origdate@#1}% for printing dates.  Worth it ???
+  {\csuse{cms@opt@origdate@#1}}%
+  {\blx@err@invopt{cmsorigdate=#1}{}}}
+\def\cms@opt@origdate@true{%
+  \@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4/2.5
+  {\@ifpackagelater{biblatex}{2013/03/30}% for biblatex 2.6 ff.
+    {\DeclareLabeldate{\field{origyear} \field{year}%
+        \field{eventyear} \field{urlyear}}%
+      \DeclareLabeldate[patent]{\field{year} \field{eventyear}%
+        \field{origyear} \field{urlyear}}}%
+    {\DeclareLabelyear{\field{origyear} \field{year}%
+        \field{eventyear} \field{urlyear}}%
+      \DeclareLabelyear[patent]{\field{year} \field{eventyear}%
+        \field{origyear} \field{urlyear}}}}%
+  {\DeclareLabelyear{origyear,year,eventyear,urlyear}%
+    \DeclareLabelyear[patent]{year,eventyear,origyear,urlyear}}%
+  \global\toggletrue{cms@ordate}}%
+\def\cms@opt@origdate@false{\togglefalse{cms@ordate}}%
 
 \DeclareEntryOption{cmsdate}[off]{% Trying to implement origyear as
   \ifcsdef{cms@opt@cmsdate@#1}% labelyear. Sorting will be an issue.
@@ -122,6 +164,45 @@
 \DeclareBibliographyOption{shorthandfull}[true]{%
   \settoggle{cms@fullshhand}{#1}}
 
+\DeclareBibliographyOption{longcrossref}[false]{%
+  \ifcsdef{cms@opt@lxref@#1}%
+  {\csuse{cms@opt@lxref@#1}}
+  {\blx@err@invopt{longcrossref=#1}{}}}
+\def\cms@opt@lxref@none{%
+  \togglefalse{cms@crossref}%
+  \togglefalse{cms@bookcrossref}}%
+\def\cms@opt@lxref@true{%
+  \toggletrue{cms@crossref}}%
+\def\cms@opt@lxref@false{%
+  \togglefalse{cms@crossref}}%
+\def\cms@opt@lxref@notes{%
+  \togglefalse{cms@crossref}}%
+\def\cms@opt@lxref@bib{%
+  \toggletrue{cms@crossref}}%
+
+\DeclareEntryOption{longcrossref}[false]{%
+  \ifcsdef{cms@opt@doi@#1}%
+  {\csuse{cms@opt@doi@#1}}
+  {\blx@err@invopt{doi=#1}{}}}
+
+\DeclareBibliographyOption{booklongxref}[true]{%
+  \ifcsdef{cms@opt@bklxref@#1}%
+  {\csuse{cms@opt@bklxref@#1}}
+  {\blx@err@invopt{booklongxref=#1}{}}}%
+\def\cms@opt@bklxref@true{%
+  \toggletrue{cms@bookcrossref}}%
+\def\cms@opt@bklxref@false{%
+  \togglefalse{cms@bookcrossref}}%
+\def\cms@opt@bklxref@notes{%
+  \togglefalse{cms@bookcrossref}}%
+\def\cms@opt@bklxref@bib{%
+  \toggletrue{cms@bookcrossref}}%
+
+\DeclareEntryOption{booklongxref}[true]{%
+  \ifcsdef{cms@opt@bklxref@#1}%
+  {\csuse{cms@opt@bklxref@#1}}
+  {\blx@err@invopt{booklongxref=#1}{}}}%
+
 % The field-exclusion options %
 
 \DeclareBibliographyOption{isbn}[true]{%
@@ -151,6 +232,8 @@
   \settoggle{cms@eprint}{#1}%
   \settoggle{cms@numbermonth}{#1}%
   \settoggle{cms@bookpages}{#1}}
+\DeclareBibliographyOption{hidevolumes}[true]{%
+  \settoggle{cms@hidevolumes}{#1}}
 
 \DeclareEntryOption{isbn}[true]{%
   \settoggle{cms@isbn}{#1}}
@@ -172,8 +255,71 @@
   \settoggle{cms@numbermonth}{#1}}
 \DeclareEntryOption{bookpages}[true]{%
   \settoggle{cms@bookpages}{#1}}
+\DeclareEntryOption{hidevolumes}[true]{%
+  \settoggle{cms@hidevolumes}{#1}}
+
+\ExecuteBibliographyOptions{includeall,hidevolumes,booklongxref}%
+
+\@ifpackagelater{biblatex}{2013/03/30}% For biblatex 2.6 ff.
+{\ExecuteBibliographyOptions{labeldate=true}}%
+{\ExecuteBibliographyOptions{labelyear=true}}%
+
+\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}
+}
 
-\ExecuteBibliographyOptions{includeall}%
+\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 %
 
@@ -199,7 +345,9 @@
   }
   \sort{
     \field{sortyear}
+    \field{labelyear}
     \field{year}
+    \field{origyear}
   }
   \sort{
     \field{sorttitle}
@@ -294,8 +442,9 @@
   {\iffieldequalstr{entrysubtype}{classical}% Similar to notes+bib
     {\iffieldundef{shorthand}%
       {\ifthenelse{\ifnameundef{labelname}\OR
-          \iffieldequalstr{entrytype}{inreference}\OR
-          \iffieldequalstr{entrytype}{reference}}% Simplified for CMS
+          \ifentrytype{inreference}\OR
+          \ifentrytype{reference}\OR
+          \ifentrytype{mvreference}}% Simplified for CMS
         {\usebibmacro{cite:label}%
           \setunit{\addspace}%
           \usebibmacro{cite:reinit}}
@@ -307,7 +456,7 @@
           {\iffieldequals{namehash}{\cbx@lastyear}%
             {}%
             {\usebibmacro{cmsbracketname}% For names in []
-              \iffieldequalstr{entrytype}{customc}%
+              \ifentrytype{customc}%
               {\newcunit}%
               {\setunit{\addspace}}}%
             \usebibmacro{cite:label}%
@@ -317,8 +466,9 @@
       {\usebibmacro{cite:shorthand+title}}}
     {\iffieldundef{shorthand}%
       {\ifthenelse{\ifnameundef{labelname}\OR
-          \iffieldequalstr{entrytype}{inreference}\OR
-          \iffieldequalstr{entrytype}{reference}}% Simplified for CMS
+          \ifentrytype{inreference}\OR
+          \ifentrytype{reference}\OR
+          \ifentrytype{mvreference}}% Simplified for CMS
         {\usebibmacro{cite:label}%
           \setunit{\addspace}%
           \usebibmacro{cmscitesortdate}%
@@ -401,14 +551,15 @@
     {\usebibmacro{cmscitesortdate}}}%
   {\iffieldundef{shorthand}
     {\ifthenelse{\ifnameundef{labelname}\OR
-        \iffieldequalstr{entrytype}{inreference}\OR
-        \iffieldequalstr{entrytype}{reference}}%
+        \ifentrytype{inreference}\OR
+        \ifentrytype{reference}\OR
+        \ifentrytype{mvreference}}%
       {\iffieldequalstr{entrysubtype}{classical}%
         {\setunit{%
             \global\booltrue{cbx:parens}%
             \addspace\bibopenparen}%
           \ifnumequal{\value{citecount}}{1}%
-          {\usebibmacro{prenote}}
+          {\usebibmacro{prenote}}%
           {}%
           \usebibmacro{cite:label}}
         {\usebibmacro{cite:label}%
@@ -416,7 +567,7 @@
             \global\booltrue{cbx:parens}%
             \addspace\bibopenparen}%
           \ifnumequal{\value{citecount}}{1}
-          {\usebibmacro{prenote}}
+          {\usebibmacro{prenote}}%
           {}%
           \usebibmacro{cmscitesortdate}}}
       {\printnames{labelname}%
@@ -424,12 +575,12 @@
 	  \global\booltrue{cbx:parens}%
 	  \addspace\bibopenparen}%
 	\ifnumequal{\value{citecount}}{1}
-        {\usebibmacro{prenote}}
+        {\usebibmacro{prenote}}%
         {}%
         \iffieldequalstr{entrysubtype}{classical}%
-        {\usebibmacro{cite:label}}
+        {\usebibmacro{cite:label}}%
         {\usebibmacro{cmscitesortdate}}%
-        \savefield{namehash}{\cbx@lasthash}}}
+        \savefield{namehash}{\cbx@lasthash}}}%
     {\printfield{shorthand}%
       \setunit{%
         \global\booltrue{cbx:parens}%
@@ -438,14 +589,15 @@
       {\usebibmacro{prenote}}%
       {}%
       \iffieldequalstr{entrysubtype}{classical}%
-      {\usebibmacro{cite:label}}
+      {\usebibmacro{cite:label}}%
       {\usebibmacro{cmscitesortdate}}%
-      \savefield{namehash}{\cbx@lasthash}}}%
+      \savefield{namehash}{\cbx@lasthash}}%
+    \stepcounter{textcitecount}}% Added ???
   \setunit{%
     \ifbool{cbx:parens}%
     {\bibcloseparen\global\boolfalse{cbx:parens}}%
     {}%
-    \multicitedelim}}
+    \textcitedelim}}% Not \multicitedelim ???
 
 \newbibmacro*{textcite:citeshort}{%
   \iffieldequals{namehash}{\cbx@lasthash}
@@ -458,7 +610,7 @@
       {\setunit{\multicitedelim}}%
       \iffieldequalstr{entrysubtype}{classical}%
       {\usebibmacro{cite:label}}%
-      {\usebibmacro{cmscitesortdate}}}
+      {\usebibmacro{cmscitesortdate}}}%
     {\iffieldundef{postnote}%
       {\iffieldequals{namehash}{\cbx@lastyear}%
         {\setunit{\multicitedelim}%
@@ -468,15 +620,16 @@
       \printtext[bibhyperref]{%
         \printfield{shorthand}}}}%
   {\ifthenelse{\ifnameundef{labelname}\OR
-      \iffieldequalstr{entrytype}{inreference}\OR
-      \iffieldequalstr{entrytype}{reference}}%
+      \ifentrytype{inreference}\OR
+      \ifentrytype{reference}\OR
+      \ifentrytype{mvreference}}%
     {\iffieldundef{shorthand}
       {\iffieldequalstr{entrysubtype}{classical}%
         {\setunit{%
             \global\booltrue{cbx:parens}%
             \addspace\bibopenparen}%
           \ifnumequal{\value{citecount}}{1}%
-          {\usebibmacro{prenote}}
+          {\usebibmacro{prenote}}%
           {}%
           \usebibmacro{cite:label}}
         {\usebibmacro{cite:label}%
@@ -484,9 +637,9 @@
             \global\booltrue{cbx:parens}%
             \addspace\bibopenparen}%
           \ifnumequal{\value{citecount}}{1}
-          {\usebibmacro{prenote}}
+          {\usebibmacro{prenote}}%
           {}%
-          \usebibmacro{cmscitesortdate}}}
+          \usebibmacro{cmscitesortdate}}}%
       {\printtext[bibhyperref]{%
           \printfield{shorthand}}}}
     {\printnames{labelname}%
@@ -494,20 +647,21 @@
         \global\booltrue{cbx:parens}%
         \addspace\bibopenparen}%
       \ifnumequal{\value{citecount}}{1}
-      {\usebibmacro{prenote}}
+      {\usebibmacro{prenote}}%
       {}%
       \iffieldundef{shorthand}
       {\iffieldequalstr{entrysubtype}{classical}%
-        {\usebibmacro{cite:label}}
+        {\usebibmacro{cite:label}}%
         {\usebibmacro{cmscitesortdate}}}%
       {\printtext[bibhyperref]{%
           \printfield{shorthand}}}%
-      \savefield{namehash}{\cbx@lasthash}}}%
+      \savefield{namehash}{\cbx@lasthash}}%
+    \stepcounter{textcitecount}}% Added ???
   \setunit{%
     \ifbool{cbx:parens}
-    {\bibcloseparen\global\boolfalse{cbx:parens}}
+    {\bibcloseparen\global\boolfalse{cbx:parens}}%
     {}%
-    \multicitedelim}}
+    \textcitedelim}}% Not \multicitedelim ???
 
 \newbibmacro*{textcite:postnote}{%
   \iffieldundef{postnote}%
@@ -519,13 +673,13 @@
   {\setunit{}%
     \printtext{%
       \ifbool{cbx:parens}
-      {\bibcloseparen\global\boolfalse{cbx:parens}}
+      {\bibcloseparen\global\boolfalse{cbx:parens}}%
       {}}}%
   {\setunit{%
       \ifbool{cbx:parens}
-      {\bibcloseparen\global\boolfalse{cbx:parens}}
+      {\bibcloseparen\global\boolfalse{cbx:parens}}%
       {}%
-      \multicitedelim}}}
+      \textcitedelim}}}% Not \multicitedelim ???
 
 \newbibmacro*{cite:shorthand}{%
   \iftoggle{cms@los}%
@@ -558,35 +712,40 @@
 \newbibmacro*{cite:label}{% Test this
   \iffieldundef{label}%
   {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT%
-      \iffieldequalstr{entrytype}{periodical}}% Simplifies .bib creation
+      \ifentrytype{periodical}}% Simplifies .bib creation
     {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}}}%
-    {\iffieldequalstr{entrytype}{manual}%
+    {\ifentrytype{manual}%
       {\printtext[bibhyperref]{\printlist{organization}}}%
       {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}}}%
   {\printtext[bibhyperref]{\printfield{label}}}}
 
 \newbibmacro*{cite:labelyear+extrayear}{%
   \ifboolexpr{ (
-    test {\iffieldequalstr{entrytype}{music}}%
+    test {\ifentrytype{music}}%
     or
-    test {\iffieldequalstr{entrytype}{review}}%
+    test {\ifentrytype{review}}%
     or
-    test {\iffieldequalstr{entrytype}{video}}%
+    test {\ifentrytype{video}}%
     )
     and
-    togl {cms@avdate}
+    togl {cms@avdate}%
   }%
   {\usebibmacro{cite:av+labelyear+extrayear}}%
-  {\usebibmacro{cite:standard+labelyear+extrayear}}}
+  {\iftoggle{cms@ordate}%
+    {\usebibmacro{cite:origfirst+labelyear+extrayear}}%
+    {\usebibmacro{cite:standard+labelyear+extrayear}}}}
 
 \newbibmacro*{cite:standard+labelyear+extrayear}{%
-  \iffieldundef{labelyear}
+  \ifthenelse{\iffieldundef{labelyear}\OR%
+    \iffieldequalstr{labelyear}{nodate}}%
   {\ifboolexpr{
-      test {\iffieldequalstr{entrytype}{misc}}
+      test {\ifentrytype{misc}}
       or
-      test {\iffieldequalstr{entrytype}{inreference}}
+      test {\ifentrytype{inreference}}
       or
-      test {\iffieldequalstr{entrytype}{reference}}
+      test {\ifentrytype{reference}}
+      or
+      test {\ifentrytype{mvreference}}
       or
       not togl {cms@nodates}
     }%
@@ -637,14 +796,78 @@
           {\mbox{\bibdatedash}}%
           {}}}}}}
 
+\newbibmacro*{cite:origfirst+labelyear+extrayear}{%
+  \ifthenelse{\iffieldundef{labelyear}\OR%
+    \iffieldequalstr{labelyear}{nodate}}%
+  {\ifboolexpr{
+      test {\ifentrytype{misc}}
+      or
+      test {\ifentrytype{inreference}}
+      or
+      test {\ifentrytype{reference}}
+      or
+      test {\ifentrytype{mvreference}}
+      or
+      not togl {cms@nodates}
+    }%
+    {}%
+    {\printtext[bibhyperref]{\bibstring{nodate}}}}% For CMS?
+  {\printtext[bibhyperref]{%
+      \iffieldundef{origyear}%
+      {\iffieldundef{year}
+        {\iffieldundef{eventyear}%
+          {\printfield{labelyear}%
+            \iffieldundef{extrayear}%
+            {}%
+            {\setunit*{}%
+              \printfield{extrayear}}%
+            \iffieldundef{urlendyear}%
+            {}%
+            {\iffieldequalstr{urlendyear}{}%
+              {\mbox{\bibdatedash}}%
+              {}}}%
+          {\printfield{labelyear}%
+            \iffieldundef{extrayear}%
+            {}%
+            {\setunit*{}%
+              \printfield{extrayear}}%
+            \iffieldundef{eventendyear}%
+            {}%
+            {\iffieldequalstr{eventendyear}{}%
+              {\mbox{\bibdatedash}}%
+              {}}}}
+        {\printfield{labelyear}%
+          \iffieldundef{extrayear}%
+          {}%
+          {\setunit*{}%
+            \printfield{extrayear}}%
+          \iffieldundef{endyear}%
+          {}%
+          {\iffieldequalstr{endyear}{}%
+            {\mbox{\bibdatedash}}%
+            {}}}}
+      {\printfield{labelyear}%
+        \iffieldundef{extrayear}%
+        {}%
+        {\setunit*{}%
+          \printfield{extrayear}}%
+        \iffieldundef{origendyear}% DATE FIX
+        {}%
+        {\iffieldequalstr{origendyear}{}%
+          {\mbox{\bibdatedash}}%
+          {}}}}}}
+
 \newbibmacro*{cite:av+labelyear+extrayear}{%
-  \iffieldundef{labelyear}
+  \ifthenelse{\iffieldundef{labelyear}\OR%
+    \iffieldequalstr{labelyear}{nodate}}%
   {\ifboolexpr{
-      test {\iffieldequalstr{entrytype}{misc}}
+      test {\ifentrytype{misc}}
+      or
+      test {\ifentrytype{inreference}}
       or
-      test {\iffieldequalstr{entrytype}{inreference}}
+      test {\ifentrytype{reference}}
       or
-      test {\iffieldequalstr{entrytype}{reference}}
+      test {\ifentrytype{mvreference}}
       or
       not togl {cms@nodates}
     }%
@@ -733,28 +956,67 @@
   {}}
 
 \newbibmacro*{cite:origyear+labelyear}{%
-  \iftoggle{cms@switchdates}%
-  {\usebibmacro{cite:labelyear+extrayear}}
-  {\iffieldundef{origyear}%
-    {\clearfield{extrayear}\usebibmacro{cite:labelyear+extrayear}}%
-    {\printtext[bibhyperref]{%
-        \usebibmacro{origyear+endyear}}}}}
+  \ifboolexpr{ (
+    test {\ifentrytype{music}}%
+    or
+    test {\ifentrytype{review}}%
+    or
+    test {\ifentrytype{video}}%
+    )
+    and
+    togl {cms@avdate}%
+  }
+  {\usebibmacro{cite:av+labelyear+extrayear}}%
+  {\iftoggle{cms@switchdates}%
+    {\usebibmacro{cite:labelyear+extrayear}}%
+    {\iffieldundef{origyear}%
+      {\iftoggle{cms@ordate}% ???
+        {}%
+        {\clearfield{extrayear}}%
+        \usebibmacro{cite:standard+labelyear+extrayear}}%
+      {\iftoggle{cms@ordate}%
+        {\usebibmacro{cite:origfirst+labelyear+extrayear}}%
+        {\printtext[bibhyperref]{%
+            \usebibmacro{origyear+endyear}}}}}}}
 
 \newbibmacro*{cite:bothyear+oldstyle}{%
-  \iftoggle{cms@switchdates}%
-  {\printtext[bibhyperref]{%
-      \bibopenparen%
-      \usebibmacro{cite:labelyear+extrayear}%
-      \bibcloseparen%
-      \addspace\usebibmacro{origyear+endyear}}}%
-  {\iffieldundef{origyear}%
-    {\clearfield{extrayear}\usebibmacro{cite:labelyear+extrayear}}%
+  \ifboolexpr{ (
+    test {\ifentrytype{music}}%
+    or
+    test {\ifentrytype{review}}%
+    or
+    test {\ifentrytype{video}}%
+    )
+    and
+    togl {cms@avdate}%
+  }
+  {\usebibmacro{cite:av+labelyear+extrayear}}%
+  {\iftoggle{cms@switchdates}%
     {\printtext[bibhyperref]{%
         \bibopenparen%
-        \usebibmacro{origyear+endyear}%
+        \usebibmacro{cite:labelyear+extrayear}%
         \bibcloseparen%
-        \clearfield{extrayear}\addspace%
-        \usebibmacro{cite:labelyear+extrayear}}}}}
+        \addspace\usebibmacro{origyear+endyear}}}%
+    {\iffieldundef{origyear}% ???
+      {\iftoggle{cms@ordate}%
+        {}%
+        {\clearfield{extrayear}}%
+        \usebibmacro{cite:standard+labelyear+extrayear}}%
+      {\iftoggle{cms@ordate}% Added test for year field ???
+        {\iffieldundef{year}%
+          {\usebibmacro{cite:origfirst+labelyear+extrayear}}%
+          {\printtext[bibhyperref]{%
+              \bibopenparen%
+              \usebibmacro{cite:origfirst+labelyear+extrayear}%
+              \bibcloseparen%
+              \setunit{\addspace}%\addspace% ???
+              \usebibmacro{year+endyear}}}}%
+        {\printtext[bibhyperref]{%
+            \bibopenparen%
+            \usebibmacro{origyear+endyear}%
+            \bibcloseparen%
+            \clearfield{extrayear}\addspace%
+            \usebibmacro{cite:standard+labelyear+extrayear}}}}}}}
 
 \newbibmacro*{cite:save}{%
   \savefield{entrykey}{\cbx@lastkey}}
@@ -821,13 +1083,45 @@
   {}
   {\usebibmacro{postnote}}
 
-\DeclareCiteCommand{\textcite}
+%%% Textcite commands taken verbatim from authoryear-comp.cbx %%% 
+
+\DeclareCiteCommand{\cbx@textcite}
   {\usebibmacro{cite:init}}
   {\usebibmacro{citeindex}%
-    \usebibmacro{textcite}}
+   \usebibmacro{textcite}}
   {}
   {\usebibmacro{textcite:postnote}}
 
+\DeclareCiteCommand{\textcite}[\cbx@textcite@init\cbx@textcite]
+  {\gdef\cbx@savedkeys{}%
+   \citetrackerfalse%
+   \pagetrackerfalse%
+   \DeferNextCitekeyHook%
+   \usebibmacro{cite:init}}
+  {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+     {\protected@xappto\cbx@savedcites{()(\thefield{multipostnote})}%
+      \global\clearfield{multipostnote}}
+     {}%
+   \xappto\cbx@savedkeys{\thefield{entrykey},}%
+   \iffieldequals{namehash}{\cbx@lasthash}
+     {}
+     {\stepcounter{textcitetotal}%
+      \savefield{namehash}{\cbx@lasthash}}}
+  {}
+  {\protected@xappto\cbx@savedcites{%
+     [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}}
+
+\newrobustcmd{\cbx@textcite@init}[2]{%
+  \setcounter{textcitetotal}{0}%
+  \setcounter{textcitecount}{0}%
+  \def\cbx@savedcites{#1}#2\cbx@savedcites\empty}
+
+\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\textcites}[\cbx@textcites@init\cbx@textcites]{\textcite}{}
+
+\let\cbx@textcites@init\cbx@textcite@init
+\pretocmd{\cbx@textcites@init}{\UseNextMultiCiteHook}{}{}
+
 \DeclareMultiCiteCommand{\cites}{\cite}{\setunit{\multicitedelim}}
 
 \DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}%
@@ -839,11 +1133,9 @@
 \DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext]%
    {\footcitetext}{\setunit{\multicitedelim}}
 
-\DeclareMultiCiteCommand{\textcites}{\textcite}{}
-
 \DeclareCiteCommand{\bibxrefcite}
   {\usebibmacro{cite:init}}%\usebibmacro{clearalmostall}} (?)
-  {\usebibmacro{cms-in:}%
+  {\usebibmacro{xref-in:}%
     \blx@ibidreset% For authordate style
     \usebibmacro{cite}}
   {}
@@ -923,22 +1215,34 @@
 
 %%%% Field Formats -- Title, Citetitle, Lostitle %%%%
 
-\DeclareFieldFormat[article]{title}{%
+\DeclareFieldFormat{title}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldFormat{citetitle}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldFormat{lostitle}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldFormat
+[article,inbook,incollection,inproceedings,online,thesis,unpublished]
+{title}{%
   \iffieldundef{title}%
   {}%
   {\mkbibquote{#1\isdot}}}
 
-\DeclareFieldFormat[article]{citetitle}{%
+\DeclareFieldFormat
+[article,inbook,incollection,inproceedings,online,thesis,unpublished]
+{citetitle}{%
   \iffieldundef{title}%
   {#1\isdot}%
   {\mkbibquote{#1\isdot}}}
 
-\DeclareFieldFormat[article]{lostitle}{%
+\DeclareFieldFormat
+[article,inbook,incollection,inproceedings,online,thesis,unpublished]
+{lostitle}{%
   \iffieldundef{title}%
   {#1\isdot}%
   {\mkbibquote{#1\isdot}}}
 
-\DeclareFieldFormat[artwork]{title}{%
+\DeclareFieldFormat[artwork,image]{title}{%
   \iffieldundef{entrysubtype}%
   {\mkbibemph{#1}\isdot}%
   {#1\isdot}}
@@ -947,83 +1251,17 @@
 
 \DeclareFieldAlias[artwork]{lostitle}[artwork]{title}
 
-\DeclareFieldFormat[book]{title}{\mkbibemph{#1}\isdot}
-
-\DeclareFieldAlias[book]{citetitle}[book]{title}
-
-\DeclareFieldAlias[book]{lostitle}[book]{title}
-
-\DeclareFieldAlias[bookinbook]{title}[book]{title}
-
-\DeclareFieldAlias[bookinbook]{citetitle}[book]{title}
-
-\DeclareFieldAlias[bookinbook]{lostitle}[book]{title}
-
-\DeclareFieldAlias[collection]{title}[book]{title}
-
-\DeclareFieldAlias[collection]{citetitle}[book]{title}
-
-\DeclareFieldAlias[collection]{lostitle}[book]{lostitle}
-
-\DeclareFieldFormat[periodical]{title}{\mkbibemph{#1}\isdot}
-
-\DeclareFieldFormat[periodical]{citetitle}{\mkbibemph{#1}\isdot}
-
-\DeclareFieldFormat[periodical]{lostitle}{\mkbibemph{#1}\isdot}
-
-\DeclareFieldAlias[image]{title}[artwork]{title}
-
 \DeclareFieldAlias[image]{citetitle}[artwork]{title}
 
-\DeclareFieldAlias[image]{lostitle}[artwork]{lostitle}
-
-\DeclareFieldAlias[incollection]{title}[article]{title}% Change article?
-
-\DeclareFieldAlias[incollection]{citetitle}[article]{title}
-
-\DeclareFieldAlias[incollection]{lostitle}[article]{lostitle}
-
-\DeclareFieldAlias[inreference]{title}[book]{title}
-
-\DeclareFieldAlias[inreference]{citetitle}[book]{title}
-
-\DeclareFieldAlias[inreference]{lostitle}[book]{lostitle}
-
-\DeclareFieldAlias[reference]{title}[book]{title}
-
-\DeclareFieldAlias[reference]{citetitle}[book]{title}
-
-\DeclareFieldAlias[reference]{lostitle}[book]{lostitle}
-
-\DeclareFieldFormat[letter]{title}{#1\isdot}
-
-\DeclareFieldFormat[letter]{citetitle}{#1\isdot}
-
-\DeclareFieldFormat[letter]{lostitle}{#1\isdot}
-
-\DeclareFieldAlias[inproceedings]{title}[article]{title}% As above
-
-\DeclareFieldAlias[inproceedings]{citetitle}[article]{title}
-
-\DeclareFieldAlias[inproceedings]{lostitle}[article]{lostitle}
-
-\DeclareFieldAlias[thesis]{title}[article]{title}
-
-\DeclareFieldAlias[thesis]{citetitle}[article]{title}
+\DeclareFieldAlias[image]{lostitle}[artwork]{title}
 
-\DeclareFieldAlias[thesis]{lostitle}[article]{lostitle}
+\DeclareFieldFormat[letter,patent]{title}{#1\isdot}
 
-\DeclareFieldAlias[patent]{title}[letter]{lostitle}% 16th ed.
+\DeclareFieldFormat[letter,patent]{citetitle}{#1\isdot}
 
-\DeclareFieldAlias[patent]{citetitle}[letter]{title}
+\DeclareFieldFormat[letter,patent]{lostitle}{#1\isdot}
 
-\DeclareFieldAlias[patent]{lostitle}[letter]{lostitle}
-
-\DeclareFieldAlias[unpublished]{title}[article]{title}
-
-\DeclareFieldAlias[unpublished]{citetitle}[article]{citetitle}
-
-\DeclareFieldAlias[unpublished]{lostitle}[article]{lostitle}
+\DeclareFieldFormat{prenote}{\ifcapital{\MakeCapital{#1}}{#1}}
 
 \DeclareFieldFormat{postnote}{% Removed \isdots -- required
   \iffieldundef{pagination}%    elsewhere also?
@@ -1049,17 +1287,11 @@
     {\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{#1}\isdot}
+\DeclareFieldFormat[suppbook,suppcollection]{title}{\mkbibemph{#1}\isdot}
 
 \DeclareFieldAlias[suppbook]{citetitle}[suppbook]{lostitle}
 
-\DeclareFieldFormat[suppbook]{lostitle}{%
+\DeclareFieldFormat[suppbook,suppcollection]{lostitle}{%
   \usebibmacro{inforaft}%
   \addspace%
   \mkbibemph{#1}\isdot}
@@ -1080,30 +1312,8 @@
       #1}%
     {\printfield{nameaddon}\addspace #1}}}
 
-\DeclareFieldAlias[suppcollection]{title}[suppbook]{title}
-
 \DeclareFieldAlias[suppcollection]{citetitle}[suppbook]{lostitle}
 
-\DeclareFieldAlias[suppcollection]{lostitle}[suppbook]{lostitle}
-
-\DeclareFieldAlias[booklet]{title}[book]{title}
-
-\DeclareFieldAlias[booklet]{citetitle}[book]{citetitle}
-
-\DeclareFieldAlias[booklet]{lostitle}[book]{lostitle}
-
-\DeclareFieldAlias[manual]{title}[book]{title}
-
-\DeclareFieldAlias[manual]{citetitle}[book]{citetitle}
-
-\DeclareFieldAlias[manual]{lostitle}[book]{lostitle}
-
-\DeclareFieldAlias[report]{title}[book]{title}
-
-\DeclareFieldAlias[report]{citetitle}[book]{citetitle}
-
-\DeclareFieldAlias[report]{lostitle}[book]{lostitle}
-
 \DeclareFieldFormat[misc]{title}{%
   \iffieldundef{entrysubtype}%
   {\mkbibemph{#1}\isdot}%
@@ -1113,7 +1323,7 @@
 
 \DeclareFieldAlias[misc]{lostitle}[misc]{title}
 
-\DeclareFieldFormat[review]{title}{%
+\DeclareFieldFormat[review,suppperiodical]{title}{%
   \ifcapital{\MakeCapital{#1\isdot}}%
   {#1\isdot}}
 
@@ -1121,23 +1331,15 @@
 
 \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]{citetitle}
-
-\DeclareFieldAlias[online]{lostitle}[article]{lostitle}
-
 \DeclareFieldFormat{booktitle}{\mkbibemph{#1}}
 
 \DeclareFieldFormat{maintitle}{\mkbibemph{#1}}
 
-\DeclareFieldFormat[video]{title}{%
+\DeclareFieldFormat[audio,music,video]{title}{%
   \iffieldundef{booktitle}%
   {\mkbibemph{#1}\isdot}%
   {\mkbibquote{#1\isdot}}}
@@ -1146,17 +1348,13 @@
 
 \DeclareFieldAlias[video]{lostitle}[video]{title}
 
-\DeclareFieldAlias[music]{title}[video]{title}
-
-\DeclareFieldAlias[music]{citetitle}[video]{citetitle}
-
-\DeclareFieldAlias[music]{lostitle}[video]{lostitle}
+\DeclareFieldAlias[music]{citetitle}[music]{title}
 
-\DeclareFieldAlias[audio]{title}[video]{title}
+\DeclareFieldAlias[music]{lostitle}[music]{title}
 
-\DeclareFieldAlias[audio]{citetitle}[video]{citetitle}
+\DeclareFieldAlias[audio]{citetitle}[audio]{title}
 
-\DeclareFieldAlias[audio]{lostitle}[video]{lostitle}
+\DeclareFieldAlias[audio]{lostitle}[audio]{title}
 
 %%%% Other Field Formats %%%%
 
@@ -1167,36 +1365,20 @@
 \DeclareFieldFormat{note}{%
   \ifcapital{\MakeCapital{#1}}{#1}}%
 
-\DeclareFieldFormat[suppbook]{type}{%
+\DeclareFieldFormat
+[audio,manual,music.patent,report,suppbook,suppcollection,thesis,video]
+{type}{%
   \ifbibstring{#1}%
   {\bibstring{#1}}%
   {\ifcapital%
     {\MakeCapital{#1\isdot}}%
     {#1\isdot}}}
 
-\DeclareFieldFormat[artwork]{type}{%
+\DeclareFieldFormat[artwork,image]{type}{%
   \ifcapital%
   {\MakeCapital{#1}}%
   {#1}}
 
-\DeclareFieldAlias[patent]{type}[suppbook]{type}
-
-\DeclareFieldAlias[manual]{type}[suppbook]{type}
-
-\DeclareFieldAlias[thesis]{type}[suppbook]{type}
-
-\DeclareFieldAlias[report]{type}[suppbook]{type}
-
-\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}{%
@@ -1205,6 +1387,26 @@
     {\href{http://dx.doi.org/#1}{\nolinkurl{#1}}}
     {\nolinkurl{#1}}}
 
+\DeclareFieldFormat[music]{date}{% Generalize userd ???
+  \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{urlyear}%
+  \OR\NOT\iffieldundef{eventyear}\OR\NOT\iffieldundef{origyear}%
+  \OR\NOT\iffieldundef{urlmonth}\OR\NOT\iffieldundef{eventmonth}%
+  \OR\NOT\iffieldundef{origmonth}}%
+  {#1}%
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat[video]{date}{% Generalize userd ???
+  \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{urlyear}%
+    \OR\NOT\iffieldundef{eventyear}\OR\NOT\iffieldundef{urlmonth}%
+    \OR\NOT\iffieldundef{eventmonth}}%
+  {#1}%
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat{date}{% Generalize userd ???
+  \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{urlyear}}%
+  {#1}%
+  {\printfield{userd}\addspace #1}}
+
 \DeclareFieldFormat{urldate}{% 16th ed.
   \iffieldundef{userd}%
   {\bibstring{urlseen}\space #1}%
@@ -1251,7 +1453,7 @@
 
 \DeclareFieldFormat{edition}{% New in 0.8
   \ifinteger{#1}
-  {\mkbibordinal{#1}~\bibstring{edition}}%
+  {\mkbibordedition{#1}~\bibstring{edition}}%
   {\ifcapital
     {\MakeCapital{#1\isdot}}%
     {#1\isdot}}}
@@ -1269,7 +1471,7 @@
 
 \DeclareFieldFormat{jourser}{%
   \ifinteger{#1}%
-  {\mkbibordinal{#1}%
+  {\mkbibordseries{#1}%
     \addnbspace%
     \bibstring{jourser}}%
   {\ifbibstring{#1}{\bibstring{#1}}{#1}}}
@@ -1296,7 +1498,10 @@
 
 \DeclareFieldFormat{annotation}{\par\nobreak \vskip \bibitemsep #1}
 
-\DeclareFieldFormat{part}{\addcomma\bibstring{partvolume}~#1}
+\DeclareFieldFormat{part}{%
+  \ifnumerals{#1}%
+  {\addcomma\addspace\bibstring{partvolume}~#1}%
+  {\addcomma\addspace\ifcapital{\MakeCapital{#1}}{#1}}}
 
 \DeclareFieldAlias[review]{volume}[article]{volume}
 
@@ -1311,6 +1516,9 @@
 
 \renewcommand*{\multicitedelim}{\addsemicolon\space}
 
+\renewcommand*{\iffinalcitedelim}{%
+  \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}
+
 \renewcommand*{\nameyeardelim}{%
   \iffieldundef{origyear}% Is this test correct?
   {\iffieldundef{year}%
@@ -1326,10 +1534,12 @@
 
 \newcommand{\classicpunct}{%
   \ifthenelse{\iffieldequalstr{entrysubtype}{classical}\OR%
-    \iffieldequalstr{entrytype}{letter}}%
+    \ifentrytype{letter}}%
   {\setunit*{\addspace}}%
   {\setunit*{\addcomma\addspace}}}
 
+\newcommand{\postvolpunct}{\addcolon}%
+
 \newcommand{\parttrans}{%
   {\bibstring{bytranslator}\space}}%
 
@@ -1375,7 +1585,10 @@
 
 \renewcommand*{\postnotedelim}{%
   \iftoggle{cms@inlineibid}%
-  {\togglefalse{cms@inlineibid}}%
+  {\togglefalse{cms@inlineibid}%
+    \iffieldundef{prenote}% Bug fix
+    {}%
+    {\addspace}}%
   {\iffieldequalstr{entrysubtype}{classical}% For Notes+Bib, too?
     {\NumCheckSetup{\DeclareNumChars*{abcdeABCDE}}%
       \iffieldpages{postnote}%
@@ -1480,7 +1693,7 @@
     \iffieldundef{maintitle}\AND\iffieldundef{issuetitle}\)%
     \OR\iffieldsequal{booktitle}{title}%  Changed these for crossrefed
     \OR\iffieldsequal{maintitle}{title}}% entries.  Create problems?
-  {\iffieldequalstr{entrytype}{video}%
+  {\ifentrytype{video}%
     {\newcunit\newblock}%
     {\newunit\newblock}}%
   {\newcunit\newblock}}
@@ -1769,11 +1982,10 @@
   {\bibstring{in}%
     \setunit{\addspace}}}
 
-\newbibmacro*{alt-in:}{%
-  \iffieldundef{booktitle}%
-  {}
-  {\bibstring{in}%
-    \setunit{\addspace}}}
+\newbibmacro*{xref-in:}{%
+  \iffieldundef{volume}{}{\savefield{volume}{\cbx@incollvol}}%
+  \iffieldundef{part}{}{\savefield{part}{\cbx@incollpart}}%
+  \usebibmacro{cms-in:}}
 
 \newbibmacro*{chapincoll}{%
   \iffieldundef{chapter}%
@@ -1782,7 +1994,7 @@
 
 \newbibmacro*{chapinscore}{%
   \iffieldundef{chapter}%
-  {\ifthenelse{\iffieldequalstr{entrytype}{music}%
+  {\ifthenelse{\ifentrytype{music}%
       \AND\NOT\iffieldundef{booktitle}}%
     {\bibstring{on}\setunit{\addspace}}%
     {}}%
@@ -1860,9 +2072,9 @@
 \newbibmacro*{issuetitle}{%
   \iffieldundef{issuetitle}%
   {}
-  {\ifthenelse{\iffieldequalstr{entrytype}{article}\OR%
-      \iffieldequalstr{entrytype}{review}\OR%
-      \iffieldequalstr{entrytype}{suppperiodical}}% This test is for
+  {\ifthenelse{\ifentrytype{article}\OR%
+      \ifentrytype{review}\OR%
+      \ifentrytype{suppperiodical}}% This test is for
     {\usebibmacro{cms-in:}}% periodical entries
     {}%
     \printtext[issuetitle]{%
@@ -1870,16 +2082,6 @@
       \setunit{\addcolon\addspace}%
       \printfield[noformat]{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}%
@@ -2041,32 +2243,6 @@
         \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[title]{% article subtype
     \printfield[noformat]{title}%
@@ -2153,52 +2329,6 @@
   \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}%
   {}%
@@ -2318,9 +2448,13 @@
   \clearname{namea}%
   \clearname{nameb}%
   \clearfield{nameaddon}%
-  \clearfield{title}%
-  \clearfield{subtitle}%
-  \clearfield{titleaddon}%
+  \ifthenelse{\ifentrytype{periodical}\OR\ifentrytype{mvbook}\OR%
+    \ifentrytype{mvcollection}\OR\ifentrytype{mvproceedings}\OR%
+    \ifentrytype{mvreference}}%
+  {}%
+  {\clearfield{title}%
+    \clearfield{subtitle}%
+    \clearfield{titleaddon}}%
   \clearfield{reprinttitle}%
   \clearfield{usere}%
   \clearlist{language}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.bbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.bbx
index 15b959db4ff..7364ef99492 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.bbx
@@ -1,11 +1,11 @@
-% $Id: chicago-authordate15.bbx,v 0.8.1.16 2012/12/06 12:17:19 dfussner Exp $
+% $Id: chicago-authordate15.bbx,v 0.8.1.17 2013/10/21 14:51:44 dfussner Exp $
 % This is a biblatex style file, adapted mainly from Lehman's
 % standard.bbx and from chicago-notes.bbx.  It provides the
 % reference list formatting for the Chicago author-date style,
 % _15th_ edition.
 
 \ProvidesFile{chicago-authordate15.bbx}
-[2012/12/06 v 2.4 biblatex bibliography style]
+[2013/10/21 v 2.8 biblatex bibliography style]
 
 %%%% Initialize and format bibliography and los %%%%
 
@@ -2107,7 +2107,8 @@
       {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}}}%
 
 \newbibmacro*{labelyear+extrayear}{%
-  \iffieldundef{labelyear}%
+  \ifthenelse{\iffieldundef{labelyear}\OR%
+    \iffieldequalstr{labelyear}{nodate}}%
     {\ifboolexpr{
         test {\iffieldequalstr{entrytype}{misc}}
         or
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.cbx
index 390c0b9d176..318c5f68121 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.cbx
@@ -1,11 +1,11 @@
-% $Id: chicago-authordate15.cbx,v 0.8.1.20 2012/12/06 12:16:45 dfussner Exp $
+% $Id: chicago-authordate15.cbx,v 0.8.1.21 2013/10/21 14:51:16 dfussner Exp $
 % This is a biblatex citation style file, adapted from Lehman's
 % authoryear-comp.cbx.  It is heavily modified, with the intention of
 % providing inline citations (and a reference list) for the
 % author-date style of the Chicago Manual of Style, _15th_ edition.
 
 \ProvidesFile{chicago-authordate15.cbx}
-[2012/12/06 v 2.4 biblatex citation style]
+[2013/10/21 v 2.8 biblatex citation style]
 
 %%%% Biblatex initialization + Chicago options + Toggles %%%%
 
@@ -155,6 +155,69 @@
 
 \ExecuteBibliographyOptions{includeall}%
 
+%% From 16th ed. %%
+
+\@ifpackagelater{biblatex}{2013/03/30}% For biblatex 2.6 ff.
+{\ExecuteBibliographyOptions{labeldate=true}}%
+{\ExecuteBibliographyOptions{labelyear=true}}%
+
+\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}{
@@ -536,7 +599,8 @@
   {\printtext[bibhyperref]{\printfield{label}}}}
 
 \newbibmacro*{cite:labelyear+extrayear}{%
-  \iffieldundef{labelyear}
+  \ifthenelse{\iffieldundef{labelyear}\OR%
+    \iffieldequalstr{labelyear}{nodate}}%
   {\ifboolexpr{
       test {\iffieldequalstr{entrytype}{misc}}
       or
@@ -1155,7 +1219,7 @@
 
 \DeclareFieldFormat{annotation}{\par\nobreak \vskip \bibitemsep #1}
 
-\DeclareFieldFormat{part}{\addcomma\bibstring{partvolume}~#1}
+\DeclareFieldFormat{part}{\addcomma\addspace\bibstring{partvolume}~#1}
 
 \DeclareFieldAlias[review]{volume}[article]{volume}
 
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 307197f8141..a9f4d864a7d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
@@ -1,10 +1,10 @@
-% $Id: chicago-notes.bbx,v 0.9.7.34 2013/03/12 12:07:20 dfussner Exp $
+% $Id: chicago-notes.bbx,v 0.9.7.50 2013/10/29 12:32:21 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}[2013/03/12 v 2.5 biblatex bibliography style]
+\ProvidesFile{chicago-notes.bbx}[2013/10/29 v 2.8 biblatex bibliography style]
 
 %%%% Initialize and format bibliography and los %%%%
 
@@ -364,10 +364,10 @@
     \finentry}%
   {\ifnameundef{labelname}%
     {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT%
-      \iffieldequalstr{entrytype}{periodical}}%
+      \ifentrytype{periodical}}%
       {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}%
           \newcunit}}%
-      {\iffieldequalstr{entrytype}{manual}%
+      {\ifentrytype{manual}%
         {\printtext[bibhyperref]{\printlist{organization}\newcunit}}%
         {}}}%
     {\usebibmacro{author/editor}%
@@ -505,7 +505,7 @@
   \newunit% ??? Editorpunct maybe not right here?
   \iffieldundef{maintitle}
   {}
-  {\iffieldundef{volume}
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
     {\usebibmacro{cms-in:}%
       \printtext[maintitle]{%
         \printfield[noformat]{maintitle}%
@@ -559,6 +559,8 @@
   \printfield{nameaddon}%
   \newunit\newblock
   \usebibmacro{italtitle+stitle}%
+  \setunit{\addspace}%
+  \usebibmacro{bib:xref+date}%
   \newunit\newblock
   \iffieldundef{maintitle}%
   {\iffieldundef{edition}%
@@ -566,11 +568,21 @@
     {\usebibmacro{edition}}}%
   {}%
   \newunit\newblock% 16th ed.
-  \usebibmacro{byauthor}
+  \usebibmacro{byauthor}%
   \newunit\newblock
   \usebibmacro{part+editor+translator}%
   \newunit\newblock
-  \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bookbibxref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bookbibxref}%
+    }%
+  {\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
   \newcunit
   \iffieldundef{edition}%
   {}%
@@ -606,7 +618,17 @@
   \usebibmacro{pageref}%
   \newunit\newblock
   \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
+  \usebibmacro{finentry}}%
+{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \bookbibxrefcite{\thefield{xref}}%
+  \usebibmacro{xrefpostnote}%
+  \usebibmacro{finentry}}}%
+{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \bookbibxrefcite{\thefield{crossref}}%
+  \usebibmacro{xrefpostnote}%
+  \usebibmacro{finentry}}}
 
 \DeclareBibliographyDriver{bookinbook}{%
   \usebibmacro{bibindex}%
@@ -615,6 +637,8 @@
   \printfield{nameaddon}%
   \newunit\newblock
   \usebibmacro{italtitle+stitle}%
+  \setunit{\addspace}%
+  \usebibmacro{bib:xref+date}%
   \newunit\newblock
   \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}%
   {\iffieldundef{edition}%
@@ -626,8 +650,17 @@
   \newunit\newblock
   \usebibmacro{part+editor+translator}%
   \setunit*{\addperiod\addspace}%
-  \usebibmacro{cms-in:}%
-  \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
+  \ifboolexpr{
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bookbibxref}%
+  }
+  {\ifboolexpr{
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bookbibxref}%
+    }
+  {\usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
   \iffieldundef{edition}%
   {}%
@@ -660,7 +693,17 @@
   \usebibmacro{pageref}%
   \newunit\newblock
   \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
+  \usebibmacro{finentry}}%
+{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \bookbibxrefcite{\thefield{xref}}%
+  \usebibmacro{xrefpostnote}%
+  \usebibmacro{finentry}}}%
+{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \bookbibxrefcite{\thefield{crossref}}%
+  \usebibmacro{xrefpostnote}%
+  \usebibmacro{finentry}}}
 
 \DeclareBibliographyDriver{booklet}{%
   \usebibmacro{bibindex}%
@@ -694,8 +737,20 @@
   \printfield{nameaddon}%
   \newunit\newblock
   \usebibmacro{italtitle+stitle}%
+  \setunit{\addspace}%
+  \usebibmacro{bib:xref+date}%
   \newunit\newblock
-  \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bookbibxref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bookbibxref}%
+    }%
+  {\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
   \usebibmacro{editorpunct}%
   \iffieldundef{edition}%
   {}%
@@ -724,7 +779,17 @@
   \usebibmacro{pageref}%
   \newunit\newblock
   \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
+  \usebibmacro{finentry}}%
+{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \bookbibxrefcite{\thefield{xref}}%
+  \usebibmacro{xrefpostnote}%
+  \usebibmacro{finentry}}}%
+{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \bookbibxrefcite{\thefield{crossref}}%
+  \usebibmacro{xrefpostnote}%
+  \usebibmacro{finentry}}}
 
 \DeclareBibliographyDriver{customc}{%
   \usebibmacro{bibindex}%
@@ -783,9 +848,18 @@
   \usebibmacro{byauthor}%
   \setunit{\addperiod\addspace}%
   \usebibmacro{part+editor+translator}%
-  \setunit{\addperiod\addspace}%
+  \ifboolexpr{
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bibcrossref}%
+  }
+  {\ifboolexpr{
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bibcrossref}%
+    }
+  {\setunit{\addperiod\addspace}%
   \usebibmacro{chapincoll}%
-  \usebibmacro{cms-in:}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
   \iffieldundef{edition}%
@@ -817,6 +891,18 @@
   \newunit\newblock
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}%
+{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \usebibmacro{chapincoll}%
+  \bibxrefcite{\thefield{xref}}%
+  \usebibmacro{xrefpostnote}%
+  \usebibmacro{finentry}}}%
+{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \usebibmacro{chapincoll}%
+  \bibxrefcite{\thefield{crossref}}%
+  \usebibmacro{xrefpostnote}%
+  \usebibmacro{finentry}}}
 
 \DeclareBibliographyDriver{incollection}{%
   \usebibmacro{bibindex}%
@@ -831,11 +917,18 @@
   \usebibmacro{byauthor}%
   \newunit\newblock
   \usebibmacro{part+editor+translator}%
-  \iffieldundef{crossref}%
-  {\iffieldundef{xref}%
+  \ifboolexpr{
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bibcrossref}%
+  }
+  {\ifboolexpr{
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bibcrossref}%
+    }
   {\newunit\newblock
   \usebibmacro{chapincoll}%
-  \usebibmacro{cms-in:}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
   \iffieldundef{edition}%
@@ -893,11 +986,18 @@
   \usebibmacro{byauthor}%
   \setunit{\addperiod\addspace}%
   \usebibmacro{part+editor+translator}%
-  \iffieldundef{crossref}%
-  {\iffieldundef{xref}%
+  \ifboolexpr{
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bibcrossref}%
+  }
+  {\ifboolexpr{
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bibcrossref}%
+    }
   {\setunit{\addperiod\addspace}%
-    \usebibmacro{chapincoll}%
-    \usebibmacro{cms-in:}%
+  \usebibmacro{chapincoll}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit\newblock
   \usebibmacro{volume+pages}%
@@ -945,7 +1045,6 @@
   \newunit\newblock
   \usebibmacro{part+editor+translator}%
   \setunit*{\addperiod\addspace}% need asterisk?
-  \usebibmacro{alt-in:}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
   \iffieldundef{edition}%
@@ -1007,10 +1106,17 @@
   \newunit\newblock%\bibsentence
   \usebibmacro{part+editor+translator}%
   \setunit*{\addperiod\addspace}%
-  \iffieldundef{crossref}%
-  {\iffieldundef{xref}%
+  \ifboolexpr{
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bibcrossref}%
+  }
+  {\ifboolexpr{
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bibcrossref}%
+    }
   {\usebibmacro{chapincoll}%
-  \usebibmacro{cms-in:}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
   \iffieldundef{edition}%
@@ -1165,7 +1271,7 @@
   \newunit% ??? Editorpunct maybe not right here?
   \iffieldundef{maintitle}
   {}
-  {\iffieldundef{volume}
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
     {\usebibmacro{cms-in:}%
       \printtext[maintitle]{%
         \printfield[noformat]{maintitle}%
@@ -1222,6 +1328,14 @@
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
+\DeclareBibliographyAlias{mvbook}{book}
+
+\DeclareBibliographyAlias{mvcollection}{collection}
+
+\DeclareBibliographyAlias{mvproceedings}{proceedings}
+
+\DeclareBibliographyAlias{mvreference}{reference}
+
 \DeclareBibliographyDriver{online}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
@@ -1368,8 +1482,20 @@
   \printfield{nameaddon}%
   \newunit\newblock
   \usebibmacro{italtitle+stitle}%
+  \setunit{\addspace}%
+  \usebibmacro{bib:xref+date}%
   \newunit\newblock
-  \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+  \ifboolexpr{%
+    test {\iffieldundef{crossref}}%
+    or
+    togl {cms@bookbibxref}%
+  }%
+  {\ifboolexpr{%
+      test {\iffieldundef{xref}}%
+      or
+      togl {cms@bookbibxref}%
+    }%
+  {\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
   \newunit\newblock
   \usebibmacro{volume+or+volumes}%
   \newunit\newblock
@@ -1390,7 +1516,17 @@
   \usebibmacro{pageref}%
   \newunit\newblock
   \usebibmacro{originally+published+as}%
-  \usebibmacro{finentry}}
+  \usebibmacro{finentry}}%
+{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \bookbibxrefcite{\thefield{xref}}%
+  \usebibmacro{xrefpostnote}%
+  \usebibmacro{finentry}}}%
+{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+  \usebibmacro{xrefprenote}% Volume fix
+  \bookbibxrefcite{\thefield{crossref}}%
+  \usebibmacro{xrefpostnote}%
+  \usebibmacro{finentry}}}
 
 \DeclareBibliographyDriver{reference}{%
   \usebibmacro{bibindex}%
@@ -1404,7 +1540,6 @@
   \newunit\newblock
   \usebibmacro{part+editor+translator}%
   \setunit*{\addperiod\addspace}% need asterisk?
-  \usebibmacro{alt-in:}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
   \iffieldundef{edition}%
@@ -1610,6 +1745,8 @@
   \newunit%usebibmacro{byauthorpunct}% Why does this work?  No idea.
   \usebibmacro{byauthor}% Same in thesis type, as well. 16th ed.
   \setunit{\addperiod\addspace}%
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock%
   \printfield{howpublished}%
   \setunit*{\addcomma\addspace}\newblock%
   \printfield{note}%
@@ -1662,7 +1799,7 @@
   \newunit% ??? Editorpunct maybe not right here?
   \iffieldundef{maintitle}
   {}
-  {\iffieldundef{volume}
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
     {\usebibmacro{cms-in:}%
       \printtext[maintitle]{%
         \printfield[noformat]{maintitle}%
@@ -1736,19 +1873,69 @@
   {\printfield{url}}%
   {}}%
 
-\newbibmacro*{volume+pages}{% Volume fix
-  \iffieldundef{maintitle}%
-  {\iffieldundef{volume}%
+\newbibmacro{bib:xref+date}{% Experiment for xrefs
+  \ifboolexpr{
+    togl {cms@omitxrefdate}%
+    or
+    togl {cms@bookbibxref}%
+    or
+    test {\iffieldundef{crossref}}%
+    or
+    test {\iffieldundef{maintitle}}%
+    or
+    ((
+    test {\iffieldundef{year}}%
+    or
+    togl {cms@switchdates}%
+    )
+    and
+    (test {\iffieldundef{origyear}}%
+    or
+    not togl {cms@switchdates}%
+    ))
+  }
+  {\ifboolexpr{
+      togl {cms@omitxrefdate}%
+      or
+      togl {cms@bookbibxref}%
+      or
+      test {\iffieldundef{xref}}%
+      or
+      test {\iffieldundef{maintitle}}%
+      or
+      ((
+      test {\iffieldundef{year}}%
+      or
+      togl {cms@switchdates}%
+      )
+      and
+      (test {\iffieldundef{origyear}}%
+      or
+      not togl {cms@switchdates}%
+      ))
+    }
+    {}%
+    {\printtext[parens]{\usebibmacro{date}}}}%
+  {\printtext[parens]{\usebibmacro{date}}}}
+
+\newbibmacro*{volume+pages}{% Volume fix (modified)
+  \ifboolexpr{
+    test {\iffieldundef{maintitle}}%
+    or
+    togl {cms@vol}%
+  }%
+  {\global\togglefalse{cms@vol}%
+    \ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
     {\printfield{pages}%
       \newunit%
       \printfield{volumes}}%
     {\iffieldundef{part}%
       {\iffieldundef{pages}%
-        {}%
+        {\printfield{volume}}% Still print this w/o part or pages???
         {\ifthenelse{\iffieldnums{pages}\AND%
-            \iffieldundef{bookpagination}}%
+            \iffieldundef{bookpagination}\AND\iffieldnums{volume}}%
           {\printfield[default]{volume}%
-            \addcolon%
+            \postvolpunct%
             \printfield{pages}}%
           {\printfield{volume}%
             \addcomma\addspace%
@@ -1757,14 +1944,24 @@
         \printfield{part}%
         \newcunit%
         \printfield{pages}}}}%
-  {\printfield{pages}%
-    \newunit%
-    \printfield{volumes}}}%
+  {\ifboolexpr{
+      togl {cms@hidevolumes}%
+      and
+      (
+      not test {\iffieldundef{volume}}%
+      or
+      not test {\iffieldundef{part}}%
+      )
+    }%
+    {\printfield{pages}}%
+    {\printfield{pages}%
+      \newunit%
+      \printfield{volumes}}}}%
 
 \newbibmacro*{mtitle+mstitle+vol+part+title+stitle}{%
   \iffieldundef{maintitle}
   {}
-  {\iffieldundef{volume}
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
     {\usebibmacro{cms-in:}% 16th ed (Also 15th?)
       \printtext[maintitle]{%
         \printfield[noformat]{maintitle}%
@@ -1786,19 +1983,18 @@
 
 \newbibmacro*{mtitle+mstitle+vol+part+btitle+bstitle}{%
   \usebibmacro{btitle+bstitle}%
-  \iffieldundef{booktitle}
-  {\setunit{\addperiod\addspace}}% Fix customc?
-  {\setunit{\addcomma\addspace}}%
   \iffieldundef{maintitle}
   {}%
-  {\iffieldundef{volume}
+  {\ifthenelse{\(\iffieldundef{volume}\AND\iffieldundef{part}\)\OR%
+      \(\iffieldundef{booktitle}\AND\NOT\ifentrytype{bookinbook}\)}% ???
     {\usebibmacro{cms-in:}% 16th ed (also 15th?)
       \printtext[maintitle]{%
         \printfield[noformat]{maintitle}%
         \setunit{\addcolon\addspace}%
         \printfield[noformat]{mainsubtitle}}%
       \newcunit
-      \printfield{maintitleaddon}}
+      \printfield{maintitleaddon}%
+      \toggletrue{cms@vol}}% InIn fix
     {\printfield{volume}%
       \printfield{part}%
       \setunit{\addspace}
@@ -1822,7 +2018,7 @@
   }%
   {\iffieldundef{number}%
     {\iffieldundef{bookpagination}%
-      {\setunit{\addcolon}}%
+      {\setunit{\postvolpunct}}%
       {\setunit{\addcolon\addspace}}%
       \printfield{pages}}%
     {\newcunit\printfield{pages}}}%
@@ -1847,7 +2043,7 @@
   }%
   {\iffieldundef{number}%
     {\iffieldundef{bookpagination}%
-      {\setunit{\addcolon}}%
+      {\setunit{\postvolpunct}}%
       {\setunit{\addcolon\addspace}}%
       \printfield{pages}}%
     {\newcunit\printfield{pages}}}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
index a1095a10057..9b41305c2eb 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
@@ -1,10 +1,10 @@
-% $Id: chicago-notes.cbx,v 0.9.7.55 2013/03/12 12:07:30 dfussner Exp $
+% $Id: chicago-notes.cbx,v 0.9.7.87 2013/10/29 12:32:14 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}[2013/03/12 v 2.5 biblatex citation style]
+\ProvidesFile{chicago-notes.cbx}[2013/10/29 v 2.8 biblatex citation style]
 
 %%%% Biblatex initialization + Chicago options + Toggles %%%%
 
@@ -23,6 +23,7 @@
 \providetoggle{cms@isbn}
 \providetoggle{cms@numbermonth}
 \providetoggle{cms@bookpages}
+\providetoggle{cms@hidevolumes}% Modify volume fix
 \providetoggle{cms@bookseries}
 \providetoggle{cms@notefield}
 \providetoggle{cms@addendum}
@@ -40,6 +41,16 @@
 \providetoggle{cms@loccit}
 \providetoggle{cms@annotation}
 \providetoggle{cms@postposit}
+\providetoggle{cms@vol}
+\providetoggle{cms@postvol}
+\providetoggle{cms@usedvol}
+\providetoggle{cms@citecrossref}
+\providetoggle{cms@bibcrossref}
+\providetoggle{cms@bookcitexref}
+\providetoggle{cms@bookbibxref}
+\providetoggle{cms@xrefvol}
+\providetoggle{cms@xrefpart}
+\providetoggle{cms@omitxrefdate}
 
 \AtEveryCitekey{%
   \iffieldundef{userc}%
@@ -59,7 +70,11 @@
     togl {cms@switchdates}
   }%
   {}%
-  {\iffieldundef{endyear}%
+  {\ifboolexpr{% Needed for open-ended ranges
+      test {\iffieldundef{endyear}}%
+      or
+      not test {\iffieldnum{endyear}}%
+    }%
     {\ifthenelse{\thefield{origyear}>\thefield{year}}%
       {\toggletrue{cms@switchdates}}%
       {}}%
@@ -94,6 +109,67 @@
 \DeclareEntryOption{juniorcomma}[true]{%
   \settoggle{cms@jrcomma}{#1}}
 
+\DeclareBibliographyOption{delayvolume}[true]{%
+  \settoggle{cms@postvol}{#1}}
+
+\DeclareEntryOption{delayvolume}[true]{%
+  \settoggle{cms@postvol}{#1}}
+
+\DeclareBibliographyOption{longcrossref}[false]{%
+  \ifcsdef{cms@opt@lxref@#1}%
+  {\csuse{cms@opt@lxref@#1}}
+  {\blx@err@invopt{longcrossref=#1}{}}}
+\def\cms@opt@lxref@none{%
+  \togglefalse{cms@citecrossref}%
+  \togglefalse{cms@bibcrossref}%
+  \togglefalse{cms@bookcitexref}%
+  \togglefalse{cms@bookbibxref}}
+\def\cms@opt@lxref@true{%
+  \toggletrue{cms@citecrossref}%
+  \toggletrue{cms@bibcrossref}}%
+\def\cms@opt@lxref@false{%
+  \togglefalse{cms@citecrossref}%
+  \togglefalse{cms@bibcrossref}}%
+\def\cms@opt@lxref@notes{%
+  \toggletrue{cms@citecrossref}%
+  \togglefalse{cms@bibcrossref}}%
+\def\cms@opt@lxref@bib{%
+  \togglefalse{cms@citecrossref}%
+  \toggletrue{cms@bibcrossref}}%
+
+\DeclareEntryOption{longcrossref}[false]{%
+  \ifcsdef{cms@opt@doi@#1}%
+  {\csuse{cms@opt@doi@#1}}
+  {\blx@err@invopt{doi=#1}{}}}
+
+\DeclareBibliographyOption{booklongxref}[true]{%
+  \ifcsdef{cms@opt@bklxref@#1}%
+  {\csuse{cms@opt@bklxref@#1}}
+  {\blx@err@invopt{booklongxref=#1}{}}}%
+\def\cms@opt@bklxref@true{%
+  \toggletrue{cms@bookcitexref}%
+  \toggletrue{cms@bookbibxref}}%
+\def\cms@opt@bklxref@false{%
+  \togglefalse{cms@bookcitexref}%
+  \togglefalse{cms@bookbibxref}}%
+\def\cms@opt@bklxref@notes{%
+  \toggletrue{cms@bookcitexref}%
+  \togglefalse{cms@bookbibxref}}%
+\def\cms@opt@bklxref@bib{%
+  \togglefalse{cms@bookcitexref}%
+  \toggletrue{cms@bookbibxref}}%
+
+\DeclareEntryOption{booklongxref}[true]{%
+  \ifcsdef{cms@opt@bklxref@#1}%
+  {\csuse{cms@opt@bklxref@#1}}
+  {\blx@err@invopt{booklongxref=#1}{}}}%
+
+\DeclareBibliographyOption{omitxrefdate}[true]{%
+  \settoggle{cms@omitxrefdate}{#1}}
+
+\DeclareEntryOption{omitxrefdate}[true]{%
+  \settoggle{cms@omitxrefdate}{#1}}
+
 % The field-exclusion options %
 
 \DeclareBibliographyOption{isbn}[true]{%
@@ -123,6 +199,8 @@
   \settoggle{cms@eprint}{#1}%
   \settoggle{cms@numbermonth}{#1}%
   \settoggle{cms@bookpages}{#1}}
+\DeclareBibliographyOption{hidevolumes}[true]{%
+  \settoggle{cms@hidevolumes}{#1}}
 
 \DeclareBibliographyOption{addendum}[true]{%
   \settoggle{cms@addendum}{#1}}
@@ -155,6 +233,8 @@
   \settoggle{cms@numbermonth}{#1}}
 \DeclareEntryOption{bookpages}[true]{%
   \settoggle{cms@bookpages}{#1}}
+\DeclareEntryOption{hidevolumes}[true]{%
+  \settoggle{cms@hidevolumes}{#1}}
 
 \DeclareEntryOption{addendum}[true]{%
   \settoggle{cms@addendum}{#1}}
@@ -163,7 +243,7 @@
 \DeclareEntryOption{notefield}[true]{%
   \settoggle{cms@notefield}{#1}}
 
-\ExecuteBibliographyOptions{includeall,completenotes}
+\ExecuteBibliographyOptions{includeall,completenotes,hidevolumes,booklongxref}
 
 % For author-date compatibility %
 
@@ -172,6 +252,8 @@
 
 \DeclareEntryOption{cmsdate}{}%
 
+\DeclareBibliographyOption{cmsdate}{}%
+
 \DeclareBibliographyOption{strict}[true]{%
   \let\splitfootnoterule\footnoterule
   \renewcommand\footnoterule{}%
@@ -213,7 +295,6 @@
 % American-specific punctuation change for 16th edition %
 
 \DefineBibliographyExtras{american}{%
-%  \DeclareCapitalPunctuation{.}%
   \DeclarePunctuationPairs{comma}{*!?}}
 
 %%%% Initialize and define bibstrings %%%%
@@ -258,57 +339,22 @@
         \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{crossref:volume+postnote}%
-            \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{crossref:volume+postnote}%
-        \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}}}}
+      {cite:\thefield{entrytype}}}}%
 
 \newbibmacro*{cite:short}{%
   \ifthenelse{\ifnameundef{labelname}\OR%
-    \iffieldequalstr{entrytype}{inreference}\OR%
-    \iffieldequalstr{entrytype}{reference}}%
+    \ifentrytype{inreference}\OR%
+    \ifentrytype{reference}\OR%
+    \ifentrytype{mvreference}}%
   {\iffieldequalstr{entrysubtype}{magazine}% Simplify .bib creation
     {\ifuseauthor%
       {\printfield[journaltitle]{journaltitle}\isdot\newcunit}%
       {}}%
-    {\iffieldequalstr{entrytype}{manual}%
+    {\ifentrytype{manual}%
       {\printlist{organization}\isdot\newcunit}%
       {}}}%
   {\iffieldequalstr{authortype}{anon}%
@@ -326,24 +372,26 @@
   }%
   {\printtext[bibhyperref]{%
     \printfield[citetitle]{labeltitle}}}%
-  {\printtext[bibhyperlink]{%
+  {\printtext[cmshyperlink]{%
     \printfield[citetitle]{labeltitle}}}}%:\thefield{entrytype}?
 
 \newbibmacro*{cite:shorthand}{%
   \iftoggle{cms@allshort}%
   {\printtext[bibhyperref]{%
       \printfield{shorthand}}}
-  {\printtext[bibhyperlink]{%
+  {\printtext[cmshyperlink]{%
       \printfield{shorthand}}}}
 
 \newbibmacro*{cms:shorthandintro}{% For changing the citedas phrase
-  \iffieldundef{shorthandintro}%
-  {\addspace%\setunit{\addspace}% Fix for after postnote field
-    \printtext[parens]{%
-      \bibstring{citedas}\space%
-      \printfield{shorthand}}}%
-  {\addspace%\setunit{\addspace}% Ditto
-    \printfield{shorthandintro}}}
+  \iffieldundef{shorthand}%
+  {}%
+  {\iffieldundef{shorthandintro}%
+    {%\addspace%\setunit{\addspace}% Fix for after postnote field
+      \printtext[parens]{%
+        \bibstring{citedas}\space%
+        \printfield{shorthand}}}%
+    {%\addspace%\setunit{\addspace}% Ditto
+      \printfield{shorthandintro}}}}
 
 \newbibmacro*{cite:ibid}{%
   \iftoggle{cms@noibid}
@@ -354,7 +402,7 @@
   {\iftoggle{cms@allshort}%
     {\printtext[bibhyperref]{%
         \bibstring[\mkibid]{ibidem}}}
-    {\printtext[bibhyperlink]{%
+    {\printtext[cmshyperlink]{%
         \bibstring[\mkibid]{ibidem}}}
     \ifloccit
     {\global\toggletrue{cms@loccit}}%
@@ -397,9 +445,37 @@
         \printfield[jourvol]{volume}%
         \ifthenelse{\iffieldundef{pagination}\AND%
           \iffieldundef{bookpagination}}%
-        {\setunit{\addcolon}}%
+        {\setunit{\postvolpunct}}%
         {\setunit{\addcolon\addspace}}}}}}
 
+%% Macros from verbose.cbx %%
+
+\newbibmacro*{textcite}{%
+  \ifnameundef{labelname}
+    {\printfield[citetitle]{labeltitle}}
+    {\printnames{labelname}}}
+
+\newbibmacro*{textcite:init}{%
+  \citetrackerfalse%
+  \pagetrackerfalse%
+  \iffirstcitekey
+    {\global\undef\cbx@lasthash}
+    {}}
+
+\newbibmacro*{textcite:count}{%
+  \stepcounter{textcitetotal}%
+  \ifnumgreater{\value{uniquelist}}{\value{maxnames}}
+    {\ifnumgreater{\value{uniquelist}}{\value{textcitemaxnames}}
+       {\setcounter{textcitemaxnames}{\value{uniquelist}}}
+       {}}
+    {\ifnumless{\value{labelname}}{\value{maxnames}}
+       {\ifnumgreater{\value{labelname}}{\value{textcitemaxnames}}
+          {\setcounter{textcitemaxnames}{\value{labelname}}}
+          {}}
+       {\ifnumgreater{\value{maxnames}}{\value{textcitemaxnames}}
+          {\setcounter{textcitemaxnames}{\value{maxnames}}}
+          {}}}}
+
 %%%% Citation Commands, internal and external %%%%
 
 \DeclareCiteCommand{\cite}
@@ -409,33 +485,41 @@
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
-\DeclareCiteCommand{\xrefcite}
+\DeclareCiteCommand{\cmsnoopcite}%
+{}{}{}{}%
+
+\DeclareCiteCommand{\bibxrefcite}
   {}%\usebibmacro{clearalmostall}} (?)
-  {\usebibmacro{citeindex}%
-    \usebibmacro{cms-in:}%
+  {\usebibmacro{cms-in:}%
     \ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
-      \(\iffieldequalstr{entrytype}{collection}\OR%
-      \iffieldequalstr{entrytype}{proceedings}\)}%
+      \(\ifentrytype{collection}\OR\ifentrytype{proceedings}\OR%
+      \ifentrytype{mvcollection}\OR\ifentrytype{mvproceedings}\)}%
     {\clearname{author}%
       \clearname{shortauthor}%
       \clearname{labelname}}%
     {}%
-    \usebibmacro{crosscite}}
+    \toggletrue{cms@shortnote}%
+    \togglefalse{cms@fullnote}%
+    \usebibmacro{cite:short}}
   {}
-  {}%\usebibmacro{xrefpostnote}}
+  {\usebibmacro{crossref:volume+postnote}}% Volume fix
 
-\DeclareCiteCommand{\bibxrefcite}
+\DeclareCiteCommand{\bookbibxrefcite}
   {}%\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}}%
+  {\iffieldequals{fullhash}{\bbx@lasthash}%
+    {\ifthenelse{\ifentrytype{collection}\OR%
+        \ifentrytype{proceedings}\OR\ifentrytype{mvcollection}\OR%
+        \ifentrytype{mvproceedings}}%
+      {\clearname{editor}%
+        \clearname{shorteditor}%
+        \clearname{labelname}}%
+      {\clearname{author}%
+        \clearname{shortauthor}%
+        \clearname{labelname}}}%
     {}%
     \toggletrue{cms@shortnote}%
     \togglefalse{cms@fullnote}%
+    \usebibmacro{bibxref-in:}%
     \usebibmacro{cite:short}}
   {}
   {\usebibmacro{crossref:volume+postnote}}% Volume fix
@@ -500,9 +584,10 @@
     {}%
     \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}%
+    {\DeclareNameAlias{sortname}{default}\clearfield{postnote}%
+      \clearname{author}\clearfield{userf}\clearfield{shorthand}%
+      \toggletrue{cms@fullnote}\toggletrue{cms@headlessnote}%
+      \frenchspacing}%
     {cite:\thefield{entrytype}}}%
   {\multicitedelim}%
   {\finentry}% Helps with annotated bibliographies (?)
@@ -514,7 +599,7 @@
     \nopunct\unspace}% Put \nopunct and \unspace here for 0.8e.
   {\usedriver
     {\DeclareNameAlias{sortname}{default}\clearfield{postnote}%
-      \usebibmacro{clearpublin}%
+      \usebibmacro{clearpublin}\clearfield{shorthand}%
       \toggletrue{cms@fullnote}\toggletrue{cms@headlessnote}%
       \toggletrue{cms@origpublished}\frenchspacing}%
     {cite:\thefield{entrytype}}}%
@@ -543,6 +628,30 @@
   {\multicitedelim}
   {\usebibmacro{cite:postnote}}
 
+\DeclareCiteCommand{\headlessparencite}[\mkbibparens]
+  {\usebibmacro{hlcprenote}}
+  {\usebibmacro{citeindex}%
+    \toggletrue{cms@headlessnote}%
+    \clearname{author}%
+    \clearname{shortauthor}%
+    \clearname{labelname}%
+    \usebibmacro{cite}}
+  {\multicitedelim}
+  {\usebibmacro{cite:postnote}}
+
+\DeclareCiteCommand{\headlessparenshortcite}[\mkbibparens]
+  {\usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+    \toggletrue{cms@headlessnote}%
+    \toggletrue{cms@shortnote}%
+    \togglefalse{cms@fullnote}%
+    \clearname{author}%
+    \clearname{shortauthor}%
+    \clearname{labelname}%
+    \usebibmacro{cite:short}}
+  {\multicitedelim}
+  {\usebibmacro{cite:postnote}}
+
 \DeclareCiteCommand{\surnamecite}
   {\usebibmacro{prenote}}%\usebibmacro{hlcprenote}}
   {\usebibmacro{citeindex}%
@@ -609,23 +718,90 @@
 
 \DeclareMultiCiteCommand{\citetitles}{citetitle}{\multicitedelim}
 
-\DeclareCiteCommand{\textcite}[\cbx@textcite\cbx@textcite@i]
-  {\boolfalse{citetracker}%
-   \gdef\cbx@savedkeys{}}
-  {\printnames{labelname}%
-   \xappto\cbx@savedkeys{\thefield{entrykey},}}
-  {\multinamedelim}
-  {\protected@xappto\cbx@savedcites{%
-     [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}}
-
-\DeclareMultiCiteCommand{\textcites}[\cbx@textcite\cbx@textcites@i]
-  {\textcite}{\multinamedelim}
-
-\newrobustcmd{\cbx@textcite}[2]{\def\cbx@savedcites{#1}#2\cbx@savedcites}
-\newrobustcmd{\cbx@textcite@i}{%
-  \iffootnote{\newcunit\bibstring{in}\addspace\headlesscite}{\footcite}}
-\newrobustcmd{\cbx@textcites@i}{%
-  \iffootnote{\newcunit\bibstring{in}\addspace\cites}{\footcites}}
+\DeclareMultiCiteCommand{\headlesscites}{headlesscite}{\multicitedelim}
+
+\DeclareMultiCiteCommand{\headlessparencites}[\mkbibparens]%
+{headlessparencite}{\multicitedelim}
+
+\DeclareMultiCiteCommand{\headlessparenshortcites}[\mkbibparens]%
+{headlessparenshortcite}{\multicitedelim}
+
+%% Textcite commands adapted from verbose.cbx %%
+
+\DeclareCiteCommand{\cbx@textcite}
+  {\usebibmacro{textcite:init}}
+  {\iffieldequals{namehash}{\cbx@lasthash}
+     {}
+     {\iffirstcitekey
+        {}
+        {\textcitedelim}%
+      \stepcounter{textcitecount}%
+      \usebibmacro{textcite}%
+      \savefield{namehash}{\cbx@lasthash}}}
+  {}
+  {}
+
+\DeclareCiteCommand{\textcite}[\cbx@textcite@init\cbx@textcite\cms@textcite@i]
+  {\usebibmacro{textcite:init}%
+   \gdef\cbx@savedkeys{}%
+   \DeferNextCitekeyHook}
+  {\ifthenelse{\iffirstcitekey\AND\value{multicitetotal}>0}
+     {\protected@xappto\cbx@footcite@args{%
+        (\thefield{multiprenote})(\thefield{multipostnote})}}
+     {}%
+   \xappto\cbx@savedkeys{\thefield{entrykey},}%
+   \iffieldequals{namehash}{\cbx@lasthash}
+     {}
+     {\usebibmacro{textcite:count}%
+      \savefield{namehash}{\cbx@lasthash}}%
+   \ifnumequal{\value{citecount}}{\value{citetotal}}
+     {\protected@xappto\cbx@textcite@args{{\cbx@savedkeys}}%
+      \protected@xappto\cbx@footcite@args{%
+        [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}%
+      \iflastcitekey
+        {\protected@xappto\cbx@textcite@args{\thefield{postpunct}}% Switch
+         \protected@xappto\cbx@footcite@args{\nopunct}}% these two?
+        {}}
+     {}}
+  {}
+  {}
+
+\newrobustcmd{\cbx@textcite@init}[3]{%
+  \setcounter{textcitetotal}{0}%
+  \setcounter{textcitecount}{0}%
+  \setcounter{textcitemaxnames}{0}%
+  \def\cbx@textcite@args{#1}\def\cbx@footcite@args{#2}#3%
+  \cbx@textcite@args\empty\cbx@footcite@args\empty}
+
+\DeclareMultiCiteCommand{\cbx@textcites}{\cbx@textcite}{}
+\DeclareMultiCiteCommand{\textcites}
+  [\cbx@textcites@init\cbx@textcites\cms@textcites@i]{\textcite}{}
+
+\let\cbx@textcites@init\cbx@textcite@init
+\pretocmd{\cbx@textcites@init}{%
+  \UseNextMultiCiteHook%
+  \AtNextMultiCite{%
+    \renewbibmacro{multiprenote}{}%
+    \renewbibmacro{multipostnote}{}}}{}{}
+
+\renewcommand*{\textcitedelim}{%
+  \iffinalcitedelim
+  {\ifnumgreater{\value{textcitetotal}}{2}
+    {\addcomma}%
+    {}%
+    \addspace\bibstring{and}}
+  {\addcomma}%
+  \space}
+
+\newrobustcmd{\cms@textcite@i}{%
+  \iffootnote{\foottextcite}{\footcite}}
+
+\newrobustcmd{\cms@textcites@i}{%
+  \iffootnote{\foottextcites}{\footcites}}
+
+\newcommand{\foottextcite}{\addspace\headlessparenshortcite}
+
+\newcommand{\foottextcites}{\addspace\headlessparenshortcites}
 
 %%%% Drivers for the Long Note Format %%%%
 
@@ -658,6 +834,8 @@
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
+  \setunit{\addspace}%
+  \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -690,6 +868,8 @@
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
+  \setunit{\addspace}%
+  \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}}
@@ -724,6 +904,8 @@
   \usebibmacro{fullpostnote}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
+  \setunit{\addspace}%
+  \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -753,7 +935,7 @@
   \usebibmacro{cbyeditor+others}%
   \iffieldundef{maintitle}
   {}
-  {\iffieldundef{volume}
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
     {\usebibmacro{cms-in:}%
       \printtext[maintitle]{%
         \printfield[noformat]{maintitle}%
@@ -761,7 +943,8 @@
         \printfield[noformat]{mainsubtitle}}%
       \newcunit
       \printfield{maintitleaddon}}
-    {\printfield{volume}%
+    {\toggletrue{cms@usedvol}%
+      \printfield{volume}%
       \printfield{part}%
       \setunit{\addspace}
       \bibstring{ofseries}%
@@ -782,7 +965,7 @@
   \usebibmacro{cpubl+loc+year}%
   \newcunit
   \printfield{type}%
-  \usebibmacro{fullpostnote}%
+  \usebibmacro{volfullpostnote}%
   \newcunit\newblock
   \usebibmacro{caddendum}%
   \newcunit\newblock
@@ -793,6 +976,8 @@
   {}%
   \newcunit\newblock%
   \usebibmacro{cite+doi+url}%
+  \setunit{\addspace}%
+  \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -804,6 +989,8 @@
   \printfield{nameaddon}%
   \newcunit\newblock
   \usebibmacro{citaltitle+stitle}%
+  \setunit{\addspace}%
+  \usebibmacro{cite:xref+date}%
   \newcunit
   \iffieldundef{maintitle}%
   {\iffieldundef{edition}%
@@ -815,7 +1002,21 @@
   \newcunit
   \usebibmacro{cpart+editor+translator}%
   \newcunit
-  \usebibmacro{cmtitle+mstitle+vol+part+title+stitle}%
+  \ifboolexpr{
+    test {\iffieldundef{crossref}}%
+    or
+    not test {\ifentryseen{\thefield{crossref}}}%
+    or
+    togl {cms@bookcitexref}%
+  }
+  {\ifboolexpr{
+      test {\iffieldundef{xref}}%
+      or
+      not test {\ifentryseen{\thefield{xref}}}%
+      or
+      togl {cms@bookcitexref}%
+    }
+  {\usebibmacro{cmtitle+mstitle+vol+part+title+stitle}%
   \newcunit\newblock
   \iffieldundef{edition}%
   {}%
@@ -835,7 +1036,7 @@
   {\clearfield{pages}}%
   \newcunit\newblock
   \usebibmacro{caddendum}%
-  \usebibmacro{fullpostnote}%
+  \usebibmacro{volfullpostnote}%
   \newcunit\newblock
   \printlist[][-\value{listtotal}]{lista}%
   \newcunit\newblock
@@ -844,9 +1045,24 @@
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
+  \setunit{\addspace}%
+  \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
+  \usebibmacro{finentry}%
+  \usebibmacro{book:xref+finentry}}%
+    {\ifterm{\addspace\bibsentence}%
+      {\addcomma\addspace}%
+      \usebibmacro{xrefprenote}% Volume fix
+      \bookbibxrefcite{\thefield{xref}}% Removed \addspace from each.
+      \usebibmacro{xrefpostnote}%
+      \usebibmacro{finentry}}}%
+  {\ifterm{\addspace\bibsentence}%
+    {\addcomma\addspace}%
+    \usebibmacro{xrefprenote}% Volume fix
+    \bookbibxrefcite{\thefield{crossref}}%
+    \usebibmacro{xrefpostnote}%
+    \usebibmacro{finentry}}}
 
 \DeclareBibliographyDriver{cite:bookinbook}{%
   \usebibmacro{bibindex}%
@@ -855,13 +1071,28 @@
   \printfield{nameaddon}%
   \newcunit\newblock
   \usebibmacro{citaltitle+stitle}%
+  \setunit{\addspace}%
+  \usebibmacro{cite:xref+date}%
   \newcunit\newblock
   \usebibmacro{byauthor}%
   \newcunit
   \usebibmacro{cpart+editor+translator}%
   \setunit*{\addcomma\addspace}%
-  \usebibmacro{cms-in:}%
-  \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
+  \ifboolexpr{
+    test {\iffieldundef{crossref}}%
+    or
+    not test {\ifentryseen{\thefield{crossref}}}%
+    or
+    togl {cms@bookcitexref}%
+  }
+  {\ifboolexpr{
+      test {\iffieldundef{xref}}%
+      or
+      not test {\ifentryseen{\thefield{xref}}}%
+      or
+      togl {cms@bookcitexref}%
+    }
+  {\usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
   \iffieldundef{edition}%
   {}%
@@ -879,16 +1110,31 @@
   \usebibmacro{cpubl+loc+year}%
   \newcunit\newblock
   \usebibmacro{caddendum}%
-  \usebibmacro{fullpostnote}%
+  \usebibmacro{volfullpostnote}%
   \newcunit\newblock
   \iftoggle{cms@isbn}%
   {\printfield{isbn}}%
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
+  \setunit{\addspace}%
+  \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
+  \usebibmacro{finentry}%
+  \usebibmacro{book:xref+finentry}}%
+    {\ifterm{\addspace\bibsentence}%
+      {\addcomma\addspace}%
+      \usebibmacro{xrefprenote}% Volume fix
+      \bookbibxrefcite{\thefield{xref}}% Removed \addspace from each.
+      \usebibmacro{xrefpostnote}%
+      \usebibmacro{finentry}}}%
+  {\ifterm{\addspace\bibsentence}%
+    {\addcomma\addspace}%
+    \usebibmacro{xrefprenote}% Volume fix
+    \bookbibxrefcite{\thefield{crossref}}%
+    \usebibmacro{xrefpostnote}%
+    \usebibmacro{finentry}}}
 
 \DeclareBibliographyDriver{cite:booklet}{%
   \usebibmacro{bibindex}%
@@ -909,6 +1155,8 @@
   \usebibmacro{fullpostnote}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
+  \setunit{\addspace}%
+  \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -920,8 +1168,24 @@
   \printfield{nameaddon}%
   \setunit{\addcomma\addspace}\newblock
   \usebibmacro{citaltitle+stitle}%
+  \setunit{\addspace}
+  \usebibmacro{cite:xref+date}%
   \newcunit
-  \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+  \ifboolexpr{
+    test {\iffieldundef{crossref}}%
+    or
+    not test {\ifentryseen{\thefield{crossref}}}%
+    or
+    togl {cms@bookcitexref}%
+  }
+  {\ifboolexpr{
+      test {\iffieldundef{xref}}%
+      or
+      not test {\ifentryseen{\thefield{xref}}}%
+      or
+      togl {cms@bookcitexref}%
+    }
+  {\usebibmacro{cmtitle+mstitle+vol+part+title+stitle}%
   \newcunit\newblock
   \iffieldundef{edition}%
   {}%
@@ -938,60 +1202,31 @@
   \usebibmacro{cpubl+loc+year}%
   \newcunit\newblock
   \usebibmacro{caddendum}%
-  \usebibmacro{fullpostnote}%
+  \usebibmacro{volfullpostnote}%
   \newcunit\newblock
   \iftoggle{cms@isbn}%
   {\printfield{isbn}}%
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
+  \setunit{\addspace}%
+  \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{cite:crossfull}{%
-  \ifcsdef{cbx@incollvol}%
-  {\restorefield{volume}{\cbx@incollvol}}%
-  {}%
-  \ifcsdef{cbx@incollpages}%
-  {\restorefield{pages}{\cbx@incollpages}}%
-  {}%
-  \ifcsdef{cbx@incollpgn}%
-  {\restorefield{pagination}{\cbx@incollpgn}}%
-  {}%
-  \ifcsdef{cbx@incollbkpgn}%
-  {\restorefield{bookpagination}{\cbx@incollbkpgn}}%
-  {}%
-  \ifcsdef{cbx@incollpart}%
-  {\restorefield{part}{\cbx@incollpart}}%
-  {}%
-  \usebibmacro{crefmtitle+mstitle+vol+part+title+stitle}%
-  \newcunit
-  \iffieldundef{edition}%
-  {}%
-  {\usebibmacro{edition}}%
-  \newcunit
-  \usebibmacro{bybookauthor}%
-  \usebibmacro{cbyeditor+others}%
-  \newcunit\newblock
-  \usebibmacro{volume+or+volumes}%
-  \newcunit\newblock
-  \usebibmacro{cser+num}%
-  \newcunit\newblock
-  \usebibmacro{cnotefield}%
-  \newcunit\newblock
-  \usebibmacro{cpubl+loc+year}%
-  \newcunit\newblock
-  \usebibmacro{caddendum}%
-  \usebibmacro{fullpostnote}%
-  \newcunit\newblock
-  \iftoggle{cms@isbn}%
-  {\printfield{isbn}}%
-  {}%
-  \newcunit\newblock
-  \usebibmacro{cite+doi+url}%
-  \newcunit\newblock
-  \usebibmacro{pageref}}%
+  \usebibmacro{finentry}%
+  \usebibmacro{book:xref+finentry}}%
+    {\ifterm{\addspace\bibsentence}%
+      {\addcomma\addspace}%
+      \usebibmacro{xrefprenote}% Volume fix
+      \bookbibxrefcite{\thefield{xref}}% Removed \addspace from each.
+      \usebibmacro{xrefpostnote}%
+      \usebibmacro{finentry}}}%
+  {\ifterm{\addspace\bibsentence}%
+    {\addcomma\addspace}%
+    \usebibmacro{xrefprenote}% Volume fix
+    \bookbibxrefcite{\thefield{crossref}}%
+    \usebibmacro{xrefpostnote}%
+    \usebibmacro{finentry}}}
 
 \DeclareBibliographyDriver{cite:customc}{%
   \usebibmacro{bibindex}%
@@ -1032,6 +1267,8 @@
   \usebibmacro{fullpostnote}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
+  \setunit{\addspace}%
+  \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -1050,8 +1287,21 @@
   \setunit{\addcomma\addspace}%
   \usebibmacro{cpart+editor+translator}%
   \setunit{\addcomma\addspace}%
-  \usebibmacro{chapincoll}%
-  \usebibmacro{cms-in:}%
+  \ifboolexpr{
+    test {\iffieldundef{crossref}}%
+    or
+    not test {\ifentryseen{\thefield{crossref}}}%
+    or
+    togl {cms@citecrossref}%
+  }
+  {\ifboolexpr{
+      test {\iffieldundef{xref}}%
+      or
+      not test {\ifentryseen{\thefield{xref}}}%
+      or
+      togl {cms@citecrossref}%
+    }
+  {\usebibmacro{chapincoll}%
   \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
   \iffieldundef{edition}%
@@ -1070,16 +1320,37 @@
   \usebibmacro{cpubl+loc+year}%
   \newcunit\newblock
   \usebibmacro{caddendum}%
-  \usebibmacro{fullpostnote}%
+  \usebibmacro{volfullpostnote}%
   \newcunit\newblock
   \iftoggle{cms@isbn}%
   {\printfield{isbn}}%
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
+  \setunit{\addspace}%
+  \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
+  \usebibmacro{finentry}%
+  \usebibmacro{cite:xref+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{xrefprenote}% Volume fix
+      \usebibmacro{chapincoll}%
+      \bibxrefcite{\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{xrefprenote}% Volume fix
+    \usebibmacro{chapincoll}%
+    \bibxrefcite{\thefield{crossref}}%
+    \usebibmacro{xrefpostnote}%
+    \usebibmacro{finentry}}}
 
 \DeclareBibliographyDriver{cite:incollection}{%
   \usebibmacro{bibindex}%
@@ -1095,10 +1366,21 @@
   \setunit{\addcomma\addspace}%
   \usebibmacro{cpart+editor+translator}%
   \setunit{\addcomma\addspace}%
-  \iffieldundef{crossref}%
-  {\iffieldundef{xref}
+  \ifboolexpr{
+    test {\iffieldundef{crossref}}%
+    or
+    not test {\ifentryseen{\thefield{crossref}}}%
+    or
+    togl {cms@citecrossref}%
+  }
+  {\ifboolexpr{
+      test {\iffieldundef{xref}}%
+      or
+      not test {\ifentryseen{\thefield{xref}}}%
+      or
+      togl {cms@citecrossref}%
+    }
     {\usebibmacro{chapincoll}%
-      \usebibmacro{cms-in:}%
       \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
       \newcunit
       \iffieldundef{edition}%
@@ -1117,23 +1399,26 @@
       \usebibmacro{cpubl+loc+year}%
       \newcunit\newblock
       \usebibmacro{caddendum}%
-      \usebibmacro{fullpostnote}%
+      \usebibmacro{volfullpostnote}%
       \newcunit\newblock
       \iftoggle{cms@isbn}%
       {\printfield{isbn}}%
       {}%
       \newcunit\newblock
       \usebibmacro{cite+doi+url}%
+      \setunit{\addspace}%
+      \usebibmacro{cms:shorthandintro}%
       \newcunit\newblock
       \usebibmacro{pageref}%
-      \usebibmacro{finentry}}
+      \usebibmacro{finentry}%
+      \usebibmacro{cite:xref+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{xrefprenote}% Volume fix
       \usebibmacro{chapincoll}%
-      \xrefcite{\thefield{xref}}% Removed \addspace from each.
+      \bibxrefcite{\thefield{xref}}% Removed \addspace from each.
       \usebibmacro{xrefpostnote}%
       \usebibmacro{finentry}}}%
   {\ifterm{\iffieldundef{chapter}% New test needed to cope with
@@ -1142,7 +1427,7 @@
     {\addcomma\addspace}%
     \usebibmacro{xrefprenote}% Volume fix
     \usebibmacro{chapincoll}%
-    \xrefcite{\thefield{crossref}}%
+    \bibxrefcite{\thefield{crossref}}%
     \usebibmacro{xrefpostnote}%
     \usebibmacro{finentry}}}
 
@@ -1160,10 +1445,21 @@
   \setunit{\addcomma\addspace}%
   \usebibmacro{cpart+editor+translator}%
   \setunit{\addcomma\addspace}%
-  \iffieldundef{crossref}%
-  {\iffieldundef{xref}
+  \ifboolexpr{
+    test {\iffieldundef{crossref}}%
+    or
+    not test {\ifentryseen{\thefield{crossref}}}%
+    or
+    togl {cms@citecrossref}%
+  }
+  {\ifboolexpr{
+      test {\iffieldundef{xref}}%
+      or
+      not test {\ifentryseen{\thefield{xref}}}%
+      or
+      togl {cms@citecrossref}%
+    }
     {\usebibmacro{chapincoll}%
-      \usebibmacro{cms-in:}%
       \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
       \newcunit\newblock
       \usebibmacro{volume+or+volumes}%
@@ -1176,23 +1472,26 @@
         \usebibmacro{org+publ+loc+year}}%
       \newcunit\newblock
       \usebibmacro{caddendum}%
-      \usebibmacro{fullpostnote}%
+      \usebibmacro{volfullpostnote}%
       \newcunit\newblock
       \iftoggle{cms@isbn}%
       {\printfield{isbn}}%
       {}%
       \newcunit\newblock
       \usebibmacro{cite+doi+url}%
+      \setunit{\addspace}%
+      \usebibmacro{cms:shorthandintro}%
       \newcunit\newblock
       \usebibmacro{pageref}%
-      \usebibmacro{finentry}}
+      \usebibmacro{finentry}%
+      \usebibmacro{cite:xref+finentry}}%
     {\ifterm{\iffieldundef{chapter}% New test needed to cope with
       {\addspace\bibsentence}%     new chapter citing system.
       {\setunit{\addspace\bibsentence}}}% See incollection
       {\addcomma\addspace}%
       \usebibmacro{xrefprenote}% Volume fix
       \usebibmacro{chapincoll}%
-      \xrefcite{\thefield{xref}}%
+      \bibxrefcite{\thefield{xref}}%
       \usebibmacro{xrefpostnote}%
       \usebibmacro{finentry}}}%
   {\ifterm{\iffieldundef{chapter}% New test needed to cope with
@@ -1201,7 +1500,7 @@
     {\addcomma\addspace}%
     \usebibmacro{xrefprenote}% Volume fix
     \usebibmacro{chapincoll}%
-    \xrefcite{\thefield{crossref}}%
+    \bibxrefcite{\thefield{crossref}}%
     \usebibmacro{xrefpostnote}%
     \usebibmacro{finentry}}}
 
@@ -1217,7 +1516,6 @@
   \newcunit
   \usebibmacro{cpart+editor+translator}%
   \setunit*{\addcomma\addspace}%
-  \usebibmacro{alt-in:}%
   \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
   \iffieldundef{edition}%
@@ -1250,6 +1548,8 @@
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
+  \setunit{\addspace}%
+  \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -1268,10 +1568,21 @@
   \newcunit\newblock%
   \usebibmacro{cpart+editor+translator}%
   \setunit*{\addcomma\addspace}%
-  \iffieldundef{crossref}%
-  {\iffieldundef{xref}%
+  \ifboolexpr{
+    test {\iffieldundef{crossref}}%
+    or
+    not test {\ifentryseen{\thefield{crossref}}}%
+    or
+    togl {cms@citecrossref}%
+  }
+  {\ifboolexpr{
+      test {\iffieldundef{xref}}%
+      or
+      not test {\ifentryseen{\thefield{xref}}}%
+      or
+      togl {cms@citecrossref}%
+    }
     {\usebibmacro{chapincoll}%
-      \usebibmacro{cms-in:}%
       \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
       \newcunit
       \iffieldundef{edition}%
@@ -1290,23 +1601,26 @@
       \usebibmacro{cpubletter+loc+year}%
       \newcunit\newblock
       \usebibmacro{caddendum}%
-      \usebibmacro{fullpostnote}%
+      \usebibmacro{volfullpostnote}%
       \newcunit\newblock
       \iftoggle{cms@isbn}%
       {\printfield{isbn}}%
       {}%
       \newcunit\newblock
       \usebibmacro{cite+doi+url}%
+      \setunit{\addspace}%
+      \usebibmacro{cms:shorthandintro}%
       \newcunit\newblock
       \usebibmacro{pageref}%
-      \usebibmacro{finentry}}%
+      \usebibmacro{finentry}%
+      \usebibmacro{cite:xref+finentry}}%
     {\ifterm{\iffieldundef{chapter}% New test needed to cope with
       {\addspace\bibsentence}%     new chapter citing system.
       {\setunit{\addspace\bibsentence}}}%
       {\addcomma\addspace}%
       \usebibmacro{xrefprenote}% Volume fix
       \usebibmacro{chapincoll}%
-      \xrefcite{\thefield{xref}}%
+      \bibxrefcite{\thefield{xref}}%
       \usebibmacro{xrefpostnote}%
       \usebibmacro{finentry}}}%
   {\ifterm{\iffieldundef{chapter}% New test needed to cope with
@@ -1315,7 +1629,7 @@
     {\addcomma\addspace}%
     \usebibmacro{xrefprenote}% Volume fix
     \usebibmacro{chapincoll}%
-    \xrefcite{\thefield{crossref}}%
+    \bibxrefcite{\thefield{crossref}}%
     \usebibmacro{xrefpostnote}%
     \usebibmacro{finentry}}}
 
@@ -1348,6 +1662,8 @@
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
+  \setunit{\addspace}%
+  \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -1394,6 +1710,8 @@
   \usebibmacro{fullpostnote}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
+  \setunit{\addspace}%
+  \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -1423,7 +1741,7 @@
   \usebibmacro{cbyeditor+others}%
   \iffieldundef{maintitle}
   {}
-  {\iffieldundef{volume}
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
     {\usebibmacro{cms-in:}%
       \printtext[maintitle]{%
         \printfield[noformat]{maintitle}%
@@ -1431,7 +1749,8 @@
         \printfield[noformat]{mainsubtitle}}%
       \newcunit
       \printfield{maintitleaddon}}
-    {\printfield{volume}%
+    {\toggletrue{cms@usedvol}%
+      \printfield{volume}%
       \printfield{part}%
       \setunit{\addspace}
       \bibstring{ofseries}%
@@ -1475,10 +1794,20 @@
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
+  \setunit{\addspace}%
+  \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
 
+\DeclareBibliographyAlias{cite:mvbook}{cite:book}
+
+\DeclareBibliographyAlias{cite:mvcollection}{cite:collection}
+
+\DeclareBibliographyAlias{cite:mvproceedings}{cite:proceedings}
+
+\DeclareBibliographyAlias{cite:mvreference}{cite:reference}
+
 \DeclareBibliographyDriver{cite:online}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
@@ -1514,6 +1843,8 @@
   \printfield{url}%
   \newcunit\newblock
   \usebibmacro{caddendum}%
+  \setunit{\addspace}%
+  \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -1555,6 +1886,8 @@
   \usebibmacro{fullpostnote}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
+  \setunit{\addspace}%
+  \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -1584,6 +1917,8 @@
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
+  \setunit{\addspace}%
+  \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}%
@@ -1612,6 +1947,8 @@
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
+  \setunit{\addspace}%
+  \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}}
@@ -1623,8 +1960,24 @@
   \printfield{nameaddon}%
   \setunit{\addcomma\addspace}\newblock%
   \usebibmacro{citaltitle+stitle}%
+  \setunit{\addspace}
+  \usebibmacro{cite:xref+date}%
   \newcunit
-  \usebibmacro{cmtitle+mstitle+vol+part+title+stitle}%
+  \ifboolexpr{
+    test {\iffieldundef{crossref}}%
+    or
+    not test {\ifentryseen{\thefield{crossref}}}%
+    or
+    togl {cms@bookcitexref}%
+  }
+  {\ifboolexpr{
+      test {\iffieldundef{xref}}%
+      or
+      not test {\ifentryseen{\thefield{xref}}}%
+      or
+      togl {cms@bookcitexref}%
+    }
+  {\usebibmacro{cmtitle+mstitle+vol+part+title+stitle}%
   \newcunit\newblock
   \usebibmacro{volume+or+volumes}%
   \newcunit\newblock
@@ -1636,16 +1989,31 @@
   \usebibmacro{org+publ+loc+year}}%
   \newcunit\newblock
   \usebibmacro{caddendum}%
-  \usebibmacro{fullpostnote}%
+  \usebibmacro{volfullpostnote}%
   \newcunit\newblock
   \iftoggle{cms@isbn}%
   {\printfield{isbn}}%
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
+  \setunit{\addspace}%
+  \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
-  \usebibmacro{finentry}}
+  \usebibmacro{finentry}%
+  \usebibmacro{book:xref+finentry}}%
+    {\ifterm{\addspace\bibsentence}%
+      {\addcomma\addspace}%
+      \usebibmacro{xrefprenote}% Volume fix
+      \bookbibxrefcite{\thefield{xref}}% Removed \addspace from each.
+      \usebibmacro{xrefpostnote}%
+      \usebibmacro{finentry}}}%
+  {\ifterm{\addspace\bibsentence}%
+    {\addcomma\addspace}%
+    \usebibmacro{xrefprenote}% Volume fix
+    \bookbibxrefcite{\thefield{crossref}}%
+    \usebibmacro{xrefpostnote}%
+    \usebibmacro{finentry}}}
 
 \DeclareBibliographyDriver{cite:reference}{%
   \usebibmacro{bibindex}%
@@ -1659,7 +2027,6 @@
   \newcunit
   \usebibmacro{cpart+editor+translator}%
   \setunit*{\addcomma\addspace}%
-  \usebibmacro{alt-in:}%
   \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit
   \iffieldundef{edition}%
@@ -1678,13 +2045,15 @@
   \usebibmacro{cpubl+loc+year}%
   \newcunit\newblock
   \usebibmacro{caddendum}%
-  \usebibmacro{fullpostnote}%
+  \usebibmacro{volfullpostnote}%
   \newcunit\newblock
   \iftoggle{cms@isbn}%
   {\printfield{isbn}}%
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
+  \setunit{\addspace}%
+  \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -1718,6 +2087,8 @@
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
+  \setunit{\addspace}%
+  \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -1760,6 +2131,8 @@
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
+  \setunit{\addspace}%
+  \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -1800,13 +2173,15 @@
   \clearfield{pages}% ?? For 16th ed.
   \newcunit\newblock
   \usebibmacro{caddendum}%
-  \usebibmacro{fullpostnote}%
+  \usebibmacro{volfullpostnote}%
   \newcunit\newblock
   \iftoggle{cms@isbn}%
   {\printfield{isbn}}%
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
+  \setunit{\addspace}%
+  \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -1836,6 +2211,8 @@
   \usebibmacro{fullpostnote}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
+  \setunit{\addspace}%
+  \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -1851,6 +2228,8 @@
   \usebibmacro{language+transtitle}%
   \setunit{\addcomma\addspace}%
   \usebibmacro{byauthor}%
+  \newcunit\newblock%
+  \usebibmacro{cbyeditor+others}%
   \setunit{\addspace}\newblock%
   \printtext[parens]{%
     \printfield{howpublished}%
@@ -1865,6 +2244,8 @@
   \usebibmacro{fullpostnote}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
+  \setunit{\addspace}%
+  \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -1894,7 +2275,7 @@
   \usebibmacro{cbyeditor+others}%
   \iffieldundef{maintitle}
   {}
-  {\iffieldundef{volume}
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
     {\usebibmacro{cms-in:}%
       \printtext[maintitle]{%
         \printfield[noformat]{maintitle}%
@@ -1902,7 +2283,8 @@
         \printfield[noformat]{mainsubtitle}}%
       \newcunit
       \printfield{maintitleaddon}}
-    {\printfield{volume}%
+    {\toggletrue{cms@usedvol}%
+      \printfield{volume}%
       \printfield{part}%
       \setunit{\addspace}
       \bibstring{ofseries}%
@@ -1925,7 +2307,7 @@
   \usebibmacro{cpubl+loc+year}%
   \newcunit\newblock
   \printfield{type}% Order of this and next?
-  \usebibmacro{fullpostnote}%
+  \usebibmacro{volfullpostnote}%
   \newcunit\newblock
   \usebibmacro{caddendum}%
   \newcunit\newblock
@@ -1934,6 +2316,8 @@
   {}%
   \newcunit\newblock
   \usebibmacro{cite+doi+url}%
+  \setunit{\addspace}%
+  \usebibmacro{cms:shorthandintro}%
   \newcunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -1987,90 +2371,55 @@
 
 %%%% Field Formats -- Title, Citetitle, Lostitle %%%%
 
+\DeclareFieldFormat{title}{\mkbibemph{#1}\isdot}
 
-\DeclareFieldFormat[article]{title}{%
+\DeclareFieldFormat{citetitle}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldFormat{lostitle}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldFormat
+[article,inbook,incollection,inproceedings,online,thesis,unpublished]
+{title}{%
   \iffieldundef{title}%
   {}%
   {\mkbibquote{#1\isdot}}}
 
-\DeclareFieldFormat[article]{citetitle}{%
+\DeclareFieldFormat
+[article,inbook,incollection,inproceedings,online,thesis,unpublished]
+{citetitle}{%
   \iffieldundef{title}%
   {#1\isdot}%
   {\mkbibquote{#1\isdot}}}
 
-\DeclareFieldFormat[article]{lostitle}{%
+\DeclareFieldFormat
+[article,inbook,incollection,inproceedings,online,thesis,unpublished]
+{lostitle}{%
   \iffieldundef{title}%
   {#1\isdot}%
   {\mkbibquote{#1\isdot}}}
 
-\DeclareFieldFormat[artwork]{title}{%
+\DeclareFieldFormat[artwork,image]{title}{%
   \iffieldundef{entrysubtype}%
   {\mkbibemph{#1}\isdot}%
   {#1\isdot}}
 
-\DeclareFieldFormat[artwork]{citetitle}{%
+\DeclareFieldFormat[artwork,image]{citetitle}{%
   \iffieldundef{entrysubtype}%
   {\mkbibemph{#1}\isdot}%
   {#1\isdot}}
 
-\DeclareFieldFormat[artwork]{lostitle}{%
+\DeclareFieldFormat[artwork,image]{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[letter,patent]{title}{#1\isdot}
 
-\DeclareFieldFormat[periodical]{title}{\mkbibemph{#1}\isdot}
+\DeclareFieldFormat[letter,patent]{citetitle}{#1\isdot}
 
-\DeclareFieldFormat[periodical]{citetitle}{\mkbibemph{#1}\isdot}
+\DeclareFieldFormat[letter,patent]{lostitle}{#1\isdot}
 
-\DeclareFieldFormat[periodical]{lostitle}{\mkbibemph{#1}\isdot}
-
-\DeclareFieldAlias[image]{title}[artwork]{title}
-
-\DeclareFieldAlias[image]{citetitle}[artwork]{citetitle}
-
-\DeclareFieldAlias[image]{lostitle}[artwork]{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}[letter]{title}
-
-\DeclareFieldAlias[patent]{citetitle}[letter]{citetitle}
-
-\DeclareFieldAlias[patent]{lostitle}[letter]{lostitle}
-
-\DeclareFieldAlias[unpublished]{title}[article]{title}
-
-\DeclareFieldAlias[unpublished]{citetitle}[article]{citetitle}
-
-\DeclareFieldAlias[unpublished]{lostitle}[article]{lostitle}
+\DeclareFieldFormat{prenote}{\ifcapital{\MakeCapital{#1}}{#1}}
 
 \DeclareFieldFormat{postnote}{% Removed \isdots -- required
   \iffieldundef{pagination}%    elsewhere also?
@@ -2094,20 +2443,14 @@
     {\bibstring{ed#1}}
     {\ifcapital{\MakeCapital{#1}}{#1}}}}
 
-\DeclareFieldAlias[inbook]{title}[article]{title}
-
-\DeclareFieldAlias[inbook]{citetitle}[article]{citetitle}
-
-\DeclareFieldAlias[inbook]{lostitle}[article]{lostitle}
+\DeclareFieldFormat[suppbook,suppcollection]{title}{\mkbibemph{#1}\isdot}
 
-\DeclareFieldFormat[suppbook]{title}{\mkbibemph{#1}\isdot}
-
-\DeclareFieldFormat[suppbook]{citetitle}{%
+\DeclareFieldFormat[suppbook,suppcollection]{citetitle}{%
   \usebibmacro{inforaft}%
   \addspace%
   \mkbibemph{#1}\isdot}
 
-\DeclareFieldFormat[suppbook]{lostitle}{%
+\DeclareFieldFormat[suppbook,suppcollection]{lostitle}{%
   \usebibmacro{inforaft}%
   \addspace%
   \mkbibemph{#1}\isdot}
@@ -2126,30 +2469,6 @@
     #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}%
@@ -2165,54 +2484,30 @@
   {\mkbibemph{#1}\isdot}%
   {\ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}}
 
-\DeclareFieldFormat[review]{title}{%
+\DeclareFieldFormat[review,suppperiodical]{title}{%
   \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}
 
-\DeclareFieldFormat[review]{citetitle}{%
+\DeclareFieldFormat[review,suppperiodical]{citetitle}{%
   \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}
 
-\DeclareFieldFormat[review]{lostitle}{%
+\DeclareFieldFormat[review,suppperiodical]{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}{%
+\DeclareFieldFormat[audio,music,video]{title}{%
   \iffieldundef{booktitle}%
   {\mkbibemph{#1}\isdot}%
   {\mkbibquote{#1\isdot}}}
 
-\DeclareFieldFormat[video]{citetitle}{%
+\DeclareFieldFormat[audio,music,video]{citetitle}{%
   \iffieldundef{booktitle}%
   {\mkbibemph{#1}\isdot}%
   {\mkbibquote{#1\isdot}}}
 
-\DeclareFieldFormat[video]{lostitle}{%
+\DeclareFieldFormat[audio,music,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.
@@ -2222,36 +2517,20 @@
 \DeclareFieldFormat{note}{%
   \ifcapital{\MakeCapital{#1}}{#1}}%
 
-\DeclareFieldFormat[suppbook]{type}{%
+\DeclareFieldFormat
+[audio,manual,music,patent,report,suppbook,suppcollection,thesis,video]
+{type}{%
   \ifbibstring{#1}%
   {\bibstring{#1}}%
   {\ifcapital%
     {\MakeCapital{#1\isdot}}%
     {#1\isdot}}}
 
-\DeclareFieldFormat[artwork]{type}{%
+\DeclareFieldFormat[artwork,image]{type}{%
   \ifcapital%
   {\MakeCapital{#1}}%
   {#1}}
 
-\DeclareFieldAlias[patent]{type}[suppbook]{type}
-
-\DeclareFieldAlias[manual]{type}[suppbook]{type}
-
-\DeclareFieldAlias[thesis]{type}[suppbook]{type}
-
-\DeclareFieldAlias[report]{type}[suppbook]{type}
-
-\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}{%
@@ -2260,6 +2539,23 @@
     {\href{http://dx.doi.org/#1}{\nolinkurl{#1}}}
     {\nolinkurl{#1}}}
 
+\DeclareFieldFormat[music]{date}{% Generalize userd ???
+  \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{urlyear}%
+  \OR\NOT\iffieldundef{eventyear}\OR\NOT\iffieldundef{origyear}}%
+  {#1}%
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat[video]{date}{% Generalize userd ???
+  \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{urlyear}%
+  \OR\NOT\iffieldundef{eventyear}}%
+  {#1}%
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat{date}{% Generalize userd ???
+  \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{urlyear}}%
+  {#1}%
+  {\printfield{userd}\addspace #1}}
+
 \DeclareFieldFormat{urldate}{% 16th ed.
   \iffieldundef{userd}%
   {\bibstring{urlseen}\space #1}%
@@ -2306,7 +2602,7 @@
 
 \DeclareFieldFormat{edition}{% New in 0.8
   \ifinteger{#1}
-  {\mkbibordinal{#1}~\bibstring{edition}}%
+  {\mkbibordedition{#1}~\bibstring{edition}}%
   {\ifcapital
     {\MakeCapital{#1\isdot}}%
     {#1\isdot}}}
@@ -2342,7 +2638,7 @@
 
 \DeclareFieldFormat{jourser}{%
   \ifinteger{#1}%
-  {\mkbibordinal{#1}%
+  {\mkbibordseries{#1}%
     \addnbspace%
     \bibstring{jourser}}%
   {\ifbibstring{#1}{\bibstring{#1}}{#1}}}
@@ -2371,7 +2667,79 @@
 
 \DeclareFieldFormat{annotation}{\par\nobreak \vskip \bibitemsep #1}
 
-\DeclareFieldFormat{part}{\addcomma\bibstring{partvolume}~#1}
+\DeclareFieldFormat{part}{% xref revision ???
+  \ifnumerals{#1}%
+  {\addcomma\addspace\bibstring{partvolume}~#1}%
+  {\addcomma\addspace\ifcapital{\MakeCapital{#1}}{#1}}}
+
+\DeclareFieldFormat{xrefpart}{% xref revision ???
+  \ifnumerals{#1}%
+  {\bibstring{partvolume}~#1}%
+  {\ifcapital{\MakeCapital{#1}}{#1}}}
+
+%% This tries to get hyperlinks from shortened cross-ref'd notes to %%
+%% long notes working properly.  Used in short and shorthand cites. %%
+
+\DeclareFieldFormat{cmshyperlink}{%
+  \iffieldundef{crossref}%
+  {\iffieldundef{xref}%
+    {\bibhyperlink{\thefield{entrykey}}{#1}}%
+    {\ifboolexpr{((
+        test {\ifentrytype{book}}%
+        or
+        test {\ifentrytype{bookinbook}}%
+        or
+        test {\ifentrytype{collection}}%
+        or
+        test {\ifentrytype{proceedings}}%
+        )
+        and
+        not togl {cms@bookcitexref}%
+        )
+        or
+        ((
+        test {\ifentrytype{inbook}}%
+        or
+        test {\ifentrytype{letter}}%
+        or
+        test {\ifentrytype{incollection}}%
+        or
+        test {\ifentrytype{inproceedings}}%
+        )
+        and
+        not togl {cms@citecrossref}
+        )
+      }%
+      {\bibhyperlink{\thefield{xref}}{#1}}%
+      {\bibhyperlink{\thefield{entrykey}}{#1}}}}%
+  {\ifboolexpr{((
+        test {\ifentrytype{book}}%
+        or
+        test {\ifentrytype{bookinbook}}%
+        or
+        test {\ifentrytype{collection}}%
+        or
+        test {\ifentrytype{proceedings}}%
+        )
+        and
+        not togl {cms@bookcitexref}%
+        )
+        or
+        ((
+        test {\ifentrytype{inbook}}%
+        or
+        test {\ifentrytype{letter}}%
+        or
+        test {\ifentrytype{incollection}}%
+        or
+        test {\ifentrytype{inproceedings}}%
+        )
+        and
+        not togl {cms@citecrossref}
+        )
+      }%
+      {\bibhyperlink{\thefield{crossref}}{#1}}%
+      {\bibhyperlink{\thefield{entrykey}}{#1}}}}
 
 \DeclareFieldAlias[review]{volume}[article]{volume}
 
@@ -2386,6 +2754,9 @@
 
 \renewcommand*{\multicitedelim}{\addsemicolon\space}
 
+\renewcommand*{\iffinalcitedelim}{%
+  \ifnumequal{\value{textcitecount}}{\value{textcitetotal}-1}}
+
 \newcommand{\custpunct}{%
   \iftoggle{cms@fullnote}%
   {\iffieldequalstr{type}{plain}%
@@ -2415,7 +2786,7 @@
 \newcommand{\classicpunct}{% 16th ed.
   \ifthenelse{\(\iffieldequalstr{entrysubtype}{classical}\AND%
     \iffieldundef{labeltitle}\)\OR
-    \iffieldequalstr{entrytype}{letter}}%
+    \ifentrytype{letter}}%
   {\setunit*{\addspace}}%
   {\setunit*{\addcomma\addspace}}}
 
@@ -2426,7 +2797,7 @@
 
 \newcommand{\encypunct}{% for named entries in an encyclopedia
   \iftoggle{cms@fullnote}%
-  {\iffieldequalstr{entrytype}{book}%
+  {\ifentrytype{book}%
     {\ifthenelse{\iffieldundef{addendum}\AND\iffieldundef{doi}\AND
         \iffieldundef{isbn}\AND\iffieldundef{url}}%
       {\ifthenelse{\value{multicitecount} < \value{multicitetotal}}%
@@ -2441,12 +2812,14 @@
           {\addperiod}}%
         {\addcomma}}%
       {}}}%
-  {\iffieldequalstr{entrytype}{book}%
+  {\ifentrytype{book}%
     {\addperiod}%
     {\ifnameundef{author}%
       {\addperiod}%
       {}}}}
 
+\newcommand{\postvolpunct}{\addcolon}% For vol:page customization
+
 \newcommand{\parttrans}{%
   \iftoggle{cms@fullnote}%
   {\bibstring{cbytranslator}\space}%
@@ -2518,10 +2891,10 @@
       {\addcomma\addspace}}%
     {\addcomma\addspace}}% 16th ed -- no more volumes test.
   {\iftoggle{cms@fullnote}%
-    {\ifthenelse{\(\iffieldequalstr{entrytype}{article}\OR
-        \iffieldequalstr{entrytype}{review}\OR
-        \iffieldequalstr{entrytype}{periodical}\OR
-        \iffieldequalstr{entrytype}{suppperiodical}\)\AND\NOT
+    {\ifthenelse{\(\ifentrytype{article}\OR
+        \ifentrytype{review}\OR
+        \ifentrytype{periodical}\OR
+        \ifentrytype{suppperiodical}\)\AND\NOT
         \iffieldequalstr{entrysubtype}{magazine}}%
       {\addcolon\addspace}%
       {\addcomma\addspace}}%
@@ -2583,6 +2956,60 @@
     {}%
   \finentry}
 
+\newbibmacro*{book:xref+finentry}{%
+  \iffieldundef{crossref}%
+  {\iffieldundef{xref}%
+    {}%
+    {\iftoggle{cms@bookcitexref}%
+      {}%
+      {\ifboolexpr{
+          test {\ifpunct}%
+          or
+          test {\ifpunctmark{*}}%
+        }%
+        {\bibhypertarget{\thefield{xref}}%
+          {\cmsnoopcite{\thefield{xref}}}\nopunct}%
+        {\bibhypertarget{\thefield{xref}}%
+          {\cmsnoopcite{\thefield{xref}}}}}}}%
+  {\iftoggle{cms@bookcitexref}%
+    {}%
+    {\ifboolexpr{
+        test {\ifpunct}%
+        or
+        test {\ifpunctmark{*}}%
+      }%
+      {\bibhypertarget{\thefield{crossref}}%
+        {\cmsnoopcite{\thefield{crossref}}}\nopunct}%
+      {\bibhypertarget{\thefield{crossref}}%
+        {\cmsnoopcite{\thefield{crossref}}}}}}}
+
+\newbibmacro*{cite:xref+finentry}{%
+  \iffieldundef{crossref}%
+  {\iffieldundef{xref}%
+    {}%
+    {\iftoggle{cms@citecrossref}%
+      {}%
+      {\ifboolexpr{
+          test {\ifpunct}%
+          or
+          test {\ifpunctmark{*}}%
+        }%
+        {\bibhypertarget{\thefield{xref}}%
+          {\cmsnoopcite{\thefield{xref}}}\nopunct}%
+        {\bibhypertarget{\thefield{xref}}%
+          {\cmsnoopcite{\thefield{xref}}}}}}}%
+  {\iftoggle{cms@citecrossref}%
+    {}%
+    {\ifboolexpr{
+        test {\ifpunct}%
+        or
+        test {\ifpunctmark{*}}%
+      }%
+      {\bibhypertarget{\thefield{crossref}}%
+        {\cmsnoopcite{\thefield{crossref}}}\nopunct}%
+      {\bibhypertarget{\thefield{crossref}}%
+        {\cmsnoopcite{\thefield{crossref}}}}}}}
+
 \newbibmacro*{entrytail}{% From reading.bbx, for annotated bibliography
   \newunit\newblock
   \iftoggle{cms@annotation}%
@@ -2625,7 +3052,7 @@
     \iffieldundef{maintitle}\AND\iffieldundef{issuetitle}\)%
     \OR\iffieldsequal{booktitle}{title}%  Changed these for crossrefed
     \OR\iffieldsequal{maintitle}{title}}% entries.  Create problems?
-  {\iffieldequalstr{entrytype}{video}% Change for Video type?  Appears
+  {\ifentrytype{video}% Change for Video type?  Appears
     {\newcunit\newblock}% to treat italicized title as booktitle in
     {\newunit\newblock}}% available examples.  Added issuetitle 0.9.9c.
   {\newcunit\newblock}}
@@ -2913,15 +3340,60 @@
 \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*{bibxref-in:}{%
+  \iffieldundef{volume}%
+  {\ifcsdef{cbx@incollvol}%
+    {\restorefield{volume}{\cbx@incollvol}\toggletrue{cms@xrefvol}%
+      \ifcsdef{cbx@incollpart}%
+      {\restorefield{part}{\cbx@incollpart}}%
+      {}%
+      \ifthenelse{\ifentrytype{mvbook}\OR\ifentrytype{mvcollection}\OR%
+        \ifentrytype{mvproceedings}\OR\ifentrytype{mvreference}}%
+      {\printfield{volume}%
+        \clearfield{volume}%
+        \global\let\cbx@incollvol\undefined% Volume fix
+        \printfield{part}%
+        \clearfield{part}%
+        \global\let\cbx@incollpart\undefined% Volume fix
+        \setunit{\addspace}%
+        \bibstring{ofseries}%
+        \setunit{\addspace}}%
+      {\usebibmacro{cms-in:}}}%
+    {\iffieldundef{part}%
+      {\ifcsdef{cbx@incollpart}%
+        {\restorefield{part}{\cbx@incollpart}\toggletrue{cms@xrefpart}}%
+        {}}%
+      {}%
+      \ifthenelse{\ifentrytype{mvbook}\OR\ifentrytype{mvcollection}\OR%
+        \ifentrytype{mvproceedings}\OR\ifentrytype{mvreference}}%
+      {\printfield[xrefpart]{part}%
+        \clearfield{part}%
+        \global\let\cbx@incollpart\undefined% Volume fix
+        \setunit{\addspace}%
+        \bibstring{ofseries}%
+        \setunit{\addspace}}%
+      {\usebibmacro{cms-in:}}}}%
+  {\iffieldundef{part}%
+    {\ifcsdef{cbx@incollpart}%
+      {\restorefield{part}{\cbx@incollpart}\toggletrue{cms@xrefpart}}%
+      {}}%
+    {}%
+    \ifthenelse{\ifentrytype{mvbook}\OR\ifentrytype{mvcollection}\OR%
+      \ifentrytype{mvproceedings}\OR\ifentrytype{mvreference}}%
+    {\printfield{volume}%
+      \clearfield{volume}%
+      \global\let\cbx@incollvol\undefined% Volume fix
+      \printfield{part}%
+      \clearfield{part}%
+      \global\let\cbx@incollpart\undefined% Volume fix
+      \setunit{\addspace}%
+      \bibstring{ofseries}%
+      \setunit{\addspace}}%
+    {\usebibmacro{cms-in:}}}}%
+
 \newbibmacro*{chapincoll}{%
   \iffieldundef{chapter}%
   {}
@@ -2930,7 +3402,7 @@
 
 \newbibmacro*{chapinscore}{%
   \iffieldundef{chapter}%
-  {\ifthenelse{\iffieldequalstr{entrytype}{music}% 16th ed.
+  {\ifthenelse{\ifentrytype{music}% 16th ed.
       \AND\NOT\iffieldundef{booktitle}}%
     {\bibstring{on}\setunit{\addspace}}%
     {}}
@@ -3040,9 +3512,9 @@
 \newbibmacro*{issuetitle}{%
   \iffieldundef{issuetitle}%
   {}
-  {\ifthenelse{\iffieldequalstr{entrytype}{article}\OR%
-      \iffieldequalstr{entrytype}{review}\OR%
-      \iffieldequalstr{entrytype}{suppperiodical}}% This test is for
+  {\ifthenelse{\ifentrytype{article}\OR%
+      \ifentrytype{review}\OR%
+      \ifentrytype{suppperiodical}}% This test is for
     {\usebibmacro{cms-in:}}% periodical entries
     {}%
     \printtext[issuetitle]{%
@@ -3052,19 +3524,24 @@
 
 \newbibmacro*{btitle+bstitle}{%
   \iffieldundef{booktitle}
-    {}
-    {\printtext[booktitle]{%
-       \printfield[noformat]{booktitle}%
-       \setunit{\addcolon\addspace}%
-       \printfield[noformat]{booksubtitle}}%
-     \newcunit
-     \printfield{booktitleaddon}}}
+  {}
+  {\ifthenelse{\ifentrytype{audio}\OR\ifentrytype{music}\OR%
+      \ifentrytype{video}}%
+    {}%
+    {\usebibmacro{cms-in:}}%
+    \printtext[booktitle]{%
+      \printfield[noformat]{booktitle}%
+      \setunit{\addcolon\addspace}%
+      \printfield[noformat]{booksubtitle}}%
+    \newcunit
+    \printfield{booktitleaddon}%
+    \setunit*{\addcomma\addspace}}}
 
 \newbibmacro*{publ+loc+year}{% Revised for reprint
   \ifboolexpr{
-    togl{cms@reprint}
+    togl {cms@reprint}
     and
-    not test {\iffieldequalstr{entrytype}{video}}
+    not test {\ifentrytype{video}}
   }%
   {\bibstring{reprint}%
     \newcunit}%
@@ -3136,7 +3613,7 @@
       \ifboolexpr{
         togl {cms@reprint}
         and
-        not test{\iffieldequalstr{entrytype}{video}}
+        not test{\ifentrytype{video}}
       }%
       {\bibsstring{reprint}%
         \newcunit}%
@@ -3150,15 +3627,23 @@
       \usebibmacro{date}}}}%
 
 \newbibmacro*{cpubletter+loc+year}{%
-    \setunit{\addspace}%
+  \ifboolexpr{
+    test {\iflistundef{location}}
+    and
+    test {\iflistundef{publisher}}
+    and
+    test {\iffieldundef{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
+      \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. 
@@ -3219,7 +3704,7 @@
   {\iffieldundef{number}%
     {\ifthenelse{\iffieldundef{pagination}\AND%
         \iffieldundef{bookpagination}}%
-      {\setunit{\addcolon}}%
+      {\setunit{\postvolpunct}}%
       {\setunit{\addcolon\addspace}}}%
     {\addcomma\addspace}}%
   {\setunit{\addspace}%
@@ -3242,7 +3727,7 @@
   {\iffieldundef{number}%
     {\ifthenelse{\iffieldundef{pagination}\AND%
         \iffieldundef{bookpagination}}%
-      {\setunit{\addcolon}}%
+      {\setunit{\postvolpunct}}%
       {\setunit{\addcolon\addspace}}}%
     {\addcomma\addspace}}%
   {\setunit{\addspace}%
@@ -3295,8 +3780,8 @@
   {}}%
 
 \newbibmacro*{choosepubstring}{%
-  \ifthenelse{\iffieldequalstr{entrytype}{video}\OR%
-    \iffieldequalstr{entrytype}{music}}%
+  \ifthenelse{\ifentrytype{video}\OR%
+    \ifentrytype{music}}%
   {\bibstring{origreleaseyear}}%
   {\bibstring{origpubyearalt}}}%
 
@@ -3305,6 +3790,55 @@
   {\printorigdate}%
   {\printdate}}
 
+\newbibmacro{cite:xref+date}{%
+  \ifboolexpr{
+    togl {cms@omitxrefdate}%
+    or
+    togl {cms@bookcitexref}%
+    or
+    test {\iffieldundef{crossref}}%
+    or
+    test {\iffieldundef{maintitle}}%
+    or
+    ((
+    test {\iffieldundef{year}}%
+    or
+    togl {cms@switchdates}%
+    )
+    and
+    (test {\iffieldundef{origyear}}%
+    or
+    not togl {cms@switchdates}%
+    ))
+    or
+    not test {\ifentryseen{\thefield{crossref}}}%
+  }
+  {\ifboolexpr{
+      togl {cms@omitxrefdate}%
+      or
+      togl {cms@bookcitexref}%
+      or
+      test {\iffieldundef{xref}}%
+      or
+      test {\iffieldundef{maintitle}}
+      or
+      ((
+      test {\iffieldundef{year}}%
+      or
+      togl {cms@switchdates}%
+      )
+      and
+      (test {\iffieldundef{origyear}}%
+      or
+      not togl {cms@switchdates}%
+      ))
+      or
+      not test {\ifentryseen{\thefield{xref}}}%
+    }
+    {}%
+    {\printtext[parens]{\usebibmacro{date}}}}%
+  {\printtext[parens]{\usebibmacro{date}}}}
+
 \newbibmacro*{cmsorigdate}{% New for 0.9
   \iftoggle{cms@switchdates}%
   {\printdate}%
@@ -3469,7 +4003,7 @@
 \newbibmacro*{cmtitle+mstitle+vol+part+title+stitle}{%
   \iffieldundef{maintitle}
   {}
-  {\iffieldundef{volume}
+  {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
     {\usebibmacro{cms-in:}%
       \printtext[maintitle]{%
         \printfield[noformat]{maintitle}%
@@ -3477,33 +4011,8 @@
         \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}%
+    {\toggletrue{cms@usedvol}%
+      \printfield{volume}%
       \printfield{part}%
       \setunit{\addspace}
       \bibstring{ofseries}%
@@ -3517,18 +4026,22 @@
 
 \newbibmacro*{cmtitle+mstitle+vol+part+btitle+bstitle}{%
   \usebibmacro{btitle+bstitle}%
-  \newcunit
   \iffieldundef{maintitle}
   {}
-  {\iffieldundef{volume}
-    {\usebibmacro{cms-in:}%
+  {\ifthenelse{\(\iffieldundef{volume}\AND\iffieldundef{part}\)\OR%
+      \(\iffieldundef{booktitle}\AND\NOT\ifentrytype{bookinbook}\)}%
+    {\iffieldundef{booktitle}% Fix for origpublin ???
+      {\usebibmacro{cms-in:}}%
+      {\bibstring{in}\setunit{\addspace}}%
       \printtext[maintitle]{%
         \printfield[noformat]{maintitle}%
         \setunit{\addcolon\addspace}%
         \printfield[noformat]{mainsubtitle}}%
       \newcunit
-      \printfield{maintitleaddon}}
-    {\printfield{volume}%
+      \printfield{maintitleaddon}%
+      \toggletrue{cms@vol}}% InIn fix
+    {\toggletrue{cms@usedvol}%
+      \printfield{volume}%
       \printfield{part}%
       \setunit{\addspace}
       \bibstring{ofseries}%
@@ -3595,48 +4108,27 @@
   {\postnotedelim% Don't need \ifbibliography test w/ following
     \usebibmacro{semel:postnote}}}
 
-\newbibmacro*{volume+or+volumes}{% Volume fix
-  \iffieldundef{maintitle}%
-  {\iffieldundef{volume}%
-    {\printfield{volumes}}%
-    {\printfield{volume}%
-      \printfield{part}}}%
-  {\printfield{volumes}}}
-
-\newbibmacro*{crossref:volume+postnote}{%
-  \ifcsdef{cbx@incollpgn}%
-  {\restorefield{pagination}{\cbx@incollpgn}}%
-  {}%
-  \ifcsdef{cbx@incollbkpgn}%
-  {\restorefield{bookpagination}{\cbx@incollbkpgn}}%
-  {}%
-  \iffieldundef{volume}% Volume fix (unfinished)
-  {\ifcsdef{cbx@incollvol}%
-    {\restorefield{volume}{\cbx@incollvol}%
-      \ifcsdef{cbx@incollpart}{\restorefield{part}{\cbx@incollpart}}{}%
-      \iffieldundef{postnote}%
-      {\ifcsdef{cbx@incollpages}%
-        {\restorefield{pages}{\cbx@incollpages}%
-          \iffieldundef{part}%
-          {\ifthenelse{\iffieldnums{pages}\AND%
-              \iffieldundef{bookpagination}}%
-            {\newcunit\printfield[default]{volume}%
-              \addcolon%
-              \printfield{pages}}%
-            {\newcunit\printfield{volume}%
-              \addcomma\addspace%
-              \printfield{pages}}}%
-          {\newcunit\printfield{volume}%
-            \printfield{part}%
-            \addcomma\addspace%
-            \printfield{pages}}}%
+\newbibmacro*{volfullpostnote}{%
+  \iftoggle{cms@postvol}%
+  {\ifboolexpr{(
+      test {\iffieldundef{volume}}%
+      and
+      test {\iffieldundef{part}}%
+      )
+      or
+      togl {cms@usedvol}%
+    }%
+    {\usebibmacro{fullpostnote}}%
+    {\iffieldundef{postnote}%
+      {\iffieldundef{chapter}%
         {\iffieldundef{pages}%
-          {\newcunit\printfield{volume}\printfield{part}}%
+          {\newcunit\printfield{volume}%
+            \printfield{part}}%
           {\iffieldundef{part}%
             {\ifthenelse{\iffieldnums{pages}\AND%
-                \iffieldundef{bookpagination}}%
+                \iffieldundef{bookpagination}\AND\iffieldnums{volume}}%
               {\newcunit\printfield[default]{volume}%
-                \addcolon%
+                \postvolpunct%
                 \printfield{pages}}%
               {\newcunit\printfield{volume}%
                 \addcomma\addspace%
@@ -3644,12 +4136,16 @@
             {\newcunit\printfield{volume}%
               \printfield{part}%
               \addcomma\addspace%
-              \printfield{pages}}}}}%
+              \printfield{pages}}}}%
+        {\newcunit\printfield{volume}%
+          \printfield{part}%
+          \newcunit
+          \printfield{chapter}}}%
       {\iffieldundef{part}%
         {\ifthenelse{\iffieldnums{postnote}\AND%
-            \iffieldundef{pagination}}%
+            \iffieldundef{pagination}\AND\iffieldnums{volume}}%
           {\newcunit\printfield[default]{volume}%
-            \addcolon%
+            \postvolpunct%
             \usebibmacro{semel:postnote}}%
           {\newcunit\printfield{volume}%
             \addcomma\addspace%
@@ -3657,57 +4153,182 @@
         {\newcunit\printfield{volume}%
           \printfield{part}%
           \addcomma\addspace%
-          \usebibmacro{semel:postnote}}}}%
-    {\ifcsdef{cbx@incollpages}%
-      {\restorefield{pages}{\cbx@incollpages}%
-        \usebibmacro{fullpostnote}}%
-      {\usebibmacro{fullpostnote}}}}%
-  {\iffieldundef{postnote}%
+          \usebibmacro{semel:postnote}}}}}%
+  {\usebibmacro{fullpostnote}}%
+  \global\togglefalse{cms@usedvol}}%
+
+\newbibmacro*{volume+or+volumes}{% Volume fix (modified)
+  \ifboolexpr{ (
+    test {\iffieldundef{maintitle}}%
+    or
+    togl {cms@vol}%
+    )
+    and
+    not togl {cms@postvol}%
+    and
+    not togl {cms@usedvol}%
+  }%
+  {\global\togglefalse{cms@vol}%
+    \ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
+    {\printfield{volumes}}%
+    {\printfield{volume}%
+      \printfield{part}}}%
+  {\ifboolexpr{
+      togl {cms@hidevolumes}%
+      and
+      (
+      not test {\iffieldundef{volume}}%
+      or
+      not test {\iffieldundef{part}}%
+      or
+      togl {cms@usedvol}%
+      )
+    }%
+    {\global\togglefalse{cms@vol}}%
+    {\global\togglefalse{cms@vol}%
+      \printfield{volumes}}}}
+
+\newbibmacro*{crossref:volume+postnote}{%
+  \ifcsdef{cbx@incollpgn}%
+  {\restorefield{pagination}{\cbx@incollpgn}}%
+  {}%
+  \ifcsdef{cbx@incollbkpgn}%
+  {\restorefield{bookpagination}{\cbx@incollbkpgn}}%
+  {}%
+  \iffieldundef{volume}% Volume fix (unfinished)
+  {\ifcsdef{cbx@incollvol}%
+    {\restorefield{volume}{\cbx@incollvol}%
+      \ifcsdef{cbx@incollpart}{\restorefield{part}{\cbx@incollpart}}{}%
+      \iffieldundef{postnote}%
       {\ifcsdef{cbx@incollpages}%
         {\restorefield{pages}{\cbx@incollpages}%
-          \iffieldundef{part}%
-          {\ifthenelse{\iffieldnums{pages}\AND%
-              \iffieldundef{bookpagination}}%
-            {\newcunit\printfield[default]{volume}%
-              \addcolon%
-              \printfield{pages}}%
-            {\newcunit\printfield{volume}%
-              \addcomma\addspace%
-              \printfield{pages}}}%
-          {\newcunit\printfield{volume}%
-            \printfield{part}%
-            \addcomma\addspace%
-            \printfield{pages}}}%
+          \usebibmacro{pages+cref+print}}%
         {\iffieldundef{pages}%
           {\newcunit\printfield{volume}\printfield{part}}%
-          {\iffieldundef{part}%
-            {\ifthenelse{\iffieldnums{pages}\AND%
-                \iffieldundef{bookpagination}}%
-              {\newcunit\printfield[default]{volume}%
-                \addcolon%
-                \printfield{pages}}%
-              {\newcunit\printfield{volume}%
-                \addcomma\addspace%
-                \printfield{pages}}}%
-            {\newcunit\printfield{volume}%
-              \printfield{part}%
-              \addcomma\addspace%
-              \printfield{pages}}}}}%
-      {\iffieldundef{part}%
-        {\ifthenelse{\iffieldnums{postnote}\AND%
-            \iffieldundef{pagination}}%
-          {\newcunit\printfield[default]{volume}%
-            \addcolon%
-            \usebibmacro{semel:postnote}}%
-          {\newcunit\printfield{volume}%
-            \addcomma\addspace%
-            \usebibmacro{semel:postnote}}}%
-        {\newcunit\printfield{volume}%
-          \printfield{part}%
-          \addcomma\addspace%
-          \usebibmacro{semel:postnote}}}}}%
+          {\usebibmacro{pages+cref+print}}}}%
+      {\usebibmacro{postnote+cref+print}}}%
+    {\iffieldundef{part}%
+      {\ifcsdef{cbx@incollpart}%
+        {\restorefield{part}{\cbx@incollpart}%
+          \iffieldundef{postnote}%
+          {\ifcsdef{cbx@incollpages}%
+            {\restorefield{pages}{\cbx@incollpages}%
+              \usebibmacro{pages+cref+print}}%
+            {\iffieldundef{pages}%
+              {\newcunit\printfield{volume}\printfield{part}}%
+              {\usebibmacro{pages+cref+print}}}}%
+          {\usebibmacro{postnote+cref+print}}}%
+        {\ifcsdef{cbx@incollpages}%
+          {\restorefield{pages}{\cbx@incollpages}%
+            \usebibmacro{fullpostnote}}%
+          {\usebibmacro{fullpostnote}}}}%
+      {\iffieldundef{postnote}%
+        {\ifcsdef{cbx@incollpages}%
+          {\restorefield{pages}{\cbx@incollpages}%
+            \usebibmacro{pages+cref+print}}%
+          {\iffieldundef{pages}%
+            {\newcunit\printfield{volume}\printfield{part}}%
+            {\usebibmacro{pages+cref+print}}}}%
+        {\usebibmacro{postnote+cref+print}}}}}%
+  {\iffieldundef{part}%
+    {\ifcsdef{cbx@incollpart}%
+      {\restorefield{part}{\cbx@incollpart}}%
+      {}}%
+    {}%
+    \iffieldundef{maintitle}% More elaborate test ???
+    {\iffieldundef{postnote}%
+      {\ifcsdef{cbx@incollpages}%
+        {\restorefield{pages}{\cbx@incollpages}%
+          \usebibmacro{pages+cref+print}}%
+        {\iffieldundef{pages}%
+          {\newcunit\printfield{volume}\printfield{part}}%
+          {\usebibmacro{pages+cref+print}}}}%
+      {\usebibmacro{postnote+cref+print}}}%
+    {\ifboolexpr{
+        test {\ifcsdef{cbx@incollvol}}%
+        and
+        (
+        not test {\iffieldequalcs{volume}{cbx@incollvol}}%
+        or
+        togl {cms@xrefvol}% Necessary ???
+        )
+      }%
+      {\restorefield{volume}{\cbx@incollvol}%
+        \iffieldundef{part}%
+        {\ifcsdef{cbx@incollpart}{\restorefield{part}{\cbx@incollpart}}{}}%
+        {\ifboolexpr{
+            test {\ifcsdef{cbx@incollpart}}%
+            and
+            (
+            not test {\iffieldequalcs{part}{cbx@incollpart}}%
+            or
+            togl {cms@xrefpart}%
+            )
+          }%
+          {\clearfield{part}\restorefield{part}{\cbx@incollpart}}%
+          {\clearfield{part}}}%
+        \iffieldundef{postnote}%
+        {\ifcsdef{cbx@incollpages}%
+          {\restorefield{pages}{\cbx@incollpages}%
+            \usebibmacro{pages+cref+print}}%
+          {\iffieldundef{pages}%
+            {\newcunit\printfield{volume}\printfield{part}}%
+            {\usebibmacro{pages+cref+print}}}}%
+        {\usebibmacro{postnote+cref+print}}}%
+      {\ifboolexpr{
+          test {\ifcsdef{cbx@incollpart}}%
+          and
+          (
+          not test {\iffieldequalcs{part}{cbx@incollpart}}%
+          or
+          togl {cms@xrefpart}%
+          )
+        }
+        {\iffieldundef{postnote}%
+          {\ifcsdef{cbx@incollpages}%
+            {\restorefield{pages}{\cbx@incollpages}%
+              \printfield{part}\newcunit\printfield{pages}}%
+            {\iffieldundef{pages}%
+              {\printfield{part}}%
+              {\printfield{part}\newcunit\printfield{pages}}}}%
+          {\printfield{part}\newcunit\usebibmacro{semel:postnote}}}%
+        {\ifcsdef{cbx@incollpages}%
+          {\restorefield{pages}{\cbx@incollpages}%
+            \usebibmacro{fullpostnote}}%
+          {\usebibmacro{fullpostnote}}}}}}}%
+
+\newbibmacro*{pages+cref+print}{% Reusable chunk for above
+  \iffieldundef{part}%
+  {\ifthenelse{\iffieldnums{pages}\AND%
+      \iffieldundef{bookpagination}\AND\iffieldnums{volume}}%
+    {\newcunit\printfield[default]{volume}%
+      \postvolpunct%
+      \printfield{pages}}%
+    {\newcunit\printfield{volume}%
+      \addcomma\addspace%
+      \printfield{pages}}}%
+  {\newcunit\printfield{volume}%
+    \printfield{part}%
+    \addcomma\addspace%
+    \printfield{pages}}}
+
+\newbibmacro*{postnote+cref+print}{% Reusable chunk for above
+  \iffieldundef{part}%
+  {\ifthenelse{\iffieldnums{postnote}\AND%
+      \iffieldundef{pagination}\AND\iffieldnums{volume}}%
+    {\newcunit\printfield[default]{volume}%
+      \postvolpunct%
+      \usebibmacro{semel:postnote}}%
+    {\newcunit\printfield{volume}%
+      \addcomma\addspace%
+      \usebibmacro{semel:postnote}}}%
+  {\newcunit\printfield{volume}%
+    \printfield{part}%
+    \addcomma\addspace%
+    \usebibmacro{semel:postnote}}}
 
 \newbibmacro*{inreffullpostnote}{%
+  \global\togglefalse{cms@usedvol}%
   \iffieldundef{postnote}%
   {\iffieldundef{chapter}%
     {\iffieldundef{pages}%
@@ -3729,6 +4350,9 @@
     {\cbx@incollbkpgn}}}
 
 \newbibmacro*{xrefpostnote}{%
+  \togglefalse{cms@xrefvol}%
+  \togglefalse{cms@xrefpart}%
+  \global\togglefalse{cms@usedvol}%
   \global\let\cbx@incollvol\undefined% Volume fix
   \global\let\cbx@incollpages\undefined%
   \global\let\cbx@incollpart\undefined%
@@ -3745,7 +4369,13 @@
   \iffieldundef{prenote}% command, rather than \headlessfullcite.
     {\bibsentence}% Needed for Ibid to be capitalized.
     {\printfield{prenote}%
-      \ifciteseen{\addspace}{\nopunct}}}% Do we need \unspace here?
+      \ifboolexpr{%
+        test {\ifciteseen}
+        or
+        togl {cms@allshort}
+      }%
+      {\addspace}%
+      {\nopunct}}}% Do we need \unspace here?
 
 \newbibmacro*{journalprenote}{%
   \iffieldundef{prenote}%
@@ -3810,6 +4440,58 @@
   \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}}
+
 \DeclareSortingScheme{cms}{
   \sort{
     \field{presort}
@@ -3974,9 +4656,13 @@
   \clearname{namea}%
   \clearname{nameb}%
   \clearfield{nameaddon}%
-  \clearfield{title}%
-  \clearfield{subtitle}%
-  \clearfield{titleaddon}%
+  \ifthenelse{\ifentrytype{periodical}\OR\ifentrytype{mvbook}\OR%
+    \ifentrytype{mvcollection}\OR\ifentrytype{mvproceedings}\OR%
+    \ifentrytype{mvreference}}%
+  {}%
+  {\clearfield{title}%
+    \clearfield{subtitle}%
+    \clearfield{titleaddon}}%
   \clearfield{reprinttitle}%
   \clearfield{usere}%
   \clearlist{language}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.cbx
index 4d09088a2f4..ca84169b50d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.cbx
@@ -1,11 +1,11 @@
-% $Id: chicago-notes15.cbx,v 0.9.7.21 2012/12/06 12:14:29 dfussner Exp $
+% $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}[2012/12/06 v 2.4 biblatex citation style]
+\ProvidesFile{chicago-notes15.cbx}[2013/10/21 v 2.8 biblatex citation style]
 
 %%%% Biblatex initialization + Chicago options + Toggles %%%%
 
@@ -2414,7 +2414,7 @@
 
 \DeclareFieldFormat{annotation}{\par\nobreak \vskip \bibitemsep #1}
 
-\DeclareFieldFormat{part}{\addcomma\bibstring{partvolume}~#1}
+\DeclareFieldFormat{part}{\addcomma\addspace\bibstring{partvolume}~#1}
 
 \DeclareFieldAlias[review]{volume}[article]{volume}
 
@@ -3616,6 +3616,65 @@
   {\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}%
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 37eb9e735d2..49f8987d745 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.31 2013/03/14 16:42:23 dfussner Exp $	
+% $Id: cms-american.lbx,v 0.10.1.35 2013/10/29 14:13:10 dfussner Exp $	
 
-\ProvidesFile{cms-american.lbx}[2013/03/14 v 2.5 biblatex localization]
+\ProvidesFile{cms-american.lbx}[2013/10/29 v 2.8 biblatex localization]
 
 \InheritBibliographyExtras{american}
 
@@ -251,7 +251,7 @@
   afterwordto = {{afterword to}{afterw\adddot\space to}},
   forewordto = {{foreword to}{forew\adddot\space to}},
   introductionto = {{introduction to}{intro\adddot\space to}},
-  partvolume = {{\addspace bk\adddot}{\addspace bk\adddot}},
+  partvolume = {{bk\adddot}{bk\adddot}},
   by = {{by}{by}},
   of = {{of}{of}},
   on = {{on}{on}},
@@ -811,7 +811,10 @@
   {}
   {\printtext[#2date]{%
     \iffieldsequal{#2year}{#2endyear}
-    {\csuse{mkbibdate#1}{}{#2month}{#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}
     {\iffieldundef{#2endmonth}
@@ -829,12 +832,15 @@
           {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
         {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}}
 
-\protected\gdef\lbx@cms@mkbibrangetrunc@short#1#2{%
+\protected\gdef\lbx@cms@mkbibrangetrunc@short#1#2{% Modify ???
   \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
   {}
   {\printtext[#2date]{%
       \iffieldsequal{#2year}{#2endyear}
-      {\csuse{mkbibdate#1}{}{#2month}{#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}}%
       \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}
       {}
@@ -846,7 +852,11 @@
 \protected\gdef\lbx@cms@mkbibrangefull#1#2{%
   \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
   {}%
-  {\printtext[#2date]{%
+  {\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}}
       {}
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 0b7949341bd..20bca56a1d6 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.5 2013/03/14 16:44:04 dfussner Exp $	
+% $Id: cms-british.lbx,v 0.7 2013/10/29 14:13:55 dfussner Exp $	
 
-\ProvidesFile{cms-british.lbx}[2013/03/14 v 2.5 biblatex localization]
+\ProvidesFile{cms-british.lbx}[2013/10/29 v 2.8 biblatex localization]
 
 \InheritBibliographyExtras{british}
 
@@ -49,7 +49,10 @@
       \iffieldsequal{#2year}{#2endyear}
       {\iffieldsequal{#2month}{#2endmonth}
         {\csuse{mkbibdate#1}{}{}{#2day}}
-        {\csuse{mkbibdate#1}{}{#2month}{#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}
       {}
@@ -61,7 +64,11 @@
 \protected\gdef\lbx@cms@mkbibrangefull#1#2{%
   \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
   {}%
-  {\printtext[#2date]{%
+  {\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}}
       {}
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 5bec9bfff6b..e136fd56e1c 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.3 2013/03/14 16:43:14 dfussner Exp $	
+% $Id: cms-finnish.lbx,v 0.6 2013/10/29 14:15:17 dfussner Exp $	
 
-\ProvidesFile{cms-finnish.lbx}[2013/03/14 v 2.5 biblatex localization]
+\ProvidesFile{cms-finnish.lbx}[2013/10/29 v 2.8 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated by a native speaker (Antti-Juhani Kaijanaho).
@@ -269,7 +269,7 @@
   afterwordto = {{j\"alkipuhe teokselle}{j\"alkipuhe teokselle}},
   % forewordto = {{foreword to}{forew\adddot\space to}},
   introductionto = {{johdanto teoksessa}{johdanto\adddot\space teoksessa}},
-  partvolume = {{\addspace osa}{\addspace osa}},
+  partvolume = {{osa}{osa}},
   by = {{kirjoittanut}{kirjoittanut}},
   % of = {{of}{of}},
   on = {{levyll\"a}{levyll\"a}},
@@ -845,7 +845,10 @@
       \iffieldsequal{#2year}{#2endyear}
       {\iffieldsequal{#2month}{#2endmonth}
         {\csuse{mkbibdate#1}{}{}{#2day}}
-        {\csuse{mkbibdate#1}{}{#2month}{#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}
       {}
@@ -857,7 +860,11 @@
 \protected\gdef\lbx@cms@mkbibrangefull#1#2{%
   \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
   {}%
-  {\printtext[#2date]{%
+  {\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}}
       {}
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 32903140d7a..fe046122525 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.24 2013/03/14 16:42:55 dfussner Exp $	
+% $Id: cms-french.lbx,v 0.9.5.27 2013/10/29 14:16:06 dfussner Exp $	
 
-\ProvidesFile{cms-french.lbx}[2013/03/14 v 2.5 biblatex localization]
+\ProvidesFile{cms-french.lbx}[2013/10/29 v 2.8 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Some strings still missing
@@ -10,6 +10,8 @@
 \InheritBibliographyExtras{french}
 
 \DeclareBibliographyExtras{%
+  \savecommand\postvolpunct%
+  \renewcommand{\postvolpunct}{\addcolon\addspace}%
   \toggletrue{cms@postposit}%
   \savecommand\mkbibnamelast
   \protected\def\mkbibnamelast#1{#1}% No small caps for Chicago (?)
@@ -28,6 +30,7 @@
   \def\cms@datelongalt{\printdate}}%
 
 \UndeclareBibliographyExtras{%
+  \restorecommand\postvolpunct%
   \restorecommand\mkbibnamelast
   \restorecommand\cms@datelong
   \restorecommand\cms@datelongalt
@@ -803,7 +806,10 @@
       \iffieldsequal{#2year}{#2endyear}
       {\iffieldsequal{#2month}{#2endmonth}
         {\csuse{mkbibdate#1}{}{}{#2day}}
-        {\csuse{mkbibdate#1}{}{#2month}{#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}
       {}
@@ -815,7 +821,11 @@
 \protected\gdef\lbx@cms@mkbibrangefull#1#2{%
   \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
   {}%
-  {\printtext[#2date]{%
+  {\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}}
       {}
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 955e0e606f3..6697704de2a 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.24 2013/03/14 16:42:38 dfussner Exp $	
+% $Id: cms-german.lbx,v 0.9.5.27 2013/10/29 14:17:00 dfussner Exp $	
 
-\ProvidesFile{cms-german.lbx}[2013/03/14 v 2.5 biblatex localization]
+\ProvidesFile{cms-german.lbx}[2013/10/29 v 2.8 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated strings and formatting decisions need review by native
@@ -267,7 +267,7 @@
   afterwordto = {{Nachwort zu}{Nachw\adddot\ zu}},
   forewordto = {{Vorwort zu}{Vorw\adddot\ zu}},
   introductionto = {{Einleitung in}{Einl\adddot\ in}},
-  partvolume = {{\addspace T\adddot}{\addspace T\adddot}},
+  partvolume = {{T\adddot}{T\adddot}},
   by = {{von}{von}},
   of = {{von}{von}},
   on = {{auf}{auf}},
@@ -963,7 +963,10 @@
       \iffieldsequal{#2year}{#2endyear}
       {\iffieldsequal{#2month}{#2endmonth}
         {\csuse{mkbibdate#1}{}{}{#2day}}
-        {\csuse{mkbibdate#1}{}{#2month}{#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}
       {}
@@ -975,7 +978,11 @@
 \protected\gdef\lbx@cms@mkbibrangefull#1#2{%
   \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
   {}%
-  {\printtext[#2date]{%
+  {\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}}
       {}
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 870490a132b..8ac97d571ed 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.7 2013/03/14 16:43:41 dfussner Exp $	
+% $Id: cms-icelandic.lbx,v 0.10 2013/10/29 14:18:01 dfussner Exp $	
 
-\ProvidesFile{cms-icelandic.lbx}[2013/03/14 v 2.5 biblatex localization]
+\ProvidesFile{cms-icelandic.lbx}[2013/10/29 v 2.8 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated by a native speaker (Baldur Kristinsson).
@@ -253,7 +253,7 @@
   afterwordto = {{eftirm\'ali vi}{eftirm\'ali vi}},
   forewordto = {{form\'ali vi}{form\'ali vi}},
   introductionto = {{inngangur a}{inngangur a}},
-  partvolume = {{\addspace hl\adddot}{\addspace hl\adddot}},
+  partvolume = {{hl\adddot}{hl\adddot}},
   by = {{eftir}{eftir}},
   of = {{af}{af}},
 %  on = {{}{}},
@@ -474,7 +474,10 @@
       \iffieldsequal{#2year}{#2endyear}
       {\iffieldsequal{#2month}{#2endmonth}
         {\csuse{mkbibdate#1}{}{}{#2day}}
-        {\csuse{mkbibdate#1}{}{#2month}{#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}
       {}
@@ -486,7 +489,11 @@
 \protected\gdef\lbx@cms@mkbibrangefull#1#2{%
   \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
   {}%
-  {\printtext[#2date]{%
+  {\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}}
       {}
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 e49ddd36962..6bbe9710ac1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx
@@ -1,6 +1,6 @@
-% $Id: cms-german.lbx,v 0.9.5.24 2013/03/14 16:42:38 dfussner Exp $	
+% $Id: cms-german.lbx,v 0.9.5.27 2013/10/29 14:17:00 dfussner Exp $	
 
-\ProvidesFile{cms-ngerman.lbx}[2013/03/14 v 2.5 biblatex localization]
+\ProvidesFile{cms-ngerman.lbx}[2013/10/29 v 2.8 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated strings and formatting decisions need review by native
@@ -267,7 +267,7 @@
   afterwordto = {{Nachwort zu}{Nachw\adddot\ zu}},
   forewordto = {{Vorwort zu}{Vorw\adddot\ zu}},
   introductionto = {{Einleitung in}{Einl\adddot\ in}},
-  partvolume = {{\addspace T\adddot}{\addspace T\adddot}},
+  partvolume = {{T\adddot}{T\adddot}},
   by = {{von}{von}},
   of = {{von}{von}},
   on = {{auf}{auf}},
@@ -963,7 +963,10 @@
       \iffieldsequal{#2year}{#2endyear}
       {\iffieldsequal{#2month}{#2endmonth}
         {\csuse{mkbibdate#1}{}{}{#2day}}
-        {\csuse{mkbibdate#1}{}{#2month}{#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}
       {}
@@ -975,7 +978,11 @@
 \protected\gdef\lbx@cms@mkbibrangefull#1#2{%
   \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
   {}%
-  {\printtext[#2date]{%
+  {\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}}
       {}
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 51af37c83ed..8e5dc4a2706 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx
@@ -1,14 +1,762 @@
-% $Id: cms-norsk.lbx,v 1.3 2013/03/14 16:41:51 dfussner Exp $
+% $Id: cms-norsk.lbx,v 1.6 2013/10/29 14:19:01 dfussner Exp $
 
-\ProvidesFile{cms-norsk.lbx}[2013/03/14 v 2.5 biblatex localization]
+\ProvidesFile{cms-norsk.lbx}[2013/10/29 v 2.8 biblatex localization]
 
 % STATUS OF THIS FILE
-% - Placeholder for cms-norwegian.lbx, as in standard biblatex.
-% - Strings in cms-norwegian.lbx translated by a native speaker
-%   (H{\aa}kon Malmedal).
-% - Date handling there modified by dfussner.
+% - Translated by a native speaker (H{\aa}kon Malmedal).
+% - Date handling modified by dfussner.
 
-\InheritBibliographyExtras{cms-norwegian}
-\InheritBibliographyStrings{cms-norwegian}
+\InheritBibliographyExtras{norsk}
+
+\DeclareBibliographyExtras{%
+  \savecommand\cms@datelong
+  \savecommand\cms@datelongalt
+  \savecommand\mkbibrangecomp
+  \savecommand\mkbibrangeterse
+  \savecommand\mkbibrangefull
+  \protected\def\mkbibrangecomp{%
+    \lbx@cms@mkbibrangetrunc{long}}%
+  \protected\def\mkbibrangeterse{%
+    \lbx@cms@mkbibrangetrunc{short}}%
+  \protected\def\mkbibrangefull{%
+    \lbx@cms@mkbibrangefull}%
+  \def\cms@datelong{\printorigdate}%
+  \def\cms@datelongalt{\printdate}}%
+
+\UndeclareBibliographyExtras{%
+  \restorecommand\cms@datelong
+  \restorecommand\cms@datelongalt
+  \restorecommand\mkbibrangecomp%
+  \restorecommand\mkbibrangefull%
+  \restorecommand\mkbibrangeterse}%
+
+\NewBibliographyString{bynone}
+\NewBibliographyString{bycompiler}
+\NewBibliographyString{byconductor}
+\NewBibliographyString{bydirector}
+\NewBibliographyString{byproducer}
+\NewBibliographyString{byeditorcp}
+\NewBibliographyString{byeditortrcp}
+\NewBibliographyString{byeditortrcpco}
+\NewBibliographyString{byeditortrcpan}
+\NewBibliographyString{byeditortrcpin}
+\NewBibliographyString{byeditortrcpfo}
+\NewBibliographyString{byeditortrcpaf}
+\NewBibliographyString{byeditortrcpcoin}
+\NewBibliographyString{byeditortrcpcofo}
+\NewBibliographyString{byeditortrcpcoaf}
+\NewBibliographyString{byeditortrcpanin}
+\NewBibliographyString{byeditortrcpanfo}
+\NewBibliographyString{byeditortrcpanaf}
+\NewBibliographyString{byeditorcpco}
+\NewBibliographyString{byeditorcpan}
+\NewBibliographyString{byeditorcpin}
+\NewBibliographyString{byeditorcpfo}
+\NewBibliographyString{byeditorcpaf}
+\NewBibliographyString{byeditorcpcoin}
+\NewBibliographyString{byeditorcpcofo}
+\NewBibliographyString{byeditorcpcoaf}
+\NewBibliographyString{byeditorcpanin}
+\NewBibliographyString{byeditorcpanfo}
+\NewBibliographyString{byeditorcpanaf}
+\NewBibliographyString{bytranslatorcp}
+\NewBibliographyString{bytranslatorcpco}
+\NewBibliographyString{bytranslatorcpan}
+\NewBibliographyString{bytranslatorcpin}
+\NewBibliographyString{bytranslatorcpfo}
+\NewBibliographyString{bytranslatorcpaf}
+\NewBibliographyString{bytranslatorcpcoin}
+\NewBibliographyString{bytranslatorcpcofo}
+\NewBibliographyString{bytranslatorcpcoaf}
+\NewBibliographyString{bytranslatorcpanin}
+\NewBibliographyString{bytranslatorcpanfo}
+\NewBibliographyString{bytranslatorcpanaf}
+\NewBibliographyString{bycompilerco}
+\NewBibliographyString{bycompileran}
+\NewBibliographyString{bycompilerin}
+\NewBibliographyString{bycompilerfo}
+\NewBibliographyString{bycompileraf}
+\NewBibliographyString{bycompilercoin}
+\NewBibliographyString{bycompilercofo}
+\NewBibliographyString{bycompilercoaf}
+\NewBibliographyString{bycompileranin}
+\NewBibliographyString{bycompileranfo}
+\NewBibliographyString{bycompileranaf}
+\NewBibliographyString{cbynone}
+\NewBibliographyString{cbyauthor}
+\NewBibliographyString{cbyeditor}
+\NewBibliographyString{cbytranslator}
+\NewBibliographyString{cbycompiler}
+\NewBibliographyString{cbyredactor}
+\NewBibliographyString{cbycommentator}
+\NewBibliographyString{cbyannotator}
+\NewBibliographyString{cbyfounder}
+\NewBibliographyString{cbycontinuator}
+\NewBibliographyString{cbycollaborator}
+\NewBibliographyString{cbyconductor}
+\NewBibliographyString{cbydirector}
+\NewBibliographyString{cbyproducer}
+\NewBibliographyString{cbyeditortr}
+\NewBibliographyString{cbyeditorcp}
+\NewBibliographyString{cbyeditorco}
+\NewBibliographyString{cbyeditoran}
+\NewBibliographyString{cbyeditorin}
+\NewBibliographyString{cbyeditorfo}
+\NewBibliographyString{cbyeditoraf}
+\NewBibliographyString{cbyeditortrcp}
+\NewBibliographyString{cbyeditortrco}
+\NewBibliographyString{cbyeditortran}
+\NewBibliographyString{cbyeditortrin}
+\NewBibliographyString{cbyeditortrfo}
+\NewBibliographyString{cbyeditortraf}
+\NewBibliographyString{cbyeditortrcpco}
+\NewBibliographyString{cbyeditortrcpan}
+\NewBibliographyString{cbyeditortrcpin}
+\NewBibliographyString{cbyeditortrcpfo}
+\NewBibliographyString{cbyeditortrcpaf}
+\NewBibliographyString{cbyeditorcoin}
+\NewBibliographyString{cbyeditorcofo}
+\NewBibliographyString{cbyeditorcoaf}
+\NewBibliographyString{cbyeditoranin}
+\NewBibliographyString{cbyeditoranfo}
+\NewBibliographyString{cbyeditoranaf}
+\NewBibliographyString{cbyeditortrcoin}
+\NewBibliographyString{cbyeditortrcofo}
+\NewBibliographyString{cbyeditortrcoaf}
+\NewBibliographyString{cbyeditortranin}
+\NewBibliographyString{cbyeditortranfo}
+\NewBibliographyString{cbyeditortranaf}
+\NewBibliographyString{cbyeditortrcpcoin}
+\NewBibliographyString{cbyeditortrcpcofo}
+\NewBibliographyString{cbyeditortrcpcoaf}
+\NewBibliographyString{cbyeditortrcpanin}
+\NewBibliographyString{cbyeditortrcpanfo}
+\NewBibliographyString{cbyeditortrcpanaf}
+\NewBibliographyString{cbyeditorcpco}
+\NewBibliographyString{cbyeditorcpan}
+\NewBibliographyString{cbyeditorcpin}
+\NewBibliographyString{cbyeditorcpfo}
+\NewBibliographyString{cbyeditorcpaf}
+\NewBibliographyString{cbyeditorcpcoin}
+\NewBibliographyString{cbyeditorcpcofo}
+\NewBibliographyString{cbyeditorcpcoaf}
+\NewBibliographyString{cbyeditorcpanin}
+\NewBibliographyString{cbyeditorcpanfo}
+\NewBibliographyString{cbyeditorcpanaf}
+\NewBibliographyString{cbytranslatorcp}
+\NewBibliographyString{cbytranslatorco}
+\NewBibliographyString{cbytranslatoran}
+\NewBibliographyString{cbytranslatorin}
+\NewBibliographyString{cbytranslatorfo}
+\NewBibliographyString{cbytranslatoraf}
+\NewBibliographyString{cbytranslatorcpco}
+\NewBibliographyString{cbytranslatorcpan}
+\NewBibliographyString{cbytranslatorcpin}
+\NewBibliographyString{cbytranslatorcpfo}
+\NewBibliographyString{cbytranslatorcpaf}
+\NewBibliographyString{cbytranslatorcoin}
+\NewBibliographyString{cbytranslatorcofo}
+\NewBibliographyString{cbytranslatorcoaf}
+\NewBibliographyString{cbytranslatoranin}
+\NewBibliographyString{cbytranslatoranfo}
+\NewBibliographyString{cbytranslatoranaf}
+\NewBibliographyString{cbytranslatorcpcoin}
+\NewBibliographyString{cbytranslatorcpcofo}
+\NewBibliographyString{cbytranslatorcpcoaf}
+\NewBibliographyString{cbytranslatorcpanin}
+\NewBibliographyString{cbytranslatorcpanfo}
+\NewBibliographyString{cbytranslatorcpanaf}
+\NewBibliographyString{cbycompilerco}
+\NewBibliographyString{cbycompileran}
+\NewBibliographyString{cbycompilerin}
+\NewBibliographyString{cbycompilerfo}
+\NewBibliographyString{cbycompileraf}
+\NewBibliographyString{cbycompilercoin}
+\NewBibliographyString{cbycompilercofo}
+\NewBibliographyString{cbycompilercoaf}
+\NewBibliographyString{cbycompileranin}
+\NewBibliographyString{cbycompileranfo}
+\NewBibliographyString{cbycompileranaf}
+\NewBibliographyString{cfromamerican}
+\NewBibliographyString{cfrombrazilian}
+\NewBibliographyString{cfromdanish}
+\NewBibliographyString{cfromdutch}
+\NewBibliographyString{cfromenglish}
+\NewBibliographyString{cfromfrench}
+\NewBibliographyString{cfromgerman}
+\NewBibliographyString{cfromgreek}
+\NewBibliographyString{cfromitalian}
+\NewBibliographyString{cfromlatin}
+\NewBibliographyString{cfromnorwegian}
+\NewBibliographyString{cfromportuguese}
+\NewBibliographyString{cfromrussian}
+\NewBibliographyString{cfromspanish}
+\NewBibliographyString{cfromswedish}
+\NewBibliographyString{partvolume}
+\NewBibliographyString{by}
+\NewBibliographyString{of}
+\NewBibliographyString{on}
+\NewBibliographyString{afterwordto}
+\NewBibliographyString{forewordto}
+\NewBibliographyString{introductionto}
+\NewBibliographyString{origpub}
+\NewBibliographyString{origpublin}
+\NewBibliographyString{origpubyear}
+\NewBibliographyString{origpubyearalt}
+\NewBibliographyString{origreleaseyear}
+\NewBibliographyString{origshownyear}
+\NewBibliographyString{origedition}
+\NewBibliographyString{revisededition}
+\NewBibliographyString{broadcast}
+\NewBibliographyString{recorded}
+\NewBibliographyString{numbers}
+\NewBibliographyString{nodate}
+\NewBibliographyString{pseudonym}
+\NewBibliographyString{patentfiled}% Needed for CMS style patent entries
+\NewBibliographyString{patentissued}%
+\NewBibliographyString{inlang}
+\NewBibliographyString{langrussian}
+\NewBibliographyString{fromrussian}
+\NewBibliographyString{edamerican}
+\NewBibliographyString{edbrazilian}
+\NewBibliographyString{eddanish}
+\NewBibliographyString{eddutch}
+\NewBibliographyString{edenglish}
+\NewBibliographyString{edfrench}
+\NewBibliographyString{edgerman}
+\NewBibliographyString{edgreek}
+\NewBibliographyString{editalian}
+\NewBibliographyString{edlatin}
+\NewBibliographyString{ednorwegian}
+\NewBibliographyString{edportuguese}
+\NewBibliographyString{edrussian}
+\NewBibliographyString{edspanish}
+\NewBibliographyString{edswedish}
+\NewBibliographyString{review}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{section}
+\NewBibliographyString{sections}
+\NewBibliographyString{compiler}
+\NewBibliographyString{compilers}
+\NewBibliographyString{conductor}
+\NewBibliographyString{conductors}
+\NewBibliographyString{director}
+\NewBibliographyString{directors}
+\NewBibliographyString{none}
+\NewBibliographyString{nones}
+\NewBibliographyString{producer}
+\NewBibliographyString{producers}
+\NewBibliographyString{transcompiler}
+\NewBibliographyString{transcompilers}
+\NewBibliographyString{editortranscompiler}
+\NewBibliographyString{editorcompiler}
+\NewBibliographyString{editortranslator}
+\NewBibliographyString{editortranscompilers}
+\NewBibliographyString{editorcompilers}
+\NewBibliographyString{editortranslators}
+
+\DeclareBibliographyStrings{%
+  inherit = {norsk},
+  afterwordto = {{etterord til}{etterord til}},
+  forewordto = {{forord til}{forord til}},
+  introductionto = {{innledning til}{innl\adddot\space til}},
+  partvolume = {{del}{del}},
+  by = {{av}{av}},
+  of = {{av}{av}},
+  on = {{p{\aa}}{p{\aa}}},
+  compiler = {{komp\adddot}{komp\adddot}},
+  compilers = {{komp\adddot}{komp\adddot}},
+  transcompiler = {{overs\adddot\addspace og komp\adddot}%
+    {overs\adddot\addspace og komp\adddot}},
+  transcompilers = {{overs\adddot\addspace og komp\adddot}%
+    {overs\adddot\addspace og komp\adddot}},
+  editortranscompiler = {{red\adddot\addcomma\addspace
+      overs\adddot\addcomma\addspace og komp\adddot}%
+    {red\adddot\addcomma\addspace
+      overs\adddot\addcomma\addspace og komp\adddot}},
+  editorcompiler = {{red\adddot\addspace og komp\adddot}%
+    {red\adddot\addspace og komp\adddot}},
+  editortranslator = {{red\adddot\addspace og overs\adddot}%
+    {red\adddot\addspace og overs\adddot}},
+  editortranscompilers = {{red\adddot\addcomma\addspace
+      overs\adddot\addcomma\addspace og komp\adddot}%
+    {red\adddot\addcomma\addspace
+      overs\adddot\addcomma\addspace og komp\adddot}},
+  editorcompilers = {{red\adddot\addspace og komp\adddot}%
+    {red\adddot\addspace og komp\adddot}},
+  editortranslators = {{red\adddot\addspace og overs\adddot}%
+    {red\adddot\addspace og overs\adddot}},
+  conductor = {{dir\adddot}{dir\adddot}},
+  conductors = {{dir\adddot}{dir\adddot}},
+  director = {{regi}{regi}},
+  directors = {{regi}{regi}},
+  none = {{}{}},
+  nones = {{}{}},
+  producer = {{prod\adddot}{prod\adddot}},
+  producers = {{prod\adddot}{prod\adddot}},
+  editor = {{red\adddot}{red\adddot}},
+  editors = {{red\adddot}{red\adddot}},
+  ibidem = {{sst\adddot}{sst\adddot}},
+  origpub = {{opprinnelig utgitt som}%
+    {oppr\adddot\ utg\adddot\ som}},
+  origpublin = {{opprinnelig utgitt i\addspace}%
+    {oppr\adddot\ utg\adddot\addspace i\addspace}},
+  origpubyear = {{opprinnelig utgitt i\addspace}%
+    {oppr\adddot\ utg\adddot\addspace}},
+  origpubyearalt = {{f{\o}rst utgitt\addspace}%
+    {f{\o}rst utg\adddot\addspace}},
+  origreleaseyear = {{opprinnelig utgitt i\addspace}%
+    {oppr\adddot\ utg\adddotspace}},
+  origshownyear = {{opprinnelig vist i\addspace}%
+    {oppr\adddot\ vist\addspace}},
+  origedition ={{utgave\addcolon\addspace}%
+    {utg\adddot\addcolon\addspace}},
+  revisededition = {{rev\adddot\addspace utg\adddot}%
+    {rev\adddot\addspace utg\adddot}},
+  broadcast = {{kringkastet}{kringkastet}},
+  recorded = {{spilt inn}{spilt inn}},
+  numbers = {{nr\adddot}{nr\adddot}},
+  nodate = {{udatert}{udatert}},
+  pseudonym = {{pseud\adddot}{pseud\adddot}},
+  patentfiled = {{s{\o}kt}{s{\o}kt}},
+  patentissued = {{meddelt}{meddelt}},
+  inlang = {{p{\aa}\addspace}{p{\aa}\addspace}},
+  edamerican     = {{amerikansk}{amerikansk}},
+  edbrazilian    = {{brasiliansk}{brasiliansk}},
+  eddanish       = {{dansk}{dansk}},
+  eddutch        = {{nederlandsk}{nederlandsk}},
+  edenglish      = {{engelsk}{engelsk}},
+  edfrench       = {{fransk}{fransk}},
+  edgerman       = {{tysk}{tysk}},
+  edgreek        = {{gresk}{gresk}},
+  editalian      = {{italiensk}{italiensk}},
+  edlatin        = {{latin}{latin}},
+  ednorwegian    = {{norsk}{norsk}},
+  edportuguese   = {{portugisisk}{portugisisk}},
+  edrussian      = {{russisk}{russisk}}
+  edspanish      = {{spansk}{spansk}},
+  edswedish      = {{svensk}{svensk}},
+  translator       = {{overs\adddot}{overs\adddot}},
+  translators      = {{overs\adddot}{overs\adddot}},
+  redactor         = {{bearb\adddot}{bearb\adddot}},
+  redactors        = {{bearb\adddot}{bearb\adddot}},
+  founder          = {{grunnl\adddot}{grunnl\adddot}},
+  founders         = {{grunnl\adddot}{grunnl\adddot}},
+  continuator      = {{videref\adddot}{videref\adddot}},
+  continuators     = {{videref\adddot}{videref\adddot}},
+  collaborator     = {{samarb\adddot}{samarb\adddot}},
+  collaborators    = {{samarb\adddot}{samarb\adddot}},
+  annotator        = {{forkl\adddot}{forkl\adddot}},
+  annotators       = {{forkl\adddot}{forkl\adddot}},
+  review = {{omtale}{omtale}},
+  reviewof = {{omtale av}{omtale av}},
+  cbynone = {{}{}},
+  cbyauthor = {{av}{av}},
+  cbyeditor = {{red\adddot}{red\adddot}},
+  cbytranslator     = {{overs\adddot\addspace\lbx@cfromlang}%
+    {overs\adddot\addspace\lbx@cfromlang}},
+  cbycompiler = {{komp\adddot}{komp\adddot}},
+  cbyredactor = {{bearb\adddot}{bearb\adddot}},
+  cbycommentator = {{komm\adddot}{komm\adddot}},
+  cbyannotator = {{forkl\addot}{forkl\addot}},
+  cbyfounder        = {{grunnl\adddot}{grunnl\adddot}},
+  cbycontinuator    = {{videref\adddot}{videref\adddot}},
+  cbycollaborator   = {{i samarb\adddotspace med}%
+    {i samarb\adddotspace med}},
+  cbyconductor = {{dir\adddot}{dir\adddot}},
+  cbydirector = {{regi}{regi}},
+  cbyproducer = {{prod\adddot}{prod\adddot}},
+  cbyeditortr    = {{red\adddot\space og
+      overs\adddot\addspace\lbx@cfromlang}%
+    {red\adddot\space og overs\adddot\addspace\lbx@cfromlang}},
+  cbyeditorcp = {{red\adddot\space og komp\adddot}%
+    {red\adddot\space og komp\adddot}},
+  cbyeditorco    = {{red\adddot\space og komm\adddot}%
+    {red\adddot\space og komm\adddot}},
+  cbyeditoran = {{red\adddot\space og forkl\adddot}%
+    {red\adddot\space og forkl\adddot}},
+  cbyeditorin = {{red.,\addabbrvspace med innl., av}%
+    {red.,\addabbrvspace med innl., av}},
+  cbyeditorfo = {{red.,\addabbrvspace med forord, av}%
+    {red.,\addabbrvspace med forord, av}},
+  cbyeditoraf = {{red.,\addabbrvspace med etterord, av}%
+    {red.,\addabbrvspace med etterord, av}},
+  cbyeditortrcp = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang og
+      komp\adddot}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp\adddot}},
+  cbyeditortrco = {{red.,\addabbrvspace
+    overs\adddot\addspace\lbx@fromlang\space og
+    komm\adddot}%
+  {red.,\addabbrvspace
+    overs\adddot\addspace\lbx@fromlang\space og komm\adddot}},
+  cbyeditortran = {{red.,\addabbrvspace
+    overs\adddot\addspace\lbx@fromlang\space og
+    forkl\adddot}%
+  {red.,\addabbrvspace
+    overs\adddot\addspace\lbx@fromlang\space og forkl\adddot}},
+  cbyeditortrin = {{red\adddotspace og overs\adddot\ \lbx@sfromlang, med innl., av}%
+    {red\adddotspace og overs\adddot\ \lbx@sfromlang, med innl., av}},
+  cbyeditortrfo = {{red\adddotspace og overs\adddot\ \lbx@sfromlang, med forord, av}%
+    {red\adddotspace og overs\adddot\ \lbx@sfromlang, med forord, av}},
+  cbyeditortraf = {{red\adddotspace og overs\adddot\ \lbx@sfromlang, med etterord, av}%
+    {red\adddotspace og overs\adddot\ \lbx@sfromlang, med etterord, av}},
+  cbyeditorcpco = {{red.,\addabbrvspace komp. og komm\adddot}%
+    {red.,\addabbrvspace komp. og komm\adddot}},
+  cbyeditorcpan = {{red.,\addabbrvspace komp. og forkl\adddot}%
+    {red.,\addabbrvspace komp. og forkl\adddot}},
+  cbyeditorcpin = {{red\adddot\space og komp., med innl., av}%
+    {red\adddot\space og komp., med innl., av}},
+  cbyeditorcpfo = {{red\adddot\space og komp., med forord, av}%
+    {red\adddot\space og komp., med forord, av}},
+  cbyeditorcpaf = {{red\adddot\space og komp., med etterord, av}%
+    {red\adddot\space og komp., med etterord, av}},
+  cbyeditorcpcoin = {{red.,\addabbrvspace komp. og komm., med innl., av}%
+    {red.,\addabbrvspace komp. og komm., med innl., av}},
+  cbyeditorcpcofo = {{red.,\addabbrvspace komp. og komm., med forord, av}%
+    {red.,\addabbrvspace komp. og komm., med forord, av}},
+  cbyeditorcpcoaf = {{red.,\addabbrvspace komp. og komm., med etterord, av}%
+    {red.,\addabbrvspace komp. og komm., med etterord, av}},
+  cbyeditorcpanin = {{red.,\addabbrvspace komp. og forkl., med innl., av}%
+    {red.,\addabbrvspace komp. og forkl., med innl., av}},
+  cbyeditorcpanfo = {{red.,\addabbrvspace komp. og forkl., med forord, av}%
+    {red.,\addabbrvspace komp. og forkl., med forord, av}},
+  cbyeditorcpanaf = {{red.,\addabbrvspace komp. og forkl., med etterord, av}%
+    {red.,\addabbrvspace komp. og forkl., med etterord, av}},
+  cbyeditortrcpco = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang,
+      komp. og komm\adddot}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm\adddot}},
+  cbyeditortrcpan = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang,
+      komp. og forkl\adddot}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl\adddot}},
+  cbyeditortrcpin = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp., med innl., av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp.,
+      med innl., av}},
+  cbyeditortrcpfo = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp., med forord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp.,
+      med forord, av}},
+  cbyeditortrcpaf = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp., med etterord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp.,
+      med etterord, av}},
+  cbyeditortrcpcoin = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang,
+      komp. og komm., med innl., av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm., med innl., av}},
+  cbyeditortrcpcofo = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang,
+      komp. og komm., med forord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm., med forord, av}},
+  cbyeditortrcpcoaf = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang,
+      komp. og komm., med etterord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm., med etterord, av}},
+  cbyeditortrcpanin = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang,
+      komp. og forkl., med innl., av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl., med innl., av}},
+  cbyeditortrcpanfo = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang,
+      komp. og forkl., med forord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl., med forord, av}},
+  cbyeditortrcpanaf = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang,
+      komp. og forkl., med etterord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl., med etterord, av}},
+  cbyeditorcoin = {{red\adddot\space og komm., med innl., av}%
+    {red\adddot\space og komm., med innl., av}},
+  cbyeditorcofo = {{red\adddot\space og komm., med forord, av}%
+    {red\adddot\space og komm., med forord, av}},
+  cbyeditorcoaf = {{red\adddot\space og komm., med etterord, av}%
+    {red\adddot\space og komm., med etterord, av}},
+  cbyeditoranin = {{red\adddot\space og forkl., med innl., av}%
+    {red\adddot\space og forkl., med innl., av}},
+  cbyeditoranfo = {{red\adddot\space og forkl., med forord, av}%
+    {red\adddot\space og forkl., med forord, av}},
+  cbyeditoranaf = {{red\adddot\space og forkl., med etterord, av}%
+    {red\adddot\space og forkl., med etterord, av}},
+  cbyeditortrcoin = {{red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og komm., med innl., av}%
+  {red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og komm., med innl., av}},
+  cbyeditortrcofo = {{red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og komm., med forord, av}%
+  {red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og komm., med forord, av}},
+  cbyeditortrcoaf = {{red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og komm., med etterord, av}%
+  {red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og komm., med etterord, av}},
+  cbyeditortranin = {{red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og forkl., med innl., av}%
+  {red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og forkl., med innl., av}},
+  cbyeditortranfo = {{red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og forkl., med forord, av}%
+  {red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og forkl., med forord, av}},
+  cbyeditortranaf = {{red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og forkl., med etterord, av}%
+  {red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og forkl., med etterord, av}},
+  cbytranslatorcp = {{overs\adddot\addspace\lbx@fromlang\ og komp\adddot}%
+    {overs\adddot\addspace\lbx@fromlang\ og komp\adddot}},
+  cbytranslatorco = {{overs\adddot\addspace\lbx@fromlang\ og komm\adddot}%
+    {overs\adddot\addspace\lbx@fromlang\ og komm\adddot}},
+  cbytranslatoran = {{overs\adddot\addspace\lbx@fromlang\ og forkl\adddot}%
+    {overs\adddot\addspace\lbx@fromlang\ og forkl\adddot}},
+  cbytranslatorin = {{overs\adddot\addspace\lbx@fromlang, med innl., av}%
+    {overs\adddot\addspace\lbx@fromlang, med innl., av}},
+  cbytranslatorfo = {{overs\adddot\addspace\lbx@fromlang, med forord, av}%
+    {overs\adddot\addspace\lbx@fromlang, med forord, av}},
+  cbytranslatoraf = {{overs\adddot\addspace\lbx@fromlang, med etterord, av}%
+    {overs\adddot\addspace\lbx@fromlang, med etterord, av}},
+  cbytranslatorcoin = {{overs\adddot\addspace\lbx@fromlang\ og komm.,
+      med innl., av}%
+    {overs\adddot\addspace\lbx@fromlang\ og komm., med innl., av}},
+  cbytranslatorcofo = {{overs\adddot\addspace\lbx@fromlang\ og komm.,
+      med forord, av}%
+    {overs\adddot\addspace\lbx@fromlang\ og komm., med forord, av}},
+  cbytranslatorcoaf = {{overs\adddot\addspace\lbx@fromlang\ og komm.,
+      med etterord, av}%
+    {overs\adddot\addspace\lbx@fromlang\ og komm., med etterord, av}},
+  cbytranslatoranin = {{overs\adddot\addspace\lbx@fromlang\ og forkl.,
+      med innl., av}%
+    {overs\adddot\addspace\lbx@fromlang\ og forkl., med innl., av}},
+  cbytranslatoranfo = {{overs\adddot\addspace\lbx@fromlang\ og forkl.,
+      med forord, av}%
+    {overs\adddot\addspace\lbx@fromlang\ og forkl., med forord, av}},
+  cbytranslatoranaf = {{overs\adddot\addspace\lbx@fromlang\ og forkl.,
+      med etterord, av}%
+    {overs\adddot\addspace\lbx@fromlang\ og forkl., med etterord, av}},
+  cbytranslatorcpco = {{overs\adddot\addspace\lbx@fromlang, komp. og komm\adddot}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og komm\adddot}},
+  cbytranslatorcpan = {{overs\adddot\addspace\lbx@fromlang, komp. og forkl\adddot}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og forkl\adddot}},
+  cbytranslatorcpin = {{overs\adddot\addspace\lbx@fromlang\ og komp.,
+      med innl., av}%
+    {overs\adddot\addspace\lbx@fromlang\ og komp., med innl., av}},
+  cbytranslatorcpfo = {{overs\adddot\addspace\lbx@fromlang\ og komp.,
+      med forord, av}%
+    {overs\adddot\addspace\lbx@fromlang\ og komp., med forord, av}},
+  cbytranslatorcpaf = {{overs\adddot\addspace\lbx@fromlang\ og komp.,
+      med etterord, av}%
+    {overs\adddot\addspace\lbx@fromlang\ og komp., med etterord, av}},
+  cbytranslatorcpcoin = {{overs\adddot\addspace\lbx@fromlang, komp. og komm., med innl., av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og komm.,
+      med innl., av}},
+  cbytranslatorcpcofo = {{overs\adddot\addspace\lbx@fromlang, komp. og komm., med forord, av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og komm.,
+      med forord, av}},
+  cbytranslatorcpcoaf = {{overs\adddot\addspace\lbx@fromlang, komp. og komm., med etterord, av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og komm.,
+      med etterord, av}},
+  cbytranslatorcpanin = {{overs\adddot\addspace\lbx@fromlang, komp. og forkl., med innl., av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og forkl.,
+      med innl., av}},
+  cbytranslatorcpanfo = {{overs\adddot\addspace\lbx@fromlang, komp. og forkl., med forord, av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og forkl.,
+      med forord, av}},
+  cbytranslatorcpanaf = {{overs\adddot\addspace\lbx@fromlang, komp. og forkl., med etterord, av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og forkl.,
+      med etterord, av}},
+  cbycompilerco = {{komp\adddot\space og komm\adddot}%
+    {komp\adddot\space og komm\adddot}},
+  cbycompileran = {{komp\adddot\space og forkl\adddot}%
+    {komp\adddot\space og forkl\adddot}},
+  cbycompilerin = {{komp.,\addabbrvspace med innl., av}%
+    {komp.,\addabbrvspace med innl., av}},
+  cbycompilerfo = {{komp.,\addabbrvspace med forord, av}%
+    {komp.,\addabbrvspace med forord, av}},
+  cbycompileraf = {{komp.,\addabbrvspace med etterord, av}%
+    {komp.,\addabbrvspace med etterord, av}},
+  cbycompilercoin = {{komp\adddot\space og komm., med innl., av}%
+    {komp\adddot\space og komm., med innl., av}},
+  cbycompilercofo = {{komp\adddot\space og komm., med forord, av}%
+    {komp\adddot\space og komm., med forord, av}},
+  cbycompilercoaf = {{komp\adddot\space og komm., med etterord, av}%
+    {komp\adddot\space og komm., med etterord, av}},
+  cbycompileranin = {{komp\adddot\space og forkl., med innl., av}%
+    {komp\adddot\space og forkl., med innl., av}},
+  cbycompileranfo = {{komp\adddot\space og forkl., med forord, av}%
+    {komp\adddot\space og forkl., med forord, av}},
+  cbycompileranaf = {{komp\adddot\space og forkl., med etterord, av}%
+    {komp\adddot\space og forkl., med etterord, av}},
+  volume = {{bd\adddot}{bd\adddot}},
+  volumes = {{bd\adddot}{bd\adddot}},
+  jourvol = {{{\aa}rg\adddot}{{\aa}rg\adddot}},
+  jourser = {{ser\adddot}{ser\adddot}},
+  oldseries = {{gl\adddotspace ser\adddot}{gl\adddotspace ser\adddot}},
+  edition = {{utg\adddot}{utg\adddot}},
+  page = {{s\adddot}{s\adddot}},
+  pages = {{s\adddot}{s\adddot}},
+  column = {{sp\adddot}{sp\adddot}},
+  columns = {{sp\adddot}{sp\adddot}},
+  line = {{l\adddot}{l\adddot}},
+  lines = {{l\adddot}{l\adddot}},
+  paragraph = {{avsn\adddot}{avsn\adddot}},
+  paragraphs = {{avsn\adddot}{avsn\adddot}},
+  section = {{avsn\adddot}{avsn\adddot}},
+  sections = {{avsn\adddot}{avsn\adddot}},
+  verse = {{v\adddot}{v\adddot}},
+  verses = {{v\adddot}{v\adddot}},
+  number = {{nr\adddot}{nr\adddot}},
+  chapter = {{kap\adddot}{kap\adddot}},
+  cfromamerican     = {{fra amerikansk-engelsk av}{fra amerikansk-engelsk av}},
+  cfrombrazilian    = {{fra brasiliansk-portugisisk av}{fra brasiliansk-portugisisk av}},
+  cfromdanish       = {{fra dansk av}{fra dansk av}},
+  cfromdutch        = {{fra nederlandsk av}{fra nederlandsk av}},
+  cfromenglish      = {{fra engelsk av}{fra engelsk av}},
+  cfromfrench       = {{fra fransk av}{fra fransk av}},
+  cfromgerman       = {{fra tysk av}{fra tysk av}},
+  cfromgreek        = {{fra gresk av}{fra gresk av}},
+  cfromitalian      = {{fra italiensk av}{fra italiensk av}},
+  cfromlatin        = {{fra latin av}{fra latin av}},
+  cfromnorwegian    = {{fra norsk av}{fra norsk av}},
+  cfromportuguese   = {{fra portugisisk av}{fra portugisisk av}},
+  cfromrussian      = {{fra russisk av}{fra russisk av}},
+  cfromspanish      = {{fra spansk av}{fra spansk av}},
+  cfromswedish      = {{fra svensk av}{fra svensk av}},
+  bynone = {{}{}},
+  byconductor = {{dirigert av}{dir\adddot}},
+  bydirector = {{regissert av}{regi}},
+  byproducer = {{produsert av}{prod\adddot}},
+  byeditorcp = {{redigert og kompilert av}{red\adddot\space og komp\adddot}},
+  byeditortrcp = {{redigert, oversatt \lbx@fromlang og kompilert av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp\adddot}},
+  byeditortrcpco = {{redigert, oversatt \lbx@fromlang, kompilert og kommentert av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm\adddot}},
+  byeditortrcpan = {{redigert, oversatt \lbx@fromlang, kompilert og forklart av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl\adddot}},
+  byeditortrcpin = {{redigert, oversatt \lbx@fromlang og kompilert, med innledning, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp\adddot,
+      med innledning, av}},
+  byeditortrcpfo = {{redigert, oversatt \lbx@fromlang og kompilert, med forord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp\adddot,
+      med forord, av}},
+  byeditortrcpaf = {{redigert, oversatt \lbx@fromlang og kompilert, med etterord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp\adddot,
+      med etterord, av}},
+  byeditortrcpcoin = {{redigert, oversatt \lbx@fromlang, kompilert og kommentert, med innledning, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm\adddot, med innledning, av}},
+  byeditortrcpcofo = {{redigert, oversatt \lbx@fromlang, kompilert og kommentert, med forord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm\adddot, med forord, av}},
+  byeditortrcpcoaf = {{redigert, oversatt \lbx@fromlang, kompilert og kommentert, med etterord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm\adddot, med etterord, av}},
+  byeditortrcpanin = {{redigert, oversatt \lbx@fromlang, kompilert og forklart, med innledning, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl\adddot, med innledning, av}},
+  byeditortrcpanfo = {{redigert, oversatt \lbx@fromlang, kompilert og forklart, med forord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl\adddot, med forord, av}},
+  byeditortrcpanaf = {{redigert, oversatt \lbx@fromlang, kompilert og forklart, med etterord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl\adddot, med etterord, av}},
+  byeditorcpco = {{redigert, kompilert og kommentert av}%
+    {red.,\addabbrvspace komp. og komm\adddot}},
+  byeditorcpan = {{redigert, kompilert og forklart av}%
+    {red.,\addabbrvspace komp. og forkl\adddot}},
+  byeditorcpin = {{redigert og kompilert, med innledning, av}%
+    {red\adddot\space og komp., med innledning, av}},
+  byeditorcpfo = {{redigert og kompilert, med forord, av}%
+    {red\adddot\space og komp., med forord, av}},
+  byeditorcpaf = {{redigert og kompilert, med etterord, av}%
+    {red\adddot\space og komp., med etterord, av}},
+  byeditorcpcoin = {{redigert, kompilert og kommentert, med innledning, av}%
+    {red.,\addabbrvspace komp. og komm., med innledning, av}},
+  byeditorcpcofo = {{redigert, kompilert og kommentert, med forord,
+      av}%
+    {red.,\addabbrvspace komp. og komm., med forord, av}},
+  byeditorcpcoaf = {{redigert, kompilert og kommentert, med etterord, av}%
+    {red.,\addabbrvspace komp. og komm., med etterord, av}},
+  byeditorcpanin = {{redigert, kompilert og forklart, med innledning, av}%
+    {red.,\addabbrvspace komp. og forkl., med innledning, av}},
+  byeditorcpanfo = {{redigert, kompilert og forklart, med forord,
+      av}%
+    {red.,\addabbrvspace komp. og forkl., med forord, av}},
+  byeditorcpanaf = {{redigert, kompilert og forklart, med etterord, av}%
+    {red.,\addabbrvspace komp. og forkl., med etterord, av}},
+  bytranslatorcp = {{oversatt \lbx@fromlang\ og kompilert av}%
+    {overs\adddot\addspace\lbx@fromlang\ og komp\adddot}},
+  bytranslatorcpco = {{oversatt \lbx@fromlang, kompilert og kommentert av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og komm\adddot}},
+  bytranslatorcpan = {{oversatt \lbx@fromlang, kompilert og forklart av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og forkl\adddot}},
+  bytranslatorcpin = {{oversatt \lbx@fromlang\  og kompilert, med innledning, av}%
+    {overs\adddot\addspace\lbx@fromlang\ og komp., med innledning, av}},
+  bytranslatorcpfo = {{oversatt \lbx@fromlang\ og kompilert, med forord, av}%
+    {overs\adddot\addspace\lbx@fromlang\ og komp., med forord, av}},
+  bytranslatorcpaf = {{oversatt \lbx@fromlang\ og kompilert, med etterord, av}%
+    {overs\adddot\addspace\lbx@fromlang\ og komp., med etterord, av}},
+  bytranslatorcpcoin = {{oversatt \lbx@fromlang, kompilert og kommentert,
+      med innledning, av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og komm., med innledning, av}},
+  bytranslatorcpcofo = {{oversatt \lbx@fromlang, kompilert og kommentert,
+      med forord, av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og komm.,
+      med forord, av}},
+  bytranslatorcpcoaf = {{oversatt \lbx@fromlang, kompilert og kommentert,
+      med etterord, av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og komm., med etterord, av}},
+  bytranslatorcpanin = {{oversatt \lbx@fromlang, kompilert og forklart,
+      med innledning, av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og forkl., med innledning, av}},
+  bytranslatorcpanfo = {{oversatt \lbx@fromlang, kompilert og forklart,
+      med forord, av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og forkl.,
+      med forord, av}},
+  bytranslatorcpanaf = {{oversatt \lbx@fromlang, kompilert og forklart,
+      med etterord, av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og forkl.,
+      med etterord, av}},
+  bycompilerco = {{kompilert og kommentert av}%
+    {komp\adddot\space og komm\adddot}},
+  bycompileran = {{kompilert og forklart av}%
+    {komp\adddot\space og forkl\adddot}},
+  bycompilerin = {{kompilert, med innledning, av}%
+    {komp\adddot, med innledning, av}},
+  bycompilerfo = {{kompilert, med forord, av}%
+    {komp\adddot, med forord, av}},
+  bycompileraf = {{kompilert, med etterord, av}%
+    {komp\adddot, med etterord, av}},
+  bycompilercoin = {{kompilert og kommentert, med innledning, av}%
+    {komp\adddot\space og komm\adddot, med innledning, av}},
+  bycompilercofo = {{kompilert og kommentert, med forord, av}%
+    {komp\adddot\space og komm\adddot, med forord, av}},
+  bycompilercoaf = {{kompilert og kommentert, med etterord, av}%
+    {komp\adddot\space og komm\adddot, med etterord, av}},
+  bycompileranin = {{kompilert og forklart, med innledning, av}%
+    {komp\adddot\space og forkl\adddot, med innledning, av}},
+  bycompileranfo = {{kompilert og forklart, med forord, av}%
+    {komp\adddot\space og forkl\adddot, med forord, av}},
+  bycompileranaf = {{kompilert og forklart, med etterord, av}%
+    {komp\adddot\space og forkl\adddot, med etterord, av}},
+}
+
+\protected\gdef\lbx@cms@mkbibrangetrunc#1#2{%  DATE FIX
+  \iffieldundef{#2year}%
+  {\iffieldundef{#2month}
+    {}
+    {\printtext[#2date]{%
+        \iffieldsequal{#2month}{#2endmonth}
+        {\csuse{mkbibdate#1}{}{}{#2day}}
+        {\csuse{mkbibdate#1}{}{#2month}{#2day}}%
+        \iffieldundef{#2endyear}
+        {\iffieldundef{#2endmonth}
+          {}
+          {\bibdatedash
+            \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}}}
+        {\iffieldequalstr{#2endyear}{}
+          {\mbox{\bibdatedash}}
+          {\bibdatedash
+            \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+  {\printtext[#2date]{%
+      \iffieldsequal{#2year}{#2endyear}
+      {\iffieldsequal{#2month}{#2endmonth}
+        {\csuse{mkbibdate#1}{}{}{#2day}}
+        {\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-norwegian.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norwegian.lbx
index 44437821b93..11e05e73d0e 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.3 2013/03/14 16:41:34 dfussner Exp $
+% $Id: cms-norwegian.lbx,v 1.6 2013/10/29 14:19:41 dfussner Exp $
 
-\ProvidesFile{cms-norwegian.lbx}[2013/03/14 v 2.5 biblatex localization]
+\ProvidesFile{cms-norwegian.lbx}[2013/10/29 v 2.8 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated by a native speaker (H{\aa}kon Malmedal).
@@ -260,7 +260,7 @@
   afterwordto = {{etterord til}{etterord til}},
   forewordto = {{forord til}{forord til}},
   introductionto = {{innledning til}{innl\adddot\space til}},
-  partvolume = {{\addspace del}{\addspace del}},
+  partvolume = {{del}{del}},
   by = {{av}{av}},
   of = {{av}{av}},
   on = {{p{\aa}}{p{\aa}}},
@@ -731,7 +731,10 @@
       \iffieldsequal{#2year}{#2endyear}
       {\iffieldsequal{#2month}{#2endmonth}
         {\csuse{mkbibdate#1}{}{}{#2day}}
-        {\csuse{mkbibdate#1}{}{#2month}{#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}
       {}
@@ -743,7 +746,11 @@
 \protected\gdef\lbx@cms@mkbibrangefull#1#2{%
   \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
   {}%
-  {\printtext[#2date]{%
+  {\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}}
       {}
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 bd0c671310c..46dd5d2cdd0 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.3 2013/03/14 16:42:05 dfussner Exp $
+% $Id: cms-nynorsk.lbx,v 1.6 2013/10/29 14:20:26 dfussner Exp $
 
-\ProvidesFile{cms-nynorsk.lbx}[2013/03/14 v 2.5 biblatex localization]
+\ProvidesFile{cms-nynorsk.lbx}[2013/10/29 v 2.8 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated by a native speaker (H{\aa}kon Malmedal).
@@ -260,7 +260,7 @@
   afterwordto = {{etterord til}{etterord til}},
   forewordto = {{f{\o}reord til}{f{\o}reord til}},
   introductionto = {{innleiing til}{innl\adddot\space til}},
-  partvolume = {{\addspace del}{\addspace del}},
+  partvolume = {{del}{del}},
   by = {{av}{av}},
   of = {{av}{av}},
   on = {{p{\aa}}{p{\aa}}},
@@ -731,7 +731,10 @@
       \iffieldsequal{#2year}{#2endyear}
       {\iffieldsequal{#2month}{#2endmonth}
         {\csuse{mkbibdate#1}{}{}{#2day}}
-        {\csuse{mkbibdate#1}{}{#2month}{#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}
       {}
@@ -743,7 +746,11 @@
 \protected\gdef\lbx@cms@mkbibrangefull#1#2{%
   \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
   {}%
-  {\printtext[#2date]{%
+  {\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}}
       {}