summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx627
1 files changed, 427 insertions, 200 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
index 3a13a6dc8ca..6b2d48b7709 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
@@ -1,11 +1,11 @@
-% $Id: chicago-authordate15.bbx,v 0.8.1.8 2011/10/12 13:25:38 dfussner Exp $
+% $Id: chicago-authordate.bbx,v 0.8.1.18 2012/07/05 11:03:42 dfussner Exp $
% This is a biblatex style file, adapted mainly from Lehman's
% standard.bbx and from chicago-notes.bbx. It provides the
-% reference list formatting for the Chicago author-date style,
-% _15th_ edition.
+% reference list formatting for the Chicago author-date style.
-\ProvidesFile{chicago-authordate.bbx}
-[2011/10/12 v 1.6 biblatex bibliography style]
+
+\ProvidesFile{chicago-authordate.bbx}[2012/07/05 v 1.7 biblatex
+bibliography style]
%%%% Initialize and format bibliography and los %%%%
@@ -36,13 +36,43 @@
{\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}}%
\AtEveryBibitem{%
- \iffieldequalstr{entrytype}{patent}%
- {\toggletrue{cms@origlabel}}%
- {}%
+ \iffieldequalstr{pubstate}{reprint}%
+ {\toggletrue{cms@reprint}}%
+ {\togglefalse{cms@reprint}}}%
+
+\AtEveryLositem{%
\iffieldequalstr{pubstate}{reprint}%
{\toggletrue{cms@reprint}}%
{\togglefalse{cms@reprint}}}%
@@ -205,7 +235,9 @@
{\iffieldequalstr{authortype}{anon?}%
{\bibleftbracket\printnames{author}\addquestion\bibrightbracket%
\savefield{fullhash}{\bbx@lasthash}}%
- {\printnames{author}%
+ {\iftoggle{cms@authorparens}%
+ {\bibopenparen\printnames{author}\bibcloseparen}%
+ {\printnames{author}}%
\savefield{fullhash}{\bbx@lasthash}}}}}}
\newbibmacro*{pickeditor}{%
@@ -219,7 +251,10 @@
{\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
\iffirstonpage}
{\bibnamedash\editordelim}%
- {\printnames{editor}\editordelim%
+ {\iftoggle{cms@authorparens}%
+ {\bibopenparen\printnames{editor}%
+ \bibcloseparen\editordelim}%
+ {\printnames{editor}\editordelim}%
\savefield{fullhash}{\bbx@lasthash}}%
\usebibmacro{editstrg}}}
@@ -228,8 +263,11 @@
{\let\bbx@lasthash\undefined}
{\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
\iffirstonpage}
- {\bibnamedash\editordelim}%
- {\printnames{editor}\editordelim%
+ {\bibnamedash\editordelim}
+ {\iftoggle{cms@authorparens}%
+ {\bibopenparen\printnames{editor}%
+ \bibcloseparen\editordelim}%
+ {\printnames{editor}\editordelim}%
\savefield{fullhash}{\bbx@lasthash}}%
\usebibmacro{editstrg}}}
@@ -239,7 +277,10 @@
{\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
\iffirstonpage}
{\bibnamedash\addcomma\addspace}
- {\printnames[sortname]{namea}\addcomma\space
+ {\iftoggle{cms@authorparens}%
+ {\bibopenparen\printnames[sortname]{namea}%
+ \bibcloseparen\addcomma\space}%
+ {\printnames[sortname]{namea}\addcomma\space}%
\savefield{fullhash}{\bbx@lasthash}}%
\usebibmacro{parteditstrg}}}
@@ -254,7 +295,10 @@
{\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
\iffirstonpage}
{\bibnamedash\addcomma\addspace}
- {\printnames[sortname]{translator}\addcomma\space
+ {\iftoggle{cms@authorparens}%
+ {\bibopenparen\printnames[sortname]{translator}%
+ \bibcloseparen\addcomma\space}%
+ {\printnames[sortname]{translator}\addcomma\space}%
\savefield{fullhash}{\bbx@lasthash}}%
\usebibmacro{transstrg}}}
@@ -264,7 +308,10 @@
{\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
\iffirstonpage}
{\bibnamedash\addcomma\addspace}
- {\printnames[sortname]{nameb}\addcomma\space
+ {\iftoggle{cms@authorparens}%
+ {\bibopenparen\printnames[sortname]{nameb}%
+ \bibcloseparen\addcomma\space}%
+ {\printnames[sortname]{nameb}\addcomma\space}%
\savefield{fullhash}{\bbx@lasthash}}%
\usebibmacro{parttransstrg}}}
@@ -274,7 +321,10 @@
{\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
\iffirstonpage}
{\bibnamedash\addcomma\addspace}
- {\printnames[sortname]{namec}\addcomma\space
+ {\iftoggle{cms@authorparens}%
+ {\bibopenparen\printnames[sortname]{namec}%
+ \bibcloseparen\addcomma\space}%
+ {\printnames[sortname]{namec}\addcomma\space}%
\savefield{fullhash}{\bbx@lasthash}}%
\usebibmacro{compilestrg}}}
@@ -296,17 +346,22 @@
\addspace%
\usebibmacro{author/editor}}%
\finentry}%
- {\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}%
@@ -322,7 +377,7 @@
\usebibmacro{language+transtitle}%
\newunit\newblock%
\usebibmacro{bibreprint}%
- \newunit\newblock%
+% \newunit\newblock%
\usebibmacro{issuetitle}%
\setunit*{\addcomma\addspace}%
\usebibmacro{byeditor+others}%
@@ -357,11 +412,11 @@
\usebibmacro{mag+news+title}%
\setunit{\addspace}%
\usebibmacro{language+transtitle}%
- \setunit*{\addcomma\addspace}\newblock%
+ \setunit*{\addperiod\addspace}\newblock% 16th ed.
\usebibmacro{byauthor}%
\newunit\newblock
\usebibmacro{bibreprint}%
- \newunit\newblock
+% \newunit\newblock
\usebibmacro{issuetitle}%
\setunit*{\addcomma\addspace}%
\usebibmacro{byeditor+others}%
@@ -387,22 +442,24 @@
\DeclareBibliographyDriver{artwork}{%
\usebibmacro{bibindex}%
+ \usebibmacro{shorthand:author}%
\usebibmacro{author/editor}%
\setunit{\addspace}%
\printfield{nameaddon}%
\newunit\newblock
+ \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
\usebibmacro{cmsbibsortdate}%
\newunit\newblock
- \usebibmacro{italtitle+stitle}%
+ \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
\newcunit\newblock
\usebibmacro{date}%
- \newcunit
+ \newunit% 16th ed.
\usebibmacro{byauthor}%
\newunit\newblock
\usebibmacro{byeditor+others}%
\newunit\newblock
\usebibmacro{bibreprint}%
- \newunit\newblock
+% \newunit\newblock
\printfield{howpublished}%
\newunit\newblock
\printfield{type}%
@@ -428,14 +485,16 @@
\DeclareBibliographyDriver{audio}{%
\usebibmacro{bibindex}%
+ \usebibmacro{shorthand:author}%
\usebibmacro{author/editor}%
\setunit{\addspace}%
\printfield{nameaddon}%
\newunit\newblock
+ \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
\usebibmacro{cmsbibsortdate}%
\newunit\newblock
- \usebibmacro{italtitle+stitle}%
- \newcunit\newblock
+ \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
+ \newunit\newblock% 16th ed.
\usebibmacro{byauthor}%
\newunit\newblock
\usebibmacro{part+editor+translator}%
@@ -495,10 +554,11 @@
\newunit\newblock
\usebibmacro{ser+num}%
\newunit\newblock
- \usebibmacro{bibreprint}%\printorigdate%
+ \usebibmacro{origpubl+loc+year}% 16th ed.
\newunit\newblock
- \printfield{note}%
+ \printfield{note}% Reversed with bibreprint 16th ed. (?)
\newunit\newblock
+ \usebibmacro{bibreprint}%\printorigdate%
\usebibmacro{publ+loc+year}%
\newunit
\printfield{type}%
@@ -522,13 +582,15 @@
\DeclareBibliographyDriver{book}{%
\usebibmacro{bibindex}%
+ \usebibmacro{shorthand:author}%
\usebibmacro{author/editor}%
\setunit{\addspace}%
\printfield{nameaddon}%
\newunit\newblock
+ \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
\usebibmacro{cmsbibsortdate}%
\newunit\newblock
- \usebibmacro{italtitle+stitle}%
+ \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
\newunit\newblock
\iffieldundef{maintitle}%
{\iffieldundef{edition}%
@@ -543,7 +605,7 @@
\printfield{volumes}%
\clearfield{volumes}}}%
{}%
- \newcunit\newblock
+ \newunit\newblock% 16th ed.
\usebibmacro{byauthor}
\newunit\newblock
\usebibmacro{part+editor+translator}%
@@ -580,10 +642,12 @@
\newunit\newblock
\usebibmacro{ser+num}%
\newunit\newblock
+ \usebibmacro{origpubl+loc+year}% 16th ed.
+ \newunit\newblock
\printfield{note}%
\newunit\newblock
\usebibmacro{bibreprint}%
- \newunit\newblock
+% \setunit*{\addcomma\addspace}\newblock
\usebibmacro{publ+loc+year}%
\newcunit\newblock
\printlist[][-\value{listtotal}]{lista}%
@@ -605,13 +669,15 @@
\DeclareBibliographyDriver{bookinbook}{%
\usebibmacro{bibindex}%
+ \usebibmacro{shorthand:author}%
\usebibmacro{author/editor}%
\setunit{\addspace}%
\printfield{nameaddon}%
\newunit\newblock
+ \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
\usebibmacro{cmsbibsortdate}%
\newunit\newblock
- \usebibmacro{italtitle+stitle}%
+ \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
\newunit\newblock
\ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}%
{\iffieldundef{edition}%
@@ -626,7 +692,7 @@
\printfield{volumes}%
\clearfield{volumes}}}%
{}%
- \newcunit\newblock
+ \newunit\newblock% 16th ed.
\usebibmacro{byauthor}%
\newunit\newblock
\usebibmacro{part+editor+translator}%
@@ -665,10 +731,12 @@
\newunit\newblock
\usebibmacro{ser+num}%
\newunit\newblock
+ \usebibmacro{origpubl+loc+year}% 16th ed.
+ \newunit\newblock
\printfield{note}%
\newunit\newblock
\usebibmacro{bibreprint}%
- \newunit\newblock
+% \newunit\newblock
\usebibmacro{publ+loc+year}%
\newunit\newblock
\usebibmacro{pubstate}%
@@ -688,20 +756,22 @@
\DeclareBibliographyDriver{booklet}{%
\usebibmacro{bibindex}%
+ \usebibmacro{shorthand:author}%
\usebibmacro{author/editor}%
\setunit{\addspace}%
\printfield{nameaddon}%
\newunit\newblock
+ \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
\usebibmacro{cmsbibsortdate}%
\newunit\newblock
- \usebibmacro{italtitle+stitle}%
- \newcunit\newblock
+ \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
+ \newunit\newblock% 16th ed.
\usebibmacro{byauthor}%
\newunit\newblock
\printfield{note}%
\newunit\newblock
\usebibmacro{bibreprint}%
- \newunit\newblock
+% \newunit\newblock
\usebibmacro{howpubl+loc+year}%
\newunit\newblock
\usebibmacro{chap+pag}%
@@ -719,13 +789,15 @@
\DeclareBibliographyDriver{collection}{%
\usebibmacro{bibindex}%
+ \usebibmacro{shorthand:author}%
\usebibmacro{editor}%
\setunit{\addspace}%
\printfield{nameaddon}%
\newunit\newblock
+ \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
\usebibmacro{cmsbibsortdate}%
\newunit\newblock
- \usebibmacro{italtitle+stitle}%
+ \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
\newunit\newblock
\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
\usebibmacro{editorpunct}%
@@ -754,10 +826,12 @@
\newunit\newblock
\usebibmacro{ser+num}%
\newunit\newblock
+ \usebibmacro{origpubl+loc+year}% 16th ed.
+ \newunit\newblock
\printfield{note}%
\newunit\newblock
\usebibmacro{bibreprint}%
- \newunit\newblock
+% \newunit\newblock
\usebibmacro{publ+loc+year}%
\newunit\newblock
\usebibmacro{pubstate}%
@@ -786,22 +860,24 @@
\DeclareBibliographyDriver{image}{%
\usebibmacro{bibindex}%
+ \usebibmacro{shorthand:author}%
\usebibmacro{author/editor}%
\setunit{\addspace}%
\printfield{nameaddon}%
\newunit\newblock
+ \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
\usebibmacro{cmsbibsortdate}%
\newunit\newblock
- \usebibmacro{italtitle+stitle}%
- \setunit{\addcomma\addspace}%
+ \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
+ \setunit*{\addcomma\addspace}% 16th ed. added * (?)
\usebibmacro{date}%
- \newcunit
+ \newunit% 16th ed.
\usebibmacro{byauthor}%
\newunit\newblock
\usebibmacro{byeditor+others}%
\newunit\newblock
\usebibmacro{bibreprint}%
- \newunit\newblock
+% \newunit\newblock
\printfield{howpublished}%
\newunit\newblock
\printfield{type}%
@@ -827,14 +903,16 @@
\DeclareBibliographyDriver{inbook}{%
\usebibmacro{bibindex}%
+ \usebibmacro{shorthand:author}%
\usebibmacro{author/editor}%
\setunit{\addspace}%
\printfield{nameaddon}%
\newunit\newblock
+ \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
\usebibmacro{cmsbibsortdate}%
\newunit\newblock
- \usebibmacro{italtitle+stitle}%
- \setunit{\addcomma\addspace}%
+ \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
+ \setunit{\addperiod\addspace}% 16th ed.
\usebibmacro{byauthor}%
\setunit{\addperiod\addspace}%
\usebibmacro{part+editor+translator}%
@@ -871,10 +949,12 @@
\newunit\newblock
\usebibmacro{ser+num}%
\newunit\newblock
+ \usebibmacro{origpubl+loc+year}% 16th ed.
+ \newunit\newblock
\printfield{note}%
\newunit\newblock
\usebibmacro{bibreprint}%
- \newunit\newblock
+% \newunit\newblock
\usebibmacro{publ+loc+year}%
\newunit\newblock
\usebibmacro{pubstate}%
@@ -894,14 +974,16 @@
\DeclareBibliographyDriver{incollection}{%
\usebibmacro{bibindex}%
+ \usebibmacro{shorthand:author}%
\usebibmacro{author/editor}%
\setunit{\addspace}%
\printfield{nameaddon}%
\newunit\newblock
+ \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
\usebibmacro{cmsbibsortdate}%
\newunit\newblock
- \usebibmacro{italtitle+stitle}% All italtitle now?
- \setunit{\addcomma\addspace}%
+ \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
+ \setunit{\addperiod\addspace}% 16th ed.
\usebibmacro{byauthor}%
\setunit{\addperiod\addspace}%
\usebibmacro{part+editor+translator}%
@@ -940,10 +1022,12 @@
\newunit\newblock
\usebibmacro{ser+num}%
\newunit\newblock
+ \usebibmacro{origpubl+loc+year}% 16th ed.
+ \newunit\newblock
\printfield{note}%
\newunit\newblock
\usebibmacro{bibreprint}%
- \newunit\newblock
+% \newunit\newblock
\usebibmacro{publ+loc+year}%
\newunit\newblock
\usebibmacro{pubstate}%
@@ -971,14 +1055,16 @@
\DeclareBibliographyDriver{inproceedings}{%
\usebibmacro{bibindex}%
+ \usebibmacro{shorthand:author}%
\usebibmacro{author/editor}%
\setunit{\addspace}%
\printfield{nameaddon}%
\newunit\newblock
+ \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
\usebibmacro{cmsbibsortdate}%
\newunit\newblock
- \usebibmacro{italtitle+stitle}%
- \setunit{\addcomma\addspace}%
+ \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
+ \setunit{\addperiod\addspace}% 16th ed.
\usebibmacro{byauthor}%
\setunit{\addperiod\addspace}%
\usebibmacro{part+editor+translator}%
@@ -1005,7 +1091,7 @@
\printfield{note}%
\newunit\newblock
\usebibmacro{bibreprint}%
- \newunit\newblock
+% \newunit\newblock
\usebibmacro{org+publ+loc+year}%
\newunit\newblock
\usebibmacro{pubstate}%
@@ -1085,17 +1171,19 @@
\newunit\newblock
\usebibmacro{ser+num}%
\newunit\newblock
+ \usebibmacro{origpubl+loc+year}% 16th ed.
+ \newunit\newblock
\printfield{note}%
\newunit\newblock
\usebibmacro{bibreprint}%
- \newunit\newblock
+% \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}}}%
@@ -1117,6 +1205,7 @@
\DeclareBibliographyDriver{letter}{%
\usebibmacro{bibindex}%
+ \usebibmacro{shorthand:author}%
\usebibmacro{author/editor}%
\setunit{\addspace}%
\printfield{nameaddon}%
@@ -1171,7 +1260,7 @@
\printfield{note}%
\newunit\newblock
\usebibmacro{bibreprint}%
- \newunit\newblock
+% \newunit\newblock
\usebibmacro{publ+loc+year}%
\newunit\newblock
\usebibmacro{pubstate}%
@@ -1203,16 +1292,18 @@
\DeclareBibliographyDriver{manual}{%
\usebibmacro{bibindex}%
+ \usebibmacro{shorthand:author}%
\usebibmacro{author+org}%
\setunit{\addspace}%
\printfield{nameaddon}%
\newunit\newblock
+ \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
\usebibmacro{cmsbibsortdate}%
\newunit\newblock
- \usebibmacro{italtitle+stitle}%
+ \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
\newunit\newblock
\usebibmacro{edition}%
- \newcunit
+ \newunit% 16th ed.
\usebibmacro{byauthor}%
\newunit\newblock
\usebibmacro{ser+num}%
@@ -1222,7 +1313,7 @@
\printfield{note}%
\newunit\newblock%
\usebibmacro{bibreprint}%
- \newunit\newblock
+% \newunit\newblock
\usebibmacro{org+publ+loc+year}%
\newunit\newblock
\usebibmacro{pubstate}%
@@ -1242,14 +1333,18 @@
\DeclareBibliographyDriver{misc}{%
\usebibmacro{bibindex}%
+ \usebibmacro{shorthand:author}%
\usebibmacro{author/editor}%
\setunit{\addspace}%
\printfield{nameaddon}%
\newunit\newblock
+ \iffieldundef{entrysubtype}%
+ {\ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}}%
+ {}%
\usebibmacro{cmsbibsortdate}%
\newunit\newblock
\iffieldundef{entrysubtype}%
- {\usebibmacro{italtitle+stitle}}%
+ {\ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}}%
{\printfield{title}%
\setunit{\addcolon\addspace}%
\printfield[noformat]{subtitle}%
@@ -1259,13 +1354,13 @@
\usebibmacro{language+transtitle}%
\newcunit\newblock%
\usebibmacro{unpubl+letter+date}}%
- \newcunit%
+ \newunit% 16th ed.
\usebibmacro{byauthor}%
\newunit\newblock
\usebibmacro{byeditor+others}%
\newunit\newblock
\usebibmacro{bibreprint}%
- \newunit\newblock
+% \newunit\newblock
\printfield{howpublished}%
\newunit\newblock
\printfield{type}%
@@ -1295,20 +1390,22 @@
\DeclareBibliographyDriver{music}{%
\usebibmacro{bibindex}%
+ \usebibmacro{shorthand:author}%
\usebibmacro{author/editor}%
\setunit{\addspace}%
\printfield{nameaddon}%
\newunit\newblock
+ \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
\usebibmacro{cmsbibsortdate}%
\newunit\newblock
- \usebibmacro{italtitle+stitle}%
- \newcunit%
+ \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
+ \newunit% 16th ed.
\usebibmacro{byauthor}%
- \setunit*{\addperiod\addspace}%
- \printeventdate%
\newunit\newblock
\usebibmacro{part+editor+translator}%
\newunit\newblock
+ \usebibmacro{music+eventdate}%\printeventdate
+ \newunit\newblock
\usebibmacro{chapinscore}%
\usebibmacro{btitle+bstitle}%
\iffieldundef{booktitle}
@@ -1366,22 +1463,24 @@
\newunit\newblock
\printfield{note}%
\newunit\newblock
- \usebibmacro{music+ser+num}%
- \newunit
- \usebibmacro{music+publisher}%
- \setunit*{\addspace}%\newblock
- \usebibmacro{date}%
- \setunit{\ifthenelse{\iffieldundef{howpublished}\AND%
- \iffieldundef{pubstate}}%
- {\newunit}{\space\bibstring{by}\space}}%
+ \usebibmacro{music+origdate}%\printtext[eventdate]{\printeventdate}%
+ \newunit\newblock
\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 -- origdate instead, as above?
+ \newunit\newblock
\printfield{addendum}%
\setunit*{\addcomma\addspace}\newblock%
\iftoggle{cms@isbn}%
@@ -1397,29 +1496,35 @@
\DeclareBibliographyDriver{online}{%
\usebibmacro{bibindex}%
+ \usebibmacro{shorthand:author}%
\usebibmacro{author/editor}%
\setunit{\addspace}%
\printfield{nameaddon}%
\newunit\newblock
+ \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
\usebibmacro{cmsbibsortdate}%
\newunit\newblock
- \usebibmacro{italtitle+stitle}%
- \newcunit%
+ \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
+ \newunit% 16th ed.
\usebibmacro{byauthor}%
\newunit\newblock
- \printfield{note}%
- \newunit\newblock
\usebibmacro{bibreprint}%
+% \newunit\newblock
+ \printlist{organization}% 16th ed.
\newunit\newblock
- \printlist{organization}%
+ \printfield{note}%
\newunit\newblock
\usebibmacro{date}%
\newunit\newblock
- \iftoggle{cms@doi}%
- {\printfield{doi}}%
+ \ifthenelse{\iffieldundef{urlyear}\AND\iffieldundef{urlmonth}}%
{}%
- \setunit*{\addcomma\addspace}\newblock%
- \usebibmacro{url+date}%
+ {\printtext[urldate]{\printurldate}}%
+ \newunit\newblock
+ \printfield{doi}%
+ \newunit\newblock%
+ \usebibmacro{eprint}%
+ \newunit\newblock
+ \printfield{url}%
\newunit\newblock
\usebibmacro{pubstate}%
\newunit\newblock
@@ -1434,14 +1539,15 @@
\usebibmacro{bibindex}%
\usebibmacro{author+holder}% + holder?
\newunit\newblock
+ \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
\usebibmacro{cmscitesortdate}%
\newunit\newblock
- \usebibmacro{italtitle+stitle}%{title}?
+ \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
\setunit{\addperiod\addspace}%
\printfield{note}%
\setunit{\addperiod\addspace}%
\usebibmacro{bibreprint}%
- \newunit\newblock
+% \newunit\newblock
\printfield{type}%
\setunit{\addspace}%
\printfield{number}%
@@ -1504,11 +1610,11 @@
\usebibmacro{issuetitle}%
\setunit{\addspace}%
\usebibmacro{language+transtitle}%
- \newunit\newblock%
+ \newunit\newblock
\usebibmacro{byeditor+others}%
\newunit\newblock
\usebibmacro{bibreprint}%
- \newunit\newblock
+% \newunit\newblock
\printfield{note}%
\setunit*{\addcomma\addspace}\newblock%
\usebibmacro{periodical+date+issue}%
@@ -1550,13 +1656,13 @@
\usebibmacro{issuetitle}%
\setunit{\addspace}%
\usebibmacro{language+transtitle}%
- \setunit*{\addcomma\addspace}\newblock%
+ \setunit*{\addperiod\addspace}\newblock% 16th ed.
\usebibmacro{byauthor}%
\newunit\newblock
\usebibmacro{byeditor+others}%
\newunit\newblock
\usebibmacro{bibreprint}%
- \newunit\newblock
+% \newunit\newblock
\printfield{note}%
\setunit*{\addcomma\addspace}\newblock% (changed for 0.7)??
\usebibmacro{periodical+issue+year+pages}%
@@ -1578,17 +1684,17 @@
\DeclareBibliographyDriver{proceedings}{%
\usebibmacro{bibindex}%
+ \usebibmacro{shorthand:author}%
\usebibmacro{editor}%
\setunit{\addspace}%
\printfield{nameaddon}%
\newunit\newblock
+ \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
\usebibmacro{cmsbibsortdate}%
\newunit\newblock
- \usebibmacro{italtitle+stitle}%
+ \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
\newunit\newblock
\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
- \usebibmacro{editorpunct}%
- \usebibmacro{bytranslator+others}%
\newunit\newblock
\iffieldundef{maintitle}
{\printfield{volume}%
@@ -1602,7 +1708,7 @@
\printfield{note}%
\newunit\newblock
\usebibmacro{bibreprint}%
- \newunit\newblock
+% \newunit\newblock
\usebibmacro{org+publ+loc+year}%
\newunit\newblock
\usebibmacro{pubstate}%
@@ -1674,10 +1780,12 @@
\newunit\newblock
\usebibmacro{ser+num}%
\newunit\newblock
+ \usebibmacro{origpubl+loc+year}% 16th ed.
+ \newunit\newblock
\printfield{note}%
\newunit\newblock
\usebibmacro{bibreprint}%
- \newunit\newblock
+% \newunit\newblock
\usebibmacro{publ+loc+year}%
\newunit\newblock
\usebibmacro{pubstate}%
@@ -1697,14 +1805,16 @@
\DeclareBibliographyDriver{report}{%
\usebibmacro{bibindex}%
+ \usebibmacro{shorthand:author}%
\usebibmacro{author/editor}%
\setunit{\addspace}%
\printfield{nameaddon}%
\newunit\newblock
+ \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
\usebibmacro{cmsbibsortdate}%
\newunit\newblock
- \usebibmacro{italtitle+stitle}%
- \newcunit
+ \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
+ \newunit% 16th ed.
\usebibmacro{byauthor}%
\newunit\newblock
\usebibmacro{ser+num}%
@@ -1714,7 +1824,7 @@
\printfield{note}%
\newunit\newblock
\usebibmacro{bibreprint}%
- \newunit\newblock
+% \newunit\newblock
\usebibmacro{inst+loc+year}%
\newunit\newblock
\usebibmacro{pubstate}%
@@ -1747,11 +1857,13 @@
\printfield[noformat]{subtitle}%
\setunit{\addspace}%
\printfield{titleaddon}%
+ \newcunit\newblock
+ \usebibmacro{music+eventdate}% 16th ed.
\setunit{\addspace}%
\usebibmacro{language+transtitle}%
\newunit\newblock%
\usebibmacro{bibreprint}%
- \newunit\newblock
+% \newunit\newblock
\usebibmacro{issuetitle}%
\setunit*{\addcomma\addspace}%
\usebibmacro{byeditor+others}%
@@ -1781,15 +1893,25 @@
\DeclareBibliographyDriver{suppbook}{%
\usebibmacro{bibindex}%
+ \usebibmacro{shorthand:author}%
\usebibmacro{author}%
\setunit{\addspace}%
\printfield{nameaddon}%
\newunit\newblock
+ \ifundef\bbx@lasthash{%
+ \usebibmacro{inforaft}%
+ \setunit{\addspace}\newblock
+ \usebibmacro{italtitle+stitle}%
+ \newcunit\newblock
+ \usebibmacro{bybookauthor}%
+ \clearname{bookauthor}
+ \newunit\newblock}{}%
\usebibmacro{cmsbibsortdate}%
\newunit\newblock
+ \ifundef\bbx@lasthash{}{%
\usebibmacro{inforaft}%
\setunit{\addspace}\newblock
- \usebibmacro{italtitle+stitle}%
+ \usebibmacro{italtitle+stitle}}%
\newunit
\iffieldundef{maintitle}%
{\iffieldundef{edition}%
@@ -1806,6 +1928,8 @@
{}%
\newcunit
\usebibmacro{bybookauthor}%
+ \newcunit\newblock
+ \usebibmacro{chap+pag}%
\newunit\newblock
\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
\newcunit%
@@ -1813,33 +1937,33 @@
{}%
{\usebibmacro{edition}%
\newcunit
- \iffieldundef{maintitle}
+ \iffieldundef{maintitle}%
{\printfield{volume}%
\printfield{part}%
\clearfield{volume}%
\clearfield{part}}%
{}%
\newcunit
- \printfield{volumes}
+ \printfield{volumes}%
\clearfield{volumes}}%
\usebibmacro{editorpunct}%
\usebibmacro{byeditor+others}%
- \usebibmacro{editorpunct}%\newcunit\newblock
- \usebibmacro{chap+pag}%
\newunit
- \iffieldundef{maintitle}
+ \iffieldundef{maintitle}%
{\printfield{volume}%
- \printfield{part}}
+ \printfield{part}}%
{}%
\newunit
\printfield{volumes}%
\newunit\newblock
\usebibmacro{ser+num}%
\newunit\newblock
+ \usebibmacro{origpubl+loc+year}% 16th ed.
+ \newunit\newblock
\printfield{note}%
\newunit\newblock
\usebibmacro{bibreprint}%
- \newunit\newblock
+% \newunit\newblock
\usebibmacro{publ+loc+year}%
\newunit\newblock
\usebibmacro{pubstate}%
@@ -1863,20 +1987,22 @@
\DeclareBibliographyDriver{thesis}{%
\usebibmacro{bibindex}%
+ \usebibmacro{shorthand:author}%
\usebibmacro{author/editor}%
\setunit{\addspace}%
\printfield{nameaddon}%
\newunit\newblock
+ \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
\usebibmacro{cmsbibsortdate}%
\newunit\newblock
- \usebibmacro{italtitle+stitle}%
- \newcunit%
+ \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
+ \newunit% 16th ed.
\usebibmacro{byauthor}%
\setunit{\addperiod\addspace}%
\printfield{note}%
\setunit{\addperiod\addspace}\newblock%
\usebibmacro{bibreprint}%
- \newunit\newblock
+% \newunit\newblock
\usebibmacro{type+inst+year}%
\newunit\newblock
\usebibmacro{pubstate}%
@@ -1892,18 +2018,20 @@
\DeclareBibliographyDriver{unpublished}{%
\usebibmacro{bibindex}%
+ \usebibmacro{shorthand:author}%
\usebibmacro{author/editor}%
\setunit{\addspace}%
\printfield{nameaddon}%
\newunit\newblock
+ \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}%
\usebibmacro{cmsbibsortdate}%
\newunit\newblock
- \usebibmacro{italtitle+stitle}%
- \newcunit%usebibmacro{byauthorpunct}% Why does this work? No idea.
- \usebibmacro{byauthor}% Same in thesis type, as well.
+ \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
+ \newunit%usebibmacro{byauthorpunct}% Why does this work? No idea.
+ \usebibmacro{byauthor}% Same in thesis type, as well. 16th ed.
\setunit{\addperiod\addspace}%
\usebibmacro{bibreprint}%
- \newunit\newblock
+% \newunit\newblock
\printfield{howpublished}%
\setunit*{\addcomma\addspace}\newblock%
\printfield{note}%
@@ -1916,9 +2044,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
@@ -1927,23 +2053,37 @@
\DeclareBibliographyDriver{video}{%
\usebibmacro{bibindex}%
+ \usebibmacro{shorthand:author}%
\usebibmacro{author/editor}%
\setunit{\addspace}%
\printfield{nameaddon}%
\newunit\newblock
+ \ifundef\bbx@lasthash{%
+ \printtext[title]{%
+ \printfield[noformat]{title}%
+ \setunit{\addcolon\addspace}%
+ \printfield[noformat]{subtitle}}%
+ \iffieldundef{booktitle}% Comma after italics, period after quotes
+ {\newcunit}
+ {\newunit}%\setunit{\addspace}\newblock%
+ \printfield{titleaddon}%\usebibmacro{title+stitle}%
+ \setunit{\addspace}\newblock%\bibsentence
+ \usebibmacro{language+transtitle}
+ \newunit\newblock}{}%
\usebibmacro{cmsbibsortdate}%
\newunit\newblock
- \printtext{%
- \printfield{title}%
+ \ifundef\bbx@lasthash{}{%
+ \printtext[title]{%
+ \printfield[noformat]{title}%
\setunit{\addcolon\addspace}%
- \printfield[title]{subtitle}}%
+ \printfield[noformat]{subtitle}}%
\iffieldundef{booktitle}% Comma after italics, period after quotes
{\newcunit}
{\newunit}%\setunit{\addspace}\newblock%
\printfield{titleaddon}%\usebibmacro{title+stitle}%
\setunit{\addspace}\newblock%\bibsentence
- \usebibmacro{language+transtitle}%
- \setunit{\addcomma\addspace}%
+ \usebibmacro{language+transtitle}}%
+ \setunit{\addperiod\addspace}% 16th ed.
\usebibmacro{byauthor}%
\setunit{\addperiod\addspace}%
\usebibmacro{part+editor+translator}%
@@ -1966,8 +2106,6 @@
\newcunit
\printfield{volumes}
\clearfield{volumes}}%
- \newunit
- \printfield{type}%
\newunit% unit, not cunit?
\usebibmacro{bybookauthor}%
\usebibmacro{byeditor+others}%
@@ -2005,10 +2143,16 @@
\newunit\newblock
\usebibmacro{ser+num}%
\newunit\newblock
+ \usebibmacro{music+eventdate}%
+ \newunit\newblock
+ \usebibmacro{origpubl+loc+year}% 16th ed.
+ \newunit\newblock
\printfield{note}%
\newunit\newblock
\usebibmacro{publ+loc+year}%
\newunit\newblock
+ \printfield{type}%
+ \newunit\newblock
\usebibmacro{pubstate}%
\newunit\newblock
\printfield{addendum}%
@@ -2026,23 +2170,59 @@
%%%% Other Formatting Macros %%%%
-\newbibmacro*{bib+doi+url}{% For biblatex field exclusion
+\newbibmacro*{bib+doi+url}{% 16th ed.
+ \ifthenelse{\iffieldundef{urlyear}\AND\iffieldundef{urlmonth}}%
+ {}%
+ {\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*{shorthand:author}{%
+ \ifboolexpr{
+ test {\iffieldundef{shorthand}}%
+ or
+ not togl {cms@los}%
+ }%
+ {\togglefalse{cms@authorparens}}%
+ {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
+ \iffirstonpage}%
+ {\togglefalse{cms@authorparens}}%
+ {\toggletrue{cms@authorparens}%
+ \printfield{shorthand}\addspace}}}
\newbibmacro*{shorthand:label}{% Test this
- \iffieldequalstr{entrysubtype}{magazine}% Simplifies .bib creation
+ \ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT%
+ \iffieldequalstr{entrytype}{periodical}}% Simplifies .bib creation
{\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}}}%
{\iffieldequalstr{entrytype}{manual}%
{\printtext[bibhyperref]{\printlist{organization}}}%
{\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}}}%
\newbibmacro*{labelyear+extrayear}{%
+ \ifboolexpr{ (
+ test {\iffieldequalstr{entrytype}{music}}%
+ or
+ test {\iffieldequalstr{entrytype}{review}}%
+ or
+ test {\iffieldequalstr{entrytype}{video}}%
+ )
+ and
+ togl {cms@avdate}
+ }%
+ {\usebibmacro{av+labelyear+extrayear}}%
+ {\usebibmacro{standard+labelyear+extrayear}}}
+
+\newbibmacro*{standard+labelyear+extrayear}{%
\iffieldundef{labelyear}%
{\ifboolexpr{
test {\iffieldequalstr{entrytype}{misc}}
@@ -2069,7 +2249,9 @@
\clearfield{urlyear}}%
{\iffieldundef{urlmonth}%
{\clearfield{urlyear}}%
- {}}}}%
+ {\iffieldsequal{urlyear}{urlendyear}%
+ {\clearfield{urlyear}\clearfield{urlendyear}}%
+ {}}}}}%
{\printfield{labelyear}%
\iffieldundef{extrayear}%
{}%
@@ -2082,7 +2264,9 @@
\clearfield{origyear}}%
{\iffieldundef{origmonth}%
{\clearfield{origyear}}%
- {}}}}}%
+ {\iffieldsequal{origyear}{origendyear}%
+ {\clearfield{origyear}\clearfield{origendyear}}%
+ {}}}}}}%
{\printfield{labelyear}%
\iffieldundef{extrayear}%
{}%
@@ -2095,7 +2279,9 @@
\clearfield{eventyear}}%
{\iffieldundef{eventmonth}%
{\clearfield{eventyear}}%
- {}}}}}%
+ {\iffieldsequal{eventyear}{evendendyear}%
+ {\clearfield{eventyear}\clearfield{eventendyear}}%
+ {}}}}}}%
{\printfield{labelyear}%
\iffieldundef{extrayear}%
{}%
@@ -2108,7 +2294,85 @@
\clearfield{year}}%
{\iffieldundef{month}%
{\clearfield{year}}%
- {}}}}}}%
+ {\iffieldsequal{year}{endyear}%
+ {\clearfield{year}\clearfield{endyear}}%
+ {}}}}}}}
+
+\newbibmacro*{av+labelyear+extrayear}{%
+ \iffieldundef{labelyear}%
+ {\ifboolexpr{
+ test {\iffieldequalstr{entrytype}{misc}}
+ or
+ test {\iffieldequalstr{entrytype}{inreference}}
+ or
+ test {\iffieldequalstr{entrytype}{reference}}
+ or
+ not togl {cms@nodates}}%
+ {}%
+ {\bibstring{nodate}}}%
+ {\iffieldundef{eventyear}%
+ {\iffieldundef{origyear}
+ {\iffieldundef{year}%
+ {\printfield{labelyear}%
+ \iffieldundef{extrayear}%
+ {}%
+ {\setunit*{}%
+ \printfield{extrayear}}%
+ \iffieldundef{urlendyear}%
+ {\clearfield{urlyear}}%
+ {\iffieldequalstr{urlendyear}{}%
+ {\mbox{\bibdatedash}%
+ \clearfield{urlyear}}%
+ {\iffieldundef{urlmonth}%
+ {\clearfield{urlyear}}%
+ {\iffieldsequal{urlyear}{urlendyear}%
+ {\clearfield{urlyear}\clearfield{urlendyear}}%
+ {}}}}}%
+ {\printfield{labelyear}%
+ \iffieldundef{extrayear}%
+ {}%
+ {\setunit*{}%
+ \printfield{extrayear}}%
+ \iffieldundef{endyear}%
+ {\clearfield{year}}%
+ {\iffieldequalstr{endyear}{}%
+ {\mbox{\bibdatedash}%
+ \clearfield{year}}%
+ {\iffieldundef{month}%
+ {\clearfield{year}}%
+ {\iffieldsequal{year}{endyear}%
+ {\clearfield{year}\clearfield{endyear}}%
+ {}}}}}}%
+ {\printfield{labelyear}%
+ \iffieldundef{extrayear}%
+ {}%
+ {\setunit*{}%
+ \printfield{extrayear}}%
+ \iffieldundef{origendyear}%
+ {\clearfield{origyear}}%
+ {\iffieldequalstr{origendyear}{}%
+ {\mbox{\bibdatedash}%
+ \clearfield{origyear}}%
+ {\iffieldundef{origmonth}%
+ {\clearfield{origyear}}%
+ {\iffieldsequal{origyear}{origendyear}%
+ {\clearfield{origyear}\clearfield{origendyear}}%
+ {}}}}}}%
+ {\printfield{labelyear}%
+ \iffieldundef{extrayear}%
+ {}%
+ {\setunit*{}%
+ \printfield{extrayear}}%
+ \iffieldundef{eventendyear}% DATE FIX
+ {\clearfield{eventyear}}%
+ {\iffieldequalstr{eventendyear}{}%
+ {\mbox{\bibdatedash}%
+ \clearfield{eventyear}}%
+ {\iffieldundef{eventmonth}%
+ {\clearfield{eventyear}}%
+ {\iffieldsequal{eventyear}{eventendyear}%
+ {\clearfield{eventyear}\clearfield{eventendyear}}%
+ {}}}}}}}
\newbibmacro*{cmsbibsortdate}{% Attempt to solve date-related problems
\ifboolexpr{%
@@ -2137,7 +2401,7 @@
\iftoggle{cms@origlabel}%
{\usebibmacro{origyear+labelyear}}%
{\iftoggle{cms@bothlabelnew}%
- {\usebibmacro{bothyear+newstyle}}%
+ {\usebibmacro{bothyear+oldstyle}}%
{\iftoggle{cms@bothlabelold}%
{\usebibmacro{bothyear+oldstyle}}%
{\usebibmacro{labelyear+extrayear}}}}%
@@ -2148,65 +2412,29 @@
\newbibmacro*{origyear+labelyear}{%
\iftoggle{cms@switchdates}%
{\usebibmacro{labelyear+extrayear}%
- \iffieldundef{endyear}% DATE FIX
- {\clearfield{year}}%
- {}}%
+ \clearfield{year}}%
{\iffieldundef{origyear}
{\usebibmacro{labelyear+extrayear}}%
{\printtext{%
\printfield{origyear}}%
- \iffieldundef{origendyear}% DATE FIX
- {\clearfield{origyear}}%
- {}}}}
-
-\newbibmacro*{bothyear+newstyle}{%
- \iftoggle{cms@switchdates}%
- {\usebibmacro{labelyear+extrayear}\addslash%
- \setunit{}% Need * here?
- \printfield{origyear}%
- \iffieldundef{endyear}% DATE FIX
- {\clearfield{year}}%
- {}%
- \iffieldundef{origendyear}% DATE FIX
- {\clearfield{origyear}}%
- {}}%
- {\iffieldundef{origyear}%
- {\usebibmacro{labelyear+extrayear}}%
- {\printtext{% Why?
- \printfield{origyear}\addslash%
- \setunit*{}%
- \printfield{labelyear}}%
- \iffieldundef{origendyear}% DATE FIX
- {\clearfield{origyear}}%
- {}%
- \iffieldundef{endyear}% DATE FIX
- {\clearfield{year}}%
- {}}}}
+ \clearfield{origyear}}}}
\newbibmacro*{bothyear+oldstyle}{%
\iftoggle{cms@switchdates}%
{\printtext{%
- \bibopenbracket%
+ \bibopenparen%
\usebibmacro{labelyear+extrayear}%
- \bibclosebracket%
+ \bibcloseparen%
\setunit{\addspace}\printfield{origyear}}%
- \iffieldundef{endyear}% DATE FIX
- {\clearfield{year}}%
- {}%
- \iffieldundef{origendyear}% DATE FIX
- {\clearfield{origyear}}%
- {}}%
+ \clearfield{year}%
+ \clearfield{origyear}}%
{\iffieldundef{origyear}
{\usebibmacro{labelyear+extrayear}}%
{\printtext{%
- \printfield[brackets]{origyear}%
+ \printfield[parens]{origyear}%
\setunit*{\addspace}\printfield{labelyear}}%
- \iffieldundef{origendyear}% DATE FIX
- {\clearfield{origyear}}%
- {}%
- \iffieldundef{endyear}% DATE FIX
- {\clearfield{year}}%
- {}}}}
+ \clearfield{origyear}%
+ \clearfield{year}}}}
\newbibmacro*{pubstate}{%
\iftoggle{cms@reprint}%
@@ -2214,24 +2442,23 @@
{}
{\iffieldundef{origyear}%
{}
- {\printtext[parens]{%
+ {\printtext{% 16th ed.
\usebibmacro{choosepubstring}%
\printorigdate\addperiod}\nopunct}}}%
{\printfield{pubstate}}}
\newbibmacro*{choosepubstring}{%
- \iffieldequalstr{entrytype}{video}%
- {\iffieldequalstr{entrysubtype}{tv}%
- {\bibstring{origshownyear}}%
- {\bibstring{origreleaseyear}}}%
- {\bibstring{origpubyear}}}%
+ \ifthenelse{\iffieldequalstr{entrytype}{video}\OR%
+ \iffieldequalstr{entrytype}{music}}%
+ {\bibstring{origreleaseyear}}%
+ {\bibstring{origpubyearalt}}}%
\newbibmacro*{bibreprint}{%
\iftoggle{cms@reprint}%
{\iffieldundef{origyear}%
- {\bibstring{reprint}}%
+ {\bibstring{reprint}\newcunit}% 16th ed.
{\iftoggle{cms@switchdates}%
- {\bibstring{reprint}}%
+ {\bibstring{reprint}\newcunit}% 16th ed.
{}}}%
{}}
@@ -2336,7 +2563,7 @@
\newbibmacro*{bycompiler}{%
\ifnameundef{namec}
{}
- {\bibstring{cbycompiler}\addspace
+ {\bibstring{bycompiler}\addspace
\printnames[bycompiler]{namec}}}
\renewbibmacro*{byeditor}{%
@@ -2372,7 +2599,7 @@
\ifthenelse{\NOT\ifnameundef{editor}\AND
\(\iffieldundef{editortype}\OR
\iffieldequalstr{editortype}{editor}\)}
- {\def\@tempa{cbyeditor}%
+ {\def\@tempa{byeditor}%
\ifnamesequal{editor}{translator}
{\edef\@tempa{\@tempa tr}%
\clearname{translator}}
@@ -2410,7 +2637,7 @@
\renewbibmacro*{bytranslator+others}{%
\ifnameundef{translator}
{}
- {\def\@tempa{cbytranslator}%
+ {\def\@tempa{bytranslator}%
\ifnamesequal{translator}{namec}
{\edef\@tempa{\@tempa cp}%
\clearname{namec}}
@@ -2441,7 +2668,7 @@
\newbibmacro*{bycompiler+others}{%
\ifnameundef{namec}
{}
- {\def\@tempa{cbycompiler}%
+ {\def\@tempa{bycompiler}%
\ifnamesequal{namec}{commentator}
{\edef\@tempa{\@tempa co}%
\clearname{commentator}}