summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx117
1 files changed, 74 insertions, 43 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
index 4e4bf9b2293..9222c66e9c1 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
@@ -2,7 +2,7 @@
% Lehman's standard.bbx. It provides the bibliography formatting for
% the Chicago notes + bibliography style.
-\ProvidesFile{chicago-notes.bbx}[2021/06/30 v 3.16 biblatex bibliography style]
+\ProvidesFile{chicago-notes.bbx}[2022/07/02 v 3.18 biblatex bibliography style]
%%%% Initialize and format bibliography and los %%%%
@@ -636,7 +636,7 @@
{\iffieldequals{fullhash}\blx@lasthash@text}}%
{\@secondoftwo}}
-\renewcommand*{\revsdnamedelim}{\addcomma}
+\DeclareDelimFormat{revsdnamedelim}{\finalandcomma}%
\DeclareNameAlias{author}{sortname}% Needed in 0.9
\DeclareNameAlias{editor}{sortname}
@@ -678,18 +678,26 @@
\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}%
@@ -966,6 +974,18 @@
\step[fieldsource=booktitle, final]
\step[fieldset=sorttitle, origfieldval]
}
+ \map[overwrite]{
+ \step[fieldsource=entrysubtype, match=classical, final]
+ \step[fieldsource=shortauthor, final]
+ \step[fieldsource=options, notmatch=\regexp{useibid}, final]
+ \step[fieldset=options, fieldvalue=\regexp{,useibid=false}, append]
+ }
+ \map{
+ \step[fieldsource=entrysubtype, match=classical, final]
+ \step[fieldsource=shortauthor, final]
+ \step[notfield=options, final]
+ \step[fieldset=options, fieldvalue=\regexp{useibid=false}]
+ }
}
}%
@@ -1115,14 +1135,16 @@
\usebibmacro{begentry}%
\usebibmacro{author/editor}%
\newunit\newblock
- \usebibmacro{italtitle+stitle}%
+ \ifthenelse{\iffieldundef{title}\AND\iffieldundef{titleaddon}}{}%
+ {\usebibmacro{italtitle+stitle}}%
\newunit\newblock% 16th ed.
\usebibmacro{byauthor}%
\newunit\newblock
\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}%
@@ -1565,7 +1587,7 @@
\setunit*{\addcomma\addspace}\newblock%
\usebibmacro{bib+doi+url}%
\newunit\newblock
- \usebibmacro{pageref}%!!!\printlist{pageref}::\strlist{pageref}%
+ \usebibmacro{pageref}%
\newunit\newblock
\ifboolexpr{%
togl {cms@related}%
@@ -2527,7 +2549,8 @@
\usebibmacro{begentry}%
\usebibmacro{author/editor}%
\newunit\newblock
- \usebibmacro{italtitle+stitle}%
+ \ifthenelse{\iffieldundef{title}\AND\iffieldundef{titleaddon}}{}%
+ {\usebibmacro{italtitle+stitle}}%
\newunit% 16th ed.
\usebibmacro{byauthor}%
\newunit\newblock
@@ -3113,7 +3136,11 @@
\newunit\newblock
\printfield{addendum}%
\newunit\newblock
- \iffieldundef{urlyear}%
+ \ifboolexpr{%
+ test {\iffieldundef{urlyear}}%
+ or
+ togl {cms@doinodate}%
+ }%
{}%
{\printurldate%
\ifboolexpr{%
@@ -3881,10 +3908,11 @@
\usebibmacro{part+editor+translator}}%
{\usebibmacro{author/editor}%
\newunit\newblock
- \printtext[title]{%
- \printfield[noformat]{title}%
- \setunit{\subtitlepunct}%
- \printfield[noformat]{subtitle}}%
+ \iffieldundef{title}{}%
+ {\printtext[title]{%
+ \printfield[noformat]{title}%
+ \setunit{\subtitlepunct}%
+ \printfield[noformat]{subtitle}}}%
\iffieldundef{booktitle}% Comma after italics, period after quotes
{\setunit{\ctitleaddonpunct}}%
{\setunit{\ptitleaddonpunct}}%\setunit{\addspace}\newblock%
@@ -3975,6 +4003,8 @@
togl {cms@url}%
and
not test {\iffieldundef{urlyear}}%
+ and
+ not togl {cms@doinodate}%
}%
{\printurldate%
\ifboolexpr{%
@@ -4342,7 +4372,7 @@
\usebibmacro{editorpunct}%
\usebibmacro{withafterword}}
-%%%% New date macros enabling special handling of seasons, decades,
+%%%% New date macros enabling special handling of yeardivisions, decades,
%%%% centuries, date eras, and uncertain dates (circa and ?), along
%%%% with CMS compression of year ranges.
@@ -4585,7 +4615,7 @@
\blx@metadateinfo{#2}%
\clearfield{extradate}%
\ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}\AND%
- \iffieldundef{#2season}}%
+ \iffieldundef{#2yeardivision}}%
{}%
{\printtext[#2date]{%
\if@cms@bracket%
@@ -4594,7 +4624,7 @@
{\bibsstring{circa}\printdelim{datecircadelim}}%
{}}%
{\global\boolfalse{cms:bracket}}%
- \iffieldundef{#2season}%
+ \iffieldundef{#2yeardivision}%
{\ifdateyearsequal{#2}{#2end}%
{\iffieldsequal{#2month}{#2endmonth}%
{\csuse{mkbibdate#1}{}{}{#2day}}%
@@ -4604,12 +4634,12 @@
{\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%
@@ -4626,13 +4656,13 @@
{}%
\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}{}%
@@ -4661,13 +4691,13 @@
{\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}%
@@ -4685,7 +4715,7 @@
\blx@metadateinfo{#2}%
\clearfield{extradate}%
\ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}\AND%
- \iffieldundef{#2season}}%
+ \iffieldundef{#2yeardivision}}%
{}%
{\printtext[#2date]{%
\if@cms@bracket%
@@ -4694,7 +4724,7 @@
{\bibsstring{circa}\printdelim{datecircadelim}}
{}}%
{\global\boolfalse{cms:bracket}}%
- \iffieldundef{#2season}%
+ \iffieldundef{#2yeardivision}%
{\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
\ifboolexpr{%
test {\ifdateyearsequal{#2}{#2end}}%
@@ -4705,7 +4735,7 @@
}%
{\cmsdateeraprint{#2endyear}\clearfield{#2endyear}}%
{\cmsdateeraprint{#2year}}}%
- {\csuse{mkbibseasondate#1}{#2year}{#2season}%
+ {\csuse{mkbibyeardivisiondate#1}{#2year}{#2yeardivision}%
\cmsdateeraprint{#2year}}%
\if@cms@bracket%
{\if@cms@uncertain%
@@ -4721,7 +4751,7 @@
{}}}%
{}%
\ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}%
- \AND\iffieldundef{#2endseason}}%
+ \AND\iffieldundef{#2endyeardivision}}%
{\ifbool{cms:bracket}%
{\bibclosebracket\global\boolfalse{cms:bracket}}%
{}}%
@@ -4751,9 +4781,9 @@
{\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}%
@@ -4769,7 +4799,8 @@
\newrobustcmd*{\cms@mkyearrangeextra}[3][]{%
\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}%