texlive[59876] Master/texmf-dist: windycity (8jul21)
commits+karl at tug.org
commits+karl at tug.org
Thu Jul 8 22:41:43 CEST 2021
Revision: 59876
http://tug.org/svn/texlive?view=revision&revision=59876
Author: karl
Date: 2021-07-08 22:41:42 +0200 (Thu, 08 Jul 2021)
Log Message:
-----------
windycity (8jul21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/windycity/CHANGES.md
trunk/Master/texmf-dist/doc/latex/windycity/windycity.pdf
trunk/Master/texmf-dist/doc/latex/windycity/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 2021-07-08 20:40:01 UTC (rev 59875)
+++ trunk/Master/texmf-dist/doc/latex/windycity/CHANGES.md 2021-07-08 20:41:42 UTC (rev 59876)
@@ -8,6 +8,38 @@
GitHub](https://github.com/brianchase/windycity "GitHub:
brianchase/windycity").
+## 2021-07-07
+
+* improved the workflow for titles, subtitles, and the like; no change
+ in output, except for the following:
+
+ - added support for printing the `subtitle` and `titleaddon` of an
+ entry cross-referenced by a cross-referenced entry (e.g. if you
+ cite an article cross-referenced to a volume cross-referenced to a
+ collection, the collection's `subtitle` and `titleaddon` will now
+ print)
+ - subsequent citations of `@review` entries with titles now have a
+ similar form as articles with titles (previously, they were the
+ same as untitled reviews)
+ - if the `crossref` field of an `@review` entry is defined, the
+ title of the cross-referenced entry now has the field format of
+ its entry type (previously, all such titles were in italics, never
+ in quotation marks)
+
+* added support for the `ibidpage` preamble option (false by default;
+ true with the `ibid` preamble option; if true, it suppresses the
+ `postnote` of a citation if the previous citation on the page is to
+ the same entry with the same `postnote`)
+* added support for the `dashed` preamble option (true by default; if
+ false, it removes the 3-em dash for repeated names in bibliographies
+ and reference lists)
+* added support for using `annotate` as an entry option, not just as a
+ preamble option
+* fixed `anon` and `anon?` author types for contexts outside the
+ author's position
+* fixed the `shortfirst` preamble option for `@review` entries
+* fixed `@review` entries with titles but no authors
+
## 2021-05-02
This release brings a long overdue redesign of the workflow for
@@ -135,9 +167,9 @@
pseudonymous authors with the value `pseudo` (the `nameaddon` field
still works for this and, in fact, remains the only way to list a
pseudonymous author's given name)
-* added a `nopages` bibliography option to stop automatic printing of
- the `pages` field on first citations of `@article` and `@review`
- entries (and their aliases) when the `postnote` is blank
+* added a `nopages` preamble option to stop automatic printing of the
+ `pages` field on first citations of `@article` and `@review` entries
+ (and their aliases) when the `postnote` is blank
* added support for the `\fullcite` and `\footfullcite` citation
commands
* new citation commands: `idemcite`, `idemcites`, `footidemcite`,
Modified: trunk/Master/texmf-dist/doc/latex/windycity/windycity.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/windycity/windycity.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/windycity/windycity.tex 2021-07-08 20:40:01 UTC (rev 59875)
+++ trunk/Master/texmf-dist/doc/latex/windycity/windycity.tex 2021-07-08 20:41:42 UTC (rev 59876)
@@ -1,4 +1,4 @@
-% Last modified: Sun 02 May 2021 01:06:52 PM CDT
+% Last modified: Wed 07 Jul 2021 05:46:01 PM CDT
\documentclass[11pt,letterpaper,oneside]{article}
\usepackage{windycity}
@@ -8,7 +8,7 @@
\author{Brian Chase}
\email{brianmichaelchase at gmail.com}
\website{https://github.com/brianchase/windycity}
-\version{2021-05-02}
+\version{2021-07-07}
\maketitle
\begingroup
\hypersetup{linkcolor=black}
@@ -57,14 +57,14 @@
\subsection{Getting Started}
If you already know how to use \biblatex, getting started with Windy
-City is easy. The first task is to confirm that \biblatex and Windy
-City are installed properly on your system. Since both are included in
-some distributions of \LaTeX, you might be able to skip this step.
+City is easy. First, confirm that \biblatex and Windy City are
+installed properly on your system. Since both are included in some
+distributions of \LaTeX, you might already have them.
Either way, please consider downloading the most recent release of
-Windy City from \begingroup \hypersetup{urlcolor=blue}
-\href{https://www.ctan.org/pkg/windycity}{its home on CTAN}. Releases
-without the PDF user guide are available from Windy City's
+Windy City from its
+\begingroup\hypersetup{urlcolor=blue}\href{https://www.ctan.org/pkg/windycity}{home
+on CTAN} or
\href{https://github.com/brianchase/windycity/releases}{repository on
GitHub}. More recent but potentially less reliable updates are
available on \href{https://github.com/brianchase/windycity}{the main
@@ -237,9 +237,8 @@
feature of the style. For demonstration purposes, though, it's
possible.}
-% The use of 'shortfirst' below might be confusing. It's necessary to
-% simulate the effect of 'short' within a document that otherwise
-% gives default output.
+% Preamble option 'short' sets 'short' and 'shortfirst' toggles to
+% true. Set them to true to simulate the 'short' preamble option.
\begin{citeonly}
\AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}}
@@ -283,30 +282,35 @@
\textit{ibid.} in reference to a citation on a previous page. A page
break here may affect the output.}
+% Preamble option 'short' sets 'short' and 'shortfirst' toggles to
+% true. Preamble option 'ibid' sets 'ibid', 'ibidpage', and 'short'
+% toggles to true. Set all those toggles to true to simulate the
+% 'short' and 'ibid' preamble options.
+
\begin{citeonly}
-\AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}\toggletrue{ibid}}
+\AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}}
\item \cite[3]{morrison2004a}
\AtNextCitekey{\toggletrue{short}\toggletrue{ibid}}
\item \cite[18]{morrison2004a}
-\AtNextCitekey{\toggletrue{short}\toggletrue{ibid}}
+\AtNextCitekey{\toggletrue{short}\toggletrue{ibid}\toggletrue{ibidpage}}
\item \cite[18]{morrison2004a}
\AtNextCitekey{\toggletrue{short}\toggletrue{ibid}}
\item \cite[24--26]{morrison2004a}
-\AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}\toggletrue{ibid}}
+\AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}}
\item \cite[401-2]{morrison2004b}
\AtNextCitekey{\toggletrue{short}\toggletrue{ibid}}
\item \cite[433]{morrison2004b}
-\AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}\toggletrue{ibid}}
+\AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}}
\item \cite[37--38]{diaz2008}
-\AtNextCitekey{\toggletrue{short}\toggletrue{ibid}}
+\AtNextCitekey{\toggletrue{short}}
\item \cite[403]{morrison2004b}
-\AtNextCitekey{\toggletrue{short}\toggletrue{ibid}}
+\AtNextCitekey{\toggletrue{short}}
\item \cite[152]{diaz2008}
\AtNextCitekey{\toggletrue{short}\toggletrue{ibid}}
\item \cite[201-2]{diaz2008}
\AtNextMultiCite{\toggletrue{short}\toggletrue{shortfirst}}
\item \cites[240]{morrison2004b}[32]{morrison2004a}
-\AtNextCitekey{\toggletrue{short}\toggletrue{ibid}}
+\AtNextCitekey{\toggletrue{short}}
\item \cite[33]{morrison2004a}
\end{citeonly}
@@ -329,36 +333,34 @@
A preamble option is an argument for the \cmd{usepackage} macro that
loads \biblatex. Preamble options affect the format of notes,
-bibliographies, and reference lists. Some features of the style
-require them.
+bibliographies, and reference lists. Windy City relies on many
+preamble options from \biblatex and supports or provides others to
+allow you to change the default output.
-All options described below are \opt{false} by default. Set them to
-\opt{true} by passing the name of the option to \biblatex, with or
-without an additional \opt{=true}. In other words, using
-\opt{annotate} as an example, the following are equivalent:
+% Windy City sets preamble options for \biblatex in
+% \file{windycity.bbx}. The list there isn't complete. The style needs
+% to set some options to comply with \textit{CMOS}, sets others as a
+% precaution, and leaves still others untouched. Users who want
+% fine-grained control of the style should look through the list along
+% with \biblatex's user guide.
+Many options below are \opt{false} by default. Make an option
+\opt{true} by passing its name to \biblatex, with or without
+\opt{=true}. Using \opt{annotate} as an example, the following are
+equivalent:
+
\begin{verbatim}
\usepackage[annotate,style=windycity]{biblatex}
\usepackage[annotate=true,style=windycity]{biblatex}
\end{verbatim}
-Bear in mind that Windy City uses many preamble options native to
-\biblatex, a few of which you may want to change. These options are
-set in \file{windycity.bbx}. In particular, the style sets
-\opt{idemtracker} to \opt{false}. If you set it to \opt{true} (or to
-some value that implies \opt{true}), Windy City will detect when the
-first citation of a work follows another citation of a work by the
-same author and shorten the author's name. Recall from the previous
-section the citation of Toni Morrison's \textit{Song of Solomon}
-immediately after a citation of her \textit{Beloved}. In a context
-like that, do you really need to remind readers of the author's full
-name? If you think not, change \opt{idemtracker} to an appropriate
-value (see section 3.1.2.3 of \biblatex's user
-guide).\footnote{\textit{CMOS} seems to have no policy on this point.
-In the 16th edition, however, Figure 14.3 shows consecutive citations
-of works by the same author, both of which give the author's full
-name.}
+If an option is \opt{true} by default, make it \opt{false} by passing
+its name with \opt{=false}. Using \opt{doi} as an example:
+\begin{verbatim}
+ \usepackage[doi=false,style=windycity]{biblatex}
+\end{verbatim}
+
\begin{optionlist}
\optitem[false]{annotate}{\opt{true}, \opt{false}}
@@ -379,18 +381,64 @@
collections. For discussion of multivolume works, see section
\ref{multivolume}.
+\optitem[true]{dashed}{\opt{true}, \opt{false}}
+
+\noindent Set \opt{false} to remove the 3-em dash for repeated names
+in bibliographies and reference lists.
+
+\optitem[true]{doi}{\opt{true}, \opt{false}}
+
+\noindent Set \opt{false} to prevent the \bibfield{doi} field from
+printing.
+
+\optitem[true]{eprint}{\opt{true}, \opt{false}}
+
+\noindent Set \opt{false} to prevent the \bibfield{eprint} field from
+printing. For more information about eprints, see section
+\ref{datafields}.
+
\optitem[false]{ibid}{\opt{true}, \opt{false}}
\noindent This option controls whether consecutive citations of a work
-on the same page receive an \textit{ibid}. The qualification ``on the
-same page'' means that \textit{ibid.} always refers to a work cited on
-the current page without an \textit{ibid}. The latter isn't a
-requirement of \textit{CMOS} but seems reasonable, since it prevents
-readers from having to look at another page to find the referent of an
-\textit{ibid}. For examples of its output, see section \ref{short} and
-\ref{14.34}. As of the 17th edition, \textit{CMOS} discourages the use
-of \textit{ibid.} (see \ref{14.34}).
+on the same page receive an \textit{ibid}. For examples, see section
+\ref{short} and \textit{CMOS} \ref{14.34}. As of the 17th edition,
+\textit{CMOS} discourages the use of \textit{ibid.}
+% The qualification ``on the same page'' means that the referent of an
+% \textit{ibid.} is never on a different page. The latter isn't a
+% requirement of \textit{CMOS} but seems reasonable, since it prevents
+% readers from having to look at another page to find the referent of
+% an \textit{ibid}.
+
+\optitem[false]{ibidpage}{\opt{true}, \opt{false}}
+
+\noindent If \opt{true}, the \bibfield{postnote} field won't print if
+the previous citation on the page is of the same entry with the same
+\bibfield{postnote}. The \opt{ibid} preamble option uses
+\opt{ibidpage}.
+
+\optitem[false]{idemtracker}{\opt{true}, \opt{false}, \opt{context},
+\opt{strict}, \opt{constrict}}
+
+\noindent If \opt{true}, the first citation of a work prints with a
+shortened author's name if the previous citation is of another work by
+the same author.
+
+Recall \textit{CMOS} \ref{14.34}, where the first citation of Toni
+Morrison's \textit{Song of Solomon} immediately follows citations of
+her \textit{Beloved}. The default output prints her full name twice,
+once for the first citation of \textit{Song of Solomon} and again for
+the first citation of \textit{Beloved}. If \opt{idemtracker} is
+\opt{true} (or in many contexts any value other than \opt{false}), her
+full name prints just once, at the beginning of the series.
+
+% As for \texit{CMOS}, the 16th edition, Figure 14.3, shows
+% consecutive citations of works by the same author, both of which
+% give the author's full name.
+
+For more information on \opt{idemtracker}, see the discussion in
+\biblatex's user guide.
+
\optitem[false]{isbn}{\opt{true}, \opt{false}}
\noindent Use this option to print ISBNs in bibliographies. A work's
@@ -427,7 +475,7 @@
\bibfield{pages} field if the \bibfield{postnote} field is blank. This
lets you cite the entirety of a work without having to duplicate the
content of the \bibfield{pages} field in the \bibfield{postnote}. To
-override this feature, use the \opt{nopages} option.
+override this feature, use \opt{nopages}.
\optitem[false]{reflist}{\opt{true}, \opt{false}}
@@ -502,8 +550,7 @@
title. According to \textit{CMOS}, this approach is optional for
documents with complete bibliographies. (See \textit{CMOS}
\ref{14.23}, also 14.29--14.36.) As with \opt{short}, you may use
-\opt{shortfirst} in conjunction with \opt{ibid} for more concise
-citations.
+\opt{shortfirst} with \opt{ibid} for more concise citations.
\optitem[false]{shortlinks}{\opt{true}, \opt{false}}
@@ -553,6 +600,11 @@
volume. To reverse this for all relevant citations, use \opt{swapvol}.
For more information, see section \ref{collorder}.
+\optitem[true]{url}{\opt{true}, \opt{false}}
+
+\noindent Set \opt{false} to prevent the \bibfield{url} field from
+printing.
+
\end{optionlist}
\subsection{Entry Options}
@@ -562,8 +614,44 @@
database entry. It affects the format of that work. For options that
affect the format of every work, see section \ref{preamble}.
+As with preamble options, many options below are \opt{false} by
+default. Make an option \opt{true} by putting its name in the
+\bibfield{options} field of a work's bibliography database entry, with
+or without \opt{=true}. Using \opt{annotate} as an example, the
+following are equivalent:
+
+\begin{verbatim}
+ options = {annotate},
+ options = {annotate=true},
+\end{verbatim}
+
+If an option is \opt{true} by default, make it \opt{false} by putting
+its name with \opt{=false} in the \bibfield{options} field. Using
+\opt{doi} as an example:
+
+\begin{verbatim}
+ options = {doi=false},
+\end{verbatim}
+
\begin{optionlist}
+\optitem[false]{annotate}{\opt{true}, \opt{false}}
+
+\noindent Set \opt{true} to print an entry's \bibfield{annotation}
+field. To change the spacing between entries and annotations, change
+the value of \cmd{bibitemsep}.
+
+\optitem[true]{doi}{\opt{true}, \opt{false}}
+
+\noindent Set \opt{false} to prevent the \bibfield{doi} field from
+printing.
+
+\optitem[true]{eprint}{\opt{true}, \opt{false}}
+
+\noindent Set \opt{false} to prevent the \bibfield{eprint} field from
+printing. For more information about eprints, see section
+\ref{datafields}.
+
\optitem[false]{isbn}{\opt{true}, \opt{false}}
\noindent Use this option to print the ISBN of a particular work in a
@@ -719,6 +807,11 @@
collection precedes that of the volume. For more information, see
section \ref{collorder}.
+\optitem[true]{url}{\opt{true}, \opt{false}}
+
+\noindent Set \opt{false} to prevent the \bibfield{url} field from
+printing.
+
\end{optionlist}
\subsection{Citation Commands}
@@ -1164,7 +1257,7 @@
\noindent Note that when \bibfield{date} contains just a year of
publication, you may use the classic \bibfield{year} field.
-\item[pages] See comments on the \opt{nopages} bibliography option in
+\item[pages] See comments on the \opt{nopages} preamble option in
section \ref{preamble}.
\item[pubstate] This fields indicates when a work is forthcoming (with
@@ -1445,10 +1538,9 @@
As the examples above also indicate, the style supports a variety of
editorial roles beyond just editor and translator. They are: compiler,
-expander, reviser, and updater. To assign them, you need to use the
-editor and translator type fields. Below are some bibliography
-database entries for examples in \textit{CMOS} \ref{14.103} and
-\ref{14.142}:
+expander, reviser, and updater. To assign them, use the editor and
+translator type fields. Below are some bibliography database entries
+for examples in \textit{CMOS} \ref{14.103} and \ref{14.142}:
\begin{verbatim}
@Book{schechter2011,
@@ -2115,7 +2207,7 @@
\bibfield{maintitle} field or a \bibfield{volume} field inherited from
the cross-referenced entry. You can find the exact details in
\file{windycity.bbx}. Just remember that entries like these should
-always be cross-referenced to a \bibtype{collection} or one of its
+always be cross-referenced to a \bibtype{collection} or to one of its
aliases. Since Windy City treats them the same, it makes no difference
whether you designate entries for volumes as \bibtype{bookinbook} or
\bibtype{inbook}.
@@ -2122,8 +2214,7 @@
With one exception, you can get the same output with a \bibtype{book},
\bibtype{collection}, \bibtype{mvbook}, or \bibtype{mvcollection}
-entry. As before, the choice of entry type is arbitrary. All four are
-equivalent. Here's a counterpart to the previous example using
+entry. Here's a counterpart to the previous example using
\bibtype{collection}:
\begin{verbatim}
@@ -2142,21 +2233,22 @@
}
\end{verbatim}
-These entries work with \opt{swapvol} if they have \bibfield{volume}
-and \bibfield{maintitle} fields, among other conditions. You may
-prefer them over \bibfield{bookinbook} or \bibfield{inbook} entries if
-you only intend to cite one volume of the collection and have no need
-to cite the collection as a whole. You risk trouble, though, if the
-volumes of the collection have different publication dates, as they do
-for \textit{The Papers of Martin Luther King, Jr}. If the publication
-information for this volume goes last, the bibliography and long
-citation should list the publication date as \textit{2014}. If the
-publication information for the collection goes last, that date is
-\textit{1992–}. A \bibtype{book} or \bibtype{collection} entry,
-however, has just one field for a publication date, so using
-\opt{swapvol} on \bibfield{carson2014} would print \textit{2014}, not
-\textit{1992–}. Otherwise, the entry types are interchangeable. You
-can find examples of both approaches in \file{windycity.bib}.
+These entry types work with \opt{swapvol} if they have
+\bibfield{volume} and \bibfield{maintitle} fields, among other
+conditions. You may prefer them over \bibfield{bookinbook} or
+\bibfield{inbook} entries if you only intend to cite one volume of the
+collection and have no need to cite the collection as a whole. You
+risk trouble, though, if the volumes of the collection have different
+publication dates, as they do for \textit{The Papers of Martin Luther
+King, Jr}. If the publication information for this volume goes last,
+the bibliography and long citation should list the publication date as
+\textit{2014}. If the publication information for the collection goes
+last, that date is \textit{1992–}. A \bibtype{book} or
+\bibtype{collection} entry, however, has just one field for a
+publication date, so using \opt{swapvol} on \bibfield{carson2014}
+would print \textit{2014}, not \textit{1992–}. Otherwise, the entry
+types are interchangeable. You can find examples of both approaches in
+\file{windycity.bib}.
Certain entries cross-referenced to entries that work with
\opt{swapvol} also work with it. Those entry types are limited to
@@ -2249,10 +2341,10 @@
are separated by a colon. With \textit{The Complete Tales of Henry
James}, only the second citation follows this pattern. In the first,
the volume number appears earlier, after the editor's name. Why?
-Apparently, \textit{The Lisle Letters} count as a single, multivolume
-work because every volume has the same title and publication date. Not
-so \textit{The Complete Tales of Henry James}. Its volumes have
-different titles and publication dates.
+Apparently, \textit{The Lisle Letters} is a single, multivolume work
+because every volume has the same title and publication date. Not so
+\textit{The Complete Tales of Henry James}. Its volumes have different
+titles and publication dates.
To get the right output, your bibliography database and citations need
to reflect this distinction. Think of it this way: If a multivolume
@@ -2329,7 +2421,7 @@
Since the volume number is part of the entry and needs to print in
different places depending on the context, don't include it in the
\bibfield{postnote}. Let Windy City handle it. Below is the source for
-the first and second citations of \textit{The Complete Tales Henry
+the first and second citations of \textit{The Complete Tales of Henry
James}:
\begin{verbatim}
@@ -2353,8 +2445,8 @@
database. For \textit{The Lisle Letters}, cross-referencing would
introduce needless complexity. A single work should have a single
entry, not multiple, cross-referenced entries. For \textit{The
-Complete Tales Henry James}, cross-referencing would result in errors
-because, with different titles and publication dates, not all
+Complete Tales of Henry James}, cross-referencing would result in
+errors because, with different titles and publication dates, not all
publication data for the collection is true of each volume. To cite
the collection as a whole, as in \textit{CMOS} \ref{14.117}, add a
separate entry:
@@ -2512,29 +2604,29 @@
\noindent With options \opt{short} and \opt{ibid}:
\begin{citeonly}
-\AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}\toggletrue{ibid}}
+\AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}}
\item \cite[3]{morrison2004a}
\AtNextCitekey{\toggletrue{short}\toggletrue{ibid}}
\item \cite[18]{morrison2004a}
-\AtNextCitekey{\toggletrue{short}\toggletrue{ibid}}
+\AtNextCitekey{\toggletrue{short}\toggletrue{ibid}\toggletrue{ibidpage}}
\item \cite[18]{morrison2004a}
\AtNextCitekey{\toggletrue{short}\toggletrue{ibid}}
\item \cite[24--26]{morrison2004a}
-\AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}\toggletrue{ibid}}
+\AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}}
\item \cite[401-2]{morrison2004b}
\AtNextCitekey{\toggletrue{short}\toggletrue{ibid}}
\item \cite[433]{morrison2004b}
-\AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}\toggletrue{ibid}}
+\AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}}
\item \cite[37--38]{diaz2008}
-\AtNextCitekey{\toggletrue{short}\toggletrue{ibid}}
+\AtNextCitekey{\toggletrue{short}}
\item \cite[403]{morrison2004b}
-\AtNextCitekey{\toggletrue{short}\toggletrue{ibid}}
+\AtNextCitekey{\toggletrue{short}}
\item \cite[152]{diaz2008}
\AtNextCitekey{\toggletrue{short}\toggletrue{ibid}}
\item \cite[201-2]{diaz2008}
\AtNextMultiCite{\toggletrue{short}\toggletrue{shortfirst}}
\item \cites[240]{morrison2004b}[32]{morrison2004a}
-\AtNextCitekey{\toggletrue{short}\toggletrue{ibid}}
+\AtNextCitekey{\toggletrue{short}}
\item \cite[33]{morrison2004a}
\end{citeonly}
Modified: trunk/Master/texmf-dist/tex/latex/windycity/american-windycity.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/windycity/american-windycity.lbx 2021-07-08 20:40:01 UTC (rev 59875)
+++ trunk/Master/texmf-dist/tex/latex/windycity/american-windycity.lbx 2021-07-08 20:41:42 UTC (rev 59876)
@@ -1,4 +1,4 @@
-% Last modified: Sun 02 May 2021 01:14:34 PM CDT
+% Last modified: Wed 07 Jul 2021 05:45:54 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{american-windycity.lbx}[2021/05/02 Windy City
+\ProvidesFile{american-windycity.lbx}[2021/07/07 Windy City
localization module for biblatex]
\InheritBibliographyExtras{american}
\InheritBibliographyStrings{american}
Modified: trunk/Master/texmf-dist/tex/latex/windycity/windycity.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/windycity/windycity.bbx 2021-07-08 20:40:01 UTC (rev 59875)
+++ trunk/Master/texmf-dist/tex/latex/windycity/windycity.bbx 2021-07-08 20:41:42 UTC (rev 59876)
@@ -1,4 +1,4 @@
-% Last modified: Sun 02 May 2021 01:14:55 PM CDT
+% Last modified: Wed 07 Jul 2021 05:45:49 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.bbx}[2021/05/02 Windy City bibliography style
+\ProvidesFile{windycity.bbx}[2021/07/07 Windy City bibliography style
for biblatex]
\@ifpackagelater{biblatex}{2019/08/17}
{}
@@ -27,7 +27,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\providetoggle{annotate}
-\DeclareBiblatexOption{global}[boolean]{annotate}[true]{%
+\DeclareBiblatexOption{entry,global}[boolean]{annotate}[true]{%
\settoggle{annotate}{#1}}%
\DeclareBiblatexOption{global}[boolean]{collsonly}[true]{%
@@ -37,6 +37,10 @@
\AtBeginBibliography{\blx at key@bibcheck{collsonly}}}
{}}
+\providetoggle{dashed}
+\DeclareBiblatexOption{global}[boolean]{dashed}[true]{%
+ \settoggle{dashed}{#1}}%
+
\providetoggle{doi}
\DeclareBiblatexOption{entry,global}[boolean]{doi}[true]{%
\settoggle{doi}{#1}}
@@ -49,9 +53,14 @@
\DeclareBiblatexOption{global}[boolean]{ibid}[true]{%
\ifstrequal{#1}{true}
{\toggletrue{ibid}%
+ \toggletrue{ibidpage}%
\toggletrue{short}}%
{\togglefalse{ibid}}}
+\providetoggle{ibidpage}
+\DeclareBiblatexOption{global}[boolean]{ibidpage}[true]{%
+ \settoggle{ibidpage}{#1}}%
+
\providetoggle{isbn}
\DeclareBiblatexOption{entry,global}[boolean]{isbn}[true]{%
\settoggle{isbn}{#1}}%
@@ -179,6 +188,7 @@
autopunct=true,
block=none,
citetracker=context,
+ dashed=true,
date=long,
dateabbrev=false,
dateusetime=true,
@@ -438,9 +448,6 @@
\DeclareDataInheritance{*}{incollection,inbook,letter,review}{%
\inherit[override=true]{titlekey}{booktitlekey}
\inherit[override=true]{booktitlekey}{bookbooktitlekey}
- \inherit{author}{bookauthor}
- \inherit{authortype}{bookauthortype}
- \inherit{shortauthor}{shortbookauthor}
\inherit[override=true]{editor}{editora}
\inherit[override=true]{editora}{editorb}
\inherit[override=true]{editorb}{editorc}
@@ -447,16 +454,21 @@
\inherit[override=true]{editortype}{editoratype}
\inherit[override=true]{editoratype}{editorbtype}
\inherit[override=true]{editorbtype}{editorctype}
+ \inherit[override=true]{translatortype}{translatoratype}
+ \inherit[override=true]{translatoratype}{translatorbtype}
+ \inherit{author}{bookauthor}
+ \inherit{authortype}{bookauthortype}
+ \inherit{shortauthor}{shortbookauthor}
\inherit{editoraddon}{editoraaddon}
\inherit{translator}{translatora}
\inherit{translatora}{translatorb}
- \inherit[override=true]{translatortype}{translatoratype}
- \inherit[override=true]{translatoratype}{translatorbtype}
\inherit{title}{booktitle}
+ \inherit{booktitle}{bookbooktitle}
\inherit{subtitle}{booksubtitle}
+ \inherit{booksubtitle}{bookbooksubtitle}
\inherit{titleaddon}{booktitleaddon}
+ \inherit{booktitleaddon}{bookbooktitleaddon}
\inherit{shorttitle}{shortbooktitle}
- \inherit{booktitle}{bookbooktitle}
\inherit{volume}{bookvolume}
\inherit{bookvolume}{bookbookvolume}
\inherit{options}{options}}
@@ -494,7 +506,6 @@
\let\pluga\empty
\let\plugb\empty
\let\xtitle\empty
-\let\xvolume\empty
\let\xeditor\empty
\let\yeditor\empty
@@ -596,26 +607,37 @@
\ifuseprefix
{\usebibmacro{name:delim}{#3#1}%
\usebibmacro{name:hook}{#3#1}%
- \ifdefvoid{#3}{}{%
- \ifcapital
- {\mkbibnameprefix{\MakeCapital{#3}}\isdot}
- {\mkbibnameprefix{#3}\isdot}%
- \ifprefchar{}{\bibnamedelimc}}%
- \mkbibnamefamily{#1}\isdot
- \ifdefvoid{#4}{}{\bibnamedelimd\mkbibnamesuffix{#4}\isdot}%
- \ifdefvoid{#2}{}{\revsdnamepunct\bibnamedelimd\mkbibnamegiven{#2}\isdot}}
+ \mkbibcompletenamefamilygiven{%
+ \ifdefvoid{#3}
+ {}
+ {\ifcapital
+ {\mkbibnameprefix{\MakeCapital{#3}}\isdot}%
+ {\mkbibnameprefix{#3}\isdot}%
+ \ifprefchar{}{\bibnamedelimc}}%
+ \mkbibnamefamily{#1}\isdot
+ \ifdefvoid{#4}
+ {}
+ {\bibnamedelimd\mkbibnamesuffix{#4}\isdot}%
+ \ifdefvoid{#2}
+ {}
+ {\revsdnamepunct\bibnamedelimd\mkbibnamegiven{#2}\isdot}}}
{\usebibmacro{name:delim}{#1}%
\usebibmacro{name:hook}{#1}%
- \mkbibnamefamily{#1}\isdot
- \ifboolexpe{%
- test {\ifdefvoid{#2}}
- and
- test {\ifdefvoid{#3}}}
- {}
- {\revsdnamepunct}%
- \ifdefvoid{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}\isdot}%
- \ifdefvoid{#3}{}{\bibnamedelimd\mkbibnameprefix{#3}\isdot}%
- \ifdefvoid{#4}{}{\revsdnamepunct\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}}
+ \mkbibcompletenamefamilygiven{%
+ \mkbibnamefamily{#1}\isdot
+ \ifboolexpe{ test {\ifdefvoid{#2}}
+ and test {\ifdefvoid{#3}}}
+ {}
+ {\revsdnamepunct}%
+ \ifdefvoid{#2}
+ {}
+ {\bibnamedelimd\mkbibnamegiven{#2}\isdot}%
+ \ifdefvoid{#3}
+ {}
+ {\bibnamedelimd\mkbibnameprefix{#3}\isdot}%
+ \ifdefvoid{#4}
+ {}
+ {\revsdnamepunct\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}}}
\renewcommand*{\mkbibindexname}[4]{%
\ifuseprefix
@@ -623,16 +645,15 @@
\@firstofone #1% remove spurious braces
\ifdefvoid{#4}{}{ #4}%
\ifdefvoid{#2}{}{, #2}%
- \actualoperator
- \ifdefvoid{#3}{}{\MakeCapital{#3} }%
- #1%
- \ifdefvoid{#4}{}{ #4}%
- \ifdefvoid{#2}{}{, #2}}
+ \ifdefvoid{#3}{}{%
+ \actualoperator
+ \MakeCapital{#3} %
+ #1%
+ \ifdefvoid{#4}{}{ #4}%
+ \ifdefvoid{#2}{}{, #2}}}
{\@firstofone #1% remove spurious braces
- \ifboolexpe{%
- test {\ifdefvoid{#2}}
- and
- test {\ifdefvoid{#3}}}
+ \ifboolexpe{test {\ifdefvoid{#2}}
+ and test {\ifdefvoid{#3}}}
{}
{,}%
\ifdefvoid{#2}{}{ #2}%
@@ -814,36 +835,29 @@
{}
{\ifboolexpr{ togl {collection:ib}
and togl {swapvol}}
- {\usebibmacro{bookauthor+namelist}}%
+ {\usebibmacro{author+namelist}{bookauthor}}%
{\ifnameundef{author}
- {\usebibmacro{bookauthor+namelist}}%
- {\usebibmacro{author+namelist}}}}}
+ {\usebibmacro{author+namelist}{bookauthor}}%
+ {\usebibmacro{author+namelist}{author}}}}}
-\newbibmacro*{author+namelist}{%
- \ifboolexpr{ test {\ifnameundef{shortauthor}}
+\newbibmacro*{author+namelist}[1]{%
+ \ifboolexpr{ test {\ifnameundef{short#1}}
or togl {cbx:first}
or togl {bibliography}}
- {\renewcommand*{\cbx at namelist}{author}}%
- {\renewcommand*{\cbx at namelist}{shortauthor}}%
- \usebibmacro{author+bookauthor+type}}%
+ {\renewcommand*{\cbx at namelist}{#1}}%
+ {\renewcommand*{\cbx at namelist}{short#1}}%
+ \usebibmacro{author+type}{#1}}%
-\newbibmacro*{bookauthor+namelist}{%
- \ifboolexpr{ test {\ifnameundef{shortbookauthor}}
- or togl {bibliography}}
- {\renewcommand*{\cbx at namelist}{bookauthor}}%
- {\renewcommand*{\cbx at namelist}{shortbookauthor}}%
- \usebibmacro{author+bookauthor+type}}%
-
-\newbibmacro*{author+bookauthor+type}{%
- \iffieldundef{\cbx at namelist type}
+\newbibmacro*{author+type}[1]{%
+ \iffieldundef{#1type}
{}
- {\iffieldequalstr{\cbx at namelist type}{anon}
+ {\iffieldequalstr{#1type}{anon}
{\renewcommand*{\anona}{\bibopenbracket}%
\renewcommand*{\anonb}{\bibclosebracket}}%
- {\iffieldequalstr{\cbx at namelist type}{anon?}
+ {\iffieldequalstr{#1type}{anon?}
{\renewcommand*{\anona}{\bibopenbracket}%
\renewcommand*{\anonb}{\addquestion\bibclosebracket}}%
- {\ifboolexpr{ test {\iffieldequalstr{\cbx at namelist type}{pseudo}}
+ {\ifboolexpr{ test {\iffieldequalstr{#1type}{pseudo}}
and not togl {cbx:short}}
{\renewcommand*{\anonb}{\space\mkbibbrackets{\bibstring{pseudo}}}}
{}}}}}
@@ -1283,7 +1297,8 @@
\newbibmacro*{printnames+etc}{%
\ifboolexpr{ togl {authposition}
- and togl {bibliography}}
+ and togl {bibliography}
+ and togl {dashed}}
{\usebibmacro{bibnamedash+printnames}}%
{\usebibmacro{printnames}}%
\usebibmacro{handle}%
@@ -1308,8 +1323,8 @@
\newbibmacro*{printnames}{%
\ifnameundef{\cbx at namelist}
{}
- {\anona\pluga\printnames[\cbx at deflabel]{%
- \cbx at namelist}\plugb\anonb}}%
+ {\pluga\anona\printnames[\cbx at deflabel]{%
+ \cbx at namelist}\anonb\plugb}}%
% A screen name precedes 'nameaddon' and can be omitted from short
% citations. See CMOS, 17th ed., 14.209.
@@ -1359,82 +1374,63 @@
\renewcommand*{\subtitlepunct}{\ifterm{\space}{:\space}}%
-\newbibmacro*{longtitle+titleaddon}{%
- \iffieldundef{\xtitle title}
+\newbibmacro*{title+labeldate}{%
+ \usebibmacro{title+titleaddon}{}%
+ \iftoggle{bibliography}
+ {\usebibmacro{b:labeldate+extradate}}%
+ {}}
+
+\newbibmacro*{title+titleaddon}[1]{%
+ \iffieldundef{#1title}
{}
- {\iftoggle{shortlinks}
- {\togglefalse{shortlinks}%
- \printtext[bibhyperref]{\usebibmacro{longtitle}}}
- {\usebibmacro{longtitle}}%
- \usebibmacro{titleaddon}%
- \usebibmacro{test:titledupes}%
- \clearfield{\xtitle title}}}% test
+ {\renewcommand*{\xtitle}{#1}%
+ \iftoggle{shortlinks}
+ {\printtext[bibhyperref]{%
+ \usebibmacro{title+subtitle}{#1}}}
+ {\usebibmacro{title+subtitle}{#1}}%
+ \usebibmacro{titleaddon}{#1}%
+ \clearfield{#1title}}}
-\newbibmacro*{longtitle}{%
- \printtext[\xtitle title]{%
- \printfield[noformat]{\xtitle title}%
- \iffieldundef{\xtitle subtitle}
+\newbibmacro*{title+subtitle}[1]{%
+ \printtext[#1title]{%
+ \printfield[noformat]{#1title}%
+ \iffieldundef{#1subtitle}
{}
{\subtitlepunct
- \printfield[noformat]{\xtitle subtitle}}%
+ \printfield[noformat]{#1subtitle}}%
\isdot}}%
-\newbibmacro*{test:titledupes}{%
- \iffieldsequal{title}{booktitle}
- {\ifboolexpr{ test {\iffieldundef{subtitle}}
- or test {\iffieldsequal{subtitle}{booksubtitle}}}
- {\clearfield{booktitle}}%
- {}}% test
- {}}% test
-
-\newbibmacro*{titleaddon}{%
- \iffieldundef{\xtitle titleaddon}
+\newbibmacro*{titleaddon}[1]{%
+ \iffieldundef{#1titleaddon}
{}
{\addspace% '\space' has issues with quotation marks
- \printfield{\xtitle titleaddon}}}
+ \printfield{#1titleaddon}}}
-\newbibmacro*{title+labelyear}{%
- \iftoggle{bibliography}
- {\usebibmacro{longtitle+titleaddon}%
- \usebibmacro{b:labeldate+extradate}}%
- {\ifboolexpr{ test \ifciteseen
- or togl {shortfirst}}
- {\iftoggle{shortlinks}
- {\printtext[bibhyperref]{\usebibmacro{shorttitle}}}
- {\usebibmacro{shorttitle}}}
- {\usebibmacro{longtitle+titleaddon}}}}
+\newbibmacro*{shorttitle+shortlinks}{%
+ \iftoggle{shortlinks}
+ {\printtext[bibhyperref]{\usebibmacro{shorttitle+crossref}{}}}
+ {\usebibmacro{shorttitle+crossref}{}}}
-\newbibmacro*{shorttitle}{%
- \ifboolexpr{ togl {collection:bk}
+\newbibmacro*{shorttitle+crossref}[1]{%
+ \ifboolexpr{ togl {collection:#1bk}
and togl {swapvol}}
- {\iffieldundef{shortmaintitle}
- {\printfield[title]{maintitle}\isdot}%
- {\printfield[title]{shortmaintitle}\isdot}}%
- {\ifboolexpr{ togl {collection:ib}
+ {\usebibmacro{shorttitle}{main}}%
+ {\ifboolexpr{ togl {collection:#1ib}
and togl {swapvol}}
- {\iffieldundef{shortbooktitle}
- {\printfield[title]{booktitle}\isdot}%
- {\printfield[title]{shortbooktitle}\isdot}}%
- {\printfield[\thefield{entrytype}]{labeltitle}\isdot}}}
+ {\usebibmacro{shorttitle}{book}}%
+ {\usebibmacro{shorttitle}{label}}}}
-\newbibmacro*{shorttitle+crossref}{%
- \ifboolexpr{ togl {collection:icbk}
- and togl {swapvol}}
- {\iffieldundef{shortmaintitle}
- {\printfield[title]{maintitle}\isdot}%
- {\printfield[title]{shortmaintitle}\isdot}}%
- {\ifboolexpr{ togl {collection:icib}
- and togl {swapvol}}
- {\iffieldundef{shortbooktitle}
- {\printfield[title]{booktitle}\isdot}%
- {\printfield[title]{shortbooktitle}\isdot}}%
- {\printfield[\thefield{entrytype}]{labeltitle}\isdot}}}
+\newbibmacro*{shorttitle}[1]{%
+ \ifstrequal{#1}{label}
+ {\printfield[\thefield{entrytype}]{labeltitle}\isdot}%
+ {\iffieldundef{short#1title}
+ {\printfield[#1title]{#1title}\isdot}%
+ {\printfield[#1title]{short#1title}\isdot}}}
\renewbibmacro*{booktitle}{%
\iffieldundef{booktitle}
{}
- {\renewcommand*{\xtitle}{book}%
- \usebibmacro{longtitle+titleaddon}%
+ {\usebibmacro{title+titleaddon}{book}%
\usebibmacro{bybookauthor+pages}}}
\newbibmacro*{bookbooktitle}[1]{%
@@ -1443,15 +1439,8 @@
{\ifstrequal{#1}{in}
{\newunit\bibstring{in}\space}%
{}% needs '%'
- \renewcommand*{\xtitle}{bookbook}%
- \usebibmacro{longtitle+titleaddon}}}
+ \usebibmacro{title+titleaddon}{bookbook}}}
-\renewbibmacro*{maintitle}{%
- \iffieldundef{maintitle}
- {}
- {\renewcommand*{\xtitle}{main}%
- \usebibmacro{longtitle+titleaddon}}}
-
\newbibmacro*{issuetitle}{%
\iffieldundef{issuetitle}
{}
@@ -1458,8 +1447,7 @@
{\iffieldequalstr{issuetitle}{special issue}
{}
{\bibstring{in}\space
- \renewcommand*{\xtitle}{issue}%
- \usebibmacro{longtitle+titleaddon}%
+ \usebibmacro{title+titleaddon}{issue}%
\usebibmacro{editors:c}{issuetitle}}%
\newunit\bibstring{special}%
\setunit{\addcomma\space}}}
@@ -1470,8 +1458,7 @@
{\newunit
\bibstring{origpub}%
\space
- \renewcommand*{\xtitle}{orig}%
- \usebibmacro{longtitle+titleaddon}%
+ \usebibmacro{title+titleaddon}{orig}%
\setunit{\addspace}% not '\setunit{\space}'
\printtext[parens]{%
\usebibmacro{origlocation}%
@@ -1844,7 +1831,7 @@
\DeclareBibliographyDriver{misc}{%
\usebibmacro{bibindex}%
\usebibmacro{author+bookauthor+etc}%
- \usebibmacro{title+labelyear}%
+ \usebibmacro{title+labeldate}%
\newunit
\printfield{userb}%
\usebibmacro{doi+finentry+etc}}%
@@ -1902,7 +1889,7 @@
\newbibmacro*{author+title+etc}{%
\usebibmacro{author+bookauthor+etc}%
- \usebibmacro{title+labelyear}%
+ \usebibmacro{title+labeldate}%
\usebibmacro{note}%
\usebibmacro{editors:b}}%
@@ -1910,8 +1897,7 @@
\newunit
\usebibmacro{part}%
\usebibmacro{issuetitle}%
- \renewcommand*{\xtitle}{journal}%
- \usebibmacro{longtitle+titleaddon}%
+ \usebibmacro{title+titleaddon}{journal}%
\usebibmacro{journallocation}%
\usebibmacro{journalseries}%
\usebibmacro{volume}%
@@ -1960,20 +1946,19 @@
\ifboolexpr{ togl {collection:bk}
and togl {swapvol}}
{\usebibmacro{maintitle+note+etc}%
- \usebibmacro{volume+number+etc}%
- \let\xtitle\empty
- \usebibmacro{longtitle+titleaddon}%
+ \usebibmacro{volume+number+etc}{}%
+ \usebibmacro{title+titleaddon}{}%
\toggletrue{edshift}%
\usebibmacro{byauthor}%
\usebibmacro{editors:b}%
- \usebibmacro{volumes+bookseries+etc}}%
- {\usebibmacro{title+labelyear}%
+ \usebibmacro{volumes+bookseries+etc}{}}%
+ {\usebibmacro{title+labeldate}{}%
\usebibmacro{byauthor}%
\iffieldundef{maintitle}
{\usebibmacro{note+edition+etc}%
- \usebibmacro{volumes+bookseries+etc}}%
+ \usebibmacro{volumes+bookseries+etc}{}}%
{\usebibmacro{editors:b}%
- \usebibmacro{volumes+bookseries+etc}%
+ \usebibmacro{volumes+bookseries+etc}{}%
\usebibmacro{maintitle+note+etc}}}
\usebibmacro{date+loc+etc}%
\usebibmacro{origtitle}}%
@@ -1994,7 +1979,7 @@
and not togl {collection:icib}}
{\usebibmacro{booktitle}%
\usebibmacro{editors:b}}%
- {\usebibmacro{title+labelyear}%
+ {\usebibmacro{title+labeldate}%
\usebibmacro{byauthor}%
\usebibmacro{editors:b}%
\usebibmacro{chapter+in}}}}
@@ -2007,7 +1992,7 @@
{\usebibmacro{incollections}}%
{\xifinlist{\thefield{crossref}}{\crossreflist}
{\ifnumgreater{\value{\thefield{crossref}}}{0}
- {\usebibmacro{crossref}%
+ {\usebibmacro{crossref+entrydata}%
\usebibmacro{pages}}%
{\usebibmacro{incollections}}}
{\listxadd{\crossreflist}{\thefield{crossref}}%
@@ -2021,33 +2006,35 @@
and test {\iffieldundef{journaltitle}}
and test {\iflistundef{organization}}}
{}
- {\renewcommand*{\xtitle}{blog}%
- \usebibmacro{longtitle+titleaddon}%
+ {\usebibmacro{title+titleaddon}{blog}%
\newunit
- \renewcommand*{\xtitle}{journal}%
- \usebibmacro{longtitle+titleaddon}%
+ \usebibmacro{title+titleaddon}{journal}%
\newunit
\printlist{organization}%
\setunit{\addcomma\space}}}
\newbibmacro*{reviews}{%
- \ifboolexpr{ test {\ifnameundef{author}}
- and not test {\ifnameundef{bookauthor}}}
- {\savename{bookauthor}{\reviewee}%
- \clearname{bookauthor}}%
- {\let\reviewee\empty}%
- \usebibmacro{author+bookauthor+etc}%
- \iffieldundef{title}
- {}
- {\usebibmacro{title+labelyear}%
- \newunit}%
+ \iftoggle{noauth}
+ {\bibsentence}%
+ {\usebibmacro{author+bookauthor+etc}}%
+ \usebibmacro{title+labeldate}%
\usebibmacro{note}%
- \usebibmacro{review+title}%
+ \newunit
+ \iftoggle{newauth}
+ {\bibstring{reviewnoauth}}%
+ {\bibstring{review}}%
+ \setunit{\space}%
+ \iffieldundef{crossref}
+ {\usebibmacro{title+titleaddon}{book}}%
+ {\entrydata{\thefield{crossref}}{%
+ {\usebibmacro{title+titleaddon}{}}}}
\setunit{\addcomma\space}%
- \iftoggle{shortfirst}
- {}
- {\toggletrue{edshift}%
- \usebibmacro{editors:b}}}
+ \renewcommand*{\pluga}{\bibstring{by}\space}%
+ \renewcommand*{\cbx at namelist}{bookauthor}%
+ \usebibmacro{printnames+etc}%
+ \setunit{\addcomma\space}%
+ \toggletrue{edshift}%
+ \usebibmacro{editors:b}}%
\newbibmacro*{inst+loc+date}{%
\usebibmacro{thesis+type}%
@@ -2212,24 +2199,26 @@
{}}}
\newbibmacro*{maintitle+note+etc}{%
- \usebibmacro{maintitle}%
- \usebibmacro{note}%
- \usebibmacro{edition}{}%
- \usebibmacro{editors:c}{maintitle}}%
+ \iffieldundef{maintitle}
+ {}
+ {\usebibmacro{title+titleaddon}{main}%
+ \usebibmacro{note}%
+ \usebibmacro{edition}{}%
+ \usebibmacro{editors:c}{maintitle}}}
-\newbibmacro*{volume+number+etc}{%
- \iffieldundef{\xvolume volume}
+\newbibmacro*{volume+number+etc}[1]{%
+ \iffieldundef{#1volume}
{}
{\usebibmacro{swapvol+pages}%
\iffieldundef{series}
{\newunit}%
{\setunit{\addcomma\space}}%
- \iffieldnum{\xvolume volume}
- {\printfield[volume]{\xvolume volume}%
+ \iffieldnum{#1volume}
+ {\printfield[volume]{#1volume}%
\usebibmacro{volume:number}}%
{\bibstring{volumes}\space
- \printfield[noformat]{\xvolume volume}}%
- \clearfield{\xvolume volume}%
+ \printfield[noformat]{#1volume}}%
+ \clearfield{#1volume}%
\usebibmacro{part}%
\iftoggle{collection}
{\iftoggle{swapvol}
@@ -2248,13 +2237,14 @@
\setunit{\addcomma\space}\bibstring{by}\space}}%
{\renewcommand*{\pluga}{\newunit\bibstring{by}\space}}%
\renewcommand*{\cbx at namelist}{author}%
+ \usebibmacro{author+type}{author}%
\usebibmacro{printnames+etc}}}
-\newbibmacro*{volumes+bookseries+etc}{%
+\newbibmacro*{volumes+bookseries+etc}[1]{%
\usebibmacro{volumes}%
\usebibmacro{bookseries}%
\usebibmacro{pages}%
- \usebibmacro{volume+number+etc}%
+ \usebibmacro{volume+number+etc}{#1}%
\usebibmacro{book:number}%
\usebibmacro{part}}%
@@ -2307,6 +2297,7 @@
{\renewcommand*{\pluga}{%
\setunit{\addcomma\space}\bibstring{by}\space}%
\renewcommand*{\cbx at namelist}{bookauthor}%
+ \usebibmacro{author+type}{bookauthor}%
\usebibmacro{printnames+etc}%
\usebibmacro{pages}}}
@@ -2331,14 +2322,13 @@
\usebibmacro{note+edition+etc}%
\iffieldundef{volume}
{\iffieldundef{bookvolume}%
- {\renewcommand*{\xvolume}{bookbook}}%
- {\renewcommand*{\xvolume}{book}}%
- \usebibmacro{volumes+bookseries+etc}}%
- {\usebibmacro{volumes+bookseries+etc}}}}
+ {\usebibmacro{volumes+bookseries+etc}{bookbook}}%
+ {\usebibmacro{volumes+bookseries+etc}{book}}}
+ {\usebibmacro{volumes+bookseries+etc}{}}}}
\usebibmacro{date+loc+etc}%
\usebibmacro{origtitle}}%
-\newbibmacro*{crossref}{%
+\newbibmacro*{crossref+entrydata}{%
\renewcommand*{\cbx at deflabel}{labelname}%
\global\toggletrue{cbx:short}%
\entrydata{\thefield{crossref}}{%
@@ -2346,7 +2336,7 @@
and togl {reflist}}
{\usebibmacro{parencite:new}}%
{\usebibmacro{author+bookauthor+etc}%
- \usebibmacro{shorttitle+crossref}}%
+ \usebibmacro{shorttitle+crossref}{ic}}%
\usebibmacro{cite:volume}}}
\newbibmacro*{pages}{%
@@ -2359,23 +2349,6 @@
\togglefalse{edshift}}%
{}}}
-\newbibmacro*{review+title}{%
- \iftoggle{newauth}
- {\bibcpstring{reviewnoauth}}%
- {\bibstring{review}}%
- \space
- \renewcommand*{\xtitle}{book}%
- \usebibmacro{title+labelyear}%
- \iftoggle{shortfirst}
- {\clearfield{booktitle}}%
- {\setunit{\addcomma\space}%
- \ifdefempty{\reviewee}
- {}
- {\restorename{bookauthor}{\reviewee}}%
- \renewcommand*{\pluga}{\bibstring{by}\space}%
- \renewcommand*{\cbx at namelist}{bookauthor}%
- \usebibmacro{printnames+etc}}}
-
\newbibmacro*{thesis+type}{%
\ifentrytype{mathesis}
{\bibstring{mathesis}%
@@ -2518,17 +2491,16 @@
\iftoggle{swapvol}
{\usebibmacro{note}%
\usebibmacro{edition}{}%
- \usebibmacro{volumes+bookseries+etc}%
- \let\xtitle\empty
- \usebibmacro{longtitle+titleaddon}%
+ \usebibmacro{volumes+bookseries+etc}{}%
+ \usebibmacro{title+titleaddon}{}%
\toggletrue{edshift}%
\usebibmacro{byauthor}%
\usebibmacro{editors:b}}%
- {\usebibmacro{volume+number+etc}%
+ {\usebibmacro{volume+number+etc}{}%
\toggletrue{edshift}%
\usebibmacro{booktitle}%
\usebibmacro{note+edition+etc}%
- \usebibmacro{volumes+bookseries+etc}}}
+ \usebibmacro{volumes+bookseries+etc}{}}}
\newbibmacro*{incollections:ic}{%
\iftoggle{swapvol}
@@ -2537,8 +2509,7 @@
{\usebibmacro{bookbooktitle}{}%
\toggletrue{edshift}%
\usebibmacro{note+edition+etc}}%
- \renewcommand*{\xvolume}{book}%
- \usebibmacro{volumes+bookseries+etc}%
+ \usebibmacro{volumes+bookseries+etc}{book}%
\toggletrue{edshift}%
\usebibmacro{booktitle}%
\usebibmacro{editors:b}}%
@@ -2545,14 +2516,12 @@
{\toggletrue{edshift}%
\usebibmacro{booktitle}%
\usebibmacro{editors:b}%
- \renewcommand*{\xvolume}{book}%
- \usebibmacro{volume+number+etc}%
+ \usebibmacro{volume+number+etc}{book}%
\iftoggle{collection:icbk}
{\usebibmacro{maintitle+note+etc}}%
{\usebibmacro{bookbooktitle}{}%
\toggletrue{edshift}%
\usebibmacro{note+edition+etc}}%
- \renewcommand*{\xvolume}{book}%
- \usebibmacro{volumes+bookseries+etc}}}
+ \usebibmacro{volumes+bookseries+etc}{book}}}
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/windycity/windycity.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/windycity/windycity.cbx 2021-07-08 20:40:01 UTC (rev 59875)
+++ trunk/Master/texmf-dist/tex/latex/windycity/windycity.cbx 2021-07-08 20:41:42 UTC (rev 59876)
@@ -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,7 +307,7 @@
\ifnameundef{author}
{\bibcpstring{reviewnoauth}%
\space
- \usebibmacro{title+labelyear}}%
+ \usebibmacro{shorttitle+shortlinks}}%
{\usebibmacro{author+bookauthor+etc}}%
\usebibmacro{cite:volume}}%
@@ -313,9 +314,12 @@
\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 at 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}%
Modified: trunk/Master/texmf-dist/tex/latex/windycity/windycity.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/windycity/windycity.dbx 2021-07-08 20:40:01 UTC (rev 59875)
+++ trunk/Master/texmf-dist/tex/latex/windycity/windycity.dbx 2021-07-08 20:41:42 UTC (rev 59876)
@@ -1,4 +1,4 @@
-\ProvidesFile{windycity.dbx}[2021/05/02 Windy City data model file for
+\ProvidesFile{windycity.dbx}[2021/07/07 Windy City data model file for
biblatex]
\DeclareDatamodelFields[type=field,datatype=literal]{%
blogsubtitle,
@@ -6,6 +6,8 @@
blogtitleaddon,
bookauthortype,
bookbooktitle,
+ bookbooksubtitle,
+ bookbooktitleaddon,
bookvolume,
bookbookvolume,
booktitlekey,
More information about the tex-live-commits
mailing list.