windycity (3apr19)

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

8 files changed, 115 insertions, 60 deletions

diff --git a/Master/texmf-dist/doc/latex/windycity/CHANGES.md b/Master/texmf-dist/doc/latex/windycity/CHANGES.md
index e979f5a29be..f0a736b4913 100644
--- a/Master/texmf-dist/doc/latex/windycity/CHANGES.md
+++ b/Master/texmf-dist/doc/latex/windycity/CHANGES.md
@@ -8,6 +8,16 @@ indicate updates to Windy City's [repository on
 GitHub](https://github.com/brianchase/windycity "GitHub:
 brianchase/windycity").
 
+## 2019-04-02
+
+* fixed '\parencite' from printing a work's publication year twice
+  under the preamble option 'reflist'
+* fixed the failure of the 3-em dash to print in bibliographies when
+  compiling with different languages
+* fixed '\autocite'; it should work for options 'footnote',
+  'inline', and 'plain' and with all preamble options
+* defined '\smartcite', '\smartcite*', and '\smartcites'
+
 ## 2019-03-27
 
 * fixed a bug that could prevent names in the 'editora' field from
@@ -188,10 +198,10 @@ brianchase/windycity").
 * added support for 'endday' field
 * 'addendum' field prints only in bibliographies and reference
   lists, not in notes
-* set 'parentracker' bibliography option
+* set 'parentracker' preamble option
 * set minxrefs preamble option
 * 'collsonly' preamble option sets 'minxrefs=1'
-* changed 'pagetracker' bibliography option from 'true' to 'page'
+* changed 'pagetracker' preamble option from 'true' to 'page'
 * edits and fixes to windycity.sty and windycity.tex
 
 ## 2018-10-20
diff --git a/Master/texmf-dist/doc/latex/windycity/doc/windycity.pdf b/Master/texmf-dist/doc/latex/windycity/doc/windycity.pdf
index d30b0165549..bdf5861c3d9 100644
--- a/Master/texmf-dist/doc/latex/windycity/doc/windycity.pdf
+++ b/Master/texmf-dist/doc/latex/windycity/doc/windycity.pdf
diff --git a/Master/texmf-dist/doc/latex/windycity/doc/windycity.sty b/Master/texmf-dist/doc/latex/windycity/doc/windycity.sty
index 7e7fa9e8e49..acc5d5b7cbf 100644
--- a/Master/texmf-dist/doc/latex/windycity/doc/windycity.sty
+++ b/Master/texmf-dist/doc/latex/windycity/doc/windycity.sty
@@ -1,4 +1,4 @@
-% Last modified: Wed 27 Mar 2019 01:19:37 PM CDT
+% Last modified: Tue 02 Apr 2019 12:28:34 PM CDT
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{windycity}
 \RequirePackage{ifxetex}
@@ -273,8 +273,10 @@
 \lstset{basicstyle=\small\ttfamily}
 \renewcommand{\bibfield}[1]{\emph{#1}}%
 \renewcommand{\bibtype}[1]{\emph{#1}}% Don't affix with '@'!
-\renewcommand{\cmd}[1]{\emph{#1}}%
+\renewcommand{\cmd}[1]{\textbackslash\emph{#1}}%
+\renewcommand{\env}[1]{\emph{#1}}%
 \renewcommand{\file}[1]{\emph{#1}}%
 \renewcommand{\opt}[1]{\emph{#1}}%
+\renewcommand{\sty}[1]{\emph{#1}}%
 
 \endinput
diff --git a/Master/texmf-dist/doc/latex/windycity/doc/windycity.tex b/Master/texmf-dist/doc/latex/windycity/doc/windycity.tex
index f73f2da5042..b5fbd41ad21 100644
--- a/Master/texmf-dist/doc/latex/windycity/doc/windycity.tex
+++ b/Master/texmf-dist/doc/latex/windycity/doc/windycity.tex
@@ -1,4 +1,4 @@
-% Last modified: Thu 28 Mar 2019 09:28:40 AM CDT
+% Last modified: Tue 02 Apr 2019 01:31:48 PM CDT
 \documentclass[11pt,letterpaper,oneside]{article}
 \usepackage{windycity}
 
@@ -8,7 +8,7 @@
 \author{Brian Michael Chase}
 \email{brianmichaelchase@gmail.com}
 \website{https://github.com/brianchase/windycity}
-\version{2019-03-27}
+\version{2019-04-02}
 \maketitle
 \begingroup
 \hypersetup{linkcolor=black}
@@ -562,23 +562,44 @@ Section \ref{collorder}.
 \subsection{Citation Commands}
 \label{citecmds}
 
-The most important citation commands are already familiar from
-\biblatex:
+The most important citation commands are familiar from \biblatex:
 
 \begin{ltxsyntax}
+\cmditem{autocite}[prenote][postnote]{key}
+\cmditem{autocites}(multiprenote)(multipostnote)[prenote][postnote]{key}|...|[prenote][postnote]{key}
 \cmditem{cite}[prenote][postnote]{key}
+\cmditem{cites}[prenote][postnote]{key}
 \cmditem{footcite}[prenote][postnote]{key}
-\cmditem{nocite}{key}
-\cmditem*{nocite}|\{*\}|
+\cmditem{footcites}(multiprenote)(multipostnote)[prenote][postnote]{key}|...|[prenote][postnote]{key}
+\cmditem{nocite}{key} \cmditem*{nocite}|\{*\}|
 \cmditem{parencite}[prenote][postnote]{key}
+\cmditem{parencites}(multiprenote)(multipostnote)[prenote][postnote]{key}|...|[prenote][postnote]{key}
+\cmditem{smartcite}[prenote][postnote]{key}
+\cmditem{smartcites}(multiprenote)(multipostnote)[prenote][postnote]{key}|...|[prenote][postnote]{key}
 \end{ltxsyntax}
 
-\noindent Insert notes with \cmd{cite} and \cmd{footcite}. Insert
-parenthetical citations with \cmd{parencite}. Use \cmd{nocite} to add
-works to bibliographies without citing them in the text. Use it with a
-comma-separated list of entry keys to add particular works. Use it
-with an asterisk to add every work in every \file{bib} file that
-you've loaded with \biblatex.
+\noindent New users should get comfortable first with \cmd{cite} and
+\cmd{footcite} (for notes) and \cmd{parencite} (for parenthetical
+citations). Their multicite forms---\cmd{cites}, \cmd{footcites}, and
+\cmd{parencites}---take a comma-separated list of entry keys.
+
+Use \cmd{nocite} to add works to bibliographies without citing them in
+the text. Use it with an asterisk to add every work in every
+\file{bib} file that you've loaded with \cmd{addbibresource} or
+\cmd{bibliography}.
+
+Windy City sets the \opt{autocite} preamble option to \opt{footnote},
+which makes \cmd{autocite} equivalent to \cmd{smartcite}---which in
+turn behaves like different citation commands in different contexts.
+In Windy City, \cmd{smartcite} is equivalent to \cmd{footcite} in a
+document's body and \cmd{cite} in footnotes and endnotes.\footnote{In
+a \env{minipage} environment, \cmd{smartcite} is equivalent to
+\cmd{cite}. To use \cmd{smartcite} with endnotes, use the
+\sty{endnotes} package.} If you set the \opt{autocite} preamble option
+to \opt{inline}, \cmd{autocite} is equivalent to \cmd{parencite}. If
+you set it to \opt{plain}, \cmd{autocite} is equivalent to \cmd{cite}.
+
+Other citation commands:
 
 \begin{ltxsyntax}
 
@@ -619,15 +640,17 @@ The source for the passage above contains:
    \parencite*{abramowitz2005}... \end{quote}
 \end{verbatim}
 
+\cmditem{smartcite*}[prenote][postnote]{key}
+
+Like \cmd{smartcite} but suppresses the author's position of a note.
+
 \end{ltxsyntax}
 
 \subsection{Entry Types}
 \label{entrytypes}
 
-In a bibliography database, every entry has an entry type. The style
-recognizes the standard ones for \BibTeX, as well as some that are
-specific to \biblatex. A relatively small number of entry types are
-basic. The style treats the rest as aliases of the basic ones.
+Windy City recognizes every entry type from \BibTeX, as well as some
+that are specific to \biblatex.
 
 \begin{typelist}
 \RaggedRight
@@ -3141,8 +3164,8 @@ in bibliographies. To exclude them, use the preamble option
 \opt{nolos}. See Section \ref{preops} for more information.\\}%
 
 \defbibnote{bib}{This section shows the default output of
-\cmd{printbibliography}. The next section shows output in the
-author-date format.\\}%
+\cmd{printbibliography}. The next section shows the author-date
+format.\\}%
 
 \defbibnote{ref}{This section shows the output of
 \cmd{printbibliography} in the author-date format. For information on
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}
-