windycity (3apr19)

git-svn-id: svn://tug.org/texlive/trunk@50736 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 58 insertions, 38 deletions

diff --git a/Master/texmf-dist/tex/latex/windycity/american-windycity.lbx b/Master/texmf-dist/tex/latex/windycity/american-windycity.lbx
index 284fa58298d..0a1f4ac8827 100644
--- a/Master/texmf-dist/tex/latex/windycity/american-windycity.lbx
+++ b/Master/texmf-dist/tex/latex/windycity/american-windycity.lbx
@@ -1,4 +1,4 @@
-% Last modified: Mon 11 Feb 2019 05:36:39 PM CST
+% Last modified: Tue 02 Apr 2019 01:51:01 PM CDT
 
 % Copyright (c) 2018 Brian Michael Chase.
 %
@@ -13,9 +13,8 @@
 % implied warranties of merchantability and fitness for a particular
 % purpose.
 
-\ProvidesFile{american.lbx}
-[\abx@lbxid]
-
+\ProvidesFile{american-windycity.lbx}[2019/04/02 Windy City
+  localization module for biblatex]
 \InheritBibliographyExtras{american}
 \InheritBibliographyStrings{american}
 
@@ -39,7 +38,6 @@
       \mkbibtimezone{\thefield{#4}}}}%
 }
 
-\NewBibliographyString{bibnamedash}
 \NewBibliographyString{by}
 \NewBibliographyString{compiler}
 \NewBibliographyString{compiler+}
@@ -72,7 +70,6 @@
   afterword     = {{afterword to}{afterword to}},
   andothers     = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
   by            = {{by}{by}},
-  bibnamedash   = {{\rule[2.4pt]{3em}{0.2pt}}{\rule[2.4pt]{3em}{0.2pt}}},
   bibliography  = {{Bibliography}{Bibliography}},
   chapter       = {{chap\adddot}{chap\adddot}},
   citedas       = {{hereafter cited as}{hereafter cited as}},
diff --git a/Master/texmf-dist/tex/latex/windycity/windycity.bbx b/Master/texmf-dist/tex/latex/windycity/windycity.bbx
index d9584ac81a5..3d4111ac138 100644
--- a/Master/texmf-dist/tex/latex/windycity/windycity.bbx
+++ b/Master/texmf-dist/tex/latex/windycity/windycity.bbx
@@ -1,4 +1,4 @@
-% Last modified: Wed 27 Mar 2019 10:37:54 AM CDT
+% Last modified: Tue 02 Apr 2019 02:13:22 PM CDT
 
 % Copyright (c) 2019 Brian Michael Chase.
 %
@@ -13,15 +13,16 @@
 % implied warranties of merchantability and fitness for a particular
 % purpose.
 
-\ProvidesFile{windycity.bbx}[Windy City style for biblatex]
+\ProvidesFile{windycity.bbx}[2019/04/02 Windy City bibliography style
+  for biblatex]
 \@ifpackagelater{biblatex}{2017/11/04}
-   {}
-   {\PackageError{biblatex}
-      {Outdated 'biblatex' package}
-      {Windy City 2019-03-27 is for biblatex v3.8 and above.\MessageBreak
-       You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak
-       This is a fatal error. I'm aborting now.}%
-    \endinput}%
+  {}
+  {\PackageError{biblatex}
+     {Outdated 'biblatex' package}
+     {Windy City is for biblatex v3.8 and above.\MessageBreak
+      You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak
+      This is a fatal error. I'm aborting now.}%
+   \endinput}%
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%  Bibliography and Entry Options  %%
@@ -99,12 +100,8 @@
        \field{urldate}
        \literal{nodate}}
      \ExecuteBibliographyOptions{%
-       autocite=inline,
        sorting=nyt}}%
-    {\global\togglefalse{reflist}%
-     \ExecuteBibliographyOptions{%
-       autocite=footnote,
-       sorting=nty}}}
+    {\global\togglefalse{reflist}}}
 
 \providetoggle{short}
 \DeclareBibliographyOption{short}[true]{%
@@ -136,6 +133,7 @@
 
 \ExecuteBibliographyOptions{%
   abbreviate=true,
+  autocite=footnote,
   autopunct=true,
   block=none,
   citetracker=constrict,
@@ -160,6 +158,7 @@
   pagetracker=page,
   parentracker=true,
   sortcites=false,
+  sorting=nty,
   time=12h,
   timezones=true,
   uniquelist=minyear,
@@ -1078,10 +1077,14 @@
                and not test \iffirstonpage}
     {\ifboolexpr{ test {\ifnameundef{author}}
                   and test {\ifnameundef{bookauthor}}}
-       {\bibstring{bibnamedash}\plugb}%
-       {\bibstring{bibnamedash}}}
+       {\bibnamedash\plugb}%
+       {\bibnamedash}}%
     {\usebibmacro{printnames}}}
 
