diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx | 1028 |
1 files changed, 722 insertions, 306 deletions
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 28de8fb80e3..d97e430551b 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.1.13 2010/09/03 08:39:06 dfussner Exp $ +% $Id: chicago-notes.cbx,v 0.9.7.1 2011/02/15 15:01:59 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}[2010/09/03 v0.9c biblatex citation style] +\ProvidesFile{chicago-notes.cbx}[2011/02/15 v 1.2a biblatex citation style] %%%% Biblatex initialization + Chicago options + Toggles %%%% @@ -14,6 +14,14 @@ \providetoggle{cms@reprint}% ditto \providetoggle{cms@switchdates}% ditto +\providetoggle{cms@jrcomma}% For comma before Jr./Sr. + +\providetoggle{cms@url}% These are for the field-exclusion options +\providetoggle{cms@doi} +\providetoggle{cms@isbn} +\providetoggle{cms@numbermonth} +\providetoggle{cms@bookpages} + \providetoggle{cms@headlessnote} \providetoggle{cms@fullnote} \providetoggle{cms@shortnote} @@ -28,6 +36,9 @@ \providetoggle{cms@postposit} \AtEveryCitekey{% + \iffieldundef{userc}% + {}% + {\nocite{\thefield{userc}}}% \global\togglefalse{cms@loccit}% \iffieldequalstr{pubstate}{reprint}% {\toggletrue{cms@reprint}}% @@ -42,9 +53,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}}% + {}}}}% \DeclareBibliographyOption{annotation}[true]{% \global\toggletrue{cms@annotation}} @@ -64,6 +79,44 @@ \DeclareEntryOption{usecompiler}[true]{% \settoggle{cms@usecompiler}{#1}} +\DeclareBibliographyOption{juniorcomma}[true]{% + \settoggle{cms@jrcomma}{#1}} + +\DeclareEntryOption{juniorcomma}[true]{% + \settoggle{cms@jrcomma}{#1}} + +% The field-exclusion options % + +\DeclareBibliographyOption{isbn}[true]{% + \settoggle{cms@isbn}{#1}} +\DeclareBibliographyOption{url}[true]{% + \settoggle{cms@url}{#1}} +\DeclareBibliographyOption{doi}[true]{% + \settoggle{cms@doi}{#1}} +\DeclareBibliographyOption{numbermonth}[true]{% + \settoggle{cms@numbermonth}{#1}} +\DeclareBibliographyOption{bookpages}[true]{% + \settoggle{cms@bookpages}{#1}} +\DeclareBibliographyOption{includeall}[true]{% + \settoggle{cms@isbn}{#1}% + \settoggle{cms@url}{#1}% + \settoggle{cms@doi}{#1}% + \settoggle{cms@numbermonth}{#1}% + \settoggle{cms@bookpages}{#1}} + +\DeclareEntryOption{isbn}[true]{% + \settoggle{cms@isbn}{#1}} +\DeclareEntryOption{url}[true]{% + \settoggle{cms@url}{#1}} +\DeclareEntryOption{doi}[true]{% + \settoggle{cms@doi}{#1}} +\DeclareEntryOption{numbermonth}[true]{% + \settoggle{cms@numbermonth}{#1}} +\DeclareEntryOption{bookpages}[true]{% + \settoggle{cms@bookpages}{#1}} + +\ExecuteBibliographyOptions{includeall} + % For author-date compatibility % \DeclareEntryOption{switchdates}[true]{% @@ -179,9 +232,7 @@ {cite:\thefield{entrytype}}% \iffieldundef{shorthand} {}% - {\addperiod\space% - \bibstring{citedas}\space% - \printfield{shorthand}}}} + {\usebibmacro{cms:shorthandintro}}}} \newbibmacro*{cite:crossfull}{% \printtext[bibhypertarget]{% @@ -190,9 +241,7 @@ {cite:crossfull}% \iffieldundef{shorthand} {} - {\addperiod\space - \bibstring{citedas}\space - \printfield{shorthand}}}} + {\usebibmacro{cms:shorthandintro}}}} \newbibmacro*{cite:short}{% \ifthenelse{\ifnameundef{labelname}\OR% @@ -218,6 +267,14 @@ \printtext[bibhyperlink]{% \printfield{shorthand}}} +\newbibmacro*{cms:shorthandintro}{% For changing the citedas phrase + \iffieldundef{shorthandintro}% + {\addperiod\space% + \bibstring{citedas}\space% + \printfield{shorthand}}% + {\addperiod\space% + \printfield{shorthandintro}}} + \newbibmacro*{cite:ibid}{% \iftoggle{cms@noibid} {\global\toggletrue{cms@shortnote}% @@ -243,6 +300,13 @@ {}%\usebibmacro{clearalmostall}} (?) {\usebibmacro{citeindex}% \usebibmacro{cms-in:}% + \ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT% + \(\iffieldequalstr{entrytype}{collection}\OR% + \iffieldequalstr{entrytype}{proceedings}\)}% + {\clearname{author}% + \clearname{shortauthor}% + \clearname{labelname}}% + {}% \usebibmacro{crosscite}} {} {}%\usebibmacro{xrefpostnote}} @@ -250,6 +314,13 @@ \DeclareCiteCommand{\bibxrefcite} {}%\usebibmacro{clearalmostall}} (?) {\usebibmacro{cms-in:}% + \ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT% + \(\iffieldequalstr{entrytype}{collection}\OR% + \iffieldequalstr{entrytype}{proceedings}\)}% + {\clearname{author}% + \clearname{shortauthor}% + \clearname{labelname}}% + {}% \toggletrue{cms@shortnote}% \togglefalse{cms@fullnote}% \usebibmacro{cite:short}} @@ -376,11 +447,11 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{issn}% - \newcunit\newblock - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{issn}}% + {}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -406,11 +477,11 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{issn}% - \newcunit\newblock - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{issn}}% + {}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}}} @@ -444,9 +515,91 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{doi}% + \usebibmacro{cite+doi+url}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{pageref}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{cite:audio}{% + \usebibmacro{bibindex}% + \usebibmacro{author/editor}% + \setunit{\addspace}% + \printfield{nameaddon}% + \newcunit\newblock + \usebibmacro{ctitle+stitle}% + \setunit{\addspace}\newblock% + \usebibmacro{language+transtitle}% + \newcunit + \usebibmacro{byauthor}% + \newcunit + \usebibmacro{cpart+editor+translator}% + \newcunit + \usebibmacro{chapinscore}% + \usebibmacro{btitle+bstitle}% + \newcunit + \iffieldundef{edition}% + {}% + {\usebibmacro{edition}% + \newcunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}% + \clearfield{volume}% + \clearfield{part}}% + {}% + \newcunit + \printfield{volumes} + \clearfield{volumes}}% + \newcunit + \usebibmacro{bybookauthor}% + \usebibmacro{cbyeditor+others}% + \iffieldundef{maintitle} + {} + {\iffieldundef{volume} + {\usebibmacro{cms-in:}% + \printtext[maintitle]{% + \printfield[noformat]{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[noformat]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}} + {\printfield{volume}% + \printfield{part}% + \setunit{\addspace} + \bibstring{ofseries}% + \setunit{\addspace} + \printtext[maintitle]{% + \printfield[noformat]{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[noformat]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}}} + \newcunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newcunit + \printfield{volumes}% + \newcunit\newblock + \usebibmacro{ser+num}% + \newcunit\newblock + \printfield{note}% + \newcunit\newblock + \usebibmacro{cpubl+loc+year}% + \newcunit + \printfield{type}% + \usebibmacro{fullpostnote}% + \newcunit\newblock + \printfield{addendum}% + \newcunit\newblock + \iftoggle{cms@isbn}% + {\printfield{isan}% + \newcunit\newblock + \printfield{ismn}}% + {}% + \newcunit\newblock% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -507,17 +660,20 @@ \printfield{note}% \newcunit\newblock \usebibmacro{cpubl+loc+year}% + \iftoggle{cms@bookpages}% + {}% + {\clearfield{pages}}% \usebibmacro{fullpostnote}% \newcunit\newblock \printlist[][-\value{listtotal}]{lista}% \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{isbn}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \newcunit\newblock - \printfield{doi}% - \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -570,11 +726,11 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{isbn}% - \newcunit\newblock - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -597,9 +753,7 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{doi}% - \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -630,8 +784,6 @@ \newcunit \usebibmacro{cbytranslator+others}% \newcunit\newblock -% \printfield{edition}% -% \newcunit \iffieldundef{maintitle} {\printfield{volume}% \printfield{part}} @@ -648,11 +800,11 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{isbn}% - \newcunit\newblock - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -677,8 +829,6 @@ \usebibmacro{bybookauthor}% \usebibmacro{cbyeditor+others}% \newcunit\newblock -% \printfield{edition}% -% \newcunit \iffieldundef{maintitle} {\printfield{volume}% \printfield{part}} @@ -695,20 +845,22 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{isbn}% - \newcunit\newblock - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}}% -% \usebibmacro{finentry}} - -\DeclareBibliographyAlias{cite:customa}{cite:letter}% -\DeclareBibliographyAlias{cite:customb}{cite:bookinbook}% - -\DeclareBibliographyAlias{cite:customc}{cite:suppbook}% +\DeclareBibliographyDriver{cite:customc}{% + \usebibmacro{bibindex}% + \usebibmacro{author/editor}% + \newcunit\newblock + \printfield{nameaddon}% + \setunit*{\addspace}% + \usebibmacro{italtitle+stitle}% + \usebibmacro{finentry}} \DeclareBibliographyDriver{cite:image}{% \usebibmacro{bibindex}% @@ -741,9 +893,7 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{doi}% - \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -762,7 +912,7 @@ \setunit{\addcomma\addspace}% \usebibmacro{cpart+editor+translator}% \setunit{\addcomma\addspace}% -% \usebibmacro{chapincoll}% + \usebibmacro{chapincoll}% \usebibmacro{cms-in:}% \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}% \newcunit @@ -782,8 +932,6 @@ \newcunit \usebibmacro{bybookauthor}% \usebibmacro{cbyeditor+others}% -% \newcunit\newblock -% \printfield{edition}% \newcunit \iffieldundef{maintitle} {\printfield{volume}% @@ -801,11 +949,11 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{isbn}% - \newcunit\newblock - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -824,65 +972,69 @@ \setunit{\addcomma\addspace}% \usebibmacro{cpart+editor+translator}% \setunit{\addcomma\addspace}% -% \usebibmacro{chapincoll}% \iffieldundef{crossref}% {\iffieldundef{xref} - {\usebibmacro{cms-in:}% - \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}% - \newcunit - \iffieldundef{edition}% - {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% - \newcunit - \usebibmacro{bybookauthor}% - \usebibmacro{cbyeditor+others}% -% \newcunit\newblock -% \printfield{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% - \newcunit\newblock - \usebibmacro{ser+num}% - \newcunit\newblock - \printfield{note}% - \newcunit\newblock - \usebibmacro{cpubl+loc+year}% - \usebibmacro{fullpostnote}% - \newcunit\newblock - \printfield{addendum}% - \newcunit\newblock - \printfield{isbn}% - \newcunit\newblock - \printfield{doi}% - \newcunit\newblock - \usebibmacro{url+date}% - \newcunit\newblock - \usebibmacro{pageref}% - \usebibmacro{finentry}} -{\ifterm{\addspace\bibsentence}% All altered for 0.9c. - {\addcomma\addspace}% Perhaps need to alter it back - \xrefcite{\thefield{xref}}% Removed \addspace from each. - \usebibmacro{xrefpostnote}% - \usebibmacro{finentry}}}% -{\ifterm{\addspace\bibsentence}% - {\addcomma\addspace}% - \xrefcite{\thefield{crossref}}% - \usebibmacro{xrefpostnote}% - \usebibmacro{finentry}}} + {\usebibmacro{chapincoll}% + \usebibmacro{cms-in:}% + \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}% + \newcunit + \iffieldundef{edition}% + {}% + {\usebibmacro{edition}% + \newcunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}% + \clearfield{volume}% + \clearfield{part}}% + {}% + \newcunit + \printfield{volumes} + \clearfield{volumes}}% + \newcunit + \usebibmacro{bybookauthor}% + \usebibmacro{cbyeditor+others}% + \newcunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newcunit + \printfield{volumes}% + \newcunit\newblock + \usebibmacro{ser+num}% + \newcunit\newblock + \printfield{note}% + \newcunit\newblock + \usebibmacro{cpubl+loc+year}% + \usebibmacro{fullpostnote}% + \newcunit\newblock + \printfield{addendum}% + \newcunit\newblock + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% + \newcunit\newblock + \usebibmacro{cite+doi+url}% + \newcunit\newblock + \usebibmacro{pageref}% + \usebibmacro{finentry}} + {\ifterm{\iffieldundef{chapter}% New test needed to cope with + {\addspace\bibsentence}% new chapter citing system. + {\setunit{\addspace\bibsentence}}}% All altered for 0.9c. + {\addcomma\addspace}% Perhaps need to alter it back + \usebibmacro{chapincoll}% + \xrefcite{\thefield{xref}}% Removed \addspace from each. + \usebibmacro{xrefpostnote}% + \usebibmacro{finentry}}}% + {\ifterm{\iffieldundef{chapter}% New test needed to cope with + {\addspace\bibsentence}% new chapter citing system. + {\setunit{\addspace\bibsentence}}}% + {\addcomma\addspace}% + \usebibmacro{chapincoll}% + \xrefcite{\thefield{crossref}}% + \usebibmacro{xrefpostnote}% + \usebibmacro{finentry}}} \DeclareBibliographyDriver{cite:inproceedings}{% \usebibmacro{bibindex}% @@ -900,44 +1052,51 @@ \setunit{\addcomma\addspace}% \iffieldundef{crossref}% {\iffieldundef{xref} - {\usebibmacro{cms-in:}% - \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}% - \newcunit\newblock - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% - \newcunit\newblock - \usebibmacro{ser+num}% - \newcunit\newblock - \printfield{note}% - \setunit{\addspace}\newblock% - \printtext[parens]{% - \usebibmacro{org+publ+loc+year}}% - \usebibmacro{fullpostnote}% - \newcunit\newblock - \printfield{addendum}% - \newcunit\newblock - \printfield{isbn}% - \newcunit\newblock - \printfield{doi}% - \newcunit\newblock - \usebibmacro{url+date}% - \newcunit\newblock - \usebibmacro{pageref}% - \usebibmacro{finentry}} -{\ifterm{\addspace\bibsentence}% See incollection - {\addcomma\addspace}% - \xrefcite{\thefield{xref}}% - \usebibmacro{xrefpostnote}% - \usebibmacro{finentry}}}% -{\ifterm{\addspace\bibsentence}% - {\addcomma\addspace}% - \xrefcite{\thefield{crossref}}% - \usebibmacro{xrefpostnote}% - \usebibmacro{finentry}}} + {\usebibmacro{chapincoll}% + \usebibmacro{cms-in:}% + \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}% + \newcunit\newblock + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newcunit + \printfield{volumes}% + \newcunit\newblock + \usebibmacro{ser+num}% + \newcunit\newblock + \printfield{note}% + \setunit{\addspace}\newblock% + \printtext[parens]{% + \usebibmacro{org+publ+loc+year}}% + \usebibmacro{fullpostnote}% + \newcunit\newblock + \printfield{addendum}% + \newcunit\newblock + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% + \newcunit\newblock + \usebibmacro{cite+doi+url}% + \newcunit\newblock + \usebibmacro{pageref}% + \usebibmacro{finentry}} + {\ifterm{\iffieldundef{chapter}% New test needed to cope with + {\addspace\bibsentence}% new chapter citing system. + {\setunit{\addspace\bibsentence}}}% See incollection + {\addcomma\addspace}% + \usebibmacro{chapincoll}% + \xrefcite{\thefield{xref}}% + \usebibmacro{xrefpostnote}% + \usebibmacro{finentry}}}% + {\ifterm{\iffieldundef{chapter}% New test needed to cope with + {\addspace\bibsentence}% new chapter citing system. + {\setunit{\addspace\bibsentence}}}% + {\addcomma\addspace}% + \usebibmacro{chapincoll}% + \xrefcite{\thefield{crossref}}% + \usebibmacro{xrefpostnote}% + \usebibmacro{finentry}}} \DeclareBibliographyDriver{cite:inreference}{% \usebibmacro{bibindex}% @@ -978,8 +1137,6 @@ \newcunit \usebibmacro{bybookauthor}% \usebibmacro{cbyeditor+others}% -% \newcunit\newblock -% \printfield{edition}% \newcunit \iffieldundef{maintitle} {\printfield{volume}% @@ -994,8 +1151,6 @@ \newcunit\newblock \usebibmacro{cpubl+loc+year}% \usebibmacro{inreffullpostnote}% -% \newcunit\newblock -% \printlist[][-\value{listtotal}]{lista}% \setunit{\addspace}% \ifnameundef{author}% {}% @@ -1006,11 +1161,11 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{isbn}% - \newcunit\newblock - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1028,65 +1183,69 @@ \newcunit\newblock% \usebibmacro{cpart+editor+translator}% \setunit*{\addcomma\addspace}% -% \usebibmacro{chapincoll}% \iffieldundef{crossref}% {\iffieldundef{xref}% - {\usebibmacro{cms-in:}% - \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}% - \newcunit - \iffieldundef{edition}% - {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% - \newcunit - \usebibmacro{bybookauthor}% -% \printlist{language}% -% \newcunit\newblock - \usebibmacro{cbyeditor+others}% -% \newcunit\newblock -% \printfield{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% - \newcunit\newblock - \usebibmacro{ser+num}% - \newcunit\newblock - \printfield{note}% - \newcunit\newblock - \usebibmacro{cpubletter+loc+year}% - \usebibmacro{fullpostnote}% - \newcunit\newblock - \printfield{addendum}% - \newcunit\newblock - \printfield{isbn}% - \newcunit\newblock - \printfield{doi}% - \newcunit\newblock - \usebibmacro{url+date}% - \newcunit\newblock - \usebibmacro{pageref}% - \usebibmacro{finentry}}% -{\addcomma\addspace% See incollection for info - \xrefcite{\thefield{xref}}% - \usebibmacro{xrefpostnote}% - \usebibmacro{finentry}}}% -{\addcomma\addspace% - \xrefcite{\thefield{crossref}}% - \usebibmacro{xrefpostnote}% - \usebibmacro{finentry}}} + {\usebibmacro{chapincoll}% + \usebibmacro{cms-in:}% + \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}% + \newcunit + \iffieldundef{edition}% + {}% + {\usebibmacro{edition}% + \newcunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}% + \clearfield{volume}% + \clearfield{part}}% + {}% + \newcunit + \printfield{volumes} + \clearfield{volumes}}% + \newcunit + \usebibmacro{bybookauthor}% + \usebibmacro{cbyeditor+others}% + \newcunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newcunit + \printfield{volumes}% + \newcunit\newblock + \usebibmacro{ser+num}% + \newcunit\newblock + \printfield{note}% + \newcunit\newblock + \usebibmacro{cpubletter+loc+year}% + \usebibmacro{fullpostnote}% + \newcunit\newblock + \printfield{addendum}% + \newcunit\newblock + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% + \newcunit\newblock + \usebibmacro{cite+doi+url}% + \newcunit\newblock + \usebibmacro{pageref}% + \usebibmacro{finentry}}% + {\ifterm{\iffieldundef{chapter}% New test needed to cope with + {\addspace\bibsentence}% new chapter citing system. + {\setunit{\addspace\bibsentence}}}% + {\addcomma\addspace}% + \usebibmacro{chapincoll}% + \xrefcite{\thefield{xref}}% + \usebibmacro{xrefpostnote}% + \usebibmacro{finentry}}}% + {\ifterm{\iffieldundef{chapter}% New test needed to cope with + {\addspace\bibsentence}% new chapter citing system. + {\setunit{\addspace\bibsentence}}}% + {\addcomma\addspace}% + \usebibmacro{chapincoll}% + \xrefcite{\thefield{crossref}}% + \usebibmacro{xrefpostnote}% + \usebibmacro{finentry}}} \DeclareBibliographyDriver{cite:manual}{% \usebibmacro{bibindex}% @@ -1099,8 +1258,6 @@ \usebibmacro{edition}% \newcunit \usebibmacro{byauthor}% -% \newcunit\newblock -% \printfield{edition}% \newcunit\newblock \usebibmacro{ser+num}% \newcunit\newblock @@ -1114,11 +1271,11 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{isbn}% - \newcunit\newblock - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1164,9 +1321,101 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{doi}% + \usebibmacro{cite+doi+url}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{pageref}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{cite:music}{% + \usebibmacro{bibindex}% + \usebibmacro{author/editor}% + \setunit{\addspace}% + \printfield{nameaddon}% + \setunit{\addcomma\addspace}\newblock + \usebibmacro{citaltitle+stitle}% + \newcunit + \printeventdate% + \newcunit + \usebibmacro{byauthor}% + \newcunit\newblock + \usebibmacro{cpart+editor+translator}% + \newcunit + \usebibmacro{chapinscore}% + \usebibmacro{btitle+bstitle}% + \newcunit + \iffieldundef{edition}% + {}% + {\usebibmacro{edition}% + \newcunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}% + \clearfield{volume}% + \clearfield{part}}% + {}% + \newcunit + \printfield{volumes} + \clearfield{volumes}}% + \newcunit + \usebibmacro{bybookauthor}% + \usebibmacro{cbyeditor+others}% + \iffieldundef{maintitle} + {} + {\iffieldundef{volume} + {\usebibmacro{cms-in:}% + \printtext[maintitle]{% + \printfield[noformat]{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[noformat]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}} + {\printfield{volume}% + \printfield{part}% + \setunit{\addspace} + \bibstring{ofseries}% + \setunit{\addspace} + \printtext[maintitle]{% + \printfield[noformat]{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[noformat]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}}} + \newcunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newcunit + \printfield{volumes}% + \newcunit\newblock + \printfield{version}% + \newcunit\newblock + \printfield{note}% + \newcunit\newblock + \usebibmacro{music+ser+num}% + \newcunit\newblock + \usebibmacro{music+publisher}% + \setunit*{\addspace}%\newblock + \usebibmacro{date}% + \setunit*{\ifthenelse{\iffieldundef{howpublished}\AND% + \iffieldundef{pubstate}}% + {\addcomma\addspace}{\addspace}}% + \printlist{publisher}% + \newcunit + \usebibmacro{institution+organization}% + \newcunit\newblock + \printlist{location}% + \newcunit\newblock + \printfield{type}% + \usebibmacro{fullpostnote}% + \newcunit\newblock + \printfield{addendum}% + \newcunit\newblock + \iftoggle{cms@isbn}% + {\printfield{iswc}}% + {}% + \newcunit\newblock + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1189,7 +1438,9 @@ \setunit{\addcomma\addspace} \usebibmacro{date}% \setunit{\addcomma\addspace}% - \printfield{doi}% + \iftoggle{cms@doi}% + {\printfield{doi}}% + {}% \setunit{\addcomma\addspace}% \usebibmacro{url+date}% \usebibmacro{fullpostnote}% @@ -1221,7 +1472,6 @@ \newcunit\newblock \printfield{version}% \newcunit -% \setunit{\addcomma\addspace \bibstring{patentfiled}\addspace}% \iffieldundef{origyear}% {\iffieldundef{year}% {}% @@ -1236,9 +1486,7 @@ \printfield{addendum}}% \usebibmacro{fullpostnote}% \newcunit\newblock - \printfield{doi}% - \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1263,11 +1511,11 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{issn}% - \newcunit\newblock - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{issn}}% + {}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}}% @@ -1291,11 +1539,11 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{issn}% - \newcunit\newblock - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{issn}}% + {}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}}} @@ -1327,11 +1575,11 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{isbn}% - \newcunit\newblock - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1375,8 +1623,6 @@ \newcunit \usebibmacro{bybookauthor}% \usebibmacro{cbyeditor+others}% -% \newcunit\newblock -% \printfield{edition}% \newcunit \iffieldundef{maintitle} {\printfield{volume}% @@ -1394,11 +1640,11 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{isbn}% - \newcunit\newblock - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1425,11 +1671,11 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{isrn}% - \newcunit\newblock - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isrn}}% + {}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1442,13 +1688,11 @@ \setunit{\addspace}% \printfield{nameaddon}% \newcunit\newblock -% \usebibmacro{mag+news+title}% Changed to enable \MakeCapital \printfield{title}% \setunit{\addcolon\addspace}% \printfield[noformat]{subtitle}% \newcunit\newblock \printfield{titleaddon}% -% \newcunit\newblock \setunit{\addspace}% \usebibmacro{language+transtitle}% \setunit{\addcomma\addspace}%\newblock% @@ -1465,11 +1709,11 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{issn}% - \newcunit\newblock - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{issn}}% + {}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1517,8 +1761,6 @@ \clearfield{volumes}}% \newcunit \usebibmacro{cbyeditor}% -% \newcunit\newblock -% \printfield{edition}% \newcunit \iffieldundef{maintitle} {\printfield{volume}% @@ -1536,11 +1778,11 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{isbn}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \newcunit\newblock - \printfield{doi}% - \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1569,9 +1811,7 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{doi}% - \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1600,7 +1840,91 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \usebibmacro{url+date}% + \iftoggle{cms@url}% + {\usebibmacro{url+date}}% + {}% + \newcunit\newblock + \usebibmacro{pageref}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{cite:video}{% + \usebibmacro{bibindex}% + \usebibmacro{author/editor}% + \setunit{\addspace}% + \printfield{nameaddon}% + \newcunit\newblock + \usebibmacro{ctitle+stitle}% + \setunit{\addspace}\newblock% + \usebibmacro{language+transtitle}% + \newcunit + \usebibmacro{byauthor}% + \newcunit + \usebibmacro{cpart+editor+translator}% + \newcunit + \usebibmacro{chapinscore}% + \usebibmacro{btitle+bstitle}% + \newcunit + \iffieldundef{edition}% + {}% + {\usebibmacro{edition}% + \newcunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}% + \clearfield{volume}% + \clearfield{part}}% + {}% + \newcunit + \printfield{volumes} + \clearfield{volumes}}% + \newcunit + \printfield{type}% + \newcunit + \usebibmacro{bybookauthor}% + \usebibmacro{cbyeditor+others}% + \iffieldundef{maintitle} + {} + {\iffieldundef{volume} + {\usebibmacro{cms-in:}% + \printtext[maintitle]{% + \printfield[noformat]{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[noformat]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}} + {\printfield{volume}% + \printfield{part}% + \setunit{\addspace} + \bibstring{ofseries}% + \setunit{\addspace} + \printtext[maintitle]{% + \printfield[noformat]{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[noformat]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}}} + \newcunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newcunit + \printfield{volumes}% + \newcunit\newblock + \usebibmacro{ser+num}% + \newcunit\newblock + \printfield{note}% + \newcunit\newblock + \usebibmacro{cpubl+loc+year}% + \usebibmacro{fullpostnote}% + \newcunit\newblock + \printfield{addendum}% + \newcunit\newblock + \iftoggle{cms@isbn}% + {\printfield{isan}}% + {}% + \newcunit\newblock + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1715,12 +2039,6 @@ \DeclareFieldFormat[letter]{lostitle}{#1\isdot} -\DeclareFieldAlias[customa]{title}[letter]{title} - -\DeclareFieldAlias[customa]{citetitle}[letter]{citetitle} - -\DeclareFieldAlias[customa]{lostitle}[letter]{lostitle} - \DeclareFieldAlias[inproceedings]{title}[article]{title} \DeclareFieldAlias[inproceedings]{citetitle}[article]{citetitle} @@ -1785,11 +2103,19 @@ \addspace% \mkbibemph{#1}\isdot} -\DeclareFieldAlias[customc]{title}[suppbook]{title} - -\DeclareFieldAlias[customc]{citetitle}[suppbook]{citetitle} +\DeclareFieldFormat[customc]{title}{% + \iffieldundef{nameaddon}% + {\mkbibemph{\bibstring{see}}% + \addspace% + #1}% + {#1}} -\DeclareFieldAlias[customc]{lostitle}[suppbook]{lostitle} +\DeclareFieldFormat[customc]{citetitle}{% + \iffieldundef{nameaddon}% + {\mkbibemph{\bibstring{see}}% + \addspace% + #1}% + {\printfield{nameaddon}\addspace #1}} \DeclareFieldAlias[suppcollection]{title}[suppbook]{title} @@ -1851,6 +2177,33 @@ \DeclareFieldAlias[online]{lostitle}[article]{lostitle} +\DeclareFieldFormat[video]{title}{% + \iffieldundef{booktitle}% + {\mkbibemph{#1}\isdot}% + {\mkbibquote{#1\isdot}}} + +\DeclareFieldFormat[video]{citetitle}{% + \iffieldundef{booktitle}% + {\mkbibemph{#1}\isdot}% + {\mkbibquote{#1\isdot}}} + +\DeclareFieldFormat[video]{lostitle}{% + \iffieldundef{booktitle}% + {\mkbibemph{#1}\isdot}% + {\mkbibquote{#1\isdot}}} + +\DeclareFieldAlias[music]{title}[video]{title} + +\DeclareFieldAlias[music]{citetitle}[video]{citetitle} + +\DeclareFieldAlias[music]{lostitle}[video]{lostitle} + +\DeclareFieldAlias[audio]{title}[video]{title} + +\DeclareFieldAlias[audio]{citetitle}[video]{citetitle} + +\DeclareFieldAlias[audio]{lostitle}[video]{lostitle} + %%%% Other Field Formats %%%% \DeclareNumChars*{:}% For proper ibidem with multi-volume works. @@ -1864,8 +2217,8 @@ \ifbibstring{#1}% {\bibstring{#1}}% {\ifcapital% - {\MakeCapital{#1}}% - {#1}}} + {\MakeCapital{#1\isdot}}% + {#1\isdot}}} \DeclareFieldFormat[artwork]{type}{% \ifcapital% @@ -1874,10 +2227,14 @@ \DeclareFieldAlias[image]{type}[artwork]{type} -\DeclareFieldAlias[customc]{type}[suppbook]{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}{% @@ -1888,6 +2245,11 @@ \DeclareFieldFormat{nameaddon}{\mkbibbrackets{#1\bibsentence}}% ?! +\DeclareFieldFormat[customc]{nameaddon}{% For cross-refs + \ifbibstring{#1}% + {\mkbibemph{\bibstring{#1}}}% + {#1}} + \DeclareFieldFormat{edition}{% New in 0.8 \ifinteger{#1} {\mkbibordinal{#1}~\bibstring{edition}}% @@ -1945,6 +2307,8 @@ {\addnbspace #1}% {\addcomma\addspace #1}} +\DeclareFieldFormat{series}{#1\isdot} + \DeclareFieldFormat{addendum}{% \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}} @@ -1996,7 +2360,6 @@ \newcommand{\classicpunct}{% \ifthenelse{\iffieldequalstr{entrysubtype}{classical}\OR% - \iffieldequalstr{entrytype}{customa}\OR% \iffieldequalstr{entrytype}{letter}}% {\setunit*{\addspace}}% {\setunit*{\addcomma\addspace}}} @@ -2189,7 +2552,9 @@ \ifthenelse{\(\iffieldundef{booktitle}\AND\iffieldundef{maintitle}\)% \OR\iffieldsequal{booktitle}{title}% Changed these for crossrefed \OR\iffieldsequal{maintitle}{title}}% entries. Create problems? - {\newunit\newblock}% + {\iffieldequalstr{entrytype}{video}% Change for Video type? Appears + {\newcunit\newblock}% to treat italicized title as booktitle in + {\newunit\newblock}}% available examples. {\newcunit\newblock}} \newbibmacro*{edition}{% @@ -2235,7 +2600,7 @@ \newcunit \printlist{institution}% \setunit*{\addcomma\space}% - \printfield{year}} + \usebibmacro{cmsyear}} \newbibmacro*{institution+organization}{% \iflistundef{organization}% @@ -2482,13 +2847,37 @@ \newbibmacro*{chapincoll}{% \iffieldundef{chapter}% {} - {\printfield{chapter}\addspace}} + {\printfield{chapter}\addspace% + \clearfield{chapter}}} + +\newbibmacro*{chapinscore}{% + \iffieldundef{chapter}% + {} + {\printfield{chapter}% + \addspace\bibstring{of}\setunit{\addspace}% + \clearfield{chapter}}} \newbibmacro*{ser+num}{% \printfield{series}% \printfield[sernum]{number}% \newunit} +\newbibmacro*{music+ser+num}{% + \iffieldundef{series}% + {\iffieldundef{number}% + {}% + {\printfield{number}}} + {\printfield{series}% + \setunit{\addspace}% + \printfield{number}}}% + +\newbibmacro*{music+publisher}{% + \iffieldundef{howpublished}% + {\iffieldundef{pubstate}% + {}% + {\printfield{pubstate}}}% + {\printfield{howpublished}}}% + \newbibmacro*{ctitle+stitle}{% \printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work) \printfield[noformat]{title}% @@ -2580,7 +2969,11 @@ \printfield{booktitleaddon}}} \newbibmacro*{publ+loc+year}{% Revised for reprint - \iftoggle{cms@reprint}% + \ifboolexpr{ + togl{cms@reprint} + and + not test {\iffieldequalstr{entrytype}{video}} + }% {\bibstring{reprint}% \newcunit}% {}% @@ -2625,9 +3018,9 @@ \newbibmacro*{cpubl+loc+year}{% Revised for reprint \ifboolexpr{ - test {\iffieldundef{location}} + test {\iflistundef{location}} and - test {\iffieldundef{publisher}} + test {\iflistundef{publisher}} and test {\iffieldundef{year}} and @@ -2638,7 +3031,11 @@ \printtext[parens]{% \usebibmacro{cmsorigdate}%\printfield{origyear}% \setunit*{\addsemicolon\addspace}% - \iftoggle{cms@reprint}% + \ifboolexpr{ + togl {cms@reprint} + and + not test{\iffieldequalstr{entrytype}{video}} + }% {\bibsstring{reprint}% \newcunit}% {}% @@ -2713,20 +3110,20 @@ \setunit{\addspace}% \printtext[parens]{% parens is the default here \iffieldundef{issue} - {\usebibmacro{date}}% + {\usebibmacro{number+or+month}}% {\printfield{issue}% \setunit{\addspace}% - \printfield{year}}}} + \usebibmacro{cmsyear}}}} \newbibmacro*{cperiodical+issue+year+pages}{% For periodicals, \usebibmacro{cperiodical+ser+vol+num}% subtype article \setunit{\addspace}% \printtext[parens]{% parens is the default here \iffieldundef{issue} - {\usebibmacro{date}}% + {\usebibmacro{number+or+month}}% {\printfield{issue}% \setunit{\addspace}% - \printfield{year}}}} + \usebibmacro{cmsyear}}}} \newbibmacro*{letter+date}{% New for 0.9 \iftoggle{cms@switchdates}% @@ -2756,6 +3153,18 @@ {\printdate}% {\printorigdate}} +\newbibmacro*{cmsyear}{% + \iftoggle{cms@switchdates}% + {\printfield{origyear}}% + {\printfield{year}}} + +\newbibmacro*{number+or+month}{% + \iffieldundef{number}% + {\usebibmacro{date}}% + {\iftoggle{cms@numbermonth}% + {\usebibmacro{date}}% + {\usebibmacro{cmsyear}}}} + \newcommand*{\cms@datelong}{% Modified for 0.9 \iffieldundef{origmonth}% {\printfield{origyear}}% @@ -2832,6 +3241,15 @@ \setunit{\addcolon\addspace}% \printfield[noformat]{journalsubtitle}}}} +\newbibmacro*{cite+doi+url}{% + \iftoggle{cms@doi}% + {\printfield{doi}}% + {}% + \newcunit\newblock + \iftoggle{cms@url}% + {\usebibmacro{url+date}}% + {}} + \newbibmacro*{url+date}{% Changed for 0.9 \printfield{url}% \iffieldundef{urlyear} @@ -2853,12 +3271,14 @@ \iffieldundef{issue} {\iffieldundef{number}% {\usebibmacro{date}}% - {\usebibmacro{date}% + {\iftoggle{cms@numbermonth}% For exclusion of month + {\usebibmacro{date}}% + {\usebibmacro{cmsyear}}% \setunit{\addcomma\addspace}% \printfield[journum]{number}}}% {\printfield{issue}% \setunit{\addspace}% - \printfield{year}}} + \usebibmacro{cmsyear}}} \newbibmacro*{mag+date+issue}{% \usebibmacro{journal+sub}% @@ -2968,9 +3388,7 @@ {\global\togglefalse{cms@printshhand}% \global\togglefalse{cms@shortnote}% \global\togglefalse{cms@fullnote}} - {\addperiod\space% - \bibstring{citedas}\space% - \printfield{shorthand}% + {\usebibmacro{cms:shorthandintro}% \global\togglefalse{cms@printshhand}% \global\togglefalse{cms@shortnote}% \global\togglefalse{cms@fullnote}}} @@ -2982,9 +3400,7 @@ \global\togglefalse{cms@fullnote}} {\postnotedelim% \printfield{postnote}% - \addperiod\space% - \bibstring{citedas}\space% - \printfield{shorthand}% + \usebibmacro{cms:shorthandintro}% \global\togglefalse{cms@printshhand}% \global\togglefalse{cms@shortnote}% \global\togglefalse{cms@fullnote}}}} @@ -3012,7 +3428,7 @@ \iffieldundef{postnote}% {\iffieldundef{chapter}% {\iffieldundef{pages}% - {\addcomma\addspace% + {\newcunit%\addcomma\addspace% Change to axe spurious comma \printlist[][-\value{listtotal}]{lista}}% {\postnotedelim% \printfield{pages}}}% |