texlive[56297] Master/texmf-dist: windycity (8sep20)
commits+karl at tug.org
commits+karl at tug.org
Tue Sep 8 23:07:25 CEST 2020
Revision: 56297
http://tug.org/svn/texlive?view=revision&revision=56297
Author: karl
Date: 2020-09-08 23:07:25 +0200 (Tue, 08 Sep 2020)
Log Message:
-----------
windycity (8sep20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/windycity/CHANGES.md
trunk/Master/texmf-dist/doc/latex/windycity/README.md
trunk/Master/texmf-dist/doc/latex/windycity/windycity.bib
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
trunk/Master/texmf-dist/tex/latex/windycity/windycity.sty
Modified: trunk/Master/texmf-dist/doc/latex/windycity/CHANGES.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/windycity/CHANGES.md 2020-09-08 21:07:10 UTC (rev 56296)
+++ trunk/Master/texmf-dist/doc/latex/windycity/CHANGES.md 2020-09-08 21:07:25 UTC (rev 56297)
@@ -8,6 +8,43 @@
GitHub](https://github.com/brianchase/windycity "GitHub:
brianchase/windycity").
+## 2020-09-07
+
+* added support for revisers and expanded combinations of editor and
+ translator types:
+
+ - compiled by, comp., comps.
+ - compiled and edited by, comp. and ed., comps. and eds.
+ - compiled and revised by, comp. and rev., comps. and revs.
+ - compiled and translated by, comp. and trans., comps. and trans.
+ - edited by, ed., eds.
+ - edited and compiled by, ed. and comp., eds. and comps.
+ - edited and revised by, ed. and rev., eds. and revs.
+ - edited and translated by, ed. and trans., eds. and trans.
+ - revised by, rev., revs.
+ - revised and compiled by, rev. and comp., revs. and comps.
+ - revised and edited by, rev. and ed., revs. and eds.
+ - revised and translated by, rev. and trans., revs. and trans.
+ - translated by, trans.
+ - translated and compiled by, trans. and comp., trans and comps.
+ - translated and edited by, trans. and ed., trans. and eds.
+ - translated and revised by, trans. and rev., trans. and revs.
+
+* added support for citing prefaces (akin to citing afterwords,
+ forewords, and introductions)
+* fixed placement of `edition` relative to editors, translators, and
+ such
+* fixed short citations of @Review entries failing to print a review's
+ title
+* fixed output of @InReference entries when they cross-reference a
+ previously cited @Reference entry
+* fixed mismatch in output between `@Article` and `@Periodical` entry
+ types
+* fixed `\parencite` failing to print names in `afterwords`,
+ `forewords`, and `introduction` fields
+* fixed printing `transcomp` and `transed` bibstrings when
+ `transcomp+` and `transed+` were needed
+
## 2019-07-17
* fixed always printing the `date` field in an American format, rather
Modified: trunk/Master/texmf-dist/doc/latex/windycity/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/windycity/README.md 2020-09-08 21:07:10 UTC (rev 56296)
+++ trunk/Master/texmf-dist/doc/latex/windycity/README.md 2020-09-08 21:07:25 UTC (rev 56297)
@@ -39,31 +39,13 @@
* [windycity.cbx](https://github.com/brianchase/windycity/blob/master/cbx/windycity.cbx "windycity.cbx")
* [american-windycity.lbx](https://github.com/brianchase/windycity/blob/master/lbx/american-windycity.lbx "american-windycity.lbx")
-If you need to install Windy City on your system, you may copy its
-files to one of several places. One option is to locate
-[biblatex](http://www.ctan.org/pkg/biblatex "biblatex") on your system
-and use its directories:
+If you need to install Windy City on your system, you have several
+options. For a one-off compilation, say, to give Windy City a trial
+run on a single document, you could copy Windy City's files to the
+document's root directory. Beyond that, your best option is to install
+it in your local \path{texmf}. Copy the files to a directory of your
+choosing, then update your \path{texmf} file name database.
-* .../biblatex/[windycity.dbx](https://github.com/brianchase/windycity/blob/master/windycity.dbx "windycity.dbx")
-* .../biblatex/bbx/[windycity.bbx](https://github.com/brianchase/windycity/blob/master/bbx/windycity.bbx "windycity.bbx")
-* .../biblatex/cbx/[windycity.cbx](https://github.com/brianchase/windycity/blob/master/cbx/windycity.cbx "windycity.cbx")
-* .../biblatex/lbx/[american-windycity.lbx](https://github.com/brianchase/windycity/blob/master/lbx/american-windycity.lbx "american-windycity.lbx")
-
-If you prefer not to mix Windy City's files with
-[biblatex](http://www.ctan.org/pkg/biblatex "biblatex")'s, another
-option is to find where your distribution of
-[LaTeX](https://en.wikipedia.org/wiki/LaTeX "LaTeX") keeps
-[biblatex](http://www.ctan.org/pkg/biblatex "biblatex")'s third-party
-style files and proceed accordingly. Yet another option is to install
-Windy City in your local `texmf`. Its location will depend on your
-system and preferences. For a one-off compilation, say, to give Windy
-City a trial run on a single document, you can copy Windy City's files
-to the document's root directory.
-
-After copying the files to one of those places — or another of your
-choosing — remember that for every option but the last (a document's
-root directory), you need to update your `texmf` file name database.
-
To compile a document with Windy City, tell
[biblatex](http://www.ctan.org/pkg/biblatex "biblatex") to load it
with the load-time option `style`:
@@ -77,14 +59,12 @@
For some entries in your bibliography database, you may need to add
fields or make other adjustments to get the right output. But since
-Windy City relies as much as possible on standard
-[BibTeX](http://www.bibtex.org "BibTeX") fields, and secondarily on
-[biblatex](http://www.ctan.org/pkg/biblatex "biblatex") fields, you
-may not need to make major changes. The examples in this document and
-its accompanying bibliography database,
-[windycity.bib](https://github.com/brianchase/windycity/blob/master/doc/windycity.bib
-"windycity.bib"), should serve as a guide for how to manage your input
-for nearly every circumstance that the style is meant to handle.
+Windy City relies as much as possible on standard \BibTeX\ fields, and
+secondarily on \biblatex fields, you may not need to make major
+changes. The examples in this document and its accompanying
+bibliography database, \file{windycity.bib}, should serve as a guide
+for how to manage your input for nearly every circumstance that the
+style is meant to handle.
## License
@@ -100,5 +80,5 @@
## Requirements
-* [biblatex](http://www.ctan.org/pkg/biblatex "biblatex") 3.8 or higher
+* [biblatex](http://www.ctan.org/pkg/biblatex "biblatex") 3.13 or later
Modified: trunk/Master/texmf-dist/doc/latex/windycity/windycity.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/windycity/windycity.bib 2020-09-08 21:07:10 UTC (rev 56296)
+++ trunk/Master/texmf-dist/doc/latex/windycity/windycity.bib 2020-09-08 21:07:25 UTC (rev 56297)
@@ -14,7 +14,7 @@
% Examples not in CMOS
@Book{doe2010a,
- options = {skipbib},
+ keywords = {notinbib,notinref},
author = {Doe, Jane},
title = {A Book's Title},
editor = {Smith, John},
@@ -24,7 +24,8 @@
year = {2010}
}
@Book{doe2010b,
- options = {skipbib,swaptrans},
+ keywords = {notinbib,notinref},
+ options = {swaptrans},
author = {Doe, Jane},
title = {A Book's Title},
editor = {Smith, John},
@@ -34,7 +35,7 @@
year = {2010}
}
@Book{smith2002a,
- options = {skipbib},
+ keywords = {notinbib,notinref},
title = {A Book's Title},
editor = {Smith, John},
translator = {Doe, Jane},
@@ -43,7 +44,8 @@
year = {2002}
}
@Book{smith2002b,
- options = {skipbib,swaptrans},
+ keywords = {notinbib,notinref},
+ options = {swaptrans},
title = {A Book's Title},
editor = {Smith, John},
translator = {Doe, Jane},
@@ -556,7 +558,7 @@
year = {2000}
}
@Misc{oflaherty,
- keywords = {notinbib,notinref},% print in example bib only
+ keywords = {notinbib,notinref},
author = {Doniger, Wendy},
sorttitle = {See also},
userb = {\emph{See also} O'Flaherty, Wendy Doniger}
@@ -1014,6 +1016,7 @@
year = {2004}
}
@InCollection{mansfield2000,
+ options = {swaptrans},
introduction = {Mansfield, Harvey, and Delba Winthrop},
pages = {xvii–lxxxvi},
crossref = {tocqueville2000}
@@ -1488,6 +1491,27 @@
addendum = {Distributed by University of Chicago Press}
}
+% 14.142 Publication Date---General
+
+ at Book{chicago2010,
+ author = {{University of Chicago Press}},
+ title = {The Chicago Manual of Style},
+ edition = {16},
+ address = {Chicago},
+ publisher = ucp,
+ year = {2010}
+}
+ at Book{turabian2013,
+ author = {Turabian, Kate L.},
+ title = {A Manual for Writers of Term Papers, Theses, and Dissertations},
+ edition = {8},
+ editor = {Booth, Wayne C. and Colomb, Gregory G. and Williams, Joseph M. and {the University of Chicago Press Staff}},
+ editortype = {reviser},
+ address = {Chicago},
+ publisher = ucp,
+ year = {2013}
+}
+
% 14.144 Multivolume works published over more than one year
% 15.41 Multivolume works published over more than one year
@@ -1519,16 +1543,16 @@
% 14.145 No date of publication
@Book{boston,
- options = {skipbib},
+ keywords = {notinbib,notinref},
address = {Boston}
}
@Book{edinburgh1750,
- options = {skipbib},
+ keywords = {notinbib,notinref},
address = {Edinburgh},
year = {[1750?]}
}
@Book{edinburgh,
- options = {skipbib},
+ keywords = {notinbib,notinref},
address = {Edinburgh},
year = {n.d., ca. 1750}
}
@@ -1536,7 +1560,7 @@
% 14.146 Forthcoming publications
@Book{author,
- keywords = {notinbib,notinref},% print in example bib only
+ keywords = {notinbib,notinref},
author = {Author, Jane Q.},
title = {Book Title},
address = {Place},
@@ -1544,7 +1568,7 @@
year = {forthcoming}
}
@Book{writer,
- keywords = {notinbib,notinref},% print in example bib only
+ keywords = {notinbib,notinref},
author = {Writer, John J.},
title = {Another Book Title},
address = {Place},
@@ -1552,13 +1576,13 @@
year = {forthcoming}
}
@InCollection{contributor,
- keywords = {notinbib,notinref},% print in example bib only
+ keywords = {notinbib,notinref},
author = {Contributor, Anna},
title = {Contribution},
crossref = {editor}
}
@Collection{editor,
- keywords = {notinbib,notinref},% print in example bib only
+ keywords = {notinbib,notinref},
title = {Edited Volume},
editor = {Editor, Ellen},
address = {Place},
@@ -1778,6 +1802,7 @@
volume = {21},
number = {2},
date = {2013-21},
+ pages = {351--81},
url = {https://doi.org/10.1215/10679847-2018283}
}
@@ -2557,7 +2582,7 @@
% 15.44 No date of publication in author-date references
@Book{nano1750,
- keywords = {notinbib,notinref},% print in example bib only
+ keywords = {notinbib,notinref},
author = {Nano, Jasmine L.},
title = {Title of Work\ldots},
year = {[1750?]},
@@ -2564,7 +2589,7 @@
sortyear = {1750}
}
@Book{nano,
- keywords = {notinbib,notinref},% print in example bib only
+ keywords = {notinbib,notinref},
author = {Nano, Jasmine L.},
title = {Title of Another Work\ldots},
sortkey = {nodate}
@@ -2620,14 +2645,25 @@
doi = {https://doi.org/10.1086/680849}
}
-% 15.56 “Quoted in” in author-date references
+% Bibliography 1.2
- at Book{costello1981,
- author = {Costello, Bonnie},
- title = {Marianne Moore},
- subtitle = {Imaginary Possessions},
- address = {Cambridge, MA},
- publisher = {Harvard University Press},
- year = {1981}
+ at Book{fowler1965,
+ author = {Fowler, H. W.},
+ title = {A Dictionary of Modern English Usage},
+ edition = {2},
+ editor = {Gowers, Sir Ernest},
+ editortype = {reved},
+ address = {Oxford},
+ publisher = {Oxford University Press},
+ year = {1965}
}
-
+ at Book{gowers2015,
+ author = {Gowers, Ernest},
+ title = {Plain Words},
+ subtitle = {A Guide to the Use of English},
+ editor = {Gowers, Rebecca},
+ editortype = {revup},
+ address = {London},
+ publisher = {Penguin Books},
+ year = {2015}
+}
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 2020-09-08 21:07:10 UTC (rev 56296)
+++ trunk/Master/texmf-dist/doc/latex/windycity/windycity.tex 2020-09-08 21:07:25 UTC (rev 56297)
@@ -1,4 +1,4 @@
-% Last modified: Wed 17 Jul 2019 09:36:07 AM CDT
+% Last modified: Mon 07 Sep 2020 06:51:00 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-07-17}
+\version{2020-09-07}
\maketitle
\begingroup
\hypersetup{linkcolor=black}
@@ -30,13 +30,13 @@
wide range of citations in different formats and includes a set of
options and commands to support special circumstances. It also has
extensive support for citing and arranging different kinds of editors,
-translators, and compilers within a single citation. These features
-make Windy City especially suitable for academic work.
+translators, compilers, and revisers within a single citation. These
+features make Windy City especially suitable for academic work.
The following sections assume familiarity with \textit{CMOS} and
\biblatex. Section \ref{overview} gives a brief overview of the
style's features. Section \ref{edtrans} discusses the assignment and
-placement of editors, translators, and compilers. Section
+placement of editors, translators, and the like. Section
\ref{collections} discusses several issues with collections, including
options for formatting citations of individual volumes. Sections
\ref{notes} and \ref{paren} reproduce examples from \textit{CMOS}
@@ -43,7 +43,7 @@
Chapters 14 and 15, respectively, with occasional commentary and
references to other sections.
-Windy City requires \biblatex version 3.8 or later.
+Windy City requires \biblatex version 3.13 or later.
\section{Overview}
\label{overview}
@@ -50,10 +50,9 @@
This section covers basic information about Windy City. If you're
completely new to \biblatex, you should probably glance at its
-documentation and try one of the styles that come with it, if only to
-get a sense of the basic commands. For the impatient, examples in
-Sections \ref{default}, \ref{short}, \ref{notes}, and \ref{paren}
-might be of more immediate interest.
+documentation. For the impatient, examples in Sections \ref{default},
+\ref{short}, \ref{notes}, and \ref{paren} might be of more immediate
+interest.
\subsection{Getting Started}
@@ -78,30 +77,13 @@
\item \file{american-windycity.lbx}
\end{itemize}
-\noindent If you need to install Windy City on your system, you may
-copy its files to one of several places. One option is to locate
-\biblatex on your system and use its directories:
+If you need to install Windy City on your system, you have several
+options. For a one-off compilation, say, to give Windy City a trial
+run on a single document, you could copy Windy City's files to the
+document's root directory. Beyond that, your best option is to install
+it in your local \path{texmf}. Copy the files to a directory of your
+choosing, then update your \path{texmf} file name database.
-\begin{itemize}[before=\small,label=]
-\item \ldots\path{/biblatex/windycity.dbx}
-\item \ldots\path{/biblatex/bbx/windycity.bbx}
-\item \ldots\path{/biblatex/cbx/windycity.cbx}
-\item \ldots\path{/biblatex/lbx/american-windycity.lbx}
-\end{itemize}
-
-If you prefer not to mix Windy City's files with \biblatex's, another
-option is to find where your distribution of \LaTeX\ keeps \biblatex's
-third-party style files and proceed accordingly. Yet another option is
-to install Windy City in your local \path{texmf}. Its location will
-depend on your system and preferences. For a one-off compilation, say,
-to give Windy City a trial run on a single document, you can copy
-Windy City's files to the document's root directory.
-
-After copying the files to one of those places---or another of your
-choosing---remember that for every option but the last (a document's
-root directory), you need to update your \path{texmf} file name
-database.
-
To compile a document with Windy City, tell \biblatex to load it with
the load-time option \opt{style}:
@@ -133,10 +115,9 @@
override any other localization files that were loaded. This allows
you to make your own localization files for Windy City without needing
to edit other files. For example, if you load \sty{babel} with option
-\sty{german}, perhaps as the last in a list of languages, Windy City
-will try to load \file{german-windycity.lbx}. If it's available, it
-will override any other localization files that were loaded, including
-\biblatex's own \file{german.lbx}.
+\sty{german}, Windy City will try to load \file{german-windycity.lbx}.
+If it's available, it will override any other localization files that
+were loaded, including \biblatex's own \file{german.lbx}.
For some entries in your bibliography database, you may need to add
fields or make other adjustments to get the right output. But since
@@ -390,10 +371,10 @@
\optitem[false]{firstshort}{\opt{true}, \opt{false}}
-\noindent Use this option to shorten the first citation of each work.
-The resulting format consists mainly of the author's name and the
-work's title. According to \textit{CMOS}, this approach is optional
-for documents with complete bibliographies. (See \textit{CMOS}
+\noindent Use this option to shorten a work's first citation. The
+resulting format consists mainly of the author's name and the work's
+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.) You may use \opt{firstshort} in
conjunction with \opt{ibid}. However, it adds nothing to \opt{short},
which has the same effect on first citations.
@@ -553,8 +534,8 @@
\optitem[false]{skipdate}{\opt{true}, \opt{false}}
\noindent On rare occasions, you may need an entry in a reference list
-to skip the \textit{date} of the author-date format. For examples, see
-Section \ref{entrytypes}.
+to skip the \textit{date} of the author-date format. See Section
+\ref{entrytypes} for examples.
\optitem[false]{swapauth}{\opt{true}, \opt{false}}
@@ -645,19 +626,17 @@
\cmditem{cites*}[prenote][postnote]{key}
-Like \cmd{cites} but, like \cmd{cite*}, suppresses the author's
-position of a note.
+Like \cmd{cites} but suppresses the author's position.
\cmditem{footcite*}[prenote][postnote]{key}
-Like \cmd{footcite} but suppresses the author's position of a note.
+Like \cmd{footcite} but suppresses the author's position.
\cmditem{parencite*}[prenote][postnote]{key}
-Like \cmd{parencite} but suppresses the author's position of a
-parenthetical citation. This is useful in passages where the author
-receives explicit mention. Here's an example from \textit{CMOS}
-\ref{15.25}:
+Like \cmd{parencite} but suppresses the author's position. This is
+useful in passages where the author receives explicit mention. Here's
+an example from \textit{CMOS} \ref{15.25}:
\begin{quote} Fiorina et al. \parencite*{fiorina2005} and Fischer and
Hout \parencite*{fischer2006} reach more or less the same conclusions.
@@ -675,13 +654,11 @@
\cmditem{smartcite*}[prenote][postnote]{key}
-Like \cmd{smartcite} but suppresses the author's position of a
-citation.
+Like \cmd{smartcite} but suppresses the author's position.
\cmditem{smartcites*}[prenote][postnote]{key}
-Like \cmd{smartcites} but, like \cmd{smartcite*}, suppresses the
-author's position of a citation.
+Like \cmd{smartcites} but suppresses the author's position.
\cmditem{textcite}[prenote][postnote]{key}
@@ -708,8 +685,8 @@
\cmditem{textcite*}[prenote][postnote]{key}
-Like \cmd{textcite} but suppresses the author's position of a note, as
-in this passage from \textit{CMOS} 13.65:
+Like \cmd{textcite} but suppresses the author's position, as in this
+passage from \textit{CMOS} 13.65:
\begin{quote} In their introduction to \textcite*{tocqueville1999},
translators Harvey Mansfield and Delba Winthrop write that Tocqueville
@@ -726,13 +703,11 @@
\cmditem{textcites}(multiprenote)(multipostnote)[prenote][postnote]{key}|...|[prenote][postnote]{key}
-Like \cmd{textcite} but for multiple sources in the same way as
-\cmd{cites} and \cmd{smartcites}.
+Like \cmd{textcite} but for multiple sources.
\cmditem{textcites*}(multiprenote)(multipostnote)[prenote][postnote]{key}|...|[prenote][postnote]{key}
-Like \cmd{textcites} but, like \cmd{textcite*}, suppresses the author's
-position of a note.
+Like \cmd{textcites} but suppresses the author's position.
\end{ltxsyntax}
@@ -815,7 +790,7 @@
article from the source.\footnote{Incidentally, reference works don't
always have titles in italics. As a result, you need to handle it in
your bibliography database.} But you could also have a single entry of
-either type with the same data, like this:
+either type with the same data:
\begin{verbatim}
@Reference{salvation1980,
@@ -888,33 +863,31 @@
\ref{collections}.
For more information on entry types---specifically, on the use of
-certain data fields with them---see Section \ref{datafields}.
+certain data fields---see Section \ref{datafields}.
\subsection{Data Fields}
\label{datafields}
-As Windy City has grown to support more citations, it has had to add
-data fields that aren't recognized by \BibTeX\ or \biblatex. It also
-uses some standard ones in perhaps unexpected ways.
+Windy City relies on a small number of data fields that aren't
+recognized by \BibTeX\ or \biblatex. It also uses some standard ones
+in perhaps unexpected ways.
\subsubsection{Additional Data Fields}
\label{datafields}
-Some of Windy City's additional or nonstandard data fields are for its
-internal handling of cross-referencing. Those fields aren't listed
-below, as they're not meant for use in a bibliography database. The
-rest store information that's crucial for correct formatting. Without
-them, quite a few citations in this document wouldn't match their
-counterparts in \textit{CMOS}.
+Some of Windy City's nonstandard data fields are for its internal
+handling of cross-referencing. Those fields aren't listed below, as
+they're not meant for use in a bibliography database. The rest store
+information that's crucial for correct formatting. Without them, quite
+a few citations in this document wouldn't match their counterparts in
+\textit{CMOS}.
\begin{marglist}
\item[\smash{\tshortstack[l]{blogtitle\\blogsubtitle}}] The name of a
-blog goes in \bibfield{blogtitle} and \bibfield{blogsubtitle}. Of
-course, already existing fields would have been preferable for this
-purpose. But since blog posts take the usual \bibfield{title} and
-\bibfield{subtitle}, and since blogs may have host names of different
-sorts, new fields seemed necessary.
+blog goes in \bibfield{blogtitle} and \bibfield{blogsubtitle}. Keep in
+mind that blog posts take the usual \bibfield{title} and
+\bibfield{subtitle} fields.
\item[editoraddon] Use this field to include additional editorial
information about a book. It's available for \bibtype{book},
@@ -936,12 +909,9 @@
\bibfield{series} field.
\item[shortmaintitle] This field is for the short form of a
-\bibfield{maintitle}. Use it in a bibliography database when a work's
-\bibfield{maintitle} may occupy the position of a regular title in a
-short citation and needs a short form. This should only happen with
-certain works in collections. See, for example, the citation of
-\textit{The Complete Tales of Henry James} in Section
-\ref{multivolume}.
+\bibfield{maintitle}. This should only be necessary for certain works
+in collections. See, for example, the citation of \textit{The Complete
+Tales of Henry James} in Section \ref{multivolume}.
\end{marglist}
@@ -957,7 +927,7 @@
number of the edition in this field---for example, \textit{2} for a
second edition. To indicate a revised edition, enter either
\textit{revised} or \textit{rev. ed.} Both options give the same
-output. You may also use the field to indicate a newspaper's edition,
+output. You may also use this field to indicate a newspaper's edition,
such as \textit{Sunday Book Review} (see \textit{CMOS} \ref{14.202}).
\item[issue] Windy City uses this field with the \bibtype{article},
@@ -965,9 +935,8 @@
season of publication (spring, summer, autumn/fall, winter). The
\bibtype{date} field also records seasons---but the value \textit{23},
for the third season, returns \textit{Autumn}. To print \textit{Fall},
-use an \bibfield{issue} field with that value. In other words, for the
-output \textit{Fall 2013}, a work's bibliography database entry should
-contain:
+use the \bibfield{issue} field. In other words, for \textit{Fall
+2013}, a work's bibliography database entry should contain:
\begin{verbatim}
issue = {Fall},
@@ -993,37 +962,37 @@
\item[series] See the comments for \bibfield{seriesaddon} in Section
\ref{datafields}.
-\item[type] With the \bibtype{thesis} entry type, Windy City uses the
-\bibfield{type} field to distinguish a Master's thesis from a PhD
-dissertation. For the latter, \bibtype{type} should have the values
+\item[type] With the \bibtype{thesis} entry type, Windy City uses
+\bibfield{type} to distinguish a Master's thesis from a PhD
+dissertation. For the latter, \bibtype{type} should have the value
\textit{phdthesis} or \textit{PhD diss.} For the former, use
\textit{mathesis} or \textit{master's thesis}. No \bibfield{type}
field is needed for the \bibtype{mathesis} and \bibtype{phdthesis}
entry types.
-In rare cases, the \bibfield{type} field is necessary for the
-\bibtype{article} and \bibtype{review} entry types when a work's
-bibliographic information doesn't allow Windy City to distinguish a
-journal article from a magazine or newspaper article. This happens
-when a magazine or newspaper article has an issue number. Normally,
-Windy City would respond by printing the issue number before the date
-and enclosing the date in parentheses. But the issue number needs to
-go first, and the date shouldn't be in parentheses. The workaround is
-to include a \bibfield{type} field with the value \textit{newsmag}.
-For an example, see \textit{CMOS} \ref{14.204} and compare it with the
-citation of Beattie in \ref{14.171}.
+In rare cases, \bibfield{type} is necessary for the \bibtype{article}
+and \bibtype{review} entry types when a work's bibliographic
+information doesn't allow Windy City to distinguish a journal article
+from a magazine or newspaper article. This happens when a magazine or
+newspaper article has an issue number. Normally, Windy City would
+respond by printing the issue number before the date and enclosing the
+date in parentheses. But the issue number needs to go first, and the
+date shouldn't be in parentheses. The workaround is to include a
+\bibfield{type} field with the value \textit{newsmag}. For an example,
+see \textit{CMOS} \ref{14.204} and compare it with the citation of
+Beattie in \ref{14.171}.
\end{marglist}
-\section{Editors, Translators, and Compilers}
+\section{Editors, Translators, Compilers, and Revisers}
\label{edtrans}
Windy City offers significant control over the handling of editors,
-translators, and compilers. Taking advantage of it, however, may not
+translators, and the like. Taking advantage of it, however, may not
seem intuitive at first. This section covers the options and issues
that you need to grasp in order to master this aspect of the style.
-\subsection{Types of Editors, Translators, and Compilers}
+\subsection{Types of Editors and Translators}
\label{edtransnames}
For the most part, Windy City associates the \bibfield{editor} and
@@ -1030,8 +999,8 @@
\bibfield{translator} fields with the lowest level title within the
scope of an entry. In most cases, then, you can assign editors and
translators simply by adding the \bibfield{editor} and
-\bibfield{translator} fields to a database entry. Below is the entry
-for an example in \textit{CMOS} \ref{14.104}:
+\bibfield{translator} fields to a database entry. The entry below is
+an example from \textit{CMOS} \ref{14.104}:
\begin{verbatim}
@Collection{adorno1999,
@@ -1050,7 +1019,7 @@
\end{citebib}
\noindent When the style processes this entry, it identifies the
-editor and translator of the work with the names, respectively, in the
+editor and translator of the work with the names in the
\bibfield{editor} and \bibfield{translator} fields. Since the entry
doesn't use the \opt{swaptrans} entry option (see Section
\ref{edtranspos}), the resulting output lists the editor and
@@ -1089,7 +1058,7 @@
\bibtype{collection} to \bibtype{incollection}, the association would
change to \textit{The Literature of Harlem}.
-Consider another example, this one an essay in a collection:
+Consider another example:
\begin{citebib}
\item \cite{petrarca1948}
@@ -1113,7 +1082,7 @@
Jr., John Herman},
title = {The Renaissance Philosophy of Man},
address = {Chicago},
- publisher = ucp,
+ publisher = {University of Chicago Press},
year = {1948}
}
\end{verbatim}
@@ -1122,37 +1091,112 @@
scope of \bibtype{collection}, the style associates it with
\textit{The Renaissance Philosophy of Man}.
-Sometimes, you need to designate the role of an editor with the field
-\bibfield{editortype}. The values of \bibfield{editortype} are
-\textit{maintitle}, \textit{series}, \textit{issuetitle}, and
-\textit{compiler}. As for the latter, Windy City treats
-\textit{compiler} as a kind of editor. So, if you need to add a
-compiler to an entry, add the compiler's name to an available field
-for an editor, then add an appropriate \bibfield{editortype} field
-with the value \textit{compiler}. It may help to see the bibliography
-database entry for an example in \textit{CMOS} \ref{14.103}:
+The style supports two other basic editorial roles: compiler and
+reviser. To assign them, you need to use the \bibfield{editortype}
+field. It may help to see the bibliography database entries for
+examples in \textit{CMOS} \ref{14.103} and \ref{14.142}:
\begin{verbatim}
@Book{schechter2011,
- editor = {Schechter, Harold, and Kurt Brown},
- editortype = {compiler},
- title = {Killer Verse},
- subtitle = {Poems of Murder and Mayhem},
- address = {London},
- publisher = {Everyman Paperback Classics},
- year = {2011}
+ editor = {Schechter, Harold, and Kurt Brown},
+ editortype = {compiler},
+ title = {Killer Verse},
+ subtitle = {Poems of Murder and Mayhem},
+ address = {London},
+ publisher = {Everyman Paperback Classics},
+ year = {2011}
}
+ @Book{turabian2013,
+ author = {Turabian, Kate L.},
+ title = {A Manual for Writers of Term Papers, Theses, and
+ Dissertations},
+ edition = {8},
+ editor = {Booth, Wayne C. and Colomb, Gregory G. and
+ Williams, Joseph M. and {the University of Chicago
+ Press Staff}},
+ editortype = {reviser},
+ address = {Chicago},
+ publisher = {University of Chicago Press},
+ year = {2013}
+ }
\end{verbatim}
\begin{citebib}
\item \cite{schechter2011}
+\item \cite{turabian2013}
\end{citebib}
-Follow the same pattern for editors of a \bibfield{maintitle},
-\bibfield{series}, or \bibfield{issuetitle}. Here's an example from
-\textit{CMOS} \ref{14.123}:
+In addition to the four basic roles (editor, translator, compiler, and
+reviser), you may assign names to any pair of them. A work's editor,
+for example, can also be its translator, or compiler, or reviser but
+not also its translator \textit{and} compiler or translator
+\textit{and} reviser, and so on. And just as you can swap the order of
+the editor and translator roles (again, see Section \ref{edtranspos}),
+you can swap the other combinations, say, to identify a work as
+``compiled and edited by'' Jane Doe rather than ``edited and compiled
+by'' her. The output depends on the value of \bibfield{editortype}.
+See Table \ref{table:ed} for a summary.
+\begin{table}[H]
+\caption{} \label{table:ed}
+\begin{tabular}{@{}r l@{}}
+\bibfield{editortype} & Assignment\\
+\toprule
+compiler & compiler\\
+comped & compiler and editor\\
+comprev & compiler and reviser\\
+comptrans & compiler and translator\\
+edcomp & editor and compiler\\
+edrev & editor and reviser\\
+reviser & reviser\\
+revcomp & reviser and compiler\\
+reved & reviser and editor\\
+revtrans & reviser and translator\\
+transcomp & translator and compiler\\
+transrev & translator and reviser\\
+\end{tabular}
+\end{table}
+
+For an example in \textit{CMOS} of a such a dual role, we need turn to
+the bibliography. This will do:
+
\begin{verbatim}
+ @Book{fowler1965,
+ author = {Fowler, H. W.},
+ title = {A Dictionary of Modern English Usage},
+ edition = {2},
+ editor = {Gowers, Sir Ernest},
+ editortype = {reved},
+ address = {Oxford},
+ publisher = {Oxford University Press},
+ year = {1965}
+ }
+\end{verbatim}
+
+\begin{citebib}
+\item \cite{fowler1965}
+\end{citebib}
+
+Try swapping \textit{reved} in the entry above for other values in
+Table \ref{table:ed}. Notice that \textit{edrev} is the reverse of
+\textit{reved}---``edited and revised by'' instead of ``revised and
+edited by.'' Similarly for \textit{comprev} and \textit{revcomp},
+\textit{comptrans} and \textit{transcomp}, and so on.
+
+Missing from the table are \textit{editor}, \textit{translator},
+\textit{edtrans}, and \textit{transed}. Windy City has bibstrings for
+them, too, but they're strictly for the style's internal use. It
+determines which of them applies, if any, based on the contents of the
+\bibfield{editor} and \bibfield{translator} fields and the option
+\opt{swaptrans}. You never need to use them in a bibliography
+database.
+
+Three more values of \bibfield{editortype} allow you to assign editors
+to higher level titles: \textit{maintitle}, \textit{series}, and
+\textit{issuetitle}. Here's an example from \textit{CMOS}
+\ref{14.123}:
+
+\begin{verbatim}
@Book{allen2009,
author = {Allen, Judith A.},
title = {The Feminism of Charlotte Perkins Gilman},
@@ -1161,7 +1205,7 @@
editor = {Stimpson, Catharine R.},
editortype = {series},
address = {Chicago},
- publisher = ucp,
+ publisher = {University of Chicago Press},
year = {2009}
}
\end{verbatim}
@@ -1171,36 +1215,32 @@
\end{citebib}
\noindent If there were no \bibfield{editortype} assigning the editor
-to the series, Windy City would assume that she's the book's editor.
-In short, for a title's compilers and for any title at a higher level
-than the \bibfield{title} field, you need to use
+to the series, Windy City would take her as the book's editor. In
+short, for a title's compilers and revisers and for any title at a
+higher level than \bibfield{title}, you need to use
\bibfield{editortype}. Combined with Windy City's support for citing
articles, chapters, books, and other works within books, this scheme
allows for several sets of editors per work, although it does limit
-you to just one set of compilers.
+you to just one set of compilers and revisers.
-Windy City's support for translators falls between its support for
-editors and compilers. Unless a work's bibliography database entry has
-a \bibfield{translatortype} field with the value \textit{maintitle},
-Windy City associates the names in \bibfield{translator} with the
-entry's lowest level title. (Recall ``The Ascent of Mont Ventoux''
-above.) You should rarely, and perhaps never, need more than one set
-of translators per work. But if you do, Windy City lets you assign as
-many as three, if you cross-reference a work with one set of
-translators to another with two. Does any such work exist? Probably
-not. Anyway, support for it is something of an accident, stemming in
-large part from how the style handles cross-referencing with editors.
+What about translators? Unless a work's bibliography database entry
+has a \bibfield{translatortype} field with the value
+\textit{maintitle}, Windy City associates the names in
+\bibfield{translator} with the entry's lowest level title. (Recall
+``The Ascent of Mont Ventoux'' above.) You should rarely, and perhaps
+never, need more than one set of translators per work. But if you do,
+Windy City lets you assign as many as three---as long as you
+cross-reference a work with one set of translators to another with
+two.
-One complication remains: There are other name lists for editors than
-\bibfield{editor}. There's \bibfield{editora}, \bibfield{editorb}, and
-\bibfield{editorc}.
-
-Reserve \bibfield{editor} for the lowest level title in a bibliography
-database entry. That should be the \bibfield{title} field. The next
-level up, as it were, is for \bibfield{editora}, followed by
-\bibfield{editorb}, and so on. Remember to include the appropriate
-\bibfield{type} field to indicate an editor's role. These fields are
-\bibfield{editortype} (for \bibfield{editor}),
+The style has three other name lists for editors: \bibfield{editora},
+\bibfield{editorb}, and \bibfield{editorc}. If a work has more than
+one set of editors, list editors of the lowest level title in
+\bibfield{editor}. Usually, those are editors of a \bibfield{title}.
+The next level up, as it were, is for \bibfield{editora}, followed by
+\bibfield{editorb}, then \bibfield{editorc}. Remember to include the
+appropriate \bibfield{type} field to indicate an editor's role. These
+fields are \bibfield{editortype} (for \bibfield{editor}),
\bibfield{editoratype} (for \bibfield{editora}),
\bibfield{editorbtype} (for \bibfield{editorb}), and
\bibfield{editorctype} (for \bibfield{editorc}).
@@ -1212,7 +1252,7 @@
\bibfield{maintitle} or some other higher level title, and have an
\bibfield{editora} with no corresponding \bibfield{editoratype}, Windy
City will assume that \bibfield{editora} is the editor of the
-\bibfield{title}. Regardless, the best practice is the follow the rule
+\bibfield{title}. Regardless, the best practice is to the follow the rule
of thumb described above, reserving \bibfield{editor} for
\bibfield{title} and working up from there.
@@ -1423,8 +1463,8 @@
\bibfield{inbook}, \bibfield{incollection}, or \bibfield{letter}
entries when they're cross-referenced to works that are changed by
\opt{swapvol}. They should have their own authors or titles that Windy
-City can use for proper sorting. As for examples, it seems that
-\textit{CMOS} gives exactly one in \ref{14.120}:
+City can use for proper sorting. It seems that \textit{CMOS} gives
+exactly such example one in \ref{14.120}:
\begin{citebib}
\item \cite[169--71]{king2014}
@@ -1442,13 +1482,12 @@
\AtNextBibliography{\toggletrue{swapvol}}
\end{citebib}
-In neither set of examples does Windy City print the volume number
-before the page reference. That's because, with or without
-\opt{swapvol}, the citation is directly to the work's title, not to
-the collection. The same goes for articles, chapters, books, and other
-works of this type. Further, consistent with \textit{CMOS}
-\ref{14.108} and \ref{15.42}, Windy City cross-references previously
-cited volumes.
+In neither case does Windy City print the volume number before the
+page reference. That's because, with or without \opt{swapvol}, the
+citation is directly to the work's title, not to the collection. The
+same goes for articles, chapters, books, and other works of this type.
+Further, consistent with \textit{CMOS} \ref{14.108} and \ref{15.42},
+Windy City cross-references previously cited volumes.
% Due to 'mincrossrefs=2', jones2018 would be added automatically to
% the bibliography at the end of the document because it's referenced
@@ -1549,7 +1588,7 @@
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 enty types are limited to
+\opt{swapvol} also work with it. Those entry types are limited to
\bibtype{bookinbook}, \bibtype{inbook}, \bibtype{incollection}, or
\bibtype{letter}. For the letter cited above:
@@ -1558,7 +1597,6 @@
author = {King, Jr., Martin Luther},
title = {Unpublished letter to the editor of the
\emph{Afro-American} (Washington, DC)},
-% crossref = {carson2014}
crossref = {armstrong2014}
}
\end{verbatim}
@@ -1659,7 +1697,7 @@
title = {The Lisle Letters},
volumes = {6},
address = {Chicago},
- publisher = ucp,
+ publisher = {University of Chicago Press},
year = {1981}
}
\end{verbatim}
@@ -1683,12 +1721,12 @@
\cite[vol. 3, chap. 9]{byrne1981}
\end{verbatim}
-What if you leave the \bibfield{postnote} empty? In that case, Windy
-City assumes that you mean to cite the collection as a whole. As such,
-the first, long citation of the work will print the collection's total
-number of volumes. Subsequent entries will indicate the collection in
-whatever short form corresponds to the preamble options. The following
-shows the default output for two such citations of the collection:
+What if you leave the \bibfield{postnote} empty? Windy City assumes
+that you mean to cite the collection as a whole. As such, the first,
+long citation of the work will print the collection's total number of
+volumes. Subsequent entries will indicate the collection in whatever
+short form corresponds to the preamble options. The following shows
+the default output for two such citations of the collection:
\begin{citeonly}
\item \cite{byrne1981}
@@ -1790,17 +1828,16 @@
\noindent If \bibfield{volume} were within the scope of
\bibfield{spinoza1900.1.1}, Windy City would assume that \textit{A
Theological-Political Treatise} is volume one of \textit{The Chief
-Works of Benedict de Spinoza}, that it's a volume of a collection,
-like other works in this section. The same error would occur if you
-put all the data for the citation into, say, a \bibfield{collection}
-entry. Windy City would associate \bibfield{volume} with
-\bibfield{title}, not with \bibfield{maintitle}. The upshot is that
-correctly citing a work like this requires cross-referencing an
-\bibtype{inbook} or \bibtype{bookinbook} entry to a
-\bibtype{collection}, \bibtype{book}, \bibtype{mvbook}, or
-\bibtype{mvcollection} entry. (Again, the alternatives give the same
-output.) Only then would Windy City associate \bibfield{volume} with
-the right \bibfield{title}.
+Works of Benedict de Spinoza}, that it's a volume of a collection. The
+same error would occur if you put all the data for the citation into,
+say, a \bibfield{collection} entry. Windy City would associate
+\bibfield{volume} with \bibfield{title}, not with
+\bibfield{maintitle}. The upshot is that correctly citing a work like
+this requires cross-referencing an \bibtype{inbook} or
+\bibtype{bookinbook} entry to a \bibtype{collection}, \bibtype{book},
+\bibtype{mvbook}, or \bibtype{mvcollection} entry. (Again, the
+alternatives give the same output.) Only then would Windy City
+associate \bibfield{volume} with the right \bibfield{title}.
\section{Examples from \emph{CMOS} Chap. 14, ``Notes and
Bibliography''}
@@ -2494,10 +2531,10 @@
\subsubsection{No place of publication}
% 14.132 No place of publication
-\begin{citebib}
+\begin{citeonly}
\item \cite{windsor1910}
\item \cite{vliet1890}
-\end{citebib}
+\end{citeonly}
\setcounter{subsubsection}{136}
\subsubsection{Self-published or privately published books}
@@ -2523,6 +2560,17 @@
\item \cite{willke2007}
\end{citebib}
+\subsubsection{Publication Date---General}
+% 14.142 Publication Date---General
+\label{14.142}
+
+\begin{citebib}
+\AtNextCitekey{\clearfield{shorthand}}
+%\item \cite[6.56; cf. 16th ed. (2010), 6.54]{chicago2017}
+\item \cite*[6.56]{chicago2017}; cf. 16th ed. \parencite*{chicago2010}, 6.54.
+\item \cite{turabian2013}
+\end{citebib}
+
\setcounter{subsubsection}{143}
\subsubsection{Multivolume works published over more than one year}
% 14.144 Multivolume works published over more than one year
@@ -2545,11 +2593,9 @@
\subsubsection{No date of publication}
% 14.145 No date of publication
-\begin{citebib}
-\item \cite{boston}
-\item \cite{edinburgh1750}
-\item \cite{edinburgh}
-\end{citebib}
+\begin{bibonly}
+\nocite{boston,edinburgh1750,edinburgh}
+\end{bibonly}
\subsubsection{Forthcoming publications}
% 14.146 Forthcoming publications
@@ -2680,7 +2726,7 @@
% 14.178 Journal special issues
\begin{citebib}
-\item \cite[351--81]{tezuka2013}
+\item \cite{tezuka2013}
\end{citebib}
\setcounter{subsubsection}{179}
Modified: trunk/Master/texmf-dist/tex/latex/windycity/american-windycity.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/windycity/american-windycity.lbx 2020-09-08 21:07:10 UTC (rev 56296)
+++ trunk/Master/texmf-dist/tex/latex/windycity/american-windycity.lbx 2020-09-08 21:07:25 UTC (rev 56297)
@@ -1,7 +1,5 @@
-% Last modified: Wed 17 Jul 2019 09:45:17 AM CDT
+% Last modified: Mon 07 Sep 2020 06:40:46 PM CDT
-% Copyright (c) 2018 Brian Michael Chase.
-%
% Permission is granted to copy, distribute and/or modify this
% software under the terms of the LaTeX Project Public License (LPPL),
% version 1.3.
@@ -13,7 +11,7 @@
% implied warranties of merchantability and fitness for a particular
% purpose.
-\ProvidesFile{american-windycity.lbx}[2019/07/17 Windy City
+\ProvidesFile{american-windycity.lbx}[2020/09/07 Windy City
localization module for biblatex]
\InheritBibliographyExtras{american}
\InheritBibliographyStrings{american}
@@ -121,55 +119,54 @@
}
\NewBibliographyString{by}
-\NewBibliographyString{compiler}
-\NewBibliographyString{compiler+}
-\NewBibliographyString{comptrans}
-\NewBibliographyString{comptrans+}
-\NewBibliographyString{editor+}
-\NewBibliographyString{edtrans}
-\NewBibliographyString{edtrans+}
+\NewBibliographyString{comped,comped+,compiler,compiler+,comprev,comprev+,comptrans,comptrans+}
+\NewBibliographyString{editor+,edcomp,edcomp+,edrev,edrev+,edtrans,edtrans+}
\NewBibliographyString{expanded}
\NewBibliographyString{noplace}
\NewBibliographyString{of}
\NewBibliographyString{origpub}
\NewBibliographyString{part}
+\NewBibliographyString{preface}
+\NewBibliographyString{reprint,reprinted}
+\NewBibliographyString{review,reviewnoauth}
+\NewBibliographyString{revcomp,revcomp+,reved,reved+,reviser,reviser+,revtrans,revtrans+}
\NewBibliographyString{revised}
-\NewBibliographyString{review}
-\NewBibliographyString{reviewnoauth}
-\NewBibliographyString{reprint}
-\NewBibliographyString{reprinted}
\NewBibliographyString{selfpub}
\NewBibliographyString{special}
-\NewBibliographyString{subverbo}
-\NewBibliographyString{subverbos}
-\NewBibliographyString{transcomp}
-\NewBibliographyString{transcomp+}
-\NewBibliographyString{transed}
-\NewBibliographyString{transed+}
+\NewBibliographyString{subverbo,subverbos}
+\NewBibliographyString{transcomp,transcomp+,transed,transed+,translator+,transrev,transrev+}
\DeclareBibliographyStrings{%
am = {{a\adddot m\adddot}{a\adddot m\adddot}},
afterword = {{afterword to}{afterword to}},
andothers = {{et\addabbrvspace al\adddot}{et\addabbrvspace al\adddot}},
+ bibliography = {{Bibliography}{Bibliography}},
by = {{by}{by}},
- bibliography = {{Bibliography}{Bibliography}},
chapter = {{chap\adddot}{chap\adddot}},
citedas = {{hereafter cited as}{hereafter cited as}},
+ comped = {{compiled and edit\-ed by}{comp\adddotspace and ed\adddot}},
+ comped+ = {{compiled and edit\-ed by}{comps\adddotspace and eds\adddot}},
compiler = {{compiled by}{comp\adddot}},
compiler+ = {{compiled by}{comps\adddot}},
+ comprev = {{compiled and revised by}{comp\adddotspace and rev\adddot}},
+ comprev+ = {{compiled and revised by}{comps\adddotspace and revs\adddot}},
comptrans = {{compiled and translated by}{comp\adddotspace and trans\adddot}},
comptrans+ = {{compiled and translated by}{comps\adddotspace and trans\adddot}},
+ edcomp = {{edit\-ed and compiled by}{ed\adddotspace and comp\adddot}},
+ edcomp+ = {{edit\-ed and compiled by}{eds\adddotspace and comps\adddot}},
edition = {{ed\adddot}{ed\adddot}},
editor = {{edit\-ed by}{ed\adddot}},
editor+ = {{edit\-ed by}{eds\adddot}},
+ edrev = {{edit\-ed and revised by}{ed\adddotspace and rev\adddot}},
+ edrev+ = {{edit\-ed and revised by}{eds\adddotspace and revs\adddot}},
edtrans = {{edit\-ed and translated by}{ed\adddotspace and trans\adddot}},
edtrans+ = {{edit\-ed and translated by}{eds\adddotspace and trans\adddot}},
expanded = {{exp\adddotspace ed\adddot}{exp\adddotspace ed\adddot}},
foreword = {{foreword to}{foreword to}},
forthcoming = {{forthcoming}{forthcoming}},
+ ibidem = {{ibid\adddot}{ibid\adddot}},
in = {{in}{in}},
introduction = {{introduction to}{introduction to}},
- ibidem = {{ibid\adddot}{ibid\adddot}},
mathesis = {{master's thesis}{master's thesis}},
nodate = {{\lowercase{n}\adddot d\adddot}{\lowercase{n}\adddot d\adddot}},
noplace = {{N\adddot p\adddot}{n\adddot p\adddot}},
@@ -177,14 +174,24 @@
origpub = {{originally published as}{orig\adddotspace published as}},
page = {{Page}{Page}}, % assures proper case in 'pageref'
pages = {{Pages}{Pages}}, % assures proper case in 'pageref'
+ part = {{pt\adddot}{pt\adddot}},
phdthesis = {{PhD diss\adddot}{PhD diss\adddot}},
pm = {{p\adddot m\adddot}{p\adddot m\adddot}},
+ preface = {{preface to}{preface to}},
references = {{Bibliography}{Bibliography}},
reprint = {{reprint}{repr\adddot}},
reprinted = {{reprinted in}{reprinted in}},
+ reved = {{revised and edit\-ed by}{rev\adddotspace and ed\adddot}},
+ reved+ = {{revised and edit\-ed by}{revs\adddotspace and eds\adddot}},
+ revcomp = {{revised and compiled by}{rev\adddotspace and comp\adddot}},
+ revcomp+ = {{revised and compiled by}{revs\adddotspace and comps\adddot}},
review = {{review of}{review of}},
reviewnoauth = {{unsigned review of}{unsigned review of}},
revised = {{rev\adddotspace ed\adddot}{rev\adddotspace ed\adddot}},
+ reviser = {{revised by}{rev\adddot}},
+ reviser+ = {{revised by}{revs\adddot}},
+ revtrans = {{revised and translated by}{rev\adddotspace and trans\adddot}},
+ revtrans+ = {{revised and translated by}{revs\adddotspace and trans\adddot}},
selfpub = {{Self-published}{self-pub\adddot}},
special = {{special issue}{special issue}},
subverbo = {{s\adddot v\adddot}{s\adddot v\adddot}},
@@ -191,10 +198,12 @@
subverbos = {{s\adddot vv\adddot}{s\adddot vv\adddot}},
transcomp = {{translated and compiled by}{trans\adddotspace and comp\adddot}},
transcomp+ = {{translated and compiled by}{trans\adddotspace and comps\adddot}},
- transed = {{translated and edited by}{trans\adddotspace and ed\adddot}},
- transed+ = {{translated and edited by}{trans\adddotspace and eds\adddot}},
+ transed = {{translated and edit\-ed by}{trans\adddotspace and ed\adddot}},
+ transed+ = {{translated and edit\-ed by}{trans\adddotspace and eds\adddot}},
translator = {{translated by}{trans\adddot}},
- part = {{pt\adddot}{pt\adddot}},
+ translator+ = {{translated by}{trans\adddot}},
+ transrev = {{translated and revised by}{trans\adddotspace and rev\adddot}},
+ transrev+ = {{translated and revised by}{trans\adddotspace and revs\adddot}},
urlseen = {{accessed}{accessed}},
volume = {{vol\adddot}{vol\adddot}},
volumes = {{vols\adddot}{vols\adddot}}
Modified: trunk/Master/texmf-dist/tex/latex/windycity/windycity.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/windycity/windycity.bbx 2020-09-08 21:07:10 UTC (rev 56296)
+++ trunk/Master/texmf-dist/tex/latex/windycity/windycity.bbx 2020-09-08 21:07:25 UTC (rev 56297)
@@ -1,7 +1,5 @@
-% Last modified: Wed 17 Jul 2019 09:44:45 AM CDT
+% Last modified: Mon 07 Sep 2020 06:40:45 PM CDT
-% Copyright (c) 2019 Brian Michael Chase.
-%
% Permission is granted to copy, distribute and/or modify this
% software under the terms of the LaTeX Project Public License (LPPL),
% version 1.3.
@@ -13,13 +11,13 @@
% implied warranties of merchantability and fitness for a particular
% purpose.
-\ProvidesFile{windycity.bbx}[2019/07/17 Windy City bibliography style
+\ProvidesFile{windycity.bbx}[2020/09/07 Windy City bibliography style
for biblatex]
-\@ifpackagelater{biblatex}{2017/11/04}
+\@ifpackagelater{biblatex}{2019/08/17}
{}
{\PackageError{biblatex}
{Outdated 'biblatex' package}
- {Windy City is for biblatex v3.8 and above.\MessageBreak
+ {Windy City is for biblatex v3.13 and above.\MessageBreak
You are using: '\csuse{ver at biblatex.sty}'.\MessageBreak
This is a fatal error. I'm aborting now.}%
\endinput}%
@@ -29,7 +27,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\providetoggle{anonauth}
-\DeclareEntryOption{anonauth}[true]{%
+\DeclareBiblatexOption{entry}[boolean]{anonauth}[true]{%
\ifstrequal{#1}{true}
{\renewcommand*{\anona}{\bibopenbracket}%
\renewcommand*{\anonb}{\bibclosebracket}}%
@@ -36,7 +34,7 @@
{}}
\providetoggle{anonqauth}
-\DeclareEntryOption{anonqauth}[true]{%
+\DeclareBiblatexOption{entry}[boolean]{anonqauth}[true]{%
\ifstrequal{#1}{true}
{\renewcommand*{\anona}{\bibopenbracket}%
\renewcommand*{\anonb}{\addquestion\bibclosebracket}}%
@@ -43,10 +41,10 @@
{}}
\providetoggle{annotate}
-\DeclareBibliographyOption[boolean]{annotate}[true]{%
- \global\settoggle{annotate}{#1}}%
+\DeclareBiblatexOption{global}[boolean]{annotate}[true]{%
+ \settoggle{annotate}{#1}}%
-\DeclareBibliographyOption{collsonly}[true]{%
+\DeclareBiblatexOption{global}[boolean]{collsonly}[true]{%
\ifstrequal{#1}{true}
{\ExecuteBibliographyOptions{mincrossrefs=1}%
\ExecuteBibliographyOptions{minxrefs=1}%
@@ -54,45 +52,41 @@
{}}
\providetoggle{firstshort}
-\DeclareBibliographyOption[boolean]{firstshort}[true]{%
- \global\settoggle{firstshort}{#1}}%
+\DeclareBiblatexOption{global}[boolean]{firstshort}[true]{%
+ \settoggle{firstshort}{#1}}%
\providetoggle{ibid}
-\DeclareBibliographyOption{ibid}[true]{%
+\DeclareBiblatexOption{global}[boolean]{ibid}[true]{%
\ifstrequal{#1}{true}
- {\global\toggletrue{ibid}%
- \global\toggletrue{short}}%
- {\global\togglefalse{ibid}}}
+ {\toggletrue{ibid}%
+ \toggletrue{short}}%
+ {\togglefalse{ibid}}}
\providetoggle{isbn}
-\DeclareBibliographyOption[boolean]{isbn}[true]{%
- \global\settoggle{isbn}{#1}}%
-\DeclareEntryOption[boolean]{isbn}[true]{%
+\DeclareBiblatexOption{entry,global}[boolean]{isbn}[true]{%
\settoggle{isbn}{#1}}%
\providetoggle{library}
-\DeclareBibliographyOption[boolean]{library}[true]{%
- \global\settoggle{library}{#1}}%
-\DeclareEntryOption[boolean]{library}[true]{%
+\DeclareBiblatexOption{entry,global}[boolean]{library}[true]{%
\settoggle{library}{#1}}%
\providetoggle{listvols}
-\DeclareEntryOption[boolean]{listvols}[true]{%
+\DeclareBiblatexOption{entry}[boolean]{listvols}[true]{%
\settoggle{listvols}{#1}}%
\providetoggle{noauth}
-\DeclareEntryOption[boolean]{noauth}[true]{%
+\DeclareBiblatexOption{entry}[boolean]{noauth}[true]{%
\settoggle{noauth}{#1}}%
-\DeclareBibliographyOption{nolos}[true]{%
+\DeclareBiblatexOption{global}[boolean]{nolos}[true]{%
\ifstrequal{#1}{true}
{\AtBeginBibliography{\blx at key@bibcheck{nolos}}}
{}}
\providetoggle{reflist}
-\DeclareBibliographyOption{reflist}[true]{%
+\DeclareBiblatexOption{global}[boolean]{reflist}[true]{%
\ifstrequal{#1}{true}
- {\global\toggletrue{reflist}%
+ {\toggletrue{reflist}%
\DeclareLabeldate{%
\field{date}
\field{year}
@@ -101,31 +95,29 @@
\literal{nodate}}
\ExecuteBibliographyOptions{%
sorting=nyt}}%
- {\global\togglefalse{reflist}}}
+ {\togglefalse{reflist}}}
\providetoggle{short}
-\DeclareBibliographyOption{short}[true]{%
+\DeclareBiblatexOption{global}[boolean]{short}[true]{%
\ifstrequal{#1}{true}
- {\global\toggletrue{short}%
- \global\toggletrue{firstshort}}%
- {\global\togglefalse{short}}}
+ {\toggletrue{short}%
+ \toggletrue{firstshort}}%
+ {\togglefalse{short}}}
\providetoggle{skipdate}
-\DeclareEntryOption[boolean]{skipdate}[true]{%
+\DeclareBiblatexOption{entry}[boolean]{skipdate}[true]{%
\settoggle{skipdate}{#1}}%
\providetoggle{swapauth}
-\DeclareEntryOption[boolean]{swapauth}[true]{%
+\DeclareBiblatexOption{entry}[boolean]{swapauth}[true]{%
\settoggle{swapauth}{#1}}%
\providetoggle{swaptrans}
-\DeclareEntryOption[boolean]{swaptrans}[true]{%
+\DeclareBiblatexOption{entry}[boolean]{swaptrans}[true]{%
\settoggle{swaptrans}{#1}}%
\providetoggle{swapvol}
-\DeclareBibliographyOption[boolean]{swapvol}[true]{%
- \global\settoggle{swapvol}{#1}}%
-\DeclareEntryOption[boolean]{swapvol}[true]{%
+\DeclareBiblatexOption{entry,global}[boolean]{swapvol}[true]{%
\settoggle{swapvol}{#1}}%
% For setting 'minbibnames' and such, see CMOS, 17th ed., 14.76 and
@@ -136,7 +128,7 @@
autocite=footnote,
autopunct=true,
block=none,
- citetracker=constrict,
+ citetracker=context,
date=long,
dateabbrev=false,
dateusetime=true,
@@ -259,8 +251,7 @@
\literal{0000}}}
\defbibcheck{collsonly}{%
- \ifboolexpr{ test {\ifentrytype{bookinbook}}
- or test {\ifentrytype{inbook}}}
+ \ifentrytype{inbook}
{\iffieldundef{crossref}
{}
{\skipentry}}%
@@ -277,18 +268,18 @@
\defbibcheck{reference}{%
\ifentrytype{reference}
{\skipentry}%
- {\ifentrytype{inreference}
- {\skipentry}%
- {}}}
+ {}}
%%%%%%%%%%%%%%%%%%%%%%%%
%% Data Inheritance %%
%%%%%%%%%%%%%%%%%%%%%%%%
+% As of biblatex 3.14 or biber 2.14 (or thereabouts), '\inherit' no
+% longer works for 'options'.
+
\ResetDataInheritance
\DefaultInheritance[\except{*}{review}{all=false}]{all=true,override=false}
-\DeclareDataInheritance{*}{%
- incollection,inbook,bookinbook,inproceedings,letter,suppbook,review}{%
+\DeclareDataInheritance{*}{incollection,inbook,letter,review}{%
\inherit{author}{bookauthor}
\inherit{shortauthor}{shortbookauthor}
\inherit{editor}{editora}
@@ -308,9 +299,25 @@
\inherit{volume}{bookvolume}
\inherit{bookvolume}{bookbookvolume}
\inherit{options}{options}}
-\DeclareDataInheritance{collection}{bookinbook,collection,inbook}{%
+\DeclareDataInheritance{collection}{collection,inbook}{%
\inherit{year}{bookyear}
\inherit{endyear}{endbookyear}}
+\DeclareDataInheritance{*}{*}{%
+ \noinherit{crossref}
+ \noinherit{entryset}
+ \noinherit{entrysubtype}
+ \noinherit{execute}
+ \noinherit{ids}
+ \noinherit{label}
+ \noinherit{presort}
+ \noinherit{related}
+ \noinherit{relatedoptions}
+ \noinherit{relatedstring}
+ \noinherit{relatedtype}
+ \noinherit{shorthand}
+ \noinherit{shorthandintro}
+ \noinherit{sortkey}
+ \noinherit{xref}}
%%%%%%%%%%%%%%%%%%%
%% Preliminary %%
@@ -400,6 +407,7 @@
\DeclareNameAlias{editorc}{sortname}
\DeclareNameAlias{foreword}{sortname}
\DeclareNameAlias{introduction}{sortname}
+\DeclareNameAlias{preface}{sortname}
\DeclareNameAlias{translator}{sortname}
\DeclareIndexNameAlias{author}{default}
@@ -411,6 +419,7 @@
\DeclareIndexNameAlias{editorc}{default}
\DeclareIndexNameAlias{foreword}{default}
\DeclareIndexNameAlias{introduction}{default}
+\DeclareIndexNameAlias{preface}{default}
\DeclareIndexNameAlias{translator}{default}
% Affixes like 'Jr.', should appear last, delimited with a comma, when
@@ -485,14 +494,11 @@
\DeclareFieldFormat{blogtitleaddon}{\mkbibparens{#1}}
\DeclareFieldFormat{titleaddon}{\mkbibbrackets{#1}}
-\DeclareFieldFormat[%
- article,incollection,inreference,inproceedings,online,reference,review]
+\DeclareFieldFormat[article,incollection,online,reference,review]
{title}{\mkbibquote{#1}}
-\DeclareFieldFormat[%
- article,incollection,inreference,inproceedings,online,reference,review]
+\DeclareFieldFormat[article,incollection,online,reference,review]
{labeltitle}{\mkbibquote{#1}}
-\DeclareIndexFieldFormat[%
- article,incollection,inreference,inproceedings,online,reference,review]
+\DeclareIndexFieldFormat[article,incollection,online,reference,review]
{indextitle}{\usebibmacro{index:title}{\index}{\mkbibquote{#1}}}
\DeclareFieldAlias[inbook]{title}{title}
@@ -565,53 +571,43 @@
%% Bibliography Aliases %%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\DeclareBibliographyAlias{periodical}{article}
-\DeclareBibliographyAlias{cite:periodical}{cite:article}
+\DeclareDriverSourcemap[datatype=bibtex]{
+ \map{
+ \step[typesource=periodical, typetarget=article]
+ \step[typesource=booklet, typetarget=book]
+ \step[typesource=manual, typetarget=book]
+ \step[typesource=mvbook, typetarget=book]
+ \step[typesource=mvcollection, typetarget=book]
+ \step[typesource=proceedings, typetarget=book]
+ \step[typesource=report, typetarget=book]
+ \step[typesource=techreport, typetarget=book]
+ \step[typesource=bookinbook, typetarget=inbook]
+ \step[typesource=conference, typetarget=incollection]
+ \step[typesource=inproceedings, typetarget=incollection]
+ \step[typesource=suppbook, typetarget=incollection]
+ \step[typesource=suppcollection, typetarget=incollection]
+ \step[typesource=electronic, typetarget=online]
+ \step[typesource=www, typetarget=online]
+ \step[typesource=inreference, typetarget=reference]
+ \step[typesource=mathesis, typetarget=thesis]
+ \step[typesource=phdthesis, typetarget=thesis]}
+ \map{
+ \step[fieldsource=school, fieldtarget=institution]
+ \step[fieldsource=address, fieldtarget=location]
+ \step[fieldsource=journal, fieldtarget=journaltitle]}}
-\DeclareBibliographyAlias{booklet}{book}
\DeclareBibliographyAlias{collection}{book}
-\DeclareBibliographyAlias{manual}{book}
-\DeclareBibliographyAlias{mvbook}{book}
-\DeclareBibliographyAlias{mvcollection}{book}
-\DeclareBibliographyAlias{proceedings}{book}
-\DeclareBibliographyAlias{report}{book}
-\DeclareBibliographyAlias{techreport}{book}
-\DeclareBibliographyAlias{cite:booklet}{cite:book}
\DeclareBibliographyAlias{cite:collection}{cite:book}
-\DeclareBibliographyAlias{cite:manual}{cite:book}
-\DeclareBibliographyAlias{cite:mvbook}{cite:book}
-\DeclareBibliographyAlias{cite:mvcollection}{cite:book}
-\DeclareBibliographyAlias{cite:proceedings}{cite:book}
-\DeclareBibliographyAlias{cite:report}{cite:book}
-\DeclareBibliographyAlias{cite:techreport}{cite:book}
-\DeclareBibliographyAlias{bookinbook}{incollection}
-\DeclareBibliographyAlias{conference}{incollection}
\DeclareBibliographyAlias{inbook}{incollection}
-\DeclareBibliographyAlias{inproceedings}{incollection}
\DeclareBibliographyAlias{letter}{incollection}
-\DeclareBibliographyAlias{suppbook}{incollection}
-\DeclareBibliographyAlias{suppcollection}{incollection}
-\DeclareBibliographyAlias{cite:bookinbook}{cite:incollection}
-\DeclareBibliographyAlias{cite:conference}{cite:incollection}
\DeclareBibliographyAlias{cite:inbook}{cite:incollection}
-\DeclareBibliographyAlias{cite:inproceedings}{cite:incollection}
\DeclareBibliographyAlias{cite:letter}{cite:incollection}
-\DeclareBibliographyAlias{cite:suppbook}{cite:incollection}
-\DeclareBibliographyAlias{cite:suppcollection}{cite:incollection}
-\DeclareBibliographyAlias{mathesis}{thesis}
-\DeclareBibliographyAlias{phdthesis}{thesis}
\DeclareBibliographyAlias{unpublished}{thesis}
-\DeclareBibliographyAlias{cite:mathesis}{cite:thesis}
-\DeclareBibliographyAlias{cite:phdthesis}{cite:thesis}
\DeclareBibliographyAlias{cite:unpublished}{cite:thesis}
-\DeclareBibliographyAlias{inreference}{reference}
-\DeclareBibliographyAlias{cite:inreference}{cite:reference}
-
\DeclareBibliographyAlias{*}{book}
-\DeclareBibliographyAlias{cite:*}{cite:book}
%%%%%%%%%%%%%%%%%%%%%%%%
%% Author's Position %%
@@ -627,11 +623,11 @@
{\usebibmacro{authpos+deflabel}}%
{\usebibmacro{author+bookauthor}%
\ifnameundef{\cbx at namelist}
- {\usebibmacro{edtrans:authpos}%
+ {\usebibmacro{edtransuthpos}%
\ifnameundef{\cbx at namelist}
{\toggletrue{noauth}%
\usebibmacro{journalfirst}}%
- {\usebibmacro{edscomps:authpos}%
+ {\usebibmacro{addplus:authpos}%
\usebibmacro{namehash+etc}}}%
{\usebibmacro{namehash+etc}}}}
@@ -642,12 +638,9 @@
\newbibmacro*{author+bookauthor}{%
\ifboolexpr{ togl {swapauth}
and ( test {\ifentrytype{book}}
- or test {\ifentrytype{bookinbook}}
or test {\ifentrytype{collection}}
or test {\ifentrytype{inbook}}
- or test {\ifentrytype{incollection}}
- or test {\ifentrytype{mvbook}}
- or test {\ifentrytype{mvcollection}} )}
+ or test {\ifentrytype{incollection}} )}
{}
{\ifboolexpr{ togl {collection:ib}
and togl {swapvol}}
@@ -699,11 +692,14 @@
\newunit}%
{\setunit{\addcomma\space}}}
-\newbibmacro*{aft+fore+intro}{%
+\newbibmacro*{supplement}{%
\ifnameundef{afterword}
{\ifnameundef{foreword}
- {\renewcommand*{\cbx at namelist}{introduction}%
- \renewcommand*{\cbx at bibstring}{introduction}}%
+ {\ifnameundef{introduction}
+ {\renewcommand*{\cbx at namelist}{preface}%
+ \renewcommand*{\cbx at bibstring}{preface}}%
+ {\renewcommand*{\cbx at namelist}{introduction}%
+ \renewcommand*{\cbx at bibstring}{introduction}}}
{\renewcommand*{\cbx at namelist}{foreword}%
\renewcommand*{\cbx at bibstring}{foreword}}}
{\renewcommand*{\cbx at namelist}{afterword}%
@@ -710,9 +706,7 @@
\renewcommand*{\cbx at bibstring}{afterword}}%
\usebibmacro{printnames+etc}%
\savefield{namehash}{\bbx at lasthash}%
- \usebibmacro{authpos+deflabel}%
- \newunit
- \bibstring{\cbx at bibstring}\space}%
+ \usebibmacro{authpos+deflabel}}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Editors and Translators %%
@@ -720,7 +714,7 @@
% For editors and translators in the author's position.
-\newbibmacro*{edtrans:authpos}{%
+\newbibmacro*{edtransuthpos}{%
\togglefalse{noed}%
\togglefalse{notrans}%
\usebibmacro{test:ed:authpos}%
@@ -827,9 +821,19 @@
\renewcommand*{\cbx at namelist}{\yeditor}%
\ifnamesequal{\xeditor}{\yeditor}
{\clearname{\xeditor}%
- \iffieldequalstr{\xeditor type}{compiler}
+ \ifboolexpr{ test {\iffieldequalstr{\xeditor type}{compiler}}
+ or test {\iffieldequalstr{\xeditor type}{comped}}
+ or test {\iffieldequalstr{\xeditor type}{comprev}}
+ or test {\iffieldequalstr{\xeditor type}{comptrans}}
+ or test {\iffieldequalstr{\xeditor type}{transcomp}}}
{\renewcommand*{\cbx at bibstring}{transcomp}}%
- {\renewcommand*{\cbx at bibstring}{transed}}}
+ {\ifboolexpr{ test {\iffieldequalstr{\xeditor type}{reviser}}
+ or test {\iffieldequalstr{\xeditor type}{revcomp}}
+ or test {\iffieldequalstr{\xeditor type}{reved}}
+ or test {\iffieldequalstr{\xeditor type}{revtrans}}
+ or test {\iffieldequalstr{\xeditor type}{transrev}}}
+ {\renewcommand*{\cbx at bibstring}{transrev}}%
+ {\renewcommand*{\cbx at bibstring}{transed}}}}
{\renewcommand*{\cbx at bibstring}{translator}}}
\newbibmacro*{edcombos}{%
@@ -836,39 +840,64 @@
\renewcommand*{\cbx at namelist}{\xeditor}%
\ifnamesequal{\xeditor}{\yeditor}
{\clearname{\yeditor}%
- \iffieldequalstr{\xeditor type}{compiler}
+ \ifboolexpr{ test {\iffieldequalstr{\xeditor type}{compiler}}
+ or test {\iffieldequalstr{\xeditor type}{comped}}
+ or test {\iffieldequalstr{\xeditor type}{comprev}}
+ or test {\iffieldequalstr{\xeditor type}{comptrans}}
+ or test {\iffieldequalstr{\xeditor type}{transcomp}}}
{\renewcommand*{\cbx at bibstring}{comptrans}}%
- {\renewcommand*{\cbx at bibstring}{edtrans}}}%
+ {\ifboolexpr{ test {\iffieldequalstr{\xeditor type}{reviser}}
+ or test {\iffieldequalstr{\xeditor type}{revcomp}}
+ or test {\iffieldequalstr{\xeditor type}{reved}}
+ or test {\iffieldequalstr{\xeditor type}{revtrans}}
+ or test {\iffieldequalstr{\xeditor type}{transrev}}}
+ {\renewcommand*{\cbx at bibstring}{revtrans}}%
+ {\renewcommand*{\cbx at bibstring}{edtrans}}}}
{\iffieldequalstr{\xeditor type}{compiler}
{\renewcommand*{\cbx at bibstring}{compiler}}%
- {\renewcommand*{\cbx at bibstring}{editor}}}}
+ {\iffieldequalstr{\xeditor type}{reviser}
+ {\renewcommand*{\cbx at bibstring}{reviser}}%
+ {\iffieldequalstr{\xeditor type}{comped}
+ {\renewcommand*{\cbx at bibstring}{comped}}%
+ {\iffieldequalstr{\xeditor type}{comprev}
+ {\renewcommand*{\cbx at bibstring}{comprev}}%
+ {\iffieldequalstr{\xeditor type}{edcomp}
+ {\renewcommand*{\cbx at bibstring}{edcomp}}%
+ {\iffieldequalstr{\xeditor type}{edrev}
+ {\renewcommand*{\cbx at bibstring}{edrev}}%
+ {\iffieldequalstr{\xeditor type}{revcomp}
+ {\renewcommand*{\cbx at bibstring}{revcomp}}%
+ {\iffieldequalstr{\xeditor type}{reved}
+ {\renewcommand*{\cbx at bibstring}{reved}}%
+ {\renewcommand*{\cbx at bibstring}{editor}}}}}}}}}}}
-\newbibmacro*{edscomps:authpos}{%
+\newbibmacro*{addplus:authpos}{%
\iftoggle{cbx at short}
{}
- {\usebibmacro{edscomps}%
+ {\usebibmacro{addplus}%
\renewcommand*{\plugb}{%
\addcomma\space\bibsstring{\cbx at bibstring}}}}
-\newbibmacro*{edscomps}{%
- \iftoggle{swaptrans}
- {}
- {\ifnameundef{editor}
- {\ifnumgreater{\value{editora}}{1}
+\newbibmacro*{addplus}{%
+ \ifnameundef{\xeditor}
+ {\ifnameundef{\yeditor}
+ {}
+ {\ifnumgreater{\value{\yeditor}}{1}
{\edef\cbx at bibstring{\cbx at bibstring +}}%
- {}}
- {\ifnumgreater{\value{editor}}{1}
- {\edef\cbx at bibstring{\cbx at bibstring +}}%
- {}}}}
+ {}}}
+ {\ifnumgreater{\value{\xeditor}}{1}
+ {\edef\cbx at bibstring{\cbx at bibstring +}}%
+ {}}}
% For editors and translators not in the author's position.
-\newbibmacro*{edtrans:a}{%
+\newbibmacro*{edtrans}{%
\iftoggle{swaptrans}
{\usebibmacro{transcombos+etc}%
\usebibmacro{edcombos+etc}}%
{\usebibmacro{edcombos+etc}%
- \usebibmacro{transcombos+etc}}}
+ \usebibmacro{transcombos+etc}}%
+ \usebibmacro{editoraddon}}%
\newbibmacro*{transcombos+etc}{%
\togglefalse{noed}%
@@ -890,11 +919,6 @@
{\usebibmacro{edcombos}%
\usebibmacro{pluga+etc}}}
-\newbibmacro*{edtrans:b}{%
- \toggletrue{edshift}%
- \usebibmacro{edtrans:a}%
- \usebibmacro{editoraddon}}%
-
\newbibmacro*{pluga+etc}{%
\usebibmacro{edtranspunct:a}%
\usebibmacro{pluga+printnames}%
@@ -901,10 +925,11 @@
\usebibmacro{edtranspunct:b}}%
\newbibmacro*{edtranspunct:a}{%
- \ifboolexpr{ togl {authposition}
- or togl {edshift}}
+ \iftoggle{authposition}
{}
- {\newunit}}%
+ {\iftoggle{edshift}
+ {\setunit{\addcomma\space}}%
+ {\newunit}}}
\newbibmacro*{pluga+printnames}{%
\renewcommand*{\pluga}{%
@@ -916,7 +941,7 @@
{\setunit{\addcomma\space}}%
{\newunit}}%
-% Tests for 'edtrans:a' and 'edtrans:b' macros.
+% Tests for 'edtrans' macro.
\newbibmacro*{test:ed}{%
\iftoggle{edshift}
@@ -988,6 +1013,20 @@
{\toggletrue{noed}}%
{\ifdefempty{\xtitle}
{\ifboolexpr{ test {\iffieldequalstr{\xeditor type}{compiler}}
+ or test {\iffieldequalstr{\xeditor type}{comped}}
+ or test {\iffieldequalstr{\xeditor type}{comprev}}
+ or test {\iffieldequalstr{\xeditor type}{comptrans}}
+ or test {\iffieldequalstr{\xeditor type}{editor}}
+ or test {\iffieldequalstr{\xeditor type}{edcomp}}
+ or test {\iffieldequalstr{\xeditor type}{edrev}}
+ or test {\iffieldequalstr{\xeditor type}{edtrans}}
+ or test {\iffieldequalstr{\xeditor type}{reviser}}
+ or test {\iffieldequalstr{\xeditor type}{revcomp}}
+ or test {\iffieldequalstr{\xeditor type}{reved}}
+ or test {\iffieldequalstr{\xeditor type}{revtrans}}
+ or test {\iffieldequalstr{\xeditor type}{transcomp}}
+ or test {\iffieldequalstr{\xeditor type}{transed}}
+ or test {\iffieldequalstr{\xeditor type}{transrev}}
or test {\iffieldequalstr{\xeditor type}{title}}
or test {\iffieldundef{\xeditor type}}}
{}
@@ -1033,7 +1072,7 @@
\ifboolexpr{ togl {collection:bk}
and togl {swapvol}}
{\newunit}%
- {\setunit{\unspace,\addspace}}}
+ {\setunit{\addcomma\space}}}
\newbibmacro*{editorlists}[1]{%
\iffieldequalstr{editortype}{#1}
@@ -1065,9 +1104,9 @@
{\nopunct\printfield{editoraddon}%
\clearfield{editoraddon}}}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Printing Names and Dashes %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%
+%% Names and Dashes %%
+%%%%%%%%%%%%%%%%%%%%%%%%
\newbibmacro*{printnames+etc}{%
\ifboolexpr{ togl {authposition}
@@ -1170,7 +1209,8 @@
\iffieldundef{\xtitle subtitle}
{}
{\subtitlepunct
- \printfield[noformat]{\xtitle subtitle}}}}
+ \printfield[noformat]{\xtitle subtitle}}%
+ \isdot}}%
\newbibmacro*{test:titledupes}{%
\iffieldsequal{title}{booktitle}
@@ -1199,40 +1239,36 @@
\ifboolexpr{ togl {collection:bk}
and togl {swapvol}}
{\iffieldundef{shortmaintitle}
- {\printfield[title]{maintitle}}%
- {\printfield[title]{shortmaintitle}}}
+ {\printfield[title]{maintitle}\isdot}%
+ {\printfield[title]{shortmaintitle}\isdot}}%
{\ifboolexpr{ togl {collection:ib}
and togl {swapvol}}
{\iffieldundef{shortbooktitle}
- {\printfield[title]{booktitle}}%
- {\printfield[title]{shortbooktitle}}}
- {\printfield[\thefield{entrytype}]{labeltitle}}}}
+ {\printfield[title]{booktitle}\isdot}%
+ {\printfield[title]{shortbooktitle}\isdot}}%
+ {\printfield[\thefield{entrytype}]{labeltitle}\isdot}}}
\newbibmacro*{shorttitle+crossref}{%
\ifboolexpr{ togl {collection:icbk}
and togl {swapvol}}
{\iffieldundef{shortmaintitle}
- {\printfield[title]{maintitle}}%
- {\printfield[title]{shortmaintitle}}}
+ {\printfield[title]{maintitle}\isdot}%
+ {\printfield[title]{shortmaintitle}\isdot}}%
{\ifboolexpr{ togl {collection:icib}
and togl {swapvol}}
{\iffieldundef{shortbooktitle}
- {\printfield[title]{booktitle}}%
- {\printfield[title]{shortbooktitle}}}
- {\printfield[\thefield{entrytype}]{labeltitle}}}}
+ {\printfield[title]{booktitle}\isdot}%
+ {\printfield[title]{shortbooktitle}\isdot}}%
+ {\printfield[\thefield{entrytype}]{labeltitle}\isdot}}}
-\newbibmacro*{booktitle+editor}[1]{%
+\newbibmacro*{booktitle}{%
\iffieldundef{booktitle}
{}
{\renewcommand*{\xtitle}{book}%
\usebibmacro{longtitle+titleaddon}%
- \setunit{\unspace,\addspace}%
- \usebibmacro{bybookauthor+pages}%
- \ifstrequal{#1}{a}
- {\usebibmacro{edtrans:a}}%
- {\usebibmacro{edtrans:b}}}}
+ \usebibmacro{bybookauthor+pages}}}
-\newbibmacro*{bookbooktitle+editor}[1]{%
+\newbibmacro*{bookbooktitle}[1]{%
\iffieldundef{bookbooktitle}
{}
{\ifstrequal{#1}{in}
@@ -1239,20 +1275,13 @@
{\newunit\bibstring{in}\space}%
{}% needs '%'
\renewcommand*{\xtitle}{bookbook}%
- \usebibmacro{longtitle+titleaddon}%
- \setunit{\unspace,\addspace}%
- \usebibmacro{edtrans:b}}}
+ \usebibmacro{longtitle+titleaddon}}}
-\newbibmacro*{maintitle+editor}{%
+\newbibmacro*{maintitle}{%
\iffieldundef{maintitle}
{}
{\renewcommand*{\xtitle}{main}%
- \usebibmacro{longtitle+titleaddon}%
- \iftoggle{swaptrans}
- {\usebibmacro{translatortypes}%
- \usebibmacro{editortypes}{maintitle}}%
- {\usebibmacro{editortypes}{maintitle}%
- \usebibmacro{translatortypes}}}}
+ \usebibmacro{longtitle+titleaddon}}}
\newbibmacro*{issuetitle}{%
\iffieldundef{issuetitle}
@@ -1288,12 +1317,9 @@
\newbibmacro*{test:collection}{%
\ifboolexpr{ test {\ifentrytype{book}}
- or test {\ifentrytype{collection}}
- or test {\ifentrytype{mvbook}}
- or test {\ifentrytype{mvcollection}}}
+ or test {\ifentrytype{collection}}}
{\usebibmacro{test:collection:bk}}%
- {\ifboolexpr{ test {\ifentrytype{bookinbook}}
- or test {\ifentrytype{inbook}}
+ {\ifboolexpr{ test {\ifentrytype{inbook}}
or test {\ifentrytype{incollection}}
or test {\ifentrytype{letter}}}
{\usebibmacro{test:collection:icbk+etc}}%
@@ -1321,8 +1347,7 @@
and not test {\iffieldundef{bookvolume}}}
{\toggletrue{collection}%
\toggletrue{collection:icbk}}%
- {\ifboolexpr{ test {\ifentrytype{bookinbook}}
- or test {\ifentrytype{inbook}}}
+ {\ifentrytype{inbook}
{\usebibmacro{test:collection:ib}}%
{\usebibmacro{test:collection:icib}}}}
@@ -1603,7 +1628,7 @@
\DeclareBibliographyDriver{article}{%
\usebibmacro{bibindex}%
- \usebibmacro{author+title+ed+note}%
+ \usebibmacro{author+title+etc}%
\usebibmacro{articles}%
\usebibmacro{colon+pages+etc}%
\usebibmacro{doi+finentry+etc}}%
@@ -1615,7 +1640,7 @@
\DeclareBibliographyDriver{incollection}{%
\usebibmacro{bibindex}%
- \usebibmacro{author+title+etc}%
+ \usebibmacro{author+incollection+etc}%
\usebibmacro{crossref+incollections}%
\usebibmacro{doi+finentry+etc}}%
@@ -1629,7 +1654,7 @@
\DeclareBibliographyDriver{online}{%
\usebibmacro{bibindex}%
- \usebibmacro{author+title+ed+note}%
+ \usebibmacro{author+title+etc}%
\newunit
\usebibmacro{websites}%
\usebibmacro{issue+month+etc}{}%
@@ -1637,7 +1662,7 @@
\DeclareBibliographyDriver{patent}{%
\usebibmacro{bibindex}%
- \usebibmacro{author+title+ed+note}%
+ \usebibmacro{author+title+etc}%
\newunit
\printfield{number}%
\newunit
@@ -1653,7 +1678,7 @@
\DeclareBibliographyDriver{thesis}{%
\usebibmacro{bibindex}%
- \usebibmacro{author+title+ed+note}%
+ \usebibmacro{author+title+etc}%
\newunit
\usebibmacro{inst+loc+date}%
\usebibmacro{doi+finentry+etc}}%
@@ -1669,11 +1694,11 @@
\usebibmacro{annotation}%
\finentry}%
-\newbibmacro*{author+title+ed+note}{%
+\newbibmacro*{author+title+etc}{%
\usebibmacro{author+bookauthor+etc}%
\usebibmacro{title+labelyear}%
- \usebibmacro{edtrans:a}%
- \usebibmacro{note}}%
+ \usebibmacro{note}%
+ \usebibmacro{edtrans}}%
\newbibmacro*{articles}{%
\newunit
@@ -1693,6 +1718,7 @@
\usebibmacro{periodical:number}}%
{\usebibmacro{periodical:number}%
\usebibmacro{issue+month+etc}{}}%
+ \toggletrue{edshift}%
\usebibmacro{edition}{noformat}}%
% If an article has an electronic article ID, don't print its page
@@ -1724,53 +1750,48 @@
\usebibmacro{author+bookauthor+etc}%
\ifboolexpr{ togl {collection:bk}
and togl {swapvol}}
- {\usebibmacro{maintitle+editor}%
- \usebibmacro{note}%
- \usebibmacro{edition}{}%
+ {\usebibmacro{maintitle+note+etc}%
\usebibmacro{volume+number+etc}%
\let\xtitle\empty
\usebibmacro{longtitle+titleaddon}%
- \setunit{\unspace,\addspace}%
- \usebibmacro{byauthor}{}%
- \usebibmacro{edtrans:b}%
- \usebibmacro{volumes}%
- \usebibmacro{bookseries}%
- \usebibmacro{volume+number+etc}%
- \usebibmacro{book:number}%
- \usebibmacro{part}}%
+ \toggletrue{edshift}%
+ \usebibmacro{byauthor}%
+ \usebibmacro{edtrans}%
+ \usebibmacro{volumes+bookseries+etc}}%
{\usebibmacro{title+labelyear}%
- \usebibmacro{byauthor}{newunit}%
- \usebibmacro{edtrans:a}%
- \usebibmacro{editoraddon}%
+ \usebibmacro{byauthor}%
\iffieldundef{maintitle}
- {\usebibmacro{note+edition+etc}}%
- {\usebibmacro{volumes}%
- \usebibmacro{bookseries}%
- \usebibmacro{volume+number+etc}%
- \usebibmacro{book:number}%
- \usebibmacro{part}%
- \usebibmacro{maintitle+editor}%
- \usebibmacro{note}%
- \usebibmacro{edition}{}}}
+ {\usebibmacro{note+edition+etc}%
+ \usebibmacro{volumes+bookseries+etc}}%
+ {\usebibmacro{edtrans}%
+ \usebibmacro{volumes+bookseries+etc}%
+ \usebibmacro{maintitle+note+etc}}}
\usebibmacro{date+loc+etc}%
\usebibmacro{origtitle}}%
-\newbibmacro*{author+title+etc}{%
+\newbibmacro*{author+incollection+etc}{%
\usebibmacro{test:collection}%
\usebibmacro{test:bookauthor}%
\ifboolexpr{ test {\ifnameundef{afterword}}
and test {\ifnameundef{foreword}}
- and test {\ifnameundef{introduction}}}
+ and test {\ifnameundef{introduction}}
+ and test {\ifnameundef{preface}}}
{\usebibmacro{author+bookauthor+etc}%
\iffieldundef{title}
- {\usebibmacro{booktitle+editor}{a}}%
+ {\usebibmacro{booktitle}%
+ \usebibmacro{edtrans}}%
{\ifboolexpr{ togl {collection:ib}
and togl {swapvol}
and not togl {collection:icib}}
- {\usebibmacro{booktitle+editor}{a}}%
+ {\usebibmacro{booktitle}%
+ \usebibmacro{edtrans}}%
{\usebibmacro{title+labelyear}%
- \usebibmacro{byauthor+ed+chapter}}}}
- {\usebibmacro{aft+fore+intro}}}
+ \usebibmacro{byauthor}%
+ \usebibmacro{edtrans}%
+ \usebibmacro{chapter+in}}}}
+ {\usebibmacro{supplement}%
+ \newunit
+ \bibstring{\cbx at bibstring}\space}}%
\newbibmacro*{crossref+incollections}{%
\iffieldundef{crossref}
@@ -1816,7 +1837,8 @@
\setunit{\addcomma\space}%
\iftoggle{firstshort}
{}
- {\usebibmacro{edtrans:b}}}
+ {\toggletrue{edshift}%
+ \usebibmacro{edtrans}}}
\newbibmacro*{inst+loc+date}{%
\usebibmacro{thesis+type}%
@@ -1842,7 +1864,10 @@
\newbibmacro*{note}{%
\iffieldundef{note}
{}
- {\newunit
+ {\iftoggle{edshift}
+ {\setunit{\addcomma\space}%
+ \togglefalse{edshift}}%
+ {\newunit}%
\printfield{note}}}
\newbibmacro*{part}{%
@@ -1949,6 +1974,16 @@
{}}
{}}}
+\newbibmacro*{maintitle+note+etc}{%
+ \usebibmacro{maintitle}%
+ \usebibmacro{note}%
+ \usebibmacro{edition}{}%
+ \iftoggle{swaptrans}
+ {\usebibmacro{translatortypes}%
+ \usebibmacro{editortypes}{maintitle}}%
+ {\usebibmacro{editortypes}{maintitle}%
+ \usebibmacro{translatortypes}}}
+
\newbibmacro*{volume+number+etc}{%
\iffieldundef{\xvolume volume}
{}
@@ -1971,25 +2006,41 @@
{}
{\space\bibstring{of}\space}}}}
-\renewbibmacro*{byauthor}[1]{%
+\renewbibmacro*{byauthor}{%
\ifboolexpr{ test {\ifnameundef{author}}
or togl {noauth}}
{}
- {\ifstrequal{#1}{newunit}
+ {\iftoggle{edshift}
+ {\renewcommand*{\pluga}{%
+ \setunit{\addcomma\space}\bibstring{by}\space}}%
{\renewcommand*{\pluga}{\newunit\bibstring{by}\space}}%
- {\renewcommand*{\pluga}{\bibstring{by}\space}}%
\renewcommand*{\cbx at namelist}{author}%
\usebibmacro{printnames+etc}}}
+\newbibmacro*{volumes+bookseries+etc}{%
+ \usebibmacro{volumes}%
+ \usebibmacro{bookseries}%
+ \usebibmacro{pages}%
+ \usebibmacro{volume+number+etc}%
+ \usebibmacro{book:number}%
+ \usebibmacro{part}}%
+
+\newbibmacro*{note+edition+etc}{%
+ \usebibmacro{note}%
+ \usebibmacro{edition}{}%
+ \usebibmacro{edtrans}}%
+
\newbibmacro*{edition}[1]{%
\iffieldundef{edition}
{}
- {\newunit
+ {\iftoggle{edshift}
+ {\setunit{\addcomma\space}%
+ \togglefalse{edshift}}%
+ {\newunit}%
\iffieldbibstring{edition}
{\bibstring{\thefield{edition}}}
{\ifstrequal{#1}{noformat}
- {\setunit{\addcomma\space}%
- \printfield[noformat]{edition}}%
+ {\printfield[noformat]{edition}}%
{\printfield{edition}}}}}
\newbibmacro*{date+loc+etc}{%
@@ -2011,7 +2062,8 @@
\ifboolexpr{ test {\ifnamesequal{author}{bookauthor}}
or test {\ifnamesequal{afterword}{bookauthor}}
or test {\ifnamesequal{foreword}{bookauthor}}
- or test {\ifnamesequal{introduction}{bookauthor}}}
+ or test {\ifnamesequal{introduction}{bookauthor}}
+ or test {\ifnamesequal{preface}{bookauthor}}}
{\clearname{bookauthor}}%
{\iftoggle{noauth}
{\clearname{bookauthor}}%
@@ -2020,15 +2072,13 @@
\newbibmacro*{bybookauthor+pages}{%
\ifnameundef{bookauthor}
{}
- {\renewcommand*{\pluga}{\bibstring{by}\space}%
+ {\renewcommand*{\pluga}{%
+ \setunit{\addcomma\space}\bibstring{by}\space}%
\renewcommand*{\cbx at namelist}{bookauthor}%
\usebibmacro{printnames+etc}%
- \usebibmacro{pages}%
- \newunit}}%
+ \usebibmacro{pages}}}
-\newbibmacro*{byauthor+ed+chapter}{%
- \usebibmacro{byauthor}{newunit}%
- \usebibmacro{edtrans:a}%
+\newbibmacro*{chapter+in}{%
\iftoggle{collection:ib}
{}
{\newunit
@@ -2043,14 +2093,16 @@
{\ifboolexpr{ togl {collection:icbk}
or togl {collection:icib}}
{\usebibmacro{incollections:ic}}%
- {\usebibmacro{booktitle+editor}{}%
- \usebibmacro{bookbooktitle+editor}{in}%
+ {\usebibmacro{bookbooktitle}{in}%
+ \toggletrue{edshift}%
+ \usebibmacro{booktitle}%
+ \usebibmacro{note+edition+etc}%
\iffieldundef{volume}
{\iffieldundef{bookvolume}%
{\renewcommand*{\xvolume}{bookbook}}%
{\renewcommand*{\xvolume}{book}}%
- \usebibmacro{note+edition+etc}}%
- {\usebibmacro{note+edition+etc}}}}
+ \usebibmacro{volumes+bookseries+etc}}%
+ {\usebibmacro{volumes+bookseries+etc}}}}
\usebibmacro{date+loc+etc}%
\usebibmacro{origtitle}}%
@@ -2070,7 +2122,8 @@
{\iftoggle{bibliography}
{\setunit{\addcomma\space}%
\printfield{pages}%
- \clearfield{pages}}%
+ \clearfield{pages}%
+ \togglefalse{edshift}}%
{}}}
\newbibmacro*{review+title}{%
@@ -2205,48 +2258,43 @@
\newbibmacro*{incollections:ib}{%
\iftoggle{swapvol}
- {\usebibmacro{note+edition+etc}%
+ {\usebibmacro{note}%
+ \usebibmacro{edition}{}%
+ \usebibmacro{volumes+bookseries+etc}%
\let\xtitle\empty
\usebibmacro{longtitle+titleaddon}%
- \setunit{\unspace,\addspace}%
- \usebibmacro{byauthor}{}%
- \usebibmacro{edtrans:b}}%
+ \toggletrue{edshift}%
+ \usebibmacro{byauthor}%
+ \usebibmacro{edtrans}}%
{\usebibmacro{volume+number+etc}%
- \usebibmacro{booktitle+editor}{}%
- \usebibmacro{note+edition+etc}}}
+ \toggletrue{edshift}%
+ \usebibmacro{booktitle}%
+ \usebibmacro{note+edition+etc}%
+ \usebibmacro{volumes+bookseries+etc}}}
-\newbibmacro*{note+edition+etc}{%
- \usebibmacro{note}%
- \usebibmacro{edition}{}%
- \usebibmacro{volumes}%
- \usebibmacro{bookseries}%
- \usebibmacro{pages}%
- \usebibmacro{volume+number+etc}%
- \usebibmacro{book:number}%
- \usebibmacro{part}}%
-
\newbibmacro*{incollections:ic}{%
\iftoggle{swapvol}
{\iftoggle{collection:icbk}
- {\usebibmacro{maintitle+editor}}%
- {\usebibmacro{bookbooktitle+editor}{}}%
+ {\usebibmacro{maintitle+note+etc}}%
+ {\usebibmacro{bookbooktitle}{}%
+ \toggletrue{edshift}%
+ \usebibmacro{note+edition+etc}}%
\renewcommand*{\xvolume}{book}%
- \usebibmacro{note+edition+etc}%
- \usebibmacro{booktitle+editor}{}%
- \usebibmacro{pages}}%
- {\usebibmacro{booktitle+editor}{}%
+ \usebibmacro{volumes+bookseries+etc}%
+ \toggletrue{edshift}%
+ \usebibmacro{booktitle}%
+ \usebibmacro{edtrans}}%
+ {\toggletrue{edshift}%
+ \usebibmacro{booktitle}%
+ \usebibmacro{edtrans}%
\renewcommand*{\xvolume}{book}%
\usebibmacro{volume+number+etc}%
\iftoggle{collection:icbk}
- {\usebibmacro{maintitle+editor}}%
- {\usebibmacro{bookbooktitle+editor}{}}%
+ {\usebibmacro{maintitle+note+etc}}%
+ {\usebibmacro{bookbooktitle}{}%
+ \toggletrue{edshift}%
+ \usebibmacro{note+edition+etc}}%
\renewcommand*{\xvolume}{book}%
- \usebibmacro{note+edition+etc}}}
+ \usebibmacro{volumes+bookseries+etc}}}
-\newbibmacro*{volume}{%
- \iffieldundef{\xvolume volume}
- {}
- {\newunit
- \printfield[volume]{\xvolume volume}}}
-
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/windycity/windycity.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/windycity/windycity.cbx 2020-09-08 21:07:10 UTC (rev 56296)
+++ trunk/Master/texmf-dist/tex/latex/windycity/windycity.cbx 2020-09-08 21:07:25 UTC (rev 56297)
@@ -1,7 +1,5 @@
-% Last modified: Wed 17 Jul 2019 09:44:59 AM CDT
+% Last modified: Mon 07 Sep 2020 06:40:45 PM CDT
-% Copyright (c) 2019 Brian Michael Chase.
-%
% Permission is granted to copy, distribute and/or modify this
% software under the terms of the LaTeX Project Public License (LPPL),
% version 1.3.
@@ -13,13 +11,13 @@
% implied warranties of merchantability and fitness for a particular
% purpose.
-\ProvidesFile{windycity.cbx}[2019/07/17 Windy City citation style for
+\ProvidesFile{windycity.cbx}[2020/09/07 Windy City citation style for
biblatex]
-\@ifpackagelater{biblatex}{2017/11/04}
+\@ifpackagelater{biblatex}{2019/08/17}
{}
{\PackageError{biblatex}
{Outdated 'biblatex' package}
- {Windy City is for biblatex v3.8 and above.\MessageBreak
+ {Windy City is for biblatex v3.13 and above.\MessageBreak
You are using: '\csuse{ver at biblatex.sty}'.\MessageBreak
This is a fatal error. I'm aborting now.}%
\endinput}%
@@ -48,6 +46,9 @@
\renewcommand{\bibendnotewrapper}[1]{%
\bibsentence#1}%
+\providetoggle{cite:collection}
+\providetoggle{cite:long}
+
% Protect commas against abbreviation dots and terminal punctuation
% marks. Note '\addspace'. Using '\space' there causes problems.
@@ -146,8 +147,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\newbibmacro*{parencite}{%
- \usebibmacro{test:collection}%
- \usebibmacro{test:crossref}%
\ifboolexpr{ test \ifciteibid
and not test \iffirstonpage}
{\iffieldundef{postnote}
@@ -155,23 +154,17 @@
\usebibmacro{parencite:date}%
\usebibmacro{cite:volume}}}
{}}
- {\printtext[bibhyperref]{%
+ {\ifboolexpr{ test {\ifentrytype{book}}
+ or test {\ifentrytype{collection}}
+ or test {\ifentrytype{incollection}}
+ or test {\ifentrytype{inbook}}
+ or test {\ifentrytype{letter}}}
+ {\usebibmacro{test:crossref}}%
+ {}% needs '%'
+ \printtext[bibhyperref]{%
\usebibmacro{parencite:long}%
\usebibmacro{cite:volume}}}}
-% See note for 'crossref+long'.
-
-\newbibmacro*{test:crossref}{%
- \ifboolexpr{ test {\iffieldundef{crossref}}
- or test {\iffieldundef{title}}}
- {}
- {\xifinlist{\thefield{crossref}}{\crossreflist}
- {\stepcounter{\thefield{crossref}}}
- {\listxadd{\crossreflist}{\thefield{crossref}}%
- \ifcsdef{c@\thefield{crossref}}
- {\setcounter{\thefield{crossref}}{0}}%
- {\newcounter{\thefield{crossref}}}}}}
-
\newbibmacro*{parencite:date}{%
\iffieldundef{labelyear}
{}
@@ -208,7 +201,12 @@
\renewcommand*{\cbx at deflabel}{labelname}%
\clearfield{handle}%
\clearfield{nameaddon}%
- \usebibmacro{author+bookauthor+etc}}}}
+ \ifboolexpr{ test {\ifnameundef{afterword}}
+ and test {\ifnameundef{foreword}}
+ and test {\ifnameundef{introduction}}
+ and test {\ifnameundef{preface}}}
+ {\usebibmacro{author+bookauthor+etc}}%
+ {\usebibmacro{supplement}}}}}
\newbibmacro*{parencite:journal}{%
{\ifentrytype{article}
@@ -285,8 +283,11 @@
{\usebibmacro{author+bookauthor+etc}%
\bibstring{review}}%
\space
- \renewcommand*{\xtitle}{book}%
- \usebibmacro{title+labelyear}%
+% \renewcommand*{\xtitle}{book}%
+% \usebibmacro{title+labelyear}%
+ \iffieldundef{shortbooktitle}
+ {\printfield[title]{booktitle}\isdot}%
+ {\printfield[title]{shortbooktitle}\isdot}%
\usebibmacro{cite:volume}}%
\newbibmacro*{cite:volume}{%
@@ -311,7 +312,10 @@
\usebibmacro{deflabel}%
\iftoggle{firstshort}
{\usebibmacro{cite:short}}%
- {\usebibmacro{crossref+long}}}
+ {\printtext{%
+ \usedriver
+ {\DeclareNameAlias{sortname}{default}}%
+ {cite:\thefield{entrytype}}}}}
% By default, idemtracker is 'false'. As such, '\ifciteidem' returns
% false. With idemtracker set to 'true' (or to some value that implies
@@ -328,19 +332,18 @@
% collection with entries containing just 'volume' and 'crossref'
% fields. Perhaps justifiable in very rare cases.
-\newbibmacro*{crossref+long}{%
+\newbibmacro*{test:crossref}{%
\ifboolexpr{ test {\iffieldundef{crossref}}
or test {\iffieldundef{title}}}
- {\usebibmacro{cite:long}}%
+ {\toggletrue{cite:long}}%
{\xifinlist{\thefield{crossref}}{\crossreflist}
- {\stepcounter{\thefield{crossref}}%
- \usebibmacro{author+title+etc}%
- \usebibmacro{crossref}}%
- {\listxadd{\crossreflist}{\thefield{crossref}}%
+ {\toggletrue{cite:collection}%
+ \stepcounter{\thefield{crossref}}}
+ {\toggletrue{cite:long}%
+ \listxadd{\crossreflist}{\thefield{crossref}}%
\ifcsdef{c@\thefield{crossref}}
{\setcounter{\thefield{crossref}}{0}}%
- {\newcounter{\thefield{crossref}}}
- \usebibmacro{cite:long}}}}
+ {\newcounter{\thefield{crossref}}}}}}
\newbibmacro*{cite:long}{%
\printtext{%
@@ -394,13 +397,13 @@
\usebibmacro{postnote}%
\usebibmacro{doi+url+etc}}}
-% If the postnote is empty, print the page ranges of journal articles.
-% See CMOS, 17th ed., 14.153, 14.167, and 14.174. As for incollection
-% and inbook entries, 14.106 seems to suggest the same, but the
-% example in 14.30 suggests otherwise. The examples in 14.108 only
-% muddy the waters further. For magazines, CMOS is clear that the
-% range can be left out. To do so, simply omit it from your
-% bibliography database.
+% If the postnote is empty, print the page ranges of journal and
+% review articles. See CMOS, 17th ed., 14.153, 14.167, and 14.174. As
+% for incollection and inbook entries, 14.106 seems to suggest the
+% same, but the example in 14.30 suggests otherwise. The examples in
+% 14.108 don't help. For magazines, CMOS is clear that the range can
+% be left out. To do so, simply omit it from your bibliography
+% database.
\newbibmacro*{cite:pages}{%
\iffieldundef{pages}
@@ -455,23 +458,35 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\DeclareBibliographyDriver{cite:article}{%
- \usebibmacro{author+title+ed+note}%
+ \usebibmacro{author+title+etc}%
\usebibmacro{articles}%
\usebibmacro{colon+comma+etc}}%
\DeclareBibliographyDriver{cite:book}{%
- \usebibmacro{author+collection+etc}%
- \newunit
- \usebibmacro{volume+page}}%
+ \usebibmacro{test:crossref}%
+ \iftoggle{cite:long}
+ {\usebibmacro{author+collection+etc}%
+ \newunit
+ \usebibmacro{volume+page}}%
+ {\iftoggle{cite:collection}
+ {\usebibmacro{author+incollection+etc}%
+ \usebibmacro{crossref}}%
+ {}}}
\DeclareBibliographyDriver{cite:incollection}{%
\ifentrytype{letter}
{\toggletrue{noauth}}%
{}% needs '%'
- \usebibmacro{author+title+etc}%
- \usebibmacro{incollections}%
- \newunit
- \usebibmacro{volume+page}}%
+ \usebibmacro{test:crossref}%
+ \iftoggle{cite:long}
+ {\usebibmacro{author+incollection+etc}%
+ \usebibmacro{incollections}%
+ \newunit
+ \usebibmacro{volume+page}}%
+ {\iftoggle{cite:collection}
+ {\usebibmacro{author+incollection+etc}%
+ \usebibmacro{crossref}}%
+ {}}}
\DeclareBibliographyDriver{cite:misc}{%
\usebibmacro{author+bookauthor+etc}%
@@ -481,7 +496,7 @@
\newunit}%
\DeclareBibliographyDriver{cite:online}{%
- \usebibmacro{author+title+ed+note}%
+ \usebibmacro{author+title+etc}%
\setunit*{\newunitpunct}% needs '*'
\usebibmacro{websites}%
\usebibmacro{issue+month+etc}{}%
@@ -488,7 +503,7 @@
\newunit}%
\DeclareBibliographyDriver{cite:patent}{%
- \usebibmacro{author+title+ed+note}%
+ \usebibmacro{author+title+etc}%
\newunit
\printfield{number}%
\newunit}%
@@ -511,7 +526,7 @@
\usebibmacro{colon+comma+etc}}%
\DeclareBibliographyDriver{cite:thesis}{%
- \usebibmacro{author+title+ed+note}%
+ \usebibmacro{author+title+etc}%
\setunit{\addspace}% not '\setunit{\space}'
\printtext[parens]{\usebibmacro{inst+loc+date}}%
\newunit}%
Modified: trunk/Master/texmf-dist/tex/latex/windycity/windycity.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/windycity/windycity.dbx 2020-09-08 21:07:10 UTC (rev 56296)
+++ trunk/Master/texmf-dist/tex/latex/windycity/windycity.dbx 2020-09-08 21:07:25 UTC (rev 56297)
@@ -1,22 +1,23 @@
-\ProvidesFile{windycity.dbx}[2019/04/02 Windy City data model file for
+\ProvidesFile{windycity.dbx}[2020/09/07 Windy City data model file for
biblatex]
\DeclareDatamodelFields[type=field,datatype=literal]{%
+ blogsubtitle,
blogtitle,
- blogsubtitle,
blogtitleaddon,
bookbooktitle,
+ bookbookvolume,
bookvolume,
- bookbookvolume,
bookyear,
+ editoraddon,
endbookyear,
- editoraddon,
handle,
seriesaddon,
shortbooktitle,
shortmaintitle,
- translatortype,
- translatoratype}
+ translatoratype,
+ translatortype}
\DeclareDatamodelFields[type=list,datatype=name]{%
+ preface,
shortbookauthor,
translatora,
translatorb}
Modified: trunk/Master/texmf-dist/tex/latex/windycity/windycity.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/windycity/windycity.sty 2020-09-08 21:07:10 UTC (rev 56296)
+++ trunk/Master/texmf-dist/tex/latex/windycity/windycity.sty 2020-09-08 21:07:25 UTC (rev 56297)
@@ -1,4 +1,4 @@
-% Last modified: Tue 16 Jul 2019 07:49:59 AM CDT
+% Last modified: Sun 19 Jul 2020 11:58:38 AM CDT
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{windycity}
\RequirePackage{ifxetex}
@@ -228,7 +228,7 @@
\TeX}}%
\emergencystretch=1em
\hyphenation{bib-la-tex Chi-ca-go}
-\usepackage{btxdockit}% For \bibfield, \bibtype, \cmd, marglist, optionlist, \op, etc.
+\usepackage{btxdockit}% For \bibfield, \bibtype, \cmd, marglist, optionlist, etc.
\renewenvironment*{marglist}
{\list{}{%
\setlength{\labelwidth}{\marglistwidth}%
@@ -278,4 +278,10 @@
\renewcommand{\opt}[1]{\emph{#1}}%
\renewcommand{\sty}[1]{\emph{#1}}%
+% For tables:
+\usepackage{booktabs}% Enhanced layout
+\usepackage{float}% For nonfloating tables
+\usepackage[it,small]{caption}% Adjust captions
+\gappto{\@floatboxreset}{\centering}% Center floats
+
\endinput
More information about the tex-live-commits
mailing list.