diff options
author | Karl Berry <karl@freefriends.org> | 2014-08-18 22:29:05 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-08-18 22:29:05 +0000 |
commit | 9422fc520291ceb7eb36aaacb2b97c08bdb02c9e (patch) | |
tree | f9aa98cb24fb2f56941fa7773eba010804383254 /Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx | |
parent | 389e6d20a6f1b1e09d2e129c21dbad563c233a56 (diff) |
biblatex-chicago (18aug14)
git-svn-id: svn://tug.org/texlive/trunk@34969 c570f23f-e606-0410-a88d-b1316a301751
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.bbx | 291 |
1 files changed, 237 insertions, 54 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 a9f4d864a7d..ee20a01d713 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx @@ -1,10 +1,10 @@ -% $Id: chicago-notes.bbx,v 0.9.7.50 2013/10/29 12:32:21 dfussner Exp $ +% $Id: chicago-notes.bbx,v 0.9.7.62 2014/08/15 09:27:26 dfussner Exp $ % This is a biblatex style file, adapted mainly from Lehman's standard.bbx % It provides the bibliography formatting for the Chicago notes + % bibliography style. -\ProvidesFile{chicago-notes.bbx}[2013/10/29 v 2.8 biblatex bibliography style] +\ProvidesFile{chicago-notes.bbx}[2014/08/15 v 2.9a biblatex bibliography style] %%%% Initialize and format bibliography and los %%%% @@ -22,10 +22,23 @@ {\endlist} {\item} -\defbibenvironment{shorthands} +\defbibenvironment{shorthand}% {\list - {\printfield[shorthandwidth]{shorthand}}% - {\setlength{\labelwidth}{\shorthandwidth}% + {\printfield[shorthandwidth]{shorthand}}% + {\setlength{\labelwidth}{\shorthandwidth}% + \setlength{\leftmargin}{\labelwidth}% + \setlength{\labelsep}{\biblabelsep}% + \addtolength{\leftmargin}{\labelsep}% + \setlength{\itemsep}{\lositemsep}% + \setlength{\parsep}{\bibparsep}% + \renewcommand*{\makelabel}[1]{##1\hss}}} + {\endlist} + {\item} + +\defbibenvironment{shorthands}% For biblatex < 2.9 + {\list + {\printfield[shorthandwidth]{shorthand}}% + {\setlength{\labelwidth}{\shorthandwidth}% \setlength{\leftmargin}{\labelwidth}% \setlength{\labelsep}{\biblabelsep}% \addtolength{\leftmargin}{\labelsep}% @@ -75,16 +88,22 @@ {\toggletrue{cms@reprint}}% {\togglefalse{cms@reprint}}% \ifboolexpr{% - test {\iffieldundef{origyear}} + test {\iffieldundef{origyear}}% or - test {\iffieldundef{year}} + test {\iffieldundef{year}}% or - not test {\iffieldint{year}} + not test {\iffieldint{year}}% or - togl {cms@switchdates} + not test {\iffieldint{origyear}}% + or + togl {cms@switchdates}% }% {}% - {\iffieldundef{endyear}% + {\ifboolexpr{% Needed for open-ended ranges + test {\iffieldundef{endyear}}% + or + not test {\iffieldnum{endyear}}% + }% {\ifthenelse{\thefield{origyear}>\thefield{year}}% {\toggletrue{cms@switchdates}}% {}}% @@ -97,16 +116,22 @@ {\toggletrue{cms@reprint}}% {\togglefalse{cms@reprint}}% \ifboolexpr{% - test {\iffieldundef{origyear}} + test {\iffieldundef{origyear}}% + or + test {\iffieldundef{year}}% or - test {\iffieldundef{year}} + not test {\iffieldint{year}}% or - not test {\iffieldint{year}} + not test {\iffieldint{origyear}}% or - togl {cms@switchdates} + togl {cms@switchdates}% }% {}% - {\iffieldundef{endyear}% + {\ifboolexpr{% Needed for open-ended ranges + test {\iffieldundef{endyear}}% + or + not test {\iffieldnum{endyear}}% + }% {\ifthenelse{\thefield{origyear}>\thefield{year}}% {\toggletrue{cms@switchdates}}% {}}% @@ -159,9 +184,9 @@ {\addlowpenspace\mkbibnameaffix{#4}\isdot}% {\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot% \ifboolexpr{ - test{\ifnumless{\value{listcount}}{\value{listtotal}}} + test{\ifnumless{\value{listcount}}{\value{listtotal}}}% and - test{\ifnumless{\value{listcount}}{\value{maxnames}}} + test{\ifnumless{\value{listcount}}{\value{maxnames}}}% } {\addcomma}% {}}}% @@ -243,7 +268,7 @@ \newbibmacro*{justauthor}{% \ifnameundef{author} - {\let\bbx@lasthash\undefined} + {\iftoggle{cms@origcite}{}{\let\bbx@lasthash\undefined}}% {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT \iffirstonpage} {\iffieldundef{nameaddon}% @@ -337,9 +362,9 @@ \newbibmacro*{compiler}{% \ifboolexpr{ - test {\ifnameundef{namec}} + test {\ifnameundef{namec}}% or - not togl {cms@usecompiler} + not togl {cms@usecompiler}% }% {\let\bbx@lasthash\undefined} {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT @@ -357,14 +382,32 @@ %%%% Drivers for Bibliography entries and Shorthands %%%% -\DeclareBibliographyDriver{shorthands}{% +\DeclareBibliographyDriver{shorthand}{% \iftoggle{cms@fullshhand}% {\usedriver{\frenchspacing}% {\thefield{entrytype}}% \finentry}% {\ifnameundef{labelname}% {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT% - \ifentrytype{periodical}}% + \ifentrytype{periodical}}% + {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}% + \newcunit}}% + {\ifentrytype{manual}% + {\printtext[bibhyperref]{\printlist{organization}\newcunit}}% + {}}}% + {\usebibmacro{author/editor}% + \setunit{\addcomma\space}}% + \printfield[lostitle]{title}% + \finentry}} + +\DeclareBibliographyDriver{shorthands}{% For biblatex < 2.9 + \iftoggle{cms@fullshhand}% + {\usedriver{\frenchspacing}% + {\thefield{entrytype}}% + \finentry}% + {\ifnameundef{labelname}% + {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT% + \ifentrytype{periodical}}% {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}% \newcunit}}% {\ifentrytype{manual}% @@ -619,15 +662,31 @@ \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% \usebibmacro{xrefprenote}% Volume fix \bookbibxrefcite{\thefield{xref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% \usebibmacro{xrefprenote}% Volume fix \bookbibxrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}} \DeclareBibliographyDriver{bookinbook}{% @@ -694,15 +753,31 @@ \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% \usebibmacro{xrefprenote}% Volume fix \bookbibxrefcite{\thefield{xref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% \usebibmacro{xrefprenote}% Volume fix \bookbibxrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}} \DeclareBibliographyDriver{booklet}{% @@ -780,15 +855,31 @@ \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% \usebibmacro{xrefprenote}% Volume fix \bookbibxrefcite{\thefield{xref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% \usebibmacro{xrefprenote}% Volume fix \bookbibxrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}} \DeclareBibliographyDriver{customc}{% @@ -891,17 +982,33 @@ \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \bibxrefcite{\thefield{xref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\newunit}% \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \bibxrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}} \DeclareBibliographyDriver{incollection}{% @@ -960,17 +1067,33 @@ \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \bibxrefcite{\thefield{xref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \bibxrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}} \DeclareBibliographyDriver{inproceedings}{% @@ -1020,17 +1143,33 @@ \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \bibxrefcite{\thefield{xref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \bibxrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}} \DeclareBibliographyDriver{inreference}{% @@ -1146,21 +1285,33 @@ \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}}% -{\ifpunctmark{*}% Attempt to fix issues with n.d. Changed for 0.9. - {\setunit{\nopunct\addspace\bibsentence}}% - {}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\newunit}% \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \bibxrefcite{\thefield{xref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}}% -{\ifpunctmark{*}% Likewise. - {\setunit{\nopunct\addspace\bibsentence}}% - {}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\newunit}% \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \bibxrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}} \DeclareBibliographyDriver{manual}{% @@ -1517,15 +1668,31 @@ \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% \usebibmacro{xrefprenote}% Volume fix \bookbibxrefcite{\thefield{xref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}}% -{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% +{\ifboolexpr{% Changed for 16th ed. + test {\ifterm}% + or + test {\ifpunctmark{*}}% + } + {\setunit{\addspace\bibsentence}}% + {\setunit{\addperiod\addspace}}% \usebibmacro{xrefprenote}% Volume fix \bookbibxrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% + \newunit\newblock + \usebibmacro{originally+published+as}% \usebibmacro{finentry}}} \DeclareBibliographyDriver{reference}{% @@ -2010,11 +2177,11 @@ \newbibmacro*{journal+issue+year+pages}{% \usebibmacro{cjournal+ser+vol+num}% \ifboolexpr{% 16th ed. - test {\iffieldundef{issue}} + test {\iffieldundef{issue}}% and - test {\iffieldundef{year}} + test {\iffieldundef{year}}% and - not togl {cms@switchdates} + not togl {cms@switchdates}% }% {\iffieldundef{number}% {\iffieldundef{bookpagination}% @@ -2022,24 +2189,32 @@ {\setunit{\addcolon\addspace}}% \printfield{pages}}% {\newcunit\printfield{pages}}}% - {\setunit{\addspace}% + {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{number}}% 16th ed. + {\newcunit% + \iffieldundef{issue} + {\usebibmacro{number+or+month}}% + {\printfield{issue}% + \setunit{\addspace}% + \usebibmacro{cmsyear}}% + \newcunit\printfield{pages}}% + {\setunit{\addspace}% \printtext[parens]{% \iffieldundef{issue} {\usebibmacro{number+or+month}}% {\printfield{issue}% \setunit{\addspace}% \usebibmacro{cmsyear}}}% - \setunit{\addcolon\addspace} - \printfield{pages}}} + \setunit{\addcolon\addspace}% + \printfield{pages}}}} \newbibmacro*{periodical+issue+year+pages}{% \usebibmacro{cperiodical+ser+vol+num}% \ifboolexpr{% 16th ed. - test {\iffieldundef{issue}} + test {\iffieldundef{issue}}% and - test {\iffieldundef{year}} + test {\iffieldundef{year}}% and - not togl {cms@switchdates} + not togl {cms@switchdates}% }% {\iffieldundef{number}% {\iffieldundef{bookpagination}% @@ -2047,15 +2222,23 @@ {\setunit{\addcolon\addspace}}% \printfield{pages}}% {\newcunit\printfield{pages}}}% - {\setunit{\addspace}% + {\ifthenelse{\iffieldundef{volume}\AND\iffieldundef{number}}% 16th ed. + {\newcunit% + \iffieldundef{issue} + {\usebibmacro{number+or+month}}% + {\printfield{issue}% + \setunit{\addspace}% + \usebibmacro{cmsyear}}% + \newcunit\printfield{pages}}% + {\setunit{\addspace}% \printtext[parens]{% \iffieldundef{issue} {\usebibmacro{number+or+month}}% {\printfield{issue}% \setunit{\addspace}% \usebibmacro{cmsyear}}}% - \setunit{\addcolon\addspace} - \printfield{pages}}} + \setunit{\addcolon\addspace}% + \printfield{pages}}}} \newbibmacro*{bycompiler}{% \ifnameundef{namec} |