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 | 134 |
1 files changed, 102 insertions, 32 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 ea5ec1ccfbc..377d9007db9 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx @@ -1,11 +1,11 @@ -% $Id: chicago-authordate15.bbx,v 0.8.1.2 2011/09/21 10:53:07 dfussner Exp $ +% $Id: chicago-authordate15.bbx,v 0.8.1.6 2011/09/28 17:33:38 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, % _15th_ edition. \ProvidesFile{chicago-authordate.bbx} -[2011/09/21 v 1.6 biblatex bibliography style] +[2011/09/28 v 1.6 biblatex bibliography style] %%%% Initialize and format bibliography and los %%%% @@ -218,8 +218,8 @@ {\usebibmacro{picktranslator}} {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT \iffirstonpage} - {\bibnamedash\addcomma\addspace} - {\printnames{editor}\addcomma\space + {\bibnamedash\editordelim}% + {\printnames{editor}\editordelim% \savefield{fullhash}{\bbx@lasthash}}% \usebibmacro{editstrg}}} @@ -228,8 +228,8 @@ {\let\bbx@lasthash\undefined} {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT \iffirstonpage} - {\bibnamedash\addcomma\addspace} - {\printnames{editor}\addcomma\space + {\bibnamedash\editordelim}% + {\printnames{editor}\editordelim% \savefield{fullhash}{\bbx@lasthash}}% \usebibmacro{editstrg}}} @@ -1311,9 +1311,9 @@ \newunit\newblock \usebibmacro{italtitle+stitle}% \newcunit% - \printeventdate% - \newcunit% \usebibmacro{byauthor}% + \setunit*{\addperiod\addspace}% + \printeventdate% \newunit\newblock \usebibmacro{part+editor+translator}% \newunit\newblock @@ -2038,17 +2038,63 @@ not togl {cms@nodates}}% {}% {\bibstring{nodate}}}% - {\printfield{labelyear}% - \iffieldundef{extrayear}% For spurious punctuation - {}% - {\setunit*{}}% - \printfield{extrayear}% - \clearfield{year}}} + {\iffieldundef{year}% + {\iffieldundef{eventyear} + {\iffieldundef{origyear}% + {\printfield{labelyear}% + \iffieldundef{extrayear}% + {}% + {\setunit*{}% + \printfield{extrayear}}% + \iffieldundef{urlendyear}% + {\clearfield{urlyear}}% + {\iffieldequalstr{urlendyear}{}% + {\mbox{\bibdatedash}% + \clearfield{urlyear}}% + {\iffieldundef{urlmonth}% + {\clearfield{urlyear}}% + {}}}}% + {\printfield{labelyear}% + \iffieldundef{extrayear}% + {}% + {\setunit*{}% + \printfield{extrayear}}% + \iffieldundef{origendyear}% + {\clearfield{origyear}}% + {\iffieldequalstr{origendyear}{}% + {\mbox{\bibdatedash}% + \clearfield{origyear}}% + {\iffieldundef{origmonth}% + {\clearfield{origyear}}% + {}}}}}% + {\printfield{labelyear}% + \iffieldundef{extrayear}% + {}% + {\setunit*{}% + \printfield{extrayear}}% + \iffieldundef{eventendyear}% + {\clearfield{eventyear}}% + {\iffieldequalstr{eventendyear}{}% + {\mbox{\bibdatedash}% + \clearfield{eventyear}}% + {\iffieldundef{eventmonth}% + {\clearfield{eventyear}}% + {}}}}}% + {\printfield{labelyear}% + \iffieldundef{extrayear}% + {}% + {\setunit*{}% + \printfield{extrayear}}% + \iffieldundef{endyear}% DATE FIX + {\clearfield{year}}% + {\iffieldequalstr{endyear}{}% + {\mbox{\bibdatedash}% + \clearfield{year}}% + {\iffieldundef{month}% + {\clearfield{year}}% + {}}}}}}% \newbibmacro*{cmsbibsortdate}{% Attempt to solve date-related problems - \iffieldsequal{year}{endyear}% - {\toggletrue{cms@oneyear}}% - {\togglefalse{cms@oneyear}}% \ifboolexpr{% test {\iffieldundef{origyear}} or @@ -2056,7 +2102,11 @@ }% {\usebibmacro{cmsbibyear}}% {\iffieldint{year}% - {\iffieldundef{endyear}% Needed for date ranges - video type, esp. + {\ifboolexpr{% Needed for date ranges - video type, esp. + test {\iffieldundef{endyear}}% + or + not test {\iffieldnum{endyear}} + }% {\ifthenelse{\thefield{origyear}>\thefield{year}}% {\toggletrue{cms@switchdates}% \usebibmacro{cmsbibyear}}% @@ -2082,45 +2132,65 @@ \newbibmacro*{origyear+labelyear}{% \iftoggle{cms@switchdates}% {\usebibmacro{labelyear+extrayear}% - \clearfield{year}}% + \iffieldundef{endyear}% DATE FIX + {\clearfield{year}}% + {}}% {\iffieldundef{origyear} {\usebibmacro{labelyear+extrayear}}% - {\printtext[bibhyperref]{% + {\printtext{% \printfield{origyear}}% - \clearfield{origyear}}}} + \iffieldundef{origendyear}% DATE FIX + {\clearfield{origyear}}% + {}}}} \newbibmacro*{bothyear+newstyle}{% \iftoggle{cms@switchdates}% {\usebibmacro{labelyear+extrayear}\addslash% \setunit{}% Need * here? \printfield{origyear}% - \clearfield{year}% - \clearfield{origyear}}% + \iffieldundef{endyear}% DATE FIX + {\clearfield{year}}% + {}% + \iffieldundef{origendyear}% DATE FIX + {\clearfield{origyear}}% + {}}% {\iffieldundef{origyear}% {\usebibmacro{labelyear+extrayear}}% - {\printtext[bibhyperref]{% Why? + {\printtext{% Why? \printfield{origyear}\addslash% \setunit*{}% \printfield{labelyear}}% - \clearfield{origyear}% - \clearfield{year}}}} + \iffieldundef{origendyear}% DATE FIX + {\clearfield{origyear}}% + {}% + \iffieldundef{endyear}% DATE FIX + {\clearfield{year}}% + {}}}} \newbibmacro*{bothyear+oldstyle}{% \iftoggle{cms@switchdates}% - {\printtext[bibhyperref]{% + {\printtext{% \bibopenbracket% \usebibmacro{labelyear+extrayear}% \bibclosebracket% \setunit{\addspace}\printfield{origyear}}% - \clearfield{year}% - \clearfield{origyear}}% + \iffieldundef{endyear}% DATE FIX + {\clearfield{year}}% + {}% + \iffieldundef{origendyear}% DATE FIX + {\clearfield{origyear}}% + {}}% {\iffieldundef{origyear} {\usebibmacro{labelyear+extrayear}}% - {\printtext[bibhyperref]{% + {\printtext{% \printfield[brackets]{origyear}% \setunit*{\addspace}\printfield{labelyear}}% - \clearfield{origyear}% - \clearfield{year}}}} + \iffieldundef{origendyear}% DATE FIX + {\clearfield{origyear}}% + {}% + \iffieldundef{endyear}% DATE FIX + {\clearfield{year}}% + {}}}} \newbibmacro*{pubstate}{% \iftoggle{cms@reprint}% |