CTAN sync 202102010300

1 files changed, 66 insertions, 45 deletions

diff --git a/macros/latex/contrib/biblatex-contrib/windycity/windycity.cbx b/macros/latex/contrib/biblatex-contrib/windycity/windycity.cbx
index b98193313a..bb0ca85e87 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: Tue 10 Nov 2020 05:24:14 PM CST
+% Last modified: Sat 30 Jan 2021 06:17:55 PM CST
 
 % 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}[2020/11/10 Windy City citation style for
+\ProvidesFile{windycity.cbx}[2021/01/30 Windy City citation style for
   biblatex]
 \@ifpackagelater{biblatex}{2019/08/17}
   {}
@@ -39,10 +39,10 @@
 \InitializeCitationStyle{\let\crossreflist\empty}%
 
 \renewcommand{\bibfootnotewrapper}[1]{%
-%  \clearfield{postpunct}%
+  \clearfield{postpunct}%
   \bibsentence#1}%
 \renewcommand{\bibendnotewrapper}[1]{%
-%  \clearfield{postpunct}%
+  \clearfield{postpunct}%
   \bibsentence#1}%
 
 % Protect commas against abbreviation dots and terminal punctuation.
@@ -182,19 +182,21 @@
      \iffieldundef{postnote}
        {\printtext[bibhyperref]{%
           \usebibmacro{parencite:date}%
-          \usebibmacro{cite:volume}}}
+          \usebibmacro{cite:volume}}}% needs '%'
        {}}
     {\usebibmacro{test:collection}%
      \usebibmacro{parencite:crossref}%
      \usebibmacro{parencite:multicite}}}
 
 \newbibmacro*{parencite:date}{%
-  \iffieldundef{labelyear}
-    {}
+  \ifboolexpr{ test {\ifentrytype{online}}
+               and test {\iffieldundef{year}}}
+    {\newunit
+     \usebibmacro{pubstate}{}}%
     {\usebibmacro{parencite:origyear}%
      \iffieldnums{labelyear}
        {}% needs '%'
-       {\addcomma}%
+       {\newunit}%
      \usebibmacro{labeldate+endyear}%
      \printfield{extradate}}}
 
@@ -221,10 +223,10 @@
       {}% needs '%'
     \printtext[bibhyperref]{%
       \usebibmacro{parencite:date}%
-      \usebibmacro{cite:volume}}}
+      \usebibmacro{cite:volume}}}% needs '%'
    {\printtext[bibhyperref]{%
       \usebibmacro{parencite:new}%
-      \usebibmacro{cite:volume}}}}
+      \usebibmacro{cite:volume}}}}% needs '%'
 
 \newbibmacro*{parencite:new}{%
   \iffieldundef{shorthand}
@@ -238,9 +240,7 @@
     {}
     {\ifboolexpr{ test {\ifnameundef{labelname}}
                   or test {\iffieldundef{labelyear}}}
-       {\iffieldundef{label}
-          {\usebibmacro{parencite:journal}}%
-          {\printfield{label}}}
+       {\printfield[citetitle]{labeltitle}}%
        {\global\toggletrue{cbx:short}%
         \renewcommand*{\cbx@deflabel}{labelname}%
         \clearfield{handle}%
@@ -252,14 +252,6 @@
           {\usebibmacro{author+bookauthor+etc}}%
           {\usebibmacro{supplement}}}}}
 
-\newbibmacro*{parencite:journal}{%
-  {\ifentrytype{article}
-    {\iffieldundef{shortjournal}
-       {\renewcommand*{\xtitle}{journal}%
-        \usebibmacro{longtitle}}%
-       {\printfield[journal]{shortjournal}}}
-    {\printfield[citetitle]{labeltitle}}}}
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%
 %%  Citations in Notes  %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -268,8 +260,12 @@
   \ifciteseen
     {\usebibmacro{test:collection}%
      \renewcommand*{\cbx@deflabel}{labelname}%
-     \printtext[bibhyperref]{\usebibmacro{cite:seen}}}
-    {\printtext[bibhyperref]{\usebibmacro{cite:new}}}% needs '%'
+     \iftoggle{shortlinks}
+       {\usebibmacro{cite:seen}}%
+       {\printtext[bibhyperref]{\usebibmacro{cite:seen}}}}
+    {\iftoggle{shortlinks}
+       {\usebibmacro{cite:new}}%
+       {\printtext[bibhyperref]{\usebibmacro{cite:new}}}}% needs '%'
   \usebibmacro{savefields}}%
 
 \newbibmacro*{cite:seen}{%
@@ -279,23 +275,32 @@
                   and not test \iffirstonpage}
        {\usebibmacro{cite:ibid}}%
        {\usebibmacro{cite:short}}}
