texlive[61021] Master/texmf-dist: windycity (10nov21)
commits+karl at tug.org
commits+karl at tug.org
Wed Nov 10 22:18:29 CET 2021
Revision: 61021
http://tug.org/svn/texlive?view=revision&revision=61021
Author: karl
Date: 2021-11-10 22:18:29 +0100 (Wed, 10 Nov 2021)
Log Message:
-----------
windycity (10nov21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/windycity/CHANGES.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
Modified: trunk/Master/texmf-dist/doc/latex/windycity/CHANGES.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/windycity/CHANGES.md 2021-11-10 21:18:14 UTC (rev 61020)
+++ trunk/Master/texmf-dist/doc/latex/windycity/CHANGES.md 2021-11-10 21:18:29 UTC (rev 61021)
@@ -8,6 +8,36 @@
GitHub](https://github.com/brianchase/windycity "GitHub:
brianchase/windycity").
+## 2021-11-09
+
+* added support for manuscript collections (see examples for *CMOS*
+ 14.222, 14.229, and 14.230)
+* improved support for unpublished lectures, presentations, and
+ similar works with the help of a `typeaddon` field (see examples for
+ *CMOS* 14.216 and 14.217)
+* added `\parenauth` and `\parenauths` citation commands for
+ parenthetical citations that omit the year (see example in *CMOS*
+ 15.54)
+* added support for the `shorteditor` field and added a
+ `shorttranslator` field (like `shortauthor`, they print only in the
+ author's position of subsequent citations, not in bibliographies or
+ first citations)
+* editor and translator type fields accept the values `anon`, `anon?`,
+ 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
+ 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
+ links in bibliographies (the links belong only in citations)
+* for `@article` entries, fixed the relative positions of `series` and
+ `location`
+* for `@thesis` entries, fixed missing punctuation in notes between
+ `title` and `note`
+* fixed a spacing problem in the `postnote` of some `@review` entries
+
+
## 2021-07-07
* improved the workflow for titles, subtitles, and the like; no change
Modified: trunk/Master/texmf-dist/doc/latex/windycity/windycity.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/windycity/windycity.bib 2021-11-10 21:18:14 UTC (rev 61020)
+++ trunk/Master/texmf-dist/doc/latex/windycity/windycity.bib 2021-11-10 21:18:29 UTC (rev 61021)
@@ -2263,6 +2263,7 @@
% 14.204 Unsigned reviews
@Review{zeitung1828,
+ type = {newsmag},
journal = {Ergänzungsblätter zur Allgemeinen Literatur-Zeitung},
date = {1828-02},
number = {23–24},
@@ -2362,6 +2363,16 @@
year = {2006},
url = {http://hdl.handle.net/1721.1/39144}
}
+ at Thesis{subacus2015,
+ author = {Subacus, Melanie},
+ title = {\textit{Duae Patriae}},
+ subtitle = {Cicero and Political Cosmopolitanism in Rome},
+ note = {abstract},
+ type = {phdthesis},
+ institution = {New York University},
+ date = {2015},
+ url = {http://pqdtopen.proquest.com/pubnum/2685917.html}
+}
@Thesis{choi2008,
author = {Choi, Mihwa},
title = {Contesting \emph{Imaginaires} in Death Rituals during the Northern Song Dynasty},
@@ -2371,6 +2382,18 @@
howpublished = {ProQuest (AAT 3300426)}
}
+% 14.216 Unpublished manuscripts
+
+ at Unpublished{balderdash2017,
+ author = {Balderdash, Pat},
+ title = {Presbyopia and Screen Size},
+ subtitle = {A Relational Analysis},
+ type = {unpublished manuscript},
+ typeaddon = {, last modified},
+ date = {2017-05-05},
+ howpublished = {Microsoft Word file}
+}
+
% 14.217 Lectures and papers or posters presented at meetings
@Unpublished{hong2015,
@@ -2377,10 +2400,40 @@
author = {Hong, Viviana},
title = {Censorship in Children's Literature during Argentina's Dirty War (1976–1983)},
type = {lecture},
+ typeaddon = {presented at the},
institution = {University of Chicago},
address = {Chicago, IL},
date = {2015-04-30}
}
+ at Unpublished{hong2015.alt,
+ keywords = {notinbib,notinref},
+ author = {Hong, Viviana},
+ title = {Censorship in Children's Literature during Argentina's Dirty War (1976–1983)},
+ type = {lecture},
+ institution = {University of Chicago},
+ address = {Chicago, IL},
+ date = {2015-04-30}
+}
+ at Unpublished{teplin2005,
+ author = {Teplin, Linda A. and McClelland, Gary M. and Abram, Karen M. and Washburn, Jason J.},
+ title = {Early Violent Death in Delinquent Youth},
+ subtitle = {A Prospective Longitudinal Study},
+ type = {paper},
+ typeaddon = {presented at the},
+ institution = {Annual Meeting of the American Psychology-Law Society},
+ address = {La Jolla, CA},
+ date = {2005-03}
+}
+ at Unpublished{teplin2005.alt,
+ keywords = {notinbib,notinref},
+ author = {Teplin, Linda A. and McClelland, Gary M. and Abram, Karen M. and Washburn, Jason J.},
+ title = {Early Violent Death in Delinquent Youth},
+ subtitle = {A Prospective Longitudinal Study},
+ type = {paper},
+ institution = {Annual Meeting of the American Psychology-Law Society},
+ address = {La Jolla, CA},
+ date = {2005-03}
+}
% 14.218 Working papers and the like
@@ -2398,11 +2451,19 @@
author = {Bronfenbrenner, Kate and Warren, Dorian},
title = {The Empirical Case for Streamlining the NLRB Certification Process},
subtitle = {The Role of Date of Unfair Labor Practice Occurrence},
- institution = {ISERP Working Papers Series 2011.01, Columbia University},
+ series = {ISERP Working Papers Series 2011.01},
+ institution = {Columbia University},
address = {New York, NY},
date = {2011-06},
url = {http://hdl.handle.net/10022/AC:P:10603}
}
+ at Unpublished{alarcon1771,
+ 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},
+ institution = {Department of Geography, University of California},
+ address = {Berkeley}
+}
% 14.220 Pamphlets, reports, and the like
@@ -2428,6 +2489,79 @@
year = {1996}
}
+% 14.222 Note forms versus bibliography entries
+
+ at Unpublished{kallen,
+ author = {Kallen, Horace},
+ type = {papers},
+ collection = {Horace Kallen Papers},
+ shortcollection = {Kallen Papers},
+ institution = {YIVO Institute for Jewish Research},
+ address = {New York}
+}
+ at Unpublished{revere,
+ collection = {Revere Family Papers},
+ institution = {Massachusetts Historical Society},
+ address = {Boston}
+}
+
+% 14.229 Examples of note forms for manuscript collections
+
+ at Unpublished{merriam,
+ author = {Merriam, Charles E.},
+ type = {papers},
+ collection = {Charles E. Merriam Papers},
+ institution = {Special Collections Research Center, University of Chicago Library}
+}
+ at Unpublished{pasociety,
+ author = {{Pennsylvania Society for the Abolition of Slavery}},
+% shorthand = {Minutes, Pennsylvania Society},
+ shorthand = {Pennsylvania Society},
+ shorthandintro = {(hereafter cited as Minutes, \printfield{shorthand})},
+ type = {papers},
+ collection = {Papers of the Pennsylvania Society for the Abolition of Slavery},
+ institution = {Historical Society of Pennsylvania},
+ address = {Philadelphia}
+}
+ at Unpublished{overseers,
+ collection = {Overseers Reports},
+ series = {Professional Series},
+ volume = {2},
+ institution = {Harvard University Archives}
+}
+ at Unpublished{morris,
+ author = {Morris, Alexander},
+ type = {papers},
+ collection = {Alexander Morris Papers},
+ institution = {Provincial Archives of Manitoba, Winnipeg}
+}
+ at Unpublished{washington,
+ author = {Washington, George},
+ type = {papers},
+ collection = {George Washington Papers},
+ series = {Series 5: Financial Papers, 1750--96},
+ institution = {Library of Congress},
+ address = {Washington, DC},
+ url = {http://memory.loc.gov/ammem/gwhtml/gwseries5.html}
+}
+
+% 14.230 Examples of bibliography entries for manuscript collections
+
+ at Unpublished{wonpr,
+ author = {{Women's Organization for National Prohibition Reform}},
+ type = {papers},
+ collection = {Papers of the Women's Organization for National Prohibition Reform},
+ note = {Alice Belin du Pont files, Pierre S. du Pont Papers},
+ institution = {Eleutherian Mills Historical Library},
+ address = {Wilmington, DE}
+}
+ at Unpublished{dinkel,
+ author = {Dinkel, Joseph},
+ title = {Description of Louis Agassiz written at the request of Elizabeth Cary Agassiz},
+ collection = {Agassiz Papers},
+ institution = {Houghton Library, Harvard University}
+}
+
% 14.232 Reference works consulted in physical formats
@InReference{salvation1980,
@@ -2947,7 +3081,7 @@
doi = {https://doi.org/10.1086/680849}
}
-% Bibliography 1.2
+% CMOS Bibliography 1.2
@Book{fowler1965,
author = {Fowler, H. W.},
@@ -2970,7 +3104,7 @@
year = {2015}
}
-% Bibliography 2.4
+% CMOS Bibliography 2.4
@Book{swanson1999,
author = {Swanson, Ellen},
Modified: trunk/Master/texmf-dist/doc/latex/windycity/windycity.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/windycity/windycity.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/windycity/windycity.tex 2021-11-10 21:18:14 UTC (rev 61020)
+++ trunk/Master/texmf-dist/doc/latex/windycity/windycity.tex 2021-11-10 21:18:29 UTC (rev 61021)
@@ -1,4 +1,4 @@
-% Last modified: Wed 07 Jul 2021 05:46:01 PM CDT
+% Last modified: Tue 09 Nov 2021 07:45:28 PM CST
\documentclass[11pt,letterpaper,oneside]{article}
\usepackage{windycity}
@@ -8,7 +8,7 @@
\author{Brian Chase}
\email{brianmichaelchase at gmail.com}
\website{https://github.com/brianchase/windycity}
-\version{2021-07-07}
+\version{2021-11-09}
\maketitle
\begingroup
\hypersetup{linkcolor=black}
@@ -384,7 +384,7 @@
\optitem[true]{dashed}{\opt{true}, \opt{false}}
\noindent Set \opt{false} to remove the 3-em dash for repeated names
-in bibliographies and reference lists.
+in bibliographies.
\optitem[true]{doi}{\opt{true}, \opt{false}}
@@ -953,12 +953,11 @@
\end{ltxsyntax}
-\subsubsection{Other Citation Commands}
-\label{cust.cmd}
+\subsubsection{Custom Commands: \emph{\cmd{idemcite}}}
+\label{idemcite}
-Windy City's custom citation commands are convenient but not strictly
-necessary. They make certain citations simpler than they would be with
-standard commands.
+This family of citation commands isn't strictly necessary but makes
+some citations simpler than they would be with standard commands.
\begin{ltxsyntax}
\cmditem{idemcite}[prenote][postnote]{key}
@@ -1017,6 +1016,25 @@
Notice that the only reason to use \cmd{footidemcites} rather than
\cmd{footidemcite} is to insert \textit{and} before the last citation.
+\subsubsection{Custom Commands: \emph{\cmd{parenauth}}}
+\label{parenauth}
+
+You may prefer to omit the year from parenthetical citations if the
+context makes it clear or if the inclusion of \textit{n.d.} (for
+\textit{no date}) seems unnecessary. Omit the year with
+\cmd{parenauth} and \cmd{parenauths}.
+
+\begin{ltxsyntax}
+\cmditem{parenauth}[prenote][postnote]{key}
+\cmditem{parenauths}(multiprenote)(multipostnote)[prenote][postnote]{key}|...|[prenote][postnote]{key}
+\end{ltxsyntax}
+
+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.
+
+For an example, see \textit{CMOS} \ref{15.54}.
+
\subsection{Entry Types}
\label{entrytypes}
@@ -1055,9 +1073,10 @@
\typeitem{thesis}
-Aliases: \bibtype{mastersthesis}, \bibtype{phdthesis},
-\bibtype{unpublished}
+Aliases: \bibtype{mastersthesis}, \bibtype{phdthesis}
+\typeitem{unpublished}
+
\end{typelist}
\noindent For the most part, you may assign every work to the basic
@@ -1185,9 +1204,9 @@
\begin{marglist}
-\item[authtype] This field takes three values: \textit{anon} (to print
-an anonymous author's name in brackets), \textit{anon?} (to add a
-question mark inside the brackets), and \textit{pseudo} (to print
+\item[authortype] This field takes three values: \textit{anon} (to
+print an anonymous author's name in brackets), \textit{anon?} (to add
+a question mark inside the brackets), and \textit{pseudo} (to print
\textit{pseud.} in brackets after the name of a pseudonymous author).
From \textit{CMOS} \ref{14.79}:
@@ -1197,10 +1216,14 @@
\end{citebib}
For pseudonymous authors, another solution is to use the
-\bibfield{nameaddon} field. Unlike with \bibfield{authtype},
+\bibfield{nameaddon} field. Unlike with \bibfield{authortype},
\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}
@@ -1280,6 +1303,9 @@
\item[series] See comments on \bibfield{seriesaddon} in section
\ref{datafields}.
+\item[shortcollection] Similar to \bibfield{shorttitle} but for the
+short name of a \bibfield{collection}.
+
\item[titleaddon] Like \bibfield{nameaddon}, this field encloses its
content in brackets. This is especially useful for translated titles.
From \textit{CMOS} \ref{14.99}:
@@ -1293,9 +1319,11 @@
\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.
+\textit{mathesis} or \textit{master's thesis}. Indicate other types of
+thesis by entering the appropiate value in the field, such as
+\textit{bachelor's thesis} or \textit{undergraduate thesis}. No
+\bibfield{type} field is needed for the \bibtype{mathesis} and
+\bibtype{phdthesis} entry types.
In rare cases, \bibfield{type} is necessary for \bibtype{article} and
\bibtype{review} entry types (and their aliases) when a work's
@@ -1310,6 +1338,23 @@
\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}
@@ -1637,6 +1682,13 @@
three or more roles at once, as in ``Edited, Translated, and Revised
by Jane Doe.''
+Along with the values in Table \ref{editors:table}, you may also use
+\textit{anon}, \textit{anon?}, and \textit{pseudo} in editor and
+translator type fields to indicate anonymous and pseudonymous editors
+and translators. For examples using these values with the
+\bibfield{authortype} field, see section \ref{stdfields} and
+\textit{CMOS} \ref{14.79} and \ref{15.34}.
+
\subsubsection{Other Options and Titles}
\label{editors:other}
@@ -2645,7 +2697,8 @@
% 14.57 Several citations in one note
\label{14.57}
-See \ref{cust.cmd} for information on how to reproduce this example.
+See section \ref{idemcite} for information on how to reproduce this
+example.
\begin{quote} Only when we gather the work of several
scholars---Walter Sutton's explications of some of Whitman's shorter
@@ -2745,7 +2798,7 @@
% 14.79 No listed author (anonymous works)
\label{14.79}
-See section \ref{stdfields} on the use of the \bibfield{authtype}
+See section \ref{stdfields} on the use of the \bibfield{authortype}
field for anonymous works.
\begin{citebib}
@@ -3624,17 +3677,27 @@
\begin{citebib}
\item \cite[59]{vedrashko2006}
+\item \cite[v]{subacus2015}
\item \cite{choi2008}
\end{citebib}
-\setcounter{subsubsection}{216}
-\subsubsection{Lectures and papers or posters presented at meetings}
-% 14.217 Lectures and papers or posters presented at meetings
+\subsubsection{Unpublished manuscripts}
+% 14.216 Unpublished manuscripts
+\label{14.216}
\begin{citebib}
-\item \cite{hong2015}
+\item \cite{balderdash2017}
\end{citebib}
+\subsubsection{Lectures and papers or posters presented at meetings}
+% 14.217 Lectures and papers or posters presented at meetings
+\label{14.217}
+
+\begin{bibonly}
+\nocite{hong2015}
+\nocite{teplin2005}
+\end{bibonly}
+
\subsubsection{Working papers and the like}
% 14.218 Working papers and the like
\label{14.218}
@@ -3642,6 +3705,7 @@
\begin{citebib}
\item \cite{lucki1980}
\item \cite{bronfenbrenner2011}
+\item \cite{alarcon1771}
\end{citebib}
\setcounter{subsubsection}{219}
@@ -3655,6 +3719,57 @@
\end{citebib}
\setcounter{subsection}{8}
+\subsection{Manuscript Collections}
+\setcounter{subsection}{14}
+
+\setcounter{subsubsection}{221}
+\subsubsection{Note forms versus bibliography entries}
+% 14.222 Note forms versus bibliography entries
+\label{14.222}
+
+\begin{citebib}
+\item \cite[Alvin Johnson, memorandum, 1937, file 36,][]{kallen}
+\item \cite[Revere's Waste and Memoranda Book (vol. 1, 1761--83; vol. 2,
+1783--97),][]{revere}
+\end{citebib}
+
+\setcounter{subsubsection}{228}
+\subsubsection{Examples of note forms for manuscript collections}
+% 14.229 Examples of note forms for manuscript collections
+\label{14.229}
+
+\begin{citeonly}
+\item \cite[Burton to Merriam, telegram, 26 January 1923, box 26, folder
+17,][]{merriam}
+\item \cite[Minutes of the Committee for Improving the Condition of the Free
+Blacks, Pennsylvania Abolition Society, 1790--1803,][]{pasociety}
+\item \cite[Louis Agassiz, report to the Committee of Overseers\ldots
+\mkbibbrackets{28 December 1859},][]{overseers}
+\item \cite[Gilbert McMicken to Alexander Morris, 29 November 1881, Glasgow
+(Scotland), Document 1359, fol. 1r,][MS-12-84]{morris}
+\item \cite[Daily Expenses, July 1787, images 7--8,][]{washington}
+\item \cite[Minutes, 15 April 1795,][]{pasociety}
+\end{citeonly}
+
+\setcounter{subsubsection}{229}
+\subsubsection{Examples of bibliography entries for manuscript collections}
+% 14.230 Examples of bibliography entries for manuscript collections
+\label{14.230}
+
+Examples with note forms in section \ref{14.229}:
+
+\begin{bibonly}
+\nocite{merriam,pasociety,overseers,morris,washington}
+\end{bibonly}
+
+\noindent Examples unique to this section:
+
+\begin{citebib}
+\item \cite{wonpr}
+\item \cite{dinkel}
+\end{citebib}
+
+\setcounter{subsection}{9}
\subsection{Special Types of References}
\setcounter{subsection}{14}
@@ -3669,7 +3784,7 @@
\bibtype{inreference} entry type. See section \ref{entrytypes} for
more information. Following the suggestion in \textit{CMOS} 14.232,
\bibtype{reference} and \bibtype{inreference} works don't appear in
-bibliographies or reference lists.
+bibliographies.
\begin{citebib}
\item \cite{salvation1980}
@@ -3686,8 +3801,8 @@
Like some of the reference works in the previous section, the ones
below need the \bibtype{reference} or \bibtype{inreference} entry
type. As odd as it may seem, but consistent with \textit{CMOS}, they,
-too, aren't included in bibliographies and reference lists. See
-section \ref{entrytypes} for more information.
+too, aren't included in bibliographies. See section \ref{entrytypes}
+for more information.
\begin{citeonly}
\item \cite{toscanini2016}
@@ -3868,8 +3983,9 @@
\setcounter{subsubsection}{33}
\subsubsection{Author-date format for anonymous works (no listed author)}
% 15.34 Author-date format for anonymous works (no listed author)
+\label{15.34}
-See section \ref{stdfields} on the use of the \bibfield{authtype}
+See section \ref{stdfields} on the use of the \bibfield{authortype}
field for anonymous works.
\begin{citeref}
@@ -4007,7 +4123,24 @@
\item \parencite{chicago2015}
\end{citeref}
-\setcounter{subsubsection}{54}
+\setcounter{subsubsection}{53}
+\subsubsection{Manuscript collections in author-date format}
+% 15.54 Manuscript collections in author-date format
+\label{15.54}
+
+An example using \cmd{parenauth} (see section \ref{parenauth}):
+
+\begin{citeref}
+\item Alvin Johnson, in a memorandum prepared sometime in 1937
+\parenauth[file 36]{kallen}, observed that\ldots
+\end{citeref}
+
+\noindent An example using \cmd{parencite}:
+
+\begin{citeref}
+\item \parencite{dinkel}
+\end{citeref}
+
\subsubsection{Patents or other documents cited by more than one date}
% 15.55 Patents or other documents cited by more than one date
Modified: trunk/Master/texmf-dist/tex/latex/windycity/american-windycity.lbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/windycity/american-windycity.lbx 2021-11-10 21:18:14 UTC (rev 61020)
+++ trunk/Master/texmf-dist/tex/latex/windycity/american-windycity.lbx 2021-11-10 21:18:29 UTC (rev 61021)
@@ -1,4 +1,4 @@
-% Last modified: Wed 07 Jul 2021 05:45:54 PM CDT
+% Last modified: Tue 09 Nov 2021 07:45:43 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/07/07 Windy City
+\ProvidesFile{american-windycity.lbx}[2021/11/09 Windy City
localization module for biblatex]
\InheritBibliographyExtras{american}
\InheritBibliographyStrings{american}
Modified: trunk/Master/texmf-dist/tex/latex/windycity/windycity.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/windycity/windycity.bbx 2021-11-10 21:18:14 UTC (rev 61020)
+++ trunk/Master/texmf-dist/tex/latex/windycity/windycity.bbx 2021-11-10 21:18:29 UTC (rev 61021)
@@ -1,4 +1,4 @@
-% Last modified: Wed 07 Jul 2021 05:45:49 PM CDT
+% Last modified: Tue 09 Nov 2021 07:46:28 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/07/07 Windy City bibliography style
+\ProvidesFile{windycity.bbx}[2021/11/09 Windy City bibliography style
for biblatex]
\@ifpackagelater{biblatex}{2019/08/17}
{}
@@ -128,7 +128,10 @@
\providetoggle{shortlinks}
\DeclareBiblatexOption{global}[boolean]{shortlinks}[true]{%
- \settoggle{shortlinks}{#1}}%
+ \ifstrequal{#1}{true}
+ {\toggletrue{shortlinks}%
+ \AtBeginBibliography{\togglefalse{shortlinks}}}
+ {}}
\providetoggle{skipdate}
\DeclareBiblatexOption{entry}[boolean]{skipdate}[true]{%
@@ -180,7 +183,8 @@
\settoggle{url}{#1}}
% For setting 'minbibnames' and such, see CMOS, 17th ed., 14.76 and
-% 15.29.
+% 15.29. For 'citetracker' and 'loccittracker', 'constrict' is too
+% strict but seems to work well for 'ibidtracker'.
\ExecuteBibliographyOptions{%
abbreviate=true,
@@ -198,7 +202,7 @@
idemtracker=false,
indexing=true,
labeldateparts=true,
- loccittracker=constrict,
+ loccittracker=context,
minbibnames=7,
maxbibnames=10,
mincitenames=1,
@@ -312,8 +316,8 @@
\field{volume}
\literal{0}}}
-% When 'journal', 'journaltitle', 'organization', or 'blogtitle' goes
-% in the author's position.
+% When 'journal', 'journaltitle', 'organization', 'blogtitle' or
+% 'collection' goes in the author's position.
\DeclareStyleSourcemap{
\maps[datatype=bibtex]{
@@ -392,6 +396,19 @@
}
}
}
+\DeclareStyleSourcemap{
+ \maps[datatype=bibtex]{
+ \map[overwrite=false]{
+ \pertype{unpublished}
+ \step[notfield=author, final]
+ \step[fieldsource=collection]
+ \step[fieldset=sortname, origfieldval]
+ \step[fieldsource=sortname,
+ match=\regexp{(.+)},
+ replace=\regexp{{$1}}]
+ }
+ }
+}
% Save the entry key of every editor, translator, and title.
@@ -522,6 +539,7 @@
\providetoggle{cbx:first}
\providetoggle{cbx:idem}
\providetoggle{cbx:short}
+\providetoggle{cbx:skipdate}
\providetoggle{collection}
\providetoggle{collection:bk}
@@ -682,13 +700,18 @@
\DeclareFieldFormat{journaltitleaddon}{\mkbibbrackets{#1}}
\DeclareFieldFormat{titleaddon}{\mkbibbrackets{#1}}
-\DeclareFieldFormat[article,incollection,online,reference,review]
+\DeclareFieldFormat[article,incollection,online,reference,review,thesis]
{title}{\mkbibquote{#1}}
-\DeclareFieldFormat[article,incollection,online,reference,review]
+\DeclareFieldFormat[article,incollection,online,reference,review,thesis]
{labeltitle}{\mkbibquote{#1}}
-\DeclareIndexFieldFormat[article,incollection,online,reference,review]
+\DeclareIndexFieldFormat[article,incollection,online,reference,review,thesis]
{indextitle}{\usebibmacro{index:title}{\index}{\mkbibquote{#1}}}
+\DeclareFieldFormat[letter,misc,patent]{title}{#1}
+\DeclareFieldFormat[letter,misc,patent]{labeltitle}{#1}
+\DeclareIndexFieldFormat[letter,misc,patent]
+ {indextitle}{\usebibmacro{index:title}{\index}{#1}}
+
\DeclareFieldAlias[inbook]{title}{title}
\DeclareFieldAlias[inbook]{labeltitle}{labeltitle}
\DeclareIndexFieldAlias[inbook]{indextitle}{indextitle}
@@ -696,20 +719,18 @@
\DeclareFieldFormat{chapter}{\bibstring{chapter}\space #1}
\DeclareFieldFormat{issuetitle}{\ifcapital{\MakeCapital{#1}}{#1}}
-\DeclareFieldFormat[letter,misc,patent]{title}{#1}
-\DeclareFieldFormat[letter,misc,patent]{labeltitle}{#1}
-\DeclareFieldFormat[thesis,unpublished]{title}{%
- \iftoggle{bibliography}
+
+\DeclareFieldFormat[unpublished]
+ {title}{\usebibmacro{unpublished:format}{#1}}
+\DeclareFieldFormat[unpublished]
+ {labeltitle}{\usebibmacro{unpublished:format}{#1}}
+\DeclareIndexFieldFormat[unpublished]
+ {indextitle}{\usebibmacro{index:title}{\index}{% Macro below won't work here
+ \iffieldundef{collection}{\mkbibquote{#1}}{#1}}}
+\newbibmacro*{unpublished:format}[1]{%
+ \iffieldundef{collection}
{\mkbibquote{#1}}%
- {\iftoggle{cbx:short}
- {\mkbibquote{#1}}%
- {\mkbibquote{#1}\nopunct}}}
-\DeclareFieldFormat[thesis]{labeltitle}{%
- \iftoggle{bibliography}
- {\mkbibquote{#1}}%
- {\iftoggle{cbx:short}
- {\mkbibquote{#1}}%
- {\mkbibquote{#1}\nopunct}}}
+ {#1}}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Other Field Formats %%
@@ -797,9 +818,6 @@
\DeclareBibliographyAlias{cite:inbook}{cite:incollection}
\DeclareBibliographyAlias{cite:letter}{cite:incollection}
-\DeclareBibliographyAlias{unpublished}{thesis}
-\DeclareBibliographyAlias{cite:unpublished}{cite:thesis}
-
%%%%%%%%%%%%%%%%%%%%%%%%%
%% Author's Position %%
%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -817,6 +835,7 @@
{\usebibmacro{editors:a}%
\ifnameundef{\cbx at namelist}
{\toggletrue{noauth}%
+ \usebibmacro{unpublished:collection}%
\usebibmacro{authpos+deflabel}}%
{\usebibmacro{addplus+etc}%
\usebibmacro{namehash+etc}}}
@@ -835,32 +854,38 @@
{}
{\ifboolexpr{ togl {collection:ib}
and togl {swapvol}}
- {\usebibmacro{author+namelist}{bookauthor}}%
+ {\usebibmacro{shortnames}{bookauthor}}%
{\ifnameundef{author}
- {\usebibmacro{author+namelist}{bookauthor}}%
- {\usebibmacro{author+namelist}{author}}}}}
+ {\usebibmacro{shortnames}{bookauthor}%
+ \usebibmacro{test:authortypes}{bookauthor}}%
+ {\usebibmacro{shortnames}{author}%
+ \usebibmacro{test:authortypes}{author}}}}}
-\newbibmacro*{author+namelist}[1]{%
+\newbibmacro*{shortnames}[1]{%
\ifboolexpr{ test {\ifnameundef{short#1}}
or togl {cbx:first}
or togl {bibliography}}
{\renewcommand*{\cbx at namelist}{#1}}%
- {\renewcommand*{\cbx at namelist}{short#1}}%
- \usebibmacro{author+type}{#1}}%
+ {\renewcommand*{\cbx at namelist}{short#1}}}
-\newbibmacro*{author+type}[1]{%
+\newbibmacro*{test:authortypes}[1]{%
\iffieldundef{#1type}
{}
- {\iffieldequalstr{#1type}{anon}
+ {\let\authtypes\empty
+ \forcsvfield{\listadd\authtypes}{#1type}%
+ \usebibmacro{types:shared}{\authtypes}}}
+
+\newbibmacro*{types:shared}[1]{%
+ \ifinlist{anon}{#1}
+ {\renewcommand*{\anona}{\bibopenbracket}%
+ \renewcommand*{\anonb}{\bibclosebracket}}%
+ {\ifinlist{anon?}{#1}
{\renewcommand*{\anona}{\bibopenbracket}%
- \renewcommand*{\anonb}{\bibclosebracket}}%
- {\iffieldequalstr{#1type}{anon?}
- {\renewcommand*{\anona}{\bibopenbracket}%
- \renewcommand*{\anonb}{\addquestion\bibclosebracket}}%
- {\ifboolexpr{ test {\iffieldequalstr{#1type}{pseudo}}
- and not togl {cbx:short}}
- {\renewcommand*{\anonb}{\space\mkbibbrackets{\bibstring{pseudo}}}}
- {}}}}}
+ \renewcommand*{\anonb}{\addquestion\bibclosebracket}}%
+ {\ifboolexpr{ test {\ifinlist{pseudo}{#1}}
+ and not togl {cbx:short}}
+ {\renewcommand*{\anonb}{\space\mkbibbrackets{\bibstring{pseudo}}}}
+ {}}}}
\newbibmacro*{namehash+etc}{%
\usebibmacro{printnames+etc}%
@@ -871,6 +896,19 @@
\newunit}%
{\setunit{\addcomma\space}}}
+\newbibmacro*{unpublished:collection}{%
+ \ifboolexpr{ test {\iffieldundef{collection}}
+ and test {\iffieldundef{shortcollection}}}
+ {}
+ {\ifboolexpr{ togl {cbx:short}
+ and not test {\iffieldundef{shortcollection}}}
+ {\iftoggle{shortlinks}
+ {\printtext[bibhyperref]{\printfield{shortcollection}}}
+ {\printfield{shortcollection}}}
+ {\iftoggle{shortlinks}
+ {\printtext[bibhyperref]{\printfield{collection}}}
+ {\printfield{collection}}}}}
+
\newbibmacro*{supplement}{%
\ifnameundef{afterword}
{\ifnameundef{foreword}
@@ -1156,26 +1194,30 @@
% Macros common to 'editors:a', 'editors:b', and 'editors:c'.
\newbibmacro*{edcombos:a}{%
- \renewcommand*{\cbx at namelist}{\xeditor}%
+ \usebibmacro{shortnames}{\xeditor}%
\ifnamesequal{\xeditor}{\yeditor}
{\clearname{\yeditor}%
\toggletrue{notrans}%
\usebibmacro{edcombos:b}{\edtypes}{edtrans}%
\iftoggle{atleastone}
- {}
- {\usebibmacro{edcombos:b}{\transtypes}{edtrans}}}
- {\usebibmacro{edcombos:c}}}
+ {\usebibmacro{types:shared}{\edtypes}}%
+ {\usebibmacro{edcombos:b}{\transtypes}{edtrans}%
+ \usebibmacro{types:shared}{\transtypes}}}
+ {\usebibmacro{edcombos:c}%
+ \usebibmacro{types:shared}{\edtypes}}}
\newbibmacro*{transcombos:a}{%
- \renewcommand*{\cbx at namelist}{\yeditor}%
+ \usebibmacro{shortnames}{\yeditor}%
\ifnamesequal{\xeditor}{\yeditor}
{\clearname{\xeditor}%
\toggletrue{noed}%
\usebibmacro{transcombos:b}{\edtypes}{transed}%
\iftoggle{atleastone}
- {}
- {\usebibmacro{transcombos:b}{\transtypes}{transed}}}
- {\usebibmacro{transcombos:c}}}
+ {\usebibmacro{types:shared}{\edtypes}}%
+ {\usebibmacro{transcombos:b}{\transtypes}{transed}%
+ \usebibmacro{types:shared}{\transtypes}}}
+ {\usebibmacro{transcombos:c}%
+ \usebibmacro{types:shared}{\transtypes}}}
\newbibmacro*{edcombos:b}[2]{%
\togglefalse{atleastone}%
@@ -1303,7 +1345,7 @@
{\usebibmacro{printnames}}%
\usebibmacro{handle}%
\usebibmacro{nameaddon}%
- \usebibmacro{newauth+journallocation}%
+ \usebibmacro{newauth+location}%
\usebibmacro{a:labeldate+extradate}%
\usebibmacro{clearnames+empty}}%
@@ -1351,11 +1393,11 @@
{\printfield[brackets]{nameaddon}%
\clearfield{nameaddon}}}}
-\newbibmacro*{newauth+journallocation}{%
+\newbibmacro*{newauth+location}{%
\iftoggle{newauth}
{\ifboolexpr{ test {\ifentrytype{article}}
and togl {bibliography}}
- {\usebibmacro{journallocation}%
+ {\usebibmacro{article:location}%
\newunit}%
{}}
{}}
@@ -1601,7 +1643,9 @@
{\iffieldundef{pubstate}
{\usebibmacro{labeldate+date}{#1}}%
{\iffieldequalstr{pubstate}{preprint}
- {\bibstring{preprint}}%
+ {\newunit
+ \bibstring{preprint}%
+ \setunit{\space}}%
{\iffieldequalstr{pubstate}{prepub}
{\newunit% necessary if no 'date'
\bibstring{prepub}%
@@ -1608,7 +1652,8 @@
\setunit{\addcomma\space}%
\printdate}%
{\iffieldequalstr{pubstate}{working}
- {\bibstring{working}%
+ {\newunit
+ \bibstring{working}%
\setunit{\addcomma\space}}%
{\ifstrequal{#1}{parens}
{\printtext[parens]{\printfield{pubstate}}}
@@ -1711,6 +1756,26 @@
{}
{\textendash\printfield{endorigyear}}}}
+\newbibmacro*{year+month+day}{%
+ \iffieldundef{year}
+ {}
+ {\iffieldundef{month}
+ {\usebibmacro{reflist+year+day}%
+ \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}{%
@@ -1765,6 +1830,14 @@
%% Locations %%
%%%%%%%%%%%%%%%%%
+\newbibmacro*{article:location}{%
+ \iflistundef{location}
+ {}
+ {\nopunct\setunit{\space}%
+ \printtext[parens]{%
+ \printlist{location}}}%
+ \clearlist{location}}%
+
\newbibmacro*{loc+pub+year}{%
\usebibmacro{loc+pub}{1}%
\ifnumgreater{\value{publisher}}{1}
@@ -1775,11 +1848,11 @@
\usebibmacro{year+bookyear}}%
\newbibmacro*{loc+pub}[1]{%
- \usebibmacro{location}{#1}%
+ \usebibmacro{location:a}{#1}%
\setunit{\addcolon\space}%
\printlist[publisher][#1-#1]{publisher}}%
-\newbibmacro*{location}[1]{%
+\newbibmacro*{location:a}[1]{%
\ifboolexpr{ test {\iflistundef{location}}
and test {\iffieldundef{howpublished}}
and test {\iffieldundef{url}}
@@ -1787,6 +1860,12 @@
{\bibstring{noplace}}%
{\printlist[location][#1-#1]{location}}}
+\newbibmacro*{location:b}{%
+ \iflistundef{location}
+ {}
+ {\printlist{location}%
+ \setunit{\addcomma\space}}}
+
\newbibmacro*{origlocation}{%
\iflistundef{origlocation}
{}
@@ -1795,80 +1874,15 @@
{\setunit{\addcomma\space}}%
{\setunit{\addcolon\space}}}}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Bibliography Drivers %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newbibmacro*{institution+venue}{%
+ \ifboolexpr{ test {\iflistundef{institution}}
+ and test {\iflistundef{venue}}}
+ {}
+ {\iflistundef{institution}
+ {\printfield{venue}}%
+ {\printlist{institution}}%
+ \setunit{\addcomma\space}}}
-\DeclareBibliographyDriver{shorthand}{%
- \usedriver
- {\DeclareNameAlias{author}{sortname}}%
- {\thefield{entrytype}}%
- \iftoggle{annotate}
- {\global\togglefalse{annotate}%
- \usebibmacro{pageref+finentry}%
- \global\toggletrue{annotate}}%
- {\usebibmacro{pageref+finentry}}}
-
-\DeclareBibliographyDriver{article}{%
- \usebibmacro{bibindex}%
- \usebibmacro{newauth}%
- \usebibmacro{author+title+etc}%
- \usebibmacro{articles}%
- \usebibmacro{colon+pages+etc}%
- \usebibmacro{doi+finentry+etc}}%
-
-\DeclareBibliographyDriver{book}{%
- \usebibmacro{bibindex}%
- \usebibmacro{author+collection+etc}%
- \usebibmacro{doi+finentry+etc}}%
-
-\DeclareBibliographyDriver{incollection}{%
- \usebibmacro{bibindex}%
- \usebibmacro{author+incollection+etc}%
- \usebibmacro{crossref+incollections}%
- \usebibmacro{doi+finentry+etc}}%
-
-\DeclareBibliographyDriver{misc}{%
- \usebibmacro{bibindex}%
- \usebibmacro{author+bookauthor+etc}%
- \usebibmacro{title+labeldate}%
- \newunit
- \printfield{userb}%
- \usebibmacro{doi+finentry+etc}}%
-
-\DeclareBibliographyDriver{online}{%
- \usebibmacro{bibindex}%
- \usebibmacro{newauth}%
- \usebibmacro{author+title+etc}%
- \newunit
- \usebibmacro{websites}%
- \usebibmacro{issue+month+etc}{}%
- \usebibmacro{doi+finentry+etc}}%
-
-\DeclareBibliographyDriver{patent}{%
- \usebibmacro{bibindex}%
- \usebibmacro{author+title+etc}%
- \newunit
- \printfield{number}%
- \newunit
- \printfield{addendum}%
- \usebibmacro{pageref+finentry}}%
-
-\DeclareBibliographyDriver{review}{%
- \usebibmacro{bibindex}%
- \usebibmacro{newauth}%
- \usebibmacro{reviews}%
- \usebibmacro{articles}%
- \usebibmacro{colon+pages+etc}%
- \usebibmacro{doi+finentry+etc}}%
-
-\DeclareBibliographyDriver{thesis}{%
- \usebibmacro{bibindex}%
- \usebibmacro{author+title+etc}%
- \newunit
- \usebibmacro{inst+loc+date}%
- \usebibmacro{doi+finentry+etc}}%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Second Tier Macros %%
%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1894,12 +1908,14 @@
\usebibmacro{editors:b}}%
\newbibmacro*{articles}{%
- \newunit
+ \iftoggle{newauth}
+ {\printunit{\newunitpunct}}%
+ {\newunit}%
\usebibmacro{part}%
\usebibmacro{issuetitle}%
\usebibmacro{title+titleaddon}{journal}%
- \usebibmacro{journallocation}%
- \usebibmacro{journalseries}%
+ \usebibmacro{article:series}%
+ \usebibmacro{article:location}%
\usebibmacro{volume}%
\iftoggle{newauth}
{\newunit}%
@@ -1951,14 +1967,14 @@
\toggletrue{edshift}%
\usebibmacro{byauthor}%
\usebibmacro{editors:b}%
- \usebibmacro{volumes+bookseries+etc}{}}%
- {\usebibmacro{title+labeldate}{}%
+ \usebibmacro{volumes+series+etc}{}}%
+ {\usebibmacro{title+labeldate}%
\usebibmacro{byauthor}%
\iffieldundef{maintitle}
{\usebibmacro{note+edition+etc}%
- \usebibmacro{volumes+bookseries+etc}{}}%
+ \usebibmacro{volumes+series+etc}{}}%
{\usebibmacro{editors:b}%
- \usebibmacro{volumes+bookseries+etc}{}%
+ \usebibmacro{volumes+series+etc}{}%
\usebibmacro{maintitle+note+etc}}}
\usebibmacro{date+loc+etc}%
\usebibmacro{origtitle}}%
@@ -2036,24 +2052,69 @@
\toggletrue{edshift}%
\usebibmacro{editors:b}}%
+\newbibmacro*{thesis:type+pubstate}{%
+ \ifentrytype{mathesis}
+ {\bibstring{mathesis}%
+ \setunit{\addcomma\space}}%
+ {\ifentrytype{phdthesis}
+ {\bibstring{phdthesis}%
+ \setunit{\addcomma\space}}%
+ {\iffieldundef{type}
+ {\usebibmacro{pubstate}{}}%
+ {\iffieldbibstring{type}
+ {\bibstring{\thefield{type}}}
+ {\printfield{type}}%
+ \setunit{\addcomma\space}}}}}
+
\newbibmacro*{inst+loc+date}{%
- \usebibmacro{thesis+type}%
- \ifboolexpr{ test {\iflistundef{institution}}
- and test {\iflistundef{venue}}}
+ \usebibmacro{institution+venue}%
+ \usebibmacro{location:b}%
+ \usebibmacro{year+month+day}}%
+
+\newbibmacro*{type+typeaddon}{%
+ \iffieldundef{type}
{}
- {\iflistundef{institution}
- {\printfield{venue}}%
- {\printlist{institution}}%
- \setunit{\addcomma\space}}%
- \iflistundef{location}
+ {\newunit
+ \printfield{type}%
+ \iffieldundef{typeaddon}
+ {\setunit{\addcomma\space}}%
+ {\iffieldstart{typeaddon}{,}
+ {}
+ {\setunit{\space}}%
+ \printfield{typeaddon}%
+ \setunit{\space}}}}
+
+\newbibmacro*{unpublished:series}{%
+ \iffieldundef{series}
{}
- {\printlist{location}%
- \setunit{\addcomma\space}}%
- \iffieldundef{month}
- {\usebibmacro{reflist+year+day}}%
- {}
- \printdate}%
+ {\newunit
+ \usebibmacro{series+seriesaddon}%
+ \iffieldundef{collection}
+ {\setunit{\addcomma\space}}%
+ {\newunit}}}
+\newbibmacro*{manuscripts}{%
+ \iffieldundef{title}
+ {\toggletrue{skipdate}%
+ \usebibmacro{author+bookauthor+etc}%
+ \usebibmacro{type+typeaddon}}%
+ {\usebibmacro{author+bookauthor+etc}%
+ \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}}}
+ \iffieldundef{type}
+ {\newunit
+ \usebibmacro{unpublished:collection}}%
+ {}}
+ \usebibmacro{unpublished:note+etc}}%
+
%%%%%%%%%%%%%%%%%%%%%%%%%
%% Third Tier Macros %%
%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2082,35 +2143,19 @@
\setunit{\addcomma\space}%
\clearfield{part}}}
-\newbibmacro*{journallocation}{%
- \iflistundef{location}
- {}
- {\nopunct\setunit{\space}%
- \printtext[parens]{%
- \printlist{location}}}%
- \clearlist{location}}%
-
-\newbibmacro*{journalseries}{%
+\newbibmacro*{article:series}{%
\iffieldundef{series}
{}
{\iftoggle{newauth}
- {\newunit
- \printfield{series}}%
- {\setunit{\addcomma\space}%
- \printfield{series}}%
- \isdot\addcomma
- \usebibmacro{seriesaddon}%
- \usebibmacro{editors:c}{series}%
- \newunit}}%
+ {\newunit}%
+ {\setunit{\addcomma\space}}%
+ \usebibmacro{series+seriesaddon}}}
\newbibmacro*{volume}{%
\iffieldundef{volume}
{}
- {\ifboolexpr{ togl {bibliography}
- and togl {newauth}}
- {\printfield[noformat]{volume}}%
- {\setunit{\space}%
- \printfield[noformat]{volume}}}}
+ {\setunit{\space}%
+ \printfield[noformat]{volume}}}
% On how to format the issue number of periodicals, see CMOS, 17th
% ed., 14.171 and 15.47.
@@ -2237,12 +2282,12 @@
\setunit{\addcomma\space}\bibstring{by}\space}}%
{\renewcommand*{\pluga}{\newunit\bibstring{by}\space}}%
\renewcommand*{\cbx at namelist}{author}%
- \usebibmacro{author+type}{author}%
+ \usebibmacro{test:authortypes}{author}%
\usebibmacro{printnames+etc}}}
-\newbibmacro*{volumes+bookseries+etc}[1]{%
+\newbibmacro*{volumes+series+etc}[1]{%
\usebibmacro{volumes}%
- \usebibmacro{bookseries}%
+ \usebibmacro{book:series}%
\usebibmacro{pages}%
\usebibmacro{volume+number+etc}{#1}%
\usebibmacro{book:number}%
@@ -2297,7 +2342,7 @@
{\renewcommand*{\pluga}{%
\setunit{\addcomma\space}\bibstring{by}\space}%
\renewcommand*{\cbx at namelist}{bookauthor}%
- \usebibmacro{author+type}{bookauthor}%
+ \usebibmacro{test:authortypes}{bookauthor}%
\usebibmacro{printnames+etc}%
\usebibmacro{pages}}}
@@ -2322,9 +2367,9 @@
\usebibmacro{note+edition+etc}%
\iffieldundef{volume}
{\iffieldundef{bookvolume}%
- {\usebibmacro{volumes+bookseries+etc}{bookbook}}%
- {\usebibmacro{volumes+bookseries+etc}{book}}}
- {\usebibmacro{volumes+bookseries+etc}{}}}}
+ {\usebibmacro{volumes+series+etc}{bookbook}}%
+ {\usebibmacro{volumes+series+etc}{book}}}
+ {\usebibmacro{volumes+series+etc}{}}}}
\usebibmacro{date+loc+etc}%
\usebibmacro{origtitle}}%
@@ -2349,20 +2394,41 @@
\togglefalse{edshift}}%
{}}}
-\newbibmacro*{thesis+type}{%
- \ifentrytype{mathesis}
- {\bibstring{mathesis}%
- \setunit{\addcomma\space}}%
- {\ifentrytype{phdthesis}
- {\bibstring{phdthesis}%
- \setunit{\addcomma\space}}%
- {\iffieldundef{type}
- {\usebibmacro{pubstate}{}}%
- {\iffieldbibstring{type}
- {\bibstring{\thefield{type}}}
- {\printfield{type}}%
- \setunit{\addcomma\space}}}}}
+% 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
+\newrobustcmd*{\iffieldstart}[2]{%
+ \iffieldundef{#1}
+ {\@secondoftwo}% originally '\@gobbletwo'
+ {\begingroup
+ \edef\@tempa{%
+ \long\def\noexpand\iffieldstart at i####1\detokenize{#2}####2}%
+ \@tempa\@nil{\endgroup\ifblank{##1}}%
+ \savefield*{#1}{\@tempa}%
+ \expandafter\iffieldstart at i\detokenize
+ \expandafter\expandafter\expandafter{%
+ \expandafter\@tempa\detokenize{#2}}\@nil}}%
+
+\newbibmacro*{series+seriesaddon}{%
+ \printfield{series}%
+ \usebibmacro{seriesaddon}%
+ \ifterm
+ {\printunit{\isdot\addcomma\space}}%
+ {\setunit{\addcomma\space}}%
+ \usebibmacro{editors:c}{series}}%
+
+\newbibmacro*{unpublished:note+etc}{%
+ \ifboolexpr{ test {\ifentrytype{unpublished}}
+ and not test {\iffieldundef{collection}}}
+ {\usebibmacro{note}%
+ \usebibmacro{editors:b}%
+ \usebibmacro{unpublished:series}%
+ \usebibmacro{unpublished:volume}%
+ \newunit
+ \usebibmacro{inst+loc+date}}%
+ {}}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Fourth and Higher Tier Macros %%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2410,22 +2476,13 @@
\printfield{volumes}%
\clearfield{volumes}}}}
-\newbibmacro*{bookseries}{%
+\newbibmacro*{book:series}{%
\iffieldundef{series}
{}
{\usebibmacro{pages}%
\newunit
- \printfield{series}%
- \usebibmacro{seriesaddon}%
- \usebibmacro{editors:c}{series}}}
+ \usebibmacro{series+seriesaddon}}}
-\newbibmacro*{seriesaddon}{%
- \iffieldundef{seriesaddon}
- {}
- {\addcomma\space
- \printfield{seriesaddon}%
- \isdot\addcomma}}%
-
\newbibmacro*{swapvol+pages}{%
\ifboolexpr{ togl {collection}
and togl {swapvol}}
@@ -2491,7 +2548,7 @@
\iftoggle{swapvol}
{\usebibmacro{note}%
\usebibmacro{edition}{}%
- \usebibmacro{volumes+bookseries+etc}{}%
+ \usebibmacro{volumes+series+etc}{}%
\usebibmacro{title+titleaddon}{}%
\toggletrue{edshift}%
\usebibmacro{byauthor}%
@@ -2500,7 +2557,7 @@
\toggletrue{edshift}%
\usebibmacro{booktitle}%
\usebibmacro{note+edition+etc}%
- \usebibmacro{volumes+bookseries+etc}{}}}
+ \usebibmacro{volumes+series+etc}{}}}
\newbibmacro*{incollections:ic}{%
\iftoggle{swapvol}
@@ -2509,7 +2566,7 @@
{\usebibmacro{bookbooktitle}{}%
\toggletrue{edshift}%
\usebibmacro{note+edition+etc}}%
- \usebibmacro{volumes+bookseries+etc}{book}%
+ \usebibmacro{volumes+series+etc}{book}%
\toggletrue{edshift}%
\usebibmacro{booktitle}%
\usebibmacro{editors:b}}%
@@ -2522,6 +2579,107 @@
{\usebibmacro{bookbooktitle}{}%
\toggletrue{edshift}%
\usebibmacro{note+edition+etc}}%
- \usebibmacro{volumes+bookseries+etc}{book}}}
+ \usebibmacro{volumes+series+etc}{book}}}
+\newbibmacro*{seriesaddon}{%
+ \iffieldundef{seriesaddon}
+ {}
+ {\ifterm
+ {\printunit{\isdot\addcomma\space}}%
+ {\setunit{\addcomma\space}}%
+ \printfield{seriesaddon}}}
+
+\newbibmacro*{unpublished:volume}{%
+ \iffieldundef{volume}
+ {}
+ {\printfield{volume}%
+ \newunit}}%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Bibliography Drivers %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\DeclareBibliographyDriver{shorthand}{%
+ \usedriver
+ {\DeclareNameAlias{author}{sortname}}%
+ {\thefield{entrytype}}%
+ \iftoggle{annotate}
+ {\global\togglefalse{annotate}%
+ \usebibmacro{pageref+finentry}%
+ \global\toggletrue{annotate}}%
+ {\usebibmacro{pageref+finentry}}}
+
+\DeclareBibliographyDriver{article}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{newauth}%
+ \usebibmacro{author+title+etc}%
+ \usebibmacro{articles}%
+ \usebibmacro{colon+pages+etc}%
+ \usebibmacro{doi+finentry+etc}}%
+
+\DeclareBibliographyDriver{book}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{author+collection+etc}%
+ \usebibmacro{doi+finentry+etc}}%
+
+\DeclareBibliographyDriver{incollection}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{author+incollection+etc}%
+ \usebibmacro{crossref+incollections}%
+ \usebibmacro{doi+finentry+etc}}%
+
+\DeclareBibliographyDriver{misc}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{author+bookauthor+etc}%
+ \usebibmacro{title+labeldate}%
+ \newunit
+ \printfield{userb}%
+ \usebibmacro{doi+finentry+etc}}%
+
+\DeclareBibliographyDriver{online}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{newauth}%
+ \usebibmacro{author+title+etc}%
+ \newunit
+ \usebibmacro{websites}%
+ \usebibmacro{issue+month+etc}{}%
+ \usebibmacro{doi+finentry+etc}}%
+
+\DeclareBibliographyDriver{patent}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{author+title+etc}%
+ \newunit
+ \printfield{number}%
+ \newunit
+ \printfield{addendum}%
+ \usebibmacro{pageref+finentry}}%
+
+\DeclareBibliographyDriver{review}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{newauth}%
+ \usebibmacro{reviews}%
+ \usebibmacro{articles}%
+ \usebibmacro{colon+pages+etc}%
+ \usebibmacro{doi+finentry+etc}}%
+
+\DeclareBibliographyDriver{thesis}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{author+title+etc}%
+ \newunit
+ \usebibmacro{thesis:type+pubstate}%
+ \usebibmacro{inst+loc+date}%
+ \usebibmacro{doi+finentry+etc}}%
+
+\DeclareBibliographyDriver{unpublished}{%
+ \usebibmacro{bibindex}%
+ \iffieldundef{collection}
+ {\usebibmacro{author+title+etc}%
+ \newunit
+ \usebibmacro{type+typeaddon}%
+ \usebibmacro{pubstate}{}%
+ \usebibmacro{unpublished:series}%
+ \usebibmacro{inst+loc+date}}%
+ {\usebibmacro{manuscripts}}%
+ \usebibmacro{doi+finentry+etc}}%
+
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/windycity/windycity.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/windycity/windycity.cbx 2021-11-10 21:18:14 UTC (rev 61020)
+++ trunk/Master/texmf-dist/tex/latex/windycity/windycity.cbx 2021-11-10 21:18:29 UTC (rev 61021)
@@ -1,4 +1,4 @@
-% Last modified: Wed 07 Jul 2021 05:45:51 PM CDT
+% Last modified: Tue 09 Nov 2021 07:46:18 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/07/07 Windy City citation style for
+\ProvidesFile{windycity.cbx}[2021/11/09 Windy City citation style for
biblatex]
\@ifpackagelater{biblatex}{2019/08/17}
{}
@@ -168,8 +168,17 @@
{\multicitedelim}%
{\usebibmacro{cite:postnote}}%
+\DeclareCiteCommand{\parenauth}[\mkbibparens]
+ {\usebibmacro{prenote}}%
+ {\usebibmacro{citeindex}%
+ \toggletrue{cbx:skipdate}%
+ \usebibmacro{parencite}}%
+ {\multicitedelim}%
+ {\usebibmacro{postnote}}%
+
\DeclareMultiCiteCommand{\idemcites}{\idemcite}{\multicitedelim}%
-\DeclareMultiCiteCommand{\footidemcites}[\mkbibfootnote]{\footidemcite}{\multicitedelim}
+\DeclareMultiCiteCommand{\footidemcites}[\mkbibfootnote]{\footidemcite}{\multicitedelim}%
+\DeclareMultiCiteCommand{\parenauths}[\mkbibparens]{\parenauth}{\multicitedelim}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Parenthetical Citations %%
@@ -189,16 +198,18 @@
\usebibmacro{parencite:multicite}}}
\newbibmacro*{parencite:date}{%
- \ifboolexpr{ test {\ifentrytype{online}}
- and test {\iffieldundef{year}}}
- {\newunit
- \usebibmacro{pubstate}{}}%
- {\usebibmacro{parencite:origyear}%
- \iffieldnums{labelyear}
- {}% needs '%'
- {\newunit}%
- \usebibmacro{labeldate+endyear}%
- \printfield{extradate}}}
+ \iftoggle{cbx:skipdate}
+ {}
+ {\ifboolexpr{ test {\ifentrytype{online}}
+ and test {\iffieldundef{year}}}
+ {\newunit
+ \usebibmacro{pubstate}{}}%
+ {\usebibmacro{parencite:origyear}%
+ \iffieldnums{labelyear}
+ {}% needs '%'
+ {\newunit}%
+ \usebibmacro{labeldate+endyear}%
+ \printfield{extradate}}}}
\newbibmacro*{parencite:origyear}{%
\iffieldundef{origyear}
@@ -249,7 +260,7 @@
and test {\ifnameundef{foreword}}
and test {\ifnameundef{introduction}}
and test {\ifnameundef{preface}}}
- {\usebibmacro{author+bookauthor+etc}}%
+ {\usebibmacro{collection+author+etc}}%
{\usebibmacro{supplement}}}}}
%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -269,6 +280,7 @@
\usebibmacro{savefields}}%
\newbibmacro*{cite:seen}{%
+ \usebibmacro{test:loccit}%
\iffieldundef{shorthand}
{\ifboolexpr{ test \ifciteibid
and togl {short}
@@ -282,12 +294,22 @@
{\printfield{shorthand}%
\usebibmacro{cite:volume}}}}
+\newbibmacro*{test:loccit}{%
+ \ifboolexpr{ togl {ibidpage}
+ and test \ifciteibid
+ and test \ifloccit
+ and not test \iffirstonpage}
+ {\global\toggletrue{ibid:loccit}}%
+ {}}
+
\newbibmacro*{cite:ibid}{%
\iftoggle{ibid}
{\iftoggle{shortlinks}
{\printtext[bibhyperref]{%
- \usebibmacro{cite:ibid+loccit}}}
- {\usebibmacro{cite:ibid+loccit}}}
+ \bibcpstring{ibidem}%
+ \usebibmacro{cite:volume}}}
+ {\bibcpstring{ibidem}%
+ \usebibmacro{cite:volume}}}
{\global\toggletrue{cbx:short}%
\ifentrytype{review}
{\usebibmacro{ibid:review}}%
@@ -296,13 +318,6 @@
\usebibmacro{cite:author+title+etc}}}
{\usebibmacro{cite:author+title+etc}}}}}
-\newbibmacro*{cite:ibid+loccit}{%
- \bibcpstring{ibidem}%
- \ifboolexpr{ togl {ibidpage}
- and test \ifloccit}
- {\global\toggletrue{ibid:loccit}}%
- {\usebibmacro{cite:volume}}}
-
\newbibmacro*{ibid:review}{%
\ifnameundef{author}
{\bibcpstring{reviewnoauth}%
@@ -316,17 +331,14 @@
\iftoggle{noauth}
{\usebibmacro{shorttitle+shortlinks}}%
{}% needs '%'
- \ifboolexpr{ togl {ibidpage}
- and test \ifloccit}
- {\global\toggletrue{ibid:loccit}}%
- {\usebibmacro{cite:volume}}}
+ \usebibmacro{cite:volume}}%
\newbibmacro*{cite:short}{%
\global\toggletrue{cbx:short}%
- \usebibmacro{short:multicite}%
+ \usebibmacro{test:multicite}%
\ifentrytype{review}
{\usebibmacro{short:review}}%
- {\usebibmacro{author+bookauthor+etc}%
+ {\usebibmacro{collection+author+etc}%
\usebibmacro{shorttitle+shortlinks}%
\ifboolexpr{ togl {ibidpage}
and test \ifloccit
@@ -334,7 +346,7 @@
{\global\toggletrue{ibid:loccit}}%
{\usebibmacro{cite:volume}}}}
-\newbibmacro*{short:multicite}{%
+\newbibmacro*{test:multicite}{%
\ifboolexpr{ test {\iffieldequals{namehash}{\bbx at lasthash}}
and togl {multicite}
and togl {short}}
@@ -355,17 +367,25 @@
\setunit{\space}%
\usebibmacro{shorttitle}{book}}%
{\usebibmacro{author+bookauthor+etc}%
- \usebibmacro{shorttitle+shortlinks}}}}
- \usebibmacro{cite:volume}}%
+ \usebibmacro{shorttitle+shortlinks}}}}}
+\newbibmacro*{collection+author+etc}{%
+ \ifboolexpr{ test {\ifentrytype{unpublished}}
+ and test {\iffieldundef{title}}
+ and not test {\iffieldundef{collection}}}
+ {\usebibmacro{unpublished:collection}}%
+ {\usebibmacro{author+bookauthor+etc}}}
+
\newbibmacro*{cite:volume}{%
- \usebibmacro{cite:punctuation}%
- \iftoggle{swapvol}
- {\ifboolexpr{ togl {collection:bk}
- or togl {collection:ib}}
- {\usebibmacro{volume+page}}%
- {}}
- {}}
+ \iftoggle{ibid:loccit}
+ {}
+ {\usebibmacro{cite:punctuation}%
+ \iftoggle{swapvol}
+ {\ifboolexpr{ togl {collection:bk}
+ or togl {collection:ib}}
+ {\usebibmacro{volume+page}}%
+ {}}
+ {}}}
\newbibmacro*{cite:punctuation}{%
\iffieldstart{postnote}{;}
@@ -372,22 +392,6 @@
{}
{\newunit}}%
-% 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
-
-\newrobustcmd*{\iffieldstart}[2]{%
- \iffieldundef{#1}
- {\@secondoftwo}% originally '\@gobbletwo'
- {\begingroup
- \edef\@tempa{%
- \long\def\noexpand\iffieldstart at i####1\detokenize{#2}####2}%
- \@tempa\@nil{\endgroup\ifblank{##1}}%
- \savefield*{#1}{\@tempa}%
- \expandafter\iffieldstart at i\detokenize
- \expandafter\expandafter\expandafter{%
- \expandafter\@tempa\detokenize{#2}}\@nil}}%
-
\newbibmacro*{volume+page}{%
\iffieldundef{volume}
{}
@@ -494,9 +498,11 @@
\ifboolexpr{ test {\iffieldundef{postnote}}
and test {\iffieldundef{pages}}
and test {\iffieldundef{url}}}
- {\usebibmacro{doi+url+etc}}%
+ {\usebibmacro{unpublished:note+etc}%
+ \usebibmacro{doi+url+etc}}%
{\usebibmacro{cite:pages}%
\usebibmacro{postnote}%
+ \usebibmacro{unpublished:note+etc}%
\usebibmacro{doi+url+etc}}}
% If the postnote is empty, print the page ranges of journal and
@@ -619,7 +625,33 @@
\DeclareBibliographyDriver{cite:thesis}{%
\usebibmacro{author+title+etc}%
\setunit{\addspace}% not '\setunit{\space}'
- \printtext[parens]{\usebibmacro{inst+loc+date}}%
+ \printtext[parens]{%
+ \usebibmacro{thesis:type+pubstate}%
+ \usebibmacro{inst+loc+date}}%
\newunit}%
+\DeclareBibliographyDriver{cite:unpublished}{%
+ \iffieldundef{collection}
+ {\usebibmacro{author+title+etc}%
+ \setunit{\addspace}% not '\setunit{\space}'
+ \printtext[parens]{%
+ \iffieldundef{type}
+ {\usebibmacro{pubstate}{}}%
+ {\printfield{type}%
+ \setunit{\addcomma\space}}%
+ \usebibmacro{unpublished:series}%
+ \usebibmacro{inst+loc+date}}}
+ {\usebibmacro{collection+author+etc}%
+ \iffieldundef{title}
+ {}
+ {\usebibmacro{title+titleaddon}{}%
+ \setunit{\addcomma\space}%
+ \iffieldundef{year}
+ {\printlabeldate}% for 'n.d.'
+ {\printdate
+ \global\clearfield{year}}% needs '\global'
+ \newunit
+ \usebibmacro{unpublished:collection}}}% needs '%'
+ \newunit}%
+
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/windycity/windycity.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/windycity/windycity.dbx 2021-11-10 21:18:14 UTC (rev 61020)
+++ trunk/Master/texmf-dist/tex/latex/windycity/windycity.dbx 2021-11-10 21:18:29 UTC (rev 61021)
@@ -1,5 +1,11 @@
-\ProvidesFile{windycity.dbx}[2021/07/07 Windy City data model file for
- biblatex]
+\ProvidesFile{windycity.dbx}[2021/11/09 Windy City data model file for biblatex]
+\DeclareDatamodelFields[type=field,datatype=key]{%
+ booktitlekey,
+ bookbooktitlekey,
+ titlekey,
+ translatortype,
+ translatoratype,
+ translatorbtype}
\DeclareDatamodelFields[type=field,datatype=literal]{%
blogsubtitle,
blogtitle,
@@ -10,9 +16,8 @@
bookbooktitleaddon,
bookvolume,
bookbookvolume,
- booktitlekey,
- bookbooktitlekey,
bookyear,
+ collection,
editoraddon,
editoraaddon,
endbookyear,
@@ -20,14 +25,13 @@
seriesaddon,
shortblog,
shortbooktitle,
+ shortcollection,
shortmaintitle,
shortorganization,
- titlekey,
- translatortype,
- translatoratype,
- translatorbtype}
+ typeaddon}
\DeclareDatamodelFields[type=list,datatype=name]{%
preface,
shortbookauthor,
+ shorttranslator,
translatora,
translatorb}
More information about the tex-live-commits
mailing list.