summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/biblatex-contrib/windycity/windycity.bbx
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/biblatex-contrib/windycity/windycity.bbx')
-rw-r--r--macros/latex/contrib/biblatex-contrib/windycity/windycity.bbx393
1 files changed, 181 insertions, 212 deletions
diff --git a/macros/latex/contrib/biblatex-contrib/windycity/windycity.bbx b/macros/latex/contrib/biblatex-contrib/windycity/windycity.bbx
index 76b543d9a6..f7679dc8ad 100644
--- a/macros/latex/contrib/biblatex-contrib/windycity/windycity.bbx
+++ b/macros/latex/contrib/biblatex-contrib/windycity/windycity.bbx
@@ -1,4 +1,4 @@
-% Last modified: Sun 02 May 2021 01:14:55 PM CDT
+% Last modified: Wed 07 Jul 2021 05:45:49 PM CDT
% Permission is granted to copy, distribute and/or modify this
% software under the terms of the LaTeX Project Public License (LPPL),
@@ -11,7 +11,7 @@
% implied warranties of merchantability and fitness for a particular
% purpose.
-\ProvidesFile{windycity.bbx}[2021/05/02 Windy City bibliography style
+\ProvidesFile{windycity.bbx}[2021/07/07 Windy City bibliography style
for biblatex]
\@ifpackagelater{biblatex}{2019/08/17}
{}
@@ -27,7 +27,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\providetoggle{annotate}
-\DeclareBiblatexOption{global}[boolean]{annotate}[true]{%
+\DeclareBiblatexOption{entry,global}[boolean]{annotate}[true]{%
\settoggle{annotate}{#1}}%
\DeclareBiblatexOption{global}[boolean]{collsonly}[true]{%
@@ -37,6 +37,10 @@
\AtBeginBibliography{\blx@key@bibcheck{collsonly}}}
{}}
+\providetoggle{dashed}
+\DeclareBiblatexOption{global}[boolean]{dashed}[true]{%
+ \settoggle{dashed}{#1}}%
+
\providetoggle{doi}
\DeclareBiblatexOption{entry,global}[boolean]{doi}[true]{%
\settoggle{doi}{#1}}
@@ -49,9 +53,14 @@
\DeclareBiblatexOption{global}[boolean]{ibid}[true]{%
\ifstrequal{#1}{true}
{\toggletrue{ibid}%
+ \toggletrue{ibidpage}%
\toggletrue{short}}%
{\togglefalse{ibid}}}
+\providetoggle{ibidpage}
+\DeclareBiblatexOption{global}[boolean]{ibidpage}[true]{%
+ \settoggle{ibidpage}{#1}}%
+
\providetoggle{isbn}
\DeclareBiblatexOption{entry,global}[boolean]{isbn}[true]{%
\settoggle{isbn}{#1}}%
@@ -179,6 +188,7 @@
autopunct=true,
block=none,
citetracker=context,
+ dashed=true,
date=long,
dateabbrev=false,
dateusetime=true,
@@ -438,25 +448,27 @@
\DeclareDataInheritance{*}{incollection,inbook,letter,review}{%
\inherit[override=true]{titlekey}{booktitlekey}
\inherit[override=true]{booktitlekey}{bookbooktitlekey}
- \inherit{author}{bookauthor}
- \inherit{authortype}{bookauthortype}
- \inherit{shortauthor}{shortbookauthor}
\inherit[override=true]{editor}{editora}
\inherit[override=true]{editora}{editorb}
\inherit[override=true]{editorb}{editorc}
\inherit[override=true]{editortype}{editoratype}
\inherit[override=true]{editoratype}{editorbtype}
\inherit[override=true]{editorbtype}{editorctype}
+ \inherit[override=true]{translatortype}{translatoratype}
+ \inherit[override=true]{translatoratype}{translatorbtype}
+ \inherit{author}{bookauthor}
+ \inherit{authortype}{bookauthortype}
+ \inherit{shortauthor}{shortbookauthor}
\inherit{editoraddon}{editoraaddon}
\inherit{translator}{translatora}
\inherit{translatora}{translatorb}
- \inherit[override=true]{translatortype}{translatoratype}
- \inherit[override=true]{translatoratype}{translatorbtype}
\inherit{title}{booktitle}
+ \inherit{booktitle}{bookbooktitle}
\inherit{subtitle}{booksubtitle}
+ \inherit{booksubtitle}{bookbooksubtitle}
\inherit{titleaddon}{booktitleaddon}
+ \inherit{booktitleaddon}{bookbooktitleaddon}
\inherit{shorttitle}{shortbooktitle}
- \inherit{booktitle}{bookbooktitle}
\inherit{volume}{bookvolume}
\inherit{bookvolume}{bookbookvolume}
\inherit{options}{options}}
@@ -494,7 +506,6 @@
\let\pluga\empty
\let\plugb\empty
\let\xtitle\empty
-\let\xvolume\empty
\let\xeditor\empty
\let\yeditor\empty
@@ -596,26 +607,37 @@
\ifuseprefix
{\usebibmacro{name:delim}{#3#1}%
\usebibmacro{name:hook}{#3#1}%
- \ifdefvoid{#3}{}{%
- \ifcapital
- {\mkbibnameprefix{\MakeCapital{#3}}\isdot}
- {\mkbibnameprefix{#3}\isdot}%
- \ifprefchar{}{\bibnamedelimc}}%
- \mkbibnamefamily{#1}\isdot
- \ifdefvoid{#4}{}{\bibnamedelimd\mkbibnamesuffix{#4}\isdot}%
- \ifdefvoid{#2}{}{\revsdnamepunct\bibnamedelimd\mkbibnamegiven{#2}\isdot}}
+ \mkbibcompletenamefamilygiven{%
+ \ifdefvoid{#3}
+ {}
+ {\ifcapital
+ {\mkbibnameprefix{\MakeCapital{#3}}\isdot}%
+ {\mkbibnameprefix{#3}\isdot}%
+ \ifprefchar{}{\bibnamedelimc}}%
+ \mkbibnamefamily{#1}\isdot
+ \ifdefvoid{#4}
+ {}
+ {\bibnamedelimd\mkbibnamesuffix{#4}\isdot}%
+ \ifdefvoid{#2}
+ {}
+ {\revsdnamepunct\bibnamedelimd\mkbibnamegiven{#2}\isdot}}}
{\usebibmacro{name:delim}{#1}%
\usebibmacro{name:hook}{#1}%
- \mkbibnamefamily{#1}\isdot
- \ifboolexpe{%
- test {\ifdefvoid{#2}}
- and
- test {\ifdefvoid{#3}}}
- {}
- {\revsdnamepunct}%
- \ifdefvoid{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}\isdot}%
- \ifdefvoid{#3}{}{\bibnamedelimd\mkbibnameprefix{#3}\isdot}%
- \ifdefvoid{#4}{}{\revsdnamepunct\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}}
+ \mkbibcompletenamefamilygiven{%
+ \mkbibnamefamily{#1}\isdot
+ \ifboolexpe{ test {\ifdefvoid{#2}}
+ and test {\ifdefvoid{#3}}}
+ {}
+ {\revsdnamepunct}%
+ \ifdefvoid{#2}
+ {}
+ {\bibnamedelimd\mkbibnamegiven{#2}\isdot}%
+ \ifdefvoid{#3}
+ {}
+ {\bibnamedelimd\mkbibnameprefix{#3}\isdot}%
+ \ifdefvoid{#4}
+ {}
+ {\revsdnamepunct\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}}}
\renewcommand*{\mkbibindexname}[4]{%
\ifuseprefix
@@ -623,16 +645,15 @@
\@firstofone #1% remove spurious braces
\ifdefvoid{#4}{}{ #4}%
\ifdefvoid{#2}{}{, #2}%
- \actualoperator
- \ifdefvoid{#3}{}{\MakeCapital{#3} }%
- #1%
- \ifdefvoid{#4}{}{ #4}%
- \ifdefvoid{#2}{}{, #2}}
+ \ifdefvoid{#3}{}{%
+ \actualoperator
+ \MakeCapital{#3} %
+ #1%
+ \ifdefvoid{#4}{}{ #4}%
+ \ifdefvoid{#2}{}{, #2}}}
{\@firstofone #1% remove spurious braces
- \ifboolexpe{%
- test {\ifdefvoid{#2}}
- and
- test {\ifdefvoid{#3}}}
+ \ifboolexpe{test {\ifdefvoid{#2}}
+ and test {\ifdefvoid{#3}}}
{}
{,}%
\ifdefvoid{#2}{}{ #2}%
@@ -814,36 +835,29 @@
{}
{\ifboolexpr{ togl {collection:ib}
and togl {swapvol}}
- {\usebibmacro{bookauthor+namelist}}%
+ {\usebibmacro{author+namelist}{bookauthor}}%
{\ifnameundef{author}
- {\usebibmacro{bookauthor+namelist}}%
- {\usebibmacro{author+namelist}}}}}
+ {\usebibmacro{author+namelist}{bookauthor}}%
+ {\usebibmacro{author+namelist}{author}}}}}
-\newbibmacro*{author+namelist}{%
- \ifboolexpr{ test {\ifnameundef{shortauthor}}
+\newbibmacro*{author+namelist}[1]{%
+ \ifboolexpr{ test {\ifnameundef{short#1}}
or togl {cbx:first}
or togl {bibliography}}
- {\renewcommand*{\cbx@namelist}{author}}%
- {\renewcommand*{\cbx@namelist}{shortauthor}}%
- \usebibmacro{author+bookauthor+type}}%
+ {\renewcommand*{\cbx@namelist}{#1}}%
+ {\renewcommand*{\cbx@namelist}{short#1}}%
+ \usebibmacro{author+type}{#1}}%
-\newbibmacro*{bookauthor+namelist}{%
- \ifboolexpr{ test {\ifnameundef{shortbookauthor}}
- or togl {bibliography}}
- {\renewcommand*{\cbx@namelist}{bookauthor}}%
- {\renewcommand*{\cbx@namelist}{shortbookauthor}}%
- \usebibmacro{author+bookauthor+type}}%
-
-\newbibmacro*{author+bookauthor+type}{%
- \iffieldundef{\cbx@namelist type}
+\newbibmacro*{author+type}[1]{%
+ \iffieldundef{#1type}
{}
- {\iffieldequalstr{\cbx@namelist type}{anon}
+ {\iffieldequalstr{#1type}{anon}
{\renewcommand*{\anona}{\bibopenbracket}%
\renewcommand*{\anonb}{\bibclosebracket}}%
- {\iffieldequalstr{\cbx@namelist type}{anon?}
+ {\iffieldequalstr{#1type}{anon?}
{\renewcommand*{\anona}{\bibopenbracket}%
\renewcommand*{\anonb}{\addquestion\bibclosebracket}}%
- {\ifboolexpr{ test {\iffieldequalstr{\cbx@namelist type}{pseudo}}
+ {\ifboolexpr{ test {\iffieldequalstr{#1type}{pseudo}}
and not togl {cbx:short}}
{\renewcommand*{\anonb}{\space\mkbibbrackets{\bibstring{pseudo}}}}
{}}}}}
@@ -1283,7 +1297,8 @@
\newbibmacro*{printnames+etc}{%
\ifboolexpr{ togl {authposition}
- and togl {bibliography}}
+ and togl {bibliography}
+ and togl {dashed}}
{\usebibmacro{bibnamedash+printnames}}%
{\usebibmacro{printnames}}%
\usebibmacro{handle}%
@@ -1308,8 +1323,8 @@
\newbibmacro*{printnames}{%
\ifnameundef{\cbx@namelist}
{}
- {\anona\pluga\printnames[\cbx@deflabel]{%
- \cbx@namelist}\plugb\anonb}}%
+ {\pluga\anona\printnames[\cbx@deflabel]{%
+ \cbx@namelist}\anonb\plugb}}%
% A screen name precedes 'nameaddon' and can be omitted from short
% citations. See CMOS, 17th ed., 14.209.
@@ -1359,82 +1374,63 @@
\renewcommand*{\subtitlepunct}{\ifterm{\space}{:\space}}%
-\newbibmacro*{longtitle+titleaddon}{%
- \iffieldundef{\xtitle title}
- {}
- {\iftoggle{shortlinks}
- {\togglefalse{shortlinks}%
- \printtext[bibhyperref]{\usebibmacro{longtitle}}}
- {\usebibmacro{longtitle}}%
- \usebibmacro{titleaddon}%
- \usebibmacro{test:titledupes}%
- \clearfield{\xtitle title}}}% test
-
-\newbibmacro*{longtitle}{%
- \printtext[\xtitle title]{%
- \printfield[noformat]{\xtitle title}%
- \iffieldundef{\xtitle subtitle}
+\newbibmacro*{title+labeldate}{%
+ \usebibmacro{title+titleaddon}{}%
+ \iftoggle{bibliography}
+ {\usebibmacro{b:labeldate+extradate}}%
+ {}}
+
+\newbibmacro*{title+titleaddon}[1]{%
+ \iffieldundef{#1title}
+ {}
+ {\renewcommand*{\xtitle}{#1}%
+ \iftoggle{shortlinks}
+ {\printtext[bibhyperref]{%
+ \usebibmacro{title+subtitle}{#1}}}
+ {\usebibmacro{title+subtitle}{#1}}%
+ \usebibmacro{titleaddon}{#1}%
+ \clearfield{#1title}}}
+
+\newbibmacro*{title+subtitle}[1]{%
+ \printtext[#1title]{%
+ \printfield[noformat]{#1title}%
+ \iffieldundef{#1subtitle}
{}
{\subtitlepunct
- \printfield[noformat]{\xtitle subtitle}}%
+ \printfield[noformat]{#1subtitle}}%
\isdot}}%
-\newbibmacro*{test:titledupes}{%
- \iffieldsequal{title}{booktitle}
- {\ifboolexpr{ test {\iffieldundef{subtitle}}
- or test {\iffieldsequal{subtitle}{booksubtitle}}}
- {\clearfield{booktitle}}%
- {}}% test
- {}}% test
-
-\newbibmacro*{titleaddon}{%
- \iffieldundef{\xtitle titleaddon}
+\newbibmacro*{titleaddon}[1]{%
+ \iffieldundef{#1titleaddon}
{}
{\addspace% '\space' has issues with quotation marks
- \printfield{\xtitle titleaddon}}}
+ \printfield{#1titleaddon}}}
-\newbibmacro*{title+labelyear}{%
- \iftoggle{bibliography}
- {\usebibmacro{longtitle+titleaddon}%
- \usebibmacro{b:labeldate+extradate}}%
- {\ifboolexpr{ test \ifciteseen
- or togl {shortfirst}}
- {\iftoggle{shortlinks}
- {\printtext[bibhyperref]{\usebibmacro{shorttitle}}}
- {\usebibmacro{shorttitle}}}
- {\usebibmacro{longtitle+titleaddon}}}}
-
-\newbibmacro*{shorttitle}{%
- \ifboolexpr{ togl {collection:bk}
- and togl {swapvol}}
- {\iffieldundef{shortmaintitle}
- {\printfield[title]{maintitle}\isdot}%
- {\printfield[title]{shortmaintitle}\isdot}}%
- {\ifboolexpr{ togl {collection:ib}
- and togl {swapvol}}
- {\iffieldundef{shortbooktitle}
- {\printfield[title]{booktitle}\isdot}%
- {\printfield[title]{shortbooktitle}\isdot}}%
- {\printfield[\thefield{entrytype}]{labeltitle}\isdot}}}
+\newbibmacro*{shorttitle+shortlinks}{%
+ \iftoggle{shortlinks}
+ {\printtext[bibhyperref]{\usebibmacro{shorttitle+crossref}{}}}
+ {\usebibmacro{shorttitle+crossref}{}}}
-\newbibmacro*{shorttitle+crossref}{%
- \ifboolexpr{ togl {collection:icbk}
+\newbibmacro*{shorttitle+crossref}[1]{%
+ \ifboolexpr{ togl {collection:#1bk}
and togl {swapvol}}
- {\iffieldundef{shortmaintitle}
- {\printfield[title]{maintitle}\isdot}%
- {\printfield[title]{shortmaintitle}\isdot}}%
- {\ifboolexpr{ togl {collection:icib}
+ {\usebibmacro{shorttitle}{main}}%
+ {\ifboolexpr{ togl {collection:#1ib}
and togl {swapvol}}
- {\iffieldundef{shortbooktitle}
- {\printfield[title]{booktitle}\isdot}%
- {\printfield[title]{shortbooktitle}\isdot}}%
- {\printfield[\thefield{entrytype}]{labeltitle}\isdot}}}
+ {\usebibmacro{shorttitle}{book}}%
+ {\usebibmacro{shorttitle}{label}}}}
+
+\newbibmacro*{shorttitle}[1]{%
+ \ifstrequal{#1}{label}
+ {\printfield[\thefield{entrytype}]{labeltitle}\isdot}%
+ {\iffieldundef{short#1title}
+ {\printfield[#1title]{#1title}\isdot}%
+ {\printfield[#1title]{short#1title}\isdot}}}
\renewbibmacro*{booktitle}{%
\iffieldundef{booktitle}
{}
- {\renewcommand*{\xtitle}{book}%
- \usebibmacro{longtitle+titleaddon}%
+ {\usebibmacro{title+titleaddon}{book}%
\usebibmacro{bybookauthor+pages}}}
\newbibmacro*{bookbooktitle}[1]{%
@@ -1443,14 +1439,7 @@
{\ifstrequal{#1}{in}
{\newunit\bibstring{in}\space}%
{}% needs '%'
- \renewcommand*{\xtitle}{bookbook}%
- \usebibmacro{longtitle+titleaddon}}}
-
-\renewbibmacro*{maintitle}{%
- \iffieldundef{maintitle}
- {}
- {\renewcommand*{\xtitle}{main}%
- \usebibmacro{longtitle+titleaddon}}}
+ \usebibmacro{title+titleaddon}{bookbook}}}
\newbibmacro*{issuetitle}{%
\iffieldundef{issuetitle}
@@ -1458,8 +1447,7 @@
{\iffieldequalstr{issuetitle}{special issue}
{}
{\bibstring{in}\space
- \renewcommand*{\xtitle}{issue}%
- \usebibmacro{longtitle+titleaddon}%
+ \usebibmacro{title+titleaddon}{issue}%
\usebibmacro{editors:c}{issuetitle}}%
\newunit\bibstring{special}%
\setunit{\addcomma\space}}}
@@ -1470,8 +1458,7 @@
{\newunit
\bibstring{origpub}%
\space
- \renewcommand*{\xtitle}{orig}%
- \usebibmacro{longtitle+titleaddon}%
+ \usebibmacro{title+titleaddon}{orig}%
\setunit{\addspace}% not '\setunit{\space}'
\printtext[parens]{%
\usebibmacro{origlocation}%
@@ -1844,7 +1831,7 @@
\DeclareBibliographyDriver{misc}{%
\usebibmacro{bibindex}%
\usebibmacro{author+bookauthor+etc}%
- \usebibmacro{title+labelyear}%
+ \usebibmacro{title+labeldate}%
\newunit
\printfield{userb}%
\usebibmacro{doi+finentry+etc}}%
@@ -1902,7 +1889,7 @@
\newbibmacro*{author+title+etc}{%
\usebibmacro{author+bookauthor+etc}%
- \usebibmacro{title+labelyear}%
+ \usebibmacro{title+labeldate}%
\usebibmacro{note}%
\usebibmacro{editors:b}}%
@@ -1910,8 +1897,7 @@
\newunit
\usebibmacro{part}%
\usebibmacro{issuetitle}%
- \renewcommand*{\xtitle}{journal}%
- \usebibmacro{longtitle+titleaddon}%
+ \usebibmacro{title+titleaddon}{journal}%
\usebibmacro{journallocation}%
\usebibmacro{journalseries}%
\usebibmacro{volume}%
@@ -1960,20 +1946,19 @@
\ifboolexpr{ togl {collection:bk}
and togl {swapvol}}
{\usebibmacro{maintitle+note+etc}%
- \usebibmacro{volume+number+etc}%
- \let\xtitle\empty
- \usebibmacro{longtitle+titleaddon}%
+ \usebibmacro{volume+number+etc}{}%
+ \usebibmacro{title+titleaddon}{}%
\toggletrue{edshift}%
\usebibmacro{byauthor}%
\usebibmacro{editors:b}%
- \usebibmacro{volumes+bookseries+etc}}%
- {\usebibmacro{title+labelyear}%
+ \usebibmacro{volumes+bookseries+etc}{}}%
+ {\usebibmacro{title+labeldate}{}%
\usebibmacro{byauthor}%
\iffieldundef{maintitle}
{\usebibmacro{note+edition+etc}%
- \usebibmacro{volumes+bookseries+etc}}%
+ \usebibmacro{volumes+bookseries+etc}{}}%
{\usebibmacro{editors:b}%
- \usebibmacro{volumes+bookseries+etc}%
+ \usebibmacro{volumes+bookseries+etc}{}%
\usebibmacro{maintitle+note+etc}}}
\usebibmacro{date+loc+etc}%
\usebibmacro{origtitle}}%
@@ -1994,7 +1979,7 @@
and not togl {collection:icib}}
{\usebibmacro{booktitle}%
\usebibmacro{editors:b}}%
- {\usebibmacro{title+labelyear}%
+ {\usebibmacro{title+labeldate}%
\usebibmacro{byauthor}%
\usebibmacro{editors:b}%
\usebibmacro{chapter+in}}}}
@@ -2007,7 +1992,7 @@
{\usebibmacro{incollections}}%
{\xifinlist{\thefield{crossref}}{\crossreflist}
{\ifnumgreater{\value{\thefield{crossref}}}{0}
- {\usebibmacro{crossref}%
+ {\usebibmacro{crossref+entrydata}%
\usebibmacro{pages}}%
{\usebibmacro{incollections}}}
{\listxadd{\crossreflist}{\thefield{crossref}}%
@@ -2021,33 +2006,35 @@
and test {\iffieldundef{journaltitle}}
and test {\iflistundef{organization}}}
{}
- {\renewcommand*{\xtitle}{blog}%
- \usebibmacro{longtitle+titleaddon}%
+ {\usebibmacro{title+titleaddon}{blog}%
\newunit
- \renewcommand*{\xtitle}{journal}%
- \usebibmacro{longtitle+titleaddon}%
+ \usebibmacro{title+titleaddon}{journal}%
\newunit
\printlist{organization}%
\setunit{\addcomma\space}}}
\newbibmacro*{reviews}{%
- \ifboolexpr{ test {\ifnameundef{author}}
- and not test {\ifnameundef{bookauthor}}}
- {\savename{bookauthor}{\reviewee}%
- \clearname{bookauthor}}%
- {\let\reviewee\empty}%
- \usebibmacro{author+bookauthor+etc}%
- \iffieldundef{title}
- {}
- {\usebibmacro{title+labelyear}%
- \newunit}%
+ \iftoggle{noauth}
+ {\bibsentence}%
+ {\usebibmacro{author+bookauthor+etc}}%
+ \usebibmacro{title+labeldate}%
\usebibmacro{note}%
- \usebibmacro{review+title}%
+ \newunit
+ \iftoggle{newauth}
+ {\bibstring{reviewnoauth}}%
+ {\bibstring{review}}%
+ \setunit{\space}%
+ \iffieldundef{crossref}
+ {\usebibmacro{title+titleaddon}{book}}%
+ {\entrydata{\thefield{crossref}}{%
+ {\usebibmacro{title+titleaddon}{}}}}
\setunit{\addcomma\space}%
- \iftoggle{shortfirst}
- {}
- {\toggletrue{edshift}%
- \usebibmacro{editors:b}}}
+ \renewcommand*{\pluga}{\bibstring{by}\space}%
+ \renewcommand*{\cbx@namelist}{bookauthor}%
+ \usebibmacro{printnames+etc}%
+ \setunit{\addcomma\space}%
+ \toggletrue{edshift}%
+ \usebibmacro{editors:b}}%
\newbibmacro*{inst+loc+date}{%
\usebibmacro{thesis+type}%
@@ -2212,24 +2199,26 @@
{}}}
\newbibmacro*{maintitle+note+etc}{%
- \usebibmacro{maintitle}%
- \usebibmacro{note}%
- \usebibmacro{edition}{}%
- \usebibmacro{editors:c}{maintitle}}%
+ \iffieldundef{maintitle}
+ {}
+ {\usebibmacro{title+titleaddon}{main}%
+ \usebibmacro{note}%
+ \usebibmacro{edition}{}%
+ \usebibmacro{editors:c}{maintitle}}}
-\newbibmacro*{volume+number+etc}{%
- \iffieldundef{\xvolume volume}
+\newbibmacro*{volume+number+etc}[1]{%
+ \iffieldundef{#1volume}
{}
{\usebibmacro{swapvol+pages}%
\iffieldundef{series}
{\newunit}%
{\setunit{\addcomma\space}}%
- \iffieldnum{\xvolume volume}
- {\printfield[volume]{\xvolume volume}%
+ \iffieldnum{#1volume}
+ {\printfield[volume]{#1volume}%
\usebibmacro{volume:number}}%
{\bibstring{volumes}\space
- \printfield[noformat]{\xvolume volume}}%
- \clearfield{\xvolume volume}%
+ \printfield[noformat]{#1volume}}%
+ \clearfield{#1volume}%
\usebibmacro{part}%
\iftoggle{collection}
{\iftoggle{swapvol}
@@ -2248,13 +2237,14 @@
\setunit{\addcomma\space}\bibstring{by}\space}}%
{\renewcommand*{\pluga}{\newunit\bibstring{by}\space}}%
\renewcommand*{\cbx@namelist}{author}%
+ \usebibmacro{author+type}{author}%
\usebibmacro{printnames+etc}}}
-\newbibmacro*{volumes+bookseries+etc}{%
+\newbibmacro*{volumes+bookseries+etc}[1]{%
\usebibmacro{volumes}%
\usebibmacro{bookseries}%
\usebibmacro{pages}%
- \usebibmacro{volume+number+etc}%
+ \usebibmacro{volume+number+etc}{#1}%
\usebibmacro{book:number}%
\usebibmacro{part}}%
@@ -2307,6 +2297,7 @@
{\renewcommand*{\pluga}{%
\setunit{\addcomma\space}\bibstring{by}\space}%
\renewcommand*{\cbx@namelist}{bookauthor}%
+ \usebibmacro{author+type}{bookauthor}%
\usebibmacro{printnames+etc}%
\usebibmacro{pages}}}
@@ -2331,14 +2322,13 @@
\usebibmacro{note+edition+etc}%
\iffieldundef{volume}
{\iffieldundef{bookvolume}%
- {\renewcommand*{\xvolume}{bookbook}}%
- {\renewcommand*{\xvolume}{book}}%
- \usebibmacro{volumes+bookseries+etc}}%
- {\usebibmacro{volumes+bookseries+etc}}}}
+ {\usebibmacro{volumes+bookseries+etc}{bookbook}}%
+ {\usebibmacro{volumes+bookseries+etc}{book}}}
+ {\usebibmacro{volumes+bookseries+etc}{}}}}
\usebibmacro{date+loc+etc}%
\usebibmacro{origtitle}}%
-\newbibmacro*{crossref}{%
+\newbibmacro*{crossref+entrydata}{%
\renewcommand*{\cbx@deflabel}{labelname}%
\global\toggletrue{cbx:short}%
\entrydata{\thefield{crossref}}{%
@@ -2346,7 +2336,7 @@
and togl {reflist}}
{\usebibmacro{parencite:new}}%
{\usebibmacro{author+bookauthor+etc}%
- \usebibmacro{shorttitle+crossref}}%
+ \usebibmacro{shorttitle+crossref}{ic}}%
\usebibmacro{cite:volume}}}
\newbibmacro*{pages}{%
@@ -2359,23 +2349,6 @@
\togglefalse{edshift}}%
{}}}
-\newbibmacro*{review+title}{%
- \iftoggle{newauth}
- {\bibcpstring{reviewnoauth}}%
- {\bibstring{review}}%
- \space
- \renewcommand*{\xtitle}{book}%
- \usebibmacro{title+labelyear}%
- \iftoggle{shortfirst}
- {\clearfield{booktitle}}%
- {\setunit{\addcomma\space}%
- \ifdefempty{\reviewee}
- {}
- {\restorename{bookauthor}{\reviewee}}%
- \renewcommand*{\pluga}{\bibstring{by}\space}%
- \renewcommand*{\cbx@namelist}{bookauthor}%
- \usebibmacro{printnames+etc}}}
-
\newbibmacro*{thesis+type}{%
\ifentrytype{mathesis}
{\bibstring{mathesis}%
@@ -2518,17 +2491,16 @@
\iftoggle{swapvol}
{\usebibmacro{note}%
\usebibmacro{edition}{}%
- \usebibmacro{volumes+bookseries+etc}%
- \let\xtitle\empty
- \usebibmacro{longtitle+titleaddon}%
+ \usebibmacro{volumes+bookseries+etc}{}%
+ \usebibmacro{title+titleaddon}{}%
\toggletrue{edshift}%
\usebibmacro{byauthor}%
\usebibmacro{editors:b}}%
- {\usebibmacro{volume+number+etc}%
+ {\usebibmacro{volume+number+etc}{}%
\toggletrue{edshift}%
\usebibmacro{booktitle}%
\usebibmacro{note+edition+etc}%
- \usebibmacro{volumes+bookseries+etc}}}
+ \usebibmacro{volumes+bookseries+etc}{}}}
\newbibmacro*{incollections:ic}{%
\iftoggle{swapvol}
@@ -2537,22 +2509,19 @@
{\usebibmacro{bookbooktitle}{}%
\toggletrue{edshift}%
\usebibmacro{note+edition+etc}}%
- \renewcommand*{\xvolume}{book}%
- \usebibmacro{volumes+bookseries+etc}%
+ \usebibmacro{volumes+bookseries+etc}{book}%
\toggletrue{edshift}%
\usebibmacro{booktitle}%
\usebibmacro{editors:b}}%
{\toggletrue{edshift}%
\usebibmacro{booktitle}%
\usebibmacro{editors:b}%
- \renewcommand*{\xvolume}{book}%
- \usebibmacro{volume+number+etc}%
+ \usebibmacro{volume+number+etc}{book}%
\iftoggle{collection:icbk}
{\usebibmacro{maintitle+note+etc}}%
{\usebibmacro{bookbooktitle}{}%
\toggletrue{edshift}%
\usebibmacro{note+edition+etc}}%
- \renewcommand*{\xvolume}{book}%
- \usebibmacro{volumes+bookseries+etc}}}
+ \usebibmacro{volumes+bookseries+etc}{book}}}
\endinput