biblatex-chicago (16feb11)

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

1 files changed, 462 insertions, 136 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
index 16cece4b09f..958fb7feffb 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
@@ -1,10 +1,10 @@
-% $Id: chicago-notes.bbx,v 0.9.1.9 2010/09/03 08:39:14 dfussner Exp $
+% $Id: chicago-notes.bbx,v 0.9.7.1 2011/02/15 15:02:59 dfussner Exp $
 % This is a biblatex style file, adapted mainly from Lehman's standard.bbx
 % It provides the bibliography formatting for the Chicago notes + 
 % bibliography style.
 
 
-\ProvidesFile{chicago-notes.bbx}[2010/09/03 v0.9c biblatex bibliography style]
+\ProvidesFile{chicago-notes.bbx}[2011/02/15 v 1.2a biblatex bibliography style]
 
 %%%% Initialize and format bibliography and los %%%%
 
@@ -56,9 +56,13 @@
     togl {cms@switchdates}
   }%
   {}%
-  {\ifthenelse{\thefield{origyear}>\thefield{year}}%
-    {\toggletrue{cms@switchdates}}%
-    {}}}%
+  {\iffieldundef{endyear}%
+    {\ifthenelse{\thefield{origyear}>\thefield{year}}%
+      {\toggletrue{cms@switchdates}}%
+      {}}%
+    {\ifthenelse{\thefield{origyear}>\thefield{endyear}}%
+      {\toggletrue{cms@switchdates}}%
+      {}}}}%
 
 \InitializeBibliographyStyle{%
   \let\bbx@lasthash\undefined}
@@ -69,6 +73,50 @@
 
 %%%% Author, Editor, Translator, and Compiler  Macros %%%%
 
