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.bbx422
1 files changed, 106 insertions, 316 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 0e41d319d0e..307197f8141 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.7.24 2012/12/06 11:50:31 dfussner Exp $
+% $Id: chicago-notes.bbx,v 0.9.7.34 2013/03/12 12:07:20 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}[2012/12/06 v 2.4 biblatex bibliography style]
+\ProvidesFile{chicago-notes.bbx}[2013/03/12 v 2.5 biblatex bibliography style]
%%%% Initialize and format bibliography and los %%%%
@@ -386,10 +386,12 @@
\setunit{\addspace}%
\usebibmacro{language+transtitle}%
\newunit\newblock%
+ \usebibmacro{part+editor+translator}%
+ \newunit\newblock%
\usebibmacro{issuetitle}%
\setunit*{\addcomma\addspace}%
\usebibmacro{byeditor+others}%
- \newunit\newblock
+ \usebibmacro{editorpunct}%\newunit\newblock
\printfield{note}%
\setunit*{\addcomma\addspace}\newblock%
\usebibmacro{mag+news+date}%
@@ -419,10 +421,12 @@
\setunit*{\addperiod\addspace}\newblock% 16th ed.
\usebibmacro{byauthor}%
\newunit\newblock
+ \usebibmacro{part+editor+translator}%
+ \newunit\newblock%
\usebibmacro{issuetitle}%
\setunit*{\addcomma\addspace}%
\usebibmacro{byeditor+others}%
- \newunit\newblock
+ \usebibmacro{editorpunct}%\newunit\newblock
\printfield{note}%
\setunit*{\addcomma\addspace}\newblock% (changed for 0.7)??
\usebibmacro{journal+issue+year+pages}%
@@ -494,17 +498,7 @@
{\setunit{\addcomma\addspace}}%
\iffieldundef{edition}%
{}%
- {\usebibmacro{edition}%
- \newcunit
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}%
- \clearfield{volume}%
- \clearfield{part}}%
- {}%
- \newcunit
- \printfield{volumes}
- \clearfield{volumes}}%
+ {\usebibmacro{edition}}%
\newunit% unit, not cunit?
\usebibmacro{bybookauthor}%
\usebibmacro{byeditor+others}%
@@ -531,14 +525,7 @@
\newcunit
\printfield{maintitleaddon}}}
\newcunit\newblock
- \printfield{pages}%
- \newunit
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
- \newunit
- \printfield{volumes}%
+ \usebibmacro{volume+pages}%
\newunit\newblock
\usebibmacro{ser+num}%
\newunit\newblock
@@ -576,15 +563,7 @@
\iffieldundef{maintitle}%
{\iffieldundef{edition}%
{}%
- {\usebibmacro{edition}%
- \newunit
- \printfield{volume}%
- \printfield{part}%
- \clearfield{volume}%
- \clearfield{part}%
- \newunit
- \printfield{volumes}%
- \clearfield{volumes}}}%
+ {\usebibmacro{edition}}}%
{}%
\newunit\newblock% 16th ed.
\usebibmacro{byauthor}
@@ -595,31 +574,16 @@
\newcunit
\iffieldundef{edition}%
{}%
- {\usebibmacro{edition}%
- \newcunit
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}%
- \clearfield{volume}%
- \clearfield{part}}%
- {}%
- \newcunit
- \printfield{volumes}%
- \clearfield{volumes}}%
+ {\usebibmacro{edition}}%
\usebibmacro{editorpunct}%
\usebibmacro{byeditor+others}%
\usebibmacro{editorpunct}%\newcunit\newblock
\iftoggle{cms@bookpages}%
{}%
{\clearfield{pages}}%
- \usebibmacro{chap+pag}%
- \newunit
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
- \newunit
- \printfield{volumes}%
+ \printfield{chapter}%
+ \setunit*{\addcomma\addspace}%
+ \usebibmacro{volume+pages}%
\newunit\newblock
\usebibmacro{ser+num}%
\newunit\newblock
@@ -655,15 +619,7 @@
\ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}%
{\iffieldundef{edition}%
{}%
- {\usebibmacro{edition}%
- \newunit
- \printfield{volume}%
- \printfield{part}%
- \clearfield{volume}%
- \clearfield{part}%
- \newunit
- \printfield{volumes}%
- \clearfield{volumes}}}%
+ {\usebibmacro{edition}}}%
{}%
\newunit\newblock% 16th ed.
\usebibmacro{byauthor}%
@@ -675,32 +631,15 @@
\newcunit
\iffieldundef{edition}%
{}%
- {\usebibmacro{edition}%
- \newcunit
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}%
- \clearfield{volume}%
- \clearfield{part}}%
- {}%
- \newcunit
- \printfield{volumes}%
- \clearfield{volumes}}%
+ {\usebibmacro{edition}}%
\newcunit
\usebibmacro{bybookauthor}%
\usebibmacro{editorpunct}
\usebibmacro{byeditor+others}%
\newcunit\newblock
- \usebibmacro{chap+pag}%
- \newunit\newblock
- \printfield{edition}%
- \newunit
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
- \newunit
- \printfield{volumes}%
+ \printfield{chapter}%
+ \newcunit\newblock
+ \usebibmacro{volume+pages}%
\newunit\newblock
\usebibmacro{ser+num}%
\newunit\newblock
@@ -760,26 +699,11 @@
\usebibmacro{editorpunct}%
\iffieldundef{edition}%
{}%
- {\usebibmacro{edition}%
- \usebibmacro{editorpunct}%
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}%
- \clearfield{volume}%
- \clearfield{part}}%
- {}%
- \usebibmacro{editorpunct}%
- \printfield{volumes}%
- \clearfield{volumes}}%
+ {\usebibmacro{edition}}%
\usebibmacro{editorpunct}%
\usebibmacro{bytranslator+others}%
\newunit
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
- \newunit
- \printfield{volumes}%
+ \usebibmacro{volume+or+volumes}%
\newunit\newblock
\usebibmacro{ser+num}%
\newunit\newblock
@@ -866,29 +790,12 @@
\newcunit
\iffieldundef{edition}%
{}%
- {\usebibmacro{edition}%
- \newcunit
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}%
- \clearfield{volume}%
- \clearfield{part}}%
- {}%
- \newcunit
- \printfield{volumes}
- \clearfield{volumes}}%
+ {\usebibmacro{edition}}%
\newcunit
\usebibmacro{bybookauthor}%
\usebibmacro{byeditor+others}%
\newcunit\newblock
- \printfield{pages}%
- \newunit
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
- \newunit
- \printfield{volumes}%
+ \usebibmacro{volume+pages}%
\newunit\newblock
\usebibmacro{ser+num}%
\newunit\newblock
@@ -933,29 +840,12 @@
\newcunit
\iffieldundef{edition}%
{}%
- {\usebibmacro{edition}%
- \newcunit
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}%
- \clearfield{volume}%
- \clearfield{part}}%
- {}%
- \newcunit
- \printfield{volumes}
- \clearfield{volumes}}%
+ {\usebibmacro{edition}}%
\newcunit
\usebibmacro{bybookauthor}%
\usebibmacro{byeditor+others}%
\newcunit\newblock
- \printfield{pages}%
- \newunit
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
- \newunit
- \printfield{volumes}%
+ \usebibmacro{volume+pages}%
\newunit\newblock
\usebibmacro{ser+num}%
\newunit\newblock
@@ -978,14 +868,16 @@
\usebibmacro{originally+published+as}%
\usebibmacro{finentry}}%
{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+ \usebibmacro{xrefprenote}% Volume fix
\usebibmacro{chapincoll}%
\bibxrefcite{\thefield{xref}}%
- \usebibmacro{bibpostxref}%
+ \usebibmacro{xrefpostnote}%
\usebibmacro{finentry}}}%
{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+ \usebibmacro{xrefprenote}% Volume fix
\usebibmacro{chapincoll}%
\bibxrefcite{\thefield{crossref}}%
- \usebibmacro{bibpostxref}%
+ \usebibmacro{xrefpostnote}%
\usebibmacro{finentry}}}
\DeclareBibliographyDriver{inproceedings}{%
@@ -1008,14 +900,7 @@
\usebibmacro{cms-in:}%
\usebibmacro{mtitle+mstitle+vol+part+btitle+bstitle}%
\newcunit\newblock
- \printfield{pages}%
- \newunit\newblock
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
- \newunit
- \printfield{volumes}%
+ \usebibmacro{volume+pages}%
\newunit\newblock
\usebibmacro{ser+num}%
\newunit\newblock
@@ -1036,14 +921,16 @@
\usebibmacro{originally+published+as}%
\usebibmacro{finentry}}%
{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+ \usebibmacro{xrefprenote}% Volume fix
\usebibmacro{chapincoll}%
\bibxrefcite{\thefield{xref}}%
- \usebibmacro{bibpostxref}%
+ \usebibmacro{xrefpostnote}%
\usebibmacro{finentry}}}%
{\ifterm{\setunit{\addspace\bibsentence}}{\setunit{\addperiod\addspace}}%
+ \usebibmacro{xrefprenote}% Volume fix
\usebibmacro{chapincoll}%
\bibxrefcite{\thefield{crossref}}%
- \usebibmacro{bibpostxref}%
+ \usebibmacro{xrefpostnote}%
\usebibmacro{finentry}}}
\DeclareBibliographyDriver{inreference}{%
@@ -1053,15 +940,7 @@
\ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}%
{\iffieldundef{edition}%
{}%
- {\usebibmacro{edition}%
- \newunit
- \printfield{volume}%
- \printfield{part}%
- \clearfield{volume}%
- \clearfield{part}%
- \newunit
- \printfield{volumes}%
- \clearfield{volumes}}}%
+ {\usebibmacro{edition}}}%
{}%
\newunit\newblock
\usebibmacro{part+editor+translator}%
@@ -1071,30 +950,15 @@
\newcunit
\iffieldundef{edition}%
{}%
- {\usebibmacro{edition}%
- \newcunit
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}%
- \clearfield{volume}%
- \clearfield{part}}%
- {}%
- \newcunit
- \printfield{volumes}%
- \clearfield{volumes}}%
+ {\usebibmacro{edition}}%
\newcunit
\usebibmacro{bybookauthor}%
\usebibmacro{editorpunct}
\usebibmacro{byeditor+others}%
\newcunit\newblock
- \usebibmacro{chap+pag}%
- \newunit
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
- \newunit
- \printfield{volumes}%
+ \printfield{chapter}%
+ \newcunit\newblock
+ \usebibmacro{volume+pages}%
\newunit\newblock
\usebibmacro{ser+num}%
\newunit\newblock
@@ -1151,29 +1015,12 @@
\newcunit
\iffieldundef{edition}%
{}%
- {\usebibmacro{edition}%
- \newcunit
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}%
- \clearfield{volume}%
- \clearfield{part}}%
- {}%
- \newcunit
- \printfield{volumes}
- \clearfield{volumes}}%
+ {\usebibmacro{edition}}%
\newcunit
\usebibmacro{bybookauthor}%
\usebibmacro{byeditor+others}%
\newcunit\newblock
- \printfield{pages}%
- \newunit
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
- \newunit
- \printfield{volumes}%
+ \usebibmacro{volume+pages}%
\newunit\newblock
\usebibmacro{ser+num}%
\newunit\newblock
@@ -1196,16 +1043,18 @@
{\ifpunctmark{*}% Attempt to fix issues with n.d. Changed for 0.9.
{\setunit{\nopunct\addspace\bibsentence}}%
{}%
+ \usebibmacro{xrefprenote}% Volume fix
\usebibmacro{chapincoll}%
\bibxrefcite{\thefield{xref}}%
- \usebibmacro{bibpostxref}%
+ \usebibmacro{xrefpostnote}%
\usebibmacro{finentry}}}%
{\ifpunctmark{*}% Likewise.
{\setunit{\nopunct\addspace\bibsentence}}%
{}%
+ \usebibmacro{xrefprenote}% Volume fix
\usebibmacro{chapincoll}%
\bibxrefcite{\thefield{crossref}}%
- \usebibmacro{bibpostxref}%
+ \usebibmacro{xrefpostnote}%
\usebibmacro{finentry}}}
\DeclareBibliographyDriver{manual}{%
@@ -1309,17 +1158,7 @@
{\newcunit}%
\iffieldundef{edition}%
{}%
- {\usebibmacro{edition}%
- \newcunit
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}%
- \clearfield{volume}%
- \clearfield{part}}%
- {}%
- \newcunit
- \printfield{volumes}
- \clearfield{volumes}}%
+ {\usebibmacro{edition}}%
\newunit% unit, not cunit?
\usebibmacro{bybookauthor}%
\usebibmacro{byeditor+others}%
@@ -1346,14 +1185,7 @@
\newcunit
\printfield{maintitleaddon}}}
\newcunit\newblock
- \printfield{pages}%
- \newunit
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
- \newunit
- \printfield{volumes}%
+ \usebibmacro{volume+pages}%
\newunit\newblock
\printfield{version}%
\newunit\newblock
@@ -1539,12 +1371,7 @@
\newunit\newblock
\usebibmacro{mtitle+mstitle+vol+part+title+stitle}%
\newunit\newblock
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
- \newunit
- \printfield{volumes}%
+ \usebibmacro{volume+or+volumes}%
\newunit\newblock
\usebibmacro{ser+num}%
\newunit\newblock
@@ -1572,15 +1399,7 @@
\ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}%
{\iffieldundef{edition}%
{}%
- {\usebibmacro{edition}%
- \newunit
- \printfield{volume}%
- \printfield{part}%
- \clearfield{volume}%
- \clearfield{part}%
- \newunit
- \printfield{volumes}%
- \clearfield{volumes}}}%
+ {\usebibmacro{edition}}}%
{}%
\newunit\newblock
\usebibmacro{part+editor+translator}%
@@ -1590,30 +1409,15 @@
\newcunit
\iffieldundef{edition}%
{}%
- {\usebibmacro{edition}%
- \newcunit
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}%
- \clearfield{volume}%
- \clearfield{part}}%
- {}%
- \newcunit
- \printfield{volumes}%
- \clearfield{volumes}}%
+ {\usebibmacro{edition}}%
\newcunit
\usebibmacro{bybookauthor}%
\usebibmacro{editorpunct}
\usebibmacro{byeditor+others}%
\newcunit\newblock
- \usebibmacro{chap+pag}%
- \newunit
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
- \newunit
- \printfield{volumes}%
+ \printfield{chapter}%
+ \newcunit\newblock
+ \usebibmacro{volume+pages}%
\newunit\newblock
\usebibmacro{ser+num}%
\newunit\newblock
@@ -1646,9 +1450,11 @@
\newunit% 16th ed.
\usebibmacro{byauthor}%
\newunit\newblock
- \usebibmacro{ser+num}%
- \newunit\newblock
\printfield{type}%
+ \newcunit
+ \printfield{series}%
+ \setunit{\addnbspace}%
+ \printfield{number}%
\newunit
\printfield{note}%
\newunit\newblock
@@ -1685,10 +1491,12 @@
\setunit{\addspace}%
\usebibmacro{language+transtitle}%
\newunit\newblock%
+ \usebibmacro{part+editor+translator}%
+ \newunit\newblock%
\usebibmacro{issuetitle}%
\setunit*{\addcomma\addspace}%
\usebibmacro{byeditor+others}%
- \newunit\newblock
+ \usebibmacro{editorpunct}%\newunit\newblock
\printfield{note}%
\setunit*{\addcomma\addspace}\newblock%
\iffieldequalstr{entrysubtype}{magazine}
@@ -1723,15 +1531,7 @@
\iffieldundef{maintitle}%
{\iffieldundef{edition}%
{}%
- {\usebibmacro{edition}%
- \newunit
- \printfield{volume}%
- \printfield{part}%
- \clearfield{volume}%
- \clearfield{part}%
- \newunit
- \printfield{volumes}%
- \clearfield{volumes}}}%
+ {\usebibmacro{edition}}}%
{}%
\newcunit
\usebibmacro{bybookauthor}%
@@ -1742,26 +1542,11 @@
\newcunit%
\iffieldundef{edition}%
{}%
- {\usebibmacro{edition}%
- \newcunit
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}%
- \clearfield{volume}%
- \clearfield{part}}%
- {}%
- \newcunit
- \printfield{volumes}
- \clearfield{volumes}}%
+ {\usebibmacro{edition}}%
\usebibmacro{editorpunct}%
\usebibmacro{byeditor+others}%
\newunit
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
- \newunit
- \printfield{volumes}%
+ \usebibmacro{volume+or+volumes}%
\newunit\newblock
\usebibmacro{ser+num}%
\newunit\newblock
@@ -1870,17 +1655,7 @@
{\setunit{\addcomma\addspace}}%
\iffieldundef{edition}%
{}%
- {\usebibmacro{edition}%
- \newcunit
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}%
- \clearfield{volume}%
- \clearfield{part}}%
- {}%
- \newcunit
- \printfield{volumes}
- \clearfield{volumes}}%
+ {\usebibmacro{edition}}%
\newunit% unit, not cunit?
\usebibmacro{bybookauthor}%
\usebibmacro{byeditor+others}%
@@ -1907,14 +1682,7 @@
\newcunit
\printfield{maintitleaddon}}}
\newcunit\newblock
- \printfield{pages}%
- \newunit
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
- \newunit
- \printfield{volumes}%
+ \usebibmacro{volume+pages}%
\newunit\newblock
\usebibmacro{ser+num}%
\newunit\newblock
@@ -1947,35 +1715,51 @@
\iffieldundef{urlyear}
{}
{\printurldate}% Date fix
- \newunit\newblock
+ \iffieldundef{addendum}% Punctuation fixes in 0.9.9c
+ {\newunit\newblock}%
+ {\newcunit\newblock}%
\iftoggle{cms@doionly}%
{\iffieldundef{doi}%
{}%
{\printfield{doi}%
+ \setunit*{\addperiod\addspace}\newblock%
\clearfield{url}}}%
{\iftoggle{cms@doi}%
- {\printfield{doi}}%
+ {\printfield{doi}%
+ \setunit*{\addperiod\addspace}\newblock}%
{}}%
- \newunit\newblock
\iftoggle{cms@eprint}%
- {\usebibmacro{eprint}}%
+ {\usebibmacro{eprint}%
+ \setunit*{\addperiod\addspace}\newblock}%
{}%
- \newunit\newblock
\iftoggle{cms@url}%
{\printfield{url}}%
{}}%
-\newbibmacro*{bibpostxref}{%
- \iffieldundef{postnote}%
- {\iffieldundef{chapter}%
- {\iffieldundef{pages}%
- {}%
- {\postnotedelim% Extra space?
- \printfield{pages}}}%
- {\postnotedelim%
- \printfield{chapter}}}%
- {\postnotedelim%
- \printfield{postnote}}}
+\newbibmacro*{volume+pages}{% Volume fix
+ \iffieldundef{maintitle}%
+ {\iffieldundef{volume}%
+ {\printfield{pages}%
+ \newunit%
+ \printfield{volumes}}%
+ {\iffieldundef{part}%
+ {\iffieldundef{pages}%
+ {}%
+ {\ifthenelse{\iffieldnums{pages}\AND%
+ \iffieldundef{bookpagination}}%
+ {\printfield[default]{volume}%
+ \addcolon%
+ \printfield{pages}}%
+ {\printfield{volume}%
+ \addcomma\addspace%
+ \printfield{pages}}}}%
+ {\printfield{volume}%
+ \printfield{part}%
+ \newcunit%
+ \printfield{pages}}}}%
+ {\printfield{pages}%
+ \newunit%
+ \printfield{volumes}}}%
\newbibmacro*{mtitle+mstitle+vol+part+title+stitle}{%
\iffieldundef{maintitle}
@@ -2037,7 +1821,10 @@
not togl {cms@switchdates}
}%
{\iffieldundef{number}%
- {\setunit{\addcolon}\printfield{pages}}%
+ {\iffieldundef{bookpagination}%
+ {\setunit{\addcolon}}%
+ {\setunit{\addcolon\addspace}}%
+ \printfield{pages}}%
{\newcunit\printfield{pages}}}%
{\setunit{\addspace}%
\printtext[parens]{%
@@ -2059,7 +1846,10 @@
not togl {cms@switchdates}
}%
{\iffieldundef{number}%
- {\setunit{\addcolon}\printfield{pages}}%
+ {\iffieldundef{bookpagination}%
+ {\setunit{\addcolon}}%
+ {\setunit{\addcolon\addspace}}%
+ \printfield{pages}}%
{\newcunit\printfield{pages}}}%
{\setunit{\addspace}%
\printtext[parens]{%