diff options
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.bbx | 364 |
1 files changed, 220 insertions, 144 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 f4287702598..30fecc564fb 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx @@ -2,7 +2,7 @@ % Lehman's standard.bbx and from chicago-notes.bbx. It provides the % reference list formatting for the Chicago author-date style. -\ProvidesFile{chicago-authordate.bbx}[2021/06/30 v 3.16 biblatex +\ProvidesFile{chicago-authordate.bbx}[2022/07/02 v 3.18 biblatex bibliography style] %%%% Initialize and format bibliography and los %%%% @@ -611,7 +611,7 @@ bibliography style] {\@firstoftwo}% {\@secondoftwo}}% -\renewcommand*{\revsdnamedelim}{\addcomma} +\DeclareDelimFormat{revsdnamedelim}{\finalandcomma}% \DeclareNameAlias{author}{sortname}% Needed in 0.9 \DeclareNameAlias{editor}{sortname} @@ -649,10 +649,9 @@ bibliography style] {\ifnameundef{labelname}% {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT% \ifentrytype{periodical}}% - {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}% - \newcunit}}% + {\printfield[journaltitle]{journaltitle}\newcunit}% {\ifthenelse{\ifentrytype{manual}\OR\ifentrytype{standard}}% - {\printtext[bibhyperref]{\printlist{organization}\newcunit}}% + {\printlist{organization}\newcunit}% {}}}% {\ifboolexpr{% test {\iffieldequalstr{labelnamesource}{shortauthor}}% @@ -671,18 +670,26 @@ bibliography style] \finentry}}} \DeclareBibliographyDriver{shortjournal}{% - \iffieldundef{journaltitle}% - {\printtext[title]{% - \printfield[tnoformat]{title}% - \setunit{\subtitlepunct}% - \printfield[stnoformat]{subtitle}}% - \setunit*{\addspace}% + \ifentrytype{periodical}% + {\iffieldundef{title}% + {\printfield{titleaddon}}% + {\printtext[title]{% + \printfield[tnoformat]{title}% + \setunit{\subtitlepunct}% + \printfield[stnoformat]{subtitle}}% + \setunit{\jtitleaddonpunct}% + \printfield{titleaddon}}% + \setunit{\addspace}% \printlist[periodplace]{location}}% - {\printtext[journaltitle]{% - \printfield[jtnoformat]{journaltitle}% - \setunit{\subtitlepunct}% - \printfield[sjtnoformat]{journalsubtitle}}% - \setunit*{\addspace}% + {\iffieldundef{journaltitle}% + {\printfield{journaltitleaddon}}% + {\printtext[journaltitle]{% + \printfield[jtnoformat]{journaltitle}% + \setunit{\subtitlepunct}% + \printfield[sjtnoformat]{journalsubtitle}}% + \setunit{\jtitleaddonpunct}% + \printfield{journaltitleaddon}}% + \setunit{\addspace}% \printlist[periodplace]{location}}% \finentry}% @@ -900,6 +907,7 @@ bibliography style] \iffieldequalstr{entrysubtype}{magazine}% {\usebibmacro{bibindex}% \usebibmacro{begentry}% + \usebibmacro{shorthand:author}% \usebibmacro{mag+news+author}% \newunit\newblock \usebibmacro{cmsbibsortdate}% @@ -950,6 +958,7 @@ bibliography style] \usebibmacro{finentry}} {\usebibmacro{bibindex}% \usebibmacro{begentry}% + \usebibmacro{shorthand:author}% \usebibmacro{author/editor}% \newunit\newblock \ifundef{\bbx@lasthash}{\usebibmacro{mag+news+title}\newunit}{}% @@ -1005,7 +1014,7 @@ bibliography style] \usebibmacro{author/editor}% \newunit\newblock \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}% - \usebibmacro{cmscitesortdate}% 17th ed. ?? + \usebibmacro{cmsbibsortdate}[1]% 17th ed. ?? \newunit\newblock \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}% \newunit\newblock @@ -1056,7 +1065,11 @@ bibliography style] \ifboolexpr{% test {\ifundef{\bbx@lasthash}}% and + ( not test {\iffieldundef{title}}% + or + not test {\iffieldundef{titleaddon}}% + ) }% {\usebibmacro{italtitle+stitle}}{}% \usebibmacro{cmsbibsortdate}% @@ -1064,7 +1077,11 @@ bibliography style] \ifboolexpr{% test {\ifundef{\bbx@lasthash}}% or + ( test {\iffieldundef{title}}% + and + test {\iffieldundef{titleaddon}}% + ) }% {}{\usebibmacro{italtitle+stitle}}% \newunit\newblock% 16th ed. @@ -1073,7 +1090,8 @@ bibliography style] \usebibmacro{part+editor+translator}% \newunit\newblock \usebibmacro{music+eventdate}% 17th ed. - \iffieldundef{eventyear}% + \ifthenelse{\iffieldundef{eventyear}\AND\NOT% + \(\iffieldundef{title}\AND\iffieldundef{titleaddon}\)}% {\newcunit}% {\newunit}% \usebibmacro{chapinscore}% @@ -1604,7 +1622,7 @@ bibliography style] \usebibmacro{author/editor}% \newunit\newblock \ifundef\bbx@lasthash{\usebibmacro{italtitle+stitle}}{}% - \usebibmacro{cmscitesortdate}% + \usebibmacro{cmsbibsortdate}[1]% \newunit\newblock \ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}% \newunit\newblock% 16th ed. added * (?) @@ -2685,7 +2703,11 @@ bibliography style] \ifboolexpr{% test {\ifundef{\bbx@lasthash}}% and + ( not test {\iffieldundef{title}}% + or + not test {\iffieldundef{titleaddon}}% + ) }% {\usebibmacro{italtitle+stitle}}{}% \usebibmacro{cmsbibsortdate}% @@ -2693,7 +2715,11 @@ bibliography style] \ifboolexpr{% test {\ifundef{\bbx@lasthash}}% or + ( test {\iffieldundef{title}}% + and + test {\iffieldundef{titleaddon}}% + ) }% {}{\usebibmacro{italtitle+stitle}}% \newunit% 16th ed. @@ -2840,9 +2866,9 @@ bibliography style] \usebibmacro{time+stamp}% \iftoggle{cms@switchdates}% {\clearfield{orighour}\clearfield{origyear}\clearfield{origmonth}% - \clearfield{origday}\clearfield{origseason}}% + \clearfield{origday}\clearfield{origyeardivision}}% {\clearfield{hour}\clearfield{year}\clearfield{month}% - \clearfield{day}\clearfield{season}}% + \clearfield{day}\clearfield{yeardivision}}% \newunit\newblock}% \usebibmacro{related:init}% \usebibmacro{related}}% @@ -2864,7 +2890,15 @@ bibliography style] \newunit\newblock \printfield{addendum}% \newunit\newblock - \ifthenelse{\iffieldundef{urlyear}\AND\iffieldundef{urlmonth}}% + \ifboolexpr{% + ( + test {\iffieldundef{urlyear}}% + and + test {\iffieldundef{urlmonth}}% + ) + or + togl {cms@doinodate}% + }% {}% {\printurldate% \ifboolexpr{% @@ -2905,10 +2939,11 @@ bibliography style] \DeclareBibliographyDriver{patent}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% + \usebibmacro{shorthand:author}% \usebibmacro{author+holder}% + holder? \newunit\newblock \ifundef\bbx@lasthash{\usebibmacro{patenttitle+stitle}}{}% - \usebibmacro{cmscitesortdate}% + \usebibmacro{cmsbibsortdate}[1]% \newunit\newblock \ifundef\bbx@lasthash{}{\usebibmacro{patenttitle+stitle}}% \setunit{\newunitpunct}% @@ -3013,6 +3048,7 @@ bibliography style] \iffieldequalstr{entrysubtype}{magazine}% {\usebibmacro{bibindex}% \usebibmacro{begentry}% + \usebibmacro{shorthand:author}% \usebibmacro{editor}% \newunit\newblock \ifboolexpr{% @@ -3021,25 +3057,37 @@ bibliography style] not togl {cms@origpublished}% }% {\ifboolexpr{% + not test {\iffieldundef{shorttitle}}% + and + (( togl {cms@bibjtabb}% and test {\ifbibliography}% + ) + or + ( + test {\iffieldundef{title}}% and - not test {\iffieldundef{shorttitle}}% + test {\iffieldundef{titleaddon}}% + )) }% {\clearlist{location}\printtext[shorttitle]{% \printfield[tnoformat]{shorttitle}}}% - {\printtext[title]{% - \printfield[tnoformat]{title}% - \setunit{\subtitlepunct}% - \printfield[stnoformat]{subtitle}}}% - \setunit*{\addspace}% - \printlist[periodplace]{location}% - \clearlist{location}% - \clearfield{shorttitle}% - \clearfield{title}% - \clearfield{subtitle}% - \newunit\newblock}{}% + {\iffieldundef{title}% + {\printfield{titleaddon}}% + {\printtext[title]{% + \printfield[tnoformat]{title}% + \setunit{\subtitlepunct}% + \printfield[stnoformat]{subtitle}}% + \setunit{\jtitleaddonpunct}% + \printfield{titleaddon}}}% + \setunit{\addspace}% + \printlist[periodplace]{location}% + \clearlist{location}% + \clearfield{shorttitle}% + \clearfield{title}% + \clearfield{subtitle}% + \newunit\newblock}{}% \usebibmacro{cmsbibsortdate}% \newunit\newblock \usebibmacro{issuetitle}% @@ -3076,6 +3124,7 @@ bibliography style] \usebibmacro{finentry}} {\usebibmacro{bibindex}% \usebibmacro{begentry}% + \usebibmacro{shorthand:author}% \usebibmacro{editor}% \newunit\newblock \ifboolexpr{% @@ -3084,25 +3133,37 @@ bibliography style] not togl {cms@origpublished}% }% {\ifboolexpr{% + not test {\iffieldundef{shorttitle}}% + and + (( togl {cms@bibjtabb}% and test {\ifbibliography}% + ) + or + ( + test {\iffieldundef{title}}% and - not test {\iffieldundef{shorttitle}}% + test {\iffieldundef{titleaddon}}% + )) }% {\clearlist{location}\printtext[shorttitle]{% \printfield[tnoformat]{shorttitle}}}% - {\printtext[title]{% - \printfield[tnoformat]{title}% - \setunit{\subtitlepunct}% - \printfield[stnoformat]{subtitle}}}% - \setunit*{\addspace}% - \printlist[periodplace]{location}% - \clearlist{location}% - \clearfield{shorttitle}% - \clearfield{title}% - \clearfield{subtitle}% - \newunit\newblock}{}% + {\iffieldundef{title}% + {\printfield{titleaddon}}% + {\printtext[title]{% + \printfield[tnoformat]{title}% + \setunit{\subtitlepunct}% + \printfield[stnoformat]{subtitle}}% + \setunit{\jtitleaddonpunct}% + \printfield{titleaddon}}}% + \setunit*{\addspace}% + \printlist[periodplace]{location}% + \clearlist{location}% + \clearfield{shorttitle}% + \clearfield{title}% + \clearfield{subtitle}% + \newunit\newblock}{}% \usebibmacro{cmsbibsortdate}% \newunit\newblock \usebibmacro{issuetitle}% @@ -3347,6 +3408,7 @@ bibliography style] \DeclareBibliographyDriver{review}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% + \usebibmacro{shorthand:author}% \iffieldequalstr{entrysubtype}{magazine}% {\usebibmacro{mag+news+author}}% {\usebibmacro{author/editor}}% @@ -3472,7 +3534,7 @@ bibliography style] \ifundef{\bbx@lasthash}{\usebibmacro{italtitle+stitle}}{}% \ifthenelse{\iffieldundef{userd}\AND\iffieldundef{howpublished}}% {\usebibmacro{cmsbibsortdate}}% - {\usebibmacro{cmscitesortdate}}% Like Patent entries (?) + {\usebibmacro{cmsbibsortdate}[1]}% Like Patent entries (?) \newunit\newblock \ifundef{\bbx@lasthash}{}% {\usebibmacro{italtitle+stitle}}% @@ -3811,7 +3873,9 @@ bibliography style] and test {\iffieldundef{urlmonth}}% ) - }% + or + togl {cms@doinodate}% + }% {}% {\printurldate% \ifboolexpr{% @@ -3882,10 +3946,15 @@ bibliography style] \newbibmacro*{shorthand:label}{% Test this \ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT% \ifentrytype{periodical}}% Simplifies .bib creation - {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}}}% + {\printfield[journaltitle]{journaltitle}}% {\ifthenelse{\ifentrytype{manual}\OR\ifentrytype{standard}}% - {\printtext[bibhyperref]{\printlist{organization}}}% - {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}}}% + {\printlist{organization}}% + {\ifthenelse{\ifentrytype{article}\OR\ifentrytype{review}\OR% + \ifentrytype{suppperiodical}}% + {\iffieldundef{shorttitle}% Authorless articles w/o subtype + {\printfield[citetitle]{title}}% + {\printfield[citetitle]{shorttitle}}}% + {\printfield[citetitle]{labeltitle}}}}}% \newbibmacro*{labelyear+extrayear}{% \ifboolexpr{ ( @@ -4017,13 +4086,47 @@ bibliography style] \newbibmacro*{cmsextradate}{% For use with some date specs \iffieldundef{extradate}% - {}% + {\ifboolexpr{% For authorless articles in newspapers & magazines + not test {\iffieldundef{extratitleyear}}% + and + ( + test {\ifentrytype{article}}% + or + test {\ifentrytype{review}}% + or + test {\ifentrytype{suppperiodical}}% + ) + and + test {\iffieldequalstr{entrysubtype}{magazine}}% + and + test {\ifnameundef{labelname}}% + }% + {\setunit*{}% + \printfield{extratitleyear}\clearfield{extratitleyear}}% + {}}% {\setunit*{}% \printfield{extradate}\clearfield{extradate}}} \newbibmacro*{cmsparensextradate}{% For use with other date specs \iffieldundef{extradate}% - {}% + {\ifboolexpr{% For authorless articles in newspapers & magazines + not test {\iffieldundef{extratitleyear}}% + and + ( + test {\ifentrytype{article}}% + or + test {\ifentrytype{review}}% + or + test {\ifentrytype{suppperiodical}}% + ) + and + test {\iffieldequalstr{entrysubtype}{magazine}}% + and + test {\ifnameundef{labelname}}% + }% + {\setunit*{}% + \mkbibparens{\printfield{extratitleyear}}\clearfield{extratitleyear}}% + {}}% {\setunit*{}% \mkbibparens{\printfield{extradate}}\clearfield{extradate}}} @@ -4164,9 +4267,9 @@ bibliography style] \newrobustcmd*{\cms@mkbibrangetrunc}[2]{% DATE FIX \begingroup \blx@metadateinfo{#2}% - \clearfield{extradate}% + \clearfield{extradate}\clearfield{extratitleyear}% \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}\AND% - \iffieldundef{#2season}}% + \iffieldundef{#2yeardivision}}% {}% {\printtext[#2date]{% \if@cms@bracket% @@ -4175,7 +4278,7 @@ bibliography style] {\bibsstring{circa}\printdelim{datecircadelim}}% {}}% {\global\boolfalse{cms:bracket}}% - \iffieldundef{#2season}% + \iffieldundef{#2yeardivision}% {\ifdateyearsequal{#2}{#2end}% {\iffieldsequal{#2month}{#2endmonth}% {\csuse{mkbibdate#1}{}{}{#2day}}% @@ -4185,12 +4288,12 @@ bibliography style] {\csuse{mkbibdate#1}{}{#2month}{#2day}}}}% {\cmsunspecified{#1}{#2}}}% {\ifdateyearsequal{#2}{#2end}% - {\ifthenelse{\iffieldundef{#2endseason}\OR% - \iffieldsequal{#2season}{#2endseason}}% - {\csuse{mkbibseasondate#1}{#2year}{#2season}% + {\ifthenelse{\iffieldundef{#2endyeardivision}\OR% + \iffieldsequal{#2yeardivision}{#2endyeardivision}}% + {\csuse{mkbibyeardivisiondate#1}{#2year}{#2yeardivision}% \cmsdateeraprint{#2endyear}\clearfield{#2endyear}}% - {\csuse{mkbibseasondate#1}{}{#2season}}}% - {\csuse{mkbibseasondate#1}{#2year}{#2season}% + {\csuse{mkbibyeardivisiondate#1}{}{#2yeardivision}}}% + {\csuse{mkbibyeardivisiondate#1}{#2year}{#2yeardivision}% \cmsdateeraprint{#2year}}}% \if@cms@bracket% {\if@cms@uncertain% @@ -4207,13 +4310,13 @@ bibliography style] {}% \iffieldundef{#2endyear}% {\iffieldundef{#2endmonth}% - {\ifthenelse{\iffieldundef{#2endseason}\OR% - \iffieldsequal{#2season}{#2endseason}}% + {\ifthenelse{\iffieldundef{#2endyeardivision}\OR% + \iffieldsequal{#2yeardivision}{#2endyeardivision}}% {\ifbool{cms:bracket}% {\bibclosebracket\global\boolfalse{cms:bracket}}% {}}% {\bibdaterangesep% - \csuse{mkbibseasondate#1}{}{#2endseason}}}% + \csuse{mkbibyeardivisiondate#1}{}{#2endyeardivision}}}% {\bibdaterangesep% \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}}}% {\iffieldequalstr{#2endyear}{}% @@ -4242,13 +4345,13 @@ bibliography style] {\bibsstring{circa}\printdelim{datecircadelim}}}% {}}% {\bibdaterangesep}}%\bibdatedash% - \iffieldundef{#2endseason}% + \iffieldundef{#2endyeardivision}% {\ifdateyearsequal{#2}{#2end}% {\csuse{mkbibdate#1}{#2year}{#2endmonth}{#2endday}}% {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}% {\ifdateyearsequal{#2}{#2end}% - {\csuse{mkbibseasondate#1}{#2year}{#2endseason}}% - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}}% + {\csuse{mkbibyeardivisiondate#1}{#2year}{#2endyeardivision}}% + {\csuse{mkbibyeardivisiondate#1}{#2endyear}{#2endyeardivision}}}% \ifbool{cms:bracket}% {\if@cms@bracket% {\cmsdateeraprint{#2endyear}% @@ -4264,9 +4367,9 @@ bibliography style] \newrobustcmd*{\cms@mkbibrangefull}[2]{% \begingroup \blx@metadateinfo{#2}% - \clearfield{extradate}% + \clearfield{extradate}\clearfield{extratitleyear}% \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}\AND% - \iffieldundef{#2season}}% + \iffieldundef{#2yeardivision}}% {}% {\printtext[#2date]{% \if@cms@bracket% @@ -4275,7 +4378,7 @@ bibliography style] {\bibsstring{circa}\printdelim{datecircadelim}} {}}% {\global\boolfalse{cms:bracket}}% - \iffieldundef{#2season}% + \iffieldundef{#2yeardivision}% {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}% \ifboolexpr{% test {\ifdateyearsequal{#2}{#2end}}% @@ -4286,7 +4389,7 @@ bibliography style] }% {\cmsdateeraprint{#2endyear}\clearfield{#2endyear}}% {\cmsdateeraprint{#2year}}}% - {\csuse{mkbibseasondate#1}{#2year}{#2season}% + {\csuse{mkbibyeardivisiondate#1}{#2year}{#2yeardivision}% \cmsdateeraprint{#2year}}% \if@cms@bracket% {\if@cms@uncertain% @@ -4302,7 +4405,7 @@ bibliography style] {}}}% {}% \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}% - \AND\iffieldundef{#2endseason}}% + \AND\iffieldundef{#2endyeardivision}}% {\ifbool{cms:bracket}% {\bibclosebracket\global\boolfalse{cms:bracket}}% {}}% @@ -4332,9 +4435,9 @@ bibliography style] {\bibsstring{circa}\printdelim{datecircadelim}}}% {}}% {\bibdaterangesep}}%\bibdaterangesep% - \iffieldundef{#2endseason}% + \iffieldundef{#2endyeardivision}% {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}% - {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}% + {\csuse{mkbibyeardivisiondate#1}{#2endyear}{#2endyeardivision}}% \ifbool{cms:bracket}% {\if@cms@bracket% {\cmsdateeraprint{#2endyear}% @@ -4351,7 +4454,8 @@ bibliography style] \global\boolfalse{cms:extraparens}% \begingroup \clearfield{#3month}\clearfield{#3day}\clearfield{#3endmonth}% - \clearfield{#3endday}\clearfield{#3season}\clearfield{#3endseason}% + \clearfield{#3endday}\clearfield{#3yeardivision}% + \clearfield{#3endyeardivision}% \blx@metadateinfo{#3}% \iffieldundef{#3year} {\blx@nounit}% @@ -4543,25 +4647,14 @@ bibliography style] \newbibmacro*{standard+labelyear+extrayear}{% \ifthenelse{\iffieldundef{labelyear}\OR% \iffieldequalstr{labelyear}{nodate}}% or new declaration ??? - {\ifboolexpr{% - test {\ifentrytype{misc}}% - or - test {\ifentrytype{dataset}}% - or - not togl {cms@nodates}}% - {}% - {\bibstring{nodate}}}% + {\iftoggle{cms@nodates}% + {\bibstring{nodate}}% + {}}% {\iffieldundef{year}% {\iffieldundef{eventyear}% {\iffieldundef{origyear}% {\iffieldundef{userd}% - {\ifboolexpr{% - togl {cms@nodates}% - and - not test {\ifentrytype{misc}}% - and - not test {\ifentrytype{dataset}}% - }% + {\iftoggle{cms@nodates}% {\bibstring{nodate}}% {}}% {\printurldateextra% @@ -4576,25 +4669,14 @@ bibliography style] \newbibmacro*{origfirst+labelyear+extrayear}{% \ifthenelse{\iffieldundef{labelyear}\OR% \iffieldequalstr{labelyear}{nodate}}% - {\ifboolexpr{% - test {\ifentrytype{misc}}% - or - test {\ifentrytype{dataset}}% - or - not togl {cms@nodates}}% - {}% - {\bibstring{nodate}}}% + {\iftoggle{cms@nodates}% + {\bibstring{nodate}}% + {}}% {\iffieldundef{origyear}% {\iffieldundef{year}% {\iffieldundef{eventyear}% {\iffieldundef{userd}% - {\ifboolexpr{% - togl {cms@nodates}% - and - not test {\ifentrytype{misc}}% - and - not test {\ifentrytype{dataset}}% - }% + {\iftoggle{cms@nodates}% {\bibstring{nodate}}% {}}% {\printurldateextra% @@ -4609,25 +4691,14 @@ bibliography style] \newbibmacro*{av+labelyear+extrayear}{% \ifthenelse{\iffieldundef{labelyear}\OR% \iffieldequalstr{labelyear}{nodate}}% - {\ifboolexpr{% - test {\ifentrytype{misc}}% - or - test {\ifentrytype{dataset}}% - or - not togl {cms@nodates}}% - {}% - {\bibstring{nodate}}}% + {\iftoggle{cms@nodates}% + {\bibstring{nodate}}% + {}}% {\iffieldundef{eventyear}% {\iffieldundef{origyear}% {\iffieldundef{year}% {\iffieldundef{userd}% - {\ifboolexpr{% - togl {cms@nodates}% - and - not test {\ifentrytype{misc}}% - and - not test {\ifentrytype{dataset}}% - }% + {\iftoggle{cms@nodates}% {\bibstring{nodate}}% {}}% {\printurldateextra% @@ -4644,7 +4715,8 @@ bibliography style] {\IfBeginWith{\thefield{labeldatesource}}{orig}% {\iftoggle{cms@switchdates}% {\printdate\newunit\printorigdate}% - {\ifthenelse{\iffieldundef{origmonth}\AND\iffieldundef{origseason}}% + {\ifthenelse{\iffieldundef{origmonth}\AND% + \iffieldundef{origyeardivision}}% {\iffieldundef{year}{}{\printdate}}% {\printorigdate% \iffieldundef{year}% @@ -4652,7 +4724,7 @@ bibliography style] {\newunit\printdate}}}}% {\IfBeginWith{\thefield{labeldatesource}}{event}% {}% - {\ifthenelse{\iffieldundef{month}\AND\iffieldundef{season}}% + {\ifthenelse{\iffieldundef{month}\AND\iffieldundef{yeardivision}}% {}{\printdate}}}}% {\ifboolexpr{% togl {cms@origlabel}% @@ -4662,18 +4734,19 @@ bibliography style] togl {cms@bothlabelnew}% }% {\iftoggle{cms@switchdates}% - {\ifthenelse{\iffieldundef{month}\AND\iffieldundef{season}}% + {\ifthenelse{\iffieldundef{month}\AND\iffieldundef{yeardivision}}% {\printorigdate}% {\printdate\newunit\printorigdate}}% - {\ifthenelse{\iffieldundef{origmonth}\AND\iffieldundef{origseason}}% + {\ifthenelse{\iffieldundef{origmonth}\AND% + \iffieldundef{origyeardivision}}% {\printdate}% {\printorigdate\newunit\printdate}}}% {\iftoggle{cms@switchdates}% - {\ifthenelse{\iffieldundef{month}\AND\iffieldundef{season}}% + {\ifthenelse{\iffieldundef{month}\AND\iffieldundef{yeardivision}}% {\printorigdate}% {\printdate\newunit\printorigdate}}% {\iffieldundef{origyear}% - {\ifthenelse{\iffieldundef{month}\AND\iffieldundef{season}}% + {\ifthenelse{\iffieldundef{month}\AND\iffieldundef{yeardivision}}% {}% {\printdate}}% {\printorigdate% @@ -4682,17 +4755,20 @@ bibliography style] {\newunit\printdate}}}}}} \newbibmacro*{clear+datefield}[1]{% - \iffieldundef{#1day}% - {\iffieldundef{#1endyear}% - {\clearfield{#1year}}% - {\ifthenelse{\iffieldundef{#1month}\AND\iffieldundef{#1season}}% + \iftoggle{cms@leaveit}% + {}% + {\iffieldundef{#1day}% + {\iffieldundef{#1endyear}% {\clearfield{#1year}}% - {\ifdateyearsequal{#1}{#1end}% - {\clearfield{#1year}\clearfield{#1endyear}}% - {}}}}% - {}} + {\ifthenelse{\iffieldundef{#1month}\AND\iffieldundef{#1yeardivision}}% + {\clearfield{#1year}}% + {\ifdateyearsequal{#1}{#1end}% + {\clearfield{#1year}\clearfield{#1endyear}}% + {}}}}% + {}}} -\newbibmacro*{cmsbibsortdate}{% Attempt to solve date-related problems +\newbibmacro*{cmsbibsortdate}[1][]{% Attempt to solve date-related problems + \ifblank{#1}{\togglefalse{cms@leaveit}}{\toggletrue{cms@leaveit}}% \ifboolexpr{% test {\iffieldundef{origyear}}% or @@ -4748,11 +4824,11 @@ bibliography style] {\iffieldundef{origyear}% {\iftoggle{cms@ordate}% ??? {}% - {\clearfield{extradate}}% + {\clearfield{extradate}\clearfield{extratitleyear}}% \usebibmacro{standard+labelyear+extrayear}}% {\iftoggle{cms@ordate}% {\usebibmacro{origfirst+labelyear+extrayear}}% - {\clearfield{extradate}% + {\clearfield{extradate}\clearfield{extratitleyear}% \printorigdateextra%\usebibmacro{origyear+endyear}% \usebibmacro{clear+datefield}{orig}}}}}}% @@ -4785,7 +4861,7 @@ bibliography style] {\iffieldundef{origyear}% {\iftoggle{cms@ordate}% {}% - {\clearfield{extradate}}% + {\clearfield{extradate}\clearfield{extratitleyear}}% \usebibmacro{standard+labelyear+extrayear}}% {\iftoggle{cms@ordate}% ??? {\iffieldundef{year}% @@ -4795,13 +4871,13 @@ bibliography style] \usebibmacro{origfirst+labelyear+extrayear}% \bibcloseparen% \setunit*{\addspace}% - \clearfield{extradate}% + \clearfield{extradate}\clearfield{extratitleyear}% \printdateextra}}}% \usebibmacro{year+endyear} {\iffieldundef{year}% {\usebibmacro{origfirst+labelyear+extrayear}}% {\printtext{% \bibopenparen% - \clearfield{extradate}% + \clearfield{extradate}\clearfield{extratitleyear}% \printorigdateextra% % \usebibmacro{origyear+endyear}% \bibcloseparen% @@ -5053,7 +5129,7 @@ bibliography style] \printfield[jourser]{series}% \newcunit}%\setunit*{\addspace}? \ifthenelse{\iffieldundef{#1year}\AND\iffieldundef{#1month}\AND% - \iffieldundef{issue}\AND\iffieldundef{#1season}}% + \iffieldundef{issue}\AND\iffieldundef{#1yeardivision}}% {\iffieldundef{volume}% {\newcunit% \printfield[journum]{number}% @@ -5081,7 +5157,7 @@ bibliography style] \setunit{\addspace}% \ifthenelse{\iffieldundef{issue}\AND\iffieldundef{#1month}% \AND\iffieldundef{number}\AND\iffieldundef{#1year}\AND% - \iffieldundef{#1season}}% Test year for related entries?? + \iffieldundef{#1yeardivision}}% Test year for related entries?? {\ifthenelse{\iffieldundef{bookpagination}\AND% \iffieldundef{eid}\AND\NOT\iffieldundef{volume}}% {\setunit{\postvolpunct}}% @@ -5108,7 +5184,7 @@ bibliography style] \setunit{\addspace}% \ifthenelse{\iffieldundef{issue}\AND\iffieldundef{#1month}% \AND\iffieldundef{number}\AND\iffieldundef{#1year}\AND% - \iffieldundef{#1season}}% See prev. macro + \iffieldundef{#1yeardivision}}% See prev. macro {\ifthenelse{\iffieldundef{bookpagination}\AND% \iffieldundef{eid}\AND\NOT\iffieldundef{volume}}% {\setunit{\postvolpunct}}% |