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 --- .../texmf-dist/doc/latex/biblatex-chicago/README | 2 +- .../texmf-dist/doc/latex/biblatex-chicago/RELEASE | 8 ++ .../latex/biblatex-chicago/biblatex-chicago.pdf | Bin 720655 -> 720844 bytes .../latex/biblatex-chicago/biblatex-chicago.tex | 29 +++-- .../latex/biblatex-chicago/cms-dates-sample.pdf | Bin 411398 -> 411993 bytes .../latex/biblatex-chicago/cms-dates-sample.tex | 4 +- .../latex/biblatex-chicago/cms-notes-sample.pdf | Bin 307802 -> 307983 bytes .../latex/biblatex-chicago/cms-notes-sample.tex | 2 +- .../doc/latex/biblatex-chicago/dates-test.bib | 15 +++ .../doc/latex/biblatex-chicago/notes-test.bib | 15 +++ .../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 ++++++++++++++++++--- 14 files changed, 257 insertions(+), 83 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/README b/Master/texmf-dist/doc/latex/biblatex-chicago/README index 96f958a9f6d..4c51e349e5b 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/README +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/README @@ -9,7 +9,7 @@ date. Most particularly please note that Biber 0.9.6 beta is now required for the author-date style, and indeed for the notes & bibliography style if you choose to use Biber with it. -README (version 0.9.8b, 2011-09-29): +README (version 0.9.8c, 2011-10-12): Biblatex-chicago contains two biblatex styles implementing the specifications of the Chicago Manual of Style, 15th edition. (If you diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE b/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE index d2685ba84aa..514663923c2 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE @@ -1,3 +1,11 @@ +Release notes for version 0.9.8c [2011-10-12]: + + - Emil Salim pointed out some rather basic errors in the presentation + of InProceedings and Proceedings entries, errors that have been + present from the first release of the style(s). These should now, + belatedly, have been put right. This doesn't require any changes + to your .bib files. + Release notes for version 0.9.8b [2011-09-29]: - Christian Boesch alerted me to some bad date-formatting errors diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf index 1fbd493dd56..6bfd1c91da0 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf and b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex index d3e7183dfbf..3f00e78acbf 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex @@ -56,7 +56,7 @@ Style files for biblatex \vspace{.3\baselineskip} -\sffamily\normalsize\bfseries David Fussner\qquad Version 0.9.8b (beta) \\ +\sffamily\normalsize\bfseries David Fussner\qquad Version 0.9.8c (beta) \\ \href{mailto:djf027@googlemail.com}{djf027@googlemail.com}\\ \today \end{center} @@ -4716,7 +4716,7 @@ and \textsf{biblatex} will use the \textsf{origyear} as the citation, and also ensuring that the letters \texttt{a,b,c} are appended to disambiguate the two sources. You no longer need anything in the \textsf{options} field at all, thanks to the way -\cmd{DeclareLabelYear} works through the possibilities and finds a +\cmd{DeclareLabelyear} works through the possibilities and finds a date to head the entry. In this case, it works because we are using the \textsf{xref} mechanism to refer to the whole published collection (white:total), so a separate citation of that entry provides the @@ -5557,12 +5557,12 @@ in the entry, in the order \textsf{date, eventdate, origdate, urldate}. Only when it finds no year at all will it fall back on \cmd{bibstring\{nodate\}}. You can eliminate some of these dates from the running, or change the search order, using the -\cmd{DeclareLabelYear} command in your preamble, but please be aware +\cmd{DeclareLabelyear} command in your preamble, but please be aware that I have hard-coded this order into the author-date style in order to cope with some tricky corners of the specification. If you reorder these dates, and your references enter these tricky corners, the results might be surprising. (Cf.\ section~4.5.2 in -\textsf{biblatex.pdf} for the \cmd{DeclareLabelYear} command.) +\textsf{biblatex.pdf} for the \cmd{DeclareLabelyear} command.) Second, the entry types in which this automatic provision is turned off are \textsf{inreference}, \textsf{misc}, and \textsf{reference}, none of which may be expected in the standard case to have a date @@ -5648,7 +5648,7 @@ publication data will also include the date of the modern reprint. contains another book by the same author, also a reprint edition: (Author 1896/1974). How will these two works be ordered in the list of references? By whatever appears in the \textsf{date} field, which -appears first in the default definition of \cmd{DeclareLabelYear}, and +appears first in the default definition of \cmd{DeclareLabelyear}, and which in this case will be wrong, because the entries should always be ordered by the \emph{first} date to appear there, in this case the contents of \textsf{origdate}. In this example, the solution can be @@ -5710,7 +5710,7 @@ in section~\ref{sec:types:authdate} for the details.) If such an entry, as may well occur, contains only an \textsf{origdate}, as can also be the case in the \textsf{letter} entries I mentioned in the previous paragraph, \textsf{Biber} and the default -\cmd{DeclareLabelYear} definition now make it possible to do without a +\cmd{DeclareLabelyear} definition now make it possible to do without a \texttt{cmsdate} option, as \textsf{biblatex} will in such a case use the \textsf{origdate} to order the entries in a reference list, and will also append the alphabetical suffix if more than one entry by the @@ -5954,7 +5954,7 @@ consistency for the \texttt{reprint} mechanism. Cf.\ \textsf{biblatex} field, added recently to the \textbf{music} entry type in case users need it to identify a particular recording session or concert. See the documentation of that type above. In the default -configuration of \cmd{DeclareLabelYear}, an entry missing a +configuration of \cmd{DeclareLabelyear}, an entry missing a \textsf{date} will use the \textsf{eventdate} to find a year for the citation and list of references, though the rest of the field would in such a case be ignored in any entry other than \textsf{music}. @@ -6365,7 +6365,7 @@ the \textsf{origdate} in citations and at the head of entries in the list of references. In entries which have \emph{only} an \textsf{origdate} --- usually \textsf{misc} with an \textsf{entrysubtype} --- \textsf{Biber} and the default -\cmd{DeclareLabelYear} configuration now make it possible to do +\cmd{DeclareLabelyear} configuration now make it possible to do without a \texttt{cmsdate} option, as the \textsf{origdate} will automatically appear where and as it should. In entries with both dates you have a choice of which appears where. In some cases it may @@ -6992,7 +6992,7 @@ field, it identifies exactly when you accessed a given url. This field would contain the whole date, in \textsc{iso}8601 format (evanston:library, grove:sibelius, hlatky:hrt, osborne:poison, sirosh:visualcortex, wikiped:bibtex). In the default setting of -\cmd{DeclareLabelYear}, any entry without a \textsf{date}, +\cmd{DeclareLabelyear}, any entry without a \textsf{date}, \textsf{eventdate}, or \textsf{origdate} will now use the \textsf{urldate} to find a year for citations and the list of references (grove:sibelius, wikiped:bibtex). Please note that the @@ -8284,7 +8284,16 @@ thought I should warn you in advance. \section{Revision History} \label{sec:history} -\textbf{0.9.8b: Released \today} +\textbf{0.9.8c: Released \today} +\begin{itemize} +\item Emil Salim pointed out some rather basic errors in the + presentation of \textsf{inproceedings} and \textsf{proceedings} + entries, errors that have been present from the first release of the + style(s). These should now, belatedly, have been put right. +\item Minor improvements to coding and documentation. +\end{itemize} + +\textbf{0.9.8b: Released September 29, 2011} \begin{itemize} \item Bad Dates: Christian Boesch alerted me to some date-formatting errors produced when using the styles with the \texttt{german} diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.pdf index 9a4956e9fde..d17e40dbe6c 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.pdf and b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.tex index e8b20b2f592..1daba713024 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.tex +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.tex @@ -167,7 +167,7 @@ provoke it into searching for other sorts of dates in the entry, in the order \textsf{year, eventyear, origyear, urlyear}: e.g., \autocite{evanston:library}, which only has a \textsf{urlyear}. (You can eliminate some of these dates from the running, or change the -search order, using the \cmd{DeclareLabelYear} command in your +search order, using the \cmd{DeclareLabelyear} command in your preamble, but please be aware that I have hard-coded this order into the author-date style in order to cope with some tricky corners of the specification. If you reorder these dates, and your references enter @@ -410,6 +410,8 @@ InCollection: \autocite{centinel:letters}; \autocite{ellet:galena}; \autocite{keating:dearborn}; \autocite{lippincott:chicago}; \autocite{sirosh:visualcortex}; \autocite{wiens:avian}. +InProceedings: \autocite{frede:inproc}. + InReference: \autocite[absolute]{oed:cdrom}. Manual: \autocite{dyna:browser}. diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdf b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdf index 9e969c6e80a..ec94d7fc75e 100644 Binary files a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdf and b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdf differ diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.tex b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.tex index f1cdbda7288..428e4999dca 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.tex +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.tex @@ -241,7 +241,7 @@ Note\footfullcite[2]{weresz} note\autocite[2]{weresz} note\footnote{\fullcite{zukowsky:chicago}.} note.\footnote{\cite*{zukowsky:chicago}.} -\nocite{furet:passing:fr,good:wholeissue,house:papers} +\nocite{furet:passing:fr,good:wholeissue,house:papers,frede:inproc} \printshorthands diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib b/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib index b7d57de6083..ed9b7edc008 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/dates-test.bib @@ -981,6 +981,21 @@ annotation = {A standard Book entry, with a translator.} } +@inproceedings{frede:inproc, + keywords={secondary}, + author = {Dorothea Frede}, + title = {\mkbibemph{Nicomachean Ethics} VII. 11--12}, + subtitle = {Pleasure}, + booktitle = {Aristotle}, + booksubtitle = {\mkbibemph{Nicomachean Ethics}, Book VII}, + series = {Symposium Aristotelicum}, + editor = {Carlo Natali}, + publisher = {Oxford University Press}, + address = {Oxford}, + year = {2009}, + pages = {183-207} +} + @SuppBook{friedman:intro, author = {Friedman, Milton}, title = {The Road to Serfdom}, diff --git a/Master/texmf-dist/doc/latex/biblatex-chicago/notes-test.bib b/Master/texmf-dist/doc/latex/biblatex-chicago/notes-test.bib index b96b031fe6d..9d83a096b20 100644 --- a/Master/texmf-dist/doc/latex/biblatex-chicago/notes-test.bib +++ b/Master/texmf-dist/doc/latex/biblatex-chicago/notes-test.bib @@ -839,6 +839,21 @@ there's no harm in doing so.} } +@inproceedings{frede:inproc, + keywords={secondary}, + author = {Dorothea Frede}, + title = {\mkbibemph{Nicomachean Ethics} VII. 11--12}, + subtitle = {Pleasure}, + booktitle = {Aristotle}, + booksubtitle = {\mkbibemph{Nicomachean Ethics}, Book VII}, + series = {Symposium Aristotelicum}, + editor = {Carlo Natali}, + publisher = {Oxford University Press}, + address = {Oxford}, + year = {2009}, + pages = {183-207} +} + @Article{friedman:learning, author = {Friedman, James~W. and Mezzetti, Claudio}, title = {Learning in Games by Random Sampling}, 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