diff options
Diffstat (limited to 'macros/latex/contrib/biblatex-contrib/windycity/windycity.cbx')
-rw-r--r-- | macros/latex/contrib/biblatex-contrib/windycity/windycity.cbx | 80 |
1 files changed, 41 insertions, 39 deletions
diff --git a/macros/latex/contrib/biblatex-contrib/windycity/windycity.cbx b/macros/latex/contrib/biblatex-contrib/windycity/windycity.cbx index f73248dcf5..f6bbabfb26 100644 --- a/macros/latex/contrib/biblatex-contrib/windycity/windycity.cbx +++ b/macros/latex/contrib/biblatex-contrib/windycity/windycity.cbx @@ -1,4 +1,4 @@ -% Last modified: Sun 02 May 2021 01:14:43 PM CDT +% Last modified: Wed 07 Jul 2021 05:45:51 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.cbx}[2021/05/02 Windy City citation style for +\ProvidesFile{windycity.cbx}[2021/07/07 Windy City citation style for biblatex] \@ifpackagelater{biblatex}{2019/08/17} {} @@ -298,7 +298,8 @@ \newbibmacro*{cite:ibid+loccit}{% \bibcpstring{ibidem}% - \ifloccit + \ifboolexpr{ togl {ibidpage} + and test \ifloccit} {\global\toggletrue{ibid:loccit}}% {\usebibmacro{cite:volume}}} @@ -306,16 +307,19 @@ \ifnameundef{author} {\bibcpstring{reviewnoauth}% \space - \usebibmacro{title+labelyear}}% + \usebibmacro{shorttitle+shortlinks}}% {\usebibmacro{author+bookauthor+etc}}% \usebibmacro{cite:volume}}% \newbibmacro*{cite:author+title+etc}{% \usebibmacro{author+bookauthor+etc}% \iftoggle{noauth} - {\usebibmacro{title+labelyear}}% + {\usebibmacro{shorttitle+shortlinks}}% {}% needs '%' - \usebibmacro{cite:volume}}% + \ifboolexpr{ togl {ibidpage} + and test \ifloccit} + {\global\toggletrue{ibid:loccit}}% + {\usebibmacro{cite:volume}}} \newbibmacro*{cite:short}{% \global\toggletrue{cbx:short}% @@ -323,8 +327,12 @@ \ifentrytype{review} {\usebibmacro{short:review}}% {\usebibmacro{author+bookauthor+etc}% - \usebibmacro{title+labelyear}% - \usebibmacro{cite:volume}}} + \usebibmacro{shorttitle+shortlinks}% + \ifboolexpr{ togl {ibidpage} + and test \ifloccit + and not test \iffirstonpage} + {\global\toggletrue{ibid:loccit}}% + {\usebibmacro{cite:volume}}}} \newbibmacro*{short:multicite}{% \ifboolexpr{ test {\iffieldequals{namehash}{\bbx@lasthash}} @@ -334,16 +342,20 @@ {}} \newbibmacro*{short:review}{% - \ifnameundef{author} - {\bibcpstring{reviewnoauth}}% - {\usebibmacro{author+bookauthor+etc}% - \bibstring{review}}% - \space -% \renewcommand*{\xtitle}{book}% -% \usebibmacro{title+labelyear}% - \iffieldundef{shortbooktitle} - {\printfield[title]{booktitle}\isdot}% - {\printfield[title]{shortbooktitle}\isdot}% + \ifboolexpr{ test {\ifnameundef{author}} + and test {\iffieldundef{title}}} + {\bibcpstring{reviewnoauth}% + \setunit{\space}% + \usebibmacro{shorttitle}{book}}% + {\ifnameundef{author} + {\usebibmacro{shorttitle+shortlinks}}% + {\iffieldundef{title} + {\usebibmacro{author+bookauthor+etc}% + \bibstring{review}% + \setunit{\space}% + \usebibmacro{shorttitle}{book}}% + {\usebibmacro{author+bookauthor+etc}% + \usebibmacro{shorttitle+shortlinks}}}} \usebibmacro{cite:volume}}% \newbibmacro*{cite:volume}{% @@ -444,17 +456,6 @@ {\newunit}% {\setunit{\addcolon\space}}}}} -\newbibmacro*{reference:authpos}{% - \iftoggle{newauth} - {\usebibmacro{author+bookauthor+etc}% - \togglefalse{newauth}% - \clearlist{organization}% - \clearname{author}}% - {\iflistundef{organization} - {\usebibmacro{author+bookauthor+etc}}% - {\printlist{organization}% - \clearlist{organization}}}} - \newbibmacro*{reference:howpublished+etc}{% \ifboolexpr{ test {\iffieldundef{howpublished}} and test {\iffieldundef{year}}} @@ -478,8 +479,8 @@ \usebibmacro{postnote+etc}% \usebibmacro{postpunct+etc}}% -% In this context, '\ifloccit' is always true. Run it earlier, in -% 'cite:ibid', and record the state with 'ibid:loccit'. +% In this context, '\ifloccit' is always true. Run it earlier and +% record the state with the 'loccit' toggle. \newbibmacro*{postnote+etc}{% \iftoggle{ibid:loccit} @@ -558,7 +559,7 @@ \usebibmacro{test:crossref}% \iftoggle{cbx:collection} {\usebibmacro{author+incollection+etc}% - \usebibmacro{crossref}}% + \usebibmacro{crossref+entrydata}}% {\usebibmacro{author+collection+etc}% \usebibmacro{cite:punctuation}% \usebibmacro{volume+page}}} @@ -570,7 +571,7 @@ \usebibmacro{test:crossref}% \iftoggle{cbx:collection} {\usebibmacro{author+incollection+etc}% - \usebibmacro{crossref}}% + \usebibmacro{crossref+entrydata}}% {\usebibmacro{author+incollection+etc}% \usebibmacro{incollections}% \usebibmacro{cite:punctuation}% @@ -578,7 +579,7 @@ \DeclareBibliographyDriver{cite:misc}{% \usebibmacro{author+bookauthor+etc}% - \usebibmacro{title+labelyear}% + \usebibmacro{title+titleaddon}{}% \newunit \printfield{usera}% \newunit}% @@ -598,15 +599,16 @@ \newunit}% \DeclareBibliographyDriver{cite:reference}{% - \usebibmacro{reference:authpos}% + \iftoggle{newauth} + {\usebibmacro{author+bookauthor+etc}% + \clearname{author}}% + {\printlist{organization}}% \usebibmacro{edition}{}% \usebibmacro{reference:howpublished+etc}% \newunit \bibstring{subverbo}\space - \usebibmacro{longtitle+titleaddon}% - \newunit - \renewcommand*{\pluga}{\bibstring{by}\space}% - \usebibmacro{reference:authpos}}% + \usebibmacro{title+titleaddon}{}% + \usebibmacro{byauthor}}% \DeclareBibliographyDriver{cite:review}{% \usebibmacro{newauth}% |