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 | 94 |
1 files changed, 63 insertions, 31 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 8ff2919f00f..b73c23d5fa4 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.19 2012/07/05 11:04:14 dfussner Exp $ +% $Id: chicago-authordate.cbx,v 0.8.1.25 2012/12/06 11:43:37 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, 15th edition. +% author-date style of the Chicago Manual of Style, 16th edition. -\ProvidesFile{chicago-authordate.cbx}[2012/07/05 v 1.7 biblatex citation style] +\ProvidesFile{chicago-authordate.cbx}[2012/12/06 v 2.4 biblatex citation style] %%%% Biblatex initialization + Chicago options + Toggles %%%% @@ -27,6 +27,7 @@ \providetoggle{cms@url}% These are for the field-exclusion options \providetoggle{cms@doi} +\providetoggle{cms@doionly} \providetoggle{cms@eprint} \providetoggle{cms@isbn} \providetoggle{cms@numbermonth} @@ -55,7 +56,10 @@ {\csuse{cms@opt@avdate@#1}} {\blx@err@invopt{avdate=#1}{}}} \def\cms@opt@avdate@true{% - \DeclareLabelyear[music,review,video]{eventyear,origyear,year,urlyear}% + \@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4 + {\DeclareLabelyear[music,review,video]{\field{eventyear}% + \field{origyear} \field{year} \field{urlyear}}}% + {\DeclareLabelyear[music,review,video]{eventyear,origyear,year,urlyear}}% \toggletrue{cms@avdate}}% \def\cms@opt@avdate@false{% \togglefalse{cms@avdate}} @@ -64,12 +68,6 @@ \ifcsdef{cms@opt@cmsdate@#1}% labelyear. Sorting will be an issue. {\csuse{cms@opt@cmsdate@#1}} {\blx@err@invopt{cmsdate=#1}{}}} -\def\cms@opt@cmsdate@on{% - \toggletrue{cms@origlabel}} -\def\cms@opt@cmsdate@new{% - \toggletrue{cms@bothlabelnew}} -\def\cms@opt@cmsdate@old{% - \toggletrue{cms@bothlabelold}} \DeclareEntryOption{cmsdate}[off]{% Trying to implement origyear as \ifcsdef{cms@opt@cmsdate@#1}% labelyear. Sorting will be an issue. @@ -131,7 +129,15 @@ \DeclareBibliographyOption{url}[true]{% \settoggle{cms@url}{#1}} \DeclareBibliographyOption{doi}[true]{% - \settoggle{cms@doi}{#1}} + \ifcsdef{cms@opt@doi@#1}% + {\csuse{cms@opt@doi@#1}} + {\blx@err@invopt{doi=#1}{}}} +\def\cms@opt@doi@true{% + \toggletrue{cms@doi}} +\def\cms@opt@doi@false{% + \togglefalse{cms@doi}} +\def\cms@opt@doi@only{% + \toggletrue{cms@doionly}} \DeclareBibliographyOption{eprint}[true]{% \settoggle{cms@eprint}{#1}} \DeclareBibliographyOption{numbermonth}[true]{% @@ -148,10 +154,18 @@ \DeclareEntryOption{isbn}[true]{% \settoggle{cms@isbn}{#1}} +\DeclareEntryOption{doi}[true]{% + \ifcsdef{cms@opt@doi@#1}% + {\iftoggle{cms@doi}% + {\togglefalse{cms@doi}% + \iftoggle{cms@doionly}% + {\togglefalse{cms@doionly}}% !! + {}}% + {\toggletrue{cms@doi}}% !! + \csuse{cms@opt@doi@#1}} + {\blx@err@invopt{doi=#1}{}}} \DeclareEntryOption{url}[true]{% \settoggle{cms@url}{#1}} -\DeclareEntryOption{doi}[true]{% - \settoggle{cms@doi}{#1}} \DeclareEntryOption{eprint}[true]{% \settoggle{cms@eprint}{#1}} \DeclareEntryOption{numbermonth}[true]{% @@ -197,8 +211,12 @@ } } -\DeclareLabelname{shortauthor,author,shorteditor,namea,editor,% -nameb,translator,namec} +\@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4 +{\DeclareLabelname{\field{shortauthor} \field{author}% + \field{shorteditor} \field{namea} \field{editor}% + \field{nameb} \field{translator} \field{namec}}} +{\DeclareLabelname{shortauthor,author,shorteditor,namea,% + editor,nameb,translator,namec}} \DeclareEntryOption{switchdates}[true]{% \settoggle{cms@switchdates}{#1}} @@ -742,7 +760,13 @@ nameb,translator,namec} \iftoggle{cms@noibid}% {\blx@ibidreset% \usebibmacro{cite}}% - {\toggletrue{cms@inlineibid}}} + {\ifthenelse{\iffieldundef{prenote}\AND% + \iffieldundef{postnote}}% + {\blx@ibidreset% + \usebibmacro{cite}% + \PackageWarning{biblatex-chicago}% + {Empty Ibidem citation}}% + {\toggletrue{cms@inlineibid}}}} %%%% Citation Commands, internal and external %%%% @@ -851,7 +875,7 @@ nameb,translator,namec} \DeclareListFormat{language}{% \ifthenelse{\value{listcount}=1}% - {\bibleftbracket\bibstring{inlang}\addspace% + {\bibleftbracket\bibstring{inlang}%\addspace - for inflected langs. \ifbibstring{#1} {\bibstring{#1}} {\ifbibstring{lang#1} @@ -1187,9 +1211,11 @@ nameb,translator,namec} {\printfield{userd}\addspace #1}} \DeclareFieldFormat[music]{origdate}{% 16th ed. - \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}}% - {\bibstring{recorded}\space #1}% - {\printfield{userd}\addspace #1}} + \iftoggle{cms@reprint}% Date fix + {#1}% + {\ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}}% + {\bibstring{recorded}\space #1}% + {\printfield{userd}\addspace #1}}} \DeclareFieldFormat[music]{eventdate}{% 16th ed. \iffieldundef{userd}% @@ -1770,24 +1796,30 @@ nameb,translator,namec} \newbibmacro*{music+origdate}{% \iftoggle{cms@reprint}% 16th ed. {}% - {\iftoggle{cms@switchdates}% + {\iftoggle{cms@switchdates}% Date fix {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}% {}% - {\printtext[origdate]{\usebibmacro{cmsorigdate}}}}% + {\usebibmacro{cmsorigdate}}}% {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}}% {}% - {\printtext[origdate]{\usebibmacro{cmsorigdate}}}}}}% + {\usebibmacro{cmsorigdate}}}}}% -\newbibmacro*{music+eventdate}{% +\newbibmacro*{music+eventdate}{% Date fix \ifthenelse{\iffieldundef{eventyear}\AND\iffieldundef{eventmonth}}% {}% - {\printtext[eventdate]{\printeventdate}}} + {\printeventdate}} \newbibmacro*{ser+num}{% \printfield{series}% \printfield[sernum]{number}% \newunit} +\newbibmacro*{video+title}{% Simplifies trad style. + \printtext[title]{% + \printfield[noformat]{title}% + \setunit{\addcolon\addspace}% + \printfield[noformat]{subtitle}}} + \newbibmacro*{italtitle+stitle}{% \printtext[title]{% \printfield[noformat]{title}% @@ -2055,12 +2087,12 @@ nameb,translator,namec} \setunit{\addcolon\addspace}% \printfield[noformat]{journalsubtitle}}}} -\newbibmacro*{url+date}{% Changed for 0.9 - \printfield{url}% - \iffieldundef{urlyear} - {} - {\setunit{\addspace}% - \printtext[urldate]{\printurldate}}} +% \newbibmacro*{url+date}{% Changed for 0.9: No longer called? +% \printfield{url}% +% \iffieldundef{urlyear} +% {} +% {\setunit{\addspace}% +% \printtext[urldate]{\printurldate}}} \newbibmacro*{chap+pag}{% \printfield{chapter}% |