summaryrefslogtreecommitdiff
path: root/macros/latex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-12-05 03:00:50 +0000
committerNorbert Preining <norbert@preining.info>2021-12-05 03:00:50 +0000
commite26711a638906ed9b27bd3c210f4f75da6064a58 (patch)
tree0162bd6e10abcdbe0bb1095ddd3888dc60bf5a8e /macros/latex
parent9b7b67b5689e5ba3aac6299b9f2f17d69e69a973 (diff)
CTAN sync 202112050300
Diffstat (limited to 'macros/latex')
-rw-r--r--macros/latex/contrib/biblatex-contrib/windycity/CHANGES.md59
-rw-r--r--macros/latex/contrib/biblatex-contrib/windycity/american-windycity.lbx4
-rw-r--r--macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.bib77
-rw-r--r--macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.pdfbin495478 -> 507249 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.tex316
-rw-r--r--macros/latex/contrib/biblatex-contrib/windycity/windycity.bbx316
-rw-r--r--macros/latex/contrib/biblatex-contrib/windycity/windycity.cbx14
-rw-r--r--macros/latex/contrib/biblatex-contrib/windycity/windycity.dbx3
-rw-r--r--macros/latex/contrib/brandeis-dissertation/brandeis-dissertation.dtx9
-rw-r--r--macros/latex/contrib/brandeis-dissertation/brandeis-dissertation.pdfbin171451 -> 172406 bytes
-rw-r--r--macros/latex/contrib/siunitx/CHANGELOG.md8
-rw-r--r--macros/latex/contrib/siunitx/siunitx-code.pdfbin1517332 -> 607749 bytes
-rw-r--r--macros/latex/contrib/siunitx/siunitx-code.tex6
-rw-r--r--macros/latex/contrib/siunitx/siunitx-emulation.dtx17
-rw-r--r--macros/latex/contrib/siunitx/siunitx-number.dtx8
-rw-r--r--macros/latex/contrib/siunitx/siunitx.dtx2
-rw-r--r--macros/latex/contrib/siunitx/siunitx.pdfbin638365 -> 638352 bytes
-rw-r--r--macros/latex/contrib/siunitx/siunitx.tex2
18 files changed, 557 insertions, 284 deletions
diff --git a/macros/latex/contrib/biblatex-contrib/windycity/CHANGES.md b/macros/latex/contrib/biblatex-contrib/windycity/CHANGES.md
index 848dc99b27..2b166c9f5c 100644
--- a/macros/latex/contrib/biblatex-contrib/windycity/CHANGES.md
+++ b/macros/latex/contrib/biblatex-contrib/windycity/CHANGES.md
@@ -8,6 +8,61 @@ indicate updates to Windy City's [repository on
GitHub](https://github.com/brianchase/windycity "GitHub:
brianchase/windycity").
+## 2021-12-04
+
+* improved the handling of `labeldate` for `@inbook` and `@bookinbook`
+ entries (for the most part, affecting books in collections when
+ they're formatted for reference lists)
+
+ - fixed cases of *n.d.* (no date) in reference lists when works
+ without a `year` or `date` field were cross-referenced to
+ works with a `year` or `date` field (previously, you could fix
+ this by listing the date in both the parent and child entries)
+ - also in reference lists, fixed occasional missing publication
+ dates after the publisher's position when it differed from the
+ one printed after the author's position (publication dates can
+ differ when a work in a collection has a different publication
+ date than the collection as a whole)
+ - fixed the assignment of `labeldate` to correct problems with
+ sorting in reference lists, ensure that multiple works by the same
+ authors in the same year are differentiated with letters (as in
+ *2015a*, *2015b*, etc.), and ensure that those letters aren't
+ appended incorrectly
+ - exception to the previous: works in reference lists formatted with
+ the `swapvol` preamble option (but not the `swapvol` entry option)
+ - fixed the position of publication dates in reference lists when a
+ work's format is changed by `swapvol` (previously, dates weren't
+ swapped along with other elements of the format)
+ - if Windy City still fails to assign the correct `labeldate`, you
+ can do it manually with the `label` field
+ - reminder: following *CMOS* 15.41, you probably shouldn't use
+ `swapvol` in reference lists because a reference list entry should
+ give a work's volume first, which is what Windy City does by
+ default and what `swapvol` changes
+
+* improved how the style processes pairs of locations and publishers
+ (e.g. *Some City: Some Publisher*):
+
+ - lists may include indefinitely many pairs (previously, no more
+ than two were allowed)
+ - rather than try to guess when it's appropriate to print *n.p.* (no
+ place) when a publisher's location is missing, you must now
+ specify when you want it with the entry option `noplace`
+ - fixed a punctuation problem problem affecting some works that
+ lacked a publisher's location
+
+* added support for citing "paintings, photographs, and sculpture"
+ with the `@artwork` or `@image` entry type (see examples for *CMOS*
+ 14.235)
+* added support for citing "standards" with the `@standard` entry type
+ (see examples for *CMOS* 4.259; note that there's no way for Windy
+ City to print long or short forms of a publisher's name, depending
+ on the context, so it falls short on one example)
+* added a `noetal` preamble and entry option to disable the truncation
+ of name lists (as a preamble option, it disables all truncation; as
+ an entry option it disables truncation in citations and bibliography
+ entries of specific works)
+
## 2021-11-09
* added support for manuscript collections (see examples for *CMOS*
@@ -26,10 +81,10 @@ brianchase/windycity").
and `pseudo` to indicate anonymous and pseudonymous editors and
translators (since the fields accept multiple values, you could
list, for example, a pseudonymous compiler)
-* fixed at least one bug with the `ibidpage` bibliography option (it
+* fixed at least one bug with the `ibidpage` preamble option (it
prevented page numbers from printing in some contexts where most but
not all of the right conditions were met)
-* fixed the `shortlinks` bibliography option to stop it from inserting
+* fixed the `shortlinks` preamble option to stop it from inserting
links in bibliographies (the links belong only in citations)
* for `@article` entries, fixed the relative positions of `series` and
`location`
diff --git a/macros/latex/contrib/biblatex-contrib/windycity/american-windycity.lbx b/macros/latex/contrib/biblatex-contrib/windycity/american-windycity.lbx
index 36e0169e79..f584258e78 100644
--- a/macros/latex/contrib/biblatex-contrib/windycity/american-windycity.lbx
+++ b/macros/latex/contrib/biblatex-contrib/windycity/american-windycity.lbx
@@ -1,4 +1,4 @@
-% Last modified: Tue 09 Nov 2021 07:45:43 PM CST
+% Last modified: Sat 04 Dec 2021 12:44:02 PM CST
% Permission is granted to copy, distribute and/or modify this
% software under the terms of the LaTeX Project Public License (LPPL),
@@ -11,7 +11,7 @@
% implied warranties of merchantability and fitness for a particular
% purpose.
-\ProvidesFile{american-windycity.lbx}[2021/11/09 Windy City
+\ProvidesFile{american-windycity.lbx}[2021/12/04 Windy City
localization module for biblatex]
\InheritBibliographyExtras{american}
\InheritBibliographyStrings{american}
diff --git a/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.bib b/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.bib
index 8c7257ab89..9fc940a868 100644
--- a/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.bib
+++ b/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.bib
@@ -124,7 +124,7 @@
@InCollection{myers2012,
author = {Myers, Herbert},
title = {Pitch and Transposition},
- pages = {375--393},
+ pages = {375–393},
crossref = {carter2012}
}
@Collection{carter2012,
@@ -223,8 +223,8 @@
year = {1999}
}
-% 14.23 Notes and bibliography—examples and variations
-% 15.9 Author-date references—examples and variations
+% 14.23 Notes and bibliography — examples and variations
+% 15.9 Author-date references — examples and variations
@Book{strayed2012,
author = {Strayed, Cheryl},
@@ -337,7 +337,7 @@
publisher = {Vintage International},
year = {2004}
}
-@Book{diaz2008,
+@Book{diaz2007,
author = {Díaz, Junot},
title = {The Brief Wondrous Life of Oscar Wao},
shorttitle = {Oscar Wao},
@@ -1583,7 +1583,7 @@
% 14.132 No place of publication
@Book{windsor1910,
- options = {skipbib},
+ options = {noplace,skipbib},
publisher = {Windsor},
year = {1910}
}
@@ -1635,7 +1635,7 @@
addendum = {Distributed by University of Chicago Press}
}
-% 14.142 Publication Date---General
+% 14.142 Publication Date — General
@Book{chicago2010,
author = {{University of Chicago Press}},
@@ -1970,7 +1970,7 @@
volume = {21},
number = {2},
date = {2013-21},
- pages = {351--81},
+ pages = {351–81},
url = {https://doi.org/10.1215/10679847-2018283}
}
@@ -2034,7 +2034,7 @@
series = {2nd ser.},
volume = {10},
date = {1896-01},
- pages = {413--15}
+ pages = {413–15}
}
@Article{moraes1950,
author = {Moraes, G. M.},
@@ -2370,7 +2370,7 @@
note = {abstract},
type = {phdthesis},
institution = {New York University},
- date = {2015},
+ year = {2015},
url = {http://pqdtopen.proquest.com/pubnum/2685917.html}
}
@Thesis{choi2008,
@@ -2458,6 +2458,7 @@
url = {http://hdl.handle.net/10022/AC:P:10603}
}
@Unpublished{alarcon1771,
+ options = {skipdate},
author = {Alarcón, Salvador Florencio de},
title = {Compendio de las noticias correspondientes a el real y minas San Francisco de Aziz de Río Chico\ldots de 20 de octobre \mkbibbrackets{1771}},
type = {photocopy},
@@ -2539,7 +2540,7 @@
author = {Washington, George},
type = {papers},
collection = {George Washington Papers},
- series = {Series 5: Financial Papers, 1750--96},
+ series = {Series 5: Financial Papers, 1750–96},
institution = {Library of Congress},
address = {Washington, DC},
url = {http://memory.loc.gov/ammem/gwhtml/gwseries5.html}
@@ -2654,6 +2655,34 @@
url = {http://www.encyclopedia.chicagohistory.org/pages/184.html},
}
+% 14.235 Citing paintings, photographs, and sculpture
+
+@Artwork{dali1931,
+ author = {Dalí, Salvador},
+ title = {The Persistence of Memory},
+ year = {1931},
+ type = {oil on canvas},
+ typeaddon = {, 9½\addthinspace ×\addthinspace 13$^{\prime\prime}$ (24.1\addthinspace ×\addthinspace 33\,cm)},
+ institution = {Museum of Modern Art},
+ address = {New York},
+ url = {http://www.moma.org/collection/works/79018}
+}
+@Artwork{mccurry1984,
+ author = {McCurry, Steve},
+ title = {Afghan Girl},
+ date = {1984-12},
+ type = {photograph},
+ note = {\emph{National Geographic}, cover, June 1985}
+}
+@Artwork{picasso1942,
+ author = {Picasso, Pablo},
+ title = {Bull's Head},
+ date = {1942-21},
+ type = {bicycle saddle and handlebars},
+ typeaddon = {, 33.5\addthinspace ×\addthinspace 43.5 ×\addthinspace 19\,cm},
+ institution = {Musée Picasso Paris}
+}
+
% 14.246 Citing specific editions of classical references
@Book{epictetus1916,
@@ -2688,6 +2717,30 @@
year = {1986}
}
+% 14.259 Standards
+
+@Standard{niso2010,
+ author = {{National Information Standards Organization}},
+ shortauthor = {NISO},
+ title = {Bibliographic References},
+ note = {ANSI/NISO \liningnums{Z39.29-2005}},
+ address = {Bethesda, MD},
+ publisher = {NISO},
+ pubstate = {approved June 9, 2005; reaffirmed May 13, 2010},
+ year = {2010}
+}
+@Standard{w3c2008,
+ options = {noetal},
+ author = {{Worldwide Web Consortium (W3C)}},
+ shortauthor = {W3C},
+ title = {Extensible Markup Language (XML) 1.0},
+ edition = {5},
+ editor = {Bray, Tim and Paoli, Jean and Sperberg-McQueen, C.M. and Maler, Eve and Yergeau, François},
+ publisher = {W3C},
+ date = {2008-11-26},
+ url = {http://www.w3.org/TR/2008/REC-xml-20081126/}
+}
+
% 14.260 Citations taken from secondary sources
@Article{zukofsky1931,
@@ -2761,7 +2814,7 @@
doi = {https://doi.org/10.1007/s00191-004-0188-x}
}
-% 15.22 Text citations—basic form
+% 15.22 Text citations — basic form
@Book{hetherington2015,
author = {Hetherington, Marc J. and Rudolph, Thomas J.},
@@ -2982,7 +3035,7 @@
year = {1997}
}
-% 15.40 Reprint editions and modern editions—more than one date
+% 15.40 Reprint editions and modern editions — more than one date
@Book{austen2003,
author = {Austen, Jane},
diff --git a/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.pdf b/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.pdf
index 7a73efcf49..f944776846 100644
--- a/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.pdf
+++ b/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.tex b/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.tex
index 611dcc9d6d..a4bc14d059 100644
--- a/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.tex
+++ b/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.tex
@@ -1,4 +1,4 @@
-% Last modified: Tue 09 Nov 2021 07:45:28 PM CST
+% Last modified: Sat 04 Dec 2021 01:43:53 PM CST
\documentclass[11pt,letterpaper,oneside]{article}
\usepackage{windycity}
@@ -8,7 +8,7 @@
\author{Brian Chase}
\email{brianmichaelchase@gmail.com}
\website{https://github.com/brianchase/windycity}
-\version{2021-11-09}
+\version{2021-12-04}
\maketitle
\begingroup
\hypersetup{linkcolor=black}
@@ -224,10 +224,10 @@ Let's start with another passage of default output:
\item \cite[24--26]{morrison2004a}
\item \cite[401-2]{morrison2004b}
\item \cite[433]{morrison2004b}
-\item \cite[37--38]{diaz2008}
+\item \cite[37--38]{diaz2007}
\item \cite[403]{morrison2004b}
-\item \cite[152]{diaz2008}
-\item \cite[201-2]{diaz2008}
+\item \cite[152]{diaz2007}
+\item \cite[201-2]{diaz2007}
\item \cites[240]{morrison2004b}[32]{morrison2004a}
\item \cite[33]{morrison2004a}
\end{citeonly}
@@ -254,13 +254,13 @@ possible.}
\AtNextCitekey{\toggletrue{short}}
\item \cite[433]{morrison2004b}
\AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}}
-\item \cite[37--38]{diaz2008}
+\item \cite[37--38]{diaz2007}
\AtNextCitekey{\toggletrue{short}}
\item \cite[403]{morrison2004b}
\AtNextCitekey{\toggletrue{short}}
-\item \cite[152]{diaz2008}
+\item \cite[152]{diaz2007}
\AtNextCitekey{\toggletrue{short}}
-\item \cite[201-2]{diaz2008}
+\item \cite[201-2]{diaz2007}
\AtNextMultiCite{\toggletrue{short}}
\item \cites[240]{morrison2004b}[32]{morrison2004a}
\AtNextCitekey{\toggletrue{short}}
@@ -301,13 +301,13 @@ break here may affect the output.}
\AtNextCitekey{\toggletrue{short}\toggletrue{ibid}}
\item \cite[433]{morrison2004b}
\AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}}
-\item \cite[37--38]{diaz2008}
+\item \cite[37--38]{diaz2007}
\AtNextCitekey{\toggletrue{short}}
\item \cite[403]{morrison2004b}
\AtNextCitekey{\toggletrue{short}}
-\item \cite[152]{diaz2008}
+\item \cite[152]{diaz2007}
\AtNextCitekey{\toggletrue{short}\toggletrue{ibid}}
-\item \cite[201-2]{diaz2008}
+\item \cite[201-2]{diaz2007}
\AtNextMultiCite{\toggletrue{short}\toggletrue{shortfirst}}
\item \cites[240]{morrison2004b}[32]{morrison2004a}
\AtNextCitekey{\toggletrue{short}}
@@ -325,7 +325,7 @@ same author (see section \ref{preamble}). The entry option
\opt{noauth} omits the author's name altogether (see section
\ref{entry}). And the \bibfield{shorthand} field allows you to set an
abbreviation to stand in place of the author's name, the work's title,
-and other elements of a citation (see sections \ref{otherfields} and
+and other elements of a citation (see sections \ref{stdfields} and
\ref{14.59}).
\subsection{Preamble Options}
@@ -376,10 +376,11 @@ field of a work's bibliography database entry.
\noindent Citing individual works of a collection adds entries for
those works to the bibliography. To exclude them and print only an
entry for the whole collection, use \opt{collsonly}. It has no effect
-on many \bibtype{incollection} entries, such as articles in books, but
-it does filter out chapters of books, books in books, and volumes of
-collections. For discussion of multivolume works, see section
-\ref{multivolume}.
+on many \bibtype{incollection} entries, such as articles in books, or
+on \bibtype{article} entries cross-referenced to a
+\bibtype{periodical}, but it does filter out chapters of books, books
+in books, and volumes of collections. For discussion of multivolume
+works, see section \ref{multivolume}.
\optitem[true]{dashed}{\opt{true}, \opt{false}}
@@ -460,6 +461,13 @@ use it with the \opt{isbn} and \opt{annotation} options, it prints
after the former but before the latter. To print this information for
selected works, use the \opt{library} entry option.
+\optitem[false]{noetal}{\opt{true}, \opt{false}}
+
+\noindent This option disables the truncation of name lists in all
+citations and bibliographies. To disable truncation in the citations
+and bibliography entries of specific works, use the \opt{noetal} entry
+option.
+
\optitem[false]{nolos}{\opt{true}, \opt{false}}
\noindent By default, every work with a \bibfield{shorthand} receives
@@ -530,13 +538,13 @@ in \textit{CMOS} \ref{14.34}:
\AtNextCitekey{\toggletrue{short}}
\item \cite[433]{morrison2004b}
\AtNextCitekey{\toggletrue{short}}
-\item \cite[37--38]{diaz2008}
+\item \cite[37--38]{diaz2007}
\AtNextCitekey{\toggletrue{short}}
\item \cite[403]{morrison2004b}
\AtNextCitekey{\toggletrue{short}}
-\item \cite[152]{diaz2008}
+\item \cite[152]{diaz2007}
\AtNextCitekey{\toggletrue{short}}
-\item \cite[201-2]{diaz2008}
+\item \cite[201-2]{diaz2007}
\AtNextMultiCite{\toggletrue{short}}
\item \cites[240]{morrison2004b}[32]{morrison2004a}
\AtNextCitekey{\toggletrue{short}}
@@ -698,6 +706,25 @@ title's position. Below is an example from \textit{CMOS} \ref{14.105}:
affecting the bibliography, use starred versions of citation commands,
such as \cmd{cite*}, \cmd{footcite*}, and \cmd{parencite*}.
+\optitem[false]{noetal}{\opt{true}, \opt{false}}
+
+\noindent This option disables the truncation of name lists in the
+citations and bibliography entries of specific works. To disable
+truncation in all works, use the \opt{noetal} preamble option.
+
+\optitem[false]{noplace}{\opt{true}, \opt{false}}
+
+\noindent In contexts where Windy City expects to print a publisher's
+location, but no location is specified in the bibliography database,
+you can tell it to print \textit{n.p.} (for \textit{no place}) with
+this option. From \textit{CMOS} \ref{14.132}:
+
+\begin{citeonly}
+%\begin{itemize}[before=\small,itemindent=0ex]
+\item[] \cite{windsor1910}
+\end{citeonly}
+%\end{itemize}
+
\optitem[false]{noreprint}{\opt{true}, \opt{false}}
\noindent This option helps if you need to indicate a work's original
@@ -999,9 +1026,7 @@ three ways:
\footnote{Sutton, \cite*{sutton1959}; Fussell, \cite*{fussell1962}...
\end{verbatim}
-\noindent They're ugly workarounds, exploiting starred citations
-commands to suppress the author's position while you add names
-manually---but they do work.
+\noindent They're ugly workarounds, but they work.
With \cmd{idemcites} and \cmd{footidemcites}, on the other hand, you
have simpler alternatives that make your intentions clearer and your
@@ -1031,73 +1056,98 @@ context makes it clear or if the inclusion of \textit{n.d.} (for
As with \cmd{parencite*} and \cmd{parencites*}, use these commands
with care. Dropping the year from parenthetical citations could result
-in bad output, such as empty parentheses or ambiguous references.
+in bad output, such as empty parentheses or ambiguous references. From
+\textit{CMOS} \ref{15.54}.
-For an example, see \textit{CMOS} \ref{15.54}.
+\begin{quote}
+Alvin Johnson, in a memorandum prepared sometime in 1937
+\parenauth[file 36]{kallen}, observed that\ldots
+\end{quote}
\subsection{Entry Types}
\label{entrytypes}
-Windy City recognizes every entry type from \BibTeX, as well as some
-that are specific to \biblatex.
+You may assign any work to one of the core entry types in the list
+below or to one of their so-called ``type aliases,'' which, minor
+differences aside, give the same output. If an entry has a type other
+than the ones listed below, Windy City processes it as a
+\bibtype{book}.
\begin{typelist}
\RaggedRight
\typeitem{article}
-Alias: \bibtype{periodical}
+Type alias: \bibtype{periodical}
+
+\typeitem{artwork}
+
+Type alias: \bibtype{image}
\typeitem{book}
-Aliases: \bibtype{booklet}, \bibtype{collection}, \bibtype{manual},
-\bibtype{mvbook}, \bibtype{mvcollection}, \bibtype{proceedings},
-\bibtype{report}, \bibtype{techreport}
+Type aliases: \bibtype{booklet}, \bibtype{manual}, \bibtype{mvbook},
+\bibtype{mvcollection}, \bibtype{proceedings}, \bibtype{report},
+\bibtype{techreport}
+
+\typeitem{collection} No type aliases
+
+\typeitem{inbook}
+
+Type alias: \bibtype{bookinbook}
\typeitem{incollection}
-Aliases: \bibtype{bookinbook}, \bibtype{conference},
-\bibtype{inproceedings}, \bibtype{inbook}, \bibtype{letter},
+Type aliases: \bibtype{conference}, \bibtype{inproceedings},
\bibtype{suppbook}, \bibtype{suppcollection}
-\typeitem{letter} No aliases
-\typeitem{misc} No aliases
-\typeitem{online} No aliases
-\typeitem{patent} No aliases
+\typeitem{letter} No type aliases
+\typeitem{misc} No type aliases
+\typeitem{online}
+
+Type aliases: \bibtype{electronic}, \bibtype{www}
+
+\typeitem{patent} No type aliases
\typeitem{reference}
-Alias: \bibtype{inreference}
+Type alias: \bibtype{inreference}
+
+\typeitem{review} No type aliases
-\typeitem{review} No aliases
+\typeitem{standard} No type aliases
\typeitem{thesis}
-Aliases: \bibtype{mastersthesis}, \bibtype{phdthesis}
+Type aliases: \bibtype{mastersthesis}, \bibtype{phdthesis}
-\typeitem{unpublished}
+\typeitem{unpublished} No type aliases
\end{typelist}
-\noindent For the most part, you may assign every work to the basic
-entry types listed above. A PhD thesis, for example, may have a
-\bibtype{thesis} or \bibtype{phdthesis} entry type. The output is the
-same. If an entry has a type other than the ones listed above, Windy
-City processes it as a book.
+Aliases don't always have the same functions, even when they're fully
+interchangeable. The difference, though, might be just conceptual. For
+example, articles in a periodical should take the \bibtype{article}
+entry type rather than \bibtype{periodical}---not because there's any
+difference in output, but because, if only in principle, the latter is
+for citing the periodical itself, not its contents. If you want to
+save some lines in your bibliography database, use it for a periodical
+when you cite multiple articles from that source.
-One comment about \bibtype{reference} and \bibtype{inreference}
-entries: You may cross-reference \bibtype{inreference} entries to
-\bibtype{reference} entries, as with articles in books, but you can
-get the same output with one or the other alone. Take an example from
-\textit{CMOS} \ref{14.232}:
+The same is true for the \bibtype{inreference} and \bibtype{reference}
+entry types. You may cross-reference \bibtype{inreference} entries to
+\bibtype{reference} entries, but they're otherwise equivalent. Take an
+example from \textit{CMOS} \ref{14.232}:
\begin{citeonly}
\item \cite{salvation1980}
\end{citeonly}
-A bibliography database could have an \bibtype{inreference} entry for
-the article cross-ref\-er\-enc\-ed to a \bibtype{reference} entry for
-\textit{Encyclopaedia Britannica}:
+\noindent One way to get that output is to cross-reference an
+\bibtype{inreference} entry (for the article) to a \bibtype{reference}
+entry (for the encyclopedia):\footnote{Incidentally, reference works
+don't always have titles in italics. When necessary, you need to set
+italics in your bibliography database.}
\begin{verbatim}
@InReference{salvation1980,
@@ -1111,11 +1161,7 @@ the article cross-ref\-er\-enc\-ed to a \bibtype{reference} entry for
}
\end{verbatim}
-\noindent This approach makes sense if you plan to cite more than one
-article from the source.\footnote{Incidentally, reference works don't
-always have titles in italics. As a result, you need to set italics in
-your bibliography database.} But you could also have a single entry of
-either type with the same data:
+\noindent But you could also have a single entry of either type:
\begin{verbatim}
@Reference{salvation1980,
@@ -1126,6 +1172,10 @@ either type with the same data:
}
\end{verbatim}
+On the differences between the \bibtype{thesis},
+\bibtype{mastersthesis}, and \bibtype{phdthesis} entry types, see
+section \ref{stdfields}.
+
For unusually complicated citations, or those just not supported by
the style, consider using the \bibtype{misc} entry type. The style
handles these entries in way that makes it a fallback for almost
@@ -1178,15 +1228,15 @@ cross-references above:
\noindent The option \opt{skipdate} is necessary only if you plan to
format your bibliography as a reference list. It prevents Windy City
-from printing \textit{n.d.} (no date) after the name to indicate a
-missing publication date. After adding the \bibtype{misc} entries, use
-\cmd{nocite} with their entry keys to add them to your bibliography,
-and cite the remaining entries as usual. For examples of automatic
-cross-referencing in notes and bibliographies see section \ref{notes}
-(\ref{14.108}), section \ref{paren} (\ref{15.42}), and section
-\ref{collections}.
+from printing \textit{n.d.} (for \textit{no date}) after the author's
+position.
-For more discussion of entry types, see section \ref{datafields}.
+Use \cmd{nocite} with the \bibtype{misc} entries to add them to your
+bibliography, then cite the remaining entries as usual.
+
+For examples of automatic cross-referencing in notes and
+bibliographies see section \ref{notes} (\ref{14.108}), section
+\ref{paren} (\ref{15.42}), and section \ref{collections}.
\subsection{Data Fields}
\label{datafields}
@@ -1220,10 +1270,6 @@ For pseudonymous authors, another solution is to use the
\bibfield{nameaddon} allows you to include an author's given name in
the brackets. For examples, see \textit{CMOS} \ref{14.81}.
-\item[collection] Use this field with \bibtype{unpublished} works for
-names of manuscript collections. See examples in \textit{CMOS}
-\ref{14.222}, \ref{14.229}, and \ref{14.230}.
-
\item[edition] To indicate a numbered edition of a work, put the
edition's number in this field---for example, \textit{2} for a second
edition. To indicate a revised edition, enter either \textit{revised}
@@ -1265,6 +1311,7 @@ contain:
\end{verbatim}
\noindent Whereas for \textit{Autumn 2013}, use either:
+%, put either \textit{2013-23} in \bibfield{date} or:
\begin{verbatim}
date = {2013-23},
@@ -1280,6 +1327,14 @@ contain:
\noindent Note that when \bibfield{date} contains just a year of
publication, you may use the classic \bibfield{year} field.
+\item[label] The publication year of a work is usually easy for Windy
+City to determine. It simply reads the \bibfield{date} or
+\bibfield{year} field of a work's bibliography database entry. But
+sometimes, especially when works with different publication dates are
+cross-referenced, the style needs to make difficult choices. If it
+picks the wrong year, you can override the error by putting the
+correct one in the \bibfield{label} field.
+
\item[pages] See comments on the \opt{nopages} preamble option in
section \ref{preamble}.
@@ -1300,11 +1355,18 @@ field.
\nocite{faraday,huang2015,jubb2015,lucki1980}
\end{bibonly}
-\item[series] See comments on \bibfield{seriesaddon} in section
-\ref{datafields}.
+\item[shorthand] Windy City doesn't automatically italicize a
+\bibfield{shorthand}. Per \textit{CMOS} 14.60, a shorthand should be
+italicized if the title that it abbreviates is italicized. Set it in
+the bibliography database with \cmd{emph} or \cmd{mkbibemph}. For
+examples of a \bibfield{shorthand}, see section \ref{14.59} and the
+first citation of \textit{CMOS} in this document's introduction.
-\item[shortcollection] Similar to \bibfield{shorttitle} but for the
-short name of a \bibfield{collection}.
+\item[shorthandintro] You may override the default announcement of a
+\bibfield{shorthand} by adding your preferred content to
+\bibfield{shorthandintro}. See the first citation of \textit{CMOS} in
+this document's introduction, where the announcement isn't a note in
+parentheses but its own sentence.
\item[titleaddon] Like \bibfield{nameaddon}, this field encloses its
content in brackets. This is especially useful for translated titles.
@@ -1338,32 +1400,14 @@ 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}.
-\item[typeaddon] In bibliography entries of \bibtype{unpublished}
-works, this field adds arbitrary content after the \bibfield{type}
-field. To replicate examples in \textit{CMOS} \ref{14.217}, use
-\bibfield{typeaddon} with the value \textit{presented at the}:
-
-\begin{bibonly}
-\nocite{hong2015}
-\nocite{teplin2005}
-\end{bibonly}
-
-\noindent For \textit{CMOS} \ref{14.216}, \bibfield{typeaddon}
-contains \textit{last modified}, preceded by a comma and a space:
-
-\begin{citebib}
-\item \cite{balderdash2017}
-\end{citebib}
-
\end{marglist}
-\subsubsection{Other Data Fields}
-\label{otherfields}
+\subsubsection{Nonstandard Data Fields}
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 usually meant for use in a bibliography database (but see
-section \ref{editors.other}). The rest store information that's
+section \ref{editors:other}). 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}.
@@ -1374,6 +1418,10 @@ blog goes in \bibfield{blogtitle} and \bibfield{blogsubtitle}. Keep in
mind that blog posts take the usual \bibfield{title} and
\bibfield{subtitle} fields.
+\item[collection] Use this field with \bibtype{unpublished} works for
+names of manuscript collections. See examples in \textit{CMOS}
+\ref{14.222}, \ref{14.229}, and \ref{14.230}.
+
\item[editoraddon] This field holds editorial information about a work
that belongs immediately after \bibfield{editor} has printed, without
intervening punctuation. For an example, see \textit{CMOS}
@@ -1400,24 +1448,31 @@ journals, which occasionally have a series but no series name,
information like \textit{2nd ser.} and \textit{n.s.} go in the
\bibfield{series} field.
-\item[shorthand] Windy City doesn't automatically italicize a
-\bibfield{shorthand}. Per \textit{CMOS} 14.60, a shorthand should be
-italicized if the title that it abbreviates is italicized. Set it in
-the bibliography database with \cmd{emph} or \cmd{mkbibemph}. For
-examples of a \bibfield{shorthand}, see section \ref{14.59} and the
-first citation of \textit{CMOS} in this document's introduction.
-
-\item[shorthandintro] You may override the default announcement of a
-\bibfield{shorthand} by adding your preferred content to
-\bibfield{shorthandintro}. See the first citation of \textit{CMOS} in
-this document's introduction, where the announcement isn't a note in
-parentheses but its own sentence.
+\item[shortcollection] Similar to \bibfield{shorttitle} but for the
+short name of a \bibfield{collection}.
\item[shortmaintitle] This field contains the short form of a
\bibfield{maintitle}. It should only be necessary for certain works in
collections. See the citation of \textit{The Complete Tales of Henry
James} in section \ref{multivolume}.
+\item[typeaddon] In bibliography entries of \bibtype{unpublished}
+works, this field adds arbitrary content after the \bibfield{type}
+field. To replicate examples in \textit{CMOS} \ref{14.217}, use
+\bibfield{typeaddon} with the value \textit{presented at the}:
+
+\begin{bibonly}
+\nocite{hong2015}
+\nocite{teplin2005}
+\end{bibonly}
+
+\noindent For \textit{CMOS} \ref{14.216}, \bibfield{typeaddon}
+contains \textit{last modified}, preceded by a comma and a space:
+
+\begin{citebib}
+\item \cite{balderdash2017}
+\end{citebib}
+
\end{marglist}
\section{Editors and Translators}
@@ -2331,10 +2386,13 @@ one work in one volume.
As mentioned in \textit{CMOS} \ref{15.41}, reference lists should give
priority to the volume, not to the collection. Nevertheless, Windy
City doesn't prevent you from using \opt{swapvol} with \opt{reflist}.
-Either way, remember that when a volume and a collection have
-different publication dates, a reference list entry prints both dates,
-which in turn requires you to use the \bibtype{bookinbook} or
-\bibtype{inbook} approach.
+(If you do use them together, it's best to choose the \opt{swapvol}
+entry option, which does a better job at formatting and sorting works
+in reference lists than the \opt{swapvol} preamble option.) Either
+way, remember that when a volume and a collection have different
+publication dates, a reference list entry prints both dates, which in
+turn requires you to use the \bibtype{bookinbook} or \bibtype{inbook}
+approach.
\begin{refonly}
\nocite{armstrong2014}
@@ -2641,13 +2699,13 @@ options, see sections \ref{short} and \ref{preamble}.
\AtNextCitekey{\toggletrue{short}}
\item \cite[433]{morrison2004b}
\AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}}
-\item \cite[37--38]{diaz2008}
+\item \cite[37--38]{diaz2007}
\AtNextCitekey{\toggletrue{short}}
\item \cite[403]{morrison2004b}
\AtNextCitekey{\toggletrue{short}}
-\item \cite[152]{diaz2008}
+\item \cite[152]{diaz2007}
\AtNextCitekey{\toggletrue{short}}
-\item \cite[201-2]{diaz2008}
+\item \cite[201-2]{diaz2007}
\AtNextMultiCite{\toggletrue{short}}
\item \cites[240]{morrison2004b}[32]{morrison2004a}
\AtNextCitekey{\toggletrue{short}} \item \cite[33]{morrison2004a}
@@ -2669,13 +2727,13 @@ options, see sections \ref{short} and \ref{preamble}.
\AtNextCitekey{\toggletrue{short}\toggletrue{ibid}}
\item \cite[433]{morrison2004b}
\AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}}
-\item \cite[37--38]{diaz2008}
+\item \cite[37--38]{diaz2007}
\AtNextCitekey{\toggletrue{short}}
\item \cite[403]{morrison2004b}
\AtNextCitekey{\toggletrue{short}}
-\item \cite[152]{diaz2008}
+\item \cite[152]{diaz2007}
\AtNextCitekey{\toggletrue{short}\toggletrue{ibid}}
-\item \cite[201-2]{diaz2008}
+\item \cite[201-2]{diaz2007}
\AtNextMultiCite{\toggletrue{short}\toggletrue{shortfirst}}
\item \cites[240]{morrison2004b}[32]{morrison2004a}
\AtNextCitekey{\toggletrue{short}}
@@ -2719,7 +2777,7 @@ Whitman's forms.\footnotemark[1] \end{quote}
% 14.59 Abbreviations for frequently cited works
\label{14.59}
-For information on shorthands, see section \ref{otherfields}.
+For information on shorthands, see section \ref{stdfields}.
\begin{citebib}
% There's no way to suppress these fields in the bibliography:
@@ -3280,6 +3338,10 @@ field for the second example below contains \textit{vol. 6}.
\setcounter{subsubsection}{131}
\subsubsection{No place of publication}
% 14.132 No place of publication
+\label{14.132}
+
+To insert \textit{n.p.} (for \textit{no place}), you need to use the
+entry option \opt{noplace}. See section \ref{entry}.
\begin{citeonly}
%\begin{itemize}[before=\small,itemindent=0ex]
@@ -3818,6 +3880,15 @@ for more information.
\item \cite{isaacson2005}
\end{citebib}
+\subsubsection{Citing paintings, photographs, and sculpture}
+% 14.235 Citing paintings, photographs, and sculpture
+
+\begin{citebib}
+\item \cite{dali1931}
+\item \cite{mccurry1984}
+\item \cite{picasso1942}
+\end{citebib}
+
\setcounter{subsubsection}{245}
\subsubsection{Citing specific editions of classical references}
% 14.246 Citing specific editions of classical references
@@ -3843,6 +3914,14 @@ for more information.
\item \cite{iizuka1986}
\end{citebib}
+\subsubsection{Standards}
+% 14.259 Standards
+
+\begin{citebib}
+\item \cite[3.2.2]{niso2010}
+\item \cite{w3c2008}
+\end{citebib}
+
\setcounter{subsubsection}{259}
\subsubsection{Citations taken from secondary sources}
% 14.260 Citations taken from secondary sources
@@ -4128,7 +4207,8 @@ with \ref{14.208} and \ref{15.42}.
% 15.54 Manuscript collections in author-date format
\label{15.54}
-An example using \cmd{parenauth} (see section \ref{parenauth}):
+This example requires the \cmd{parenauth} citation command (see
+section \ref{parenauth}):
\begin{citeref}
\item Alvin Johnson, in a memorandum prepared sometime in 1937
diff --git a/macros/latex/contrib/biblatex-contrib/windycity/windycity.bbx b/macros/latex/contrib/biblatex-contrib/windycity/windycity.bbx
index 6537e4c13d..f0ebc54803 100644
--- a/macros/latex/contrib/biblatex-contrib/windycity/windycity.bbx
+++ b/macros/latex/contrib/biblatex-contrib/windycity/windycity.bbx
@@ -1,4 +1,4 @@
-% Last modified: Tue 09 Nov 2021 07:46:28 PM CST
+% Last modified: Sat 04 Dec 2021 01:25:10 PM CST
% Permission is granted to copy, distribute and/or modify this
% software under the terms of the LaTeX Project Public License (LPPL),
@@ -11,7 +11,7 @@
% implied warranties of merchantability and fitness for a particular
% purpose.
-\ProvidesFile{windycity.bbx}[2021/11/09 Windy City bibliography style
+\ProvidesFile{windycity.bbx}[2021/12/04 Windy City bibliography style
for biblatex]
\@ifpackagelater{biblatex}{2019/08/17}
{}
@@ -32,8 +32,7 @@
\DeclareBiblatexOption{global}[boolean]{collsonly}[true]{%
\ifstrequal{#1}{true}
- {\ExecuteBibliographyOptions{mincrossrefs=1}%
- \ExecuteBibliographyOptions{minxrefs=1}%
+ {\ExecuteBibliographyOptions{mincrossrefs=1,minxrefs=1}%
\AtBeginBibliography{\blx@key@bibcheck{collsonly}}}
{}}
@@ -85,6 +84,10 @@
\DeclareBiblatexOption{entry}[boolean]{noauth}[true]{%
\settoggle{noauth}{#1}}%
+\providetoggle{noetal}
+\DeclareBiblatexOption{entry,global}[boolean]{noetal}[true]{%
+ \settoggle{noetal}{#1}}%
+
\DeclareBiblatexOption{global}[boolean]{nolos}[true]{%
\ifstrequal{#1}{true}
{\AtBeginBibliography{\blx@key@bibcheck{nolos}}}
@@ -94,6 +97,10 @@
\DeclareBiblatexOption{global}[boolean]{nopages}[true]{%
\settoggle{nopages}{#1}}%
+\providetoggle{noplace}
+\DeclareBiblatexOption{entry}[boolean]{noplace}[true]{%
+ \settoggle{noplace}{#1}}%
+
\providetoggle{noreprint}
\DeclareBiblatexOption{entry}[boolean]{noreprint}[true]{%
\settoggle{noreprint}{#1}}%
@@ -102,14 +109,7 @@
\DeclareBiblatexOption{global}[boolean]{reflist}[true]{%
\ifstrequal{#1}{true}
{\toggletrue{reflist}%
- \DeclareLabeldate{%
- \field{date}
- \field{year}
- \field{origdate}
- \field{urldate}
- \literal{nodate}}
- \ExecuteBibliographyOptions{%
- sorting=nyt}}%
+ \ExecuteBibliographyOptions{sorting=nyt}}%
{\togglefalse{reflist}}}
\providetoggle{short}
@@ -175,12 +175,17 @@
\settoggle{swaptrans:maintitle}{#1}}%
\providetoggle{swapvol}
-\DeclareBiblatexOption{entry,global}[boolean]{swapvol}[true]{%
+\DeclareBiblatexOption{entry}[boolean]{swapvol}[true]{%
\settoggle{swapvol}{#1}}%
+\providetoggle{swapvol:global}
+\DeclareBiblatexOption{global}[boolean]{swapvol}[true]{%
+ \settoggle{swapvol}{#1}%
+ \settoggle{swapvol:global}{#1}}%
+
\providetoggle{url}
\DeclareBiblatexOption{entry,global}[boolean]{url}[true]{%
- \settoggle{url}{#1}}
+ \settoggle{url}{#1}}%
% For setting 'minbibnames' and such, see CMOS, 17th ed., 14.76 and
% 15.29. For 'citetracker' and 'loccittracker', 'constrict' is too
@@ -201,6 +206,7 @@
ibidtracker=constrict,
idemtracker=false,
indexing=true,
+ labeldate=year,
labeldateparts=true,
loccittracker=context,
minbibnames=7,
@@ -209,6 +215,7 @@
maxcitenames=3,
mincrossrefs=2,
minxrefs=2,
+ nohashothers=false,
pagetracker=page,
parentracker=true,
sortcites=false,
@@ -226,7 +233,9 @@
\DeclareLanguageMapping{english}{american-windycity}
\DeclareLanguageMappingSuffix{-windycity}
-\DeclareLabeldate{% 'reflist' preamble option loads an alternative
+\DeclareLabeldate{%
+ \field{label}
+ \field{setlabel}
\field{bookyear}
\field{date}
\field{year}
@@ -421,7 +430,7 @@
\step[fieldset=$MAPLOOPkey, null]
}
\map[overwrite, foreach={%
- editor,editora,editorb,editorc,translator,translatora,translatorb}]{
+ editor,editora,editorb,editorc,translator,translatora,translatorb}]{
\step[fieldsource=entrykey]
\step[fieldset=$MAPLOOPtype, fieldvalue={,}, appendstrict]
\step[fieldset=$MAPLOOPtype, origfieldval, append]
@@ -431,7 +440,32 @@
}
}
-% For 'collsonly' and 'nolos' options and the 'reference' entry type.
+% Workarounds to get the correct 'labeldate'.
+
+\DeclareStyleSourcemap{
+ \maps[datatype=bibtex]{
+ \map[overwrite=false]{
+ \pertype{inbook}
+ \pertype{bookinbook}
+ \step[notfield=options, final]
+ \step[fieldsource=year, final]
+ \step[fieldset=setlabel, origfieldval]
+ }
+ }
+}
+\DeclareStyleSourcemap{
+ \maps[datatype=bibtex]{
+ \map[overwrite=false]{
+ \pertype{inbook}
+ \pertype{bookinbook}
+ \step[fieldsource=options, notmatch=\regexp{swapvol}, final]
+ \step[fieldsource=year, final]
+ \step[fieldset=setlabel, origfieldval]
+ }
+ }
+}
+
+% For 'collsonly' and 'nolos' options and the '@reference' entry type.
\defbibcheck{collsonly}{%
\ifentrytype{inbook}
@@ -764,14 +798,14 @@
\DeclareListFormat{publisher}{#1}
\DeclareFieldFormat{pubstate}{\ifcapital{\MakeCapital{#1}}{#1}}%
\DeclareFieldFormat{season}{\MakeCapital{#1}}% always capitalize
+\DeclareFieldFormat{series}{\ifcapital{\MakeCapital{#1}}{#1}}
% A shorthand should be italicized if the title that it abbreviates is
% also italicized. See CMOS, 17th ed., 14.60. Set italics for it in
% the bibliography database with '\emph{}' or '\mkbibemph{}'.
\DeclareFieldFormat{shorthand}{#1}
-\DeclareFieldFormat{shorthandintro}{%
- \ifcapital{\MakeCapital{#1}}{#1}}%
+\DeclareFieldFormat{shorthandintro}{\ifcapital{\MakeCapital{#1}}{#1}}%
\DeclareFieldFormat{shorthandwidth}{#1}
\DeclareFieldFormat{type}{\ifcapital{\MakeCapital{#1}}{#1}}%
\DeclareFieldFormat{url}{\url{#1}}
@@ -784,6 +818,7 @@
\DeclareDriverSourcemap[datatype=bibtex]{
\map{
\step[typesource=periodical, typetarget=article]
+ \step[typesource=image, typetarget=artwork]
\step[typesource=booklet, typetarget=book]
\step[typesource=manual, typetarget=book]
\step[typesource=mvbook, typetarget=book]
@@ -1365,8 +1400,11 @@
\newbibmacro*{printnames}{%
\ifnameundef{\cbx@namelist}
{}
- {\pluga\anona\printnames[\cbx@deflabel]{%
- \cbx@namelist}\anonb\plugb}}%
+ {\iftoggle{noetal}
+ {\pluga\anona\printnames[\cbx@deflabel][-\value{listtotal}]{%
+ \cbx@namelist}\anonb\plugb}%
+ {\pluga\anona\printnames[\cbx@deflabel]{%
+ \cbx@namelist}\anonb\plugb}}}
% A screen name precedes 'nameaddon' and can be omitted from short
% citations. See CMOS, 17th ed., 14.209.
@@ -1503,12 +1541,11 @@
\usebibmacro{title+titleaddon}{orig}%
\setunit{\addspace}% not '\setunit{\space}'
\printtext[parens]{%
- \usebibmacro{origlocation}%
- \usebibmacro{origpublisher}%
+ \usebibmacro{loc+pub+etc}{orig}%
\ifboolexpr{ togl {bibliography}
and togl {reflist}}
{}
- {\usebibmacro{origyear+origendyear}}}}}
+ {\usebibmacro{year+endyear}{orig}}}}}
%%%%%%%%%%%%%%%%%%%
%% Collections %%
@@ -1712,49 +1749,50 @@
\newbibmacro*{year+bookyear}{%
\ifboolexpr{ togl {bibliography}
and togl {reflist}}
- {\ifboolexpr{ test {\iffieldundef{bookyear}}
- or test {\iffieldundef{year}}
- or test {\iffieldsequal{year}{bookyear}}
- or not test {\iffieldequalstr{labeldatesource}{bookyear}}}
+ {\ifboolexpr{ test {\iffieldundef{year}}
+ or test {\iffieldundef{bookyear}}
+ or test {\iffieldsequal{year}{bookyear}}}
{}
- {\printfield{bookyear}%
- \usebibmacro{endbookyear}}}
+ {\ifboolexpr{ togl {collection}
+ and togl {swapvol}}
+ {\usebibmacro{year+endyear}{}}%
+ {\usebibmacro{year+endyear}{book}}}}
{\ifboolexpr{ test {\iffieldundef{year}}
and test {\iffieldundef{bookyear}}}
{\usebibmacro{pubstate}{label}}%
{\iffieldundef{bookyear}
- {\printfield{year}%
- \usebibmacro{endyear}}%
+ {\usebibmacro{year+endyear}{}}%
{\ifboolexpr{ togl {collection}
and togl {swapvol}
and not test {\iffieldundef{year}}}
- {\printfield{year}%
- \usebibmacro{endyear}}%
- {\printfield{bookyear}%
- \usebibmacro{endbookyear}}}}}}
+ {\usebibmacro{year+endyear}{}}%
+ {\usebibmacro{year+endyear}{book}}}}}}
-\newbibmacro*{endyear}{%
- \iffieldundef{endyear}
+\newbibmacro*{year+endyear}[1]{%
+ \iffieldundef{#1year}
{}
- {\iffieldsequal{year}{endyear}
+ {\ifboolexpr{ togl {bibliography}
+ and togl {reflist}
+ and test {\iffieldsequal{#1year}{label}}}
{}
- {\textendash\printfield{endyear}}}}
+ {\printfield{#1year}%
+ \usebibmacro{endyear}{#1}}}}
-\newbibmacro*{endbookyear}{%
- \iffieldundef{endbookyear}
+\newbibmacro*{endyear}[1]{%
+ \ifboolexpr{ test {\iffieldundef{#1endyear}}
+ or test {\iffieldsequal{#1year}{#1endyear}}}
{}
- {\iffieldsequal{bookyear}{endbookyear}
- {}
- {\textendash\printfield{endbookyear}}}}
+ {\textendash\printfield{#1endyear}}}
-\newbibmacro*{origyear+origendyear}{%
- \iffieldundef{origyear}
+\newbibmacro*{month+season+year}{%
+ \ifboolexpr{ togl {reflist}
+ and test {\iffieldundef{month}}
+ and test {\iffieldundef{season}}}
{}
- {\printfield{origyear}%
- \ifboolexpr{ test {\iffieldundef{endorigyear}}
- or test {\iffieldsequal{origyear}{endorigyear}}}
- {}
- {\textendash\printfield{endorigyear}}}}
+ {\iffieldundef{year}
+ {\printlabeldate}% for 'n.d.'
+ {\printdate
+ \clearfield{year}}}}
\newbibmacro*{year+month+day}{%
\iffieldundef{year}
@@ -1764,18 +1802,6 @@
\printdate}%
{\printdate}}}
-\newbibmacro*{year+month+day+old}{%
- \iffieldundef{year}
- {}
- {\ifboolexpr{ togl {reflist}
- and togl {bibliography}
- and test {\iffieldundef{month}}}
- {}
- {\iffieldundef{month}
- {\usebibmacro{reflist+year+day}%
- \printdate}%
- {\printdate}}}}
-
% For reference lists.
\newbibmacro*{a:labeldate+extradate}{%
@@ -1805,26 +1831,17 @@
\newbibmacro*{reflist+origyear}{%
\iffieldundef{origyear}
{}
- {\printtext[parens]{\usebibmacro{origyear+origendyear}}%
+ {\printtext[parens]{\usebibmacro{year+endyear}{orig}}%
\space}}%
-% The next macro helps bib environments that use the 'reflist' toggle
-% (see the 'reflist' bib environment set elsewhere in this file).
-% Since they can't use the 'reflist' preamble option, they can't load
-% the DeclareLabeldate for reference lists. The macro below makes the
-% output consistent in those cases but can cause problems with
-% sorting. Resolve them with '\sortyear'. Also, end dates go here. See
-% CMOS, 17th ed., 15.37 and 15.41. Although '\printlabeldate' prints
-% them, the workaround needs to run 'endyear', which can cause
-% problems not only with sorting but with 'extralabeldate'.
-
\newbibmacro*{labeldate+endyear}{%
- \iffieldequalstr{labeldatesource}{bookyear}
- {\iffieldundef{year}
- {\usebibmacro{pubstate}{label}}%
- {\usebibmacro{pubstate}{date}%
- \usebibmacro{endyear}}}
- {\usebibmacro{pubstate}{label}}}
+ \ifboolexpr{ togl {collection}
+ and togl {swapvol:global}
+ and test {\iffieldundef{label}}
+ and not test {\iffieldundef{bookyear}}
+ and not test {\iffieldsequal{year}{bookyear}}}
+ {\usebibmacro{year+endyear}{book}}%
+ {\usebibmacro{pubstate}{label}}}
%%%%%%%%%%%%%%%%%
%% Locations %%
@@ -1834,45 +1851,43 @@
\iflistundef{location}
{}
{\nopunct\setunit{\space}%
- \printtext[parens]{%
- \printlist{location}}}%
+ \printtext[parens]{\printlist{location}}}%
\clearlist{location}}%
-\newbibmacro*{loc+pub+year}{%
- \usebibmacro{loc+pub}{1}%
- \ifnumgreater{\value{publisher}}{1}
- {\setunit{\addsemicolon\space}%
- \usebibmacro{loc+pub}{2}}%
+\newbibmacro*{loc+pub+etc}[1]{%
+ \ifboolexpr{ test {\iflistundef{#1location}}
+ and test {\iflistundef{#1publisher}}}
{}
- \setunit{\addcomma\space}%
- \usebibmacro{year+bookyear}}%
+ {\usebibmacro{pubcount}%
+ \whileboolexpr{ test {\ifnumless{\value{pubcount}}{\value{#1location}}}
+ or test {\ifnumless{\value{pubcount}}{\value{#1publisher}}}}
+ {\stepcounter{pubcount}%
+ \usebibmacro{#1loc+#1pub}{\value{pubcount}}%
+ \setunit{\addsemicolon\space}}%
+ \setunit{\addcomma\space}}}
-\newbibmacro*{loc+pub}[1]{%
- \usebibmacro{location:a}{#1}%
- \setunit{\addcolon\space}%
- \printlist[publisher][#1-#1]{publisher}}%
+\newbibmacro*{pubcount}{%
+ \ifltxcounter{pubcount}
+ {\setcounter{pubcount}{0}}%
+ {\newcounter{pubcount}}}
-\newbibmacro*{location:a}[1]{%
+\newbibmacro*{loc+pub}[1]{%
\ifboolexpr{ test {\iflistundef{location}}
- and test {\iffieldundef{howpublished}}
- and test {\iffieldundef{url}}
- and test {\iffieldundef{doi}}}
- {\bibstring{noplace}}%
- {\printlist[location][#1-#1]{location}}}
-
-\newbibmacro*{location:b}{%
- \iflistundef{location}
- {}
- {\printlist{location}%
- \setunit{\addcomma\space}}}
+ and togl {noplace}}
+ {\bibstring{noplace}%
+ \setunit{\addcolon\space}}%
+ {\iflistundef{location}
+ {}
+ {\printlist[location][#1-#1]{location}%
+ \setunit{\addcolon\space}}}% needs '%'
+ \printlist[publisher][#1-#1]{publisher}}%
-\newbibmacro*{origlocation}{%
+\newbibmacro*{origloc+origpub}[1]{%
\iflistundef{origlocation}
{}
- {\printlist{origlocation}%
- \iflistundef{origpublisher}
- {\setunit{\addcomma\space}}%
- {\setunit{\addcolon\space}}}}
+ {\printlist[location][#1-#1]{origlocation}%
+ \setunit{\addcolon\space}}% needs '%'
+ \printlist[publisher][#1-#1]{origpublisher}}%
\newbibmacro*{institution+venue}{%
\ifboolexpr{ test {\iflistundef{institution}}
@@ -1956,6 +1971,18 @@
\usebibmacro{library}%
\usebibmacro{pageref+finentry}}%
+\newbibmacro*{artworks}{%
+ \usebibmacro{author+bookauthor+etc}%
+ \usebibmacro{title+titleaddon}{}%
+ \newunit
+ \usebibmacro{month+season+year}%
+ \usebibmacro{type+typeaddon}%
+ \usebibmacro{note}%
+ \newunit
+ \usebibmacro{institution+venue}%
+ \printlist{location}%
+ \setunit{\addcomma\space}}%
+
\newbibmacro*{author+collection+etc}{%
\usebibmacro{test:collection}%
\usebibmacro{author+bookauthor+etc}%
@@ -2052,6 +2079,17 @@
\toggletrue{edshift}%
\usebibmacro{editors:b}}%
+\newbibmacro*{standards}{%
+ \usebibmacro{author+bookauthor+etc}%
+ \usebibmacro{title+labeldate}%
+ \usebibmacro{note+edition+etc}%
+ \usebibmacro{volumes+series+etc}{}%
+ \iftoggle{bibliography}
+ {\newunit
+ \usebibmacro{loc+pub+year}}%
+ {\setunit{\addspace}% not '\setunit{\space}'
+ \printtext[parens]{\usebibmacro{loc+pub+year}}}}
+
\newbibmacro*{thesis:type+pubstate}{%
\ifentrytype{mathesis}
{\bibstring{mathesis}%
@@ -2068,7 +2106,8 @@
\newbibmacro*{inst+loc+date}{%
\usebibmacro{institution+venue}%
- \usebibmacro{location:b}%
+ \printlist{location}%
+ \setunit*{\addcomma\space}%
\usebibmacro{year+month+day}}%
\newbibmacro*{type+typeaddon}{%
@@ -2102,13 +2141,7 @@
\usebibmacro{title+titleaddon}{}%
\usebibmacro{type+typeaddon}%
\setunit{\addcomma\space}%
- \ifboolexpr{ togl {reflist}
- and test {\iffieldundef{month}}}
- {}
- {\iffieldundef{year}
- {\printlabeldate}% for 'n.d.'
- {\printdate
- \clearfield{year}}}
+ \usebibmacro{month+season+year}%
\iffieldundef{type}
{\newunit
\usebibmacro{unpublished:collection}}%
@@ -2323,7 +2356,9 @@
{\setunit{\addspace}% not '\setunit{\space}'
\printtext[parens]{\usebibmacro{orig+etc}}}}
{\newunit
- \usebibmacro{loc+pub+year}}}}
+ \usebibmacro{loc+pub+etc}{}%
+ \setunit{\addcomma\space}%
+ \usebibmacro{year+bookyear}}}}
\newbibmacro*{test:bookauthor}{%
\ifboolexpr{ test {\ifnamesequal{author}{bookauthor}}
@@ -2394,6 +2429,13 @@
\togglefalse{edshift}}%
{}}}
+\newbibmacro*{loc+pub+year}{%
+ \usebibmacro{loc+pub+etc}{}%
+ \setunit{\addcomma\space}%
+ \usebibmacro{month+season+year}%
+ \setunit{\addcomma\space}%
+ \usebibmacro{pubstate}{}}%
+
% Thanks to David Fussner's biblatex-chicago for pointing me to this
% command by Philipp Lehman. Source:
% https://groups.google.com/forum/#!topic/comp.text.tex/kG003fkZK1I
@@ -2424,7 +2466,8 @@
{\usebibmacro{note}%
\usebibmacro{editors:b}%
\usebibmacro{unpublished:series}%
- \usebibmacro{unpublished:volume}%
+ \newunit
+ \printfield{volume}%
\newunit
\usebibmacro{inst+loc+date}}%
{}}
@@ -2518,20 +2561,15 @@
\printfield{number}}}
\newbibmacro*{orig+etc}{%
- \usebibmacro{origlocation}%
- \usebibmacro{origpublisher}%
+ \usebibmacro{loc+pub+etc}{orig}%
\ifboolexpr{ togl {bibliography}
and togl {reflist}}
{}
- {\usebibmacro{origyear+origendyear}}%
+ {\usebibmacro{year+endyear}{orig}}%
\usebibmacro{reprint}%
- \usebibmacro{loc+pub+year}}%
-
-\newbibmacro*{origpublisher}{%
- \iflistundef{origpublisher}
- {}
- {\printlist{origpublisher}%
- \setunit{\addcomma\space}}}
+ \usebibmacro{loc+pub+etc}{}%
+ \setunit{\addcomma\space}%
+ \usebibmacro{year+bookyear}}%
\newbibmacro*{reprint}{%
\ifboolexpr{ test {\iffieldundef{origyear}}
@@ -2589,12 +2627,6 @@
{\setunit{\addcomma\space}}%
\printfield{seriesaddon}}}
-\newbibmacro*{unpublished:volume}{%
- \iffieldundef{volume}
- {}
- {\printfield{volume}%
- \newunit}}%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Bibliography Drivers %%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2617,6 +2649,11 @@
\usebibmacro{colon+pages+etc}%
\usebibmacro{doi+finentry+etc}}%
+\DeclareBibliographyDriver{artwork}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{artworks}%
+ \usebibmacro{doi+finentry+etc}}%
+
\DeclareBibliographyDriver{book}{%
\usebibmacro{bibindex}%
\usebibmacro{author+collection+etc}%
@@ -2662,6 +2699,11 @@
\usebibmacro{colon+pages+etc}%
\usebibmacro{doi+finentry+etc}}%
+\DeclareBibliographyDriver{standard}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{standards}%
+ \usebibmacro{doi+finentry+etc}}%
+
\DeclareBibliographyDriver{thesis}{%
\usebibmacro{bibindex}%
\usebibmacro{author+title+etc}%
diff --git a/macros/latex/contrib/biblatex-contrib/windycity/windycity.cbx b/macros/latex/contrib/biblatex-contrib/windycity/windycity.cbx
index 85d4ad37f2..155407ad63 100644
--- a/macros/latex/contrib/biblatex-contrib/windycity/windycity.cbx
+++ b/macros/latex/contrib/biblatex-contrib/windycity/windycity.cbx
@@ -1,4 +1,4 @@
-% Last modified: Tue 09 Nov 2021 07:46:18 PM CST
+% Last modified: Sat 04 Dec 2021 12:44:00 PM CST
% Permission is granted to copy, distribute and/or modify this
% software under the terms of the LaTeX Project Public License (LPPL),
@@ -11,7 +11,7 @@
% implied warranties of merchantability and fitness for a particular
% purpose.
-\ProvidesFile{windycity.cbx}[2021/11/09 Windy City citation style for
+\ProvidesFile{windycity.cbx}[2021/12/04 Windy City citation style for
biblatex]
\@ifpackagelater{biblatex}{2019/08/17}
{}
@@ -561,6 +561,10 @@
\usebibmacro{articles}%
\usebibmacro{colon+comma+etc}}%
+\DeclareBibliographyDriver{cite:artwork}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{artworks}}%
+
\DeclareBibliographyDriver{cite:book}{%
\usebibmacro{test:crossref}%
\iftoggle{cbx:collection}
@@ -622,6 +626,12 @@
\usebibmacro{articles}%
\usebibmacro{colon+comma+etc}}%
+\DeclareBibliographyDriver{cite:standard}{%
+ \toggletrue{noauth}%
+ \usebibmacro{standards}%
+ \usebibmacro{cite:punctuation}%
+ \usebibmacro{volume+page}}%
+
\DeclareBibliographyDriver{cite:thesis}{%
\usebibmacro{author+title+etc}%
\setunit{\addspace}% not '\setunit{\space}'
diff --git a/macros/latex/contrib/biblatex-contrib/windycity/windycity.dbx b/macros/latex/contrib/biblatex-contrib/windycity/windycity.dbx
index 0f61210ff0..165a90319c 100644
--- a/macros/latex/contrib/biblatex-contrib/windycity/windycity.dbx
+++ b/macros/latex/contrib/biblatex-contrib/windycity/windycity.dbx
@@ -1,4 +1,4 @@
-\ProvidesFile{windycity.dbx}[2021/11/09 Windy City data model file for biblatex]
+\ProvidesFile{windycity.dbx}[2021/12/04 Windy City data model file for biblatex]
\DeclareDatamodelFields[type=field,datatype=key]{%
booktitlekey,
bookbooktitlekey,
@@ -23,6 +23,7 @@
endbookyear,
handle,
seriesaddon,
+ setlabel,
shortblog,
shortbooktitle,
shortcollection,
diff --git a/macros/latex/contrib/brandeis-dissertation/brandeis-dissertation.dtx b/macros/latex/contrib/brandeis-dissertation/brandeis-dissertation.dtx
index 564e175581..df827bf3c5 100644
--- a/macros/latex/contrib/brandeis-dissertation/brandeis-dissertation.dtx
+++ b/macros/latex/contrib/brandeis-dissertation/brandeis-dissertation.dtx
@@ -22,9 +22,9 @@
%<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
%<package>\ProvidesPackage{brandeis-dissertation}
%<*package>
- [2020/06/29 v3.12 .dtx brandeis-dissertation file]
+ [2020/12/04 v3.13.dtx brandeis-dissertation file]
%</package>
-%<package>\LoadClass[12pt]{article}
+%<package>\LoadClass[12pt]{book}
%<package>\RequirePackage[margin=1in]{geometry}
%<package>\RequirePackage{setspace}
%<package>\RequirePackage{titlesec}
@@ -206,6 +206,7 @@
% \changes{v3.1}{2020/04/09}{Formatting update}
% \changes{v3.11}{2020/04/09}{Documentation update}
% \changes{v3.12}{2021/06/29}{Dean signature update}
+% \changes{v3.13}{2021/12/04}{Based on book class rather than on article class}
%
% \GetFileInfo{brandeis-dissertation.dtx}
%
@@ -227,6 +228,10 @@
% \item Create your title, approval, copyright, acknowledgements, and abstract pages.
% \item Ensure your dissertation has the correct margins, spacing, and pagination.
% \end{itemize}
+%
+% The \textsf{brandeis-dissertation} class includes the \textsf{book} class, so all of the sectioning
+% commands of book class (chapter, section and so on) and all of the table of contents commands
+% work as they work in the \textsf{book} class.
%
% \section{Usage}
% \label{Sec:usage}
diff --git a/macros/latex/contrib/brandeis-dissertation/brandeis-dissertation.pdf b/macros/latex/contrib/brandeis-dissertation/brandeis-dissertation.pdf
index 0a63d5927c..0a8b50b70d 100644
--- a/macros/latex/contrib/brandeis-dissertation/brandeis-dissertation.pdf
+++ b/macros/latex/contrib/brandeis-dissertation/brandeis-dissertation.pdf
Binary files differ
diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md
index c69dbaa4d8..88a402317a 100644
--- a/macros/latex/contrib/siunitx/CHANGELOG.md
+++ b/macros/latex/contrib/siunitx/CHANGELOG.md
@@ -7,6 +7,11 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
## [Unreleased]
+## [v3.0.37]
+
+### Changed
+- Documentation and warning improvements for "drop-exponent" option
+
## [v3.0.36]
### Changed
@@ -1632,7 +1637,8 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
### Added
- First public testing release (as `si`)
-[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.36...HEAD
+[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.37...HEAD
+[v3.0.37]: https://github.com/josephwright/siunitx/compare/v3.0.36...v3.0.37
[v3.0.36]: https://github.com/josephwright/siunitx/compare/v3.0.35...v3.0.36
[v3.0.35]: https://github.com/josephwright/siunitx/compare/v3.0.34...v3.0.35
[v3.0.34]: https://github.com/josephwright/siunitx/compare/v3.0.33...v3.0.34
diff --git a/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf
index 840c9f384c..a72fe2827b 100644
--- a/macros/latex/contrib/siunitx/siunitx-code.pdf
+++ b/macros/latex/contrib/siunitx/siunitx-code.pdf
Binary files differ
diff --git a/macros/latex/contrib/siunitx/siunitx-code.tex b/macros/latex/contrib/siunitx/siunitx-code.tex
index 7396975f44..bf2bd1b7e9 100644
--- a/macros/latex/contrib/siunitx/siunitx-code.tex
+++ b/macros/latex/contrib/siunitx/siunitx-code.tex
@@ -39,6 +39,10 @@ for those people who are interested.
\NewDocumentCommand\acro{m}{\textsc{\LowerCaseText{#1}}}
\NewDocumentCommand\foreign{m}{\textit{#1}}
+% Standard settings
+\EnableDocumentation
+\DisableImplementation
+
\begin{document}
\GetFileInfo{siunitx.sty}
@@ -81,7 +85,7 @@ for those people who are interested.
\RenewDocumentCommand\PrintIndex{}{}
% Load the source files in order
-\DocInput{siunitx.dtx}
+%\DocInput{siunitx.dtx}
\DocInput{siunitx-angle.dtx}
\DocInput{siunitx-compound.dtx}
\DocInput{siunitx-locale.dtx}
diff --git a/macros/latex/contrib/siunitx/siunitx-emulation.dtx b/macros/latex/contrib/siunitx/siunitx-emulation.dtx
index 92e3671852..18ad1d2d60 100644
--- a/macros/latex/contrib/siunitx/siunitx-emulation.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-emulation.dtx
@@ -559,10 +559,19 @@
} ,
table-omit-exponent .code:n =
{
- \@@_option_deprecated:nnV
- { table-omit-exponent }
- { drop-exponent }
- \l_keys_value_tl
+ \msg_info:nnnn { siunitx } { option-deprecated }
+ { table-omit-exponent } { drop-exponent }
+ \str_if_eq:VnTF \l_keys_value_tl { true }
+ {
+ \keys_set:nn
+ { siunitx }
+ { drop-exponent = true , exponent-mode = fixed }
+ }
+ {
+ \keys_set:nn
+ { siunitx }
+ { drop-exponent = false }
+ }
} ,
table-omit-exponent .default:n = true ,
table-parse-only .code:n =
diff --git a/macros/latex/contrib/siunitx/siunitx-number.dtx b/macros/latex/contrib/siunitx/siunitx-number.dtx
index 25e15ca4bb..a7b3594d9d 100644
--- a/macros/latex/contrib/siunitx/siunitx-number.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-number.dtx
@@ -2143,6 +2143,8 @@
{
\bool_if:NT \l_@@_drop_exponent_bool
{
+ \str_if_eq:VnT \l_@@_exponent_mode_tl { input }
+ { \msg_warning:nn { siunitx } { ambiguous-dropped-exponent } }
\tl_set:Nx #2
{ \exp_after:wN \@@_drop_exponent:nnnnnnn #1 }
}
@@ -3736,6 +3738,12 @@
The~input~'#1'~could~not~be~parsed~as~a~number~following~the~
format~defined~in~module~documentation.
}
+\msg_new:nnnn { siunitx } { ambiguous-dropped-exponent }
+ { Potentially~ambiguous~dropping~of~exponent. }
+ {
+ The~option~"drop-exponent"~is~active~but~values~do~not~have~an~
+ exponent~fixed~by~"exponent-mode".~The~result~could~be~misleading.
+ }
% \end{macrocode}
%
% \subsection{Standard settings for module options}
diff --git a/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx
index e48aaa37ae..46d2b2f942 100644
--- a/macros/latex/contrib/siunitx/siunitx.dtx
+++ b/macros/latex/contrib/siunitx/siunitx.dtx
@@ -121,7 +121,7 @@
%
% Identify the package and give the over all version information.
% \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2021-11-18} {3.0.36}
+\ProvidesExplPackage {siunitx} {2021-12-03} {3.0.37}
{A comprehensive (SI) units package}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf
index 89231df355..9b5fabfa52 100644
--- a/macros/latex/contrib/siunitx/siunitx.pdf
+++ b/macros/latex/contrib/siunitx/siunitx.pdf
Binary files differ
diff --git a/macros/latex/contrib/siunitx/siunitx.tex b/macros/latex/contrib/siunitx/siunitx.tex
index 0cde5ebbd3..69f61e8c58 100644
--- a/macros/latex/contrib/siunitx/siunitx.tex
+++ b/macros/latex/contrib/siunitx/siunitx.tex
@@ -2736,7 +2736,7 @@ combined with \opt{exponent-mode = fixed} can be used to achieve this
(Table~\ref{tab:exp:omit}).
\begin{LaTeXdemo}[code and float]
\begin{table}
- \caption{The \opt{table-omit-exponent} option.%
+ \caption{The \opt{drop-exponent} option.%
\label{tab:exp:omit}}
\begin{tabular}{@{}
S[table-format = 1.1e1]