From b114d96898098a66dc02ad51ec93d68b835e2a93 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 18 Feb 2011 00:23:14 +0000 Subject: biblatex-chicago (16feb11) git-svn-id: svn://tug.org/texlive/trunk@21454 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/biblatex-chicago/chicago-authordate.bbx | 615 ++++++++++++++++----- 1 file changed, 468 insertions(+), 147 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx') diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx index b8a47e28a83..d63a666fd5f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx @@ -1,10 +1,10 @@ -% $Id: chicago-authordate.bbx,v 0.6.1.17 2010/09/03 08:51:57 dfussner Exp $ +% $Id: chicago-authordate.bbx,v 0.8 2011/02/15 14:59:29 dfussner Exp $ % This is a biblatex style file, adapted mainly from Lehman's % standard.bbx and from chicago-notes.bbx. It provides the % reference list formatting for the Chicago author-date style. -\ProvidesFile{chicago-authordate.bbx}[2010/09/03 v0.9c biblatex +\ProvidesFile{chicago-authordate.bbx}[2011/02/15 v 1.2a biblatex bibliography style] %%%% Initialize and format bibliography and los %%%% @@ -56,6 +56,50 @@ bibliography style] %%%% Author, Editor, Translator, and Compiler Macros %%%% +\renewbibmacro*{name:last-first}[4]{% + \ifuseprefix + {\usebibmacro{name:delim}{#3#1}% + \usebibmacro{name:hook}{#3#1}% + \ifblank{#3}{}{% + \ifcapital + {\mkbibnameprefix{\MakeCapital{#3}}\isdot} + {\mkbibnameprefix{#3}\isdot}% + \ifpunctmark{'}{}{\addhighpenspace}}% + \mkbibnamelast{#1}\isdot + \ifblank{#2}{}{\addcomma\addlowpenspace\mkbibnamefirst{#2}\isdot}% + \ifblank{#4}{}{\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot}} + {\usebibmacro{name:delim}{#1}% + \usebibmacro{name:hook}{#1}% + \mkbibnamelast{#1}\isdot% + \ifblank{#2#3#4}{}{\addcomma}% + \ifblank{#2}{}{\addlowpenspace\mkbibnamefirst{#2}\isdot}% + \ifblank{#3}{}{\addlowpenspace\mkbibnameprefix{#3}\isdot}% + \ifblank{#4}{}{\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot}}} + +\renewbibmacro*{name:first-last}[4]{% + \usebibmacro{name:delim}{#2#3#1}% + \usebibmacro{name:hook}{#2#3#1}% + \ifblank{#2}{}{\mkbibnamefirst{#2}\isdot\addlowpenspace}% + \ifblank{#3}{}{% + \mkbibnameprefix{#3}\isdot + \ifpunctmark{'} + {} + {\ifuseprefix{\addhighpenspace}{\addlowpenspace}}}% + \mkbibnamelast{#1}\isdot + \ifblank{#4}{}{% + \iftoggle{cms@jrcomma}% + {\ifnumeral{#4}% + {\addlowpenspace\mkbibnameaffix{#4}\isdot}% + {\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot% + \ifboolexpr{ + test{\ifnumless{\value{listcount}}{\value{listtotal}}} + and + test{\ifnumless{\value{listcount}}{\value{maxnames}}} + } + {\addcomma}% + {}}}% + {\addlowpenspace\mkbibnameaffix{#4}\isdot}}} + \newbibmacro*{author/editors/translators}{% \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}% {\usebibmacro{author}}% @@ -303,11 +347,11 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{issn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{issn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -334,18 +378,17 @@ bibliography style] \newunit\newblock \printfield{note}% \setunit*{\addcomma\addspace}\newblock% (changed for 0.7)?? -% \usebibmacro{cms-in:}% \usebibmacro{journal+issue+year+pages}% \newunit\newblock \usebibmacro{pubstate}% \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{issn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{issn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -386,15 +429,107 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% - \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}} +\DeclareBibliographyDriver{audio}{% + \usebibmacro{bibindex}% + \usebibmacro{author/editor}% + \setunit{\addspace}% + \printfield{nameaddon}% + \newunit\newblock + \usebibmacro{cmsbibsortdate}% + \newunit\newblock + \usebibmacro{italtitle+stitle}% + \newcunit\newblock + \usebibmacro{byauthor}% + \newunit\newblock + \usebibmacro{part+editor+translator}% + \newcunit%\setunit{\addperiod\addspace}% + \usebibmacro{chapinscore}% + \usebibmacro{btitle+bstitle}% + \iffieldundef{booktitle} + {\setunit{\addperiod\addspace}}% Fix customc? + {\setunit{\addcomma\addspace}}% + \iffieldundef{edition}% + {}% + {\usebibmacro{edition}% + \newcunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}% + \clearfield{volume}% + \clearfield{part}}% + {}% + \newcunit + \printfield{volumes} + \clearfield{volumes}}% + \newunit% unit, not cunit? + \usebibmacro{bybookauthor}% + \usebibmacro{byeditor+others}% + \newunit% ??? Editorpunct maybe not right here? + \iffieldundef{maintitle} + {} + {\iffieldundef{volume} + {\usebibmacro{cms-in:}% + \printtext{% + \printfield{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[maintitle]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}} + {\printfield{volume}% + \printfield{part}% + \setunit{\addspace} + \bibstring{ofseries}% + \setunit{\addspace} + \printtext{% + \printfield{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[maintitle]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}}} + \newcunit\newblock + \printfield{pages}% + \newunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newunit + \printfield{volumes}% + \newunit\newblock + \usebibmacro{ser+num}% + \newunit\newblock + \usebibmacro{bibreprint}%\printorigdate% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{publ+loc+year}% + \newunit + \printfield{type}% + \newunit\newblock + \usebibmacro{pubstate}% + \newunit\newblock + \printfield{addendum}% + \setunit*{\addcomma\addspace}\newblock% + \iftoggle{cms@isbn}% + {\printfield{isan}% + \setunit*{\addcomma\addspace}\newblock% + \printfield{ismn}}% + {}% + \setunit*{\addcomma\addspace}\newblock% + \usebibmacro{bib+doi+url}% + \newunit\newblock + \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{originally+published+as}% + \usebibmacro{finentry}}% + \DeclareBibliographyDriver{book}{% \usebibmacro{bibindex}% \usebibmacro{author/editor}% @@ -440,7 +575,10 @@ bibliography style] \clearfield{volumes}}% \usebibmacro{editorpunct}% \usebibmacro{byeditor+others}% - \newcunit\newblock + \usebibmacro{editorpunct}% + \iftoggle{cms@bookpages}% + {}% + {\clearfield{pages}}% \usebibmacro{chap+pag}% \newunit \iffieldundef{maintitle} @@ -451,8 +589,6 @@ bibliography style] \printfield{volumes}% \newunit\newblock \usebibmacro{ser+num}% -% \newunit\newblock -% \printorigdate% \newunit\newblock \printfield{note}% \newunit\newblock @@ -466,11 +602,11 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -539,8 +675,6 @@ bibliography style] \printfield{volumes}% \newunit\newblock \usebibmacro{ser+num}% -% \newunit\newblock -% \printorigdate% \newunit\newblock \printfield{note}% \newunit\newblock @@ -552,11 +686,11 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -587,9 +721,7 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% - \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -623,8 +755,6 @@ bibliography style] \clearfield{volumes}}% \usebibmacro{editorpunct}% \usebibmacro{bytranslator+others}% -% \newunit\newblock -% \printfield{edition}% \newunit \iffieldundef{maintitle} {\printfield{volume}% @@ -634,8 +764,6 @@ bibliography style] \printfield{volumes}% \newunit\newblock \usebibmacro{ser+num}% -% \newunit\newblock -% \printorigdate% \newunit\newblock \printfield{note}% \newunit\newblock @@ -647,22 +775,25 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}} -\DeclareBibliographyAlias{customa}{letter}% - -\DeclareBibliographyAlias{customb}{bookinbook}% - -\DeclareBibliographyAlias{customc}{suppbook}% +\DeclareBibliographyDriver{customc}{% + \usebibmacro{bibindex}% + \usebibmacro{author/editor}% + \newunit\newblock + \printfield{nameaddon}% + \setunit*{\addspace}% + \usebibmacro{italtitle+stitle}% + \usebibmacro{finentry}} \DeclareBibliographyDriver{image}{% \usebibmacro{bibindex}% @@ -700,9 +831,7 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% - \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -747,8 +876,6 @@ bibliography style] \usebibmacro{byeditor+others}% \newcunit\newblock \printfield{pages}% -% \newunit\newblock -% \printfield{edition}% \newunit \iffieldundef{maintitle} {\printfield{volume}% @@ -758,8 +885,6 @@ bibliography style] \printfield{volumes}% \newunit\newblock \usebibmacro{ser+num}% -% \newunit\newblock -% \printorigdate% \newunit\newblock \printfield{note}% \newunit\newblock @@ -771,11 +896,11 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -797,7 +922,6 @@ bibliography style] \usebibmacro{byauthor}% \setunit{\addperiod\addspace}% \usebibmacro{part+editor+translator}% -% \setunit{\addperiod\addspace}% Part of the crossref fix. Moved below. \iffieldundef{crossref}% {\iffieldundef{xref}% {\setunit{\addperiod\addspace}% Moved here. @@ -823,8 +947,6 @@ bibliography style] \usebibmacro{byeditor+others}% \newcunit\newblock \printfield{pages}% -% \newunit\newblock -% \printfield{edition}% \newunit \iffieldundef{maintitle} {\printfield{volume}% @@ -834,8 +956,6 @@ bibliography style] \printfield{volumes}% \newunit\newblock \usebibmacro{ser+num}% -% \newunit\newblock -% \printorigdate% \newunit\newblock \printfield{note}% \newunit\newblock @@ -847,11 +967,11 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -881,7 +1001,6 @@ bibliography style] \usebibmacro{byauthor}% \setunit{\addperiod\addspace}% \usebibmacro{part+editor+translator}% -% \setunit{\addperiod\addspace}% \iffieldundef{crossref}% {\iffieldundef{xref}% {\setunit{\addperiod\addspace}% @@ -910,11 +1029,11 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -973,8 +1092,6 @@ bibliography style] \usebibmacro{byeditor+others}% \newcunit\newblock \usebibmacro{chap+pag}% -% \newunit\newblock -% \printfield{edition}% \newunit \iffieldundef{maintitle} {\printfield{volume}% @@ -984,8 +1101,6 @@ bibliography style] \printfield{volumes}% \newunit\newblock \usebibmacro{ser+num}% -% \newunit\newblock -% \printorigdate% \newunit\newblock \printfield{note}% \newunit\newblock @@ -1006,11 +1121,11 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1060,8 +1175,6 @@ bibliography style] \usebibmacro{byeditor+others}% \newcunit\newblock \printfield{pages}% -% \newunit\newblock -% \printfield{edition}% \newunit \iffieldundef{maintitle} {\printfield{volume}% @@ -1082,11 +1195,11 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1118,8 +1231,6 @@ bibliography style] \usebibmacro{edition}% \newcunit \usebibmacro{byauthor}% -% \newunit\newblock -% \printfield{edition}% \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock @@ -1135,11 +1246,11 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1192,9 +1303,109 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \usebibmacro{bib+doi+url}% + \newunit\newblock + \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{originally+published+as}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{music}{% + \usebibmacro{bibindex}% + \usebibmacro{author/editor}% + \setunit{\addspace}% + \printfield{nameaddon}% + \newunit\newblock + \usebibmacro{cmsbibsortdate}% + \newunit\newblock + \usebibmacro{italtitle+stitle}% + \newcunit% + \printeventdate% + \newcunit% + \usebibmacro{byauthor}% + \newunit\newblock + \usebibmacro{part+editor+translator}% + \newunit\newblock + \usebibmacro{chapinscore}% + \usebibmacro{btitle+bstitle}% + \iffieldundef{booktitle} + {\newunit}% Fix customc? + {\newcunit}% + \iffieldundef{edition}% + {}% + {\usebibmacro{edition}% + \newcunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}% + \clearfield{volume}% + \clearfield{part}}% + {}% + \newcunit + \printfield{volumes} + \clearfield{volumes}}% + \newunit% unit, not cunit? + \usebibmacro{bybookauthor}% + \usebibmacro{byeditor+others}% + \newunit% ??? Editorpunct maybe not right here? + \iffieldundef{maintitle} + {} + {\iffieldundef{volume} + {\usebibmacro{cms-in:}% + \printtext{% + \printfield{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[maintitle]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}} + {\printfield{volume}% + \printfield{part}% + \setunit{\addspace} + \bibstring{ofseries}% + \setunit{\addspace} + \printtext{% + \printfield{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[maintitle]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}}} + \newcunit\newblock + \printfield{pages}% + \newunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newunit + \printfield{volumes}% + \newunit\newblock + \printfield{version}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{music+ser+num}% + \newunit + \usebibmacro{music+publisher}% + \setunit*{\addspace}%\newblock + \usebibmacro{date}% + \setunit{\ifthenelse{\iffieldundef{howpublished}\AND% + \iffieldundef{pubstate}}% + {\newunit}{\space\bibstring{by}\space}}% + \printlist{publisher}% + \newunit + \usebibmacro{institution+organization}% + \setunit*{\addcomma\addspace}\newblock + \printlist{location}% + \newunit\newblock + \printfield{type}% + \newunit\newblock + \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \iftoggle{cms@isbn}% + {\printfield{iswc}}% + {}% + \setunit*{\addcomma\addspace}\newblock% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1223,7 +1434,9 @@ bibliography style] \newunit\newblock \usebibmacro{date}% \newunit\newblock - \printfield{doi}% + \iftoggle{cms@doi}% + {\printfield{doi}}% + {}% \setunit*{\addcomma\addspace}\newblock% \usebibmacro{url+date}% \newunit\newblock @@ -1261,7 +1474,6 @@ bibliography style] \newcunit\newblock \printfield{version}% \newcunit\newblock -% \bibstring{patentfiled}\addspace}\newblock% \iftoggle{cms@switchdates}% {\bibstring{patentfiled}% \setunit{\addspace}% @@ -1280,15 +1492,12 @@ bibliography style] \setunit{\addcomma\addspace\bibstring{and}% \addspace\bibstring{patentissued}\addspace}% \usebibmacro{date}}}% -% \usebibmacro{date}% \newcunit\newblock \printfield{addendum}% \newunit\newblock \usebibmacro{pubstate}% \newunit\newblock - \printfield{doi}% - \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1320,11 +1529,11 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{issn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{issn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1349,18 +1558,17 @@ bibliography style] \newunit\newblock \printfield{note}% \setunit*{\addcomma\addspace}\newblock% (changed for 0.7)?? -% \usebibmacro{cms-in:}% \usebibmacro{periodical+issue+year+pages}% \newunit\newblock \usebibmacro{pubstate}% \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{issn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{issn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1398,11 +1606,11 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1453,8 +1661,6 @@ bibliography style] \usebibmacro{byeditor+others}% \newcunit\newblock \usebibmacro{chap+pag}% -% \newunit\newblock -% \printfield{edition}% \newunit \iffieldundef{maintitle} {\printfield{volume}% @@ -1464,8 +1670,6 @@ bibliography style] \printfield{volumes}% \newunit\newblock \usebibmacro{ser+num}% -% \newunit\newblock -% \printorigdate% \newunit\newblock \printfield{note}% \newunit\newblock @@ -1477,11 +1681,11 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1514,11 +1718,11 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isrn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isrn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1535,7 +1739,6 @@ bibliography style] \newunit\newblock \usebibmacro{cmsbibsortdate}% \newunit\newblock -% \usebibmacro{mag+news+title}% \printfield{title}% \setunit{\addcolon\addspace}% \printfield[noformat]{subtitle}% @@ -1562,11 +1765,11 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{issn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{issn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1618,10 +1821,8 @@ bibliography style] \clearfield{volumes}}% \usebibmacro{editorpunct}% \usebibmacro{byeditor}% - \newcunit\newblock + \usebibmacro{editorpunct}%\newcunit\newblock \usebibmacro{chap+pag}% -% \newunit\newblock -% \printfield{edition}% \newunit \iffieldundef{maintitle} {\printfield{volume}% @@ -1631,8 +1832,6 @@ bibliography style] \printfield{volumes}% \newunit\newblock \usebibmacro{ser+num}% -% \newunit\newblock -% \printorigdate% \newunit\newblock \printfield{note}% \newunit\newblock @@ -1644,11 +1843,11 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1683,9 +1882,7 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% - \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1720,15 +1917,125 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \iftoggle{cms@url} + {\usebibmacro{url+date}}% + {}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}} +\DeclareBibliographyDriver{video}{% + \usebibmacro{bibindex}% + \usebibmacro{author/editor}% + \setunit{\addspace}% + \printfield{nameaddon}% + \newunit\newblock + \usebibmacro{cmsbibsortdate}% + \newunit\newblock + \printtext{% + \printfield{title}% + \setunit{\addcolon\addspace}% + \printfield[title]{subtitle}}% + \iffieldundef{booktitle}% Comma after italics, period after quotes + {\newcunit} + {\newunit}%\setunit{\addspace}\newblock% + \printfield{titleaddon}%\usebibmacro{title+stitle}% + \setunit{\addspace}\newblock%\bibsentence + \usebibmacro{language+transtitle}% + \setunit{\addcomma\addspace}% + \usebibmacro{byauthor}% + \setunit{\addperiod\addspace}% + \usebibmacro{part+editor+translator}% + \setunit{\addperiod\addspace}% + \usebibmacro{chapinscore}% + \usebibmacro{btitle+bstitle}% + \iffieldundef{booktitle} + {\setunit{\addperiod\addspace}}% Fix customc? + {\setunit{\addcomma\addspace}}% + \iffieldundef{edition}% + {}% + {\usebibmacro{edition}% + \newcunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}% + \clearfield{volume}% + \clearfield{part}}% + {}% + \newcunit + \printfield{volumes} + \clearfield{volumes}}% + \newunit + \printfield{type}% + \newunit% unit, not cunit? + \usebibmacro{bybookauthor}% + \usebibmacro{byeditor+others}% + \newunit% ??? Editorpunct maybe not right here? + \iffieldundef{maintitle} + {} + {\iffieldundef{volume} + {\usebibmacro{cms-in:}% + \printtext{% + \printfield{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[maintitle]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}} + {\printfield{volume}% + \printfield{part}% + \setunit{\addspace} + \bibstring{ofseries}% + \setunit{\addspace} + \printtext{% + \printfield{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[maintitle]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}}} + \newcunit\newblock + \printfield{pages}% + \newunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newunit + \printfield{volumes}% + \newunit\newblock + \usebibmacro{ser+num}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{publ+loc+year}% + \newunit\newblock + \usebibmacro{pubstate}% + \newunit\newblock + \printfield{addendum}% + \setunit*{\addcomma\addspace}\newblock% + \iftoggle{cms@isbn}% + {\printfield{isan}}% + {}% + \setunit*{\addcomma\addspace}\newblock% + \usebibmacro{bib+doi+url}% + \newunit\newblock + \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{originally+published+as}% + \usebibmacro{finentry}}% + %%%% Other Formatting Macros %%%% +\newbibmacro*{bib+doi+url}{% For biblatex field exclusion + \iftoggle{cms@doi}% + {\printfield{doi}}% + {}% + \setunit*{\addcomma\addspace}\newblock% + \iftoggle{cms@url}% + {\usebibmacro{url+date}}% + {}} + \newbibmacro*{shorthand:label}{% Test this \iffieldequalstr{entrysubtype}{magazine}% Simplifies .bib creation {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}}}% @@ -1762,10 +2069,15 @@ bibliography style] \iffieldundef{origyear}% {\usebibmacro{cmsbibyear}}% {\iffieldint{year}% - {\ifthenelse{\thefield{origyear}>\thefield{year}}% - {\toggletrue{cms@switchdates}% - \usebibmacro{cmsbibyear}}% - {\usebibmacro{cmsbibyear}}}% + {\iffieldundef{endyear}% Needed for date ranges - video type, esp. + {\ifthenelse{\thefield{origyear}>\thefield{year}}% + {\toggletrue{cms@switchdates}% + \usebibmacro{cmsbibyear}}% + {\usebibmacro{cmsbibyear}}}% + {\ifthenelse{\thefield{origyear}>\thefield{endyear}}% + {\toggletrue{cms@switchdates}% + \usebibmacro{cmsbibyear}}% + {\usebibmacro{cmsbibyear}}}}% {\usebibmacro{cmsbibyear}}}} \newbibmacro*{cmsbibyear}{% @@ -1830,10 +2142,17 @@ bibliography style] {\iffieldundef{origyear}% {} {\printtext[parens]{% - \bibstring{origpubyear}% - \printfield{origyear}\addperiod}\nopunct}}}% + \usebibmacro{choosepubstring}% + \printorigdate\addperiod}\nopunct}}}% {\printfield{pubstate}}} +\newbibmacro*{choosepubstring}{% + \iffieldequalstr{entrytype}{video}% + {\iffieldequalstr{entrysubtype}{tv}% + {\bibstring{origshownyear}}% + {\bibstring{origreleaseyear}}}% + {\bibstring{origpubyear}}}% + \newbibmacro*{bibreprint}{% \iftoggle{cms@reprint}% {\iffieldundef{origyear}% @@ -1904,6 +2223,7 @@ bibliography style] \printfield{maintitleaddon}}}} \newbibmacro*{journal+issue+year+pages}{% + \iftoggle{cms@numbermonth}{}{\clearfield{month}}% \usebibmacro{cjournal+ser+vol+num}% \setunit{\addspace}% \ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month} @@ -1917,11 +2237,12 @@ bibliography style] \printfield{number}}% {\printfield{issue}% \setunit{\addspace}% - \printfield{year}}}% + \usebibmacro{cmsyear}}}% \setunit{\addcolon\addspace}} \printfield{pages}} \newbibmacro*{periodical+issue+year+pages}{% + \iftoggle{cms@numbermonth}{}{\clearfield{month}}% \usebibmacro{cperiodical+ser+vol+num}% \setunit{\addspace}% \ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month} @@ -1935,7 +2256,7 @@ bibliography style] \printfield{number}}% {\printfield{issue}% \setunit{\addspace}% - \printfield{year}}}% + \usebibmacro{cmsyear}}}% \setunit{\addcolon\addspace}} \printfield{pages}} -- cgit v1.2.3