diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx | 53 |
1 files changed, 29 insertions, 24 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx index b73c23d5fa4..19742ff22be 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx @@ -1,10 +1,10 @@ -% $Id: chicago-authordate.cbx,v 0.8.1.25 2012/12/06 11:43:37 dfussner Exp $ +% $Id: chicago-authordate.cbx,v 0.8.1.32 2013/03/12 12:35:38 dfussner Exp $ % This is a biblatex citation style file, adapted from Lehman's % authoryear-comp.cbx. It is heavily modified, with the intention of % providing inline citations (and a reference list) for the % author-date style of the Chicago Manual of Style, 16th edition. -\ProvidesFile{chicago-authordate.cbx}[2012/12/06 v 2.4 biblatex citation style] +\ProvidesFile{chicago-authordate.cbx}[2013/03/12 v 2.5 biblatex citation style] %%%% Biblatex initialization + Chicago options + Toggles %%%% @@ -736,9 +736,9 @@ \iftoggle{cms@switchdates}% {\usebibmacro{cite:labelyear+extrayear}} {\iffieldundef{origyear}% - {\usebibmacro{cite:labelyear+extrayear}}% + {\clearfield{extrayear}\usebibmacro{cite:labelyear+extrayear}}% {\printtext[bibhyperref]{% - \printfield{origyear}}}}} + \usebibmacro{origyear+endyear}}}}} \newbibmacro*{cite:bothyear+oldstyle}{% \iftoggle{cms@switchdates}% @@ -746,12 +746,15 @@ \bibopenparen% \usebibmacro{cite:labelyear+extrayear}% \bibcloseparen% - \addspace\printfield{origyear}}}% + \addspace\usebibmacro{origyear+endyear}}}% {\iffieldundef{origyear}% - {\usebibmacro{cite:labelyear+extrayear}}% + {\clearfield{extrayear}\usebibmacro{cite:labelyear+extrayear}}% {\printtext[bibhyperref]{% - \printfield[parens]{origyear}% - \addspace\printfield{labelyear}}}}} + \bibopenparen% + \usebibmacro{origyear+endyear}% + \bibcloseparen% + \clearfield{extrayear}\addspace% + \usebibmacro{cite:labelyear+extrayear}}}}} \newbibmacro*{cite:save}{% \savefield{entrykey}{\cbx@lastkey}} @@ -1035,7 +1038,7 @@ \DeclareFieldFormat{pages}{% \iffieldundef{bookpagination}% {#1\isdot}% - {\mkpageprefix[bookpagination]{#1\isdot}}} + {\mkpageprefix[bookpagination]{#1}}}% Removed \isdot. \DeclareFieldFormat{bibnote}{\MakeCapital{#1}} @@ -1168,14 +1171,22 @@ \ifbibstring{#1}% {\bibstring{#1}}% {\ifcapital% - {\MakeCapital{#1}}% - {#1}}} + {\MakeCapital{#1\isdot}}% + {#1\isdot}}} \DeclareFieldFormat[artwork]{type}{% \ifcapital% {\MakeCapital{#1}}% {#1}} +\DeclareFieldAlias[patent]{type}[suppbook]{type} + +\DeclareFieldAlias[manual]{type}[suppbook]{type} + +\DeclareFieldAlias[thesis]{type}[suppbook]{type} + +\DeclareFieldAlias[report]{type}[suppbook]{type} + \DeclareFieldAlias[image]{type}[artwork]{type} \DeclareFieldAlias[suppcollection]{type}[suppbook]{type} @@ -1423,13 +1434,13 @@ \newbibmacro*{finentry}{%{\finentry} To make annotated bibliography \ifbibliography - {\usebibmacro{entrytail}} + {\usebibmacro{entrytail}}% {}% \finentry} \newbibmacro*{entrytail}{% From reading.bbx, for annotated bibliography \newunit\newblock - \iftoggle{cms@annotation} + \iftoggle{cms@annotation}% {\usebibmacro{annotation}% \newunit\newblock} {}}% @@ -1465,7 +1476,8 @@ \newcunit\newblock}}} \newbibmacro*{editorpunct}{% - \ifthenelse{\(\iffieldundef{booktitle}\AND\iffieldundef{maintitle}\)% + \ifthenelse{\(\iffieldundef{booktitle}\AND% + \iffieldundef{maintitle}\AND\iffieldundef{issuetitle}\)% \OR\iffieldsequal{booktitle}{title}% Changed these for crossrefed \OR\iffieldsequal{maintitle}{title}}% entries. Create problems? {\iffieldequalstr{entrytype}{video}% @@ -1853,10 +1865,10 @@ \iffieldequalstr{entrytype}{suppperiodical}}% This test is for {\usebibmacro{cms-in:}}% periodical entries {}% - \printtext{% - \printfield{issuetitle}% + \printtext[issuetitle]{% + \printfield[noformat]{issuetitle}% \setunit{\addcolon\addspace}% - \printfield[issuetitle]{issuesubtitle}}}} + \printfield[noformat]{issuesubtitle}}}} \newbibmacro*{btitle+bstitle}{% \iffieldundef{booktitle} @@ -2087,13 +2099,6 @@ \setunit{\addcolon\addspace}% \printfield[noformat]{journalsubtitle}}}} -% \newbibmacro*{url+date}{% Changed for 0.9: No longer called? -% \printfield{url}% -% \iffieldundef{urlyear} -% {} -% {\setunit{\addspace}% -% \printtext[urldate]{\printurldate}}} - \newbibmacro*{chap+pag}{% \printfield{chapter}% \setunit*{\addcomma\space}% |