diff options
author | Karl Berry <karl@freefriends.org> | 2012-07-11 23:30:43 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-07-11 23:30:43 +0000 |
commit | 562ae685591240b0ea768aa3de044339bcaee64e (patch) | |
tree | fe67bf362ccf70a9434b3a4ed2760af84eaa42ab /Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx | |
parent | 6d1e02f252c44d2e43c13d9d0608e628812a8a90 (diff) |
biblatex-chicago 16th (6jul12)
git-svn-id: svn://tug.org/texlive/trunk@27002 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx | 343 |
1 files changed, 201 insertions, 142 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 6a670e81a24..e5093e0efc2 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx @@ -1,11 +1,10 @@ -% $Id: chicago-notes15.bbx,v 0.9.7.10 2011/10/12 13:23:00 dfussner Exp $ +% $Id: chicago-notes.bbx,v 0.9.7.20 2012/07/05 10:50:42 dfussner Exp $ % This is a biblatex style file, adapted mainly from Lehman's standard.bbx % It provides the bibliography formatting for the Chicago notes + -% bibliography style, _15th_ edition. +% bibliography style. -\ProvidesFile{chicago-notes.bbx} -[2011/10/12 v 1.6 biblatex bibliography style] +\ProvidesFile{chicago-notes.bbx}[2012/07/05 v 1.7 biblatex bibliography style] %%%% Initialize and format bibliography and los %%%% @@ -36,6 +35,34 @@ {\endlist} {\item} +\defbibenvironment{losnotes} + {\list + {\printfield[shorthandwidth]{shorthand}}% + {\footnotesize% + \setlength{\labelwidth}{\shorthandwidth}% + \setlength{\leftmargin}{\labelwidth}% + \setlength{\labelsep}{.3\biblabelsep}% + \addtolength{\leftmargin}{\labelsep}% + \setlength{\itemsep}{\lositemsep}% + \setlength{\parsep}{\bibparsep}% + \renewcommand*{\makelabel}[1]{##1\hss}}} + {\endlist} + {\item} + +\defbibenvironment{losendnotes} + {\list + {\printfield[shorthandwidth]{shorthand}}% + {\enotesize% + \setlength{\labelwidth}{\shorthandwidth}% + \setlength{\leftmargin}{\labelwidth}% + \setlength{\labelsep}{.3\biblabelsep}% + \addtolength{\leftmargin}{\labelsep}% + \setlength{\itemsep}{\lositemsep}% + \setlength{\parsep}{\bibparsep}% + \renewcommand*{\makelabel}[1]{##1\hss}}} + {\endlist\nopunct\vspace{-\baselineskip}}% Kludges for endnotes + {\item} + \AtBeginBibliography{% \togglefalse{cms@headlessnote}% \togglefalse{cms@shortnote}% @@ -54,16 +81,32 @@ or not test {\iffieldint{year}} or - not test {\iffieldint{origyear}} + togl {cms@switchdates} + }% + {}% + {\iffieldundef{endyear}% + {\ifthenelse{\thefield{origyear}>\thefield{year}}% + {\toggletrue{cms@switchdates}}% + {}}% + {\ifthenelse{\thefield{origyear}>\thefield{endyear}}% + {\toggletrue{cms@switchdates}}% + {}}}}% + +\AtEveryLositem{% + \iffieldequalstr{pubstate}{reprint}% + {\toggletrue{cms@reprint}}% + {\togglefalse{cms@reprint}}% + \ifboolexpr{% + test {\iffieldundef{origyear}} + or + test {\iffieldundef{year}} + or + not test {\iffieldint{year}} or togl {cms@switchdates} }% {}% - {\ifboolexpr{% - test {\iffieldundef{endyear}}% - or - not test {\iffieldnum{endyear}} - }% + {\iffieldundef{endyear}% {\ifthenelse{\thefield{origyear}>\thefield{year}}% {\toggletrue{cms@switchdates}}% {}}% @@ -238,12 +281,12 @@ {\usebibmacro{parteditor}}} \newbibmacro*{moreeditor}{% - \ifnameundef{editor} + \ifthenelse{\ifnameundef{editor}\OR\NOT\ifuseeditor}% {\usebibmacro{picktranslator}} {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT \iffirstonpage} - {\bibnamedash\editordelim}%\addcomma\addspace - {\printnames{editor}\editordelim%\addcomma\space + {\bibnamedash\editordelim}% + {\printnames{editor}\editordelim% \savefield{fullhash}{\bbx@lasthash}}% \usebibmacro{editstrg}}} @@ -252,8 +295,8 @@ {\let\bbx@lasthash\undefined} {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT \iffirstonpage} - {\bibnamedash\editordelim}%\addcomma\addspace - {\printnames{editor}\editordelim%\addcomma\space + {\bibnamedash\editordelim}% + {\printnames{editor}\editordelim% \savefield{fullhash}{\bbx@lasthash}}% \usebibmacro{editstrg}}} @@ -273,7 +316,7 @@ {\usebibmacro{parttranslator}}} \newbibmacro*{moretranslator}{% - \ifnameundef{translator} + \ifthenelse{\ifnameundef{translator}\OR\NOT\ifusetranslator}% {\usebibmacro{compiler}} {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT \iffirstonpage} @@ -293,14 +336,18 @@ \usebibmacro{parttransstrg}}} \newbibmacro*{compiler}{% - \ifnameundef{namec} - {\let\bbx@lasthash\undefined} - {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT - \iffirstonpage} - {\bibnamedash\addcomma\addspace} - {\printnames[sortname]{namec}\addcomma\space - \savefield{fullhash}{\bbx@lasthash}}% - \usebibmacro{compilestrg}}} + \ifboolexpr{ + test {\ifnameundef{namec}} + or + not togl {cms@usecompiler} + }% + {\let\bbx@lasthash\undefined} + {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT + \iffirstonpage} + {\bibnamedash\addcomma\addspace} + {\printnames[sortname]{namec}\addcomma\space + \savefield{fullhash}{\bbx@lasthash}}% + \usebibmacro{compilestrg}}} \renewcommand*{\revsdnamedelim}{\addcomma} @@ -311,17 +358,22 @@ %%%% Drivers for Bibliography entries and Shorthands %%%% \DeclareBibliographyDriver{shorthands}{% - \ifnameundef{labelname} - {\iffieldequalstr{entrysubtype}{magazine}% - {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}% - \newcunit}}% - {\iffieldequalstr{entrytype}{manual}% - {\printtext[bibhyperref]{\printlist{organization}\newcunit}}% - {}}}% - {\usebibmacro{author/editor}% - \setunit{\addcomma\space}}% - \printfield[lostitle]{title}% - \finentry} + \iftoggle{cms@fullshhand}% + {\usedriver{\frenchspacing}% + {\thefield{entrytype}}% + \finentry}% + {\ifnameundef{labelname}% + {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT% + \iffieldequalstr{entrytype}{periodical}}% + {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}% + \newcunit}}% + {\iffieldequalstr{entrytype}{manual}% + {\printtext[bibhyperref]{\printlist{organization}\newcunit}}% + {}}}% + {\usebibmacro{author/editor}% + \setunit{\addcomma\space}}% + \printfield[lostitle]{title}% + \finentry}} \DeclareBibliographyDriver{article}{% \iffieldequalstr{entrysubtype}{magazine}% @@ -364,7 +416,7 @@ \usebibmacro{mag+news+title}% \setunit{\addspace}% \usebibmacro{language+transtitle}% - \setunit*{\addcomma\addspace}\newblock% + \setunit*{\addperiod\addspace}\newblock% 16th ed. \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{issuetitle}% @@ -397,7 +449,7 @@ \usebibmacro{italtitle+stitle}% \newcunit\newblock \usebibmacro{date}% - \newcunit + \newunit% 16th ed. \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{byeditor+others}% @@ -430,7 +482,7 @@ \printfield{nameaddon}% \newunit\newblock \usebibmacro{italtitle+stitle}% - \newcunit\newblock + \newunit\newblock% 16th ed. \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{part+editor+translator}% @@ -490,7 +542,7 @@ \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock - \usebibmacro{cmsorigdate}%\printorigdate% + \usebibmacro{origpubl+loc+year}%{cmsorigdate}%\printorigdate% \newunit\newblock \printfield{note}% \newunit\newblock @@ -534,7 +586,7 @@ \printfield{volumes}% \clearfield{volumes}}}% {}% - \newcunit\newblock + \newunit\newblock% 16th ed. \usebibmacro{byauthor} \newunit\newblock \usebibmacro{part+editor+translator}% @@ -571,7 +623,7 @@ \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock - \usebibmacro{cmsorigdate}%\printorigdate% + \usebibmacro{origpubl+loc+year}%cmsorigdate%\printorigdate \newunit\newblock \printfield{note}% \newunit\newblock @@ -613,8 +665,7 @@ \printfield{volumes}% \clearfield{volumes}}}% {}% - \newcunit\newblock - \newcunit\newblock + \newunit\newblock% 16th ed. \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{part+editor+translator}% @@ -653,7 +704,7 @@ \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock - \usebibmacro{cmsorigdate}%\printorigdate% + \usebibmacro{origpubl+loc+year}%{cmsorigdate}%\printorigdate% \newunit\newblock \printfield{note}% \newunit\newblock @@ -679,7 +730,7 @@ \printfield{nameaddon}% \newunit\newblock \usebibmacro{italtitle+stitle}% - \newcunit\newblock + \newunit\newblock% 16th ed. \usebibmacro{byauthor}% \newunit\newblock \printfield{note}% @@ -732,7 +783,7 @@ \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock - \usebibmacro{cmsorigdate}%\printorigdate% + \usebibmacro{origpubl+loc+year}%{cmsorigdate}%\printorigdate% \newunit\newblock \printfield{note}% \newunit\newblock @@ -766,12 +817,10 @@ \setunit{\addspace}% \printfield{nameaddon}% \newunit\newblock - \usebibmacro{title+stitle}% - \setunit{\addspace}\newblock% - \usebibmacro{language+transtitle}% - \setunit{\addcomma\addspace}% + \usebibmacro{italtitle+stitle}% + \newcunit%\setunit{\addcomma\addspace}% \usebibmacro{date}% - \newcunit + \newunit% 16th ed. \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{byeditor+others}% @@ -806,7 +855,7 @@ \usebibmacro{title+stitle}% \setunit{\addspace}\newblock%\bibsentence \usebibmacro{language+transtitle}% - \setunit{\addcomma\addspace}% + \setunit{\addperiod\addspace}% 16th ed. \usebibmacro{byauthor}% \setunit{\addperiod\addspace}% \usebibmacro{part+editor+translator}% @@ -843,7 +892,7 @@ \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock - \usebibmacro{cmsorigdate}%\printorigdate% + \usebibmacro{origpubl+loc+year}%{cmsorigdate}%\printorigdate% \newunit\newblock \printfield{note}% \newunit\newblock @@ -871,7 +920,7 @@ \usebibmacro{title+stitle}% \setunit{\addspace}\newblock%\bibsentence \usebibmacro{language+transtitle}% - \newcunit\newblock + \newunit\newblock% 16th ed. \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{part+editor+translator}% @@ -910,7 +959,7 @@ \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock - \usebibmacro{cmsorigdate}%\printorigdate% + \usebibmacro{origpubl+loc+year}%{cmsorigdate}%\printorigdate% \newunit\newblock \printfield{note}% \newunit\newblock @@ -948,7 +997,7 @@ \usebibmacro{title+stitle}% \setunit{\addspace}\newblock% \usebibmacro{language+transtitle}% - \setunit{\addcomma\addspace}% + \setunit{\addperiod\addspace}% 16th ed. \usebibmacro{byauthor}% \setunit{\addperiod\addspace}% \usebibmacro{part+editor+translator}% @@ -959,8 +1008,6 @@ \usebibmacro{cms-in:}% \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}% \newcunit\newblock - \usebibmacro{byeditor+others}% - \newcunit\newblock \printfield{pages}% \newunit\newblock \iffieldundef{maintitle} @@ -1051,17 +1098,17 @@ \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock - \usebibmacro{cmsorigdate}%\printorigdate% + \usebibmacro{origpubl+loc+year}%{cmsorigdate}%\printorigdate% \newunit\newblock \printfield{note}% \newunit\newblock \usebibmacro{publ+loc+year}% \newcunit\newblock \printlist[][-\value{listtotal}]{lista}% - \setunit{\addspace}% + \newcunit\newblock%setunit{\addspace}% 16th ed \ifnameundef{author}% {}% - {\printtext[parens]{% + {\printtext{% 16th ed \bibstring{by}% \addspace% \printnames[byauthor]{author}}}% @@ -1120,8 +1167,6 @@ \usebibmacro{byeditor+others}% \newcunit\newblock \printfield{pages}% -% \newunit\newblock -% \printfield{edition}% \newunit \iffieldundef{maintitle} {\printfield{volume}% @@ -1172,7 +1217,7 @@ \usebibmacro{italtitle+stitle}% \newunit\newblock \usebibmacro{edition}% - \newcunit + \newunit% 16th ed. \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{ser+num}% @@ -1213,7 +1258,7 @@ \usebibmacro{language+transtitle}% \newcunit\newblock% \usebibmacro{unpubl+letter+date}}% - \newcunit% + \newunit% 16th ed. \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{byeditor+others}% @@ -1250,13 +1295,13 @@ \printfield{nameaddon}% \newunit\newblock \usebibmacro{italtitle+stitle}% - \newcunit% + \newunit% 16th ed. \usebibmacro{byauthor}% - \setunit*{\addperiod\addspace} - \printeventdate% \newunit\newblock \usebibmacro{part+editor+translator}% \newunit\newblock + \usebibmacro{music+eventdate}% + \newunit\newblock \usebibmacro{chapinscore}% \usebibmacro{btitle+bstitle}% \iffieldundef{booktitle} @@ -1313,23 +1358,25 @@ \printfield{version}% \newunit\newblock \printfield{note}% + \newunit\newblock% + \usebibmacro{music+origdate}%\printtext[eventdate]{\printeventdate}% \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}% + \setunit*{\addcomma\addspace}\newblock + \printfield{series}% + \setunit{\addspace}% + \printfield{number}% + \newcunit\newblock + \usebibmacro{date}% \newunit \usebibmacro{institution+organization}% \setunit*{\addcomma\addspace}\newblock \printlist{location}% - \newunit\newblock + \newcunit\newblock \printfield{type}% \newunit\newblock + \usebibmacro{pubstate}% 16th ed. + \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% \iftoggle{cms@isbn}% @@ -1352,20 +1399,24 @@ \usebibmacro{title+stitle}% \setunit{\addspace}% \usebibmacro{language+transtitle}% - \newcunit% + \newunit% 16th ed. \usebibmacro{byauthor}% \newunit\newblock - \printfield{note}% + \printlist{organization}% Rearranged for 16th ed. \newunit\newblock - \printlist{organization}% + \printfield{note}% \newunit\newblock \usebibmacro{date}% \newunit\newblock - \iftoggle{cms@doi}% - {\printfield{doi}}% - {}% - \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \iffieldundef{urlyear} + {} + {\printtext[urldate]{\printurldate}}% + \newunit\newblock + \printfield{doi}% + \newunit\newblock + \usebibmacro{eprint}% + \newunit\newblock + \printfield{url}% \newunit\newblock \printfield{addendum}% \newunit\newblock @@ -1451,7 +1502,7 @@ \usebibmacro{issuetitle}% \setunit{\addspace}% \usebibmacro{language+transtitle}% - \setunit*{\addcomma\addspace}\newblock% + \setunit*{\addperiod\addspace}\newblock% 16th ed. \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{byeditor+others}% @@ -1482,8 +1533,6 @@ \usebibmacro{italtitle+stitle}% \newunit\newblock \usebibmacro{mtitle+mstitle+vol+part+title+stitle}% - \usebibmacro{editorpunct}% - \usebibmacro{bytranslator+others}% \newunit\newblock \iffieldundef{maintitle} {\printfield{volume}% @@ -1563,7 +1612,7 @@ \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock - \usebibmacro{cmsorigdate}%\printorigdate% + \usebibmacro{origpubl+loc+year}%{cmsorigdate}%\printorigdate% \newunit\newblock \printfield{note}% \newunit\newblock @@ -1589,7 +1638,7 @@ \printfield{nameaddon}% \newunit\newblock \usebibmacro{italtitle+stitle}% - \newcunit + \newunit% 16th ed. \usebibmacro{byauthor}% \newunit\newblock \usebibmacro{ser+num}% @@ -1618,8 +1667,10 @@ \iffieldequalstr{entrysubtype}{magazine}% {\usebibmacro{mag+news+author}}% {\usebibmacro{author/editor}}% + \newunit\newblock + \printeventdate% 16th ed. \setunit{\addspace}% - \printfield{nameaddon}% + \printfield{nameaddon}% 16th ed. \newunit\newblock \printfield{title}% \setunit{\addcolon\addspace}% @@ -1679,6 +1730,8 @@ {}% \newcunit \usebibmacro{bybookauthor}% + \newcunit\newblock + \usebibmacro{chap+pag}% \newunit\newblock \usebibmacro{mtitle+mstitle+vol+part+title+stitle}% \newcunit% @@ -1696,9 +1749,7 @@ \printfield{volumes} \clearfield{volumes}}% \usebibmacro{editorpunct}% - \usebibmacro{byeditor}% - \usebibmacro{editorpunct}%\newcunit\newblock - \usebibmacro{chap+pag}% + \usebibmacro{byeditor+others}% \newunit \iffieldundef{maintitle} {\printfield{volume}% @@ -1709,7 +1760,7 @@ \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock - \usebibmacro{cmsorigdate}%\printorigdate% + \usebibmacro{origpubl+loc+year}%{cmsorigdate}%\printorigdate% \newunit\newblock \printfield{note}% \newunit\newblock @@ -1741,7 +1792,7 @@ \usebibmacro{title+stitle}% \setunit{\addspace}%\newblock% \usebibmacro{language+transtitle}% - \newcunit% + \newunit% 16th ed. \usebibmacro{byauthor}% \setunit{\addperiod\addspace}% \printfield{note}% @@ -1766,8 +1817,8 @@ \usebibmacro{title+stitle}% \setunit{\addspace}\newblock% \usebibmacro{language+transtitle}% - \newcunit%usebibmacro{byauthorpunct}% Why does this work? No idea. - \usebibmacro{byauthor}% Same in thesis type, as well. + \newunit%usebibmacro{byauthorpunct}% Why does this work? No idea. + \usebibmacro{byauthor}% Same in thesis type, as well. 16th ed. \setunit{\addperiod\addspace}% \printfield{howpublished}% \setunit*{\addcomma\addspace}\newblock% @@ -1779,9 +1830,7 @@ \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \iftoggle{cms@url} - {\usebibmacro{url+date}}% - {}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1804,7 +1853,7 @@ \printfield{titleaddon}%\usebibmacro{title+stitle}% \setunit{\addspace}\newblock%\bibsentence \usebibmacro{language+transtitle}% - \setunit{\addcomma\addspace}% + \setunit{\addperiod\addspace}% 16th ed. \usebibmacro{byauthor}% \setunit{\addperiod\addspace}% \usebibmacro{part+editor+translator}% @@ -1827,8 +1876,6 @@ \newcunit \printfield{volumes} \clearfield{volumes}}% - \newunit - \printfield{type}% \newunit% unit, not cunit? \usebibmacro{bybookauthor}% \usebibmacro{byeditor+others}% @@ -1866,12 +1913,16 @@ \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock - \usebibmacro{cmsorigdate}%\printorigdate% + \usebibmacro{music+eventdate}% + \newunit\newblock + \usebibmacro{origpubl+loc+year}%{cmsorigdate}%\printorigdate% \newunit\newblock \printfield{note}% \newunit\newblock \usebibmacro{publ+loc+year}% \newunit\newblock + \printfield{type}% 16th ed. + \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% \iftoggle{cms@isbn}% @@ -1887,14 +1938,22 @@ %%%% Other Formatting Macros %%%% -\newbibmacro*{bib+doi+url}{% For biblatex field exclusion +\newbibmacro*{bib+doi+url}{% 16th ed. + \iffieldundef{urlyear} + {} + {\printtext[urldate]{\printurldate}}% + \newunit\newblock \iftoggle{cms@doi}% {\printfield{doi}}% {}% - \setunit*{\addcomma\addspace}\newblock% + \newunit\newblock + \iftoggle{cms@eprint}% + {\usebibmacro{eprint}}% + {}% + \newunit\newblock \iftoggle{cms@url}% - {\usebibmacro{url+date}}% - {}} + {\printfield{url}}% + {}}% \newbibmacro*{bibpostxref}{% \iffieldundef{postnote}% @@ -1912,24 +1971,24 @@ \iffieldundef{maintitle} {} {\iffieldundef{volume} - {\usebibmacro{cms-in:}% + {\usebibmacro{cms-in:}% 16th ed (Also 15th?) \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}}}} + \setunit{\addcolon\addspace}% + \printfield[noformat]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}} + {\printfield{volume}% + \printfield{part}% + \setunit{\addspace} + \bibstring{ofseries}% + \setunit{\addspace} + \printtext[maintitle]{% + \printfield[noformat]{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[noformat]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}}}} \newbibmacro*{mtitle+mstitle+vol+part+btitle+bstitle}{% \usebibmacro{btitle+bstitle}% @@ -1937,26 +1996,26 @@ {\setunit{\addperiod\addspace}}% Fix customc? {\setunit{\addcomma\addspace}}% \iffieldundef{maintitle} - {} + {}% {\iffieldundef{volume} - {\usebibmacro{cms-in:}% + {\usebibmacro{cms-in:}% 16th ed (also 15th?) \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}}}} + \setunit{\addcolon\addspace}% + \printfield[noformat]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}} + {\printfield{volume}% + \printfield{part}% + \setunit{\addspace} + \bibstring{ofseries}% + \setunit{\addspace} + \printtext[maintitle]{% + \printfield[noformat]{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[noformat]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}}}} \newbibmacro*{journal+issue+year+pages}{% \usebibmacro{cjournal+ser+vol+num}% |