+\renewbibmacro*{name:last-first}[4]{%
+  \ifuseprefix
+  {\usebibmacro{name:delim}{#3#1}%
+    \usebibmacro{name:hook}{#3#1}%
+    \ifblank{#3}{}{%
+      \ifcapital
+      {\mkbibnameprefix{\MakeCapital{#3}}\isdot}
+      {\mkbibnameprefix{#3}\isdot}%
+      \ifpunctmark{'}{}{\addhighpenspace}}%
+    \mkbibnamelast{#1}\isdot
+    \ifblank{#2}{}{\addcomma\addlowpenspace\mkbibnamefirst{#2}\isdot}%
+    \ifblank{#4}{}{\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot}}
+  {\usebibmacro{name:delim}{#1}%
+    \usebibmacro{name:hook}{#1}%
+    \mkbibnamelast{#1}\isdot%
+    \ifblank{#2#3#4}{}{\addcomma}%
+    \ifblank{#2}{}{\addlowpenspace\mkbibnamefirst{#2}\isdot}%
+    \ifblank{#3}{}{\addlowpenspace\mkbibnameprefix{#3}\isdot}%
+    \ifblank{#4}{}{\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot}}}
+
+\renewbibmacro*{name:first-last}[4]{%
+  \usebibmacro{name:delim}{#2#3#1}%
+  \usebibmacro{name:hook}{#2#3#1}%
+  \ifblank{#2}{}{\mkbibnamefirst{#2}\isdot\addlowpenspace}%
+  \ifblank{#3}{}{%
+    \mkbibnameprefix{#3}\isdot
+    \ifpunctmark{'}
+    {}
+    {\ifuseprefix{\addhighpenspace}{\addlowpenspace}}}%
+  \mkbibnamelast{#1}\isdot
+  \ifblank{#4}{}{%
+    \iftoggle{cms@jrcomma}%
+    {\ifnumeral{#4}%
+      {\addlowpenspace\mkbibnameaffix{#4}\isdot}%
+      {\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot%
+        \ifboolexpr{
+          test{\ifnumless{\value{listcount}}{\value{listtotal}}}
+          and
+          test{\ifnumless{\value{listcount}}{\value{maxnames}}}
+        }
+        {\addcomma}%
+        {}}}%
+    {\addlowpenspace\mkbibnameaffix{#4}\isdot}}}
+
 \newbibmacro*{author/editors/translators}{%
   \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}%
     {\usebibmacro{author}}%
@@ -295,11 +343,11 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{issn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -322,16 +370,15 @@
   \newunit\newblock
   \printfield{note}%
   \setunit*{\addcomma\addspace}\newblock% (changed for 0.7)??
-%  \usebibmacro{cms-in:}%
   \usebibmacro{journal+issue+year+pages}%
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{issn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -366,15 +413,103 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
+\DeclareBibliographyDriver{audio}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \setunit{\addspace}%
+  \printfield{nameaddon}%
+  \newunit\newblock
+  \usebibmacro{italtitle+stitle}%
+  \newcunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \newcunit%\setunit{\addperiod\addspace}%
+  \usebibmacro{chapinscore}%
+  \usebibmacro{btitle+bstitle}%
+  \iffieldundef{booktitle}
+  {\setunit{\addperiod\addspace}}% Fix customc?
+  {\setunit{\addcomma\addspace}}%
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}%
+    \newcunit
+    \iffieldundef{maintitle}
+    {\printfield{volume}%
+      \printfield{part}%
+      \clearfield{volume}%
+      \clearfield{part}}%
+    {}%
+    \newcunit
+    \printfield{volumes}
+    \clearfield{volumes}}%
+  \newunit% unit, not cunit?
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{byeditor+others}%
+  \newunit% ??? Editorpunct maybe not right here?
+  \iffieldundef{maintitle}
+  {}
+  {\iffieldundef{volume}
+    {\usebibmacro{cms-in:}%
+      \printtext[maintitle]{%
+        \printfield[noformat]{maintitle}%
+        \setunit{\addcolon\addspace}%
+        \printfield[noformat]{mainsubtitle}}%
+      \newcunit
+      \printfield{maintitleaddon}}
+    {\printfield{volume}%
+      \printfield{part}%
+      \setunit{\addspace}
+      \bibstring{ofseries}%
+      \setunit{\addspace}
+      \printtext[maintitle]{%
+        \printfield[noformat]{maintitle}%
+        \setunit{\addcolon\addspace}%
+        \printfield[noformat]{mainsubtitle}}%
+      \newcunit
+      \printfield{maintitleaddon}}}
+  \newcunit\newblock
+  \printfield{pages}%
+  \newunit
+  \iffieldundef{maintitle}
+    {\printfield{volume}%
+     \printfield{part}}
+    {}%
+  \newunit
+  \printfield{volumes}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \usebibmacro{cmsorigdate}%\printorigdate%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{publ+loc+year}%
+  \newunit
+  \printfield{type}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isan}%
+    \setunit*{\addcomma\addspace}\newblock%
+    \printfield{ismn}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}%
+
 \DeclareBibliographyDriver{book}{%
   \usebibmacro{bibindex}%
   \usebibmacro{author/editor}%
@@ -418,7 +553,10 @@
     \clearfield{volumes}}%
   \usebibmacro{editorpunct}%
   \usebibmacro{byeditor+others}%
-  \newcunit\newblock
+  \usebibmacro{editorpunct}%\newcunit\newblock
+  \iftoggle{cms@bookpages}%
+  {}%
+  {\clearfield{pages}}%
   \usebibmacro{chap+pag}%
   \newunit
   \iffieldundef{maintitle}
@@ -440,11 +578,11 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -520,11 +658,11 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -549,9 +687,7 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -583,8 +719,6 @@
     \clearfield{volumes}}%
   \usebibmacro{editorpunct}%
   \usebibmacro{bytranslator+others}%
-%  \newunit\newblock
-%  \printfield{edition}%
   \newunit
   \iffieldundef{maintitle}
     {\printfield{volume}%
@@ -603,22 +737,25 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
-\DeclareBibliographyAlias{customa}{letter}%
-
-\DeclareBibliographyAlias{customb}{bookinbook}%
-
-\DeclareBibliographyAlias{customc}{suppbook}%
+\DeclareBibliographyDriver{customc}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \newunit\newblock
+  \printfield{nameaddon}%
+  \setunit*{\addspace}%
+  \usebibmacro{italtitle+stitle}%
+  \usebibmacro{finentry}}
 
 \DeclareBibliographyDriver{image}{%
   \usebibmacro{bibindex}%
@@ -650,9 +787,7 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -695,8 +830,6 @@
   \usebibmacro{byeditor+others}%
   \newcunit\newblock
   \printfield{pages}%
-%  \newunit\newblock
-%  \printfield{edition}%
   \newunit
   \iffieldundef{maintitle}
     {\printfield{volume}%
@@ -715,11 +848,11 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -735,14 +868,13 @@
   \usebibmacro{title+stitle}%
   \setunit{\addspace}\newblock%\bibsentence
   \usebibmacro{language+transtitle}%
-  \setunit{\addcomma\addspace}%
+  \newcunit\newblock
   \usebibmacro{byauthor}%
-  \setunit{\addperiod\addspace}%
+  \newunit\newblock
   \usebibmacro{part+editor+translator}%
-%  \setunit{\addperiod\addspace}% Part of the crossref fix. Moved below.
   \iffieldundef{crossref}%
   {\iffieldundef{xref}%
-  {\setunit{\addperiod\addspace}% Moved here.
+  {\newunit\newblock
   \usebibmacro{chapincoll}%
   \usebibmacro{cms-in:}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
@@ -765,8 +897,6 @@
   \usebibmacro{byeditor+others}%
   \newcunit\newblock
   \printfield{pages}%
-%  \newunit\newblock
-%  \printfield{edition}%
   \newunit
   \iffieldundef{maintitle}
     {\printfield{volume}%
@@ -785,21 +915,23 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}%
 {\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
-  \bibxrefcite{\thefield{xref}}
+  \usebibmacro{chapincoll}%
+  \bibxrefcite{\thefield{xref}}%
   \usebibmacro{bibpostxref}%
   \usebibmacro{finentry}}}%
 {\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+  \usebibmacro{chapincoll}%
   \bibxrefcite{\thefield{crossref}}%
   \usebibmacro{bibpostxref}%
   \usebibmacro{finentry}}}
@@ -817,7 +949,6 @@
   \usebibmacro{byauthor}%
   \setunit{\addperiod\addspace}%
   \usebibmacro{part+editor+translator}%
-%  \setunit{\addperiod\addspace}%
   \iffieldundef{crossref}%
   {\iffieldundef{xref}%
   {\setunit{\addperiod\addspace}%
@@ -825,7 +956,7 @@
     \usebibmacro{cms-in:}%
   \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
   \newcunit\newblock
-  \usebibmacro{chap+pag}%
+  \printfield{pages}%
   \newunit\newblock
   \iffieldundef{maintitle}
     {\printfield{volume}%
@@ -842,21 +973,23 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}%
 {\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
-  \bibxrefcite{\thefield{xref}}
+  \usebibmacro{chapincoll}%
+  \bibxrefcite{\thefield{xref}}%
   \usebibmacro{bibpostxref}%
   \usebibmacro{finentry}}}%
 {\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+  \usebibmacro{chapincoll}%
   \bibxrefcite{\thefield{crossref}}%
   \usebibmacro{bibpostxref}%
   \usebibmacro{finentry}}}
@@ -903,8 +1036,6 @@
   \usebibmacro{byeditor+others}%
   \newcunit\newblock
   \usebibmacro{chap+pag}%
-%  \newunit\newblock
-%  \printfield{edition}%
   \newunit
   \iffieldundef{maintitle}
     {\printfield{volume}%
@@ -932,11 +1063,11 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1002,11 +1133,11 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1015,12 +1146,14 @@
 {\ifpunctmark{*}% Attempt to fix issues with n.d. Changed for 0.9.
   {\setunit{\nopunct\addspace\bibsentence}}%
   {}%
-  \bibxrefcite{\thefield{xref}}
+  \usebibmacro{chapincoll}%
+  \bibxrefcite{\thefield{xref}}%
   \usebibmacro{bibpostxref}%
   \usebibmacro{finentry}}}%
 {\ifpunctmark{*}% Likewise.
   {\setunit{\nopunct\addspace\bibsentence}}%
   {}%
+  \usebibmacro{chapincoll}%
   \bibxrefcite{\thefield{crossref}}%
   \usebibmacro{bibpostxref}%
   \usebibmacro{finentry}}}
@@ -1036,8 +1169,6 @@
   \usebibmacro{edition}%
   \newcunit
   \usebibmacro{byauthor}%
-%  \newunit\newblock
-%  \printfield{edition}%
   \newunit\newblock
   \usebibmacro{ser+num}%
   \newunit\newblock
@@ -1049,11 +1180,11 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1100,9 +1231,107 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}
+
+\DeclareBibliographyDriver{music}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \setunit{\addspace}%
+  \printfield{nameaddon}%
+  \newunit\newblock
+  \usebibmacro{italtitle+stitle}%
+  \newcunit%
+  \printeventdate%
+  \newcunit%
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{part+editor+translator}%
+  \newunit\newblock
+  \usebibmacro{chapinscore}%
+  \usebibmacro{btitle+bstitle}%
+  \iffieldundef{booktitle}
+  {\newunit}% Fix customc?
+  {\newcunit}%
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}%
+    \newcunit
+    \iffieldundef{maintitle}
+    {\printfield{volume}%
+      \printfield{part}%
+      \clearfield{volume}%
+      \clearfield{part}}%
+    {}%
+    \newcunit
+    \printfield{volumes}
+    \clearfield{volumes}}%
+  \newunit% unit, not cunit?
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{byeditor+others}%
+  \newunit% ??? Editorpunct maybe not right here?
+  \iffieldundef{maintitle}
+  {}
+  {\iffieldundef{volume}
+    {\usebibmacro{cms-in:}%
+      \printtext[maintitle]{%
+        \printfield[noformat]{maintitle}%
+        \setunit{\addcolon\addspace}%
+        \printfield[noformat]{mainsubtitle}}%
+      \newcunit
+      \printfield{maintitleaddon}}
+    {\printfield{volume}%
+      \printfield{part}%
+      \setunit{\addspace}
+      \bibstring{ofseries}%
+      \setunit{\addspace}
+      \printtext[maintitle]{%
+        \printfield[noformat]{maintitle}%
+        \setunit{\addcolon\addspace}%
+        \printfield[noformat]{mainsubtitle}}%
+      \newcunit
+      \printfield{maintitleaddon}}}
+  \newcunit\newblock
+  \printfield{pages}%
+  \newunit
+  \iffieldundef{maintitle}
+    {\printfield{volume}%
+     \printfield{part}}
+    {}%
+  \newunit
+  \printfield{volumes}%
+  \newunit\newblock
+  \printfield{version}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{music+ser+num}%
+  \newunit
+  \usebibmacro{music+publisher}%
+  \setunit*{\addspace}%\newblock
+  \usebibmacro{date}%
+  \setunit*{\ifthenelse{\iffieldundef{howpublished}\AND%
+      \iffieldundef{pubstate}}%
+    {\addperiod\addspace}{\space\bibstring{by}\space}}%
+  \printlist{publisher}%
+  \newunit
+  \usebibmacro{institution+organization}%
+  \setunit*{\addcomma\addspace}\newblock
+  \printlist{location}%
+  \newunit\newblock
+  \printfield{type}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{iswc}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1127,7 +1356,9 @@
   \newunit\newblock
   \usebibmacro{date}%
   \newunit\newblock
-  \printfield{doi}%
+  \iftoggle{cms@doi}%
+  {\printfield{doi}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
   \usebibmacro{url+date}%
   \newunit\newblock
@@ -1158,8 +1389,6 @@
        \printlist[][-\value{listtotal}]{location}}}%
   \newcunit\newblock
   \printfield{version}%
-%  \setunit{\addcomma\addspace
-%  \bibstring{patentfiled}\addspace}\newblock%
   \iffieldundef{origyear}%
   {\iffieldundef{year}%
     {}%
@@ -1170,13 +1399,10 @@
     \setunit{\addcomma\addspace\bibstring{and}%
       \addspace\bibstring{patentissued}\addspace}%
     \usebibmacro{date}}%
-%  \usebibmacro{date}%
   \newcunit\newblock
   \printfield{addendum}%
   \newunit\newblock
-  \printfield{doi}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \usebibmacro{finentry}}
@@ -1202,11 +1428,11 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{issn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1227,16 +1453,15 @@
   \newunit\newblock
   \printfield{note}%
   \setunit*{\addcomma\addspace}\newblock% (changed for 0.7)??
-%  \usebibmacro{cms-in:}%
   \usebibmacro{periodical+issue+year+pages}%
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{issn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1268,11 +1493,11 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1321,8 +1546,6 @@
   \usebibmacro{byeditor+others}%
   \newcunit\newblock
   \usebibmacro{chap+pag}%
-%  \newunit\newblock
-%  \printfield{edition}%
   \newunit
   \iffieldundef{maintitle}
     {\printfield{volume}%
@@ -1341,11 +1564,11 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1372,11 +1595,11 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isrn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isrn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1391,7 +1614,6 @@
   \setunit{\addspace}%
   \printfield{nameaddon}%
   \newunit\newblock
-%  \usebibmacro{mag+news+title}%
   \printfield{title}%
   \setunit{\addcolon\addspace}%
   \printfield[noformat]{subtitle}%
@@ -1414,11 +1636,11 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{issn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{issn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1468,10 +1690,8 @@
     \clearfield{volumes}}%
   \usebibmacro{editorpunct}%
   \usebibmacro{byeditor}%
-  \newcunit\newblock
+  \usebibmacro{editorpunct}%\newcunit\newblock
   \usebibmacro{chap+pag}%
-%  \newunit\newblock
-%  \printfield{edition}%
   \newunit
   \iffieldundef{maintitle}
     {\printfield{volume}%
@@ -1490,11 +1710,11 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{isbn}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
+  \iftoggle{cms@isbn}%
+  {\printfield{isbn}}%
+  {}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1523,9 +1743,7 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \printfield{doi}%
-  \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \usebibmacro{bib+doi+url}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
@@ -1554,15 +1772,123 @@
   \newunit\newblock
   \printfield{addendum}%
   \setunit*{\addcomma\addspace}\newblock%
-  \usebibmacro{url+date}%
+  \iftoggle{cms@url}
+  {\usebibmacro{url+date}}%
+  {}%
   \newunit\newblock
   \usebibmacro{pageref}%
   \newunit\newblock
   \usebibmacro{originally+published+as}%
   \usebibmacro{finentry}}
 
+\DeclareBibliographyDriver{video}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{author/editor}%
+  \setunit{\addspace}%
+  \printfield{nameaddon}%
+  \newunit\newblock
+  \printtext[title]{%
+    \printfield[noformat]{title}%
+    \setunit{\addcolon\addspace}%
+    \printfield[noformat]{subtitle}}%
+  \iffieldundef{booktitle}% Comma after italics, period after quotes
+  {\newcunit}
+  {\newunit}%\setunit{\addspace}\newblock%
+  \printfield{titleaddon}%\usebibmacro{title+stitle}%
+  \setunit{\addspace}\newblock%\bibsentence
+  \usebibmacro{language+transtitle}%
+  \setunit{\addcomma\addspace}%
+  \usebibmacro{byauthor}%
+  \setunit{\addperiod\addspace}%
+  \usebibmacro{part+editor+translator}%
+  \setunit{\addperiod\addspace}%
+  \usebibmacro{chapinscore}%
+  \usebibmacro{btitle+bstitle}%
+  \iffieldundef{booktitle}
+  {\setunit{\addperiod\addspace}}% Fix customc?
+  {\setunit{\addcomma\addspace}}%
+  \iffieldundef{edition}%
+  {}%
+  {\usebibmacro{edition}%
+    \newcunit
+    \iffieldundef{maintitle}
+    {\printfield{volume}%
+      \printfield{part}%
+      \clearfield{volume}%
+      \clearfield{part}}%
+    {}%
+    \newcunit
+    \printfield{volumes}
+    \clearfield{volumes}}%
+  \newunit
+  \printfield{type}%
+  \newunit% unit, not cunit?
+  \usebibmacro{bybookauthor}%
+  \usebibmacro{byeditor+others}%
+  \newunit% ??? Editorpunct maybe not right here?
+  \iffieldundef{maintitle}
+  {}
+  {\iffieldundef{volume}
+    {\usebibmacro{cms-in:}%
+      \printtext[maintitle]{%
+        \printfield[noformat]{maintitle}%
+        \setunit{\addcolon\addspace}%
+        \printfield[noformat]{mainsubtitle}}%
+      \newcunit
+      \printfield{maintitleaddon}}
+    {\printfield{volume}%
+      \printfield{part}%
+      \setunit{\addspace}
+      \bibstring{ofseries}%
+      \setunit{\addspace}
+      \printtext[maintitle]{%
+        \printfield[noformat]{maintitle}%
+        \setunit{\addcolon\addspace}%
+        \printfield[noformat]{mainsubtitle}}%
+      \newcunit
+      \printfield{maintitleaddon}}}
+  \newcunit\newblock
+  \printfield{pages}%
+  \newunit
+  \iffieldundef{maintitle}
+    {\printfield{volume}%
+     \printfield{part}}
+    {}%
+  \newunit
+  \printfield{volumes}%
+  \newunit\newblock
+  \usebibmacro{ser+num}%
+  \newunit\newblock
+  \usebibmacro{cmsorigdate}%\printorigdate%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{publ+loc+year}%
+  \newunit\newblock
+  \printfield{addendum}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@isbn}%
+  {\printfield{isan}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \usebibmacro{bib+doi+url}%
+  \newunit\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \usebibmacro{originally+published+as}%
+  \usebibmacro{finentry}}%
+
 %%%% Other Formatting Macros %%%%
 
+\newbibmacro*{bib+doi+url}{% For biblatex field exclusion
+  \iftoggle{cms@doi}%
+  {\printfield{doi}}%
+  {}%
+  \setunit*{\addcomma\addspace}\newblock%
+  \iftoggle{cms@url}%
+  {\usebibmacro{url+date}}%
+  {}}
+
 \newbibmacro*{bibpostxref}{%
   \iffieldundef{postnote}%
   {\iffieldundef{chapter}%
@@ -1628,10 +1954,10 @@
   \setunit{\addspace}%
   \printtext[parens]{%
     \iffieldundef{issue}
-    {\usebibmacro{date}}%
+    {\usebibmacro{number+or+month}}%
       {\printfield{issue}%
        \setunit{\addspace}%
-       \printfield{year}}}%
+       \usebibmacro{cmsyear}}}%
   \setunit{\addcolon\addspace}
   \printfield{pages}}
 
@@ -1640,10 +1966,10 @@
   \setunit{\addspace}%
   \printtext[parens]{%
     \iffieldundef{issue}
-    {\usebibmacro{date}}%
+    {\usebibmacro{number+or+month}}%
       {\printfield{issue}%
        \setunit{\addspace}%
-       \printfield{year}}}%
+       \usebibmacro{cmsyear}}}%
   \setunit{\addcolon\addspace}
   \printfield{pages}}