From b114d96898098a66dc02ad51ec93d68b835e2a93 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 18 Feb 2011 00:23:14 +0000 Subject: biblatex-chicago (16feb11) git-svn-id: svn://tug.org/texlive/trunk@21454 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/biblatex-chicago/biblatex-chicago.sty | 8 +- .../latex/biblatex-chicago/chicago-authordate.bbx | 615 +++++++++--- .../latex/biblatex-chicago/chicago-authordate.cbx | 361 +++---- .../tex/latex/biblatex-chicago/chicago-notes.bbx | 598 +++++++++--- .../tex/latex/biblatex-chicago/chicago-notes.cbx | 1028 ++++++++++++++------ .../tex/latex/biblatex-chicago/cms-american.lbx | 36 +- .../tex/latex/biblatex-chicago/cms-french.lbx | 41 +- .../tex/latex/biblatex-chicago/cms-german.lbx | 36 +- .../tex/latex/biblatex-chicago/cms-ngerman.lbx | 36 +- 9 files changed, 1955 insertions(+), 804 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-chicago') diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty b/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty index 6aebbb89278..e6e03ea3dfa 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty @@ -1,6 +1,6 @@ -% $Id: biblatex-chicago.sty,v 0.1.1.29 2010/09/07 10:51:36 dfussner Exp $ +% $Id: biblatex-chicago.sty,v 0.1.1.31 2011/02/15 11:56:42 dfussner Exp $ -% Copyright (c) 2009-2010 David Fussner. This package is +% Copyright (c) 2009-2011 David Fussner. This package is % author-maintained. % % This work may be copied, distributed and/or modified under the @@ -13,7 +13,7 @@ % but not limited to, the implied warranties of merchantability and % fitness for a particular purpose. -\ProvidesPackage{biblatex-chicago}[2010/09/07 v.0.9d biblatex style] +\ProvidesPackage{biblatex-chicago}[2011/02/15 v 1.2a biblatex style] \RequirePackage{etoolbox} @@ -37,7 +37,7 @@ \ExecuteBibliographyOptions{% pagetracker=true,autocite=inline,alldates=comp,labelyear=true, uniquename=true,useeditor=true,usetranslator=true,usecompiler=true, - ibidtracker=constrict,sorting=nyt,cmslos=true,nodates}} + ibidtracker=constrict,sorting=nyt,punctfont,cmslos=true,nodates}} \def\cms@notes{% \RequirePackage[style=chicago-notes]{biblatex}% 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 b8a47e28a83..d63a666fd5f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx @@ -1,10 +1,10 @@ -% $Id: chicago-authordate.bbx,v 0.6.1.17 2010/09/03 08:51:57 dfussner Exp $ +% $Id: chicago-authordate.bbx,v 0.8 2011/02/15 14:59:29 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. -\ProvidesFile{chicago-authordate.bbx}[2010/09/03 v0.9c biblatex +\ProvidesFile{chicago-authordate.bbx}[2011/02/15 v 1.2a biblatex bibliography style] %%%% Initialize and format bibliography and los %%%% @@ -56,6 +56,50 @@ bibliography style] %%%% Author, Editor, Translator, and Compiler Macros %%%% +\renewbibmacro*{name:last-first}[4]{% + \ifuseprefix + {\usebibmacro{name:delim}{#3#1}% + \usebibmacro{name:hook}{#3#1}% + \ifblank{#3}{}{% + \ifcapital + {\mkbibnameprefix{\MakeCapital{#3}}\isdot} + {\mkbibnameprefix{#3}\isdot}% + \ifpunctmark{'}{}{\addhighpenspace}}% + \mkbibnamelast{#1}\isdot + \ifblank{#2}{}{\addcomma\addlowpenspace\mkbibnamefirst{#2}\isdot}% + \ifblank{#4}{}{\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot}} + {\usebibmacro{name:delim}{#1}% + \usebibmacro{name:hook}{#1}% + \mkbibnamelast{#1}\isdot% + \ifblank{#2#3#4}{}{\addcomma}% + \ifblank{#2}{}{\addlowpenspace\mkbibnamefirst{#2}\isdot}% + \ifblank{#3}{}{\addlowpenspace\mkbibnameprefix{#3}\isdot}% + \ifblank{#4}{}{\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot}}} + +\renewbibmacro*{name:first-last}[4]{% + \usebibmacro{name:delim}{#2#3#1}% + \usebibmacro{name:hook}{#2#3#1}% + \ifblank{#2}{}{\mkbibnamefirst{#2}\isdot\addlowpenspace}% + \ifblank{#3}{}{% + \mkbibnameprefix{#3}\isdot + \ifpunctmark{'} + {} + {\ifuseprefix{\addhighpenspace}{\addlowpenspace}}}% + \mkbibnamelast{#1}\isdot + \ifblank{#4}{}{% + \iftoggle{cms@jrcomma}% + {\ifnumeral{#4}% + {\addlowpenspace\mkbibnameaffix{#4}\isdot}% + {\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot% + \ifboolexpr{ + test{\ifnumless{\value{listcount}}{\value{listtotal}}} + and + test{\ifnumless{\value{listcount}}{\value{maxnames}}} + } + {\addcomma}% + {}}}% + {\addlowpenspace\mkbibnameaffix{#4}\isdot}}} + \newbibmacro*{author/editors/translators}{% \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}% {\usebibmacro{author}}% @@ -303,11 +347,11 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{issn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{issn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -334,18 +378,17 @@ bibliography style] \newunit\newblock \printfield{note}% \setunit*{\addcomma\addspace}\newblock% (changed for 0.7)?? -% \usebibmacro{cms-in:}% \usebibmacro{journal+issue+year+pages}% \newunit\newblock \usebibmacro{pubstate}% \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{issn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{issn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -386,15 +429,107 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% - \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}} +\DeclareBibliographyDriver{audio}{% + \usebibmacro{bibindex}% + \usebibmacro{author/editor}% + \setunit{\addspace}% + \printfield{nameaddon}% + \newunit\newblock + \usebibmacro{cmsbibsortdate}% + \newunit\newblock + \usebibmacro{italtitle+stitle}% + \newcunit\newblock + \usebibmacro{byauthor}% + \newunit\newblock + \usebibmacro{part+editor+translator}% + \newcunit%\setunit{\addperiod\addspace}% + \usebibmacro{chapinscore}% + \usebibmacro{btitle+bstitle}% + \iffieldundef{booktitle} + {\setunit{\addperiod\addspace}}% Fix customc? + {\setunit{\addcomma\addspace}}% + \iffieldundef{edition}% + {}% + {\usebibmacro{edition}% + \newcunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}% + \clearfield{volume}% + \clearfield{part}}% + {}% + \newcunit + \printfield{volumes} + \clearfield{volumes}}% + \newunit% unit, not cunit? + \usebibmacro{bybookauthor}% + \usebibmacro{byeditor+others}% + \newunit% ??? Editorpunct maybe not right here? + \iffieldundef{maintitle} + {} + {\iffieldundef{volume} + {\usebibmacro{cms-in:}% + \printtext{% + \printfield{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[maintitle]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}} + {\printfield{volume}% + \printfield{part}% + \setunit{\addspace} + \bibstring{ofseries}% + \setunit{\addspace} + \printtext{% + \printfield{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[maintitle]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}}} + \newcunit\newblock + \printfield{pages}% + \newunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newunit + \printfield{volumes}% + \newunit\newblock + \usebibmacro{ser+num}% + \newunit\newblock + \usebibmacro{bibreprint}%\printorigdate% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{publ+loc+year}% + \newunit + \printfield{type}% + \newunit\newblock + \usebibmacro{pubstate}% + \newunit\newblock + \printfield{addendum}% + \setunit*{\addcomma\addspace}\newblock% + \iftoggle{cms@isbn}% + {\printfield{isan}% + \setunit*{\addcomma\addspace}\newblock% + \printfield{ismn}}% + {}% + \setunit*{\addcomma\addspace}\newblock% + \usebibmacro{bib+doi+url}% + \newunit\newblock + \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{originally+published+as}% + \usebibmacro{finentry}}% + \DeclareBibliographyDriver{book}{% \usebibmacro{bibindex}% \usebibmacro{author/editor}% @@ -440,7 +575,10 @@ bibliography style] \clearfield{volumes}}% \usebibmacro{editorpunct}% \usebibmacro{byeditor+others}% - \newcunit\newblock + \usebibmacro{editorpunct}% + \iftoggle{cms@bookpages}% + {}% + {\clearfield{pages}}% \usebibmacro{chap+pag}% \newunit \iffieldundef{maintitle} @@ -451,8 +589,6 @@ bibliography style] \printfield{volumes}% \newunit\newblock \usebibmacro{ser+num}% -% \newunit\newblock -% \printorigdate% \newunit\newblock \printfield{note}% \newunit\newblock @@ -466,11 +602,11 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -539,8 +675,6 @@ bibliography style] \printfield{volumes}% \newunit\newblock \usebibmacro{ser+num}% -% \newunit\newblock -% \printorigdate% \newunit\newblock \printfield{note}% \newunit\newblock @@ -552,11 +686,11 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -587,9 +721,7 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% - \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -623,8 +755,6 @@ bibliography style] \clearfield{volumes}}% \usebibmacro{editorpunct}% \usebibmacro{bytranslator+others}% -% \newunit\newblock -% \printfield{edition}% \newunit \iffieldundef{maintitle} {\printfield{volume}% @@ -634,8 +764,6 @@ bibliography style] \printfield{volumes}% \newunit\newblock \usebibmacro{ser+num}% -% \newunit\newblock -% \printorigdate% \newunit\newblock \printfield{note}% \newunit\newblock @@ -647,22 +775,25 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}} -\DeclareBibliographyAlias{customa}{letter}% - -\DeclareBibliographyAlias{customb}{bookinbook}% - -\DeclareBibliographyAlias{customc}{suppbook}% +\DeclareBibliographyDriver{customc}{% + \usebibmacro{bibindex}% + \usebibmacro{author/editor}% + \newunit\newblock + \printfield{nameaddon}% + \setunit*{\addspace}% + \usebibmacro{italtitle+stitle}% + \usebibmacro{finentry}} \DeclareBibliographyDriver{image}{% \usebibmacro{bibindex}% @@ -700,9 +831,7 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% - \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -747,8 +876,6 @@ bibliography style] \usebibmacro{byeditor+others}% \newcunit\newblock \printfield{pages}% -% \newunit\newblock -% \printfield{edition}% \newunit \iffieldundef{maintitle} {\printfield{volume}% @@ -758,8 +885,6 @@ bibliography style] \printfield{volumes}% \newunit\newblock \usebibmacro{ser+num}% -% \newunit\newblock -% \printorigdate% \newunit\newblock \printfield{note}% \newunit\newblock @@ -771,11 +896,11 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -797,7 +922,6 @@ bibliography style] \usebibmacro{byauthor}% \setunit{\addperiod\addspace}% \usebibmacro{part+editor+translator}% -% \setunit{\addperiod\addspace}% Part of the crossref fix. Moved below. \iffieldundef{crossref}% {\iffieldundef{xref}% {\setunit{\addperiod\addspace}% Moved here. @@ -823,8 +947,6 @@ bibliography style] \usebibmacro{byeditor+others}% \newcunit\newblock \printfield{pages}% -% \newunit\newblock -% \printfield{edition}% \newunit \iffieldundef{maintitle} {\printfield{volume}% @@ -834,8 +956,6 @@ bibliography style] \printfield{volumes}% \newunit\newblock \usebibmacro{ser+num}% -% \newunit\newblock -% \printorigdate% \newunit\newblock \printfield{note}% \newunit\newblock @@ -847,11 +967,11 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -881,7 +1001,6 @@ bibliography style] \usebibmacro{byauthor}% \setunit{\addperiod\addspace}% \usebibmacro{part+editor+translator}% -% \setunit{\addperiod\addspace}% \iffieldundef{crossref}% {\iffieldundef{xref}% {\setunit{\addperiod\addspace}% @@ -910,11 +1029,11 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -973,8 +1092,6 @@ bibliography style] \usebibmacro{byeditor+others}% \newcunit\newblock \usebibmacro{chap+pag}% -% \newunit\newblock -% \printfield{edition}% \newunit \iffieldundef{maintitle} {\printfield{volume}% @@ -984,8 +1101,6 @@ bibliography style] \printfield{volumes}% \newunit\newblock \usebibmacro{ser+num}% -% \newunit\newblock -% \printorigdate% \newunit\newblock \printfield{note}% \newunit\newblock @@ -1006,11 +1121,11 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1060,8 +1175,6 @@ bibliography style] \usebibmacro{byeditor+others}% \newcunit\newblock \printfield{pages}% -% \newunit\newblock -% \printfield{edition}% \newunit \iffieldundef{maintitle} {\printfield{volume}% @@ -1082,11 +1195,11 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1118,8 +1231,6 @@ bibliography style] \usebibmacro{edition}% \newcunit \usebibmacro{byauthor}% -% \newunit\newblock -% \printfield{edition}% \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock @@ -1135,11 +1246,11 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1192,9 +1303,109 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \usebibmacro{bib+doi+url}% + \newunit\newblock + \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{originally+published+as}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{music}{% + \usebibmacro{bibindex}% + \usebibmacro{author/editor}% + \setunit{\addspace}% + \printfield{nameaddon}% + \newunit\newblock + \usebibmacro{cmsbibsortdate}% + \newunit\newblock + \usebibmacro{italtitle+stitle}% + \newcunit% + \printeventdate% + \newcunit% + \usebibmacro{byauthor}% + \newunit\newblock + \usebibmacro{part+editor+translator}% + \newunit\newblock + \usebibmacro{chapinscore}% + \usebibmacro{btitle+bstitle}% + \iffieldundef{booktitle} + {\newunit}% Fix customc? + {\newcunit}% + \iffieldundef{edition}% + {}% + {\usebibmacro{edition}% + \newcunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}% + \clearfield{volume}% + \clearfield{part}}% + {}% + \newcunit + \printfield{volumes} + \clearfield{volumes}}% + \newunit% unit, not cunit? + \usebibmacro{bybookauthor}% + \usebibmacro{byeditor+others}% + \newunit% ??? Editorpunct maybe not right here? + \iffieldundef{maintitle} + {} + {\iffieldundef{volume} + {\usebibmacro{cms-in:}% + \printtext{% + \printfield{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[maintitle]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}} + {\printfield{volume}% + \printfield{part}% + \setunit{\addspace} + \bibstring{ofseries}% + \setunit{\addspace} + \printtext{% + \printfield{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[maintitle]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}}} + \newcunit\newblock + \printfield{pages}% + \newunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newunit + \printfield{volumes}% + \newunit\newblock + \printfield{version}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{music+ser+num}% + \newunit + \usebibmacro{music+publisher}% + \setunit*{\addspace}%\newblock + \usebibmacro{date}% + \setunit{\ifthenelse{\iffieldundef{howpublished}\AND% + \iffieldundef{pubstate}}% + {\newunit}{\space\bibstring{by}\space}}% + \printlist{publisher}% + \newunit + \usebibmacro{institution+organization}% + \setunit*{\addcomma\addspace}\newblock + \printlist{location}% + \newunit\newblock + \printfield{type}% + \newunit\newblock + \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \iftoggle{cms@isbn}% + {\printfield{iswc}}% + {}% + \setunit*{\addcomma\addspace}\newblock% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1223,7 +1434,9 @@ bibliography style] \newunit\newblock \usebibmacro{date}% \newunit\newblock - \printfield{doi}% + \iftoggle{cms@doi}% + {\printfield{doi}}% + {}% \setunit*{\addcomma\addspace}\newblock% \usebibmacro{url+date}% \newunit\newblock @@ -1261,7 +1474,6 @@ bibliography style] \newcunit\newblock \printfield{version}% \newcunit\newblock -% \bibstring{patentfiled}\addspace}\newblock% \iftoggle{cms@switchdates}% {\bibstring{patentfiled}% \setunit{\addspace}% @@ -1280,15 +1492,12 @@ bibliography style] \setunit{\addcomma\addspace\bibstring{and}% \addspace\bibstring{patentissued}\addspace}% \usebibmacro{date}}}% -% \usebibmacro{date}% \newcunit\newblock \printfield{addendum}% \newunit\newblock \usebibmacro{pubstate}% \newunit\newblock - \printfield{doi}% - \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1320,11 +1529,11 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{issn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{issn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1349,18 +1558,17 @@ bibliography style] \newunit\newblock \printfield{note}% \setunit*{\addcomma\addspace}\newblock% (changed for 0.7)?? -% \usebibmacro{cms-in:}% \usebibmacro{periodical+issue+year+pages}% \newunit\newblock \usebibmacro{pubstate}% \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{issn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{issn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1398,11 +1606,11 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1453,8 +1661,6 @@ bibliography style] \usebibmacro{byeditor+others}% \newcunit\newblock \usebibmacro{chap+pag}% -% \newunit\newblock -% \printfield{edition}% \newunit \iffieldundef{maintitle} {\printfield{volume}% @@ -1464,8 +1670,6 @@ bibliography style] \printfield{volumes}% \newunit\newblock \usebibmacro{ser+num}% -% \newunit\newblock -% \printorigdate% \newunit\newblock \printfield{note}% \newunit\newblock @@ -1477,11 +1681,11 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1514,11 +1718,11 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isrn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isrn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1535,7 +1739,6 @@ bibliography style] \newunit\newblock \usebibmacro{cmsbibsortdate}% \newunit\newblock -% \usebibmacro{mag+news+title}% \printfield{title}% \setunit{\addcolon\addspace}% \printfield[noformat]{subtitle}% @@ -1562,11 +1765,11 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{issn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{issn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1618,10 +1821,8 @@ bibliography style] \clearfield{volumes}}% \usebibmacro{editorpunct}% \usebibmacro{byeditor}% - \newcunit\newblock + \usebibmacro{editorpunct}%\newcunit\newblock \usebibmacro{chap+pag}% -% \newunit\newblock -% \printfield{edition}% \newunit \iffieldundef{maintitle} {\printfield{volume}% @@ -1631,8 +1832,6 @@ bibliography style] \printfield{volumes}% \newunit\newblock \usebibmacro{ser+num}% -% \newunit\newblock -% \printorigdate% \newunit\newblock \printfield{note}% \newunit\newblock @@ -1644,11 +1843,11 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1683,9 +1882,7 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% - \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1720,15 +1917,125 @@ bibliography style] \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \iftoggle{cms@url} + {\usebibmacro{url+date}}% + {}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}} +\DeclareBibliographyDriver{video}{% + \usebibmacro{bibindex}% + \usebibmacro{author/editor}% + \setunit{\addspace}% + \printfield{nameaddon}% + \newunit\newblock + \usebibmacro{cmsbibsortdate}% + \newunit\newblock + \printtext{% + \printfield{title}% + \setunit{\addcolon\addspace}% + \printfield[title]{subtitle}}% + \iffieldundef{booktitle}% Comma after italics, period after quotes + {\newcunit} + {\newunit}%\setunit{\addspace}\newblock% + \printfield{titleaddon}%\usebibmacro{title+stitle}% + \setunit{\addspace}\newblock%\bibsentence + \usebibmacro{language+transtitle}% + \setunit{\addcomma\addspace}% + \usebibmacro{byauthor}% + \setunit{\addperiod\addspace}% + \usebibmacro{part+editor+translator}% + \setunit{\addperiod\addspace}% + \usebibmacro{chapinscore}% + \usebibmacro{btitle+bstitle}% + \iffieldundef{booktitle} + {\setunit{\addperiod\addspace}}% Fix customc? + {\setunit{\addcomma\addspace}}% + \iffieldundef{edition}% + {}% + {\usebibmacro{edition}% + \newcunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}% + \clearfield{volume}% + \clearfield{part}}% + {}% + \newcunit + \printfield{volumes} + \clearfield{volumes}}% + \newunit + \printfield{type}% + \newunit% unit, not cunit? + \usebibmacro{bybookauthor}% + \usebibmacro{byeditor+others}% + \newunit% ??? Editorpunct maybe not right here? + \iffieldundef{maintitle} + {} + {\iffieldundef{volume} + {\usebibmacro{cms-in:}% + \printtext{% + \printfield{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[maintitle]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}} + {\printfield{volume}% + \printfield{part}% + \setunit{\addspace} + \bibstring{ofseries}% + \setunit{\addspace} + \printtext{% + \printfield{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[maintitle]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}}} + \newcunit\newblock + \printfield{pages}% + \newunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newunit + \printfield{volumes}% + \newunit\newblock + \usebibmacro{ser+num}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{publ+loc+year}% + \newunit\newblock + \usebibmacro{pubstate}% + \newunit\newblock + \printfield{addendum}% + \setunit*{\addcomma\addspace}\newblock% + \iftoggle{cms@isbn}% + {\printfield{isan}}% + {}% + \setunit*{\addcomma\addspace}\newblock% + \usebibmacro{bib+doi+url}% + \newunit\newblock + \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{originally+published+as}% + \usebibmacro{finentry}}% + %%%% Other Formatting Macros %%%% +\newbibmacro*{bib+doi+url}{% For biblatex field exclusion + \iftoggle{cms@doi}% + {\printfield{doi}}% + {}% + \setunit*{\addcomma\addspace}\newblock% + \iftoggle{cms@url}% + {\usebibmacro{url+date}}% + {}} + \newbibmacro*{shorthand:label}{% Test this \iffieldequalstr{entrysubtype}{magazine}% Simplifies .bib creation {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}}}% @@ -1762,10 +2069,15 @@ bibliography style] \iffieldundef{origyear}% {\usebibmacro{cmsbibyear}}% {\iffieldint{year}% - {\ifthenelse{\thefield{origyear}>\thefield{year}}% - {\toggletrue{cms@switchdates}% - \usebibmacro{cmsbibyear}}% - {\usebibmacro{cmsbibyear}}}% + {\iffieldundef{endyear}% Needed for date ranges - video type, esp. + {\ifthenelse{\thefield{origyear}>\thefield{year}}% + {\toggletrue{cms@switchdates}% + \usebibmacro{cmsbibyear}}% + {\usebibmacro{cmsbibyear}}}% + {\ifthenelse{\thefield{origyear}>\thefield{endyear}}% + {\toggletrue{cms@switchdates}% + \usebibmacro{cmsbibyear}}% + {\usebibmacro{cmsbibyear}}}}% {\usebibmacro{cmsbibyear}}}} \newbibmacro*{cmsbibyear}{% @@ -1830,10 +2142,17 @@ bibliography style] {\iffieldundef{origyear}% {} {\printtext[parens]{% - \bibstring{origpubyear}% - \printfield{origyear}\addperiod}\nopunct}}}% + \usebibmacro{choosepubstring}% + \printorigdate\addperiod}\nopunct}}}% {\printfield{pubstate}}} +\newbibmacro*{choosepubstring}{% + \iffieldequalstr{entrytype}{video}% + {\iffieldequalstr{entrysubtype}{tv}% + {\bibstring{origshownyear}}% + {\bibstring{origreleaseyear}}}% + {\bibstring{origpubyear}}}% + \newbibmacro*{bibreprint}{% \iftoggle{cms@reprint}% {\iffieldundef{origyear}% @@ -1904,6 +2223,7 @@ bibliography style] \printfield{maintitleaddon}}}} \newbibmacro*{journal+issue+year+pages}{% + \iftoggle{cms@numbermonth}{}{\clearfield{month}}% \usebibmacro{cjournal+ser+vol+num}% \setunit{\addspace}% \ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month} @@ -1917,11 +2237,12 @@ bibliography style] \printfield{number}}% {\printfield{issue}% \setunit{\addspace}% - \printfield{year}}}% + \usebibmacro{cmsyear}}}% \setunit{\addcolon\addspace}} \printfield{pages}} \newbibmacro*{periodical+issue+year+pages}{% + \iftoggle{cms@numbermonth}{}{\clearfield{month}}% \usebibmacro{cperiodical+ser+vol+num}% \setunit{\addspace}% \ifthenelse{\iffieldundef{issue}\AND\iffieldundef{month} @@ -1935,7 +2256,7 @@ bibliography style] \printfield{number}}% {\printfield{issue}% \setunit{\addspace}% - \printfield{year}}}% + \usebibmacro{cmsyear}}}% \setunit{\addcolon\addspace}} \printfield{pages}} 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 cb763d8fa2b..10302cb00e6 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.6.1.30 2010/09/03 08:52:06 dfussner Exp $ +% $Id: chicago-authordate.cbx,v 0.8.1.1 2011/02/15 17:09:04 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. -\ProvidesFile{chicago-authordate.cbx}[2010/09/03 v0.9c biblatex citation style] +\ProvidesFile{chicago-authordate.cbx}[2011/02/15 v 1.2a biblatex citation style] %%%% Biblatex initialization + Chicago options + Toggles %%%% @@ -22,6 +22,14 @@ \providetoggle{cms@oneyear} \providetoggle{cms@nodates} +\providetoggle{cms@url}% These are for the field-exclusion options +\providetoggle{cms@doi} +\providetoggle{cms@isbn} +\providetoggle{cms@numbermonth} +\providetoggle{cms@bookpages} + +\providetoggle{cms@jrcomma}% Comma after Jr./Sr. + \providetoggle{cms@headlessnote}% Keep \providetoggle{cms@noibid}% Keep \providetoggle{cms@usecompiler}% Keep @@ -30,6 +38,9 @@ \providetoggle{cms@postposit}% Keep \AtEveryCitekey{% + \iffieldundef{userc}% + {}% + {\nocite{\thefield{userc}}}% \iffieldequalstr{entrytype}{patent}% {\toggletrue{cms@origlabel}}% {}% @@ -88,6 +99,46 @@ \DeclareEntryOption{usecompiler}[true]{% \settoggle{cms@usecompiler}{#1}} +\DeclareBibliographyOption{juniorcomma}[true]{% + \settoggle{cms@jrcomma}{#1}} + +\DeclareEntryOption{juniorcomma}[true]{% + \settoggle{cms@jrcomma}{#1}} + +% The field-exclusion options % + +\DeclareBibliographyOption{isbn}[true]{% + \settoggle{cms@isbn}{#1}} +\DeclareBibliographyOption{url}[true]{% + \settoggle{cms@url}{#1}} +\DeclareBibliographyOption{doi}[true]{% + \settoggle{cms@doi}{#1}} +\DeclareBibliographyOption{numbermonth}[true]{% + \settoggle{cms@numbermonth}{#1}} +\DeclareBibliographyOption{bookpages}[true]{% + \settoggle{cms@bookpages}{#1}} +\DeclareBibliographyOption{includeall}[true]{% + \settoggle{cms@isbn}{#1}% + \settoggle{cms@url}{#1}% + \settoggle{cms@doi}{#1}% + \settoggle{cms@numbermonth}{#1}% + \settoggle{cms@bookpages}{#1}} + +\DeclareEntryOption{isbn}[true]{% + \settoggle{cms@isbn}{#1}} +\DeclareEntryOption{url}[true]{% + \settoggle{cms@url}{#1}} +\DeclareEntryOption{doi}[true]{% + \settoggle{cms@doi}{#1}} +\DeclareEntryOption{numbermonth}[true]{% + \settoggle{cms@numbermonth}{#1}} +\DeclareEntryOption{bookpages}[true]{% + \settoggle{cms@bookpages}{#1}} + +\ExecuteBibliographyOptions{includeall}% + +% More authordate options % + \DeclareEntryOption{switchdates}[true]{% \settoggle{cms@switchdates}{#1}} @@ -167,7 +218,9 @@ {\iffieldequals{namehash}{\cbx@lastyear}% {}% {\usebibmacro{cmsbracketname}% For names in [] - \setunit{\addspace}}% + \iffieldequalstr{entrytype}{customc}% + {\newcunit}% + {\setunit{\addspace}}}% \usebibmacro{cite:label}% \iffieldundef{postnote}% {\savefield{namehash}{\cbx@lasthash}}% @@ -443,10 +496,15 @@ \iffieldundef{origyear}% {\usebibmacro{cmsciteyear}}% {\iffieldint{year}% - {\ifthenelse{\thefield{origyear}>\thefield{year}}% - {\toggletrue{cms@switchdates}% - \usebibmacro{cmsciteyear}}% - {\usebibmacro{cmsciteyear}}}% + {\iffieldundef{endyear}% Needed for date ranges -- video type, esp. + {\ifthenelse{\thefield{origyear}>\thefield{year}}% + {\toggletrue{cms@switchdates}% + \usebibmacro{cmsciteyear}}% + {\usebibmacro{cmsciteyear}}}% + {\ifthenelse{\thefield{origyear}>\thefield{endyear}}% + {\toggletrue{cms@switchdates}% + \usebibmacro{cmsciteyear}}% + {\usebibmacro{cmsciteyear}}}}% {\usebibmacro{cmsciteyear}}}} \newbibmacro*{cmsciteyear}{% @@ -680,12 +738,6 @@ \DeclareFieldFormat[book]{title}{% \mkbibemph{\MakeSentenceCase*{#1}}\isdot} -\DeclareFieldAlias[customb]{title}[book]{title} - -\DeclareFieldAlias[customb]{citetitle}[book]{title} - -\DeclareFieldAlias[customb]{lostitle}[book]{lostitle} - \DeclareFieldAlias[bookinbook]{title}[book]{title} \DeclareFieldAlias[bookinbook]{citetitle}[book]{title} @@ -722,17 +774,17 @@ \DeclareFieldAlias[inreference]{lostitle}[book]{lostitle} -\DeclareFieldFormat[letter]{title}{#1\isdot} +\DeclareFieldAlias[reference]{title}[book]{title} -\DeclareFieldFormat[letter]{citetitle}{#1\isdot} +\DeclareFieldAlias[reference]{citetitle}[book]{title} -\DeclareFieldFormat[letter]{lostitle}{#1\isdot} +\DeclareFieldAlias[reference]{lostitle}[book]{lostitle} -\DeclareFieldAlias[customa]{title}[letter]{title} +\DeclareFieldFormat[letter]{title}{#1\isdot} -\DeclareFieldAlias[customa]{citetitle}[letter]{citetitle} +\DeclareFieldFormat[letter]{citetitle}{#1\isdot} -\DeclareFieldAlias[customa]{lostitle}[letter]{lostitle} +\DeclareFieldFormat[letter]{lostitle}{#1\isdot} \DeclareFieldAlias[inproceedings]{title}[article]{title}% As above @@ -798,11 +850,21 @@ \addspace% \mkbibemph{\MakeSentenceCase*{#1}}\isdot} -\DeclareFieldAlias[customc]{title}[suppbook]{title} - -\DeclareFieldAlias[customc]{citetitle}[suppbook]{lostitle} +\DeclareFieldFormat[customc]{title}{% + \iffieldundef{nameaddon}% + {\mkbibemph{\bibstring{see}}% + \addspace% + #1}% + {#1}} -\DeclareFieldAlias[customc]{lostitle}[suppbook]{lostitle} +\DeclareFieldFormat[customc]{citetitle}{% + \ifnameundef{author}% + {#1} + {\iffieldundef{nameaddon}% + {\mkbibemph{\bibstring{see}}% + \addspace% + #1}% + {\printfield{nameaddon}\addspace #1}}} \DeclareFieldAlias[suppcollection]{title}[suppbook]{title} @@ -862,6 +924,33 @@ \DeclareFieldFormat{maintitle}{\mkbibemph{\MakeSentenceCase*{#1}}} +\DeclareFieldFormat[video]{title}{% + \iffieldundef{booktitle}% + {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}% + {\MakeSentenceCase*{#1}\isdot}} + +\DeclareFieldFormat[video]{citetitle}{% + \iffieldundef{booktitle}% + {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}% + {\MakeSentenceCase*{#1}\isdot}} + +\DeclareFieldFormat[video]{lostitle}{% + \iffieldundef{booktitle}% + {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}% + {\MakeSentenceCase*{#1}\isdot}} + +\DeclareFieldAlias[music]{title}[video]{title} + +\DeclareFieldAlias[music]{citetitle}[video]{citetitle} + +\DeclareFieldAlias[music]{lostitle}[video]{lostitle} + +\DeclareFieldAlias[audio]{title}[video]{title} + +\DeclareFieldAlias[audio]{citetitle}[video]{citetitle} + +\DeclareFieldAlias[audio]{lostitle}[video]{lostitle} + %%%% Other Field Formats %%%% \DeclareNumChars*{:}% @@ -885,10 +974,14 @@ \DeclareFieldAlias[image]{type}[artwork]{type} -\DeclareFieldAlias[customc]{type}[suppbook]{type} - \DeclareFieldAlias[suppcollection]{type}[suppbook]{type} +\DeclareFieldAlias[video]{type}[suppbook]{type} + +\DeclareFieldAlias[music]{type}[suppbook]{type} + +\DeclareFieldAlias[audio]{type}[suppbook]{type} + \DeclareFieldFormat{url}{\url{#1}} \DeclareFieldFormat{doi}{% @@ -899,6 +992,11 @@ \DeclareFieldFormat{nameaddon}{\mkbibbrackets{#1\bibsentence}}% ?! +\DeclareFieldFormat[customc]{nameaddon}{% For cross-refs + \ifbibstring{#1}% + {\mkbibemph{\bibstring{#1}}}% + {#1}}% + \DeclareFieldFormat{edition}{% New in 0.8 \ifinteger{#1} {\mkbibordinal{#1}~\bibstring{edition}}% @@ -976,7 +1074,6 @@ \newcommand{\classicpunct}{% \ifthenelse{\iffieldequalstr{entrysubtype}{classical}\OR% - \iffieldequalstr{entrytype}{customa}\OR% \iffieldequalstr{entrytype}{letter}}% {\setunit*{\addspace}}% {\setunit*{\addcomma\addspace}}} @@ -1111,7 +1208,9 @@ \ifthenelse{\(\iffieldundef{booktitle}\AND\iffieldundef{maintitle}\)% \OR\iffieldsequal{booktitle}{title}% Changed these for crossrefed \OR\iffieldsequal{maintitle}{title}}% entries. Create problems? - {\newunit\newblock}% + {\iffieldequalstr{entrytype}{video}% + {\newcunit\newblock}% + {\newunit\newblock}}% {\newcunit\newblock}} \newbibmacro*{edition}{% @@ -1404,44 +1503,33 @@ {} {\printfield{chapter}\addspace}} +\newbibmacro*{chapinscore}{% + \iffieldundef{chapter}% + {} + {\printfield{chapter}% + \addspace\bibstring{of}\setunit{\addspace}}} + +\newbibmacro*{music+ser+num}{% + \iffieldundef{series}% + {\iffieldundef{number}% + {}% + {\printfield{number}}} + {\printfield{series}% + \setunit{\addspace}% + \printfield{number}}}% + +\newbibmacro*{music+publisher}{% + \iffieldundef{howpublished}% + {\iffieldundef{pubstate}% + {}% + {\printfield{pubstate}}}% + {\printfield{howpublished}}}% + \newbibmacro*{ser+num}{% \printfield{series}% \printfield[sernum]{number}% \newunit} -\newbibmacro*{ctitle+stitle}{% - \printtext[title]{% - \printfield[noformat]{title}% - \setunit{\addcolon\addspace}% - \printfield[noformat]{subtitle}}% - \setunit{\addcomma\addspace}\newblock% - \printfield{titleaddon}}% -% \setunit{\addspace}}% -% \usebibmacro{language+transtitle}% -% \setunit*{\addcomma}\newblock} - -\newbibmacro*{citaltitle+stitle}{% - \printtext[title]{% - \printfield[noformat]{title}% - \setunit{\addcolon\addspace}% - \printfield[noformat]{subtitle}}% - \newcunit\newblock% - \printfield{titleaddon}% - \setunit{\addspace}% - \usebibmacro{language+transtitle}% - \newcunit\newblock} - -\newbibmacro*{title+stitle}{% - \printtext[title]{% - \printfield[noformat]{title}% - \setunit{\addcolon\addspace}% - \printfield[noformat]{subtitle}}% - \newunit%\setunit{\addspace}\newblock% - \printfield{titleaddon}}% -% \setunit{\addspace}}% -% \usebibmacro{language+transtitle}% -% \newunit\newblock} - \newbibmacro*{italtitle+stitle}{% \printtext{% \printfield{title}% @@ -1462,15 +1550,6 @@ \printfield{titleaddon}% }%\newcunit\newblock -\newbibmacro*{cmag+news+title}{% - \printtext[title]{% - \printfield[noformat]{title}% - \setunit{\addcolon\addspace}% - \printfield[noformat]{subtitle}}% - \setunit{\addcomma\addspace}% - \printfield{titleaddon}% - }%\newcunit\newblock - \newbibmacro*{language+transtitle}{% \iffieldundef{usere}% {\printlist[][-\value{listtotal}]{language}}% @@ -1529,33 +1608,6 @@ \usebibmacro{date}% }% -\newbibmacro*{cpubl+loc+year}{% - \ifthenelse{\iffieldundef{location}\AND\iffieldundef{publisher} - \AND\iffieldundef{year}}% - {} - {\setunit{\addspace}% - \printtext[parens]{% - \printorigdate%\printfield{origyear}% - \setunit*{\addsemicolon\addspace}% - \printlist{location}% - \iflistundef{publisher} - {\setunit*{\addspace}} - {\setunit*{\addcolon\space}}% - \printlist{publisher}% - \setunit{\addcomma\space}% - \usebibmacro{date}}}}% - -\newbibmacro*{cpubletter+loc+year}{% - \setunit{\addspace}% - \printtext[parens]{% - \printlist{location}% - \iflistundef{publisher} - {\setunit*{\addspace}} - {\setunit*{\addcolon\space}}% - \printlist{publisher}% - \setunit{\addcomma\space}% - \usebibmacro{date}}}% Changed for 0.9 - \newbibmacro*{originally+published+as}{% Punctuation fix now in \iffieldundef{userf}% \origfullcite for 0.8e. {\iffieldundef{reprinttitle}% @@ -1598,26 +1650,6 @@ {noformat}% {parens}} -\newbibmacro*{cjournal+issue+year+pages}{% - \usebibmacro{cjournal+ser+vol+num}% - \setunit{\addspace}% - \printtext[parens]{% parens is the default here - \iffieldundef{issue} - {\usebibmacro{date}}% - {\printfield{issue}% - \setunit{\addspace}% - \printfield{year}}}} - -\newbibmacro*{cperiodical+issue+year+pages}{% For periodicals, - \usebibmacro{cperiodical+ser+vol+num}% subtype article - \setunit{\addspace}% - \printtext[parens]{% parens is the default here - \iffieldundef{issue} - {\usebibmacro{date}}% - {\printfield{issue}% - \setunit{\addspace}% - \printfield{year}}}} - \newbibmacro*{letter+date}{% New for 0.9 \iftoggle{cms@switchdates}% {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}% @@ -1768,12 +1800,14 @@ \iffieldundef{issue} {\iffieldundef{number}% {\usebibmacro{date}}% - {\usebibmacro{date}% - \setunit{\addcomma\addspace}% - \printfield[journum]{number}}}% - {\printfield{issue}% + {\iftoggle{cms@numbermonth}% + {\usebibmacro{date}}% + {\usebibmacro{cmsyear}}% + \setunit*{\addcomma\addspace}% Starred version for when the + \printfield[journum]{number}}}% month isn't printed because of + {\printfield{issue}% the toggle. \setunit{\addspace}% - \printfield{year}}} + \usebibmacro{cmsyear}}} \newbibmacro*{mag+date+issue}{% \usebibmacro{journal+sub}% @@ -1784,6 +1818,11 @@ \newcunit\newblock \usebibmacro{date+issue}} +\newbibmacro*{cmsyear}{% + \iftoggle{cms@switchdates}% + {\printfield{origyear}}% + {\printfield{year}}} + \newbibmacro*{periodical+date+issue}{% For periodical type & \printtext[title]{% magazine subtype \printfield[noformat]{title}% @@ -1818,32 +1857,6 @@ \newcunit \printfield{maintitleaddon}}}} -\newbibmacro*{crefmtitle+mstitle+vol+part+title+stitle}{% - \iffieldundef{booktitle} - {\usebibmacro{citaltitle+stitle}}% - {\usebibmacro{btitle+bstitle}}% - \newcunit% need this? - \iffieldundef{maintitle} - {} - {\iffieldundef{volume} - {\printtext{% - \printfield{maintitle}% - \setunit{\addcolon\addspace}% - \printfield[maintitle]{mainsubtitle}}% - \newcunit - \printfield{maintitleaddon}} - {\printfield{volume}% - \printfield{part}% - \setunit{\addspace} - \bibstring{ofseries}% - \setunit{\addspace} - \printtext{% - \printfield{maintitle}% - \setunit{\addcolon\addspace}% - \printfield[maintitle]{mainsubtitle}}% - \newcunit - \printfield{maintitleaddon}}}} - \newbibmacro*{cmtitle+mstitle+vol+part+btitle+bstitle}{% \usebibmacro{btitle+bstitle}% \newcunit @@ -1874,43 +1887,6 @@ {\setunit{\postnotedelim}% \printfield{postnote}}} -% \newbibmacro*{fullpostnote}{% -% \iffieldundef{postnote}% -% {\iffieldundef{chapter}% -% {\iffieldundef{pages}% -% {}% -% {\postnotedelim% -% \printfield{pages}}}% -% {\postnotedelim% -% \printfield{chapter}}}% -% {\postnotedelim% -% \printfield{postnote}}} - -% \newbibmacro*{inreffullpostnote}{% -% \iffieldundef{postnote}% -% {\iffieldundef{chapter}% -% {\iffieldundef{pages}% -% {\addcomma\addspace% -% \printlist[][-\value{listtotal}]{lista}}% -% {\postnotedelim% -% \printfield{pages}}}% -% {\postnotedelim% -% \printfield{chapter}}}% -% {\postnotedelim% -% \printfield{postnote}}} - -% \newbibmacro*{xrefpostnote}{% Only for crossrefed (or xrefed) InCollection, -% \iffieldundef{postnote}% InProceedings, or CustomA entries -% {\iffieldundef{chapter}% -% {\iffieldundef{pages}% -% {}% -% {\addcomma\addspace% -% \printfield{pages}}}% -% {\addcomma\addspace% -% \printfield{chapter}}}% -% {}}% The postnote field already shows up because of the fullpostnote -% % call. - \newbibmacro*{part+editor+translator}{% \ifnameundef{namea}% {\ifnameundef{nameb}% @@ -1928,23 +1904,6 @@ \bibstring{cbytranslator}\space% \printnames[bytranslator]{nameb}}}}} -% \newbibmacro*{cpart+editor+translator}{% -% \ifnameundef{namea}% -% {\ifnameundef{nameb}% -% {} -% {\bibstring{cbytranslator}\space% -% \printnames[bytranslator]{nameb}}}% -% {\ifnamesequal{namea}{nameb}% -% {\bibstring{cbyeditortr}\space% -% \printnames[byeditor]{namea}}% -% {\bibstring{cbyeditor}\space% Need this \space here? -% \printnames[byeditor]{namea}% -% \ifnameundef{nameb}% -% {} -% {\newcunit -% \bibstring{cbytranslator}\space% -% \printnames[bytranslator]{nameb}}}}} - \newbibmacro*{compilestrg}{% \ifthenelse{\value{namec}>1\OR\ifandothers{namec}} {\bibstring{compilers}} 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 16cece4b09f..958fb7feffb 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.1.9 2010/09/03 08:39:14 dfussner Exp $ +% $Id: chicago-notes.bbx,v 0.9.7.1 2011/02/15 15:02:59 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}[2010/09/03 v0.9c biblatex bibliography style] +\ProvidesFile{chicago-notes.bbx}[2011/02/15 v 1.2a biblatex bibliography style] %%%% Initialize and format bibliography and los %%%% @@ -56,9 +56,13 @@ togl {cms@switchdates} }% {}% - {\ifthenelse{\thefield{origyear}>\thefield{year}}% - {\toggletrue{cms@switchdates}}% - {}}}% + {\iffieldundef{endyear}% + {\ifthenelse{\thefield{origyear}>\thefield{year}}% + {\toggletrue{cms@switchdates}}% + {}}% + {\ifthenelse{\thefield{origyear}>\thefield{endyear}}% + {\toggletrue{cms@switchdates}}% + {}}}}% \InitializeBibliographyStyle{% \let\bbx@lasthash\undefined} @@ -69,6 +73,50 @@ %%%% Author, Editor, Translator, and Compiler Macros %%%% +\renewbibmacro*{name:last-first}[4]{% + \ifuseprefix + {\usebibmacro{name:delim}{#3#1}% + \usebibmacro{name:hook}{#3#1}% + \ifblank{#3}{}{% + \ifcapital + {\mkbibnameprefix{\MakeCapital{#3}}\isdot} + {\mkbibnameprefix{#3}\isdot}% + \ifpunctmark{'}{}{\addhighpenspace}}% + \mkbibnamelast{#1}\isdot + \ifblank{#2}{}{\addcomma\addlowpenspace\mkbibnamefirst{#2}\isdot}% + \ifblank{#4}{}{\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot}} + {\usebibmacro{name:delim}{#1}% + \usebibmacro{name:hook}{#1}% + \mkbibnamelast{#1}\isdot% + \ifblank{#2#3#4}{}{\addcomma}% + \ifblank{#2}{}{\addlowpenspace\mkbibnamefirst{#2}\isdot}% + \ifblank{#3}{}{\addlowpenspace\mkbibnameprefix{#3}\isdot}% + \ifblank{#4}{}{\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot}}} + +\renewbibmacro*{name:first-last}[4]{% + \usebibmacro{name:delim}{#2#3#1}% + \usebibmacro{name:hook}{#2#3#1}% + \ifblank{#2}{}{\mkbibnamefirst{#2}\isdot\addlowpenspace}% + \ifblank{#3}{}{% + \mkbibnameprefix{#3}\isdot + \ifpunctmark{'} + {} + {\ifuseprefix{\addhighpenspace}{\addlowpenspace}}}% + \mkbibnamelast{#1}\isdot + \ifblank{#4}{}{% + \iftoggle{cms@jrcomma}% + {\ifnumeral{#4}% + {\addlowpenspace\mkbibnameaffix{#4}\isdot}% + {\addcomma\addlowpenspace\mkbibnameaffix{#4}\isdot% + \ifboolexpr{ + test{\ifnumless{\value{listcount}}{\value{listtotal}}} + and + test{\ifnumless{\value{listcount}}{\value{maxnames}}} + } + {\addcomma}% + {}}}% + {\addlowpenspace\mkbibnameaffix{#4}\isdot}}} + \newbibmacro*{author/editors/translators}{% \ifthenelse{\ifuseauthor\AND\NOT\ifnameundef{author}}% {\usebibmacro{author}}% @@ -295,11 +343,11 @@ \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{issn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{issn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -322,16 +370,15 @@ \newunit\newblock \printfield{note}% \setunit*{\addcomma\addspace}\newblock% (changed for 0.7)?? -% \usebibmacro{cms-in:}% \usebibmacro{journal+issue+year+pages}% \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{issn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{issn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -366,15 +413,103 @@ \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% - \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}} +\DeclareBibliographyDriver{audio}{% + \usebibmacro{bibindex}% + \usebibmacro{author/editor}% + \setunit{\addspace}% + \printfield{nameaddon}% + \newunit\newblock + \usebibmacro{italtitle+stitle}% + \newcunit\newblock + \usebibmacro{byauthor}% + \newunit\newblock + \usebibmacro{part+editor+translator}% + \newcunit%\setunit{\addperiod\addspace}% + \usebibmacro{chapinscore}% + \usebibmacro{btitle+bstitle}% + \iffieldundef{booktitle} + {\setunit{\addperiod\addspace}}% Fix customc? + {\setunit{\addcomma\addspace}}% + \iffieldundef{edition}% + {}% + {\usebibmacro{edition}% + \newcunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}% + \clearfield{volume}% + \clearfield{part}}% + {}% + \newcunit + \printfield{volumes} + \clearfield{volumes}}% + \newunit% unit, not cunit? + \usebibmacro{bybookauthor}% + \usebibmacro{byeditor+others}% + \newunit% ??? Editorpunct maybe not right here? + \iffieldundef{maintitle} + {} + {\iffieldundef{volume} + {\usebibmacro{cms-in:}% + \printtext[maintitle]{% + \printfield[noformat]{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[noformat]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}} + {\printfield{volume}% + \printfield{part}% + \setunit{\addspace} + \bibstring{ofseries}% + \setunit{\addspace} + \printtext[maintitle]{% + \printfield[noformat]{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[noformat]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}}} + \newcunit\newblock + \printfield{pages}% + \newunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newunit + \printfield{volumes}% + \newunit\newblock + \usebibmacro{ser+num}% + \newunit\newblock + \usebibmacro{cmsorigdate}%\printorigdate% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{publ+loc+year}% + \newunit + \printfield{type}% + \newunit\newblock + \printfield{addendum}% + \setunit*{\addcomma\addspace}\newblock% + \iftoggle{cms@isbn}% + {\printfield{isan}% + \setunit*{\addcomma\addspace}\newblock% + \printfield{ismn}}% + {}% + \setunit*{\addcomma\addspace}\newblock% + \usebibmacro{bib+doi+url}% + \newunit\newblock + \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{originally+published+as}% + \usebibmacro{finentry}}% + \DeclareBibliographyDriver{book}{% \usebibmacro{bibindex}% \usebibmacro{author/editor}% @@ -418,7 +553,10 @@ \clearfield{volumes}}% \usebibmacro{editorpunct}% \usebibmacro{byeditor+others}% - \newcunit\newblock + \usebibmacro{editorpunct}%\newcunit\newblock + \iftoggle{cms@bookpages}% + {}% + {\clearfield{pages}}% \usebibmacro{chap+pag}% \newunit \iffieldundef{maintitle} @@ -440,11 +578,11 @@ \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -520,11 +658,11 @@ \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -549,9 +687,7 @@ \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% - \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -583,8 +719,6 @@ \clearfield{volumes}}% \usebibmacro{editorpunct}% \usebibmacro{bytranslator+others}% -% \newunit\newblock -% \printfield{edition}% \newunit \iffieldundef{maintitle} {\printfield{volume}% @@ -603,22 +737,25 @@ \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}} -\DeclareBibliographyAlias{customa}{letter}% - -\DeclareBibliographyAlias{customb}{bookinbook}% - -\DeclareBibliographyAlias{customc}{suppbook}% +\DeclareBibliographyDriver{customc}{% + \usebibmacro{bibindex}% + \usebibmacro{author/editor}% + \newunit\newblock + \printfield{nameaddon}% + \setunit*{\addspace}% + \usebibmacro{italtitle+stitle}% + \usebibmacro{finentry}} \DeclareBibliographyDriver{image}{% \usebibmacro{bibindex}% @@ -650,9 +787,7 @@ \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% - \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -695,8 +830,6 @@ \usebibmacro{byeditor+others}% \newcunit\newblock \printfield{pages}% -% \newunit\newblock -% \printfield{edition}% \newunit \iffieldundef{maintitle} {\printfield{volume}% @@ -715,11 +848,11 @@ \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -735,14 +868,13 @@ \usebibmacro{title+stitle}% \setunit{\addspace}\newblock%\bibsentence \usebibmacro{language+transtitle}% - \setunit{\addcomma\addspace}% + \newcunit\newblock \usebibmacro{byauthor}% - \setunit{\addperiod\addspace}% + \newunit\newblock \usebibmacro{part+editor+translator}% -% \setunit{\addperiod\addspace}% Part of the crossref fix. Moved below. \iffieldundef{crossref}% {\iffieldundef{xref}% - {\setunit{\addperiod\addspace}% Moved here. + {\newunit\newblock \usebibmacro{chapincoll}% \usebibmacro{cms-in:}% \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}% @@ -765,8 +897,6 @@ \usebibmacro{byeditor+others}% \newcunit\newblock \printfield{pages}% -% \newunit\newblock -% \printfield{edition}% \newunit \iffieldundef{maintitle} {\printfield{volume}% @@ -785,21 +915,23 @@ \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}}% {\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% - \bibxrefcite{\thefield{xref}} + \usebibmacro{chapincoll}% + \bibxrefcite{\thefield{xref}}% \usebibmacro{bibpostxref}% \usebibmacro{finentry}}}% {\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% + \usebibmacro{chapincoll}% \bibxrefcite{\thefield{crossref}}% \usebibmacro{bibpostxref}% \usebibmacro{finentry}}} @@ -817,7 +949,6 @@ \usebibmacro{byauthor}% \setunit{\addperiod\addspace}% \usebibmacro{part+editor+translator}% -% \setunit{\addperiod\addspace}% \iffieldundef{crossref}% {\iffieldundef{xref}% {\setunit{\addperiod\addspace}% @@ -825,7 +956,7 @@ \usebibmacro{cms-in:}% \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}% \newcunit\newblock - \usebibmacro{chap+pag}% + \printfield{pages}% \newunit\newblock \iffieldundef{maintitle} {\printfield{volume}% @@ -842,21 +973,23 @@ \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}}% {\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% - \bibxrefcite{\thefield{xref}} + \usebibmacro{chapincoll}% + \bibxrefcite{\thefield{xref}}% \usebibmacro{bibpostxref}% \usebibmacro{finentry}}}% {\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}% + \usebibmacro{chapincoll}% \bibxrefcite{\thefield{crossref}}% \usebibmacro{bibpostxref}% \usebibmacro{finentry}}} @@ -903,8 +1036,6 @@ \usebibmacro{byeditor+others}% \newcunit\newblock \usebibmacro{chap+pag}% -% \newunit\newblock -% \printfield{edition}% \newunit \iffieldundef{maintitle} {\printfield{volume}% @@ -932,11 +1063,11 @@ \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1002,11 +1133,11 @@ \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1015,12 +1146,14 @@ {\ifpunctmark{*}% Attempt to fix issues with n.d. Changed for 0.9. {\setunit{\nopunct\addspace\bibsentence}}% {}% - \bibxrefcite{\thefield{xref}} + \usebibmacro{chapincoll}% + \bibxrefcite{\thefield{xref}}% \usebibmacro{bibpostxref}% \usebibmacro{finentry}}}% {\ifpunctmark{*}% Likewise. {\setunit{\nopunct\addspace\bibsentence}}% {}% + \usebibmacro{chapincoll}% \bibxrefcite{\thefield{crossref}}% \usebibmacro{bibpostxref}% \usebibmacro{finentry}}} @@ -1036,8 +1169,6 @@ \usebibmacro{edition}% \newcunit \usebibmacro{byauthor}% -% \newunit\newblock -% \printfield{edition}% \newunit\newblock \usebibmacro{ser+num}% \newunit\newblock @@ -1049,11 +1180,11 @@ \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1100,9 +1231,107 @@ \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \usebibmacro{bib+doi+url}% + \newunit\newblock + \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{originally+published+as}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{music}{% + \usebibmacro{bibindex}% + \usebibmacro{author/editor}% + \setunit{\addspace}% + \printfield{nameaddon}% + \newunit\newblock + \usebibmacro{italtitle+stitle}% + \newcunit% + \printeventdate% + \newcunit% + \usebibmacro{byauthor}% + \newunit\newblock + \usebibmacro{part+editor+translator}% + \newunit\newblock + \usebibmacro{chapinscore}% + \usebibmacro{btitle+bstitle}% + \iffieldundef{booktitle} + {\newunit}% Fix customc? + {\newcunit}% + \iffieldundef{edition}% + {}% + {\usebibmacro{edition}% + \newcunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}% + \clearfield{volume}% + \clearfield{part}}% + {}% + \newcunit + \printfield{volumes} + \clearfield{volumes}}% + \newunit% unit, not cunit? + \usebibmacro{bybookauthor}% + \usebibmacro{byeditor+others}% + \newunit% ??? Editorpunct maybe not right here? + \iffieldundef{maintitle} + {} + {\iffieldundef{volume} + {\usebibmacro{cms-in:}% + \printtext[maintitle]{% + \printfield[noformat]{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[noformat]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}} + {\printfield{volume}% + \printfield{part}% + \setunit{\addspace} + \bibstring{ofseries}% + \setunit{\addspace} + \printtext[maintitle]{% + \printfield[noformat]{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[noformat]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}}} + \newcunit\newblock + \printfield{pages}% + \newunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newunit + \printfield{volumes}% + \newunit\newblock + \printfield{version}% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{music+ser+num}% + \newunit + \usebibmacro{music+publisher}% + \setunit*{\addspace}%\newblock + \usebibmacro{date}% + \setunit*{\ifthenelse{\iffieldundef{howpublished}\AND% + \iffieldundef{pubstate}}% + {\addperiod\addspace}{\space\bibstring{by}\space}}% + \printlist{publisher}% + \newunit + \usebibmacro{institution+organization}% + \setunit*{\addcomma\addspace}\newblock + \printlist{location}% + \newunit\newblock + \printfield{type}% + \newunit\newblock + \printfield{addendum}% + \setunit*{\addcomma\addspace}\newblock% + \iftoggle{cms@isbn}% + {\printfield{iswc}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1127,7 +1356,9 @@ \newunit\newblock \usebibmacro{date}% \newunit\newblock - \printfield{doi}% + \iftoggle{cms@doi}% + {\printfield{doi}}% + {}% \setunit*{\addcomma\addspace}\newblock% \usebibmacro{url+date}% \newunit\newblock @@ -1158,8 +1389,6 @@ \printlist[][-\value{listtotal}]{location}}}% \newcunit\newblock \printfield{version}% -% \setunit{\addcomma\addspace -% \bibstring{patentfiled}\addspace}\newblock% \iffieldundef{origyear}% {\iffieldundef{year}% {}% @@ -1170,13 +1399,10 @@ \setunit{\addcomma\addspace\bibstring{and}% \addspace\bibstring{patentissued}\addspace}% \usebibmacro{date}}% -% \usebibmacro{date}% \newcunit\newblock \printfield{addendum}% \newunit\newblock - \printfield{doi}% - \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1202,11 +1428,11 @@ \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{issn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{issn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1227,16 +1453,15 @@ \newunit\newblock \printfield{note}% \setunit*{\addcomma\addspace}\newblock% (changed for 0.7)?? -% \usebibmacro{cms-in:}% \usebibmacro{periodical+issue+year+pages}% \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{issn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{issn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1268,11 +1493,11 @@ \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1321,8 +1546,6 @@ \usebibmacro{byeditor+others}% \newcunit\newblock \usebibmacro{chap+pag}% -% \newunit\newblock -% \printfield{edition}% \newunit \iffieldundef{maintitle} {\printfield{volume}% @@ -1341,11 +1564,11 @@ \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1372,11 +1595,11 @@ \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isrn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isrn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1391,7 +1614,6 @@ \setunit{\addspace}% \printfield{nameaddon}% \newunit\newblock -% \usebibmacro{mag+news+title}% \printfield{title}% \setunit{\addcolon\addspace}% \printfield[noformat]{subtitle}% @@ -1414,11 +1636,11 @@ \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{issn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{issn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1468,10 +1690,8 @@ \clearfield{volumes}}% \usebibmacro{editorpunct}% \usebibmacro{byeditor}% - \newcunit\newblock + \usebibmacro{editorpunct}%\newcunit\newblock \usebibmacro{chap+pag}% -% \newunit\newblock -% \printfield{edition}% \newunit \iffieldundef{maintitle} {\printfield{volume}% @@ -1490,11 +1710,11 @@ \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{isbn}% - \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1523,9 +1743,7 @@ \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \printfield{doi}% - \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \usebibmacro{bib+doi+url}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock @@ -1554,15 +1772,123 @@ \newunit\newblock \printfield{addendum}% \setunit*{\addcomma\addspace}\newblock% - \usebibmacro{url+date}% + \iftoggle{cms@url} + {\usebibmacro{url+date}}% + {}% \newunit\newblock \usebibmacro{pageref}% \newunit\newblock \usebibmacro{originally+published+as}% \usebibmacro{finentry}} +\DeclareBibliographyDriver{video}{% + \usebibmacro{bibindex}% + \usebibmacro{author/editor}% + \setunit{\addspace}% + \printfield{nameaddon}% + \newunit\newblock + \printtext[title]{% + \printfield[noformat]{title}% + \setunit{\addcolon\addspace}% + \printfield[noformat]{subtitle}}% + \iffieldundef{booktitle}% Comma after italics, period after quotes + {\newcunit} + {\newunit}%\setunit{\addspace}\newblock% + \printfield{titleaddon}%\usebibmacro{title+stitle}% + \setunit{\addspace}\newblock%\bibsentence + \usebibmacro{language+transtitle}% + \setunit{\addcomma\addspace}% + \usebibmacro{byauthor}% + \setunit{\addperiod\addspace}% + \usebibmacro{part+editor+translator}% + \setunit{\addperiod\addspace}% + \usebibmacro{chapinscore}% + \usebibmacro{btitle+bstitle}% + \iffieldundef{booktitle} + {\setunit{\addperiod\addspace}}% Fix customc? + {\setunit{\addcomma\addspace}}% + \iffieldundef{edition}% + {}% + {\usebibmacro{edition}% + \newcunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}% + \clearfield{volume}% + \clearfield{part}}% + {}% + \newcunit + \printfield{volumes} + \clearfield{volumes}}% + \newunit + \printfield{type}% + \newunit% unit, not cunit? + \usebibmacro{bybookauthor}% + \usebibmacro{byeditor+others}% + \newunit% ??? Editorpunct maybe not right here? + \iffieldundef{maintitle} + {} + {\iffieldundef{volume} + {\usebibmacro{cms-in:}% + \printtext[maintitle]{% + \printfield[noformat]{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[noformat]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}} + {\printfield{volume}% + \printfield{part}% + \setunit{\addspace} + \bibstring{ofseries}% + \setunit{\addspace} + \printtext[maintitle]{% + \printfield[noformat]{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[noformat]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}}} + \newcunit\newblock + \printfield{pages}% + \newunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newunit + \printfield{volumes}% + \newunit\newblock + \usebibmacro{ser+num}% + \newunit\newblock + \usebibmacro{cmsorigdate}%\printorigdate% + \newunit\newblock + \printfield{note}% + \newunit\newblock + \usebibmacro{publ+loc+year}% + \newunit\newblock + \printfield{addendum}% + \setunit*{\addcomma\addspace}\newblock% + \iftoggle{cms@isbn}% + {\printfield{isan}}% + {}% + \setunit*{\addcomma\addspace}\newblock% + \usebibmacro{bib+doi+url}% + \newunit\newblock + \usebibmacro{pageref}% + \newunit\newblock + \usebibmacro{originally+published+as}% + \usebibmacro{finentry}}% + %%%% Other Formatting Macros %%%% +\newbibmacro*{bib+doi+url}{% For biblatex field exclusion + \iftoggle{cms@doi}% + {\printfield{doi}}% + {}% + \setunit*{\addcomma\addspace}\newblock% + \iftoggle{cms@url}% + {\usebibmacro{url+date}}% + {}} + \newbibmacro*{bibpostxref}{% \iffieldundef{postnote}% {\iffieldundef{chapter}% @@ -1628,10 +1954,10 @@ \setunit{\addspace}% \printtext[parens]{% \iffieldundef{issue} - {\usebibmacro{date}}% + {\usebibmacro{number+or+month}}% {\printfield{issue}% \setunit{\addspace}% - \printfield{year}}}% + \usebibmacro{cmsyear}}}% \setunit{\addcolon\addspace} \printfield{pages}} @@ -1640,10 +1966,10 @@ \setunit{\addspace}% \printtext[parens]{% \iffieldundef{issue} - {\usebibmacro{date}}% + {\usebibmacro{number+or+month}}% {\printfield{issue}% \setunit{\addspace}% - \printfield{year}}}% + \usebibmacro{cmsyear}}}% \setunit{\addcolon\addspace} \printfield{pages}} 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 28de8fb80e3..d97e430551b 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.1.13 2010/09/03 08:39:06 dfussner Exp $ +% $Id: chicago-notes.cbx,v 0.9.7.1 2011/02/15 15:01:59 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}[2010/09/03 v0.9c biblatex citation style] +\ProvidesFile{chicago-notes.cbx}[2011/02/15 v 1.2a biblatex citation style] %%%% Biblatex initialization + Chicago options + Toggles %%%% @@ -14,6 +14,14 @@ \providetoggle{cms@reprint}% ditto \providetoggle{cms@switchdates}% ditto +\providetoggle{cms@jrcomma}% For comma before Jr./Sr. + +\providetoggle{cms@url}% These are for the field-exclusion options +\providetoggle{cms@doi} +\providetoggle{cms@isbn} +\providetoggle{cms@numbermonth} +\providetoggle{cms@bookpages} + \providetoggle{cms@headlessnote} \providetoggle{cms@fullnote} \providetoggle{cms@shortnote} @@ -28,6 +36,9 @@ \providetoggle{cms@postposit} \AtEveryCitekey{% + \iffieldundef{userc}% + {}% + {\nocite{\thefield{userc}}}% \global\togglefalse{cms@loccit}% \iffieldequalstr{pubstate}{reprint}% {\toggletrue{cms@reprint}}% @@ -42,9 +53,13 @@ togl {cms@switchdates} }% {}% - {\ifthenelse{\thefield{origyear}>\thefield{year}}% - {\toggletrue{cms@switchdates}}% - {}}}% + {\iffieldundef{endyear}% + {\ifthenelse{\thefield{origyear}>\thefield{year}}% + {\toggletrue{cms@switchdates}}% + {}}% + {\ifthenelse{\thefield{origyear}>\thefield{endyear}}% + {\toggletrue{cms@switchdates}}% + {}}}}% \DeclareBibliographyOption{annotation}[true]{% \global\toggletrue{cms@annotation}} @@ -64,6 +79,44 @@ \DeclareEntryOption{usecompiler}[true]{% \settoggle{cms@usecompiler}{#1}} +\DeclareBibliographyOption{juniorcomma}[true]{% + \settoggle{cms@jrcomma}{#1}} + +\DeclareEntryOption{juniorcomma}[true]{% + \settoggle{cms@jrcomma}{#1}} + +% The field-exclusion options % + +\DeclareBibliographyOption{isbn}[true]{% + \settoggle{cms@isbn}{#1}} +\DeclareBibliographyOption{url}[true]{% + \settoggle{cms@url}{#1}} +\DeclareBibliographyOption{doi}[true]{% + \settoggle{cms@doi}{#1}} +\DeclareBibliographyOption{numbermonth}[true]{% + \settoggle{cms@numbermonth}{#1}} +\DeclareBibliographyOption{bookpages}[true]{% + \settoggle{cms@bookpages}{#1}} +\DeclareBibliographyOption{includeall}[true]{% + \settoggle{cms@isbn}{#1}% + \settoggle{cms@url}{#1}% + \settoggle{cms@doi}{#1}% + \settoggle{cms@numbermonth}{#1}% + \settoggle{cms@bookpages}{#1}} + +\DeclareEntryOption{isbn}[true]{% + \settoggle{cms@isbn}{#1}} +\DeclareEntryOption{url}[true]{% + \settoggle{cms@url}{#1}} +\DeclareEntryOption{doi}[true]{% + \settoggle{cms@doi}{#1}} +\DeclareEntryOption{numbermonth}[true]{% + \settoggle{cms@numbermonth}{#1}} +\DeclareEntryOption{bookpages}[true]{% + \settoggle{cms@bookpages}{#1}} + +\ExecuteBibliographyOptions{includeall} + % For author-date compatibility % \DeclareEntryOption{switchdates}[true]{% @@ -179,9 +232,7 @@ {cite:\thefield{entrytype}}% \iffieldundef{shorthand} {}% - {\addperiod\space% - \bibstring{citedas}\space% - \printfield{shorthand}}}} + {\usebibmacro{cms:shorthandintro}}}} \newbibmacro*{cite:crossfull}{% \printtext[bibhypertarget]{% @@ -190,9 +241,7 @@ {cite:crossfull}% \iffieldundef{shorthand} {} - {\addperiod\space - \bibstring{citedas}\space - \printfield{shorthand}}}} + {\usebibmacro{cms:shorthandintro}}}} \newbibmacro*{cite:short}{% \ifthenelse{\ifnameundef{labelname}\OR% @@ -218,6 +267,14 @@ \printtext[bibhyperlink]{% \printfield{shorthand}}} +\newbibmacro*{cms:shorthandintro}{% For changing the citedas phrase + \iffieldundef{shorthandintro}% + {\addperiod\space% + \bibstring{citedas}\space% + \printfield{shorthand}}% + {\addperiod\space% + \printfield{shorthandintro}}} + \newbibmacro*{cite:ibid}{% \iftoggle{cms@noibid} {\global\toggletrue{cms@shortnote}% @@ -243,6 +300,13 @@ {}%\usebibmacro{clearalmostall}} (?) {\usebibmacro{citeindex}% \usebibmacro{cms-in:}% + \ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT% + \(\iffieldequalstr{entrytype}{collection}\OR% + \iffieldequalstr{entrytype}{proceedings}\)}% + {\clearname{author}% + \clearname{shortauthor}% + \clearname{labelname}}% + {}% \usebibmacro{crosscite}} {} {}%\usebibmacro{xrefpostnote}} @@ -250,6 +314,13 @@ \DeclareCiteCommand{\bibxrefcite} {}%\usebibmacro{clearalmostall}} (?) {\usebibmacro{cms-in:}% + \ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT% + \(\iffieldequalstr{entrytype}{collection}\OR% + \iffieldequalstr{entrytype}{proceedings}\)}% + {\clearname{author}% + \clearname{shortauthor}% + \clearname{labelname}}% + {}% \toggletrue{cms@shortnote}% \togglefalse{cms@fullnote}% \usebibmacro{cite:short}} @@ -376,11 +447,11 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{issn}% - \newcunit\newblock - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{issn}}% + {}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -406,11 +477,11 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{issn}% - \newcunit\newblock - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{issn}}% + {}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}}} @@ -444,9 +515,91 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{doi}% + \usebibmacro{cite+doi+url}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{pageref}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{cite:audio}{% + \usebibmacro{bibindex}% + \usebibmacro{author/editor}% + \setunit{\addspace}% + \printfield{nameaddon}% + \newcunit\newblock + \usebibmacro{ctitle+stitle}% + \setunit{\addspace}\newblock% + \usebibmacro{language+transtitle}% + \newcunit + \usebibmacro{byauthor}% + \newcunit + \usebibmacro{cpart+editor+translator}% + \newcunit + \usebibmacro{chapinscore}% + \usebibmacro{btitle+bstitle}% + \newcunit + \iffieldundef{edition}% + {}% + {\usebibmacro{edition}% + \newcunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}% + \clearfield{volume}% + \clearfield{part}}% + {}% + \newcunit + \printfield{volumes} + \clearfield{volumes}}% + \newcunit + \usebibmacro{bybookauthor}% + \usebibmacro{cbyeditor+others}% + \iffieldundef{maintitle} + {} + {\iffieldundef{volume} + {\usebibmacro{cms-in:}% + \printtext[maintitle]{% + \printfield[noformat]{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[noformat]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}} + {\printfield{volume}% + \printfield{part}% + \setunit{\addspace} + \bibstring{ofseries}% + \setunit{\addspace} + \printtext[maintitle]{% + \printfield[noformat]{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[noformat]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}}} + \newcunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newcunit + \printfield{volumes}% + \newcunit\newblock + \usebibmacro{ser+num}% + \newcunit\newblock + \printfield{note}% + \newcunit\newblock + \usebibmacro{cpubl+loc+year}% + \newcunit + \printfield{type}% + \usebibmacro{fullpostnote}% + \newcunit\newblock + \printfield{addendum}% + \newcunit\newblock + \iftoggle{cms@isbn}% + {\printfield{isan}% + \newcunit\newblock + \printfield{ismn}}% + {}% + \newcunit\newblock% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -507,17 +660,20 @@ \printfield{note}% \newcunit\newblock \usebibmacro{cpubl+loc+year}% + \iftoggle{cms@bookpages}% + {}% + {\clearfield{pages}}% \usebibmacro{fullpostnote}% \newcunit\newblock \printlist[][-\value{listtotal}]{lista}% \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{isbn}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \newcunit\newblock - \printfield{doi}% - \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -570,11 +726,11 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{isbn}% - \newcunit\newblock - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -597,9 +753,7 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{doi}% - \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -630,8 +784,6 @@ \newcunit \usebibmacro{cbytranslator+others}% \newcunit\newblock -% \printfield{edition}% -% \newcunit \iffieldundef{maintitle} {\printfield{volume}% \printfield{part}} @@ -648,11 +800,11 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{isbn}% - \newcunit\newblock - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -677,8 +829,6 @@ \usebibmacro{bybookauthor}% \usebibmacro{cbyeditor+others}% \newcunit\newblock -% \printfield{edition}% -% \newcunit \iffieldundef{maintitle} {\printfield{volume}% \printfield{part}} @@ -695,20 +845,22 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{isbn}% - \newcunit\newblock - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}}% -% \usebibmacro{finentry}} - -\DeclareBibliographyAlias{cite:customa}{cite:letter}% -\DeclareBibliographyAlias{cite:customb}{cite:bookinbook}% - -\DeclareBibliographyAlias{cite:customc}{cite:suppbook}% +\DeclareBibliographyDriver{cite:customc}{% + \usebibmacro{bibindex}% + \usebibmacro{author/editor}% + \newcunit\newblock + \printfield{nameaddon}% + \setunit*{\addspace}% + \usebibmacro{italtitle+stitle}% + \usebibmacro{finentry}} \DeclareBibliographyDriver{cite:image}{% \usebibmacro{bibindex}% @@ -741,9 +893,7 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{doi}% - \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -762,7 +912,7 @@ \setunit{\addcomma\addspace}% \usebibmacro{cpart+editor+translator}% \setunit{\addcomma\addspace}% -% \usebibmacro{chapincoll}% + \usebibmacro{chapincoll}% \usebibmacro{cms-in:}% \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}% \newcunit @@ -782,8 +932,6 @@ \newcunit \usebibmacro{bybookauthor}% \usebibmacro{cbyeditor+others}% -% \newcunit\newblock -% \printfield{edition}% \newcunit \iffieldundef{maintitle} {\printfield{volume}% @@ -801,11 +949,11 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{isbn}% - \newcunit\newblock - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -824,65 +972,69 @@ \setunit{\addcomma\addspace}% \usebibmacro{cpart+editor+translator}% \setunit{\addcomma\addspace}% -% \usebibmacro{chapincoll}% \iffieldundef{crossref}% {\iffieldundef{xref} - {\usebibmacro{cms-in:}% - \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}% - \newcunit - \iffieldundef{edition}% - {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% - \newcunit - \usebibmacro{bybookauthor}% - \usebibmacro{cbyeditor+others}% -% \newcunit\newblock -% \printfield{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% - \newcunit\newblock - \usebibmacro{ser+num}% - \newcunit\newblock - \printfield{note}% - \newcunit\newblock - \usebibmacro{cpubl+loc+year}% - \usebibmacro{fullpostnote}% - \newcunit\newblock - \printfield{addendum}% - \newcunit\newblock - \printfield{isbn}% - \newcunit\newblock - \printfield{doi}% - \newcunit\newblock - \usebibmacro{url+date}% - \newcunit\newblock - \usebibmacro{pageref}% - \usebibmacro{finentry}} -{\ifterm{\addspace\bibsentence}% All altered for 0.9c. - {\addcomma\addspace}% Perhaps need to alter it back - \xrefcite{\thefield{xref}}% Removed \addspace from each. - \usebibmacro{xrefpostnote}% - \usebibmacro{finentry}}}% -{\ifterm{\addspace\bibsentence}% - {\addcomma\addspace}% - \xrefcite{\thefield{crossref}}% - \usebibmacro{xrefpostnote}% - \usebibmacro{finentry}}} + {\usebibmacro{chapincoll}% + \usebibmacro{cms-in:}% + \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}% + \newcunit + \iffieldundef{edition}% + {}% + {\usebibmacro{edition}% + \newcunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}% + \clearfield{volume}% + \clearfield{part}}% + {}% + \newcunit + \printfield{volumes} + \clearfield{volumes}}% + \newcunit + \usebibmacro{bybookauthor}% + \usebibmacro{cbyeditor+others}% + \newcunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newcunit + \printfield{volumes}% + \newcunit\newblock + \usebibmacro{ser+num}% + \newcunit\newblock + \printfield{note}% + \newcunit\newblock + \usebibmacro{cpubl+loc+year}% + \usebibmacro{fullpostnote}% + \newcunit\newblock + \printfield{addendum}% + \newcunit\newblock + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% + \newcunit\newblock + \usebibmacro{cite+doi+url}% + \newcunit\newblock + \usebibmacro{pageref}% + \usebibmacro{finentry}} + {\ifterm{\iffieldundef{chapter}% New test needed to cope with + {\addspace\bibsentence}% new chapter citing system. + {\setunit{\addspace\bibsentence}}}% All altered for 0.9c. + {\addcomma\addspace}% Perhaps need to alter it back + \usebibmacro{chapincoll}% + \xrefcite{\thefield{xref}}% Removed \addspace from each. + \usebibmacro{xrefpostnote}% + \usebibmacro{finentry}}}% + {\ifterm{\iffieldundef{chapter}% New test needed to cope with + {\addspace\bibsentence}% new chapter citing system. + {\setunit{\addspace\bibsentence}}}% + {\addcomma\addspace}% + \usebibmacro{chapincoll}% + \xrefcite{\thefield{crossref}}% + \usebibmacro{xrefpostnote}% + \usebibmacro{finentry}}} \DeclareBibliographyDriver{cite:inproceedings}{% \usebibmacro{bibindex}% @@ -900,44 +1052,51 @@ \setunit{\addcomma\addspace}% \iffieldundef{crossref}% {\iffieldundef{xref} - {\usebibmacro{cms-in:}% - \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}% - \newcunit\newblock - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% - \newcunit\newblock - \usebibmacro{ser+num}% - \newcunit\newblock - \printfield{note}% - \setunit{\addspace}\newblock% - \printtext[parens]{% - \usebibmacro{org+publ+loc+year}}% - \usebibmacro{fullpostnote}% - \newcunit\newblock - \printfield{addendum}% - \newcunit\newblock - \printfield{isbn}% - \newcunit\newblock - \printfield{doi}% - \newcunit\newblock - \usebibmacro{url+date}% - \newcunit\newblock - \usebibmacro{pageref}% - \usebibmacro{finentry}} -{\ifterm{\addspace\bibsentence}% See incollection - {\addcomma\addspace}% - \xrefcite{\thefield{xref}}% - \usebibmacro{xrefpostnote}% - \usebibmacro{finentry}}}% -{\ifterm{\addspace\bibsentence}% - {\addcomma\addspace}% - \xrefcite{\thefield{crossref}}% - \usebibmacro{xrefpostnote}% - \usebibmacro{finentry}}} + {\usebibmacro{chapincoll}% + \usebibmacro{cms-in:}% + \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}% + \newcunit\newblock + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newcunit + \printfield{volumes}% + \newcunit\newblock + \usebibmacro{ser+num}% + \newcunit\newblock + \printfield{note}% + \setunit{\addspace}\newblock% + \printtext[parens]{% + \usebibmacro{org+publ+loc+year}}% + \usebibmacro{fullpostnote}% + \newcunit\newblock + \printfield{addendum}% + \newcunit\newblock + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% + \newcunit\newblock + \usebibmacro{cite+doi+url}% + \newcunit\newblock + \usebibmacro{pageref}% + \usebibmacro{finentry}} + {\ifterm{\iffieldundef{chapter}% New test needed to cope with + {\addspace\bibsentence}% new chapter citing system. + {\setunit{\addspace\bibsentence}}}% See incollection + {\addcomma\addspace}% + \usebibmacro{chapincoll}% + \xrefcite{\thefield{xref}}% + \usebibmacro{xrefpostnote}% + \usebibmacro{finentry}}}% + {\ifterm{\iffieldundef{chapter}% New test needed to cope with + {\addspace\bibsentence}% new chapter citing system. + {\setunit{\addspace\bibsentence}}}% + {\addcomma\addspace}% + \usebibmacro{chapincoll}% + \xrefcite{\thefield{crossref}}% + \usebibmacro{xrefpostnote}% + \usebibmacro{finentry}}} \DeclareBibliographyDriver{cite:inreference}{% \usebibmacro{bibindex}% @@ -978,8 +1137,6 @@ \newcunit \usebibmacro{bybookauthor}% \usebibmacro{cbyeditor+others}% -% \newcunit\newblock -% \printfield{edition}% \newcunit \iffieldundef{maintitle} {\printfield{volume}% @@ -994,8 +1151,6 @@ \newcunit\newblock \usebibmacro{cpubl+loc+year}% \usebibmacro{inreffullpostnote}% -% \newcunit\newblock -% \printlist[][-\value{listtotal}]{lista}% \setunit{\addspace}% \ifnameundef{author}% {}% @@ -1006,11 +1161,11 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{isbn}% - \newcunit\newblock - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1028,65 +1183,69 @@ \newcunit\newblock% \usebibmacro{cpart+editor+translator}% \setunit*{\addcomma\addspace}% -% \usebibmacro{chapincoll}% \iffieldundef{crossref}% {\iffieldundef{xref}% - {\usebibmacro{cms-in:}% - \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}% - \newcunit - \iffieldundef{edition}% - {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% - \newcunit - \usebibmacro{bybookauthor}% -% \printlist{language}% -% \newcunit\newblock - \usebibmacro{cbyeditor+others}% -% \newcunit\newblock -% \printfield{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% - \newcunit\newblock - \usebibmacro{ser+num}% - \newcunit\newblock - \printfield{note}% - \newcunit\newblock - \usebibmacro{cpubletter+loc+year}% - \usebibmacro{fullpostnote}% - \newcunit\newblock - \printfield{addendum}% - \newcunit\newblock - \printfield{isbn}% - \newcunit\newblock - \printfield{doi}% - \newcunit\newblock - \usebibmacro{url+date}% - \newcunit\newblock - \usebibmacro{pageref}% - \usebibmacro{finentry}}% -{\addcomma\addspace% See incollection for info - \xrefcite{\thefield{xref}}% - \usebibmacro{xrefpostnote}% - \usebibmacro{finentry}}}% -{\addcomma\addspace% - \xrefcite{\thefield{crossref}}% - \usebibmacro{xrefpostnote}% - \usebibmacro{finentry}}} + {\usebibmacro{chapincoll}% + \usebibmacro{cms-in:}% + \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}% + \newcunit + \iffieldundef{edition}% + {}% + {\usebibmacro{edition}% + \newcunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}% + \clearfield{volume}% + \clearfield{part}}% + {}% + \newcunit + \printfield{volumes} + \clearfield{volumes}}% + \newcunit + \usebibmacro{bybookauthor}% + \usebibmacro{cbyeditor+others}% + \newcunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newcunit + \printfield{volumes}% + \newcunit\newblock + \usebibmacro{ser+num}% + \newcunit\newblock + \printfield{note}% + \newcunit\newblock + \usebibmacro{cpubletter+loc+year}% + \usebibmacro{fullpostnote}% + \newcunit\newblock + \printfield{addendum}% + \newcunit\newblock + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% + \newcunit\newblock + \usebibmacro{cite+doi+url}% + \newcunit\newblock + \usebibmacro{pageref}% + \usebibmacro{finentry}}% + {\ifterm{\iffieldundef{chapter}% New test needed to cope with + {\addspace\bibsentence}% new chapter citing system. + {\setunit{\addspace\bibsentence}}}% + {\addcomma\addspace}% + \usebibmacro{chapincoll}% + \xrefcite{\thefield{xref}}% + \usebibmacro{xrefpostnote}% + \usebibmacro{finentry}}}% + {\ifterm{\iffieldundef{chapter}% New test needed to cope with + {\addspace\bibsentence}% new chapter citing system. + {\setunit{\addspace\bibsentence}}}% + {\addcomma\addspace}% + \usebibmacro{chapincoll}% + \xrefcite{\thefield{crossref}}% + \usebibmacro{xrefpostnote}% + \usebibmacro{finentry}}} \DeclareBibliographyDriver{cite:manual}{% \usebibmacro{bibindex}% @@ -1099,8 +1258,6 @@ \usebibmacro{edition}% \newcunit \usebibmacro{byauthor}% -% \newcunit\newblock -% \printfield{edition}% \newcunit\newblock \usebibmacro{ser+num}% \newcunit\newblock @@ -1114,11 +1271,11 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{isbn}% - \newcunit\newblock - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1164,9 +1321,101 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{doi}% + \usebibmacro{cite+doi+url}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{pageref}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{cite:music}{% + \usebibmacro{bibindex}% + \usebibmacro{author/editor}% + \setunit{\addspace}% + \printfield{nameaddon}% + \setunit{\addcomma\addspace}\newblock + \usebibmacro{citaltitle+stitle}% + \newcunit + \printeventdate% + \newcunit + \usebibmacro{byauthor}% + \newcunit\newblock + \usebibmacro{cpart+editor+translator}% + \newcunit + \usebibmacro{chapinscore}% + \usebibmacro{btitle+bstitle}% + \newcunit + \iffieldundef{edition}% + {}% + {\usebibmacro{edition}% + \newcunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}% + \clearfield{volume}% + \clearfield{part}}% + {}% + \newcunit + \printfield{volumes} + \clearfield{volumes}}% + \newcunit + \usebibmacro{bybookauthor}% + \usebibmacro{cbyeditor+others}% + \iffieldundef{maintitle} + {} + {\iffieldundef{volume} + {\usebibmacro{cms-in:}% + \printtext[maintitle]{% + \printfield[noformat]{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[noformat]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}} + {\printfield{volume}% + \printfield{part}% + \setunit{\addspace} + \bibstring{ofseries}% + \setunit{\addspace} + \printtext[maintitle]{% + \printfield[noformat]{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[noformat]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}}} + \newcunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newcunit + \printfield{volumes}% + \newcunit\newblock + \printfield{version}% + \newcunit\newblock + \printfield{note}% + \newcunit\newblock + \usebibmacro{music+ser+num}% + \newcunit\newblock + \usebibmacro{music+publisher}% + \setunit*{\addspace}%\newblock + \usebibmacro{date}% + \setunit*{\ifthenelse{\iffieldundef{howpublished}\AND% + \iffieldundef{pubstate}}% + {\addcomma\addspace}{\addspace}}% + \printlist{publisher}% + \newcunit + \usebibmacro{institution+organization}% + \newcunit\newblock + \printlist{location}% + \newcunit\newblock + \printfield{type}% + \usebibmacro{fullpostnote}% + \newcunit\newblock + \printfield{addendum}% + \newcunit\newblock + \iftoggle{cms@isbn}% + {\printfield{iswc}}% + {}% + \newcunit\newblock + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1189,7 +1438,9 @@ \setunit{\addcomma\addspace} \usebibmacro{date}% \setunit{\addcomma\addspace}% - \printfield{doi}% + \iftoggle{cms@doi}% + {\printfield{doi}}% + {}% \setunit{\addcomma\addspace}% \usebibmacro{url+date}% \usebibmacro{fullpostnote}% @@ -1221,7 +1472,6 @@ \newcunit\newblock \printfield{version}% \newcunit -% \setunit{\addcomma\addspace \bibstring{patentfiled}\addspace}% \iffieldundef{origyear}% {\iffieldundef{year}% {}% @@ -1236,9 +1486,7 @@ \printfield{addendum}}% \usebibmacro{fullpostnote}% \newcunit\newblock - \printfield{doi}% - \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1263,11 +1511,11 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{issn}% - \newcunit\newblock - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{issn}}% + {}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}}% @@ -1291,11 +1539,11 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{issn}% - \newcunit\newblock - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{issn}}% + {}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}}} @@ -1327,11 +1575,11 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{isbn}% - \newcunit\newblock - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1375,8 +1623,6 @@ \newcunit \usebibmacro{bybookauthor}% \usebibmacro{cbyeditor+others}% -% \newcunit\newblock -% \printfield{edition}% \newcunit \iffieldundef{maintitle} {\printfield{volume}% @@ -1394,11 +1640,11 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{isbn}% - \newcunit\newblock - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1425,11 +1671,11 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{isrn}% - \newcunit\newblock - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{isrn}}% + {}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1442,13 +1688,11 @@ \setunit{\addspace}% \printfield{nameaddon}% \newcunit\newblock -% \usebibmacro{mag+news+title}% Changed to enable \MakeCapital \printfield{title}% \setunit{\addcolon\addspace}% \printfield[noformat]{subtitle}% \newcunit\newblock \printfield{titleaddon}% -% \newcunit\newblock \setunit{\addspace}% \usebibmacro{language+transtitle}% \setunit{\addcomma\addspace}%\newblock% @@ -1465,11 +1709,11 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{issn}% - \newcunit\newblock - \printfield{doi}% + \iftoggle{cms@isbn}% + {\printfield{issn}}% + {}% \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1517,8 +1761,6 @@ \clearfield{volumes}}% \newcunit \usebibmacro{cbyeditor}% -% \newcunit\newblock -% \printfield{edition}% \newcunit \iffieldundef{maintitle} {\printfield{volume}% @@ -1536,11 +1778,11 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{isbn}% + \iftoggle{cms@isbn}% + {\printfield{isbn}}% + {}% \newcunit\newblock - \printfield{doi}% - \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1569,9 +1811,7 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \printfield{doi}% - \newcunit\newblock - \usebibmacro{url+date}% + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1600,7 +1840,91 @@ \newcunit\newblock \printfield{addendum}% \newcunit\newblock - \usebibmacro{url+date}% + \iftoggle{cms@url}% + {\usebibmacro{url+date}}% + {}% + \newcunit\newblock + \usebibmacro{pageref}% + \usebibmacro{finentry}} + +\DeclareBibliographyDriver{cite:video}{% + \usebibmacro{bibindex}% + \usebibmacro{author/editor}% + \setunit{\addspace}% + \printfield{nameaddon}% + \newcunit\newblock + \usebibmacro{ctitle+stitle}% + \setunit{\addspace}\newblock% + \usebibmacro{language+transtitle}% + \newcunit + \usebibmacro{byauthor}% + \newcunit + \usebibmacro{cpart+editor+translator}% + \newcunit + \usebibmacro{chapinscore}% + \usebibmacro{btitle+bstitle}% + \newcunit + \iffieldundef{edition}% + {}% + {\usebibmacro{edition}% + \newcunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}% + \clearfield{volume}% + \clearfield{part}}% + {}% + \newcunit + \printfield{volumes} + \clearfield{volumes}}% + \newcunit + \printfield{type}% + \newcunit + \usebibmacro{bybookauthor}% + \usebibmacro{cbyeditor+others}% + \iffieldundef{maintitle} + {} + {\iffieldundef{volume} + {\usebibmacro{cms-in:}% + \printtext[maintitle]{% + \printfield[noformat]{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[noformat]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}} + {\printfield{volume}% + \printfield{part}% + \setunit{\addspace} + \bibstring{ofseries}% + \setunit{\addspace} + \printtext[maintitle]{% + \printfield[noformat]{maintitle}% + \setunit{\addcolon\addspace}% + \printfield[noformat]{mainsubtitle}}% + \newcunit + \printfield{maintitleaddon}}} + \newcunit + \iffieldundef{maintitle} + {\printfield{volume}% + \printfield{part}} + {}% + \newcunit + \printfield{volumes}% + \newcunit\newblock + \usebibmacro{ser+num}% + \newcunit\newblock + \printfield{note}% + \newcunit\newblock + \usebibmacro{cpubl+loc+year}% + \usebibmacro{fullpostnote}% + \newcunit\newblock + \printfield{addendum}% + \newcunit\newblock + \iftoggle{cms@isbn}% + {\printfield{isan}}% + {}% + \newcunit\newblock + \usebibmacro{cite+doi+url}% \newcunit\newblock \usebibmacro{pageref}% \usebibmacro{finentry}} @@ -1715,12 +2039,6 @@ \DeclareFieldFormat[letter]{lostitle}{#1\isdot} -\DeclareFieldAlias[customa]{title}[letter]{title} - -\DeclareFieldAlias[customa]{citetitle}[letter]{citetitle} - -\DeclareFieldAlias[customa]{lostitle}[letter]{lostitle} - \DeclareFieldAlias[inproceedings]{title}[article]{title} \DeclareFieldAlias[inproceedings]{citetitle}[article]{citetitle} @@ -1785,11 +2103,19 @@ \addspace% \mkbibemph{#1}\isdot} -\DeclareFieldAlias[customc]{title}[suppbook]{title} - -\DeclareFieldAlias[customc]{citetitle}[suppbook]{citetitle} +\DeclareFieldFormat[customc]{title}{% + \iffieldundef{nameaddon}% + {\mkbibemph{\bibstring{see}}% + \addspace% + #1}% + {#1}} -\DeclareFieldAlias[customc]{lostitle}[suppbook]{lostitle} +\DeclareFieldFormat[customc]{citetitle}{% + \iffieldundef{nameaddon}% + {\mkbibemph{\bibstring{see}}% + \addspace% + #1}% + {\printfield{nameaddon}\addspace #1}} \DeclareFieldAlias[suppcollection]{title}[suppbook]{title} @@ -1851,6 +2177,33 @@ \DeclareFieldAlias[online]{lostitle}[article]{lostitle} +\DeclareFieldFormat[video]{title}{% + \iffieldundef{booktitle}% + {\mkbibemph{#1}\isdot}% + {\mkbibquote{#1\isdot}}} + +\DeclareFieldFormat[video]{citetitle}{% + \iffieldundef{booktitle}% + {\mkbibemph{#1}\isdot}% + {\mkbibquote{#1\isdot}}} + +\DeclareFieldFormat[video]{lostitle}{% + \iffieldundef{booktitle}% + {\mkbibemph{#1}\isdot}% + {\mkbibquote{#1\isdot}}} + +\DeclareFieldAlias[music]{title}[video]{title} + +\DeclareFieldAlias[music]{citetitle}[video]{citetitle} + +\DeclareFieldAlias[music]{lostitle}[video]{lostitle} + +\DeclareFieldAlias[audio]{title}[video]{title} + +\DeclareFieldAlias[audio]{citetitle}[video]{citetitle} + +\DeclareFieldAlias[audio]{lostitle}[video]{lostitle} + %%%% Other Field Formats %%%% \DeclareNumChars*{:}% For proper ibidem with multi-volume works. @@ -1864,8 +2217,8 @@ \ifbibstring{#1}% {\bibstring{#1}}% {\ifcapital% - {\MakeCapital{#1}}% - {#1}}} + {\MakeCapital{#1\isdot}}% + {#1\isdot}}} \DeclareFieldFormat[artwork]{type}{% \ifcapital% @@ -1874,10 +2227,14 @@ \DeclareFieldAlias[image]{type}[artwork]{type} -\DeclareFieldAlias[customc]{type}[suppbook]{type} - \DeclareFieldAlias[suppcollection]{type}[suppbook]{type} +\DeclareFieldAlias[video]{type}[suppbook]{type} + +\DeclareFieldAlias[music]{type}[suppbook]{type} + +\DeclareFieldAlias[audio]{type}[suppbook]{type} + \DeclareFieldFormat{url}{\url{#1}} \DeclareFieldFormat{doi}{% @@ -1888,6 +2245,11 @@ \DeclareFieldFormat{nameaddon}{\mkbibbrackets{#1\bibsentence}}% ?! +\DeclareFieldFormat[customc]{nameaddon}{% For cross-refs + \ifbibstring{#1}% + {\mkbibemph{\bibstring{#1}}}% + {#1}} + \DeclareFieldFormat{edition}{% New in 0.8 \ifinteger{#1} {\mkbibordinal{#1}~\bibstring{edition}}% @@ -1945,6 +2307,8 @@ {\addnbspace #1}% {\addcomma\addspace #1}} +\DeclareFieldFormat{series}{#1\isdot} + \DeclareFieldFormat{addendum}{% \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}} @@ -1996,7 +2360,6 @@ \newcommand{\classicpunct}{% \ifthenelse{\iffieldequalstr{entrysubtype}{classical}\OR% - \iffieldequalstr{entrytype}{customa}\OR% \iffieldequalstr{entrytype}{letter}}% {\setunit*{\addspace}}% {\setunit*{\addcomma\addspace}}} @@ -2189,7 +2552,9 @@ \ifthenelse{\(\iffieldundef{booktitle}\AND\iffieldundef{maintitle}\)% \OR\iffieldsequal{booktitle}{title}% Changed these for crossrefed \OR\iffieldsequal{maintitle}{title}}% entries. Create problems? - {\newunit\newblock}% + {\iffieldequalstr{entrytype}{video}% Change for Video type? Appears + {\newcunit\newblock}% to treat italicized title as booktitle in + {\newunit\newblock}}% available examples. {\newcunit\newblock}} \newbibmacro*{edition}{% @@ -2235,7 +2600,7 @@ \newcunit \printlist{institution}% \setunit*{\addcomma\space}% - \printfield{year}} + \usebibmacro{cmsyear}} \newbibmacro*{institution+organization}{% \iflistundef{organization}% @@ -2482,13 +2847,37 @@ \newbibmacro*{chapincoll}{% \iffieldundef{chapter}% {} - {\printfield{chapter}\addspace}} + {\printfield{chapter}\addspace% + \clearfield{chapter}}} + +\newbibmacro*{chapinscore}{% + \iffieldundef{chapter}% + {} + {\printfield{chapter}% + \addspace\bibstring{of}\setunit{\addspace}% + \clearfield{chapter}}} \newbibmacro*{ser+num}{% \printfield{series}% \printfield[sernum]{number}% \newunit} +\newbibmacro*{music+ser+num}{% + \iffieldundef{series}% + {\iffieldundef{number}% + {}% + {\printfield{number}}} + {\printfield{series}% + \setunit{\addspace}% + \printfield{number}}}% + +\newbibmacro*{music+publisher}{% + \iffieldundef{howpublished}% + {\iffieldundef{pubstate}% + {}% + {\printfield{pubstate}}}% + {\printfield{howpublished}}}% + \newbibmacro*{ctitle+stitle}{% \printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work) \printfield[noformat]{title}% @@ -2580,7 +2969,11 @@ \printfield{booktitleaddon}}} \newbibmacro*{publ+loc+year}{% Revised for reprint - \iftoggle{cms@reprint}% + \ifboolexpr{ + togl{cms@reprint} + and + not test {\iffieldequalstr{entrytype}{video}} + }% {\bibstring{reprint}% \newcunit}% {}% @@ -2625,9 +3018,9 @@ \newbibmacro*{cpubl+loc+year}{% Revised for reprint \ifboolexpr{ - test {\iffieldundef{location}} + test {\iflistundef{location}} and - test {\iffieldundef{publisher}} + test {\iflistundef{publisher}} and test {\iffieldundef{year}} and @@ -2638,7 +3031,11 @@ \printtext[parens]{% \usebibmacro{cmsorigdate}%\printfield{origyear}% \setunit*{\addsemicolon\addspace}% - \iftoggle{cms@reprint}% + \ifboolexpr{ + togl {cms@reprint} + and + not test{\iffieldequalstr{entrytype}{video}} + }% {\bibsstring{reprint}% \newcunit}% {}% @@ -2713,20 +3110,20 @@ \setunit{\addspace}% \printtext[parens]{% parens is the default here \iffieldundef{issue} - {\usebibmacro{date}}% + {\usebibmacro{number+or+month}}% {\printfield{issue}% \setunit{\addspace}% - \printfield{year}}}} + \usebibmacro{cmsyear}}}} \newbibmacro*{cperiodical+issue+year+pages}{% For periodicals, \usebibmacro{cperiodical+ser+vol+num}% subtype article \setunit{\addspace}% \printtext[parens]{% parens is the default here \iffieldundef{issue} - {\usebibmacro{date}}% + {\usebibmacro{number+or+month}}% {\printfield{issue}% \setunit{\addspace}% - \printfield{year}}}} + \usebibmacro{cmsyear}}}} \newbibmacro*{letter+date}{% New for 0.9 \iftoggle{cms@switchdates}% @@ -2756,6 +3153,18 @@ {\printdate}% {\printorigdate}} +\newbibmacro*{cmsyear}{% + \iftoggle{cms@switchdates}% + {\printfield{origyear}}% + {\printfield{year}}} + +\newbibmacro*{number+or+month}{% + \iffieldundef{number}% + {\usebibmacro{date}}% + {\iftoggle{cms@numbermonth}% + {\usebibmacro{date}}% + {\usebibmacro{cmsyear}}}} + \newcommand*{\cms@datelong}{% Modified for 0.9 \iffieldundef{origmonth}% {\printfield{origyear}}% @@ -2832,6 +3241,15 @@ \setunit{\addcolon\addspace}% \printfield[noformat]{journalsubtitle}}}} +\newbibmacro*{cite+doi+url}{% + \iftoggle{cms@doi}% + {\printfield{doi}}% + {}% + \newcunit\newblock + \iftoggle{cms@url}% + {\usebibmacro{url+date}}% + {}} + \newbibmacro*{url+date}{% Changed for 0.9 \printfield{url}% \iffieldundef{urlyear} @@ -2853,12 +3271,14 @@ \iffieldundef{issue} {\iffieldundef{number}% {\usebibmacro{date}}% - {\usebibmacro{date}% + {\iftoggle{cms@numbermonth}% For exclusion of month + {\usebibmacro{date}}% + {\usebibmacro{cmsyear}}% \setunit{\addcomma\addspace}% \printfield[journum]{number}}}% {\printfield{issue}% \setunit{\addspace}% - \printfield{year}}} + \usebibmacro{cmsyear}}} \newbibmacro*{mag+date+issue}{% \usebibmacro{journal+sub}% @@ -2968,9 +3388,7 @@ {\global\togglefalse{cms@printshhand}% \global\togglefalse{cms@shortnote}% \global\togglefalse{cms@fullnote}} - {\addperiod\space% - \bibstring{citedas}\space% - \printfield{shorthand}% + {\usebibmacro{cms:shorthandintro}% \global\togglefalse{cms@printshhand}% \global\togglefalse{cms@shortnote}% \global\togglefalse{cms@fullnote}}} @@ -2982,9 +3400,7 @@ \global\togglefalse{cms@fullnote}} {\postnotedelim% \printfield{postnote}% - \addperiod\space% - \bibstring{citedas}\space% - \printfield{shorthand}% + \usebibmacro{cms:shorthandintro}% \global\togglefalse{cms@printshhand}% \global\togglefalse{cms@shortnote}% \global\togglefalse{cms@fullnote}}}} @@ -3012,7 +3428,7 @@ \iffieldundef{postnote}% {\iffieldundef{chapter}% {\iffieldundef{pages}% - {\addcomma\addspace% + {\newcunit%\addcomma\addspace% Change to axe spurious comma \printlist[][-\value{listtotal}]{lista}}% {\postnotedelim% \printfield{pages}}}% diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx index 02ebacfae61..601beda5eaa 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx @@ -1,6 +1,6 @@ -% $Id: cms-american.lbx,v 0.10.1.8 2010/09/03 08:32:47 dfussner Exp $ +% $Id: cms-american.lbx,v 0.10.1.13 2011/02/15 12:00:23 dfussner Exp $ -\ProvidesFile{cms-american.lbx}[2010/09/03 v0.9c biblatex localization] +\ProvidesFile{cms-american.lbx}[2011/02/15 v 1.2a biblatex localization] \InheritBibliographyExtras{american} @@ -25,7 +25,10 @@ \restorecommand\mkbibrangeterseextra% } +\NewBibliographyString{bynone} \NewBibliographyString{bycompiler} +\NewBibliographyString{bydirector} +\NewBibliographyString{byproducer} \NewBibliographyString{byeditorcp} \NewBibliographyString{byeditortrcp} \NewBibliographyString{byeditortrcpco} @@ -73,6 +76,8 @@ \NewBibliographyString{bycompileranin} \NewBibliographyString{bycompileranfo} \NewBibliographyString{bycompileranaf} +\NewBibliographyString{cbynone} +\NewBibliographyString{cbyauthor} \NewBibliographyString{cbyeditor} \NewBibliographyString{cbytranslator} \NewBibliographyString{cbycompiler} @@ -82,6 +87,8 @@ \NewBibliographyString{cbyfounder} \NewBibliographyString{cbycontinuator} \NewBibliographyString{cbycollaborator} +\NewBibliographyString{cbydirector} +\NewBibliographyString{cbyproducer} \NewBibliographyString{cbyeditortr} \NewBibliographyString{cbyeditorcp} \NewBibliographyString{cbyeditorco} @@ -186,6 +193,8 @@ \NewBibliographyString{origpub} \NewBibliographyString{origpublin} \NewBibliographyString{origpubyear} +\NewBibliographyString{origreleaseyear} +\NewBibliographyString{origshownyear} \NewBibliographyString{origedition} \NewBibliographyString{revisededition} \NewBibliographyString{numbers} @@ -217,6 +226,12 @@ \NewBibliographyString{sections} \NewBibliographyString{compiler} \NewBibliographyString{compilers} +\NewBibliographyString{conductor} +\NewBibliographyString{conductors} +\NewBibliographyString{director} +\NewBibliographyString{directors} +\NewBibliographyString{producer} +\NewBibliographyString{producers} \NewBibliographyString{transcompiler} \NewBibliographyString{transcompilers} \NewBibliographyString{editortranscompiler} @@ -255,6 +270,12 @@ {eds\adddot\addspace and comps\adddot}}, editortranslators = {{eds\adddot\addspace and trans\adddot}% {eds\adddot\addspace and trans\adddot}}, + conductor = {{dir\adddot}{dir\adddot}}, + conductors = {{dirs\adddot}{dirs\adddot}}, + director = {{dir\adddot}{dir\adddot}}, + directors = {{dirs\adddot}{dirs\adddot}}, + producer = {{prod\adddot}{prod\adddot}}, + producers = {{prods\adddot}{prods\adddot}}, editor = {{ed\adddot}{ed\adddot}}, editors = {{eds\adddot}{eds\adddot}}, ibidem = {{ibid\adddot}{ibid\adddot}}, @@ -264,6 +285,10 @@ {orig\adddot\ pub\adddot\addspace in\addspace}}, origpubyear = {{originally published in\addspace}% {orig\adddot\ pub\adddot\addspace}}, + origreleaseyear = {{originally released in\addspace}% + {orig\adddot\ released\addspace}}, + origshownyear = {{originally shown in\addspace}% + {orig\adddot\ shown\addspace}}, origedition ={{edition\addcolon\addspace}% {ed\adddot\addcolon\addspace}}, revisededition = {{rev\adddot\addspace ed\adddot}% @@ -309,6 +334,8 @@ shorthands = {{Abbreviations}{Abbreviations}}, newseries = {{n\adddot s\adddot}{n\adddot s\adddot}}, urlseen = {{accessed}{accessed}}, + cbynone = {{}{}}, + cbyauthor = {{by}{by}}, cbyeditor = {{ed\adddot}{ed\adddot}}, cbytranslator = {{trans\adddot\addspace\lbx@cfromlang}% {trans\adddot\addspace\lbx@cfromlang}}, @@ -320,6 +347,8 @@ cbycontinuator = {{cont\adddot}{cont\adddot}}, cbycollaborator = {{in collab\adddotspace with}% {in collab\adddotspace with}}, + cbydirector = {{dir\adddot}{dir\adddot}}, + cbyproducer = {{prod\adddot}{prod\adddot}}, cbyeditortr = {{ed\adddot\space and trans\adddot\addspace\lbx@cfromlang}% {ed\adddot\space and trans\adddot\addspace\lbx@cfromlang}}, @@ -618,7 +647,10 @@ cfromrussian = {{from the Russian by}{from the Russian by}}, cfromspanish = {{from the Spanish by}{from the Spanish by}}, cfromswedish = {{from the Swedish by}{from the Swedish by}}, + bynone = {{}{}}, bycompiler = {{compiled by}{comp\adddot}}, + bydirector = {{directed by}{dir\adddot}}, + byproducer = {{produced by}{prod\adddot}}, byeditorcp = {{edited and compiled by}{ed\adddot\space and comp\adddot}}, byeditortrcp = {{edited, translated \lbx@fromlang, and compiled by}% {ed.,\addabbrvspace trans.\addspace\lbx@fromlang, and comp\adddot}}, diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx index f9ab5e94f33..23ff86ea9aa 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx @@ -1,6 +1,6 @@ -% $Id: cms-french.lbx,v 0.9.5.4 2010/09/03 08:32:58 dfussner Exp $ +% $Id: cms-french.lbx,v 0.9.5.7 2011/02/15 12:04:01 dfussner Exp $ -\ProvidesFile{cms-french.lbx}[2010/09/03 v0.9c biblatex localization] +\ProvidesFile{cms-french.lbx}[2011/02/15 v 1.2a biblatex localization] % STATUS OF THIS FILE % - Some strings still missing @@ -40,7 +40,10 @@ \restorecommand\mkbibrangeterse% \restorecommand\mkbibrangeterseextra} +\NewBibliographyString{bynone} \NewBibliographyString{bycompiler} +\NewBibliographyString{bydirector} +\NewBibliographyString{byproducer} \NewBibliographyString{byeditorcp} \NewBibliographyString{byeditortrcp} \NewBibliographyString{byeditortrcpco} @@ -88,6 +91,8 @@ \NewBibliographyString{bycompileranin} \NewBibliographyString{bycompileranfo} \NewBibliographyString{bycompileranaf} +\NewBibliographyString{cbynone} +\NewBibliographyString{cbyauthor} \NewBibliographyString{cbyeditor} \NewBibliographyString{cbyeditoralt} % To cope with \smartof issues \NewBibliographyString{byeditoralt} % in \partedit command. @@ -96,6 +101,8 @@ \NewBibliographyString{cbyredactor} \NewBibliographyString{cbycommentator} \NewBibliographyString{cbyannotator} +\NewBibliographyString{cbydirector} +\NewBibliographyString{cbyproducer} \NewBibliographyString{cbyeditortr} \NewBibliographyString{cbyeditorcp} \NewBibliographyString{cbyeditorco} @@ -200,6 +207,8 @@ \NewBibliographyString{origpub} \NewBibliographyString{origpublin} \NewBibliographyString{origpubyear} +\NewBibliographyString{origreleaseyear} +\NewBibliographyString{origshownyear} \NewBibliographyString{origedition} \NewBibliographyString{revisededition} \NewBibliographyString{numbers} @@ -231,6 +240,12 @@ \NewBibliographyString{sections} \NewBibliographyString{compiler} \NewBibliographyString{compilers} +\NewBibliographyString{conductor} +\NewBibliographyString{conductors} +\NewBibliographyString{director} +\NewBibliographyString{directors} +\NewBibliographyString{producer} +\NewBibliographyString{producers} \NewBibliographyString{transcompiler} \NewBibliographyString{transcompilers} \NewBibliographyString{editortranscompiler} @@ -263,8 +278,14 @@ {\'eds\adddot\ et comp\adddot}}, editortranslators = {{\'eds\adddot\ et trad\adddot}% {\'eds\adddot\ et trad\adddot}}, + conductor = {{dir\adddot}{dir\adddot}}, + conductors = {{dir\adddot}{dir\adddot}}, + director = {{r\'eal\adddot}{r\'eal\adddot}}, + directors = {{r\'eal\adddot}{r\'eal\adddot}}, + producer = {{prod\adddot}{prod\adddot}}, + producers = {{prod\adddot}{prod\adddot}}, editor = {{\'ed\adddot}{\'ed\adddot}}, - editors = {{\'eds\adddot}{\'ed\adddot}}, + editors = {{\'eds\adddot}{\'eds\adddot}}, ibidem = {{ibid\adddot}{ibid\adddot}}, origpub = {{originellement publi\'e comme}% {origin\adddot\ publ\adddot\ comme}}, @@ -272,6 +293,10 @@ {origin\adddot\ publ\adddot\ dans}}, origpubyear = {{originellement publi\'e en\addspace}% {origin\adddot\ publ\adddot\addspace}}, + origreleaseyear = {{originellement sorti en\addspace}% + {origin\adddot\ sorti\addspace}}, + origshownyear = {{originellement diffus\'ee en\addspace}% + {origin\adddot\ diffus\'ee\addspace}}, origedition = {{\'edition}{\'edition}}, revisededition = {{\'ed\adddot\ r\'ev\adddot}{\'ed\adddot\ r\'ev\adddot}}, numbers = {{n\textsuperscript{os}}{n\textsuperscript{os}}},% ? @@ -313,7 +338,10 @@ reviewof = {{critique de}{critique de}}, reprint = {{r\'eimpression}{r\'eimpr\adddot}}, shorthands = {{Sigles}{Sigles}}, - newseries = {{nouv\adddot\ s\'er\adddot}{nouv\adddot\ s\'er\adddot}}, + newseries = {{nouv\adddot\ s\'er\adddot}{nouv\adddot\ + s\'er\adddot}}, + cbynone = {{}{}}, + cbyauthor = {{par}{par}}, cbyeditor = {{sous la dir\adddot\smartof}{sous la dir\adddot\smartof}}, cbyeditoralt = {{sous la dir\adddot}{sous la dir\adddot}}, @@ -327,6 +355,8 @@ % cbyfounder = {{}{}}, % FIXME % cbycontinuator = {{}{}}, % FIXME % cbycollaborator = {{}{}}, % FIXME + cbydirector = {{r\'eal\adddot}{r\'eal\adddot}}, + cbyproducer = {{prod\adddot}{prod\adddot}}, cbyeditortr = {{\'ed\adddotspace \'etablie et trad\adddot\ \lbx@cfromlang}{\'ed\adddotspace \'etablie et trad\adddot\ \lbx@cfromlang}}, @@ -597,7 +627,10 @@ cfromrussian = {{du russe par}{du russe par}}, cfromspanish = {{de l'espagnol par}{de l'espagnol par}}, cfromswedish = {{du su\'edois par}{du su\'edois par}}, + bynone = {{}{}}, bycompiler = {{compil\'e par}{comp\adddot}}, + bydirector = {{r\'ealis\'e par}{r\'eal\adddot}}, + byproducer = {{produit par}{prod\adddot}}, byeditorcp = {{\'edition \'etablie et compil\'ee par}% {\'ed\adddotspace \'etablie et comp\adddot}}, byeditortrcp = {{\'edition \'etablie, traduite \lbx@fromlang\ et diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx index c565bb0e517..464976fdee1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx @@ -1,6 +1,6 @@ -% $Id: cms-german.lbx,v 0.9.5.4 2010/09/03 08:32:37 dfussner Exp $ +% $Id: cms-german.lbx,v 0.9.5.7 2011/02/15 12:02:26 dfussner Exp $ -\ProvidesFile{cms-german.lbx}[2010/09/03 v0.9c biblatex localization] +\ProvidesFile{cms-german.lbx}[2011/02/15 v 1.2a biblatex localization] % STATUS OF THIS FILE % - Translated strings and formatting decisions need review by native @@ -56,7 +56,10 @@ \restorecommand\mkbibrangeterse% \restorecommand\mkbibrangeterseextra} +\NewBibliographyString{bynone} \NewBibliographyString{bycompiler} +\NewBibliographyString{bydirector} +\NewBibliographyString{byproducer} \NewBibliographyString{byeditorcp} \NewBibliographyString{byeditortrcp} \NewBibliographyString{byeditortrcpco} @@ -104,6 +107,8 @@ \NewBibliographyString{bycompileranin} \NewBibliographyString{bycompileranfo} \NewBibliographyString{bycompileranaf} +\NewBibliographyString{cbynone} +\NewBibliographyString{cbyauthor} \NewBibliographyString{cbyeditor} \NewBibliographyString{cbytranslator} \NewBibliographyString{cbycompiler} @@ -113,6 +118,8 @@ \NewBibliographyString{cbyfounder} \NewBibliographyString{cbycontinuator} \NewBibliographyString{cbycollaborator} +\NewBibliographyString{cbydirector} +\NewBibliographyString{cbyproducer} \NewBibliographyString{cbyeditortr} \NewBibliographyString{cbyeditorcp} \NewBibliographyString{cbyeditorco} @@ -202,6 +209,8 @@ \NewBibliographyString{origpub} \NewBibliographyString{origpublin} \NewBibliographyString{origpubyear} +\NewBibliographyString{origreleaseyear} +\NewBibliographyString{origshownyear} \NewBibliographyString{origedition} \NewBibliographyString{revisededition} \NewBibliographyString{numbers} @@ -233,6 +242,12 @@ \NewBibliographyString{sections} \NewBibliographyString{compiler} \NewBibliographyString{compilers} +\NewBibliographyString{conductor} +\NewBibliographyString{conductors} +\NewBibliographyString{director} +\NewBibliographyString{directors} +\NewBibliographyString{producer} +\NewBibliographyString{producers} \NewBibliographyString{transcompiler} \NewBibliographyString{transcompilers} \NewBibliographyString{editortranscompiler} @@ -270,6 +285,12 @@ editortranslators = {{Hrsg\adddot\addabbrvspace und \"Ubers\adddot}% {Hrsg\adddot\addabbrvspace und \"Ubers\adddot}}, + conductor = {{Dir\adddot}{Dir\adddot}}, + conductors = {{Dir\adddot}{Dir\adddot}}, + director = {{Reg\adddot}{Reg\adddot}}, + directors = {{Reg\adddot}{Reg\adddot}}, + producer = {{Prod\adddot}{Prod\adddot}}, + producers = {{Prod\adddot}{Prod\adddot}}, editor = {{Hrsg\adddot}{Hrsg\adddot}}, editors = {{Hrsg\adddot}{Hrsg\adddot}}, ibidem = {{ebd\adddot}{ebd\adddot}}, @@ -279,6 +300,10 @@ {urspr\adddot\ ver\"offtl\adddot\ in}}, origpubyear = {{urspr\"unglich ver\"offentlicht im Jahr\addspace}% {urspr\adddot\ ver\"offtl\adddot\addspace}}, + origreleaseyear = {{urspr\"unglich freigegeben\addspace}% + {urspr\adddot\ freigegeben\addspace}}, + origshownyear = {{urspr\"unglich gezeigt\addspace}% + {urspr\adddot\ gezeigt\addspace}}, origedition = {{Auf\noligature lage\addcolon}% {Aufl\adddot\addcolon}}, revisededition = {{\"uberarb\adddot\space Aufl\adddot}% @@ -323,6 +348,8 @@ reprint = {{Nachdruck}{Nachdr\adddot}}, shorthands = {{Sigel}{Sigel}}, newseries = {{n.\,F\adddot}{n.\,F\adddot}}, + cbynone = {{}{}}, + cbyauthor = {{von}{von}}, cbyeditor = {{hrsg\adddot}{hrsg\adddot}}, cbytranslator = {{\lbx@fromlang \"ubers\adddot}% {\lbx@fromlang \"ubers\adddot}}, @@ -334,6 +361,8 @@ cbycontinuator = {{fortgef\adddot}{fortgef\adddot}}, cbycollaborator = {{unter Mitarb\adddotspace von}% {unter Mitarb\adddotspace von}}, + cbydirector = {{unter der Reg\adddot\ von}{unter der Reg\adddot\ von}}, + cbyproducer = {{prod\adddot}{prod\adddot}}, cbyeditortr = {{hrsg\adddot\addabbrvspace und \lbx@fromlang \"ubers\adddot}% {hrsg\adddot\addabbrvspace und \lbx@fromlang \"ubers\adddot}}, @@ -706,7 +735,10 @@ mathesis = {{Magisterarbeit}{Magisterarbeit}}, phdthesis = {{Diss\adddot}{Diss\adddot}}, techreport = {{Technischer Bericht}{Technischer Bericht}}, + bynone = {{}{}}, bycompiler = {{zusammengestellt von}{zusammengest\adddot}}, + bydirector = {{unter der Regie von}{unter der Reg\adddot\ von}}, + byproducer = {{produziert von}{prod\adddot}}, byeditorcp = {{herausgegeben und zusammengestellt von}% {hrsg\adddot\addabbrvspace und zusammengest\adddot}}, byeditortrcp = {{herausgegeben, \lbx@fromlang \"ubersetzt und diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx index 2d2896f547c..f6e7ce22492 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx @@ -1,6 +1,6 @@ -% $Id: cms-ngerman.lbx,v 0.9.5.4 2010/09/03 08:32:37 dfussner Exp $ +% $Id: cms-ngerman.lbx,v 0.9.5.7 2011/02/15 12:02:26 dfussner Exp $ -\ProvidesFile{cms-ngerman.lbx}[2010/09/03 v0.9c biblatex localization] +\ProvidesFile{cms-ngerman.lbx}[2011/02/15 v 1.2a biblatex localization] % STATUS OF THIS FILE % - Translated strings and formatting decisions need review by native @@ -56,7 +56,10 @@ \restorecommand\mkbibrangeterse% \restorecommand\mkbibrangeterseextra} +\NewBibliographyString{bynone} \NewBibliographyString{bycompiler} +\NewBibliographyString{bydirector} +\NewBibliographyString{byproducer} \NewBibliographyString{byeditorcp} \NewBibliographyString{byeditortrcp} \NewBibliographyString{byeditortrcpco} @@ -104,6 +107,8 @@ \NewBibliographyString{bycompileranin} \NewBibliographyString{bycompileranfo} \NewBibliographyString{bycompileranaf} +\NewBibliographyString{cbynone} +\NewBibliographyString{cbyauthor} \NewBibliographyString{cbyeditor} \NewBibliographyString{cbytranslator} \NewBibliographyString{cbycompiler} @@ -113,6 +118,8 @@ \NewBibliographyString{cbyfounder} \NewBibliographyString{cbycontinuator} \NewBibliographyString{cbycollaborator} +\NewBibliographyString{cbydirector} +\NewBibliographyString{cbyproducer} \NewBibliographyString{cbyeditortr} \NewBibliographyString{cbyeditorcp} \NewBibliographyString{cbyeditorco} @@ -202,6 +209,8 @@ \NewBibliographyString{origpub} \NewBibliographyString{origpublin} \NewBibliographyString{origpubyear} +\NewBibliographyString{origreleaseyear} +\NewBibliographyString{origshownyear} \NewBibliographyString{origedition} \NewBibliographyString{revisededition} \NewBibliographyString{numbers} @@ -233,6 +242,12 @@ \NewBibliographyString{sections} \NewBibliographyString{compiler} \NewBibliographyString{compilers} +\NewBibliographyString{conductor} +\NewBibliographyString{conductors} +\NewBibliographyString{director} +\NewBibliographyString{directors} +\NewBibliographyString{producer} +\NewBibliographyString{producers} \NewBibliographyString{transcompiler} \NewBibliographyString{transcompilers} \NewBibliographyString{editortranscompiler} @@ -270,6 +285,12 @@ editortranslators = {{Hrsg\adddot\addabbrvspace und \"Ubers\adddot}% {Hrsg\adddot\addabbrvspace und \"Ubers\adddot}}, + conductor = {{Dir\adddot}{Dir\adddot}}, + conductors = {{Dir\adddot}{Dir\adddot}}, + director = {{Reg\adddot}{Reg\adddot}}, + directors = {{Reg\adddot}{Reg\adddot}}, + producer = {{Prod\adddot}{Prod\adddot}}, + producers = {{Prod\adddot}{Prod\adddot}}, editor = {{Hrsg\adddot}{Hrsg\adddot}}, editors = {{Hrsg\adddot}{Hrsg\adddot}}, ibidem = {{ebd\adddot}{ebd\adddot}}, @@ -279,6 +300,10 @@ {urspr\adddot\ ver\"offtl\adddot\ in}}, origpubyear = {{urspr\"unglich ver\"offentlicht im Jahr\addspace}% {urspr\adddot\ ver\"offtl\adddot\addspace}}, + origreleaseyear = {{urspr\"unglich freigegeben\addspace}% + {urspr\adddot\ freigegeben\addspace}}, + origshownyear = {{urspr\"unglich gezeigt\addspace}% + {urspr\adddot\ gezeigt\addspace}}, origedition = {{Auf\noligature lage\addcolon}% {Aufl\adddot\addcolon}}, revisededition = {{\"uberarb\adddot\space Aufl\adddot}% @@ -323,6 +348,8 @@ reprint = {{Nachdruck}{Nachdr\adddot}}, shorthands = {{Sigel}{Sigel}}, newseries = {{n.\,F\adddot}{n.\,F\adddot}}, + cbynone = {{}{}}, + cbyauthor = {{von}{von}}, cbyeditor = {{hrsg\adddot}{hrsg\adddot}}, cbytranslator = {{\lbx@fromlang \"ubers\adddot}% {\lbx@fromlang \"ubers\adddot}}, @@ -334,6 +361,8 @@ cbycontinuator = {{fortgef\adddot}{fortgef\adddot}}, cbycollaborator = {{unter Mitarb\adddotspace von}% {unter Mitarb\adddotspace von}}, + cbydirector = {{unter der Reg\adddot\ von}{unter der Reg\adddot\ von}}, + cbyproducer = {{prod\adddot}{prod\adddot}}, cbyeditortr = {{hrsg\adddot\addabbrvspace und \lbx@fromlang \"ubers\adddot}% {hrsg\adddot\addabbrvspace und \lbx@fromlang \"ubers\adddot}}, @@ -706,7 +735,10 @@ mathesis = {{Magisterarbeit}{Magisterarbeit}}, phdthesis = {{Diss\adddot}{Diss\adddot}}, techreport = {{Technischer Bericht}{Technischer Bericht}}, + bynone = {{}{}}, bycompiler = {{zusammengestellt von}{zusammengest\adddot}}, + bydirector = {{unter der Regie von}{unter der Reg\adddot\ von}}, + byproducer = {{produziert von}{prod\adddot}}, byeditorcp = {{herausgegeben und zusammengestellt von}% {hrsg\adddot\addabbrvspace und zusammengest\adddot}}, byeditortrcp = {{herausgegeben, \lbx@fromlang \"ubersetzt und -- cgit v1.2.3