From dbb79e00b454d5ef01b12000a491fa3e7203973b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 12 Oct 2011 23:06:09 +0000 Subject: biblatex-chicago (12oct11) git-svn-id: svn://tug.org/texlive/trunk@24274 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/biblatex-chicago/chicago-authordate.bbx | 52 +++++---- .../latex/biblatex-chicago/chicago-authordate.cbx | 16 +-- .../tex/latex/biblatex-chicago/chicago-notes.bbx | 80 +++++++++----- .../tex/latex/biblatex-chicago/chicago-notes.cbx | 117 ++++++++++++++++++--- 4 files changed, 195 insertions(+), 70 deletions(-) (limited to 'Master/texmf-dist/tex/latex/biblatex-chicago') 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 377d9007db9..3a13a6dc8ca 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx @@ -1,11 +1,11 @@ -% $Id: chicago-authordate15.bbx,v 0.8.1.6 2011/09/28 17:33:38 dfussner Exp $ +% $Id: chicago-authordate15.bbx,v 0.8.1.8 2011/10/12 13:25:38 dfussner Exp $ % This is a biblatex style file, adapted mainly from Lehman's % standard.bbx and from chicago-notes.bbx. It provides the % reference list formatting for the Chicago author-date style, % _15th_ edition. \ProvidesFile{chicago-authordate.bbx} -[2011/09/28 v 1.6 biblatex bibliography style] +[2011/10/12 v 1.6 biblatex bibliography style] %%%% Initialize and format bibliography and los %%%% @@ -292,15 +292,9 @@ {\mkbibemph{\bibstring{see}}% \addspace% \usebibmacro{shorthand:label}}% - {\ifnameundef{author} - {\mkbibemph{\bibstring{see}}% - \setunit{\addspace}% - \printnames[loseditor]{editor}% - \addcomma\space - \usebibmacro{editstrg}} - {\mkbibemph{\bibstring{see}}% - \setunit{\addspace}% - \printnames[losauthor]{author}}}% + {\mkbibemph{\bibstring{see}}% + \addspace% + \usebibmacro{author/editor}}% \finentry}% {\ifnameundef{labelname} {\iffieldequalstr{entrysubtype}{magazine}% @@ -309,11 +303,7 @@ {\iffieldequalstr{entrytype}{manual}% {\printtext[bibhyperref]{\printlist{organization}\newcunit}}% {}}} - {\ifnameundef{author} - {\printnames[loseditor]{editor}% - \addcomma\space - \usebibmacro{editstrg}} - {\printnames[losauthor]{author}}% + {\usebibmacro{author/editor} \setunit{\addcomma\space}}% \printfield[lostitle]{title}% \finentry}} @@ -999,7 +989,9 @@ \usebibmacro{cms-in:}% \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}% \newcunit\newblock - \usebibmacro{chap+pag}% + \usebibmacro{byeditor+others}% + \newcunit\newblock + \printfield{pages}% \newunit\newblock \iffieldundef{maintitle} {\printfield{volume}% @@ -1496,6 +1488,17 @@ \setunit{\addspace}% \printfield{nameaddon}% \newunit\newblock + \ifundef\bbx@lasthash{% + \printtext[title]{% magazine subtype + \printfield[noformat]{title}% + \setunit{\addcolon\addspace}% + \printfield[noformat]{subtitle}}% + \setunit*{\addspace}% + \printlist[periodplace]{location}% + \clearlist{location}% + \clearfield{title}% + \clearfield{subtitle}% + \newunit\newblock}{}% \usebibmacro{cmsbibsortdate}% \newunit\newblock \usebibmacro{issuetitle}% @@ -1531,6 +1534,17 @@ \setunit{\addspace}% \printfield{nameaddon}% \newunit\newblock + \ifundef\bbx@lasthash{% + \printtext[title]{% magazine subtype + \printfield[noformat]{title}% + \setunit{\addcolon\addspace}% + \printfield[noformat]{subtitle}}% + \setunit*{\addspace}% + \printlist[periodplace]{location}% + \clearlist{location}% + \clearfield{title}% + \clearfield{subtitle}% + \newunit\newblock}{}% \usebibmacro{cmsbibsortdate}% \newunit\newblock \usebibmacro{issuetitle}% @@ -1573,6 +1587,8 @@ \usebibmacro{italtitle+stitle}% \newunit\newblock \usebibmacro{mtitle+mstitle+vol+part+title+stitle}% + \usebibmacro{editorpunct}% + \usebibmacro{bytranslator+others}% \newunit\newblock \iffieldundef{maintitle} {\printfield{volume}% @@ -1807,7 +1823,7 @@ \printfield{volumes} \clearfield{volumes}}% \usebibmacro{editorpunct}% - \usebibmacro{byeditor}% + \usebibmacro{byeditor+others}% \usebibmacro{editorpunct}%\newcunit\newblock \usebibmacro{chap+pag}% \newunit 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 b718305caef..e2db39d622e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx @@ -1,11 +1,11 @@ -% $Id: chicago-authordate15.cbx,v 0.8.1.7 2011/09/28 17:33:47 dfussner Exp $ +% $Id: chicago-authordate15.cbx,v 0.8.1.8 2011/10/10 18:03:45 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} -[2011/09/28 v 1.6 biblatex citation style] +[2011/10/12 v 1.6 biblatex citation style] %%%% Biblatex initialization + Chicago options + Toggles %%%% @@ -468,7 +468,8 @@ \newbibmacro*{cite:label}{% Test this \iffieldundef{label}% - {\iffieldequalstr{entrysubtype}{magazine}% Simplifies .bib creation + {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}% + \AND\NOT\iffieldequalstr{entrytype}{periodical}}% Simplifies .bib creation {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}}}% {\iffieldequalstr{entrytype}{manual}% {\printtext[bibhyperref]{\printlist{organization}}}% @@ -1283,9 +1284,12 @@ {\ifnameundef{afterword}% {\ifnameundef{foreword}% {\printfield{type}}% - {\bibstring{forewordto}}}% - {\bibstring{afterwordto}}}% - {\bibstring{introductionto}}} + {\bibstring{forewordto}% + \clearname{foreword}}}% + {\bibstring{afterwordto}% + \clearname{afterword}}}% + {\bibstring{introductionto}% + \clearname{introduction}}} \newbibmacro*{langlist:andothers}{% \ifthenelse{\value{listcount}=\value{liststop}\AND 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 80aa9cbbca9..6a670e81a24 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx @@ -1,11 +1,11 @@ -% $Id: chicago-notes15.bbx,v 0.9.7.7 2011/09/27 20:20:29 dfussner Exp $ +% $Id: chicago-notes15.bbx,v 0.9.7.10 2011/10/12 13:23:00 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, _15th_ edition. \ProvidesFile{chicago-notes.bbx} -[2011/09/28 v 1.6 biblatex bibliography style] +[2011/10/12 v 1.6 biblatex bibliography style] %%%% Initialize and format bibliography and los %%%% @@ -242,8 +242,8 @@ {\usebibmacro{picktranslator}} {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT \iffirstonpage} - {\bibnamedash\editordelim}% - {\printnames{editor}\editordelim% + {\bibnamedash\editordelim}%\addcomma\addspace + {\printnames{editor}\editordelim%\addcomma\space \savefield{fullhash}{\bbx@lasthash}}% \usebibmacro{editstrg}}} @@ -252,8 +252,8 @@ {\let\bbx@lasthash\undefined} {\ifthenelse{\iffieldequals{fullhash}{\bbx@lasthash}\AND\NOT \iffirstonpage} - {\bibnamedash\editordelim}% - {\printnames{editor}\editordelim% + {\bibnamedash\editordelim}%\addcomma\addspace + {\printnames{editor}\editordelim%\addcomma\space \savefield{fullhash}{\bbx@lasthash}}% \usebibmacro{editstrg}}} @@ -318,11 +318,7 @@ {\iffieldequalstr{entrytype}{manual}% {\printtext[bibhyperref]{\printlist{organization}\newcunit}}% {}}}% - {\ifnameundef{author} - {\printnames[loseditor]{editor}% - \addcomma\space - \usebibmacro{editstrg}} - {\printnames[losauthor]{author}}% + {\usebibmacro{author/editor}% \setunit{\addcomma\space}}% \printfield[lostitle]{title}% \finentry} @@ -963,6 +959,8 @@ \usebibmacro{cms-in:}% \usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}% \newcunit\newblock + \usebibmacro{byeditor+others}% + \newcunit\newblock \printfield{pages}% \newunit\newblock \iffieldundef{maintitle} @@ -1484,6 +1482,8 @@ \usebibmacro{italtitle+stitle}% \newunit\newblock \usebibmacro{mtitle+mstitle+vol+part+title+stitle}% + \usebibmacro{editorpunct}% + \usebibmacro{bytranslator+others}% \newunit\newblock \iffieldundef{maintitle} {\printfield{volume}% @@ -1912,7 +1912,8 @@ \iffieldundef{maintitle} {} {\iffieldundef{volume} - {\printtext[maintitle]{% + {\usebibmacro{cms-in:}% + \printtext[maintitle]{% \printfield[noformat]{maintitle}% \setunit{\addcolon\addspace}% \printfield[noformat]{mainsubtitle}}% @@ -1938,7 +1939,8 @@ \iffieldundef{maintitle} {} {\iffieldundef{volume} - {\printtext[maintitle]{% + {\usebibmacro{cms-in:}% + \printtext[maintitle]{% \printfield[noformat]{maintitle}% \setunit{\addcolon\addspace}% \printfield[noformat]{mainsubtitle}}% @@ -1958,27 +1960,47 @@ \newbibmacro*{journal+issue+year+pages}{% \usebibmacro{cjournal+ser+vol+num}% - \setunit{\addspace}% - \printtext[parens]{% - \iffieldundef{issue} - {\usebibmacro{number+or+month}}% + \ifboolexpr{% 16th ed. + test {\iffieldundef{issue}} + and + test {\iffieldundef{year}} + and + not togl {cms@switchdates} + }% + {\iffieldundef{number}% + {\setunit{\addcolon}\printfield{pages}}% + {\newcunit\printfield{pages}}}% + {\setunit{\addspace}% + \printtext[parens]{% + \iffieldundef{issue} + {\usebibmacro{number+or+month}}% {\printfield{issue}% - \setunit{\addspace}% - \usebibmacro{cmsyear}}}% - \setunit{\addcolon\addspace} - \printfield{pages}} + \setunit{\addspace}% + \usebibmacro{cmsyear}}}% + \setunit{\addcolon\addspace} + \printfield{pages}}} \newbibmacro*{periodical+issue+year+pages}{% \usebibmacro{cperiodical+ser+vol+num}% - \setunit{\addspace}% - \printtext[parens]{% - \iffieldundef{issue} - {\usebibmacro{number+or+month}}% + \ifboolexpr{% 16th ed. + test {\iffieldundef{issue}} + and + test {\iffieldundef{year}} + and + not togl {cms@switchdates} + }% + {\iffieldundef{number}% + {\setunit{\addcolon}\printfield{pages}}% + {\newcunit\printfield{pages}}}% + {\setunit{\addspace}% + \printtext[parens]{% + \iffieldundef{issue} + {\usebibmacro{number+or+month}}% {\printfield{issue}% - \setunit{\addspace}% - \usebibmacro{cmsyear}}}% - \setunit{\addcolon\addspace} - \printfield{pages}} + \setunit{\addspace}% + \usebibmacro{cmsyear}}}% + \setunit{\addcolon\addspace} + \printfield{pages}}} \newbibmacro*{bycompiler}{% \ifnameundef{namec} 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 0b0db8a2cc1..84dcff0df5d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx @@ -1,17 +1,17 @@ -% $Id: chicago-notes15.cbx,v 0.9.7.10 2011/09/27 20:23:17 dfussner Exp $ +% $Id: chicago-notes15.cbx,v 0.9.7.13 2011/10/12 13:23:11 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, % _15th_ edition. -\ProvidesFile{chicago-notes.cbx}[2011/09/28 v 1.6 biblatex citation style] +\ProvidesFile{chicago-notes.cbx}[2011/10/12 v 1.6 biblatex citation style] %%%% Biblatex initialization + Chicago options + Toggles %%%% \providecommand*{\mkibid}[1]{#1} -\providetoggle{cms@oneyear}% Needed for author-date +%\providetoggle{cms@oneyear}% Needed for author-date \providetoggle{cms@reprint}% ditto \providetoggle{cms@switchdates}% ditto @@ -296,6 +296,36 @@ {\global\toggletrue{cms@loccit}}% {}}} +\newbibmacro*{cite:journal}{% + \ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}% + {\usebibmacro{cite:ibid}}% + {\iffieldundef{journaltitle}% + {\usebibmacro{cite:short}}% + {\iffieldequalstr{authortype}{anon}% + {\bibleftbracket\printnames{labelname}% + \bibrightbracket\newcunit}% + {\iffieldequalstr{authortype}{anon?}% + {\bibleftbracket\printnames{labelname}?% + \bibrightbracket\newcunit}% + {\printnames{labelname}% + \isdot\newcunit}}% + \printfield[journaltitle]{journaltitle}% + \iffieldundef{volume}% + {\iffieldundef{number}% + {\iffieldundef{issue} + {\newcunit% + \usebibmacro{number+or+month}}% + {\newcunit% + \printfield{issue}% + \setunit{\addspace}% + \usebibmacro{cmsyear}}}% + {\newcunit% + \printfield[journum]{number}}}% + {\toggletrue{cms@fullnote}% + \togglefalse{cms@shortnote}% + \setunit{\addspace}% + \printfield[jourvol]{volume}\setunit{\addcolon}}}}} + %%%% Citation Commands, internal and external %%%% \DeclareCiteCommand{\cite} @@ -441,6 +471,28 @@ {\multicitedelim} {\usebibmacro{postnote}} +\DeclareCiteCommand{\citejournal}% Name? + {\usebibmacro{journalprenote}} + {\toggletrue{cms@shortnote}% + \togglefalse{cms@fullnote}% + \usebibmacro{citeindex}% + \usebibmacro{cite:journal}} + {\multicitedelim} + {\usebibmacro{fullpostnote}} + +\DeclareCiteCommand{\citeauthor} + {\boolfalse{citetracker}% + \boolfalse{pagetracker}% + \usebibmacro{prenote}} + {\toggletrue{cms@shortnote}% + \togglefalse{cms@fullnote}% + \ifciteindex + {\indexnames{labelname}} + {}% + \printnames{labelname}} + {\multicitedelim} + {\usebibmacro{postnote}} + \DeclareMultiCiteCommand{\citetitles}{citetitle}{\multicitedelim} %%%% Drivers for the Long Note Format %%%% @@ -1076,6 +1128,8 @@ \usebibmacro{cms-in:}% \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}% \newcunit\newblock + \usebibmacro{cbyeditor+others}% + \newcunit\newblock \iffieldundef{maintitle} {\printfield{volume}% \printfield{part}} @@ -1579,6 +1633,8 @@ \newcunit \usebibmacro{cmtitle+mstitle+vol+part+title+stitle}% \newcunit\newblock + \usebibmacro{cbytranslator+others}% + \newcunit\newblock \iffieldundef{maintitle} {\printfield{volume}% \printfield{part}} @@ -3144,23 +3200,43 @@ \newbibmacro*{cjournal+issue+year+pages}{% \usebibmacro{cjournal+ser+vol+num}% - \setunit{\addspace}% - \printtext[parens]{% parens is the default here - \iffieldundef{issue} - {\usebibmacro{number+or+month}}% + \ifboolexpr{% 16th ed. + test {\iffieldundef{issue}} + and + test {\iffieldundef{year}} + and + not togl {cms@switchdates} + }% + {\iffieldundef{number}% + {\setunit{\addcolon}}% + {\addcomma\addspace}}% w/setunit colon appears + {\setunit{\addspace}% + \printtext[parens]{% parens is the default here + \iffieldundef{issue} + {\usebibmacro{number+or+month}}% {\printfield{issue}% - \setunit{\addspace}% - \usebibmacro{cmsyear}}}} + \setunit{\addspace}% + \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{number+or+month}}% + \ifboolexpr{% 16th ed. + test {\iffieldundef{issue}} + and + test {\iffieldundef{year}} + and + not togl {cms@switchdates} + }% + {\iffieldundef{number}% + {\setunit{\addcolon}}% + {\addcomma\addspace}}% + {\setunit{\addspace}% + \printtext[parens]{% parens is the default here + \iffieldundef{issue} + {\usebibmacro{number+or+month}}% {\printfield{issue}% - \setunit{\addspace}% - \usebibmacro{cmsyear}}}} + \setunit{\addspace}% + \usebibmacro{cmsyear}}}}} \newbibmacro*{letter+date}{% New for 0.9 \iftoggle{cms@switchdates}% @@ -3342,7 +3418,8 @@ \iffieldundef{maintitle} {} {\iffieldundef{volume} - {\printtext[maintitle]{% + {\usebibmacro{cms-in:}% + \printtext[maintitle]{% \printfield[noformat]{maintitle}% \setunit{\addcolon\addspace}% \printfield[noformat]{mainsubtitle}}% @@ -3392,7 +3469,8 @@ \iffieldundef{maintitle} {} {\iffieldundef{volume} - {\printtext[maintitle]{% + {\usebibmacro{cms-in:}% + \printtext[maintitle]{% \printfield[noformat]{maintitle}% \setunit{\addcolon\addspace}% \printfield[noformat]{mainsubtitle}}% @@ -3498,6 +3576,11 @@ {\printfield{prenote}% \ifciteseen{\addspace}{\nopunct}}}% Do we need \unspace here? +\newbibmacro*{journalprenote}{% + \iffieldundef{prenote}% + {\bibsentence}% + {\usebibmacro{prenote}}} + \newbibmacro*{part+editor+translator}{% \ifnameundef{namea}% {\ifnameundef{nameb}% -- cgit v1.2.3