summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
diff options
context:
space:
mode:
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.cbx755
1 files changed, 524 insertions, 231 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 86ee1ef255c..eb980243c43 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
@@ -1,17 +1,16 @@
-% $Id: chicago-notes15.cbx,v 0.9.7.15 2011/11/15 16:13:16 dfussner Exp $
+% $Id: chicago-notes.cbx,v 0.9.7.34 2012/07/05 10:50:34 dfussner Exp $
% This is a biblatex citation style file, adapted from Lehman's
% authortitle-cverb.cbx. It is heavily modified, with the intention
% of providing footnote citations and a bibliography formatted
-% according to the specifications of the Chicago Manual of Style,
-% _15th_ edition.
+% according to the specifications of the Chicago Manual of Style.
-\ProvidesFile{chicago-notes.cbx}[2011/11/15 v 1.7 biblatex citation style]
+\ProvidesFile{chicago-notes.cbx}[2012/07/05 v 1.7 biblatex citation style]
%%%% Biblatex initialization + Chicago options + Toggles %%%%
\providecommand*{\mkibid}[1]{#1}
-%\providetoggle{cms@oneyear}% Needed for author-date
+\providetoggle{cms@oneyear}% Needed for author-date
\providetoggle{cms@reprint}% ditto
\providetoggle{cms@switchdates}% ditto
@@ -19,9 +18,13 @@
\providetoggle{cms@url}% These are for the field-exclusion options
\providetoggle{cms@doi}
+\providetoggle{cms@eprint}
\providetoggle{cms@isbn}
\providetoggle{cms@numbermonth}
\providetoggle{cms@bookpages}
+\providetoggle{cms@bookseries}
+\providetoggle{cms@notefield}
+\providetoggle{cms@addendum}
\providetoggle{cms@headlessnote}
\providetoggle{cms@fullnote}
@@ -31,6 +34,7 @@
\providetoggle{cms@usecompiler}
\providetoggle{cms@shorthandibid}
\providetoggle{cms@printshhand}
+\providetoggle{cms@fullshhand}
\providetoggle{cms@origpublished}
\providetoggle{cms@loccit}
\providetoggle{cms@annotation}
@@ -51,16 +55,10 @@
or
not test {\iffieldint{year}}
or
- not test {\iffieldint{origyear}}
- or
togl {cms@switchdates}
}%
{}%
- {\ifboolexpr{%
- test {\iffieldundef{endyear}}%
- or
- not test {\iffieldnum{endyear}}
- }%
+ {\iffieldundef{endyear}%
{\ifthenelse{\thefield{origyear}>\thefield{year}}%
{\toggletrue{cms@switchdates}}%
{}}%
@@ -80,6 +78,9 @@
\DeclareBibliographyOption{shorthandibid}[true]{%
\global\toggletrue{cms@shorthandibid}}
+\DeclareBibliographyOption{shorthandfull}[true]{%
+ \settoggle{cms@fullshhand}{#1}}
+
\DeclareBibliographyOption{usecompiler}[true]{%
\settoggle{cms@usecompiler}{#1}}
@@ -100,6 +101,8 @@
\settoggle{cms@url}{#1}}
\DeclareBibliographyOption{doi}[true]{%
\settoggle{cms@doi}{#1}}
+\DeclareBibliographyOption{eprint}[true]{%
+ \settoggle{cms@eprint}{#1}}
\DeclareBibliographyOption{numbermonth}[true]{%
\settoggle{cms@numbermonth}{#1}}
\DeclareBibliographyOption{bookpages}[true]{%
@@ -108,21 +111,42 @@
\settoggle{cms@isbn}{#1}%
\settoggle{cms@url}{#1}%
\settoggle{cms@doi}{#1}%
+ \settoggle{cms@eprint}{#1}%
\settoggle{cms@numbermonth}{#1}%
\settoggle{cms@bookpages}{#1}}
+\DeclareBibliographyOption{addendum}[true]{%
+ \settoggle{cms@addendum}{#1}}
+\DeclareBibliographyOption{bookseries}[true]{%
+ \settoggle{cms@bookseries}{#1}}
+\DeclareBibliographyOption{notefield}[true]{%
+ \settoggle{cms@notefield}{#1}}
+\DeclareBibliographyOption{completenotes}[true]{%
+ \settoggle{cms@addendum}{#1}%
+ \settoggle{cms@bookseries}{#1}%
+ \settoggle{cms@notefield}{#1}}%
+
\DeclareEntryOption{isbn}[true]{%
\settoggle{cms@isbn}{#1}}
\DeclareEntryOption{url}[true]{%
\settoggle{cms@url}{#1}}
\DeclareEntryOption{doi}[true]{%
\settoggle{cms@doi}{#1}}
+\DeclareEntryOption{eprint}[true]{%
+ \settoggle{cms@eprint}{#1}}
\DeclareEntryOption{numbermonth}[true]{%
\settoggle{cms@numbermonth}{#1}}
\DeclareEntryOption{bookpages}[true]{%
\settoggle{cms@bookpages}{#1}}
-\ExecuteBibliographyOptions{includeall}
+\DeclareEntryOption{addendum}[true]{%
+ \settoggle{cms@addendum}{#1}}
+\DeclareEntryOption{bookseries}[true]{%
+ \settoggle{cms@bookseries}{#1}}
+\DeclareEntryOption{notefield}[true]{%
+ \settoggle{cms@notefield}{#1}}
+
+\ExecuteBibliographyOptions{includeall,completenotes}
% For author-date compatibility %
@@ -160,18 +184,27 @@
\def\mkbibcurdinal#1{%
\@tempcnta0#1 \the\@tempcnta}%
-\@ifpackagelater{biblatex}{2011/01/04}
+\@ifpackagelater{biblatex}{2010/08/28}
{}
{\PackageError{biblatex}
{Outdated 'biblatex' package}
- {The Chicago style requires biblatex v1.1 or later.\MessageBreak
+ {The Chicago style requires biblatex v0.9 or later.\MessageBreak
You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak
This is a fatal error. I'm aborting now.}%
\endinput}
+% American-specific punctuation change for 16th edition %
+
+\DefineBibliographyExtras{american}{%
+% \DeclareCapitalPunctuation{.}%
+ \DeclarePunctuationPairs{comma}{*!?}}
+
%%%% Initialize and define bibstrings %%%%
-%%%% Now in cms-*.lbx %%%%
+\DefineBibliographyStrings{english}{%
+ citedas = {hereafter cited as},}
+
+%%%% This one needed for 16th edition. Others in cms-*.lbx %%%%
%%%% Cite macros for use by the citation commands %%%%
@@ -267,7 +300,7 @@
{\iffieldequalstr{authortype}{anon?}%
{\bibleftbracket\printnames{labelname}?%
\bibrightbracket\classicpunct}%
- {\printnames{labelname}%
+ {\usebibmacro{choose+labelname}%\printnames{labelname}%
\isdot\classicpunct}}}%
\ifboolexpr{%
togl {cms@allshort}%
@@ -282,16 +315,17 @@
\newbibmacro*{cite:shorthand}{%
\iftoggle{cms@allshort}%
{\printtext[bibhyperref]{%
- \printfield{shorthand}}}%
+ \printfield{shorthand}}}
{\printtext[bibhyperlink]{%
\printfield{shorthand}}}}
\newbibmacro*{cms:shorthandintro}{% For changing the citedas phrase
\iffieldundef{shorthandintro}%
- {\addperiod\space%
- \bibstring{citedas}\space%
- \printfield{shorthand}}%
- {\addperiod\space%
+ {\setunit{\addspace}%
+ \printtext[parens]{%
+ \bibstring{citedas}\space%
+ \printfield{shorthand}}}%
+ {\setunit{\addspace}%
\printfield{shorthandintro}}}
\newbibmacro*{cite:ibid}{%
@@ -302,16 +336,18 @@
\usebibmacro{cite:save}}%
{\iftoggle{cms@allshort}%
{\printtext[bibhyperref]{%
- \bibstring[\mkibid]{ibidem}}}%
+ \bibstring[\mkibid]{ibidem}}}
{\printtext[bibhyperlink]{%
- \bibstring[\mkibid]{ibidem}}}%
+ \bibstring[\mkibid]{ibidem}}}
\ifloccit
{\global\toggletrue{cms@loccit}}%
{}}}
\newbibmacro*{cite:journal}{%
\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
- {\usebibmacro{cite:ibid}}%
+ {\iffieldundef{prenote}%
+ {\bibsentence\usebibmacro{cite:ibid}}%
+ {\usebibmacro{cite:ibid}}}%
{\iffieldundef{journaltitle}%
{\usebibmacro{cite:short}}%
{\iffieldequalstr{authortype}{anon}%
@@ -322,7 +358,11 @@
\bibrightbracket\newcunit}%
{\printnames{labelname}%
\isdot\newcunit}}%
- \printfield[journaltitle]{journaltitle}%
+ \iftoggle{cms@allshort}%
+ {\printtext[bibhyperref]{%
+ \printfield[journaltitle]{journaltitle}}}%
+ {\printtext[bibhyperlink]{%
+ \printfield[journaltitle]{journaltitle}}}%
\iffieldundef{volume}%
{\iffieldundef{number}%
{\iffieldundef{issue}
@@ -464,10 +504,10 @@
{\usebibmacro{hlprenote}}%
{\printtext[bibhypertarget]{%
\usedriver
- {\DeclareNameAlias{sortname}{default}\clearname{author}%
- \toggletrue{cms@fullnote}\toggletrue{cms@headlessnote}%
- \usebibmacro{cite:save}}%
- {cite:\thefield{entrytype}}}}%
+ {\DeclareNameAlias{sortname}{default}\clearname{author}%
+ \toggletrue{cms@fullnote}\toggletrue{cms@headlessnote}%
+ \usebibmacro{cite:save}}%
+ {cite:\thefield{entrytype}}}}%
{\multicitedelim}%
{}%\usebibmacro{finentry}}
@@ -482,6 +522,23 @@
{\multicitedelim}
{\usebibmacro{cite:postnote}}
+\DeclareCiteCommand{\surnamecite}
+ {\usebibmacro{prenote}}%\usebibmacro{hlcprenote}}
+ {\usebibmacro{citeindex}%
+ \ifboolexpr{%
+ test {\ifciteseen}
+ or
+ togl {cms@allshort}
+ }%
+ {\usebibmacro{cite:short}}
+ {\toggletrue{cms@headlessnote}%
+ \usebibmacro{choose+surname}%
+ \usebibmacro{cite}}}
+ {\multicitedelim}
+ {\usebibmacro{cite:postnote}}
+
+\DeclareMultiCiteCommand{\surnamecites}{surnamecite}{\multicitedelim}
+
\DeclareCiteCommand{\shortcite}
{\usebibmacro{prenote}}
{\toggletrue{cms@shortnote}%
@@ -491,14 +548,30 @@
{\multicitedelim}
{\usebibmacro{postnote}}
+\DeclareCiteCommand{\shorthandcite}
+ {\usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \iftoggle{cms@shorthandibid}%
+ {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
+ {\usebibmacro{cite:ibid}}%
+ {\usebibmacro{cite:shorthand}%
+ \usebibmacro{cite:save}}}%
+ {\usebibmacro{cite:shorthand}%
+ \usebibmacro{cite:save}}}
+ {\multicitedelim}
+ {\usebibmacro{postnote}}
+
\DeclareCiteCommand{\citejournal}% Name?
- {\usebibmacro{journalprenote}}
+ {\usebibmacro{prenote}}
{\toggletrue{cms@shortnote}%
\togglefalse{cms@fullnote}%
+ \clearfield{pages}%
\usebibmacro{citeindex}%
\usebibmacro{cite:journal}}
{\multicitedelim}
- {\usebibmacro{fullpostnote}}
+ {\iftoggle{cms@loccit}%
+ {}%
+ {\usebibmacro{fullpostnote}}}
\DeclareCiteCommand{\citeauthor}
{\boolfalse{citetracker}%
@@ -537,7 +610,7 @@
\usebibmacro{mag+news+date}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
- \printfield{addendum}%
+ \usebibmacro{caddendum}%
\newcunit\newblock
\iftoggle{cms@isbn}%
{\printfield{issn}}%
@@ -567,7 +640,7 @@
\usebibmacro{cjournal+issue+year+pages}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
- \printfield{addendum}%
+ \usebibmacro{caddendum}%
\newcunit\newblock
\iftoggle{cms@isbn}%
{\printfield{issn}}%
@@ -598,14 +671,14 @@
\newcunit\newblock
\printfield{version}%
\newcunit\newblock
- \printfield{note}%
+ \usebibmacro{cnotefield}%
\newcunit\newblock
\usebibmacro{institution+organization}%
\newcunit\newblock
\printlist{location}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
- \printfield{addendum}%
+ \usebibmacro{caddendum}%
\newcunit\newblock
\usebibmacro{cite+doi+url}%
\newcunit\newblock
@@ -674,16 +747,16 @@
\newcunit
\printfield{volumes}%
\newcunit\newblock
- \usebibmacro{ser+num}%
+ \usebibmacro{cser+num}%
\newcunit\newblock
- \printfield{note}%
+ \usebibmacro{cnotefield}%
\newcunit\newblock
\usebibmacro{cpubl+loc+year}%
\newcunit
\printfield{type}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
- \printfield{addendum}%
+ \usebibmacro{caddendum}%
\newcunit\newblock
\iftoggle{cms@isbn}%
{\printfield{isan}%
@@ -747,9 +820,9 @@
\newcunit
\printfield{volumes}%
\newcunit\newblock
- \usebibmacro{ser+num}%
+ \usebibmacro{cser+num}%
\newcunit\newblock
- \printfield{note}%
+ \usebibmacro{cnotefield}%
\newcunit\newblock
\usebibmacro{cpubl+loc+year}%
\iftoggle{cms@bookpages}%
@@ -759,7 +832,7 @@
\newcunit\newblock
\printlist[][-\value{listtotal}]{lista}%
\newcunit\newblock
- \printfield{addendum}%
+ \usebibmacro{caddendum}%
\newcunit\newblock
\iftoggle{cms@isbn}%
{\printfield{isbn}}%
@@ -809,14 +882,14 @@
\newcunit
\printfield{volumes}%
\newcunit\newblock
- \usebibmacro{ser+num}%
+ \usebibmacro{cser+num}%
\newcunit\newblock
- \printfield{note}%
+ \usebibmacro{cnotefield}%
\newcunit\newblock
\usebibmacro{cpubl+loc+year}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
- \printfield{addendum}%
+ \usebibmacro{caddendum}%
\newcunit\newblock
\iftoggle{cms@isbn}%
{\printfield{isbn}}%
@@ -837,13 +910,13 @@
\newcunit\newblock
\usebibmacro{byauthor}%
\newcunit
- \printfield{note}%
+ \usebibmacro{cnotefield}%
\setunit{\addspace}\newblock%
\printtext[parens]{%
\usebibmacro{howpubl+loc+year}}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
- \printfield{addendum}%
+ \usebibmacro{caddendum}%
\newcunit\newblock
\usebibmacro{cite+doi+url}%
\newcunit\newblock
@@ -883,14 +956,14 @@
\newcunit
\printfield{volumes}%
\newcunit\newblock
- \usebibmacro{ser+num}%
+ \usebibmacro{cser+num}%
\newcunit\newblock
- \printfield{note}%
+ \usebibmacro{cnotefield}%
\newcunit\newblock
\usebibmacro{cpubl+loc+year}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
- \printfield{addendum}%
+ \usebibmacro{caddendum}%
\newcunit\newblock
\iftoggle{cms@isbn}%
{\printfield{isbn}}%
@@ -928,14 +1001,14 @@
\newcunit
\printfield{volumes}%
\newcunit\newblock
- \usebibmacro{ser+num}%
+ \usebibmacro{cser+num}%
\newcunit\newblock
- \printfield{note}%
+ \usebibmacro{cnotefield}%
\newcunit\newblock
\usebibmacro{cpubl+loc+year}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
- \printfield{addendum}%
+ \usebibmacro{caddendum}%
\newcunit\newblock
\iftoggle{cms@isbn}%
{\printfield{isbn}}%
@@ -960,10 +1033,8 @@
\setunit{\addspace}%
\printfield{nameaddon}%
\setunit{\addcomma\addspace}\newblock
- \usebibmacro{ctitle+stitle}%
- \setunit{\addspace}\newblock%
- \usebibmacro{language+transtitle}%
- \setunit{\addcomma\addspace}%
+ \usebibmacro{citaltitle+stitle}%
+ \newcunit%\setunit{\addcomma\addspace}%
\usebibmacro{date}%
\newcunit
\usebibmacro{byauthor}%
@@ -976,14 +1047,14 @@
\newcunit\newblock
\printfield{version}%
\newcunit\newblock
- \printfield{note}%
+ \usebibmacro{cnotefield}%
\newcunit\newblock
\usebibmacro{institution+organization}%
\newcunit\newblock
\printlist{location}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
- \printfield{addendum}%
+ \usebibmacro{caddendum}%
\newcunit\newblock
\usebibmacro{cite+doi+url}%
\newcunit\newblock
@@ -1032,14 +1103,14 @@
\newcunit
\printfield{volumes}%
\newcunit\newblock
- \usebibmacro{ser+num}%
+ \usebibmacro{cser+num}%
\newcunit\newblock
- \printfield{note}%
+ \usebibmacro{cnotefield}%
\newcunit\newblock
\usebibmacro{cpubl+loc+year}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
- \printfield{addendum}%
+ \usebibmacro{caddendum}%
\newcunit\newblock
\iftoggle{cms@isbn}%
{\printfield{isbn}}%
@@ -1094,14 +1165,14 @@
\newcunit
\printfield{volumes}%
\newcunit\newblock
- \usebibmacro{ser+num}%
+ \usebibmacro{cser+num}%
\newcunit\newblock
- \printfield{note}%
+ \usebibmacro{cnotefield}%
\newcunit\newblock
\usebibmacro{cpubl+loc+year}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
- \printfield{addendum}%
+ \usebibmacro{caddendum}%
\newcunit\newblock
\iftoggle{cms@isbn}%
{\printfield{isbn}}%
@@ -1148,8 +1219,6 @@
\usebibmacro{cms-in:}%
\usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}%
\newcunit\newblock
- \usebibmacro{cbyeditor+others}%
- \newcunit\newblock
\iffieldundef{maintitle}
{\printfield{volume}%
\printfield{part}}
@@ -1157,15 +1226,15 @@
\newcunit
\printfield{volumes}%
\newcunit\newblock
- \usebibmacro{ser+num}%
+ \usebibmacro{cser+num}%
\newcunit\newblock
- \printfield{note}%
+ \usebibmacro{cnotefield}%
\setunit{\addspace}\newblock%
\printtext[parens]{%
\usebibmacro{org+publ+loc+year}}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
- \printfield{addendum}%
+ \usebibmacro{caddendum}%
\newcunit\newblock
\iftoggle{cms@isbn}%
{\printfield{isbn}}%
@@ -1239,21 +1308,21 @@
\newcunit
\printfield{volumes}%
\newcunit\newblock
- \usebibmacro{ser+num}%
+ \usebibmacro{cser+num}%
\newcunit\newblock
- \printfield{note}%
+ \usebibmacro{cnotefield}%
\newcunit\newblock
\usebibmacro{cpubl+loc+year}%
\usebibmacro{inreffullpostnote}%
- \setunit{\addspace}%
+ \newcunit\newblock%setunit{\addspace}% 16th ed
\ifnameundef{author}%
{}%
- {\printtext[parens]{%
+ {\printtext{% 16th ed
\bibstring{by}%
\addspace%
\printnames{author}}}%
\newcunit\newblock
- \printfield{addendum}%
+ \usebibmacro{caddendum}%
\newcunit\newblock
\iftoggle{cms@isbn}%
{\printfield{isbn}}%
@@ -1308,14 +1377,14 @@
\newcunit
\printfield{volumes}%
\newcunit\newblock
- \usebibmacro{ser+num}%
+ \usebibmacro{cser+num}%
\newcunit\newblock
- \printfield{note}%
+ \usebibmacro{cnotefield}%
\newcunit\newblock
\usebibmacro{cpubletter+loc+year}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
- \printfield{addendum}%
+ \usebibmacro{caddendum}%
\newcunit\newblock
\iftoggle{cms@isbn}%
{\printfield{isbn}}%
@@ -1354,17 +1423,17 @@
\newcunit
\usebibmacro{byauthor}%
\newcunit\newblock
- \usebibmacro{ser+num}%
+ \usebibmacro{cser+num}%
\newcunit\newblock
\printfield{type}%
\newcunit
- \printfield{note}%
+ \usebibmacro{cnotefield}%
\setunit{\addspace}\newblock%
\printtext[parens]{%
\usebibmacro{org+publ+loc+year}}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
- \printfield{addendum}%
+ \usebibmacro{caddendum}%
\newcunit\newblock
\iftoggle{cms@isbn}%
{\printfield{isbn}}%
@@ -1414,7 +1483,7 @@
{}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
- \printfield{addendum}%
+ \usebibmacro{caddendum}%
\newcunit\newblock
\usebibmacro{cite+doi+url}%
\newcunit\newblock
@@ -1430,11 +1499,11 @@
\usebibmacro{citaltitle+stitle}%
\newcunit
\usebibmacro{byauthor}%
- \newcunit
- \printeventdate%
\newcunit\newblock
\usebibmacro{cpart+editor+translator}%
- \newcunit
+ \newcunit\newblock
+ \usebibmacro{music+eventdate}%
+ \newcunit\newblock
\usebibmacro{chapinscore}%
\usebibmacro{btitle+bstitle}%
\newcunit
@@ -1485,17 +1554,17 @@
\newcunit\newblock
\printfield{version}%
\newcunit\newblock
- \printfield{note}%
+ \usebibmacro{cnotefield}%
\newcunit\newblock
- \usebibmacro{music+ser+num}%
+ \usebibmacro{music+origdate}%\printtext[eventdate]{\printeventdate}%
\newcunit\newblock
- \usebibmacro{music+publisher}%
- \setunit*{\addspace}%\newblock
- \usebibmacro{date}%
- \setunit*{\ifthenelse{\iffieldundef{howpublished}\AND%
- \iffieldundef{pubstate}}%
- {\addcomma\addspace}{\addspace}}%
\printlist{publisher}%
+ \newcunit\newblock
+ \printfield{series}%
+ \setunit{\addspace}%
+ \printfield{number}%
+ \newcunit\newblock
+ \usebibmacro{date}%
\newcunit
\usebibmacro{institution+organization}%
\newcunit\newblock
@@ -1504,7 +1573,9 @@
\printfield{type}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
- \printfield{addendum}%
+ \usebibmacro{pubstate}% 16th ed.
+ \newcunit\newblock
+ \usebibmacro{caddendum}%
\newcunit\newblock
\iftoggle{cms@isbn}%
{\printfield{iswc}}%
@@ -1527,20 +1598,24 @@
\setunit{\addcomma\addspace}%
\usebibmacro{byauthor}%
\setunit{\addcomma\addspace}%
- \printfield{note}%
+ \printlist{organization}% Rearranged for 16th ed.
\setunit{\addcomma\addspace}%
- \printlist{organization}%
+ \usebibmacro{cnotefield}%
\setunit{\addcomma\addspace}
\usebibmacro{date}%
\setunit{\addcomma\addspace}%
- \iftoggle{cms@doi}%
- {\printfield{doi}}%
+ \iffieldundef{urlyear}%
{}%
- \setunit{\addcomma\addspace}%
- \usebibmacro{url+date}%
+ {\printtext[urldate]{\printurldate}}%
+ \newcunit\newblock
+ \printfield{doi}%
+ \newcunit\newblock
+ \usebibmacro{eprint}%
+ \newcunit\newblock
+ \printfield{url}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
- \printfield{addendum}%
+ \usebibmacro{caddendum}%
\newcunit\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -1553,7 +1628,7 @@
\setunit{\addspace}%
\usebibmacro{language+transtitle}%
\setunit{\addcomma\addspace}\newblock%
- \printfield{note}%
+ \usebibmacro{cnotefield}%
\setunit{\addspace}%
\printtext[parens]{%
\printfield{type}%
@@ -1578,7 +1653,7 @@
\addspace\bibstring{patentissued}\addspace}%
\usebibmacro{date}}%
\newcunit%
- \printfield{addendum}}%
+ \usebibmacro{caddendum}}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
\usebibmacro{cite+doi+url}%
@@ -1604,7 +1679,7 @@
\usebibmacro{periodical+date+issue}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
- \printfield{addendum}%
+ \usebibmacro{caddendum}%
\newcunit\newblock
\iftoggle{cms@isbn}%
{\printfield{issn}}%
@@ -1632,7 +1707,7 @@
\usebibmacro{cperiodical+issue+year+pages}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
- \printfield{addendum}%
+ \usebibmacro{caddendum}%
\newcunit\newblock
\iftoggle{cms@isbn}%
{\printfield{issn}}%
@@ -1653,8 +1728,6 @@
\newcunit
\usebibmacro{cmtitle+mstitle+vol+part+title+stitle}%
\newcunit\newblock
- \usebibmacro{cbytranslator+others}%
- \newcunit\newblock
\iffieldundef{maintitle}
{\printfield{volume}%
\printfield{part}}
@@ -1662,15 +1735,15 @@
\newcunit
\printfield{volumes}%
\newcunit\newblock
- \usebibmacro{ser+num}%
+ \usebibmacro{cser+num}%
\newcunit\newblock
- \printfield{note}%
+ \usebibmacro{cnotefield}%
\setunit{\addspace}\newblock%
\printtext[parens]{%
\usebibmacro{org+publ+loc+year}}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
- \printfield{addendum}%
+ \usebibmacro{caddendum}%
\newcunit\newblock
\iftoggle{cms@isbn}%
{\printfield{isbn}}%
@@ -1728,14 +1801,14 @@
\newcunit
\printfield{volumes}%
\newcunit\newblock
- \usebibmacro{ser+num}%
+ \usebibmacro{cser+num}%
\newcunit\newblock
- \printfield{note}%
+ \usebibmacro{cnotefield}%
\newcunit\newblock
\usebibmacro{cpubl+loc+year}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
- \printfield{addendum}%
+ \usebibmacro{caddendum}%
\newcunit\newblock
\iftoggle{cms@isbn}%
{\printfield{isbn}}%
@@ -1756,17 +1829,17 @@
\newcunit
\usebibmacro{byauthor}%
\newcunit\newblock
- \usebibmacro{ser+num}%
+ \usebibmacro{cser+num}%
\newcunit\newblock
\printfield{type}%
\newcunit
- \printfield{note}%
+ \usebibmacro{cnotefield}%
\setunit{\addspace}\newblock%
\printtext[parens]{%
\usebibmacro{inst+loc+year}}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
- \printfield{addendum}%
+ \usebibmacro{caddendum}%
\newcunit\newblock
\iftoggle{cms@isbn}%
{\printfield{isrn}}%
@@ -1782,8 +1855,10 @@
\iffieldequalstr{entrysubtype}{magazine}
{\usebibmacro{cmag+news+author}}%
{\usebibmacro{author/editor}}%
+ \newcunit\newblock
+ \printeventdate% 16th ed.
\setunit{\addspace}%
- \printfield{nameaddon}%
+ \printfield{nameaddon}% 16th ed.
\newcunit\newblock
\printfield{title}%
\setunit{\addcolon\addspace}%
@@ -1804,7 +1879,7 @@
{\usebibmacro{cjournal+issue+year+pages}}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
- \printfield{addendum}%
+ \usebibmacro{caddendum}%
\newcunit\newblock
\iftoggle{cms@isbn}%
{\printfield{issn}}%
@@ -1857,7 +1932,7 @@
\printfield{volumes}
\clearfield{volumes}}%
\newcunit
- \usebibmacro{cbyeditor}%
+ \usebibmacro{cbyeditor+others}%
\newcunit
\iffieldundef{maintitle}
{\printfield{volume}%
@@ -1866,14 +1941,15 @@
\newcunit
\printfield{volumes}%
\newcunit\newblock
- \usebibmacro{ser+num}%
+ \usebibmacro{cser+num}%
\newcunit\newblock
- \printfield{note}%
+ \usebibmacro{cnotefield}%
\newcunit\newblock
\usebibmacro{cpubl+loc+year}%
+ \clearfield{pages}% ?? For 16th ed.
\usebibmacro{fullpostnote}%
\newcunit\newblock
- \printfield{addendum}%
+ \usebibmacro{caddendum}%
\newcunit\newblock
\iftoggle{cms@isbn}%
{\printfield{isbn}}%
@@ -1900,13 +1976,13 @@
\setunit{\addcomma\addspace}%
\usebibmacro{byauthor}%
\setunit{\addcomma\addspace}%
- \printfield{note}%
+ \usebibmacro{cnotefield}%
\setunit{\addspace}%
\printtext[parens]{%
\usebibmacro{type+inst+year}}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
- \printfield{addendum}%
+ \usebibmacro{caddendum}%
\newcunit\newblock
\usebibmacro{cite+doi+url}%
\newcunit\newblock
@@ -1928,18 +2004,16 @@
\printtext[parens]{%
\printfield{howpublished}%
\newcunit\newblock
- \printfield{note}%
+ \usebibmacro{cnotefield}%
\newcunit\newblock
\printlist{location}%
\newcunit\newblock
\usebibmacro{date}}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
- \printfield{addendum}%
+ \usebibmacro{caddendum}%
\newcunit\newblock
- \iftoggle{cms@url}%
- {\usebibmacro{url+date}}%
- {}%
+ \usebibmacro{cite+doi+url}%
\newcunit\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
@@ -1975,8 +2049,6 @@
\printfield{volumes}
\clearfield{volumes}}%
\newcunit
- \printfield{type}%
- \newcunit
\usebibmacro{bybookauthor}%
\usebibmacro{cbyeditor+others}%
\iffieldundef{maintitle}
@@ -2008,14 +2080,18 @@
\newcunit
\printfield{volumes}%
\newcunit\newblock
- \usebibmacro{ser+num}%
+ \usebibmacro{cser+num}%
\newcunit\newblock
- \printfield{note}%
+ \usebibmacro{music+eventdate}%
+ \newcunit\newblock
+ \usebibmacro{cnotefield}%
\newcunit\newblock
\usebibmacro{cpubl+loc+year}%
\usebibmacro{fullpostnote}%
\newcunit\newblock
- \printfield{addendum}%
+ \printfield{type}%
+ \newcunit\newblock
+ \usebibmacro{caddendum}%
\newcunit\newblock
\iftoggle{cms@isbn}%
{\printfield{isan}}%
@@ -2086,6 +2162,32 @@
{#1\isdot}%
{\mkbibquote{#1\isdot}}}
+\newcommand*{\long@kludge}{% 16th edition places commas after these
+ \ifboolexpr{% punctuation marks.
+ (
+ test {\ifpunctmark{?}}
+ or
+ test {\ifpunctmark{!}}
+ )
+ and
+ not togl {cms@fullnote}%test {\ifcitation}
+ }%
+ {\spacefactor\blx@sf@dot}%\blx@postpunct\addperiod}%
+ {\isdot}}%
+
+\newcommand*{\short@kludge}{% 16th edition places commas after these
+ \ifboolexpr{% punctuation marks. Needed?
+ (
+ test {\ifpunctmark{?}}
+ or
+ test {\ifpunctmark{!}}
+ )
+ and
+ not test {\iffieldundef{postnote}}
+ }%
+ {\isdot\midsentence}%
+ {\isdot}}%
+
\DeclareFieldFormat[article]{lostitle}{%
\iffieldundef{title}%
{#1\isdot}%
@@ -2118,11 +2220,11 @@
\DeclareFieldFormat[periodical]{lostitle}{\mkbibemph{#1}\isdot}
-\DeclareFieldAlias[image]{title}[article]{title}
+\DeclareFieldAlias[image]{title}[artwork]{title}
-\DeclareFieldAlias[image]{citetitle}[article]{citetitle}
+\DeclareFieldAlias[image]{citetitle}[artwork]{citetitle}
-\DeclareFieldAlias[image]{lostitle}[article]{lostitle}
+\DeclareFieldAlias[image]{lostitle}[artwork]{lostitle}
\DeclareFieldAlias[incollection]{title}[article]{title}
@@ -2148,11 +2250,11 @@
\DeclareFieldAlias[thesis]{lostitle}[article]{lostitle}
-\DeclareFieldAlias[patent]{title}[article]{title}
+\DeclareFieldAlias[patent]{title}[letter]{title}
-\DeclareFieldAlias[patent]{citetitle}[article]{citetitle}
+\DeclareFieldAlias[patent]{citetitle}[letter]{citetitle}
-\DeclareFieldAlias[patent]{lostitle}[article]{lostitle}
+\DeclareFieldAlias[patent]{lostitle}[letter]{lostitle}
\DeclareFieldAlias[unpublished]{title}[article]{title}
@@ -2303,6 +2405,13 @@
%%%% Other Field Formats %%%%
+% \InitializeCitationStyle{\numgdef{\cbx@resetcount}{\cbx@resetcount+1}}
+% \DeclareFieldFormat{bibhyperlink}{%
+% \bibhyperlink{\iffootnote{f}{t}:\cbx@resetcount:\thefield{entrykey}}{#1}}
+% \DeclareFieldFormat{bibhypertarget}{%
+% \bibhypertarget{\iffootnote{f}{t}:\cbx@resetcount:\thefield{entrykey}}{#1}}
+% \newcommand*{\cbx@resetcount}{0}
+
\DeclareNumChars*{:}% For proper ibidem with multi-volume works.
\DeclareFieldFormat{letterday}{\mkbibcurdinal{#1}}
@@ -2340,8 +2449,43 @@
{\href{http://dx.doi.org/#1}{\nolinkurl{#1}}}
{\nolinkurl{#1}}}
+\DeclareFieldFormat{urldate}{% 16th ed.
+ \iffieldundef{userd}%
+ {\bibstring{urlseen}\space #1}%
+ {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat[video]{urldate}{% 16th ed.
+ \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}}%
+ {\bibstring{urlseen}\space #1}%
+ {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat[music]{urldate}{% 16th ed.
+ \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}%
+ \OR\NOT\iffieldundef{origyear}}%
+ {\bibstring{urlseen}\space #1}%
+ {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat[music]{origdate}{% 16th ed.
+ \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}}%
+ {\bibstring{recorded}\space #1}%
+ {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat[music]{eventdate}{% 16th ed.
+ \iffieldundef{userd}%
+ {\bibstring{recorded}\space #1}%
+ {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat[video]{eventdate}{% 16th ed.
+ \iffieldundef{userd}%
+ {\bibstring{broadcast}\space #1}%
+ {\printfield{userd}\addspace #1}}
+
+\DeclareFieldAlias{userd}{titleaddon}% 16th ed.
+
\DeclareFieldFormat{nameaddon}{\mkbibbrackets{#1\bibsentence}}% ?!
+\DeclareFieldFormat[review]{nameaddon}{#1\bibsentence}
+
\DeclareFieldFormat[customc]{nameaddon}{% For cross-refs
\ifbibstring{#1}%
{\mkbibemph{\bibstring{#1}}}%
@@ -2455,8 +2599,9 @@
{\addcomma}}%
{\addperiod}}}
-\newcommand{\classicpunct}{%
- \ifthenelse{\iffieldequalstr{entrysubtype}{classical}\OR%
+\newcommand{\classicpunct}{% 16th ed.
+ \ifthenelse{\(\iffieldequalstr{entrysubtype}{classical}\AND%
+ \iffieldundef{labeltitle}\)\OR
\iffieldequalstr{entrytype}{letter}}%
{\setunit*{\addspace}}%
{\setunit*{\addcomma\addspace}}}
@@ -2558,9 +2703,7 @@
\iffieldpages{postnote}% test more accurate. See 17.253.
{\addspace}%
{\addcomma\addspace}}%
- {\iffieldundef{volumes}%
- {\addcomma\addspace}%
- {\addspace}}}%
+ {\addcomma\addspace}}% 16th ed -- no more volumes test.
{\iftoggle{cms@fullnote}%
{\ifthenelse{\(\iffieldequalstr{entrytype}{article}\OR
\iffieldequalstr{entrytype}{review}\OR
@@ -2571,7 +2714,7 @@
{\addcomma\addspace}}%
{\addcomma\addspace}}}%
-\newcommand*{\editordelim}{% Otherwise you get a spurious comma.
+\newcommand*{\editordelim}{%
\iffieldequalstr{editortype}{none}%
{\addperiod\addspace}%
{\addcomma\addspace}}
@@ -2682,9 +2825,12 @@
{\ifnameundef{afterword}%
{\ifnameundef{foreword}%
{\printfield{type}}%
- {\bibstring{forewordto}}}%
- {\bibstring{afterwordto}}}%
- {\bibstring{introductionto}}}
+ {\bibstring{forewordto}%
+ \clearname{foreword}}}% 16th ed.
+ {\bibstring{afterwordto}%
+ \clearname{afterword}}}%
+ {\bibstring{introductionto}%
+ \clearname{introduction}}}
\newbibmacro*{langlist:andothers}{%
\ifthenelse{\value{listcount}=\value{liststop}\AND
@@ -2708,9 +2854,7 @@
\newbibmacro*{cmag+news+author}{%
\ifnameundef{author}%
- {\usebibmacro{journal+sub}%
- \setunit*{\addspace}%
- \printlist[periodplace]{location}}%
+ {}% 16th ed.
{\ifuseauthor%
{\usebibmacro{author}}%
{}}}
@@ -2972,31 +3116,45 @@
\newbibmacro*{chapinscore}{%
\iffieldundef{chapter}%
- {}
+ {\ifthenelse{\iffieldequalstr{entrytype}{music}% 16th ed.
+ \AND\NOT\iffieldundef{booktitle}}%
+ {\bibstring{on}\setunit{\addspace}}%
+ {}}
{\printfield{chapter}%
\addspace\bibstring{of}\setunit{\addspace}%
\clearfield{chapter}}}
+\newbibmacro*{caddendum}{% New macros for 16th ed. field exclusion
+ \iftoggle{cms@addendum}%
+ {\printfield{addendum}}%
+ {}}%
+
+\newbibmacro*{cnotefield}{%
+ \iftoggle{cms@notefield}%
+ {\printfield{note}}%
+ {}}%
+
+\newbibmacro*{cser+num}{%
+ \iftoggle{cms@bookseries}%
+ {\printfield{series}%
+ \printfield[sernum]{number}}%
+ {}}%
+
\newbibmacro*{ser+num}{%
\printfield{series}%
- \printfield[sernum]{number}%
- \newunit}
+ \printfield[sernum]{number}}
-\newbibmacro*{music+ser+num}{%
- \iffieldundef{series}%
- {\iffieldundef{number}%
+\newbibmacro*{music+origdate}{%
+ \iftoggle{cms@reprint}% 16th ed.
+ {}%
+ {\iffieldundef{origyear}%
{}%
- {\printfield{number}}}
- {\printfield{series}%
- \setunit{\addspace}%
- \printfield{number}}}%
+ {\printtext[origdate]{\usebibmacro{cmsorigdate}}}}}
-\newbibmacro*{music+publisher}{%
- \iffieldundef{howpublished}%
- {\iffieldundef{pubstate}%
- {}%
- {\printfield{pubstate}}}%
- {\printfield{howpublished}}}%
+\newbibmacro*{music+eventdate}{%
+ \iffieldundef{eventyear}%
+ {}%
+ {\printtext[eventdate]{\printeventdate}}}
\newbibmacro*{ctitle+stitle}{%
\printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
@@ -3051,9 +3209,14 @@
\printfield{titleaddon}%
}%\newcunit\newblock}
+\renewcommand*{\subtitlepunct}{%
+ \ifpunctmark{?}{\setunit{\addspace}}{\setunit{\addcolon\addspace}}}
+
\newbibmacro*{cmag+news+title}{%
\printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
\printfield[noformat]{title}%
+% \ifpunctmark{?}{\setunit{\addcolon\addspace}{\addspace}}%
+% \subtitlepunct
\setunit{\addcolon\addspace}%
\printfield[noformat]{subtitle}}%
\setunit{\addcomma\addspace}%
@@ -3106,6 +3269,16 @@
\usebibmacro{date}%
}
+\newbibmacro*{origpubl+loc+year}{% 16th ed.
+ \printlist{origlocation}%
+ \iflistundef{origpublisher}%
+ {\setunit*{\addcomma\addspace}}%
+ {\setunit*{\addcolon\addspace}}%
+ \printlist{origpublisher}%
+ \setunit*{\addcomma\addspace}%
+ \usebibmacro{cmsorigdate}%
+}
+
\newbibmacro*{howpubl+loc+year}{% Revised for reprint
\usebibmacro{cmsorigdate}%
\reprintpunct%
@@ -3122,7 +3295,7 @@
}
\newbibmacro*{inst+loc+year}{% Revised for reprint
- \usebibmacro{cmsorigdate}%
+ \usebibmacro{origpubl+loc+year}%{cmsorigdate}% 16th ed.
\reprintpunct%
\iftoggle{cms@reprint}%
{\reprint\newcunit}%
@@ -3149,7 +3322,7 @@
{}%
{\setunit{\addspace}%
\printtext[parens]{%
- \usebibmacro{cmsorigdate}%\printfield{origyear}%
+ \usebibmacro{origpubl+loc+year}%{cmsorigdate}%\printfield{origyear}%
\setunit*{\addsemicolon\addspace}%
\ifboolexpr{
togl {cms@reprint}
@@ -3203,7 +3376,7 @@
\newunit}}}}
\newbibmacro*{org+publ+loc+year}{% What was wrong with \ifthenelse here?
- \usebibmacro{cmsorigdate}%
+ \usebibmacro{origpubl+loc+year}%{cmsorigdate}% 16th ed.
\reprintpunct%
\iftoggle{cms@reprint}% Revised for reprint
{\reprint\newcunit}%
@@ -3236,7 +3409,7 @@
}%
{\iffieldundef{number}%
{\setunit{\addcolon}}%
- {\addcomma\addspace}}% w/setunit colon appears
+ {\addcomma\addspace}}%
{\setunit{\addspace}%
\printtext[parens]{% parens is the default here
\iffieldundef{issue}
@@ -3266,6 +3439,10 @@
\usebibmacro{cmsyear}}}}}
\newbibmacro*{letter+date}{% New for 0.9
+ \iflistundef{origlocation}%
+ {}%
+ {\printlist{origlocation}%
+ \newcunit\newblock}%
\iftoggle{cms@switchdates}%
{\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}%
{}%
@@ -3275,6 +3452,10 @@
{\cms@datelong}}}
\newbibmacro*{unpubl+letter+date}{% For Misc entries
+ \iflistundef{origlocation}%
+ {}%
+ {\printlist{origlocation}%
+ \newcunit\newblock}%
\iftoggle{cms@switchdates}%
{\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}%
{}%
@@ -3283,6 +3464,27 @@
{\printdate}% For interviews and other dated non-letters.
{\cms@datelong}}}
+\newbibmacro*{pubstate}{%
+ \iftoggle{cms@reprint}%
+ {\iftoggle{cms@switchdates}%
+ {\iffieldundef{year}%
+ {}%
+ {\printtext{% 16th ed.
+ \usebibmacro{choosepubstring}%
+ \printdate}}}%
+ {\iffieldundef{origyear}%
+ {}
+ {\printtext{% 16th ed.
+ \usebibmacro{choosepubstring}%
+ \printorigdate}}}}%
+ {}}%
+
+\newbibmacro*{choosepubstring}{%
+ \ifthenelse{\iffieldequalstr{entrytype}{video}\OR%
+ \iffieldequalstr{entrytype}{music}}%
+ {\bibstring{origreleaseyear}}%
+ {\bibstring{origpubyearalt}}}%
+
\renewbibmacro*{date}{% New for 0.9
\iftoggle{cms@switchdates}%
{\printorigdate}%
@@ -3381,31 +3583,34 @@
\setunit{\addcolon\addspace}%
\printfield[noformat]{journalsubtitle}}}}
-\newbibmacro*{cite+doi+url}{%
+\newbibmacro*{cite+doi+url}{% 16th ed.
+ \iffieldundef{urlyear}
+ {}
+ {\printtext[urldate]{\printurldate}}%
+ \newcunit\newblock
\iftoggle{cms@doi}%
{\printfield{doi}}%
{}%
\newcunit\newblock
+ \iftoggle{cms@eprint}%
+ {\usebibmacro{eprint}}%
+ {}%
+ \newcunit\newblock
\iftoggle{cms@url}%
- {\usebibmacro{url+date}}%
- {}}
-
-\newbibmacro*{url+date}{% Changed for 0.9
- \printfield{url}%
- \iffieldundef{urlyear}
- {}
- {\setunit{\addspace}%
- \printtext[urldate]{\printurldate}}}
+ {\printfield{url}}%
+ {}}%
\newbibmacro*{chap+pag}{%
\printfield{chapter}%
\setunit*{\addcomma\space}%
\printfield{pages}}
-\newbibmacro*{mag+news+date}{%
- \ifnameundef{author}%
- {\usebibmacro{date+issue}}%
- {\usebibmacro{mag+date+issue}}}
+\newbibmacro*{mag+news+date}{% 16th ed.
+ \iftoggle{cms@fullnote}%
+ {\usebibmacro{mag+date+issue}}%
+ {\ifnameundef{author}%
+ {\usebibmacro{date+issue}}%
+ {\usebibmacro{mag+date+issue}}}}
\newbibmacro*{date+issue}{%
\iffieldundef{issue}
@@ -3448,21 +3653,21 @@
{\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}}}}
+ \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*{crefmtitle+mstitle+vol+part+title+stitle}{%
\iffieldundef{booktitle}
@@ -3474,21 +3679,21 @@
{\iffieldundef{volume}
{\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*{cmtitle+mstitle+vol+part+btitle+bstitle}{%
\usebibmacro{btitle+bstitle}%
@@ -3499,21 +3704,21 @@
{\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}}}}
+ \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{cite:postnote}{%
\iftoggle{cms@loccit}%
@@ -3608,6 +3813,94 @@
{\bibsentence}%
{\usebibmacro{prenote}}}
+\newbibmacro*{choose+surname}{%
+ \ifciteseen%
+ {}
+ {\ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}%
+ {\printnames{labelname}%
+ \clearname{author}}%
+ {\ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{namea}}%
+ {\printnames[labelname]{namea}\newcunit%
+ \usebibmacro{parteditstrg}}%
+ {\ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{editor}}%
+ {\printnames{labelname}\newcunit%
+ \usebibmacro{editstrg}}%
+ {\ifthenelse{\ifusetranslator\AND\NOT\ifnameundef{nameb}}%
+ {\printnames[labelname]{nameb}\newcunit%
+ \usebibmacro{parttransstrg}}%
+ {\ifthenelse{\ifusetranslator\AND\NOT\ifnameundef{translator}}%
+ {\printnames{labelname}\newcunit%
+ \usebibmacro{transstrg}}%
+ {\ifboolexpr{%
+ not test {\ifnameundef{namec}}
+ and
+ togl {cms@usecompiler}
+ }%
+ {\printnames[labelname]{namec}\newcunit%
+ \usebibmacro{compilestrg}}%
+ {}}}}}}}}%
+
+\newbibmacro*{choose+labelname}{%
+ \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}%
+ {\printnames{labelname}}%
+ {\ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{namea}}%
+ {\printnames[labelname]{namea}}%
+ {\ifthenelse{\ifuseeditor\AND\NOT\ifnameundef{editor}}%
+ {\printnames{labelname}}%
+ {\ifthenelse{\ifusetranslator\AND\NOT\ifnameundef{nameb}}%
+ {\printnames[labelname]{nameb}}%
+ {\ifthenelse{\ifusetranslator\AND\NOT\ifnameundef{translator}}%
+ {\printnames{labelname}}%
+ {\ifboolexpr{%
+ not test {\ifnameundef{namec}}
+ and
+ togl {cms@usecompiler}
+ }%
+ {\printnames[labelname]{namec}}%
+ {}}}}}}}%
+
+\DeclareLabelname{shortauthor,author,shorteditor,namea,%
+ editor,nameb,translator,namec}
+
+\DeclareDataInheritance{collection}{suppcollection}{%
+ \inherit{title}{title}
+ \inherit{subtitle}{subtitle}
+ \inherit{titleaddon}{titleaddon}}
+
+\DeclareSortingScheme{cms}{
+ \sort{
+ \field{presort}
+ }
+ \sort[final]{
+ \field{sortkey}
+ }
+ \sort{
+ \name{sortname}
+ \name{author}
+ \name{namea}
+ \name{editor}
+ \name{nameb}
+ \name{translator}
+ \name{namec}
+ \field{sorttitle}
+ \field{journaltitle}
+ \list{organization}
+ \field{title}
+ }
+ \sort{
+ \field{sorttitle}
+ \field{title}
+ }
+ \sort{
+ \field{sortyear}
+ \field{year}
+ }
+ \sort{
+ \field[padside=left,padwidth=4,padchar=0]{volume}
+ \literal{0000}
+ }
+}
+
\newbibmacro*{part+editor+translator}{%
\ifnameundef{namea}%
{\ifnameundef{nameb}%