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