summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx')
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx403
1 files changed, 306 insertions, 97 deletions
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 76c4808b341..8ff2919f00f 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,10 @@
-% $Id: chicago-authordate15.cbx,v 0.8.1.9 2011/11/15 10:44:41 dfussner Exp $
+% $Id: chicago-authordate.cbx,v 0.8.1.19 2012/07/05 11:04:14 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.
+% author-date style of the Chicago Manual of Style, 15th edition.
-\ProvidesFile{chicago-authordate.cbx}
-[2011/11/15 v 1.7 biblatex citation style]
+\ProvidesFile{chicago-authordate.cbx}[2012/07/05 v 1.7 biblatex citation style]
%%%% Biblatex initialization + Chicago options + Toggles %%%%
@@ -17,13 +16,18 @@
\providetoggle{cms@origlabel}
\providetoggle{cms@bothlabelold}
\providetoggle{cms@bothlabelnew}
+\providetoggle{cms@fulldate}
\providetoggle{cms@reprint}
\providetoggle{cms@switchdates}
\providetoggle{cms@los}
+%\providetoggle{cms@oneyear}
+\providetoggle{cms@avdate}
\providetoggle{cms@nodates}
+\providetoggle{cms@authorparens}
\providetoggle{cms@url}% These are for the field-exclusion options
\providetoggle{cms@doi}
+\providetoggle{cms@eprint}
\providetoggle{cms@isbn}
\providetoggle{cms@numbermonth}
\providetoggle{cms@bookpages}
@@ -36,18 +40,26 @@
\providetoggle{cms@origpublished}% Keep
\providetoggle{cms@annotation}% Keep
\providetoggle{cms@postposit}% Keep
+\providetoggle{cms@fullshhand}
\AtEveryCitekey{%
\iffieldundef{userc}%
{}%
{\nocite{\thefield{userc}}}%
- \iffieldequalstr{entrytype}{patent}%
- {\toggletrue{cms@origlabel}}%
- {}%
\iffieldequalstr{pubstate}{reprint}%
{\toggletrue{cms@reprint}}%
{\togglefalse{cms@reprint}}}%
+\DeclareBibliographyOption{avdate}[true]{%
+ \ifcsdef{cms@opt@avdate@#1}%
+ {\csuse{cms@opt@avdate@#1}}
+ {\blx@err@invopt{avdate=#1}{}}}
+\def\cms@opt@avdate@true{%
+ \DeclareLabelyear[music,review,video]{eventyear,origyear,year,urlyear}%
+ \toggletrue{cms@avdate}}%
+\def\cms@opt@avdate@false{%
+ \togglefalse{cms@avdate}}
+
\DeclareBibliographyOption{cmsdate}{% Trying to implement origyear as
\ifcsdef{cms@opt@cmsdate@#1}% labelyear. Sorting will be an issue.
{\csuse{cms@opt@cmsdate@#1}}
@@ -79,6 +91,10 @@
\toggletrue{cms@bothlabelnew}}
\def\cms@opt@cmsdate@old{%
\toggletrue{cms@bothlabelold}}
+\def\cms@opt@cmsdate@both{%
+ \toggletrue{cms@bothlabelold}}
+\def\cms@opt@cmsdate@full{%
+ \toggletrue{cms@fulldate}}
\def\cms@opt@cmsdate@off{}
\DeclareBibliographyOption{annotation}[true]{%
@@ -105,6 +121,9 @@
\DeclareEntryOption{juniorcomma}[true]{%
\settoggle{cms@jrcomma}{#1}}
+\DeclareBibliographyOption{shorthandfull}[true]{%
+ \settoggle{cms@fullshhand}{#1}}
+
% The field-exclusion options %
\DeclareBibliographyOption{isbn}[true]{%
@@ -113,6 +132,8 @@
\settoggle{cms@url}{#1}}
\DeclareBibliographyOption{doi}[true]{%
\settoggle{cms@doi}{#1}}
+\DeclareBibliographyOption{eprint}[true]{%
+ \settoggle{cms@eprint}{#1}}
\DeclareBibliographyOption{numbermonth}[true]{%
\settoggle{cms@numbermonth}{#1}}
\DeclareBibliographyOption{bookpages}[true]{%
@@ -121,6 +142,7 @@
\settoggle{cms@isbn}{#1}%
\settoggle{cms@url}{#1}%
\settoggle{cms@doi}{#1}%
+ \settoggle{cms@eprint}{#1}%
\settoggle{cms@numbermonth}{#1}%
\settoggle{cms@bookpages}{#1}}
@@ -130,6 +152,8 @@
\settoggle{cms@url}{#1}}
\DeclareEntryOption{doi}[true]{%
\settoggle{cms@doi}{#1}}
+\DeclareEntryOption{eprint}[true]{%
+ \settoggle{cms@eprint}{#1}}
\DeclareEntryOption{numbermonth}[true]{%
\settoggle{cms@numbermonth}{#1}}
\DeclareEntryOption{bookpages}[true]{%
@@ -139,6 +163,43 @@
% More authordate options %
+\DeclareSortingScheme{cms}{
+ \sort{
+ \field{presort}
+ }
+ \sort[final]{
+ \field{sortkey}
+ }
+ \sort{
+ \name{sortname}
+ \name{author}
+ \name{namea}
+ \name{editor}
+ \name{nameb}
+ \name{translator}
+ \name{namec}
+ \field{sorttitle}
+ \field{journaltitle}
+ \list{organization}
+ \field{title}
+ }
+ \sort{
+ \field{sortyear}
+ \field{year}
+ }
+ \sort{
+ \field{sorttitle}
+ \field{title}
+ }
+ \sort{
+ \field[padside=left,padwidth=4,padchar=0]{volume}
+ \literal{0000}
+ }
+}
+
+\DeclareLabelname{shortauthor,author,shorteditor,namea,editor,%
+nameb,translator,namec}
+
\DeclareEntryOption{switchdates}[true]{%
\settoggle{cms@switchdates}{#1}}
@@ -179,9 +240,19 @@
This is a fatal error. I'm aborting now.}%
\endinput}
+% American-specific punctuation change for 16th edition %
+
+\DefineBibliographyExtras{american}{%
+ \DeclarePunctuationPairs{comma}{*!?}}
+
%%%% Initialize and define bibstrings %%%%
-%%%% Now in cms-*.lbx %%%%
+% \NewBibliographyString{origpubyear} % Already in .lbx files?
+
+% \DefineBibliographyStrings{american}{%
+% origpubyear = {first published\addspace},}
+
+%%%% This one needed for 16th edition. Others in cms-*.lbx %%%%
%%%% Macros from authoryear-comp.cbx, revised for CMS %%%%
@@ -468,8 +539,8 @@
\newbibmacro*{cite:label}{% Test this
\iffieldundef{label}%
- {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}%
- \AND\NOT\iffieldequalstr{entrytype}{periodical}}% 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}}}%
@@ -477,6 +548,20 @@
{\printtext[bibhyperref]{\printfield{label}}}}
\newbibmacro*{cite:labelyear+extrayear}{%
+ \ifboolexpr{ (
+ test {\iffieldequalstr{entrytype}{music}}%
+ or
+ test {\iffieldequalstr{entrytype}{review}}%
+ or
+ test {\iffieldequalstr{entrytype}{video}}%
+ )
+ and
+ togl {cms@avdate}
+ }%
+ {\usebibmacro{cite:av+labelyear+extrayear}}%
+ {\usebibmacro{cite:standard+labelyear+extrayear}}}
+
+\newbibmacro*{cite:standard+labelyear+extrayear}{%
\iffieldundef{labelyear}
{\ifboolexpr{
test {\iffieldequalstr{entrytype}{misc}}
@@ -534,6 +619,64 @@
{\mbox{\bibdatedash}}%
{}}}}}}
+\newbibmacro*{cite:av+labelyear+extrayear}{%
+ \iffieldundef{labelyear}
+ {\ifboolexpr{
+ test {\iffieldequalstr{entrytype}{misc}}
+ or
+ test {\iffieldequalstr{entrytype}{inreference}}
+ or
+ test {\iffieldequalstr{entrytype}{reference}}
+ or
+ not togl {cms@nodates}
+ }%
+ {}%
+ {\printtext[bibhyperref]{\bibstring{nodate}}}}% For CMS?
+ {\printtext[bibhyperref]{%
+ \iffieldundef{eventyear}%
+ {\iffieldundef{origyear}
+ {\iffieldundef{year}%
+ {\printfield{labelyear}%
+ \iffieldundef{extrayear}%
+ {}%
+ {\setunit*{}%
+ \printfield{extrayear}}%
+ \iffieldundef{urlendyear}%
+ {}%
+ {\iffieldequalstr{urlendyear}{}%
+ {\mbox{\bibdatedash}}%
+ {}}}%
+ {\printfield{labelyear}%
+ \iffieldundef{extrayear}%
+ {}%
+ {\setunit*{}%
+ \printfield{extrayear}}%
+ \iffieldundef{endyear}%
+ {}%
+ {\iffieldequalstr{endyear}{}%
+ {\mbox{\bibdatedash}}%
+ {}}}}
+ {\printfield{labelyear}%
+ \iffieldundef{extrayear}%
+ {}%
+ {\setunit*{}%
+ \printfield{extrayear}}%
+ \iffieldundef{origendyear}%
+ {}%
+ {\iffieldequalstr{origendyear}{}%
+ {\mbox{\bibdatedash}}%
+ {}}}}
+ {\printfield{labelyear}%
+ \iffieldundef{extrayear}%
+ {}%
+ {\setunit*{}%
+ \printfield{extrayear}}%
+ \iffieldundef{eventendyear}% DATE FIX
+ {}%
+ {\iffieldequalstr{eventendyear}{}%
+ {\mbox{\bibdatedash}}%
+ {}}}}}}
+
\newbibmacro*{cmscitesortdate}{% Attempt to solve date-related problems
\ifboolexpr{%
test {\iffieldundef{origyear}}
@@ -561,10 +704,12 @@
\iftoggle{cms@origlabel}%
{\usebibmacro{cite:origyear+labelyear}}%
{\iftoggle{cms@bothlabelnew}%
- {\usebibmacro{cite:bothyear+newstyle}}%
+ {\usebibmacro{cite:bothyear+oldstyle}}%
{\iftoggle{cms@bothlabelold}%
{\usebibmacro{cite:bothyear+oldstyle}}%
- {\usebibmacro{cite:labelyear+extrayear}}}}%
+ {\iftoggle{cms@fulldate}%
+ {\newcunit\printdate}%
+ {\usebibmacro{cite:labelyear+extrayear}}}}}%
\ifcsdef{@cms@tempdate}%
{\toggletrue{\@cms@tempdate}}%
{}}
@@ -577,25 +722,17 @@
{\printtext[bibhyperref]{%
\printfield{origyear}}}}}
-\newbibmacro*{cite:bothyear+newstyle}{%
- \iftoggle{cms@switchdates}%
- {\usebibmacro{cite:labelyear+extrayear}/\printfield{origyear}}%
- {\iffieldundef{origyear}%
- {\usebibmacro{cite:labelyear+extrayear}}%
- {\printtext[bibhyperref]{%
- \printfield{origyear}/\printfield{labelyear}}}}}
-
\newbibmacro*{cite:bothyear+oldstyle}{%
\iftoggle{cms@switchdates}%
{\printtext[bibhyperref]{%
- \bibopenbracket%
+ \bibopenparen%
\usebibmacro{cite:labelyear+extrayear}%
- \bibclosebracket%
+ \bibcloseparen%
\addspace\printfield{origyear}}}%
{\iffieldundef{origyear}%
{\usebibmacro{cite:labelyear+extrayear}}%
{\printtext[bibhyperref]{%
- \printfield[brackets]{origyear}%
+ \printfield[parens]{origyear}%
\addspace\printfield{labelyear}}}}}
\newbibmacro*{cite:save}{%
@@ -762,37 +899,38 @@
\DeclareFieldFormat[article]{title}{%
\iffieldundef{title}%
{}%
- {\MakeSentenceCase*{#1}}}
+ {\mkbibquote{#1\isdot}}}
-\DeclareFieldAlias[article]{citetitle}[article]{lostitle}
+\DeclareFieldFormat[article]{citetitle}{%
+ \iffieldundef{title}%
+ {#1\isdot}%
+ {\mkbibquote{#1\isdot}}}
-\DeclareFieldFormat[article]{lostitle}{\MakeSentenceCase*{#1}}
+\DeclareFieldFormat[article]{lostitle}{%
+ \iffieldundef{title}%
+ {#1\isdot}%
+ {\mkbibquote{#1\isdot}}}
\DeclareFieldFormat[artwork]{title}{%
\iffieldundef{entrysubtype}%
- {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
- {\MakeSentenceCase*{#1}\isdot}}
+ {\mkbibemph{#1}\isdot}%
+ {#1\isdot}}
\DeclareFieldAlias[artwork]{citetitle}[artwork]{title}
-\DeclareFieldFormat[artwork]{lostitle}{%
- \iffieldundef{entrysubtype}%
- {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
- {\MakeSentenceCase*{#1}\isdot}}
+\DeclareFieldAlias[artwork]{lostitle}[artwork]{title}
-\DeclareFieldFormat[book]{title}{%
- \mkbibemph{\MakeSentenceCase*{#1}}\isdot}
+\DeclareFieldFormat[book]{title}{\mkbibemph{#1}\isdot}
\DeclareFieldAlias[book]{citetitle}[book]{title}
-\DeclareFieldFormat[book]{lostitle}{%
- \mkbibemph{\MakeSentenceCase*{#1}}\isdot}
+\DeclareFieldAlias[book]{lostitle}[book]{title}
\DeclareFieldAlias[bookinbook]{title}[book]{title}
\DeclareFieldAlias[bookinbook]{citetitle}[book]{title}
-\DeclareFieldAlias[bookinbook]{lostitle}[book]{lostitle}
+\DeclareFieldAlias[bookinbook]{lostitle}[book]{title}
\DeclareFieldAlias[collection]{title}[book]{title}
@@ -806,11 +944,11 @@
\DeclareFieldFormat[periodical]{lostitle}{\mkbibemph{#1}\isdot}
-\DeclareFieldAlias[image]{title}[article]{title}
+\DeclareFieldAlias[image]{title}[artwork]{title}
-\DeclareFieldAlias[image]{citetitle}[article]{title}
+\DeclareFieldAlias[image]{citetitle}[artwork]{title}
-\DeclareFieldAlias[image]{lostitle}[article]{lostitle}
+\DeclareFieldAlias[image]{lostitle}[artwork]{lostitle}
\DeclareFieldAlias[incollection]{title}[article]{title}% Change article?
@@ -848,15 +986,15 @@
\DeclareFieldAlias[thesis]{lostitle}[article]{lostitle}
-\DeclareFieldAlias[patent]{title}[article]{lostitle}
+\DeclareFieldAlias[patent]{title}[letter]{lostitle}% 16th ed.
-\DeclareFieldAlias[patent]{citetitle}[article]{title}
+\DeclareFieldAlias[patent]{citetitle}[letter]{title}
-\DeclareFieldAlias[patent]{lostitle}[article]{lostitle}
+\DeclareFieldAlias[patent]{lostitle}[letter]{lostitle}
\DeclareFieldAlias[unpublished]{title}[article]{title}
-\DeclareFieldAlias[unpublished]{citetitle}[article]{title}
+\DeclareFieldAlias[unpublished]{citetitle}[article]{citetitle}
\DeclareFieldAlias[unpublished]{lostitle}[article]{lostitle}
@@ -890,15 +1028,14 @@
\DeclareFieldAlias[inbook]{lostitle}[article]{lostitle}
-\DeclareFieldFormat[suppbook]{title}{%
- \mkbibemph{\MakeSentenceCase*{#1}}\isdot}
+\DeclareFieldFormat[suppbook]{title}{\mkbibemph{#1}\isdot}
\DeclareFieldAlias[suppbook]{citetitle}[suppbook]{lostitle}
\DeclareFieldFormat[suppbook]{lostitle}{%
\usebibmacro{inforaft}%
\addspace%
- \mkbibemph{\MakeSentenceCase*{#1}}\isdot}
+ \mkbibemph{#1}\isdot}
\DeclareFieldFormat[customc]{title}{%
\iffieldundef{nameaddon}%
@@ -930,21 +1067,20 @@
\DeclareFieldAlias[manual]{title}[book]{title}
-\DeclareFieldAlias[manual]{citetitle}[book]{title}
+\DeclareFieldAlias[manual]{citetitle}[book]{citetitle}
\DeclareFieldAlias[manual]{lostitle}[book]{lostitle}
\DeclareFieldAlias[report]{title}[book]{title}
-\DeclareFieldAlias[report]{citetitle}[book]{title}
+\DeclareFieldAlias[report]{citetitle}[book]{citetitle}
\DeclareFieldAlias[report]{lostitle}[book]{lostitle}
\DeclareFieldFormat[misc]{title}{%
\iffieldundef{entrysubtype}%
- {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
- {\ifcapital{\MakeCapital{#1\isdot}}%
- {#1\isdot}}}
+ {\mkbibemph{#1}\isdot}%
+ {\ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}}
\DeclareFieldAlias[misc]{citetitle}[misc]{title}
@@ -966,28 +1102,22 @@
\DeclareFieldAlias[online]{title}[article]{title}
-\DeclareFieldAlias[online]{citetitle}[article]{title}
+\DeclareFieldAlias[online]{citetitle}[article]{citetitle}
\DeclareFieldAlias[online]{lostitle}[article]{lostitle}
-\DeclareFieldFormat{booktitle}{\mkbibemph{\MakeSentenceCase*{#1}}}
+\DeclareFieldFormat{booktitle}{\mkbibemph{#1}}
-\DeclareFieldFormat{maintitle}{\mkbibemph{\MakeSentenceCase*{#1}}}
+\DeclareFieldFormat{maintitle}{\mkbibemph{#1}}
\DeclareFieldFormat[video]{title}{%
\iffieldundef{booktitle}%
- {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
- {\MakeSentenceCase*{#1}\isdot}}
+ {\mkbibemph{#1}\isdot}%
+ {\mkbibquote{#1\isdot}}}
-\DeclareFieldFormat[video]{citetitle}{%
- \iffieldundef{booktitle}%
- {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
- {\MakeSentenceCase*{#1}\isdot}}
+\DeclareFieldAlias[video]{citetitle}[video]{title}
-\DeclareFieldFormat[video]{lostitle}{%
- \iffieldundef{booktitle}%
- {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
- {\MakeSentenceCase*{#1}\isdot}}
+\DeclareFieldAlias[video]{lostitle}[video]{title}
\DeclareFieldAlias[music]{title}[video]{title}
@@ -1040,8 +1170,43 @@
{\href{http://dx.doi.org/#1}{\nolinkurl{#1}}}
{\nolinkurl{#1}}}
+\DeclareFieldFormat{urldate}{% 16th ed.
+ \iffieldundef{userd}%
+ {\bibstring{urlseen}\space #1}%
+ {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat[video]{urldate}{% 16th ed.
+ \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}}%
+ {\bibstring{urlseen}\space #1}%
+ {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat[music]{urldate}{% 16th ed.
+ \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}%
+ \OR\NOT\iffieldundef{origyear}}%
+ {\bibstring{urlseen}\space #1}%
+ {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat[music]{origdate}{% 16th ed.
+ \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}}%
+ {\bibstring{recorded}\space #1}%
+ {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat[music]{eventdate}{% 16th ed.
+ \iffieldundef{userd}%
+ {\bibstring{recorded}\space #1}%
+ {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat[video]{eventdate}{% 16th ed.
+ \iffieldundef{userd}%
+ {\bibstring{broadcast}\space #1}%
+ {\printfield{userd}\addspace #1}}
+
+\DeclareFieldAlias{userd}{titleaddon}% 16th ed.
+
\DeclareFieldFormat{nameaddon}{\mkbibbrackets{#1\bibsentence}}% ?!
+\DeclareFieldFormat[review]{nameaddon}{#1\bibsentence}% 16th ed.
+
\DeclareFieldFormat[customc]{nameaddon}{% For cross-refs
\ifbibstring{#1}%
{\mkbibemph{\bibstring{#1}}}%
@@ -1063,7 +1228,7 @@
\DeclareFieldAlias{maintitleaddon}{titleaddon}
-\DeclareFieldFormat{issuetitle}{\MakeSentenceCase*{#1\isdot}}
+\DeclareFieldFormat{issuetitle}{\mkbibquote{#1\isdot}}
\DeclareFieldFormat{jourser}{%
\ifinteger{#1}%
@@ -1102,7 +1267,7 @@
%%%% Commands, for users and internal %%%%
-\newcommand*{\cbytypeeditor}{%
+\newcommand*{\cbytypeeditor}{% Needed?
\iffieldundef{editortype}
{\bibstring{cbytypeeditor}}
{\bibstring{cbytype\thefield{editortype}}}}
@@ -1129,27 +1294,27 @@
{\setunit*{\addcomma\addspace}}}
\newcommand{\parttrans}{%
- {\bibstring{cbytranslator}\space}}%
+ {\bibstring{bytranslator}\space}}%
\newcommand{\partedit}{%
\iftoggle{cms@postposit}% Kludge to make it work in French.
- {\bibstring{cbyeditoralt}\addspace}%
- {\bibstring{cbyeditor}\addspace}}%
+ {\bibstring{byeditoralt}\addspace}%
+ {\bibstring{byeditor}\addspace}}%
\newcommand{\partcomp}{%
- {\bibstring{cbycompiler}\space}}%
+ {\bibstring{bycompiler}\space}}%
\newcommand{\parteditandcomp}{%
- {\bibstring{cbyeditorcp}\space}}%
+ {\bibstring{byeditorcp}\space}}%
\newcommand{\parttransandcomp}{%
- {\bibstring{cbytranslatorcp}\space}}%
+ {\bibstring{bytranslatorcp}\space}}%
\newcommand{\partedittransandcomp}{%
- {\bibstring{cbyeditortrcp}\space}}%
+ {\bibstring{byeditortrcp}\space}}%
\newcommand{\parteditandtrans}{%
- {\bibstring{cbyeditortr}\space}}%
+ {\bibstring{byeditortr}\space}}%
\newcommand{\reprint}{\bibstring{reprint}}%
@@ -1245,7 +1410,7 @@
\newbibmacro*{author+holder}{%
\ifnameundef{author}
- {}
+ {\let\bbx@lasthash\undefined}
{\usebibmacro{author/editor}%
\ifthenelse{\ifnameundef{holder}\OR
\ifnamesequal{author}{holder}}
@@ -1350,22 +1515,24 @@
\ifnameundef{author}%
{\ifnameundef{editor}%
{\iflistundef{organization}%
- {}%
+ {\let\bbx@lasthash\undefined}%
{\ifboolexpr{
test {\iflistequals{organization}{\bbx@lasthash}}
and
not test {\iffirstonpage}
}%
{\bibnamedash\addperiod\addspace}%
- {\printlist{organization}%
+ {\iftoggle{cms@authorparens}%
+ {\bibopenparen\printlist{organization}\bibcloseparen}%
+ {\printlist{organization}}%
\savelist{organization}{\bbx@lasthash}}}}%
{\usebibmacro{editor}}}%
{\usebibmacro{author/editor}}}
\newbibmacro*{cbytypestrg}[2]{%
\iffieldundef{#1type}
- {\bibstring{cby#2}}
- {\bibstring{cby\thefield{#1type}}}}
+ {\bibstring{by#2}}
+ {\bibstring{by\thefield{#1type}}}}
\newbibmacro*{cbyeditor}{%
\ifnameundef{editor}
@@ -1399,7 +1566,7 @@
\newbibmacro*{cbytranslator}{%
\ifnameundef{translator}
{}
- {\bibstring{cbytranslator}%
+ {\bibstring{bytranslator}%
\addspace
\printnames[bytranslator]{translator}}}
@@ -1577,7 +1744,10 @@
\newbibmacro*{chapinscore}{%
\iffieldundef{chapter}%
- {}
+ {\ifthenelse{\iffieldequalstr{entrytype}{music}%
+ \AND\NOT\iffieldundef{booktitle}}%
+ {\bibstring{on}\setunit{\addspace}}%
+ {}}%
{\printfield{chapter}%
\addspace\bibstring{of}\setunit{\addspace}}}
@@ -1597,16 +1767,32 @@
{\printfield{pubstate}}}%
{\printfield{howpublished}}}%
+\newbibmacro*{music+origdate}{%
+ \iftoggle{cms@reprint}% 16th ed.
+ {}%
+ {\iftoggle{cms@switchdates}%
+ {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}%
+ {}%
+ {\printtext[origdate]{\usebibmacro{cmsorigdate}}}}%
+ {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}}%
+ {}%
+ {\printtext[origdate]{\usebibmacro{cmsorigdate}}}}}}%
+
+\newbibmacro*{music+eventdate}{%
+ \ifthenelse{\iffieldundef{eventyear}\AND\iffieldundef{eventmonth}}%
+ {}%
+ {\printtext[eventdate]{\printeventdate}}}
+
\newbibmacro*{ser+num}{%
\printfield{series}%
\printfield[sernum]{number}%
\newunit}
\newbibmacro*{italtitle+stitle}{%
- \printtext{%
- \printfield{title}%
+ \printtext[title]{%
+ \printfield[noformat]{title}%
\setunit{\addcolon\addspace}%
- \printfield[title]{subtitle}}%
+ \printfield[noformat]{subtitle}}%
\newunit\newblock%
\printfield{titleaddon}%
\setunit{\addspace}%
@@ -1614,10 +1800,10 @@
\newunit\newblock}
\newbibmacro*{mag+news+title}{%
- \printtext{%
- \printfield{title}%
+ \printtext[title]{%
+ \printfield[noformat]{title}%
\setunit{\addcolon\addspace}%
- \printfield[title]{subtitle}}%
+ \printfield[noformat]{subtitle}}%
\newunit%\setunit{\addcomma\addspace}
\printfield{titleaddon}%
}%\newcunit\newblock
@@ -1660,6 +1846,16 @@
\usebibmacro{date}% For the author-date style. Tricky.
}%
+\newbibmacro*{origpubl+loc+year}{% 16th ed.
+ \printlist{origlocation}%
+ \iflistundef{origpublisher}%
+ {\setunit*{\addcomma\addspace}}%
+ {\setunit*{\addcolon\addspace}}%
+ \printlist{origpublisher}%
+% \setunit*{\addcomma\addspace}%
+% \usebibmacro{cmsorigdate}%
+}
+
\newbibmacro*{howpubl+loc+year}{%
\printlist{location}%
\iffieldundef{howpublished}%
@@ -1723,6 +1919,10 @@
{parens}}
\newbibmacro*{letter+date}{% New for 0.9
+ \iflistundef{origlocation}%
+ {}%
+ {\printlist{origlocation}%
+ \newcunit\newblock}%
\iftoggle{cms@switchdates}%
{\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}%
{}%
@@ -1732,6 +1932,10 @@
{\cms@datelong}}}
\newbibmacro*{unpubl+letter+date}{% For the Misc type.
+ \iflistundef{origlocation}%
+ {}%
+ {\printlist{origlocation}%
+ \newcunit\newblock}%
\iftoggle{cms@switchdates}%
{\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}%
{}%
@@ -1820,10 +2024,10 @@
\newunit}
\newbibmacro*{cperiodical+ser+vol+num}{% For periodical entries,
- \printtext{% article subtype
- \printfield{title}%
+ \printtext[title]{% article subtype
+ \printfield[noformat]{title}%
\setunit{\addcolon\addspace}%
- \printfield{subtitle}}%
+ \printfield[noformat]{subtitle}}%
\setunit*{\addspace}%
\printlist[periodplace]{location}%
\setunit*{\addspace}%
@@ -1853,8 +2057,8 @@
\newbibmacro*{url+date}{% Changed for 0.9
\printfield{url}%
- \ifthenelse{\iffieldundef{urlyear}\AND\iffieldundef{urlmonth}}%
- {}%
+ \iffieldundef{urlyear}
+ {}
{\setunit{\addspace}%
\printtext[urldate]{\printurldate}}}
@@ -1895,6 +2099,11 @@
{\printfield{origyear}}%
{\printfield{year}}}
+\newbibmacro*{cmsorigdate}{% New for 0.9
+ \iftoggle{cms@switchdates}%
+ {\printdate}%
+ {\printorigdate}}
+
\newbibmacro*{periodical+date+issue}{% For periodical type &
\printtext[title]{% magazine subtype
\printfield[noformat]{title}%
@@ -1963,17 +2172,17 @@
\ifnameundef{namea}%
{\ifnameundef{nameb}%
{}
- {\bibstring{cbytranslator}\space%
+ {\bibstring{bytranslator}\space%
\printnames[bytranslator]{nameb}}}%
{\ifnamesequal{namea}{nameb}%
- {\bibstring{cbyeditortr}\space%
+ {\bibstring{byeditortr}\space%
\printnames[byeditor]{namea}}%
- {\bibstring{cbyeditor}\space%
+ {\bibstring{byeditor}\space%
\printnames[byeditor]{namea}%
\ifnameundef{nameb}%
{}
{\newunit
- \bibstring{cbytranslator}\space%
+ \bibstring{bytranslator}\space%
\printnames[bytranslator]{nameb}}}}}
\newbibmacro*{compilestrg}{%