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