texlive[50736] Master/texmf-dist: windycity (3apr19)
commits+karl at tug.org
commits+karl at tug.org
Wed Apr 3 23:39:37 CEST 2019
Revision: 50736
http://tug.org/svn/texlive?view=revision&revision=50736
Author: karl
Date: 2019-04-03 23:39:37 +0200 (Wed, 03 Apr 2019)
Log Message:
-----------
windycity (3apr19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/windycity/CHANGES.md
trunk/Master/texmf-dist/doc/latex/windycity/doc/windycity.pdf
trunk/Master/texmf-dist/doc/latex/windycity/doc/windycity.sty
trunk/Master/texmf-dist/doc/latex/windycity/doc/windycity.tex
trunk/Master/texmf-dist/tex/latex/windycity/american-windycity.lbx
trunk/Master/texmf-dist/tex/latex/windycity/windycity.bbx
trunk/Master/texmf-dist/tex/latex/windycity/windycity.cbx
trunk/Master/texmf-dist/tex/latex/windycity/windycity.dbx
Modified: trunk/Master/texmf-dist/doc/latex/windycity/CHANGES.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/windycity/CHANGES.md 2019-04-03 21:39:22 UTC (rev 50735)
+++ trunk/Master/texmf-dist/doc/latex/windycity/CHANGES.md 2019-04-03 21:39:37 UTC (rev 50736)
@@ -8,6 +8,16 @@
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 @@
* 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
Modified: trunk/Master/texmf-dist/doc/latex/windycity/doc/windycity.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/windycity/doc/windycity.sty
===================================================================
--- trunk/Master/texmf-dist/doc/latex/windycity/doc/windycity.sty 2019-04-03 21:39:22 UTC (rev 50735)
+++ trunk/Master/texmf-dist/doc/latex/windycity/doc/windycity.sty 2019-04-03 21:39:37 UTC (rev 50736)
@@ -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
Modified: trunk/Master/texmf-dist/doc/latex/windycity/doc/windycity.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/windycity/doc/windycity.tex 2019-04-03 21:39:22 UTC (rev 50735)
+++ trunk/Master/texmf-dist/doc/latex/windycity/doc/windycity.tex 2019-04-03 21:39:37 UTC (rev 50736)
@@ -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 at gmail.com}
\website{https://github.com/brianchase/windycity}
-\version{2019-03-27}
+\version{2019-04-02}
\maketitle
\begingroup
\hypersetup{linkcolor=black}
@@ -562,24 +562,45 @@
\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}
\cmditem{cite*}[prenote][postnote]{key}
@@ -619,15 +640,17 @@
\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 @@
\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
Modified: trunk/Master/texmf-dist/tex/latex/windycity/american-windycity.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/windycity/american-windycity.lbx 2019-04-03 21:39:22 UTC (rev 50735)
+++ trunk/Master/texmf-dist/tex/latex/windycity/american-windycity.lbx 2019-04-03 21:39:37 UTC (rev 50736)
@@ -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 at 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}},
Modified: trunk/Master/texmf-dist/tex/latex/windycity/windycity.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/windycity/windycity.bbx 2019-04-03 21:39:22 UTC (rev 50735)
+++ trunk/Master/texmf-dist/tex/latex/windycity/windycity.bbx 2019-04-03 21:39:37 UTC (rev 50736)
@@ -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 at 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 at 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 at insert}}%
+
\newbibmacro*{printnames}{%
\ifnameundef{\cbx at namelist}
{}
@@ -1117,7 +1120,7 @@
\newbibmacro*{bibjournaldash}{%
\ifboolexpr{ test {\iffieldequals{journaltitle}{\bbx at lasthash}}
and not test \iffirstonpage}
- {\bibstring{bibnamedash}%
+ {\bibnamedash
\clearfield{journaltitle}%
\clearlist{location}%
\newunit}%
@@ -1132,7 +1135,7 @@
\newbibmacro*{bibblogdash}{%
\ifboolexpr{ test {\iffieldequals{blogtitle}{\bbx at lasthash}}
and not test \iffirstonpage}
- {\bibstring{bibnamedash}%
+ {\bibnamedash
\clearfield{blogtitle}%
\newunit}%
{\savefield{blogtitle}{\bbx at 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}%
Modified: trunk/Master/texmf-dist/tex/latex/windycity/windycity.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/windycity/windycity.cbx 2019-04-03 21:39:22 UTC (rev 50735)
+++ trunk/Master/texmf-dist/tex/latex/windycity/windycity.cbx 2019-04-03 21:39:37 UTC (rev 50736)
@@ -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 at 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 at 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,7 +84,7 @@
{\usebibmacro{cite:postnote}}%
\DeclareCiteCommand{\footcite}[\mkbibfootnote]
- {\bibsentence\usebibmacro{prenote}}%
+ {\usebibmacro{prenote}}%
{\usebibmacro{citeindex}%
\usebibmacro{cite}}%
{\multicitedelim}%
@@ -90,7 +91,7 @@
{\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 %%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Modified: trunk/Master/texmf-dist/tex/latex/windycity/windycity.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/windycity/windycity.dbx 2019-04-03 21:39:22 UTC (rev 50735)
+++ trunk/Master/texmf-dist/tex/latex/windycity/windycity.dbx 2019-04-03 21:39:37 UTC (rev 50736)
@@ -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}
-
More information about the tex-live-commits
mailing list