diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx')
-rw-r--r-- | Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx | 128 |
1 files changed, 73 insertions, 55 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx index eb980243c43..bd39d98c705 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx @@ -1,10 +1,10 @@ -% $Id: chicago-notes.cbx,v 0.9.7.34 2012/07/05 10:50:34 dfussner Exp $ +% $Id: chicago-notes.cbx,v 0.9.7.40 2012/12/06 11:58:41 dfussner Exp $ % This is a biblatex citation style file, adapted from Lehman's % authortitle-cverb.cbx. It is heavily modified, with the intention % of providing footnote citations and a bibliography formatted % according to the specifications of the Chicago Manual of Style. -\ProvidesFile{chicago-notes.cbx}[2012/07/05 v 1.7 biblatex citation style] +\ProvidesFile{chicago-notes.cbx}[2012/12/06 v 2.4 biblatex citation style] %%%% Biblatex initialization + Chicago options + Toggles %%%% @@ -18,6 +18,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} @@ -100,7 +101,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]{% @@ -131,7 +140,15 @@ \DeclareEntryOption{url}[true]{% \settoggle{cms@url}{#1}} \DeclareEntryOption{doi}[true]{% - \settoggle{cms@doi}{#1}} + \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{eprint}[true]{% \settoggle{cms@eprint}{#1}} \DeclareEntryOption{numbermonth}[true]{% @@ -321,11 +338,11 @@ \newbibmacro*{cms:shorthandintro}{% For changing the citedas phrase \iffieldundef{shorthandintro}% - {\setunit{\addspace}% + {\addspace%\setunit{\addspace}% Fix for after postnote field \printtext[parens]{% \bibstring{citedas}\space% \printfield{shorthand}}}% - {\setunit{\addspace}% + {\addspace%\setunit{\addspace}% Ditto \printfield{shorthandintro}}} \newbibmacro*{cite:ibid}{% @@ -588,6 +605,24 @@ \DeclareMultiCiteCommand{\citetitles}{citetitle}{\multicitedelim} +\DeclareCiteCommand{\textcite}[\cbx@textcite\cbx@textcite@i] + {\boolfalse{citetracker}% + \gdef\cbx@savedkeys{}} + {\printnames{labelname}% + \xappto\cbx@savedkeys{\thefield{entrykey},}} + {\multinamedelim} + {\protected@xappto\cbx@savedcites{% + [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}} + +\DeclareMultiCiteCommand{\textcites}[\cbx@textcite\cbx@textcites@i] + {\textcite}{\multinamedelim} + +\newrobustcmd{\cbx@textcite}[2]{\def\cbx@savedcites{#1}#2\cbx@savedcites} +\newrobustcmd{\cbx@textcite@i}{% + \iffootnote{\newcunit\bibstring{in}\addspace\headlesscite}{\footcite}} +\newrobustcmd{\cbx@textcites@i}{% + \iffootnote{\newcunit\bibstring{in}\addspace\cites}{\footcites}} + %%%% Drivers for the Long Note Format %%%% \DeclareBibliographyDriver{cite:article}{% @@ -1606,9 +1641,14 @@ \setunit{\addcomma\addspace}% \iffieldundef{urlyear}% {}% - {\printtext[urldate]{\printurldate}}% + {\printurldate}% Date fix \newcunit\newblock - \printfield{doi}% + \iftoggle{cms@doionly}% + {\iffieldundef{doi}% + {}% + {\printfield{doi}% + \clearfield{url}}}% + {\printfield{doi}}% \newcunit\newblock \usebibmacro{eprint}% \newcunit\newblock @@ -2087,9 +2127,9 @@ \usebibmacro{cnotefield}% \newcunit\newblock \usebibmacro{cpubl+loc+year}% - \usebibmacro{fullpostnote}% \newcunit\newblock - \printfield{type}% + \printfield{type}% Order of this and next? + \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% \newcunit\newblock @@ -2106,7 +2146,7 @@ \DeclareListFormat{language}{% \ifthenelse{\value{listcount}=1}% - {\bibleftbracket\bibstring{inlang}\addspace% + {\bibleftbracket\bibstring{inlang}%\addspace - for inflected langs. \ifbibstring{#1} {\bibstring{#1}} {\ifbibstring{lang#1} @@ -2162,32 +2202,6 @@ {#1\isdot}% {\mkbibquote{#1\isdot}}} -\newcommand*{\long@kludge}{% 16th edition places commas after these - \ifboolexpr{% punctuation marks. - ( - test {\ifpunctmark{?}} - or - test {\ifpunctmark{!}} - ) - and - not togl {cms@fullnote}%test {\ifcitation} - }% - {\spacefactor\blx@sf@dot}%\blx@postpunct\addperiod}% - {\isdot}}% - -\newcommand*{\short@kludge}{% 16th edition places commas after these - \ifboolexpr{% punctuation marks. Needed? - ( - test {\ifpunctmark{?}} - or - test {\ifpunctmark{!}} - ) - and - not test {\iffieldundef{postnote}} - }% - {\isdot\midsentence}% - {\isdot}}% - \DeclareFieldFormat[article]{lostitle}{% \iffieldundef{title}% {#1\isdot}% @@ -2405,13 +2419,6 @@ %%%% Other Field Formats %%%% -% \InitializeCitationStyle{\numgdef{\cbx@resetcount}{\cbx@resetcount+1}} -% \DeclareFieldFormat{bibhyperlink}{% -% \bibhyperlink{\iffootnote{f}{t}:\cbx@resetcount:\thefield{entrykey}}{#1}} -% \DeclareFieldFormat{bibhypertarget}{% -% \bibhypertarget{\iffootnote{f}{t}:\cbx@resetcount:\thefield{entrykey}}{#1}} -% \newcommand*{\cbx@resetcount}{0} - \DeclareNumChars*{:}% For proper ibidem with multi-volume works. \DeclareFieldFormat{letterday}{\mkbibcurdinal{#1}} @@ -2466,9 +2473,11 @@ {\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}% @@ -3149,12 +3158,12 @@ {}% {\iffieldundef{origyear}% {}% - {\printtext[origdate]{\usebibmacro{cmsorigdate}}}}} + {\usebibmacro{cmsorigdate}}}}% Date fix \newbibmacro*{music+eventdate}{% \iffieldundef{eventyear}% {}% - {\printtext[eventdate]{\printeventdate}}} + {\printeventdate}}% Date fix \newbibmacro*{ctitle+stitle}{% \printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work) @@ -3586,11 +3595,16 @@ \newbibmacro*{cite+doi+url}{% 16th ed. \iffieldundef{urlyear} {} - {\printtext[urldate]{\printurldate}}% + {\printurldate}% Date fix \newcunit\newblock - \iftoggle{cms@doi}% - {\printfield{doi}}% - {}% + \iftoggle{cms@doionly}% + {\iffieldundef{doi}% + {}% + {\printfield{doi}% + \clearfield{url}}}% + {\iftoggle{cms@doi}% + {\printfield{doi}}% + {}}% \newcunit\newblock \iftoggle{cms@eprint}% {\usebibmacro{eprint}}% @@ -3859,8 +3873,12 @@ {\printnames[labelname]{namec}}% {}}}}}}}% -\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}} \DeclareDataInheritance{collection}{suppcollection}{% \inherit{title}{title} |