-    {\printfield{shorthand}%
-     \usebibmacro{cite:volume}}}
+    {\iftoggle{shortlinks}
+       {\printtext[bibhyperref]{%
+          \printfield{shorthand}%
+          \usebibmacro{cite:volume}}}
+       {\printfield{shorthand}%
+        \usebibmacro{cite:volume}}}}
 
 \newbibmacro*{cite:ibid}{%
   \iftoggle{ibid}
-    {\bibcpstring{ibidem}%
-     \ifloccit
-       {\global\toggletrue{ibid:loccit}}%
-       {\usebibmacro{cite:volume}}}
+    {\iftoggle{shortlinks}
+       {\printtext[bibhyperref]{%
+          \usebibmacro{cite:ibid+loccit}}}
+       {\usebibmacro{cite:ibid+loccit}}}
     {\global\toggletrue{cbx:short}%
      \ifentrytype{review}
        {\usebibmacro{ibid:review}}%
-       {\usebibmacro{author+bookauthor+etc}%
-        \iftoggle{noauth}
-          {\usebibmacro{title+labelyear}}%
-          {}% needs '%'
-        \usebibmacro{cite:volume}}}}
+       {\iftoggle{shortlinks}
+          {\printtext[bibhyperref]{%
+             \usebibmacro{cite:author+title+etc}}}
+          {\usebibmacro{cite:author+title+etc}}}}}
+
+\newbibmacro*{cite:ibid+loccit}{%
+  \bibcpstring{ibidem}%
+  \ifloccit
+    {\global\toggletrue{ibid:loccit}}%
+    {\usebibmacro{cite:volume}}}
 
 \newbibmacro*{ibid:review}{%
   \ifnameundef{author}
@@ -305,6 +310,13 @@
     {\usebibmacro{author+bookauthor+etc}}%
   \usebibmacro{cite:volume}}%
 
+\newbibmacro*{cite:author+title+etc}{%
+  \usebibmacro{author+bookauthor+etc}%
+  \iftoggle{noauth}
+    {\usebibmacro{title+labelyear}}%
+    {}% needs '%'
+  \usebibmacro{cite:volume}}%
+
 \newbibmacro*{cite:short}{%
   \global\toggletrue{cbx:short}%
   \usebibmacro{short:multicite}%
@@ -359,7 +371,7 @@
 \newbibmacro*{cite:new}{%
   \global\toggletrue{cbx:first}%
   \usebibmacro{idem+short+multicite}%
-  \iftoggle{firstshort}
+  \iftoggle{shortfirst}
     {\usebibmacro{cite:short}}%
     {\printtext{%
        \usedriver
@@ -373,7 +385,7 @@
 \newbibmacro*{idem+short+multicite}{%
   \ifboolexpr{ test {\ifciteidem}
                or togl {cbx:idem}
-               or togl {firstshort}}
+               or togl {shortfirst}}
     {\renewcommand*{\cbx@deflabel}{labelname}}%
     {\ifboolexpr{ test {\iffieldequals{namehash}{\bbx@lasthash}}
                   and togl {multicite}}
@@ -417,13 +429,15 @@
           {\setunit{\addcolon\space}}}}}
 
 \newbibmacro*{reference:authpos}{%
-  \iflistundef{organization}
-    {\ifnameundef{bookauthor}
-       {\renewcommand*{\cbx@namelist}{author}}%
-       {\renewcommand*{\cbx@namelist}{bookauthor}}%
-     \usebibmacro{printnames+etc}}%
-    {\printlist{organization}%
-     \clearlist{organization}}}
+  \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}}
@@ -483,14 +497,18 @@
     {\ifboolexpr{ test {\ifentrytype{article}}
                   or test {\ifentrytype{review}}}
        {\iffieldundef{postnote}
-          {\printtext[bibhyperref]{\printfield{pages}}}
+          {\iftoggle{shortlinks}
+             {\printfield{pages}}%
+             {\printtext[bibhyperref]{\printfield{pages}}}}
           {}}
        {}}}
 
 \renewbibmacro*{postnote}{%
   \iffieldundef{postnote}
     {}
-    {\printtext[bibhyperref]{\printfield{postnote}}}}
+    {\iftoggle{shortlinks}
+       {\printfield{postnote}}%
+       {\printtext[bibhyperref]{\printfield{postnote}}}}}
 
 \newbibmacro*{shorthand+intro}{%
   \iffieldundef{shorthand}
@@ -515,6 +533,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \DeclareBibliographyDriver{cite:article}{%
+  \usebibmacro{newauth}%
   \usebibmacro{author+title+etc}%
   \usebibmacro{articles}%
   \usebibmacro{colon+comma+etc}}%
@@ -549,6 +568,7 @@
   \newunit}%
 
 \DeclareBibliographyDriver{cite:online}{%
+  \usebibmacro{newauth}%
   \usebibmacro{author+title+etc}%
   \setunit*{\newunitpunct}% needs '*'
   \usebibmacro{websites}%
@@ -573,6 +593,7 @@
   \usebibmacro{reference:authpos}}%
 
 \DeclareBibliographyDriver{cite:review}{%
+  \usebibmacro{newauth}%
   \usebibmacro{reviews}%
   \usebibmacro{articles}%
   \usebibmacro{colon+comma+etc}}%