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.bbx685
1 files changed, 506 insertions, 179 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 6d3cfe411a8..c60c053a134 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
@@ -1,10 +1,10 @@
-% $Id: chicago-authordate.bbx,v 0.8.1.29 2013/03/13 19:05:02 dfussner Exp $
+% $Id: chicago-authordate.bbx,v 0.8.1.49 2013/10/29 14:04:23 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.
-\ProvidesFile{chicago-authordate.bbx}[2013/03/12 v 2.5 biblatex
+\ProvidesFile{chicago-authordate.bbx}[2013/10/29 v 2.8 biblatex
bibliography style]
%%%% Initialize and format bibliography and los %%%%
@@ -222,10 +222,10 @@ bibliography style]
\savefield{fullhash}{\bbx@lasthash}}}}}}
\newbibmacro*{moreauthor}{%
- \ifnameundef{author}
- {\usebibmacro{pickeditor}}
- {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT
- \iffirstonpage}
+ \ifnameundef{author}%
+ {\usebibmacro{pickeditor}}%
+ {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT%
+ \iffirstonpage}%
{\iffieldundef{nameaddon}%
{\bibnamedash\addperiod\addspace}%
{\bibnamedash\addspace}}%
@@ -352,10 +352,10 @@ bibliography style]
\finentry}%
{\ifnameundef{labelname}
{\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT%
- \iffieldequalstr{entrytype}{periodical}}%
+ \ifentrytype{periodical}}%
{\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}%
\newcunit}}%
- {\iffieldequalstr{entrytype}{manual}%
+ {\ifentrytype{manual}%
{\printtext[bibhyperref]{\printlist{organization}\newcunit}}%
{}}}
{\usebibmacro{author/editor}%
@@ -379,7 +379,6 @@ bibliography style]
\usebibmacro{part+editor+translator}%
\newunit\newblock%
\usebibmacro{bibreprint}%
-% \newunit\newblock%
\usebibmacro{issuetitle}%
\setunit*{\addcomma\addspace}%
\usebibmacro{byeditor+others}%
@@ -421,7 +420,6 @@ bibliography style]
\usebibmacro{part+editor+translator}%
\newunit\newblock%
\usebibmacro{bibreprint}%
-% \newunit\newblock
\usebibmacro{issuetitle}%
\setunit*{\addcomma\addspace}%
\usebibmacro{byeditor+others}%
@@ -464,7 +462,6 @@ bibliography style]
\usebibmacro{byeditor+others}%
\newunit\newblock
\usebibmacro{bibreprint}%
-% \newunit\newblock
\printfield{howpublished}%
\newunit\newblock
\printfield{type}%
@@ -518,7 +515,7 @@ bibliography style]
\newunit% ??? Editorpunct maybe not right here?
\iffieldundef{maintitle}
{}
- {\iffieldundef{volume}
+ {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
{\usebibmacro{cms-in:}%
\printtext{%
\printfield{maintitle}%
@@ -590,7 +587,17 @@ bibliography style]
\newunit\newblock
\usebibmacro{part+editor+translator}%
\newunit\newblock
- \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+ \ifboolexpr{%
+ test {\iffieldundef{crossref}}%
+ or
+ togl {cms@bookcrossref}%
+ }%
+ {\ifboolexpr{%
+ test {\iffieldundef{xref}}%
+ or
+ togl {cms@bookcrossref}%
+ }%
+ {\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
\newcunit
\iffieldundef{edition}%
{}%
@@ -612,7 +619,6 @@ bibliography style]
\printfield{note}%
\newunit\newblock
\usebibmacro{bibreprint}%
-% \setunit*{\addcomma\addspace}\newblock
\usebibmacro{publ+loc+year}%
\newcunit\newblock
\printlist[][-\value{listtotal}]{lista}%
@@ -630,7 +636,15 @@ bibliography style]
\usebibmacro{pageref}%
\newunit\newblock
\usebibmacro{originally+published+as}%
- \usebibmacro{finentry}}
+ \usebibmacro{finentry}}%
+{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+ \bibxrefcite{\thefield{xref}}
+ \usebibmacro{bibpostxref}%
+ \usebibmacro{finentry}}}%
+{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+ \bibxrefcite{\thefield{crossref}}%
+ \usebibmacro{bibpostxref}%
+ \usebibmacro{finentry}}}
\DeclareBibliographyDriver{bookinbook}{%
\usebibmacro{bibindex}%
@@ -654,8 +668,17 @@ bibliography style]
\newunit\newblock
\usebibmacro{part+editor+translator}%
\setunit*{\addperiod\addspace}%
- \usebibmacro{cms-in:}%
- \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
+ \ifboolexpr{%
+ test {\iffieldundef{crossref}}%
+ or
+ togl {cms@bookcrossref}%
+ }%
+ {\ifboolexpr{%
+ test {\iffieldundef{xref}}%
+ or
+ togl {cms@bookcrossref}%
+ }%
+ {\usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
\newcunit
\iffieldundef{edition}%
{}%
@@ -676,7 +699,6 @@ bibliography style]
\printfield{note}%
\newunit\newblock
\usebibmacro{bibreprint}%
-% \newunit\newblock
\usebibmacro{publ+loc+year}%
\newunit\newblock
\usebibmacro{pubstate}%
@@ -692,7 +714,15 @@ bibliography style]
\usebibmacro{pageref}%
\newunit\newblock
\usebibmacro{originally+published+as}%
- \usebibmacro{finentry}}
+ \usebibmacro{finentry}}%
+{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+ \bibxrefcite{\thefield{xref}}
+ \usebibmacro{bibpostxref}%
+ \usebibmacro{finentry}}}%
+{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+ \bibxrefcite{\thefield{crossref}}%
+ \usebibmacro{bibpostxref}%
+ \usebibmacro{finentry}}}
\DeclareBibliographyDriver{booklet}{%
\usebibmacro{bibindex}%
@@ -711,7 +741,6 @@ bibliography style]
\printfield{note}%
\newunit\newblock
\usebibmacro{bibreprint}%
-% \newunit\newblock
\usebibmacro{howpubl+loc+year}%
\newunit\newblock
\usebibmacro{chap+pag}%
@@ -739,7 +768,17 @@ bibliography style]
\newunit\newblock
\ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
\newunit\newblock
- \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+ \ifboolexpr{%
+ test {\iffieldundef{crossref}}%
+ or
+ togl {cms@bookcrossref}%
+ }%
+ {\ifboolexpr{%
+ test {\iffieldundef{xref}}%
+ or
+ togl {cms@bookcrossref}%
+ }%
+ {\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
\usebibmacro{editorpunct}%
\iffieldundef{edition}%
{}%
@@ -756,7 +795,6 @@ bibliography style]
\printfield{note}%
\newunit\newblock
\usebibmacro{bibreprint}%
-% \newunit\newblock
\usebibmacro{publ+loc+year}%
\newunit\newblock
\usebibmacro{pubstate}%
@@ -772,7 +810,15 @@ bibliography style]
\usebibmacro{pageref}%
\newunit\newblock
\usebibmacro{originally+published+as}%
- \usebibmacro{finentry}}
+ \usebibmacro{finentry}}%
+{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+ \bibxrefcite{\thefield{xref}}
+ \usebibmacro{bibpostxref}%
+ \usebibmacro{finentry}}}%
+{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+ \bibxrefcite{\thefield{crossref}}%
+ \usebibmacro{bibpostxref}%
+ \usebibmacro{finentry}}}
\DeclareBibliographyDriver{customc}{%
\usebibmacro{bibindex}%
@@ -802,7 +848,6 @@ bibliography style]
\usebibmacro{byeditor+others}%
\newunit\newblock
\usebibmacro{bibreprint}%
-% \newunit\newblock
\printfield{howpublished}%
\newunit\newblock
\printfield{type}%
@@ -841,9 +886,18 @@ bibliography style]
\usebibmacro{byauthor}%
\setunit{\addperiod\addspace}%
\usebibmacro{part+editor+translator}%
- \setunit{\addperiod\addspace}%
+ \ifboolexpr{
+ test {\iffieldundef{crossref}}%
+ or
+ togl {cms@crossref}%
+ }
+ {\ifboolexpr{
+ test {\iffieldundef{xref}}%
+ or
+ togl {cms@crossref}%
+ }
+ {\setunit{\addperiod\addspace}%
\usebibmacro{chapincoll}%
- \usebibmacro{cms-in:}%
\usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
\newcunit
\iffieldundef{edition}%
@@ -862,7 +916,6 @@ bibliography style]
\printfield{note}%
\newunit\newblock
\usebibmacro{bibreprint}%
-% \newunit\newblock
\usebibmacro{publ+loc+year}%
\newunit\newblock
\usebibmacro{pubstate}%
@@ -879,6 +932,14 @@ bibliography style]
\newunit\newblock
\usebibmacro{originally+published+as}%
\usebibmacro{finentry}}%
+{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+ \bibxrefcite{\thefield{xref}}
+ \usebibmacro{bibpostxref}%
+ \usebibmacro{finentry}}}%
+{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+ \bibxrefcite{\thefield{crossref}}%
+ \usebibmacro{bibpostxref}%
+ \usebibmacro{finentry}}}
\DeclareBibliographyDriver{incollection}{%
\usebibmacro{bibindex}%
@@ -895,11 +956,18 @@ bibliography style]
\usebibmacro{byauthor}%
\setunit{\addperiod\addspace}%
\usebibmacro{part+editor+translator}%
- \iffieldundef{crossref}%
- {\iffieldundef{xref}%
+ \ifboolexpr{
+ test {\iffieldundef{crossref}}%
+ or
+ togl {cms@crossref}%
+ }
+ {\ifboolexpr{
+ test {\iffieldundef{xref}}%
+ or
+ togl {cms@crossref}%
+ }
{\setunit{\addperiod\addspace}% Moved here.
\usebibmacro{chapincoll}%
- \usebibmacro{cms-in:}%
\usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
\newcunit
\iffieldundef{edition}%
@@ -918,7 +986,6 @@ bibliography style]
\printfield{note}%
\newunit\newblock
\usebibmacro{bibreprint}%
-% \newunit\newblock
\usebibmacro{publ+loc+year}%
\newunit\newblock
\usebibmacro{pubstate}%
@@ -959,11 +1026,18 @@ bibliography style]
\usebibmacro{byauthor}%
\setunit{\addperiod\addspace}%
\usebibmacro{part+editor+translator}%
- \iffieldundef{crossref}%
- {\iffieldundef{xref}%
+ \ifboolexpr{
+ test {\iffieldundef{crossref}}%
+ or
+ togl {cms@crossref}%
+ }
+ {\ifboolexpr{
+ test {\iffieldundef{xref}}%
+ or
+ togl {cms@crossref}%
+ }
{\setunit{\addperiod\addspace}%
\usebibmacro{chapincoll}%
- \usebibmacro{cms-in:}%
\usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
\newcunit\newblock
\usebibmacro{byeditor+others}%
@@ -975,7 +1049,6 @@ bibliography style]
\printfield{note}%
\newunit\newblock
\usebibmacro{bibreprint}%
-% \newunit\newblock
\usebibmacro{org+publ+loc+year}%
\newunit\newblock
\usebibmacro{pubstate}%
@@ -1015,7 +1088,6 @@ bibliography style]
\newunit\newblock
\usebibmacro{part+editor+translator}%
\setunit*{\addperiod\addspace}% need asterisk?
- \usebibmacro{alt-in:}%
\usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
\newcunit
\iffieldundef{edition}%
@@ -1037,7 +1109,6 @@ bibliography style]
\printfield{note}%
\newunit\newblock
\usebibmacro{bibreprint}%
-% \newunit\newblock
\usebibmacro{publ+loc+year}%
\newcunit\newblock
\printlist[][-\value{listtotal}]{lista}%
@@ -1084,10 +1155,17 @@ bibliography style]
\newunit\newblock%\bibsentence
\usebibmacro{part+editor+translator}%
\setunit*{\addperiod\addspace}%
- \iffieldundef{crossref}%
- {\iffieldundef{xref}%
+ \ifboolexpr{
+ test {\iffieldundef{crossref}}%
+ or
+ togl {cms@crossref}%
+ }
+ {\ifboolexpr{
+ test {\iffieldundef{xref}}%
+ or
+ togl {cms@crossref}%
+ }
{\usebibmacro{chapincoll}%
- \usebibmacro{cms-in:}%
\usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
\newcunit
\iffieldundef{edition}%
@@ -1104,7 +1182,6 @@ bibliography style]
\printfield{note}%
\newunit\newblock
\usebibmacro{bibreprint}%
-% \newunit\newblock
\usebibmacro{publ+loc+year}%
\newunit\newblock
\usebibmacro{pubstate}%
@@ -1157,7 +1234,6 @@ bibliography style]
\printfield{note}%
\newunit\newblock%
\usebibmacro{bibreprint}%
-% \newunit\newblock
\usebibmacro{org+publ+loc+year}%
\newunit\newblock
\usebibmacro{pubstate}%
@@ -1204,7 +1280,6 @@ bibliography style]
\usebibmacro{byeditor+others}%
\newunit\newblock
\usebibmacro{bibreprint}%
-% \newunit\newblock
\printfield{howpublished}%
\newunit\newblock
\printfield{type}%
@@ -1264,7 +1339,7 @@ bibliography style]
\newunit% ??? Editorpunct maybe not right here?
\iffieldundef{maintitle}
{}
- {\iffieldundef{volume}
+ {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
{\usebibmacro{cms-in:}%
\printtext{%
\printfield{maintitle}%
@@ -1321,6 +1396,14 @@ bibliography style]
\usebibmacro{originally+published+as}%
\usebibmacro{finentry}}
+\DeclareBibliographyAlias{mvbook}{book}
+
+\DeclareBibliographyAlias{mvcollection}{collection}
+
+\DeclareBibliographyAlias{mvproceedings}{proceedings}
+
+\DeclareBibliographyAlias{mvreference}{reference}
+
\DeclareBibliographyDriver{online}{%
\usebibmacro{bibindex}%
\usebibmacro{shorthand:author}%
@@ -1336,7 +1419,6 @@ bibliography style]
\usebibmacro{byauthor}%
\newunit\newblock
\usebibmacro{bibreprint}%
-% \newunit\newblock
\printlist{organization}% 16th ed.
\newunit\newblock
\printfield{note}%
@@ -1379,7 +1461,6 @@ bibliography style]
\printfield{note}%
\setunit{\addperiod\addspace}%
\usebibmacro{bibreprint}%
-% \newunit\newblock
\printfield{type}%
\setunit{\addspace}%
\printfield{number}%
@@ -1446,7 +1527,6 @@ bibliography style]
\usebibmacro{byeditor+others}%
\newunit\newblock
\usebibmacro{bibreprint}%
-% \newunit\newblock
\printfield{note}%
\setunit*{\addcomma\addspace}\newblock%
\usebibmacro{periodical+date+issue}%
@@ -1494,7 +1574,6 @@ bibliography style]
\usebibmacro{byeditor+others}%
\newunit\newblock
\usebibmacro{bibreprint}%
-% \newunit\newblock
\printfield{note}%
\setunit*{\addcomma\addspace}\newblock% (changed for 0.7)??
\usebibmacro{periodical+issue+year+pages}%
@@ -1526,7 +1605,17 @@ bibliography style]
\newunit\newblock
\ifundef\bbx@lasthash{}{\usebibmacro{italtitle+stitle}}%
\newunit\newblock
- \usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
+ \ifboolexpr{%
+ test {\iffieldundef{crossref}}%
+ or
+ togl {cms@bookcrossref}%
+ }%
+ {\ifboolexpr{%
+ test {\iffieldundef{xref}}%
+ or
+ togl {cms@bookcrossref}%
+ }%
+ {\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
\newunit\newblock
\usebibmacro{volume+or+volumes}%
\newunit\newblock
@@ -1535,7 +1624,6 @@ bibliography style]
\printfield{note}%
\newunit\newblock
\usebibmacro{bibreprint}%
-% \newunit\newblock
\usebibmacro{org+publ+loc+year}%
\newunit\newblock
\usebibmacro{pubstate}%
@@ -1551,7 +1639,15 @@ bibliography style]
\usebibmacro{pageref}%
\newunit\newblock
\usebibmacro{originally+published+as}%
- \usebibmacro{finentry}}
+ \usebibmacro{finentry}}%
+{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+ \bibxrefcite{\thefield{xref}}
+ \usebibmacro{bibpostxref}%
+ \usebibmacro{finentry}}}%
+{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+ \bibxrefcite{\thefield{crossref}}%
+ \usebibmacro{bibpostxref}%
+ \usebibmacro{finentry}}}
\DeclareBibliographyDriver{reference}{%
\usebibmacro{bibindex}%
@@ -1567,7 +1663,6 @@ bibliography style]
\newunit\newblock
\usebibmacro{part+editor+translator}%
\setunit*{\addperiod\addspace}% need asterisk?
- \usebibmacro{alt-in:}%
\usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
\newcunit
\iffieldundef{edition}%
@@ -1589,7 +1684,6 @@ bibliography style]
\printfield{note}%
\newunit\newblock
\usebibmacro{bibreprint}%
-% \newunit\newblock
\usebibmacro{publ+loc+year}%
\newunit\newblock
\usebibmacro{pubstate}%
@@ -1630,7 +1724,6 @@ bibliography style]
\printfield{note}%
\newunit\newblock
\usebibmacro{bibreprint}%
-% \newunit\newblock
\usebibmacro{inst+loc+year}%
\newunit\newblock
\usebibmacro{pubstate}%
@@ -1679,7 +1772,6 @@ bibliography style]
\usebibmacro{part+editor+translator}%
\newunit\newblock%
\usebibmacro{bibreprint}%
-% \newunit\newblock
\usebibmacro{issuetitle}%
\setunit*{\addcomma\addspace}%
\usebibmacro{byeditor+others}%
@@ -1756,7 +1848,6 @@ bibliography style]
\printfield{note}%
\newunit\newblock
\usebibmacro{bibreprint}%
-% \newunit\newblock
\usebibmacro{publ+loc+year}%
\newunit\newblock
\usebibmacro{pubstate}%
@@ -1795,7 +1886,6 @@ bibliography style]
\printfield{note}%
\setunit{\addperiod\addspace}\newblock%
\usebibmacro{bibreprint}%
-% \newunit\newblock
\usebibmacro{type+inst+year}%
\newunit\newblock
\usebibmacro{pubstate}%
@@ -1823,8 +1913,9 @@ bibliography style]
\newunit%usebibmacro{byauthorpunct}% Why does this work? No idea.
\usebibmacro{byauthor}% Same in thesis type, as well. 16th ed.
\setunit{\addperiod\addspace}%
+ \usebibmacro{byeditor+others}% Fix bug ???
+ \newunit\newblock
\usebibmacro{bibreprint}%
-% \newunit\newblock
\printfield{howpublished}%
\setunit*{\addcomma\addspace}\newblock%
\printfield{note}%
@@ -1889,7 +1980,7 @@ bibliography style]
\newunit% ??? Editorpunct maybe not right here?
\iffieldundef{maintitle}
{}
- {\iffieldundef{volume}
+ {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
{\usebibmacro{cms-in:}%
\printtext{%
\printfield{maintitle}%
@@ -1980,34 +2071,39 @@ bibliography style]
\newbibmacro*{shorthand:label}{% Test this
\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT%
- \iffieldequalstr{entrytype}{periodical}}% Simplifies .bib creation
+ \ifentrytype{periodical}}% Simplifies .bib creation
{\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}}}%
- {\iffieldequalstr{entrytype}{manual}%
+ {\ifentrytype{manual}%
{\printtext[bibhyperref]{\printlist{organization}}}%
{\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}}}%
\newbibmacro*{labelyear+extrayear}{%
\ifboolexpr{ (
- test {\iffieldequalstr{entrytype}{music}}%
+ test {\ifentrytype{music}}%
or
- test {\iffieldequalstr{entrytype}{review}}%
+ test {\ifentrytype{review}}%
or
- test {\iffieldequalstr{entrytype}{video}}%
+ test {\ifentrytype{video}}%
)
and
- togl {cms@avdate}
+ togl {cms@avdate}%
}%
{\usebibmacro{av+labelyear+extrayear}}%
- {\usebibmacro{standard+labelyear+extrayear}}}
+ {\iftoggle{cms@ordate}%
+ {\usebibmacro{origfirst+labelyear+extrayear}}%
+ {\usebibmacro{standard+labelyear+extrayear}}}}
\newbibmacro*{standard+labelyear+extrayear}{%
- \iffieldundef{labelyear}%
+ \ifthenelse{\iffieldundef{labelyear}\OR%
+ \iffieldequalstr{labelyear}{nodate}}% or new declaration ???
{\ifboolexpr{
- test {\iffieldequalstr{entrytype}{misc}}
+ test {\ifentrytype{misc}}
+ or
+ test {\ifentrytype{inreference}}
or
- test {\iffieldequalstr{entrytype}{inreference}}
+ test {\ifentrytype{reference}}
or
- test {\iffieldequalstr{entrytype}{reference}}
+ test {\ifentrytype{mvreference}}
or
not togl {cms@nodates}}%
{}%
@@ -2057,7 +2153,7 @@ bibliography style]
\clearfield{eventyear}}%
{\iffieldundef{eventmonth}%
{\clearfield{eventyear}}%
- {\iffieldsequal{eventyear}{evendendyear}%
+ {\iffieldsequal{eventyear}{eventendyear}%
{\clearfield{eventyear}\clearfield{eventendyear}}%
{}}}}}}%
{\printfield{labelyear}%
@@ -2076,14 +2172,96 @@ bibliography style]
{\clearfield{year}\clearfield{endyear}}%
{}}}}}}}
+\newbibmacro*{origfirst+labelyear+extrayear}{%
+ \ifthenelse{\iffieldundef{labelyear}\OR%
+ \iffieldequalstr{labelyear}{nodate}}%
+ {\ifboolexpr{
+ test {\ifentrytype{misc}}
+ or
+ test {\ifentrytype{inreference}}
+ or
+ test {\ifentrytype{reference}}
+ or
+ test {\ifentrytype{mvreference}}
+ or
+ not togl {cms@nodates}}%
+ {}%
+ {\bibstring{nodate}}}%
+ {\iffieldundef{origyear}%
+ {\iffieldundef{year}
+ {\iffieldundef{eventyear}%
+ {\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{eventendyear}%
+ {\clearfield{eventyear}}%
+ {\iffieldequalstr{eventendyear}{}%
+ {\mbox{\bibdatedash}%
+ \clearfield{eventyear}}%
+ {\iffieldundef{eventmonth}%
+ {\clearfield{eventyear}}%
+ {\iffieldsequal{eventyear}{eventendyear}%
+ {\clearfield{eventyear}\clearfield{eventendyear}}%
+ {}}}}}}%
+ {\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}% DATE FIX
+ {\clearfield{origyear}}%
+ {\iffieldequalstr{origendyear}{}%
+ {\mbox{\bibdatedash}%
+ \clearfield{origyear}}%
+ {\iffieldundef{origmonth}%
+ {\clearfield{origyear}}%
+ {\iffieldsequal{origyear}{origendyear}%
+ {\clearfield{origyear}\clearfield{origendyear}}%
+ {}}}}}}}
+
\newbibmacro*{av+labelyear+extrayear}{%
- \iffieldundef{labelyear}%
+ \ifthenelse{\iffieldundef{labelyear}\OR%
+ \iffieldequalstr{labelyear}{nodate}}%
{\ifboolexpr{
- test {\iffieldequalstr{entrytype}{misc}}
+ test {\ifentrytype{misc}}
+ or
+ test {\ifentrytype{inreference}}
or
- test {\iffieldequalstr{entrytype}{inreference}}
+ test {\ifentrytype{reference}}
or
- test {\iffieldequalstr{entrytype}{reference}}
+ test {\ifentrytype{mvreference}}
or
not togl {cms@nodates}}%
{}%
@@ -2154,11 +2332,23 @@ bibliography style]
\newbibmacro*{origyear+endyear}{%
\printfield{origyear}%
- \iffieldundef{origendyear}%
+ \ifthenelse{\iffieldundef{origendyear}\OR%
+ \iffieldsequal{origyear}{origendyear}}% Same fix as in .lbx
{}%
{\iffieldequalstr{origendyear}{}%
{\mbox{\bibdatedash}}%
- {\bibdatedash\printfield{origendyear}}}}
+ {\bibdatedash\csuse{mkbibdatelong}{origendyear}{}{}}}}% ???
+
+% \printfield{origendyear}}}} Peculiar bug with this after \bibnamedash
+
+\newbibmacro*{year+endyear}{%
+ \printfield{year}%
+ \ifthenelse{\iffieldundef{endyear}\OR%
+ \iffieldsequal{year}{endyear}}% Same fix as in .lbx
+ {}%
+ {\iffieldequalstr{endyear}{}%
+ {\mbox{\bibdatedash}}%
+ {\bibdatedash\printfield{endyear}}}}
\newbibmacro*{cmsbibsortdate}{% Attempt to solve date-related problems
\ifboolexpr{%
@@ -2171,7 +2361,7 @@ bibliography style]
{\ifboolexpr{% Needed for date ranges - video type, esp.
test {\iffieldundef{endyear}}%
or
- not test {\iffieldnum{endyear}}
+ not test {\iffieldnum{endyear}}%
}%
{\ifthenelse{\thefield{origyear}>\thefield{year}}%
{\toggletrue{cms@switchdates}%
@@ -2181,7 +2371,7 @@ bibliography style]
{\toggletrue{cms@switchdates}%
\usebibmacro{cmsbibyear}}%
{\usebibmacro{cmsbibyear}}}}%
- {\usebibmacro{cmsbibyear}}}}
+ {\usebibmacro{cmsbibyear}}}}%
\newbibmacro*{cmsbibyear}{%
\iftoggle{cms@origlabel}%
@@ -2196,34 +2386,71 @@ bibliography style]
{}}
\newbibmacro*{origyear+labelyear}{%
- \iftoggle{cms@switchdates}%
- {\usebibmacro{labelyear+extrayear}%
- \clearfield{year}}%
- {\iffieldundef{origyear}
- {\clearfield{extrayear}\usebibmacro{labelyear+extrayear}}%
- {\usebibmacro{origyear+endyear}}%
- \clearfield{origyear}}}
+ \ifboolexpr{ (
+ test {\ifentrytype{music}}%
+ or
+ test {\ifentrytype{review}}%
+ or
+ test {\ifentrytype{video}}%
+ )
+ and
+ togl {cms@avdate}%
+ }
+ {\usebibmacro{av+labelyear+extrayear}}%
+ {\iftoggle{cms@switchdates}%
+ {\usebibmacro{labelyear+extrayear}}%
+ {\iffieldundef{origyear}%
+ {\iftoggle{cms@ordate}% ???
+ {}%
+ {\clearfield{extrayear}}%
+ \usebibmacro{standard+labelyear+extrayear}}%
+ {\iftoggle{cms@ordate}%
+ {\usebibmacro{origfirst+labelyear+extrayear}}%
+ {\usebibmacro{origyear+endyear}%
+ \clearfield{origyear}}}}}}
\newbibmacro*{bothyear+oldstyle}{%
- \iftoggle{cms@switchdates}%
- {\printtext{%
- \bibopenparen%
- \usebibmacro{labelyear+extrayear}%
- \bibcloseparen%
- \setunit{\addspace}\usebibmacro{origyear+endyear}}%
- \clearfield{year}%
- \clearfield{origyear}}%
- {\iffieldundef{origyear}
- {\clearfield{extrayear}\usebibmacro{labelyear+extrayear}}%
+ \ifboolexpr{ (
+ test {\ifentrytype{music}}%
+ or
+ test {\ifentrytype{review}}%
+ or
+ test {\ifentrytype{video}}%
+ )
+ and
+ togl {cms@avdate}%
+ }
+ {\usebibmacro{av+labelyear+extrayear}}% \clearfield local to \printtext
+ {\iftoggle{cms@switchdates}%
{\printtext{%
\bibopenparen%
- \usebibmacro{origyear+endyear}%
+ \usebibmacro{labelyear+extrayear}%
\bibcloseparen%
-% \printfield[parens]{origyear}%
- \clearfield{extrayear}\setunit*{\addspace}%
- \usebibmacro{labelyear+extrayear}}%
- \clearfield{origyear}%
- \clearfield{year}}}}
+ \setunit{\addspace}\usebibmacro{origyear+endyear}}%
+ \clearfield{year}%
+ \clearfield{origyear}}%
+ {\iffieldundef{origyear}
+ {\iftoggle{cms@ordate}%
+ {}%
+ {\clearfield{extrayear}}%
+ \usebibmacro{standard+labelyear+extrayear}}%
+ {\iftoggle{cms@ordate}% ???
+ {\iffieldundef{year}%
+ {\usebibmacro{origfirst+labelyear+extrayear}}%
+ {\printtext{%
+ \bibopenparen%
+ \usebibmacro{origfirst+labelyear+extrayear}%
+ \bibcloseparen%
+ \setunit*{\addspace}%
+ \usebibmacro{year+endyear}}}}%
+ {\printtext{%
+ \bibopenparen%
+ \usebibmacro{origyear+endyear}%
+ \bibcloseparen%
+ \clearfield{extrayear}\setunit*{\addspace}%
+ \usebibmacro{standard+labelyear+extrayear}}}%
+ \clearfield{origyear}%
+ \clearfield{year}}}}}
\newbibmacro*{pubstate}{%
\iftoggle{cms@reprint}%
@@ -2241,8 +2468,8 @@ bibliography style]
{\printfield{pubstate}}}
\newbibmacro*{choosepubstring}{%
- \ifthenelse{\iffieldequalstr{entrytype}{video}\OR%
- \iffieldequalstr{entrytype}{music}}%
+ \ifthenelse{\ifentrytype{video}\OR%
+ \ifentrytype{music}}%
{\bibstring{origreleaseyear}}%
{\bibstring{origpubyearalt}}}%
@@ -2255,19 +2482,24 @@ bibliography style]
{}}}%
{}}
-\newbibmacro*{volume+pages}{% Volume fix
- \iffieldundef{maintitle}%
- {\iffieldundef{volume}%
+\newbibmacro*{volume+pages}{% Volume fix (modified)
+ \ifboolexpr{
+ test {\iffieldundef{maintitle}}%
+ or
+ togl {cms@vol}%
+ }
+ {\global\togglefalse{cms@vol}%
+ \ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
{\printfield{pages}%
\newunit%
\printfield{volumes}}%
{\iffieldundef{part}%
{\iffieldundef{pages}%
- {}%
+ {\printfield{volume}}% Still print this w/o part or pages???
{\ifthenelse{\iffieldnums{pages}%
- \AND\iffieldundef{bookpagination}}%
+ \AND\iffieldundef{bookpagination}\AND\iffieldnums{volume}}%
{\printfield[default]{volume}%
- \addcolon%
+ \postvolpunct%
\printfield{pages}}%
{\printfield{volume}%
\addcomma\addspace%
@@ -2276,89 +2508,184 @@ bibliography style]
\printfield{part}%
\newcunit%
\printfield{pages}}}}%
- {\printfield{pages}%
- \newunit%
- \printfield{volumes}}}%
+ {\ifboolexpr{
+ togl {cms@hidevolumes}%
+ and
+ (
+ not test {\iffieldundef{volume}}%
+ or
+ not test {\iffieldundef{part}}%
+ )
+ }%
+ {\printfield{pages}}%
+ {\printfield{pages}%
+ \newunit%
+ \printfield{volumes}}}}%
\newbibmacro*{bibpostxref}{% Volume fix
- \iffieldundef{pages}%
- {\iffieldundef{volume}%
- {}%
- {\iffieldundef{part}%
- {\newcunit\printfield{volume}}%
- {\newcunit\printfield{volume}%
- \printfield{part}}}}%
- {\iffieldundef{volume}%
- {\newcunit\printfield{pages}}%
- {\iffieldundef{part}%
- {\ifthenelse{\iffieldnums{pages}%
- \AND\iffieldundef{bookpagination}}%
- {\newcunit\printfield[default]{volume}%
- \addcolon%
- \printfield{pages}}%
- {\newcunit\printfield{volume}%
- \addcomma\addspace%
- \printfield{pages}}}%
- {\newcunit\printfield{volume}%
- \printfield{part}%
- \newcunit%
- \printfield{pages}}}}}
-
-\newbibmacro*{volume+or+volumes}{% Volume fix
+ \iffieldundef{chapter}%
+ {\iffieldundef{pages}%
+ {\iffieldundef{volume}%
+ {\iffieldundef{part}%
+ {}%
+ {\newcunit\printfield{part}}}%
+ {\ifboolexpr{
+ test {\ifcsdef{cbx@incollvol}}%
+ and
+ test {\iffieldequalcs{volume}{cbx@incollvol}}%
+ }%
+ {\iffieldundef{part}%
+ {}%
+ {\ifboolexpr{
+ test {\ifcsdef{cbx@incollpart}}%
+ and
+ test {\iffieldequalcs{part}{cbx@incollpart}}%
+ }%
+ {}%
+ {\newcunit\printfield{part}}}}%
+ {\iffieldundef{part}%
+ {\newcunit\printfield{volume}}%
+ {\newcunit\printfield{volume}\printfield{part}}}}}%
+ {\iffieldundef{volume}%
+ {\iffieldundef{part}%
+ {\newcunit\printfield{pages}}%
+ {\newcunit\printfield{part}\newcunit\printfield{pages}}}%
+ {\ifboolexpr{
+ test {\ifcsdef{cbx@incollvol}}%
+ and
+ test {\iffieldequalcs{volume}{cbx@incollvol}}%
+ }%
+ {\iffieldundef{part}%
+ {\newcunit\printfield{pages}}%
+ {\ifboolexpr{
+ test {\ifcsdef{cbx@incollpart}}%
+ and
+ test {\iffieldequalcs{part}{cbx@incollpart}}%
+ }%
+ {\newcunit\printfield{pages}}%
+ {\newcunit\printfield{part}\newcunit\printfield{pages}}}}%
+ {\iffieldundef{part}%
+ {\ifthenelse{\iffieldnums{pages}%
+ \AND\iffieldundef{bookpagination}\AND\iffieldnums{volume}}%
+ {\newcunit\printfield[default]{volume}%
+ \postvolpunct%
+ \printfield{pages}}%
+ {\newcunit\printfield{volume}%
+ \addcomma\addspace%
+ \printfield{pages}}}%
+ {\newcunit\printfield{volume}%
+ \printfield{part}%
+ \newcunit%
+ \printfield{pages}}}}}}%
+ {\newcunit\printfield{chapter}}}
+
+\newbibmacro*{volume+or+volumes}{% Volume fix (modified)
\iffieldundef{maintitle}%
- {\iffieldundef{volume}%
+ {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}%
{\printfield{volumes}}%
{\printfield{volume}%
\printfield{part}}}%
- {\printfield{volumes}}}
+ {\ifboolexpr{
+ togl {cms@hidevolumes}%
+ and
+ (
+ not test {\iffieldundef{volume}}%
+ or
+ not test {\iffieldundef{part}}%
+ )
+ }%
+ {}%
+ {\printfield{volumes}}}}
\newbibmacro*{mtitle+mstitle+vol+part+title+stitle}{%
\iffieldundef{maintitle}
{}
- {\iffieldundef{volume}
- {\printtext{%
+ {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{part}}% Test ???
+ {\usebibmacro{cms-in:}% Volume-less treatment?
+ \printtext{%
\printfield{maintitle}%
- \setunit{\addcolon\addspace}%
- \printfield[maintitle]{mainsubtitle}}%
- \newcunit
- \printfield{maintitleaddon}}
- {\printfield{volume}%
- \printfield{part}%
- \setunit{\addspace}
- \bibstring{ofseries}%
- \setunit{\addspace}
+ \setunit{\addcolon\addspace}%
+ \printfield[maintitle]{mainsubtitle}}%
+ \newcunit
+ \printfield{maintitleaddon}}
+ {\printfield{volume}%
+ \printfield{part}%
+ \setunit{\addspace}
+ \bibstring{ofseries}%
+ \setunit{\addspace}
+ \printtext{%
+ \printfield{maintitle}%
+ \setunit{\addcolon\addspace}%
+ \printfield[maintitle]{mainsubtitle}}%
+ \newcunit
+ \printfield{maintitleaddon}}}}
+
+\newbibmacro*{btitle+bstitle}{% InIn fix from N&B
+ \iffieldundef{booktitle}
+ {}
+ {\ifthenelse{\ifentrytype{audio}\OR\ifentrytype{music}\OR%
+ \ifentrytype{video}}%
+ {}%
+ {\usebibmacro{cms-in:}}%
\printtext{%
- \printfield{maintitle}%
+ \printfield{booktitle}%
\setunit{\addcolon\addspace}%
- \printfield[maintitle]{mainsubtitle}}%
+ \printfield[booktitle]{booksubtitle}}%
\newcunit
- \printfield{maintitleaddon}}}}
+ \printfield{booktitleaddon}%
+ \setunit*{\addcomma\addspace}}}
\newbibmacro*{mtitle+mstitle+vol+part+btitle+bstitle}{%
\usebibmacro{btitle+bstitle}%
- \iffieldundef{booktitle}
- {\setunit{\addperiod\addspace}}% Fix customc?
- {\setunit{\addcomma\addspace}}%
\iffieldundef{maintitle}
{}
- {\iffieldundef{volume}
- {\printtext{%
+ {\ifthenelse{\(\iffieldundef{volume}\AND\iffieldundef{part}\)\OR%
+ \(\iffieldundef{booktitle}\AND\NOT\ifentrytype{bookinbook}\)}%
+ {\usebibmacro{cms-in:}% Volume-less treatment?
+ \printtext{%
\printfield{maintitle}%
- \setunit{\addcolon\addspace}%
- \printfield[maintitle]{mainsubtitle}}%
- \newcunit
- \printfield{maintitleaddon}}
- {\printfield{volume}%
- \printfield{part}%
- \setunit{\addspace}
- \bibstring{ofseries}%
- \setunit{\addspace}
- \printtext{%
- \printfield{maintitle}%
- \setunit{\addcolon\addspace}%
- \printfield[maintitle]{mainsubtitle}}%
- \newcunit
- \printfield{maintitleaddon}}}}
+ \setunit{\addcolon\addspace}%
+ \printfield[maintitle]{mainsubtitle}}%
+ \newcunit
+ \printfield{maintitleaddon}%
+ \toggletrue{cms@vol}}
+ {\printfield{volume}%
+ \printfield{part}%
+ \setunit{\addspace}
+ \bibstring{ofseries}%
+ \setunit{\addspace}
+ \printtext{%
+ \printfield{maintitle}%
+ \setunit{\addcolon\addspace}%
+ \printfield[maintitle]{mainsubtitle}}%
+ \newcunit
+ \printfield{maintitleaddon}}}}
+
+\newbibmacro*{cjournal+ser+vol+num}{% Moved to bbx
+ \usebibmacro{journal+sub}%
+ \setunit*{\addspace}%
+ \printlist[periodplace]{location}%
+ \setunit*{\addspace}%
+ \iffieldundef{series}
+ {}
+ {\newcunit
+ \printfield[jourser]{series}%
+ \newcunit}%\setunit*{\addspace}?
+ \ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}%
+ {\iffieldundef{volume}%
+ {\newcunit%
+ \printfield[journum]{number}%
+ \clearfield{number}%
+ \setunit{\addcomma\addspace}}
+ {\printfield[jourvol]{volume}%
+ \setunit{\addcomma\addspace}}}%
+ {\printfield[jourvol]{volume}%
+ \newcunit%
+ \printfield[journum]{number}%
+ \clearfield{number}%
+ \setunit{\addcomma\addspace}}% need * here?
+ \printfield{eid}%
+ \newunit}
\newbibmacro*{journal+issue+year+pages}{%
\iftoggle{cms@numbermonth}{}{\clearfield{month}}%
@@ -2366,9 +2693,9 @@ bibliography style]
\setunit{\addspace}%
\ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month}
\AND\iffieldundef{number}}%
- {\iftoggle{cms@postposit}% Kludge for French colon spacing.
- {\setunit{\addcolon\addspace}}%
- {\setunit{\addcolon}}}% This may not be universally correct.
+ {\iffieldundef{bookpagination}% Removed kludge for French colon spacing?
+ {\setunit{\postvolpunct}}%
+ {\setunit{\addcolon\addspace}}}% This may not be universally correct.
{\printtext[parens]{% Perhaps if it's wrong use magazine subtype?
\iffieldundef{issue}
{\usebibmacro{date}%
@@ -2385,9 +2712,9 @@ bibliography style]
\setunit{\addspace}%
\ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month}
\AND\iffieldundef{number}}%
- {\iftoggle{cms@postposit}%
- {\setunit{\addcolon\addspace}}%
- {\setunit{\addcolon}}}%
+ {\iffieldundef{bookpagination}% Removed kludge for French ???
+ {\setunit{\postvolpunct}}%
+ {\setunit{\addcolon\addspace}}}%
{\printtext[parens]{%
\iffieldundef{issue}
{\usebibmacro{date}%