diff options
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.cbx | 601 |
1 files changed, 263 insertions, 338 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 bd39d98c705..a1095a10057 100644 --- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx @@ -1,10 +1,10 @@ -% $Id: chicago-notes.cbx,v 0.9.7.40 2012/12/06 11:58:41 dfussner Exp $ +% $Id: chicago-notes.cbx,v 0.9.7.55 2013/03/12 12:07:30 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. -\ProvidesFile{chicago-notes.cbx}[2012/12/06 v 2.4 biblatex citation style] +\ProvidesFile{chicago-notes.cbx}[2013/03/12 v 2.5 biblatex citation style] %%%% Biblatex initialization + Chicago options + Toggles %%%% @@ -267,8 +267,8 @@ {\global\toggletrue{cms@shortnote}% \global\toggletrue{cms@fullnote}% \usebibmacro{cite:short}% - \usebibmacro{fullpostnote}% - \usebibmacro{cite:save}}}% + \usebibmacro{crossref:volume+postnote}% + \usebibmacro{cite:save}}}% {\global\togglefalse{cms@shortnote}% \global\togglefalse{cms@fullnote}% \usebibmacro{cite:shorthand}% @@ -276,7 +276,7 @@ {\iftoggle{cms@allshort}% {\global\toggletrue{cms@shortnote}% \usebibmacro{cite:short}% - \usebibmacro{fullpostnote}% + \usebibmacro{crossref:volume+postnote}% \usebibmacro{cite:save}}% {\global\toggletrue{cms@fullnote}% \usebibmacro{cite:crossfull}% @@ -394,7 +394,11 @@ {\toggletrue{cms@fullnote}% \togglefalse{cms@shortnote}% \setunit{\addspace}% - \printfield[jourvol]{volume}\setunit{\addcolon}}}}} + \printfield[jourvol]{volume}% + \ifthenelse{\iffieldundef{pagination}\AND% + \iffieldundef{bookpagination}}% + {\setunit{\addcolon}}% + {\setunit{\addcolon\addspace}}}}}} %%%% Citation Commands, internal and external %%%% @@ -434,7 +438,7 @@ \togglefalse{cms@fullnote}% \usebibmacro{cite:short}} {} - {} + {\usebibmacro{crossref:volume+postnote}}% Volume fix \DeclareCiteCommand*{\cite} {\usebibmacro{cite:init}% @@ -636,6 +640,8 @@ \setunit{\addspace}% \usebibmacro{language+transtitle}% \setunit{\addcomma\addspace}%\newblock% + \usebibmacro{cpart+editor+translator}% + \newcunit% \usebibmacro{issuetitle}% \setunit{\addcomma\addspace}% \usebibmacro{cbyeditor+others}% @@ -666,6 +672,8 @@ \setunit{\addcomma\addspace}% \usebibmacro{byauthor}% \setunit{\addcomma\addspace}% + \usebibmacro{cpart+editor+translator}% + \newcunit% \usebibmacro{issuetitle}% \setunit{\addcomma\addspace}% \usebibmacro{cbyeditor+others}% @@ -711,9 +719,9 @@ \usebibmacro{institution+organization}% \newcunit\newblock \printlist{location}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{cite+doi+url}% \newcunit\newblock @@ -739,17 +747,7 @@ \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{cbyeditor+others}% @@ -775,12 +773,7 @@ \newcunit \printfield{maintitleaddon}}} \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newcunit\newblock \usebibmacro{cser+num}% \newcunit\newblock @@ -815,15 +808,7 @@ \iffieldundef{maintitle}% {\iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}% - \newcunit - \printfield{volumes}% - \clearfield{volumes}}}% + {\usebibmacro{edition}}}% {}% \newcunit \usebibmacro{byauthor}% @@ -834,26 +819,11 @@ \newcunit\newblock \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newcunit \usebibmacro{cbyeditor+others}% \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newcunit\newblock \usebibmacro{cser+num}% \newcunit\newblock @@ -863,12 +833,12 @@ \iftoggle{cms@bookpages}% {}% {\clearfield{pages}}% + \newcunit\newblock + \usebibmacro{caddendum}% \usebibmacro{fullpostnote}% \newcunit\newblock \printlist[][-\value{listtotal}]{lista}% \newcunit\newblock - \usebibmacro{caddendum}% - \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% {}% @@ -895,36 +865,21 @@ \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{cbyeditor+others}% \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newcunit\newblock \usebibmacro{cser+num}% \newcunit\newblock \usebibmacro{cnotefield}% \newcunit\newblock \usebibmacro{cpubl+loc+year}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% @@ -949,9 +904,9 @@ \setunit{\addspace}\newblock% \printtext[parens]{% \usebibmacro{howpubl+loc+year}}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{cite+doi+url}% \newcunit\newblock @@ -970,35 +925,20 @@ \newcunit\newblock \iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}}% - {}% - \newcunit - \printfield{volumes} - \clearfield{volumes}}% + {\usebibmacro{edition}}% \newcunit \usebibmacro{cbytranslator+others}% \newcunit\newblock - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newcunit\newblock \usebibmacro{cser+num}% \newcunit\newblock \usebibmacro{cnotefield}% \newcunit\newblock \usebibmacro{cpubl+loc+year}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% @@ -1010,40 +950,40 @@ \usebibmacro{finentry}} \DeclareBibliographyDriver{cite:crossfull}{% + \ifcsdef{cbx@incollvol}% + {\restorefield{volume}{\cbx@incollvol}}% + {}% + \ifcsdef{cbx@incollpages}% + {\restorefield{pages}{\cbx@incollpages}}% + {}% + \ifcsdef{cbx@incollpgn}% + {\restorefield{pagination}{\cbx@incollpgn}}% + {}% + \ifcsdef{cbx@incollbkpgn}% + {\restorefield{bookpagination}{\cbx@incollbkpgn}}% + {}% + \ifcsdef{cbx@incollpart}% + {\restorefield{part}{\cbx@incollpart}}% + {}% \usebibmacro{crefmtitle+mstitle+vol+part+title+stitle}% \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{cbyeditor+others}% \newcunit\newblock - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newcunit\newblock \usebibmacro{cser+num}% \newcunit\newblock \usebibmacro{cnotefield}% \newcunit\newblock \usebibmacro{cpubl+loc+year}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% @@ -1087,9 +1027,9 @@ \usebibmacro{institution+organization}% \newcunit\newblock \printlist{location}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{cite+doi+url}% \newcunit\newblock @@ -1116,36 +1056,21 @@ \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{cbyeditor+others}% \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newcunit\newblock \usebibmacro{cser+num}% \newcunit\newblock \usebibmacro{cnotefield}% \newcunit\newblock \usebibmacro{cpubl+loc+year}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% @@ -1178,36 +1103,21 @@ \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{cbyeditor+others}% \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newcunit\newblock \usebibmacro{cser+num}% \newcunit\newblock \usebibmacro{cnotefield}% \newcunit\newblock \usebibmacro{cpubl+loc+year}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% @@ -1221,6 +1131,7 @@ {\addspace\bibsentence}% new chapter citing system. {\setunit{\addspace\bibsentence}}}% All altered for 0.9c. {\addcomma\addspace}% Perhaps need to alter it back + \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \xrefcite{\thefield{xref}}% Removed \addspace from each. \usebibmacro{xrefpostnote}% @@ -1229,6 +1140,7 @@ {\addspace\bibsentence}% new chapter citing system. {\setunit{\addspace\bibsentence}}}% {\addcomma\addspace}% + \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \xrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% @@ -1254,12 +1166,7 @@ \usebibmacro{cms-in:}% \usebibmacro{cmtitle+mstitle+vol+part+btitle+bstitle}% \newcunit\newblock - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newcunit\newblock \usebibmacro{cser+num}% \newcunit\newblock @@ -1267,9 +1174,9 @@ \setunit{\addspace}\newblock% \printtext[parens]{% \usebibmacro{org+publ+loc+year}}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% @@ -1283,6 +1190,7 @@ {\addspace\bibsentence}% new chapter citing system. {\setunit{\addspace\bibsentence}}}% See incollection {\addcomma\addspace}% + \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \xrefcite{\thefield{xref}}% \usebibmacro{xrefpostnote}% @@ -1291,6 +1199,7 @@ {\addspace\bibsentence}% new chapter citing system. {\setunit{\addspace\bibsentence}}}% {\addcomma\addspace}% + \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \xrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% @@ -1303,15 +1212,7 @@ \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}% {\iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}% - \newcunit - \printfield{volumes}% - \clearfield{volumes}}}% + {\usebibmacro{edition}}}% {}% \newcunit \usebibmacro{cpart+editor+translator}% @@ -1321,33 +1222,20 @@ \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{cbyeditor+others}% \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newcunit\newblock \usebibmacro{cser+num}% \newcunit\newblock \usebibmacro{cnotefield}% \newcunit\newblock \usebibmacro{cpubl+loc+year}% + \newcunit\newblock + \usebibmacro{caddendum}% \usebibmacro{inreffullpostnote}% \newcunit\newblock%setunit{\addspace}% 16th ed \ifnameundef{author}% @@ -1357,8 +1245,6 @@ \addspace% \printnames{author}}}% \newcunit\newblock - \usebibmacro{caddendum}% - \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% {}% @@ -1390,36 +1276,21 @@ \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{cbyeditor+others}% \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newcunit\newblock \usebibmacro{cser+num}% \newcunit\newblock \usebibmacro{cnotefield}% \newcunit\newblock \usebibmacro{cpubletter+loc+year}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% @@ -1432,7 +1303,8 @@ {\ifterm{\iffieldundef{chapter}% New test needed to cope with {\addspace\bibsentence}% new chapter citing system. {\setunit{\addspace\bibsentence}}}% - {\addcomma\addspace}% + {\addcomma\addspace}% + \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \xrefcite{\thefield{xref}}% \usebibmacro{xrefpostnote}% @@ -1441,6 +1313,7 @@ {\addspace\bibsentence}% new chapter citing system. {\setunit{\addspace\bibsentence}}}% {\addcomma\addspace}% + \usebibmacro{xrefprenote}% Volume fix \usebibmacro{chapincoll}% \xrefcite{\thefield{crossref}}% \usebibmacro{xrefpostnote}% @@ -1466,9 +1339,9 @@ \setunit{\addspace}\newblock% \printtext[parens]{% \usebibmacro{org+publ+loc+year}}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% @@ -1516,9 +1389,9 @@ {\newcunit\newblock \usebibmacro{date}}% {}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{cite+doi+url}% \newcunit\newblock @@ -1544,17 +1417,7 @@ \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{cbyeditor+others}% @@ -1580,12 +1443,7 @@ \newcunit \printfield{maintitleaddon}}} \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newcunit\newblock \printfield{version}% \newcunit\newblock @@ -1608,10 +1466,10 @@ \printfield{type}% \usebibmacro{fullpostnote}% \newcunit\newblock - \usebibmacro{pubstate}% 16th ed. - \newcunit\newblock \usebibmacro{caddendum}% \newcunit\newblock + \usebibmacro{pubstate}% 16th ed. + \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{iswc}}% {}% @@ -1638,6 +1496,7 @@ \usebibmacro{cnotefield}% \setunit{\addcomma\addspace} \usebibmacro{date}% + \usebibmacro{fullpostnote}% \setunit{\addcomma\addspace}% \iffieldundef{urlyear}% {}% @@ -1653,7 +1512,6 @@ \usebibmacro{eprint}% \newcunit\newblock \printfield{url}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% \newcunit\newblock @@ -1768,12 +1626,7 @@ \newcunit \usebibmacro{cmtitle+mstitle+vol+part+title+stitle}% \newcunit\newblock - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newcunit\newblock \usebibmacro{cser+num}% \newcunit\newblock @@ -1781,9 +1634,9 @@ \setunit{\addspace}\newblock% \printtext[parens]{% \usebibmacro{org+publ+loc+year}}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% @@ -1801,15 +1654,7 @@ \ifthenelse{\iffieldundef{maintitle}\AND\iffieldundef{booktitle}}% {\iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}% - \newcunit - \printfield{volumes}% - \clearfield{volumes}}}% + {\usebibmacro{edition}}}% {}% \newcunit \usebibmacro{cpart+editor+translator}% @@ -1819,36 +1664,21 @@ \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{cbyeditor+others}% \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newcunit\newblock \usebibmacro{cser+num}% \newcunit\newblock \usebibmacro{cnotefield}% \newcunit\newblock \usebibmacro{cpubl+loc+year}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% @@ -1868,18 +1698,20 @@ \usebibmacro{citaltitle+stitle}% \newcunit \usebibmacro{byauthor}% - \newcunit\newblock - \usebibmacro{cser+num}% - \newcunit\newblock + \newcunit% \printfield{type}% \newcunit + \printfield{series}% + \setunit{\addnbspace}% + \printfield{number}% + \newcunit% \usebibmacro{cnotefield}% \setunit{\addspace}\newblock% - \printtext[parens]{% + \printtext[parens]{% \usebibmacro{inst+loc+year}}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isrn}}% @@ -1908,6 +1740,8 @@ \setunit{\addspace}% \usebibmacro{language+transtitle}% \setunit{\addcomma\addspace}%\newblock% + \usebibmacro{cpart+editor+translator}% + \newcunit% \usebibmacro{issuetitle}% \setunit{\addcomma\addspace}% \usebibmacro{cbyeditor+others}% @@ -1943,15 +1777,7 @@ \iffieldundef{maintitle}% {\iffieldundef{edition}% {}% - {\usebibmacro{edition}% - \newcunit - \printfield{volume}% - \printfield{part}% - \clearfield{volume}% - \clearfield{part}% - \newcunit - \printfield{volumes}% - \clearfield{volumes}}}% + {\usebibmacro{edition}}}% {}% \newcunit \usebibmacro{bybookauthor}% @@ -1960,26 +1786,11 @@ \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{cbyeditor+others}% \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newcunit\newblock \usebibmacro{cser+num}% \newcunit\newblock @@ -1987,9 +1798,9 @@ \newcunit\newblock \usebibmacro{cpubl+loc+year}% \clearfield{pages}% ?? For 16th ed. - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \iftoggle{cms@isbn}% {\printfield{isbn}}% @@ -2020,9 +1831,9 @@ \setunit{\addspace}% \printtext[parens]{% \usebibmacro{type+inst+year}}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{cite+doi+url}% \newcunit\newblock @@ -2049,9 +1860,9 @@ \printlist{location}% \newcunit\newblock \usebibmacro{date}}% - \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{caddendum}% + \usebibmacro{fullpostnote}% \newcunit\newblock \usebibmacro{cite+doi+url}% \newcunit\newblock @@ -2077,17 +1888,7 @@ \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{cbyeditor+others}% @@ -2113,12 +1914,7 @@ \newcunit \printfield{maintitleaddon}}} \newcunit - \iffieldundef{maintitle} - {\printfield{volume}% - \printfield{part}} - {}% - \newcunit - \printfield{volumes}% + \usebibmacro{volume+or+volumes}% \newcunit\newblock \usebibmacro{cser+num}% \newcunit\newblock @@ -2289,7 +2085,7 @@ \DeclareFieldFormat{pages}{% \iffieldundef{bookpagination}% {#1\isdot}% - {\mkpageprefix[bookpagination]{#1\isdot}}} + {\mkpageprefix[bookpagination]{#1}}} \DeclareFieldFormat{edlang}{% \ifbibstring{#1} @@ -2438,6 +2234,14 @@ {\MakeCapital{#1}}% {#1}} +\DeclareFieldAlias[patent]{type}[suppbook]{type} + +\DeclareFieldAlias[manual]{type}[suppbook]{type} + +\DeclareFieldAlias[thesis]{type}[suppbook]{type} + +\DeclareFieldAlias[report]{type}[suppbook]{type} + \DeclareFieldAlias[image]{type}[artwork]{type} \DeclareFieldAlias[suppcollection]{type}[suppbook]{type} @@ -2773,7 +2577,7 @@ %%%% Formatting macros, called both by cbx and bbx %%%% \newbibmacro*{finentry}{%{\finentry} To make annotated bibliography - \togglefalse{cms@switchdates} + \togglefalse{cms@switchdates}% \ifbibliography {\usebibmacro{entrytail}} {}% @@ -2781,7 +2585,7 @@ \newbibmacro*{entrytail}{% From reading.bbx, for annotated bibliography \newunit\newblock - \iftoggle{cms@annotation} + \iftoggle{cms@annotation}% {\usebibmacro{annotation}% \newunit\newblock} {}}% @@ -2817,12 +2621,13 @@ \newcunit\newblock}}} \newbibmacro*{editorpunct}{% - \ifthenelse{\(\iffieldundef{booktitle}\AND\iffieldundef{maintitle}\)% + \ifthenelse{\(\iffieldundef{booktitle}\AND% + \iffieldundef{maintitle}\AND\iffieldundef{issuetitle}\)% \OR\iffieldsequal{booktitle}{title}% Changed these for crossrefed \OR\iffieldsequal{maintitle}{title}}% entries. Create problems? {\iffieldequalstr{entrytype}{video}% Change for Video type? Appears {\newcunit\newblock}% to treat italicized title as booktitle in - {\newunit\newblock}}% available examples. + {\newunit\newblock}}% available examples. Added issuetitle 0.9.9c. {\newcunit\newblock}} \newbibmacro*{edition}{% @@ -3218,14 +3023,9 @@ \printfield{titleaddon}% }%\newcunit\newblock} -\renewcommand*{\subtitlepunct}{% - \ifpunctmark{?}{\setunit{\addspace}}{\setunit{\addcolon\addspace}}} - \newbibmacro*{cmag+news+title}{% \printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work) \printfield[noformat]{title}% -% \ifpunctmark{?}{\setunit{\addcolon\addspace}{\addspace}}% -% \subtitlepunct \setunit{\addcolon\addspace}% \printfield[noformat]{subtitle}}% \setunit{\addcomma\addspace}% @@ -3417,7 +3217,10 @@ not togl {cms@switchdates} }% {\iffieldundef{number}% - {\setunit{\addcolon}}% + {\ifthenelse{\iffieldundef{pagination}\AND% + \iffieldundef{bookpagination}}% + {\setunit{\addcolon}}% + {\setunit{\addcolon\addspace}}}% {\addcomma\addspace}}% {\setunit{\addspace}% \printtext[parens]{% parens is the default here @@ -3437,7 +3240,10 @@ not togl {cms@switchdates} }% {\iffieldundef{number}% - {\setunit{\addcolon}}% + {\ifthenelse{\iffieldundef{pagination}\AND% + \iffieldundef{bookpagination}}% + {\setunit{\addcolon}}% + {\setunit{\addcolon\addspace}}}% {\addcomma\addspace}}% {\setunit{\addspace}% \printtext[parens]{% parens is the default here @@ -3689,7 +3495,7 @@ {\usebibmacro{btitle+bstitle}}% \newcunit% need this? \iffieldundef{maintitle} - {} + {}% {\iffieldundef{volume} {\printtext[maintitle]{% \printfield[noformat]{maintitle}% @@ -3734,11 +3540,15 @@ \newcunit \printfield{maintitleaddon}}}} -\newbibmacro{cite:postnote}{% +\newbibmacro*{cite:postnote}{% \iftoggle{cms@loccit}% {}% {\usebibmacro{postnote}}} +\newbibmacro*{semel:postnote}{% Fix to print postnote only once + \printfield{postnote}% + \global\let\abx@field@postnote\undefined} + \renewbibmacro*{postnote}{% \iftoggle{cms@fullnote}% {\global\togglefalse{cms@shortnote}% @@ -3755,12 +3565,12 @@ \global\togglefalse{cms@fullnote}}} {\iffieldundef{shorthand} {\postnotedelim% - \printfield{postnote}% + \usebibmacro{semel:postnote}% \global\togglefalse{cms@printshhand}% \global\togglefalse{cms@shortnote}% \global\togglefalse{cms@fullnote}} {\postnotedelim% - \printfield{postnote}% + \usebibmacro{semel:postnote}% \usebibmacro{cms:shorthandintro}% \global\togglefalse{cms@printshhand}% \global\togglefalse{cms@shortnote}% @@ -3769,7 +3579,7 @@ {\global\togglefalse{cms@shortnote}% \global\togglefalse{cms@fullnote}} {\postnotedelim% - \printfield{postnote}% + \usebibmacro{semel:postnote}% \global\togglefalse{cms@shortnote}% \global\togglefalse{cms@fullnote}}}}}% @@ -3782,8 +3592,120 @@ \printfield{pages}}}% {\postnotedelim% \printfield{chapter}}}% - {\postnotedelim% - \printfield{postnote}}} + {\postnotedelim% Don't need \ifbibliography test w/ following + \usebibmacro{semel:postnote}}} + +\newbibmacro*{volume+or+volumes}{% Volume fix + \iffieldundef{maintitle}% + {\iffieldundef{volume}% + {\printfield{volumes}}% + {\printfield{volume}% + \printfield{part}}}% + {\printfield{volumes}}} + +\newbibmacro*{crossref:volume+postnote}{% + \ifcsdef{cbx@incollpgn}% + {\restorefield{pagination}{\cbx@incollpgn}}% + {}% + \ifcsdef{cbx@incollbkpgn}% + {\restorefield{bookpagination}{\cbx@incollbkpgn}}% + {}% + \iffieldundef{volume}% Volume fix (unfinished) + {\ifcsdef{cbx@incollvol}% + {\restorefield{volume}{\cbx@incollvol}% + \ifcsdef{cbx@incollpart}{\restorefield{part}{\cbx@incollpart}}{}% + \iffieldundef{postnote}% + {\ifcsdef{cbx@incollpages}% + {\restorefield{pages}{\cbx@incollpages}% + \iffieldundef{part}% + {\ifthenelse{\iffieldnums{pages}\AND% + \iffieldundef{bookpagination}}% + {\newcunit\printfield[default]{volume}% + \addcolon% + \printfield{pages}}% + {\newcunit\printfield{volume}% + \addcomma\addspace% + \printfield{pages}}}% + {\newcunit\printfield{volume}% + \printfield{part}% + \addcomma\addspace% + \printfield{pages}}}% + {\iffieldundef{pages}% + {\newcunit\printfield{volume}\printfield{part}}% + {\iffieldundef{part}% + {\ifthenelse{\iffieldnums{pages}\AND% + \iffieldundef{bookpagination}}% + {\newcunit\printfield[default]{volume}% + \addcolon% + \printfield{pages}}% + {\newcunit\printfield{volume}% + \addcomma\addspace% + \printfield{pages}}}% + {\newcunit\printfield{volume}% + \printfield{part}% + \addcomma\addspace% + \printfield{pages}}}}}% + {\iffieldundef{part}% + {\ifthenelse{\iffieldnums{postnote}\AND% + \iffieldundef{pagination}}% + {\newcunit\printfield[default]{volume}% + \addcolon% + \usebibmacro{semel:postnote}}% + {\newcunit\printfield{volume}% + \addcomma\addspace% + \usebibmacro{semel:postnote}}}% + {\newcunit\printfield{volume}% + \printfield{part}% + \addcomma\addspace% + \usebibmacro{semel:postnote}}}}% + {\ifcsdef{cbx@incollpages}% + {\restorefield{pages}{\cbx@incollpages}% + \usebibmacro{fullpostnote}}% + {\usebibmacro{fullpostnote}}}}% + {\iffieldundef{postnote}% + {\ifcsdef{cbx@incollpages}% + {\restorefield{pages}{\cbx@incollpages}% + \iffieldundef{part}% + {\ifthenelse{\iffieldnums{pages}\AND% + \iffieldundef{bookpagination}}% + {\newcunit\printfield[default]{volume}% + \addcolon% + \printfield{pages}}% + {\newcunit\printfield{volume}% + \addcomma\addspace% + \printfield{pages}}}% + {\newcunit\printfield{volume}% + \printfield{part}% + \addcomma\addspace% + \printfield{pages}}}% + {\iffieldundef{pages}% + {\newcunit\printfield{volume}\printfield{part}}% + {\iffieldundef{part}% + {\ifthenelse{\iffieldnums{pages}\AND% + \iffieldundef{bookpagination}}% + {\newcunit\printfield[default]{volume}% + \addcolon% + \printfield{pages}}% + {\newcunit\printfield{volume}% + \addcomma\addspace% + \printfield{pages}}}% + {\newcunit\printfield{volume}% + \printfield{part}% + \addcomma\addspace% + \printfield{pages}}}}}% + {\iffieldundef{part}% + {\ifthenelse{\iffieldnums{postnote}\AND% + \iffieldundef{pagination}}% + {\newcunit\printfield[default]{volume}% + \addcolon% + \usebibmacro{semel:postnote}}% + {\newcunit\printfield{volume}% + \addcomma\addspace% + \usebibmacro{semel:postnote}}}% + {\newcunit\printfield{volume}% + \printfield{part}% + \addcomma\addspace% + \usebibmacro{semel:postnote}}}}}% \newbibmacro*{inreffullpostnote}{% \iffieldundef{postnote}% @@ -3796,19 +3718,22 @@ {\postnotedelim% \printfield{chapter}}}% {\postnotedelim% - \printfield{postnote}}} - -\newbibmacro*{xrefpostnote}{% Only for crossrefed (or xrefed) InCollection, - \iffieldundef{postnote}% InProceedings, or CustomA entries - {\iffieldundef{chapter}% - {\iffieldundef{pages}% - {}% - {\addcomma\addspace% - \printfield{pages}}}% - {\addcomma\addspace% - \printfield{chapter}}}% - {}}% The postnote field already shows up because of the fullpostnote - % call. + \usebibmacro{semel:postnote}}} + +\newbibmacro*{xrefprenote}{% + \iffieldundef{volume}{}{\savefield{volume}{\cbx@incollvol}}% + \iffieldundef{pages}{}{\savefield{pages}{\cbx@incollpages}}% + \iffieldundef{part}{}{\savefield{part}{\cbx@incollpart}}% + \iffieldundef{pagination}{}{\savefield{pagination}{\cbx@incollpgn}}% + \iffieldundef{bookpagination}{}{\savefield{bookpagination}% + {\cbx@incollbkpgn}}} + +\newbibmacro*{xrefpostnote}{% + \global\let\cbx@incollvol\undefined% Volume fix + \global\let\cbx@incollpages\undefined% + \global\let\cbx@incollpart\undefined% + \global\let\cbx@incollpgn\undefined% + \global\let\cbx@incollbkpgn\undefined} \newbibmacro*{hlprenote}{% Removes spurious comma after prenote in \iffieldundef{prenote}% \headlessfullnote citations. |