+\renewcommand*{\bibnamedash}{%
+  \rule[2.4pt]{3em}{0.2pt}%
+  \global\toggletrue{blx@insert}}%
+
 \newbibmacro*{printnames}{%
   \ifnameundef{\cbx@namelist}
     {}
@@ -1117,7 +1120,7 @@
 \newbibmacro*{bibjournaldash}{%
   \ifboolexpr{ test {\iffieldequals{journaltitle}{\bbx@lasthash}}
                and not test \iffirstonpage}
-    {\bibstring{bibnamedash}%
+    {\bibnamedash
      \clearfield{journaltitle}%
      \clearlist{location}%
      \newunit}%
@@ -1132,7 +1135,7 @@
 \newbibmacro*{bibblogdash}{%
   \ifboolexpr{ test {\iffieldequals{blogtitle}{\bbx@lasthash}}
                and not test \iffirstonpage}
-    {\bibstring{bibnamedash}%
+    {\bibnamedash
      \clearfield{blogtitle}%
      \newunit}%
     {\savefield{blogtitle}{\bbx@lasthash}%
@@ -1504,7 +1507,8 @@
     {}}
 
 \newbibmacro*{labeldate+extradate}{%
-  \ifboolexpr{ togl {reflist}
+  \ifboolexpr{ togl {bibliography}
+               and togl {reflist}
                and not togl {skipdate}}
     {\newunit
      \usebibmacro{reflist+origyear}%
diff --git a/Master/texmf-dist/tex/latex/windycity/windycity.cbx b/Master/texmf-dist/tex/latex/windycity/windycity.cbx
index a33e9e13b6b..0d054166396 100644
--- a/Master/texmf-dist/tex/latex/windycity/windycity.cbx
+++ b/Master/texmf-dist/tex/latex/windycity/windycity.cbx
@@ -1,4 +1,4 @@
-% Last modified: Wed 27 Mar 2019 10:38:04 AM CDT
+% Last modified: Tue 02 Apr 2019 11:43:21 AM CDT
 
 % Copyright (c) 2019 Brian Michael Chase.
 %
@@ -13,15 +13,16 @@
 % implied warranties of merchantability and fitness for a particular
 % purpose.
 
-\ProvidesFile{windycity.cbx}[Windy City style for biblatex]
+\ProvidesFile{windycity.cbx}[2019/04/02 Windy City citation style for
+  biblatex]
 \@ifpackagelater{biblatex}{2017/11/04}
-   {}
-   {\PackageError{biblatex}
-      {Outdated 'biblatex' package}
-      {Windy City 2019-03-27 is for biblatex v3.8 and above.\MessageBreak
-       You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak
-       This is a fatal error. I'm aborting now.}%
-    \endinput}%
+  {}
+  {\PackageError{biblatex}
+     {Outdated 'biblatex' package}
+     {Windy City is for biblatex v3.8 and above.\MessageBreak
+      You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak
+      This is a fatal error. I'm aborting now.}%
+   \endinput}%
 
 % This file contains material only for formatting notes and
 % parenthetical citations. For content that is also used for
@@ -83,14 +84,14 @@
   {\usebibmacro{cite:postnote}}%
 
 \DeclareCiteCommand{\footcite}[\mkbibfootnote]
-  {\bibsentence\usebibmacro{prenote}}%
+  {\usebibmacro{prenote}}%
   {\usebibmacro{citeindex}%
    \usebibmacro{cite}}%
   {\multicitedelim}%
   {\usebibmacro{cite:postnote}}%
 
 \DeclareCiteCommand*{\footcite}[\mkbibfootnote]
-  {\bibsentence\usebibmacro{prenote}}%
+  {\usebibmacro{prenote}}%
   {\usebibmacro{citeindex}%
    \toggletrue{noauth}%
    \usebibmacro{cite}}%
@@ -112,6 +113,24 @@
   {\multicitedelim}%
   {\usebibmacro{postnote}}%
 
+\DeclareCiteCommand{\smartcite}[\iffootnote{}{\mkbibfootnote}]
+  {\usebibmacro{prenote}}%
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}}%
+  {\multicitedelim}%
+  {\usebibmacro{cite:postnote}}%
+
+\DeclareCiteCommand*{\smartcite}[\iffootnote{}{\mkbibfootnote}]
+  {\usebibmacro{prenote}}%
+  {\usebibmacro{citeindex}%
+   \toggletrue{noauth}%
+   \usebibmacro{cite}}%
+  {\multicitedelim}%
+  {\usebibmacro{cite:postnote}}%
+
+\DeclareMultiCiteCommand{\smartcites}[\iffootnote{}\mkbibfootnote]
+  {\smartcite}{\multicitedelim}
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%  Parenthetical Citations  %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/windycity/windycity.dbx b/Master/texmf-dist/tex/latex/windycity/windycity.dbx
index 68a907a98f6..24c2908303c 100644
--- a/Master/texmf-dist/tex/latex/windycity/windycity.dbx
+++ b/Master/texmf-dist/tex/latex/windycity/windycity.dbx
@@ -1,4 +1,5 @@
-
+\ProvidesFile{windycity.dbx}[2019/04/02 Windy City data model file for
+  biblatex]
 \DeclareDatamodelFields[type=field,datatype=literal]{%
   blogtitle,
   blogsubtitle,
@@ -19,4 +20,3 @@
   shortbookauthor,
   translatora,
   translatorb}
-