summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx80
1 files changed, 51 insertions, 29 deletions
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}