From 3cf2e76fc502cb474081c80838c95ecaba2f386d Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 5 May 2023 03:01:19 +0000 Subject: CTAN sync 202305050301 --- .../contrib/biblatex-contrib/windycity/CHANGES.md | 41 ++ .../windycity/american-windycity.lbx | 4 +- .../biblatex-contrib/windycity/doc/windycity.bib | 36 +- .../biblatex-contrib/windycity/doc/windycity.pdf | Bin 507249 -> 512581 bytes .../biblatex-contrib/windycity/doc/windycity.sty | 26 +- .../biblatex-contrib/windycity/doc/windycity.tex | 221 ++++++--- .../biblatex-contrib/windycity/windycity.bbx | 542 ++++++++++++++++----- .../biblatex-contrib/windycity/windycity.cbx | 24 +- .../biblatex-contrib/windycity/windycity.dbx | 8 +- 9 files changed, 680 insertions(+), 222 deletions(-) (limited to 'macros/latex/contrib/biblatex-contrib') diff --git a/macros/latex/contrib/biblatex-contrib/windycity/CHANGES.md b/macros/latex/contrib/biblatex-contrib/windycity/CHANGES.md index 2b166c9f5c..61b08926c1 100644 --- a/macros/latex/contrib/biblatex-contrib/windycity/CHANGES.md +++ b/macros/latex/contrib/biblatex-contrib/windycity/CHANGES.md @@ -8,6 +8,47 @@ indicate updates to Windy City's [repository on GitHub](https://github.com/brianchase/windycity "GitHub: brianchase/windycity"). +## 2023-05-03 + +* added preamble option `sentencecase` to put titles in + sentence-style capitalization (see *CMOS* 8.158) +* added entry options to override, per entry, the default formats of + titles: + + - Supported fields: `title`, `blogtitle`, `bookbooktitle`, + `booktitle`, `issuetitle`, `journal`, `journaltitle`, + `maintitle`, `origtitle`, `shortbooktitle`, `shorthand`, + `shorttitle`, and `shortmaintitle` + - For italics: `emph:` (`emph` is short for `emph:title`) + - For quotes: `quotes:` (`quotes` is short for + `quotes:title`) + - For sentence-style capitalization: `sentencecase:` + (`sentencecase` is short for `sentencecase:title`) + - To remove formatting: `noformat:` (`noformat` is short for + `noformat:title`) + - Uppercase the first letter when `\ifcapital` is true: + `ifcapital:` (`ifcapital` is short for `ifcapital:title`) + - You can use some of the options above at the same time, such as + putting a title in both italics and sentence case. Exceptions: You + can't use the `emph` and `quotes` options together (the `emph` + options prevail), you can't use either with the `noformat` options + (the `noformat` options prevail), and you can't use the + `setencecase` and `ifcapital` options together (the `sentencecase` + options prevail). + - Setting an option for a title sets the related option for its + short title (e.g. `sentencecase:maintitle` implies + `sentencecase:shortmaintitle`). + +* added support for the `yeardivision` field (support for `season` + remains for backward compatibility) +* fixed the `year` field of `@standard` entries printing when + `pubstate` supersedes it +* fixed a missing field format for `shortmaintitle` +* fixed a setting that caused `@reference` and `@inreference` works to + format incorrectly if (1) `organization` was supposed to occupy the + author's position *and* (2) their bibliography database entries had + an `options` field + ## 2021-12-04 * improved the handling of `labeldate` for `@inbook` and `@bookinbook` diff --git a/macros/latex/contrib/biblatex-contrib/windycity/american-windycity.lbx b/macros/latex/contrib/biblatex-contrib/windycity/american-windycity.lbx index f584258e78..95a214aaaf 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: Sat 04 Dec 2021 12:44:02 PM CST +% Last modified: Wed 03 May 2023 06:54:19 PM CDT % Permission is granted to copy, distribute and/or modify this % software under the terms of the LaTeX Project Public License (LPPL), @@ -11,7 +11,7 @@ % implied warranties of merchantability and fitness for a particular % purpose. -\ProvidesFile{american-windycity.lbx}[2021/12/04 Windy City +\ProvidesFile{american-windycity.lbx}[2023/05/03 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 9fc940a868..5eaf6ffeef 100644 --- a/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.bib +++ b/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.bib @@ -1,10 +1,11 @@ @STRING{ucp = "University of Chicago Press"} @Book{chicago2017, + options = {emph:shorthand}, author = {{University of Chicago Press}}, title = {The Chicago Manual of Style}, - shorthand = {\emph{CMOS}}, - shorthandintro = {\addperiod\space Hereafter, \printfield{shorthand}}, + shorthand = {CMOS}, + shorthandintro = {\addperiod\space Hereafter, \printfield[emph]{shorthand}}, edition = {17}, address = {Chicago}, publisher = ucp, @@ -433,10 +434,10 @@ % 14.59 Abbreviations for frequently cited works @Collection{shurtleff1853, - options = {listvols}, + options = {emph:shorthand,listvols}, editor = {Shurtleff, Nathaniel B.}, title = {Records of the Governor and Company of the Massachusetts Bay in New England (1628–86)}, - shorthand = {\emph{Mass. Records}}, + shorthand = {Mass. Records}, volumes = {5}, address = {Boston}, year = {1853–54} @@ -882,10 +883,11 @@ year = {1977} } @Book{furet1999,% see also 14.59 + options = {emph:shorthand}, author = {Furet, François}, title = {The Passing of an Illusion}, -% shorthand = {\emph{PI}}, - shorthandintro = {\mkbibparens{hereafter cited in text as \printfield{shorthand}}}, +% shorthand = {PI}, + shorthandintro = {\mkbibparens{hereafter cited in text as \printfield[emph]{shorthand}}}, translator = {Furet, Deborah}, address = {Chicago}, publisher = ucp, @@ -2353,6 +2355,26 @@ url = {https://www.facebook.com/junotdiaz.writer/posts/972495572815454?comment_id=972558569475821} } +% 14.210 Electronic mailing lists and forums + +@Online{powell1998, + author = {Powell, John}, + title = {Pattern matching}, + note = {Grapevine digest mailing list archives}, + organization = {Electric Editors}, + date = {1998-04-23}, + url = {http://www.electriceditors.net/grapevine/archives.php} +} +@Online{braun2016, + keywords = {notinref},% not for reference lists (see 15.52) + options = {noformat,ifcapital}, + author = {Braun, Caroline}, + title = {reply to \mkbibquote{How did the `cool kids' from high school turn out?}}, + organization = {Quora}, + date = {2016-08-09}, + url = {https://www.quora.com/How-did-the-cool-kids-from-high-school-turn-out/} +} + % 14.215 Theses and dissertations @Thesis{vedrashko2006, @@ -2679,7 +2701,7 @@ title = {Bull's Head}, date = {1942-21}, type = {bicycle saddle and handlebars}, - typeaddon = {, 33.5\addthinspace ×\addthinspace 43.5 ×\addthinspace 19\,cm}, + typeaddon = {, 33.5\addthinspace ×\addthinspace 43.5\addthinspace ×\addthinspace 19\,cm}, institution = {Musée Picasso Paris} } diff --git a/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.pdf b/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.pdf index f944776846..16deb0a936 100644 Binary files a/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.pdf and b/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.pdf differ diff --git a/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.sty b/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.sty index c001e45902..07653b99c9 100644 --- a/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.sty +++ b/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.sty @@ -1,4 +1,4 @@ -% Last modified: Tue 13 Apr 2021 05:25:58 PM CDT +% Last modified: Sun 13 Feb 2022 10:28:05 AM CST \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{windycity} \RequirePackage{ifxetex} @@ -105,6 +105,13 @@ {\end{enumerate} \printbibliography[env=bib,heading=none,segment=\therefsegment] \endrefsegment}% +\newenvironment{citenobib} + {\begin{enumerate}[% + before=\RaggedRight\citereset\newrefsegment\small, + itemindent=2.2em, + labelsep=0.2em, + leftmargin=1.1em]}% + {\end{enumerate}}% \newenvironment{citeref} {\begin{itemize}[label=,labelsep=0.2em,leftmargin=1.1em] \item\begin{enumerate*}[% @@ -116,13 +123,16 @@ \end{itemize} \printbibliography[env=ref,heading=none,segment=\therefsegment] \endrefsegment}% -\newenvironment{citeonly} - {\begin{enumerate}[% - before=\RaggedRight\citereset\newrefsegment\small, - itemindent=2.2em, - labelsep=0.2em, - leftmargin=1.1em]}% - {\end{enumerate}}% +\newenvironment{citenoref} + {\begin{itemize}[label=,labelsep=0.2em,leftmargin=1.1em] + \item\begin{enumerate*}[% + afterlabel=, + before=\citereset\newrefsegment\small\noindent, + itemjoin={{, }}, + label=]}% + {\end{enumerate*} + \end{itemize} + \endrefsegment}% \newenvironment{bibonly} {\citereset\newrefsegment\small}% {\printbibliography[env=bib,heading=none,segment=\therefsegment] diff --git a/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.tex b/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.tex index a4bc14d059..d81be4bee3 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: Sat 04 Dec 2021 01:43:53 PM CST +% Last modified: Wed 03 May 2023 07:02:51 PM CDT \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-12-04} +\version{2023-05-03} \maketitle \begingroup \hypersetup{linkcolor=black} @@ -17,7 +17,7 @@ \section{Introduction} -\nfootnote{Copyright \textcopyright\ 2014--2021 Brian Chase. Under the +\nfootnote{Copyright \textcopyright\ 2014--2023 Brian Chase. Under the terms of the \LaTeX\ Project Public License, version 1.3, permission is granted to copy, distribute, or modify this software. See \url{http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt} or @@ -136,14 +136,14 @@ style is meant to handle. For a first set of examples, consider this passage from \textit{CMOS} \ref{14.30}: -\begin{citeonly} +\begin{citenobib} \item \cite[24--25]{morley1995} \item \cite{schwartz1992} \item \cite{kaiser1964} \item \cite[43]{morley1995} \item \cite[138]{schwartz1992} \item \cite[189--90]{kaiser1964} -\end{citeonly} +\end{citenobib} A work's first citation is similar to its entry in the bibliography. It includes all or most of its bibliographic information. Subsequent @@ -217,7 +217,7 @@ offers several preamble options and other means for producing them. Let's start with another passage of default output: -\begin{citeonly} +\begin{citenobib} \item \cite[3]{morrison2004a} \item \cite[18]{morrison2004a} \item \cite[18]{morrison2004a} @@ -230,7 +230,7 @@ Let's start with another passage of default output: \item \cite[201-2]{diaz2007} \item \cites[240]{morrison2004b}[32]{morrison2004a} \item \cite[33]{morrison2004a} -\end{citeonly} +\end{citenobib} A shorter form of this passage appears in \textit{CMOS} \ref{14.34}:\footnote{Switching forms within a document isn't a @@ -240,7 +240,7 @@ possible.} % Preamble option 'short' sets 'short' and 'shortfirst' toggles to % true. Set them to true to simulate the 'short' preamble option. -\begin{citeonly} +\begin{citenobib} \AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}} \item \cite[3]{morrison2004a} \AtNextCitekey{\toggletrue{short}} @@ -265,7 +265,7 @@ possible.} \item \cites[240]{morrison2004b}[32]{morrison2004a} \AtNextCitekey{\toggletrue{short}} \item \cite[33]{morrison2004a} -\end{citeonly} +\end{citenobib} In this version, a work's first citation gives short names and titles and omits all other publication information. Consecutive citations of @@ -287,7 +287,7 @@ break here may affect the output.} % toggles to true. Set all those toggles to true to simulate the % 'short' and 'ibid' preamble options. -\begin{citeonly} +\begin{citenobib} \AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}} \item \cite[3]{morrison2004a} \AtNextCitekey{\toggletrue{short}\toggletrue{ibid}} @@ -312,7 +312,7 @@ break here may affect the output.} \item \cites[240]{morrison2004b}[32]{morrison2004a} \AtNextCitekey{\toggletrue{short}} \item \cite[33]{morrison2004a} -\end{citeonly} +\end{citenobib} For a compromise between standard and short forms, try the preamble option \opt{shortfirst}. It swaps long first citations for short ones @@ -495,6 +495,17 @@ reference list is to pass \opt{env=reflist} to \cmd{printbibliography}. See section \ref{overview} for more information. +\optitem[false]{sentencecase}{\opt{true}, \opt{false}} + +\noindent This option puts titles in sentence-style capitalization, +also called sentence case (see \textit{CMOS} 8.158), whereby the first +letter is uppercase and subsequent letters are lowercase. Affected +fields: \bibfield{title}, \bibfield{blogtitle}, +\bibfield{bookbooktitle}, \bibfield{booktitle}, \bibfield{issuetitle}, +\bibfield{journal}, \bibfield{journaltitle}, \bibfield{maintitle}, +\bibfield{origtitle}, \bibfield{shortbooktitle}, \bibfield{shorthand}, +\bibfield{shorttitle}, and \bibfield{shortmaintitle}. + \optitem[false]{short}{\opt{true}, \opt{false}} \noindent As shown in section \ref{short}, this option prints short @@ -524,7 +535,7 @@ in \textit{CMOS} \ref{14.34}: % 'shortafter' doesn't. Hence, to display the output of 'shortafter' % below, you need only toggle true 'short'. -\begin{citeonly} +\begin{citenobib} \AtNextCitekey{\toggletrue{short}} \item \cite[3]{morrison2004a} \AtNextCitekey{\toggletrue{short}} @@ -549,7 +560,7 @@ in \textit{CMOS} \ref{14.34}: \item \cites[240]{morrison2004b}[32]{morrison2004a} \AtNextCitekey{\toggletrue{short}} \item \cite[33]{morrison2004a} -\end{citeonly} +\end{citenobib} \optitem[false]{shortfirst}{\opt{true}, \opt{false}} @@ -573,18 +584,18 @@ the author's name, \textit{ibid.}, or a shorthand. For comparison, the blue text below shows default links: \hypersetup{citecolor=blue} -\begin{citeonly} +\begin{citenobib} \item \cite[24--25]{morley1995} \item \cite{schwartz1992} \item \cite{kaiser1964} \item \cite[43]{morley1995} \item \cite[138]{schwartz1992} \item \cite[189--90]{kaiser1964} -\end{citeonly} +\end{citenobib} \noindent And here they are with \opt{shortlinks}: -\begin{citeonly} +\begin{citenobib} \AtNextCitekey{\toggletrue{shortlinks}} \item \cite[24--25]{morley1995} \AtNextCitekey{\toggletrue{shortlinks}} @@ -597,7 +608,7 @@ blue text below shows default links: \item \cite[138]{schwartz1992} \AtNextCitekey{\toggletrue{shortlinks}} \item \cite[189--90]{kaiser1964} -\end{citeonly} +\end{citenobib} \hypersetup{citecolor=} \optitem[false]{swapvol}{\opt{true}, \opt{false}} @@ -654,12 +665,60 @@ the value of \cmd{bibitemsep}. \noindent Set \opt{false} to prevent the \bibfield{doi} field from printing. +\optitem[false]{emph}{\opt{true}, \opt{false}} + +\noindent Short for \opt{emph:title}. + +\optitem[false]{emph:}{\opt{true}, \opt{false}} + +\noindent This option puts titles in italics. Supported values of +\bibfield{}: \bibfield{title}, \bibfield{blogtitle}, +\bibfield{bookbooktitle}, \bibfield{booktitle}, \bibfield{issuetitle}, +\bibfield{journal}, \bibfield{journaltitle}, \bibfield{maintitle}, +\bibfield{origtitle}, \bibfield{shortbooktitle}, \bibfield{shorthand}, +\bibfield{shorttitle}, and \bibfield{shortmaintitle}. + \optitem[true]{eprint}{\opt{true}, \opt{false}} \noindent Set \opt{false} to prevent the \bibfield{eprint} field from printing. For more information about eprints, see section \ref{datafields}. +\optitem[false]{ifcapital}{\opt{true}, \opt{false}} + +\noindent Short for \opt{ifcapital:title}. + +\optitem[false]{ifcapital:}{\opt{true}, \opt{false}} + +\noindent This option uppercases the first letter of titles when +\cmd{ifcapital} is true. Supported values of \bibfield{}: +\bibfield{title}, \bibfield{blogtitle}, \bibfield{bookbooktitle}, +\bibfield{booktitle}, \bibfield{issuetitle}, \bibfield{journal}, +\bibfield{journaltitle}, \bibfield{maintitle}, \bibfield{origtitle}, +\bibfield{shortbooktitle}, \bibfield{shorthand}, +\bibfield{shorttitle}, and \bibfield{shortmaintitle}. + +In combination with \opt{noformat:}, this option allows you to +work with complex titles, where different parts need different formats +in different contexts. From \textit{CMOS} \ref{14.210}: + +\begin{verbatim} + @Online{braun2016, + options = {noformat,ifcapital}, + author = {Braun, Caroline}, + title = {reply to \mkbibquote{How did the `cool kids' from high + school turn out?}}, + organization = {Quora}, + date = {2016-08-09}, + url = {https://www.quora.com/How-did-the-cool-kids-from-high + -school-turn-out/} + } +\end{verbatim} + +\begin{citebib} +\item \cite{braun2016} +\end{citebib} + \optitem[false]{isbn}{\opt{true}, \opt{false}} \noindent Use this option to print the ISBN of a particular work in a @@ -712,6 +771,19 @@ such as \cmd{cite*}, \cmd{footcite*}, and \cmd{parencite*}. citations and bibliography entries of specific works. To disable truncation in all works, use the \opt{noetal} preamble option. +\optitem[false]{noformat}{\opt{true}, \opt{false}} + +\noindent Short for \opt{noformat:title}. + +\optitem[false]{noformat:}{\opt{true}, \opt{false}} + +\noindent This option removes formatting from titles. Supported values +of \bibfield{}: \bibfield{title}, \bibfield{blogtitle}, +\bibfield{bookbooktitle}, \bibfield{booktitle}, \bibfield{issuetitle}, +\bibfield{journal}, \bibfield{journaltitle}, \bibfield{maintitle}, +\bibfield{origtitle}, \bibfield{shortbooktitle}, \bibfield{shorthand}, +\bibfield{shorttitle}, and \bibfield{shortmaintitle}. + \optitem[false]{noplace}{\opt{true}, \opt{false}} \noindent In contexts where Windy City expects to print a publisher's @@ -719,10 +791,10 @@ 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{citenobib} %\begin{itemize}[before=\small,itemindent=0ex] \item[] \cite{windsor1910} -\end{citeonly} +\end{citenobib} %\end{itemize} \optitem[false]{noreprint}{\opt{true}, \opt{false}} @@ -745,6 +817,34 @@ the author-year format): \nocite{darwin1964} \end{refonly} +\optitem[false]{quotes}{\opt{true}, \opt{false}} + +\noindent Short for \opt{quotes:title}. + +\optitem[false]{quotes:}{\opt{true}, \opt{false}} + +\noindent This option puts titles in quotes. Supported values of +\bibfield{}: \bibfield{title}, \bibfield{blogtitle}, +\bibfield{bookbooktitle}, \bibfield{booktitle}, \bibfield{issuetitle}, +\bibfield{journal}, \bibfield{journaltitle}, \bibfield{maintitle}, +\bibfield{origtitle}, \bibfield{shortbooktitle}, \bibfield{shorthand}, +\bibfield{shorttitle}, and \bibfield{shortmaintitle}. + +\optitem[false]{sentencecase}{\opt{true}, \opt{false}} + +\noindent Short for \opt{sentencecase:title}. + +\optitem[false]{sentencecase:}{\opt{true}, \opt{false}} + +\noindent This option puts titles in sentence-style capitalization, +also called sentence case (see \textit{CMOS} 8.158), whereby the first +letter is uppercase and subsequent letters are lowercase. Supported +values of \bibfield{}: \bibfield{title}, \bibfield{blogtitle}, +\bibfield{bookbooktitle}, \bibfield{booktitle}, \bibfield{issuetitle}, +\bibfield{journal}, \bibfield{journaltitle}, \bibfield{maintitle}, +\bibfield{origtitle}, \bibfield{shortbooktitle}, \bibfield{shorthand}, +\bibfield{shorttitle}, and \bibfield{shortmaintitle}. + \optitem[false]{skipdate}{\opt{true}, \opt{false}} \noindent On rare occasions, you may need an entry in a reference list @@ -1007,9 +1107,9 @@ respectively, to elucidate the strategy in ``indirection''---do we begin to get a sense of both the extent and the specificity of Whitman's forms.\footnotemark[1] \end{quote} -\begin{citeonly} +\begin{citenobib} \item \idemcites{sutton1959,fussell1962,coffman1954,coffman1955,rountree1958}[and][]{lovell1960} -\end{citeonly} +\end{citenobib} Without commands like \cmd{idemcite}, there's often no easy way to tell Windy City to shorten names. The preamble option @@ -1139,9 +1239,9 @@ 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} +\begin{citenobib} \item \cite{salvation1980} -\end{citeonly} +\end{citenobib} \noindent One way to get that output is to cross-reference an \bibtype{inreference} entry (for the article) to a \bibtype{reference} @@ -2162,19 +2262,19 @@ short citations), the one with priority determines which one identifies the work. By default, as you can see in the second note below, the volume has priority: -\begin{citeonly} +\begin{citenobib} \item \cite{armstrong2014} \item \cite[45]{armstrong2014} -\end{citeonly} +\end{citenobib} \noindent Whereas with \opt{swapvol}: -\begin{citeonly} +\begin{citenobib} \AtNextCitekey{\toggletrue{swapvol}} \item \cite{armstrong2014} \AtNextCitekey{\toggletrue{swapvol}} \item \cite[45]{armstrong2014} -\end{citeonly} +\end{citenobib} Notice the volume number in the second note above, separated from the page by a colon. When the collection has priority, the volume number @@ -2426,9 +2526,9 @@ without regard to the \bibfield{postnote}, use the entry option \opt{listvols}. Windy City uses it to match some examples in \textit{CMOS}, such as in \ref{14.59}: -\begin{citeonly} +\begin{citenobib} \item \cite[1:126]{shurtleff1853} -\end{citeonly} +\end{citenobib} \subsection{Collections as Single Works} \label{multivolume} @@ -2440,12 +2540,12 @@ illustrate the distinction between a collection that counts as a single work and one that doesn't, \textit{CMOS} gives the following examples in \ref{14.118}: -\begin{citeonly} +\begin{citenobib} \item \cite[4:243]{byrne1981} \item \cite*[32--33]{james1963.5} \item \cite[4:245]{byrne1981} \item \cite*[34]{james1963.5} -\end{citeonly} +\end{citenobib} In citations of \textit{The Lisle Letters}, volume numbers and pages are separated by a colon. With \textit{The Complete Tales of Henry @@ -2501,10 +2601,10 @@ Subsequent entries indicate the collection in whatever short form corresponds to the preamble options. The following shows the default output for two such citations of the collection: -\begin{citeonly} +\begin{citenobib} \item \cite{byrne1981} \item \cite{byrne1981} -\end{citeonly} +\end{citenobib} For collections like \textit{The Complete Tales of Henry James}, which don't count as single works, every volume needs to have its own entry @@ -2545,11 +2645,11 @@ editor's name, long before the \bibfield{postnote}. The second prints it just before the \bibfield{postnote}, separated from the page by a colon: -\begin{citeonly} +\begin{citenobib} \item[2.] \cite*[32--33]{james1963.5} \item[\ldots] \item[4.] \cite*[34]{james1963.5} -\end{citeonly} +\end{citenobib} Neither type of collection uses cross-referencing in the bibliography database. For \textit{The Lisle Letters}, cross-referencing would @@ -2685,7 +2785,7 @@ To help with cross-checking, subsection numbers and headings are from On short citations and the \opt{short} and \opt{ibid} preamble options, see sections \ref{short} and \ref{preamble}. -\begin{citeonly} +\begin{citenobib} \AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}} \item \cite[3]{morrison2004a} \AtNextCitekey{\toggletrue{short}} @@ -2709,11 +2809,11 @@ options, see sections \ref{short} and \ref{preamble}. \AtNextMultiCite{\toggletrue{short}} \item \cites[240]{morrison2004b}[32]{morrison2004a} \AtNextCitekey{\toggletrue{short}} \item \cite[33]{morrison2004a} -\end{citeonly} +\end{citenobib} \noindent With options \opt{short} and \opt{ibid}: -\begin{citeonly} +\begin{citenobib} \AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}} \item \cite[3]{morrison2004a} \AtNextCitekey{\toggletrue{short}\toggletrue{ibid}} @@ -2738,7 +2838,7 @@ options, see sections \ref{short} and \ref{preamble}. \item \cites[240]{morrison2004b}[32]{morrison2004a} \AtNextCitekey{\toggletrue{short}} \item \cite[33]{morrison2004a} -\end{citeonly} +\end{citenobib} \setcounter{subsubsection}{53} \subsubsection{Source notes for previously published material} @@ -2768,9 +2868,9 @@ respectively, to elucidate the strategy in ``indirection''---do we begin to get a sense of both the extent and the specificity of Whitman's forms.\footnotemark[1] \end{quote} -\begin{citeonly} +\begin{citenobib} \item \idemcites{sutton1959,fussell1962,coffman1954,coffman1955,rountree1958}[and][]{lovell1960} -\end{citeonly} +\end{citenobib} \setcounter{subsubsection}{58} \subsubsection{Abbreviations for frequently cited works} @@ -3343,11 +3443,11 @@ field for the second example below contains \textit{vol. 6}. 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{citenobib} %\begin{itemize}[before=\small,itemindent=0ex] \item[] \cite{windsor1910} \item[] \cite{vliet1890} -\end{citeonly} +\end{citenobib} %\end{itemize} \setcounter{subsubsection}{136} @@ -3729,6 +3829,15 @@ correct. \item \cite{licis2016} \end{citebib} +\subsubsection{Electronic mailing lists and forums} +% 14.210 Electronic mailing lists and forums +\label{14.210} + +\begin{citebib} +\item \cite{powell1998} +\item \cite{braun2016} +\end{citebib} + \setcounter{subsection}{7} \subsection{Papers, Contracts, and Reports} \setcounter{subsection}{14} @@ -3800,7 +3909,7 @@ correct. % 14.229 Examples of note forms for manuscript collections \label{14.229} -\begin{citeonly} +\begin{citenobib} \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 @@ -3811,7 +3920,7 @@ Blacks, Pennsylvania Abolition Society, 1790--1803,][]{pasociety} (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} +\end{citenobib} \setcounter{subsubsection}{229} \subsubsection{Examples of bibliography entries for manuscript collections} @@ -3866,12 +3975,12 @@ type. As odd as it may seem, but consistent with \textit{CMOS}, they, too, aren't included in bibliographies. See section \ref{entrytypes} for more information. -\begin{citeonly} +\begin{citenobib} \item \cite{toscanini2016} \item \cite{cairns2016} \item \cite{wikipedia2016} \item \cite{merriam2016} -\end{citeonly} +\end{citenobib} \subsubsection{Citing individual reference entries by author} % 14.234 Citing individual reference entries by author @@ -4006,9 +4115,9 @@ after the year, not before. \subsubsection{Additional material in text citations} % 15.24 Additional material in text citations -\begin{citeref} +\begin{citenoref} \item \parencite[; t-tests are used here]{mandolan2017} -\end{citeref} +\end{citenoref} \subsubsection{Text citations in relation to surrounding text and punctuation} % 15.25 Text citations in relation to surrounding text and punctuation @@ -4024,7 +4133,7 @@ blue states and between churchgoers and secular voters. \end{quote} \subsubsection{Several references to the same source} % 15.27 Several references to the same source -\begin{citeref}% 'even\-tanned' prevents even--[break]tanned +\begin{citenoref}% 'even\-tanned' prevents even--[break]tanned \item Complexion figures prominently in Morgan's descriptions. When Jasper compliments his mother's choice of car (a twelve-cylinder Mediterranean roadster with leather and wood-grained interior), ``his @@ -4034,26 +4143,26 @@ never changes, her ``even\-tanned good looks'' \parencite[56]{chaston2000}, ``burnished visage'' \parencite[101]{chaston2000}, and ``air-brushed confidence'' \parencite[211]{chaston2000} providing the foil to the drama in her -midst. \end{citeref} +midst. \end{citenoref} \setcounter{subsubsection}{28} \subsubsection{Text citations of works with more than three authors} % 15.29 Text citations of works with more than three authors -\begin{citeref} +\begin{citenoref} \item \parencite{schonen2017a} \item \parencite{schonen2017b} -\end{citeref} +\end{citenoref} \subsubsection{Multiple text references} % 15.30 Multiple text references -\begin{citeref} +\begin{citenoref} \item \parencite{armstrong1989,beigl1989,pickett1985} \item \parencites{whittaker1967,whittaker1975,wiens1989a,wiens1989b} \item \parencites[328]{wong1999}[475]{wong2000}[67]{garcia1998} \item \parencites{guest2006}[see also][]{stalle2008}{rahn2009} -\end{citeref} +\end{citenoref} \setcounter{subsection}{2} \subsection{Author-Date References: Special Cases} @@ -4198,7 +4307,7 @@ with \ref{14.208} and \ref{15.42}. \begin{citeref} \item \parencite{diaz2016} -\item \parencite{obrien2015} +\item \parencite{brien2015} \item \parencite{chicago2015} \end{citeref} diff --git a/macros/latex/contrib/biblatex-contrib/windycity/windycity.bbx b/macros/latex/contrib/biblatex-contrib/windycity/windycity.bbx index f0ebc54803..7ec01ff0a4 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: Sat 04 Dec 2021 01:25:10 PM CST +% Last modified: Wed 03 May 2023 06:54:57 PM CDT % Permission is granted to copy, distribute and/or modify this % software under the terms of the LaTeX Project Public License (LPPL), @@ -11,7 +11,7 @@ % implied warranties of merchantability and fitness for a particular % purpose. -\ProvidesFile{windycity.bbx}[2021/12/04 Windy City bibliography style +\ProvidesFile{windycity.bbx}[2023/05/03 Windy City bibliography style for biblatex] \@ifpackagelater{biblatex}{2019/08/17} {} @@ -142,20 +142,20 @@ \settoggle{swapauth}{#1}}% \providetoggle{swaptrans} -\providetoggle{swaptrans:booktitle} \providetoggle{swaptrans:bookbooktitle} +\providetoggle{swaptrans:booktitle} \providetoggle{swaptrans:issuetitle} \providetoggle{swaptrans:maintitle} \providetoggle{swaptrans:series} \providetoggle{swaptrans:title} \DeclareBiblatexOption{entry}[boolean]{swaptrans}[true]{% \settoggle{swaptrans:title}{#1}% - \settoggle{swaptrans:booktitle}{#1}% - \settoggle{swaptrans:bookbooktitle}{#1}}% -\DeclareBiblatexOption{entry}[boolean]{swaptrans:booktitle}[true]{% + \settoggle{swaptrans:bookbooktitle}{#1}% \settoggle{swaptrans:booktitle}{#1}}% \DeclareBiblatexOption{entry}[boolean]{swaptrans:bookbooktitle}[true]{% \settoggle{swaptrans:bookbooktitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{swaptrans:booktitle}[true]{% + \settoggle{swaptrans:booktitle}{#1}}% \DeclareBiblatexOption{entry}[boolean]{swaptrans:issuetitle}[true]{% \settoggle{swaptrans:issuetitle}{#1}}% \DeclareBiblatexOption{entry}[boolean]{swaptrans:maintitle}[true]{% @@ -187,6 +187,250 @@ \DeclareBiblatexOption{entry,global}[boolean]{url}[true]{% \settoggle{url}{#1}}% +% Options for formatting titles and other fields: + +\providetoggle{emph:blogtitle} +\providetoggle{emph:booktitle} +\providetoggle{emph:bookbooktitle} +\providetoggle{emph:issuetitle} +\providetoggle{emph:journaltitle} +\providetoggle{emph:labeltitle} +\providetoggle{emph:maintitle} +\providetoggle{emph:origtitle} +\providetoggle{emph:shortbooktitle} +\providetoggle{emph:shorthand} +\providetoggle{emph:shortmaintitle} +\providetoggle{emph:title} +\providetoggle{emph} +\DeclareBiblatexOption{entry}[boolean]{emph:blogtitle}[true]{% + \settoggle{emph:blogtitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{emph:bookbooktitle}[true]{% + \settoggle{emph:bookbooktitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{emph:booktitle}[true]{% + \settoggle{emph:booktitle}{#1}% + \settoggle{emph:shortbooktitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{emph:issuetitle}[true]{% + \settoggle{emph:issuetitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{emph:journal}[true]{% + \settoggle{emph:journaltitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{emph:journaltitle}[true]{% + \settoggle{emph:journaltitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{emph:maintitle}[true]{% + \settoggle{emph:maintitle}{#1}% + \settoggle{emph:shortmaintitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{emph:origtitle}[true]{% + \settoggle{emph:origtitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{emph:shortbooktitle}[true]{% + \settoggle{emph:shortbooktitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{emph:shorthand}[true]{% + \settoggle{emph:shorthand}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{emph:shortmaintitle}[true]{% + \settoggle{emph:shortmaintitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{emph:shorttitle}[true]{% + \settoggle{emph:labeltitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{emph:title}[true]{% + \settoggle{emph:title}{#1}% + \settoggle{emph:labeltitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{emph}[true]{% + \settoggle{emph:title}{#1}% + \settoggle{emph:labeltitle}{#1}}% + +\providetoggle{ifcapital:blogtitle} +\providetoggle{ifcapital:booktitle} +\providetoggle{ifcapital:bookbooktitle} +\providetoggle{ifcapital:issuetitle} +\providetoggle{ifcapital:journaltitle} +\providetoggle{ifcapital:labeltitle} +\providetoggle{ifcapital:maintitle} +\providetoggle{ifcapital:origtitle} +\providetoggle{ifcapital:shortbooktitle} +\providetoggle{ifcapital:shorthand} +\providetoggle{ifcapital:shortmaintitle} +\providetoggle{ifcapital:title} +\providetoggle{ifcapital} +\DeclareBiblatexOption{entry}[boolean]{ifcapital:blogtitle}[true]{% + \settoggle{ifcapital:blogtitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{ifcapital:bookbooktitle}[true]{% + \settoggle{ifcapital:bookbooktitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{ifcapital:booktitle}[true]{% + \settoggle{ifcapital:booktitle}{#1}% + \settoggle{ifcapital:shortbooktitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{ifcapital:issuetitle}[true]{% + \settoggle{ifcapital:issuetitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{ifcapital:journal}[true]{% + \settoggle{ifcapital:journaltitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{ifcapital:journaltitle}[true]{% + \settoggle{ifcapital:journaltitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{ifcapital:maintitle}[true]{% + \settoggle{ifcapital:maintitle}{#1}% + \settoggle{ifcapital:shortmaintitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{ifcapital:origtitle}[true]{% + \settoggle{ifcapital:origtitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{ifcapital:shortbooktitle}[true]{% + \settoggle{ifcapital:shortbooktitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{ifcapital:shorthand}[true]{% + \settoggle{ifcapital:shorthand}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{ifcapital:shortmaintitle}[true]{% + \settoggle{ifcapital:shortmaintitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{ifcapital:shorttitle}[true]{% + \settoggle{ifcapital:labeltitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{ifcapital:title}[true]{% + \settoggle{ifcapital:title}{#1}% + \settoggle{ifcapital:labeltitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{ifcapital}[true]{% + \settoggle{ifcapital:title}{#1}% + \settoggle{ifcapital:labeltitle}{#1}}% + +\providetoggle{noformat:blogtitle} +\providetoggle{noformat:booktitle} +\providetoggle{noformat:bookbooktitle} +\providetoggle{noformat:issuetitle} +\providetoggle{noformat:journaltitle} +\providetoggle{noformat:labeltitle} +\providetoggle{noformat:maintitle} +\providetoggle{noformat:origtitle} +\providetoggle{noformat:shortbooktitle} +\providetoggle{noformat:shorthand} +\providetoggle{noformat:shortmaintitle} +\providetoggle{noformat:title} +\providetoggle{noformat} +\DeclareBiblatexOption{entry}[boolean]{noformat:blogtitle}[true]{% + \settoggle{noformat:blogtitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{noformat:bookbooktitle}[true]{% + \settoggle{noformat:bookbooktitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{noformat:booktitle}[true]{% + \settoggle{noformat:booktitle}{#1}% + \settoggle{noformat:shortbooktitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{noformat:issuetitle}[true]{% + \settoggle{noformat:issuetitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{noformat:journal}[true]{% + \settoggle{noformat:journaltitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{noformat:journaltitle}[true]{% + \settoggle{noformat:journaltitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{noformat:maintitle}[true]{% + \settoggle{noformat:maintitle}{#1}% + \settoggle{noformat:shortmaintitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{noformat:origtitle}[true]{% + \settoggle{noformat:orig}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{noformat:shortbooktitle}[true]{% + \settoggle{noformat:shortbooktitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{noformat:shorthand}[true]{% + \settoggle{noformat:shorthand}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{noformat:shortmaintitle}[true]{% + \settoggle{noformat:shortmaintitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{noformat:shorttitle}[true]{% + \settoggle{noformat:labeltitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{noformat:title}[true]{% + \settoggle{noformat:labeltitle}{#1}% + \settoggle{noformat:title}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{noformat}[true]{% + \settoggle{noformat:labeltitle}{#1}% + \settoggle{noformat:title}{#1}}% + +\providetoggle{quotes:blogtitle} +\providetoggle{quotes:booktitle} +\providetoggle{quotes:bookbooktitle} +\providetoggle{quotes:issuetitle} +\providetoggle{quotes:journaltitle} +\providetoggle{quotes:labeltitle} +\providetoggle{quotes:maintitle} +\providetoggle{quotes:origtitle} +\providetoggle{quotes:shortbooktitle} +\providetoggle{quotes:shorthand} +\providetoggle{quotes:shortmaintitle} +\providetoggle{quotes:title} +\providetoggle{quotes} +\DeclareBiblatexOption{entry}[boolean]{quotes:blogtitle}[true]{% + \settoggle{quotes:blogtitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{quotes:bookbooktitle}[true]{% + \settoggle{quotes:bookbooktitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{quotes:booktitle}[true]{% + \settoggle{quotes:booktitle}{#1}% + \settoggle{quotes:shortbooktitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{quotes:issuetitle}[true]{% + \settoggle{quotes:issuetitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{quotes:journal}[true]{% + \settoggle{quotes:journaltitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{quotes:journaltitle}[true]{% + \settoggle{quotes:journaltitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{quotes:maintitle}[true]{% + \settoggle{quotes:maintitle}{#1}% + \settoggle{quotes:shortmaintitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{quotes:origtitle}[true]{% + \settoggle{quotes:origtitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{quotes:shortbooktitle}[true]{% + \settoggle{quotes:shortbooktitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{quotes:shorthand}[true]{% + \settoggle{quotes:shorthand}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{quotes:shortmaintitle}[true]{% + \settoggle{quotes:shortmaintitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{quotes:shorttitle}[true]{% + \settoggle{quotes:labeltitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{quotes:title}[true]{% + \settoggle{quotes:labeltitle}{#1}% + \settoggle{quotes:title}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{quotes}[true]{% + \settoggle{quotes:labeltitle}{#1}% + \settoggle{quotes:title}{#1}}% + +\providetoggle{sentencecase:blogtitle} +\providetoggle{sentencecase:booktitle} +\providetoggle{sentencecase:bookbooktitle} +\providetoggle{sentencecase:issuetitle} +\providetoggle{sentencecase:journaltitle} +\providetoggle{sentencecase:labeltitle} +\providetoggle{sentencecase:maintitle} +\providetoggle{sentencecase:origtitle} +\providetoggle{sentencecase:shortbooktitle} +\providetoggle{sentencecase:shorthand} +\providetoggle{sentencecase:shortmaintitle} +\providetoggle{sentencecase:title} +\providetoggle{sentencecase} +\DeclareBiblatexOption{entry}[boolean]{sentencecase:blogtitle}[true]{% + \settoggle{sentencecase:blogtitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{sentencecase:bookbooktitle}[true]{% + \settoggle{sentencecase:bookbooktitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{sentencecase:booktitle}[true]{% + \settoggle{sentencecase:booktitle}{#1}% + \settoggle{sentencecase:shortbooktitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{sentencecase:issuetitle}[true]{% + \settoggle{sentencecase:issuetitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{sentencecase:journal}[true]{% + \settoggle{sentencecase:journaltitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{sentencecase:journaltitle}[true]{% + \settoggle{sentencecase:journaltitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{sentencecase:maintitle}[true]{% + \settoggle{sentencecase:maintitle}{#1}% + \settoggle{sentencecase:shortmaintitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{sentencecase:origtitle}[true]{% + \settoggle{sentencecase:origtitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{sentencecase:shortbooktitle}[true]{% + \settoggle{sentencecase:shortbooktitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{sentencecase:shorthand}[true]{% + \settoggle{sentencecase:shorthand}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{sentencecase:shortmaintitle}[true]{% + \settoggle{sentencecase:shortmaintitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{sentencecase:shorttitle}[true]{% + \settoggle{sentencecase:labeltitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{sentencecase:title}[true]{% + \settoggle{sentencecase:title}{#1}% + \settoggle{sentencecase:labeltitle}{#1}}% +\DeclareBiblatexOption{entry}[boolean]{sentencecase}[true]{% + \settoggle{sentencecase:title}{#1}% + \settoggle{sentencecase:labeltitle}{#1}}% +\DeclareBiblatexOption{global}[boolean]{sentencecase}[true]{% + \settoggle{sentencecase:blogtitle}{#1}% + \settoggle{sentencecase:booktitle}{#1}% + \settoggle{sentencecase:bookbooktitle}{#1}% + \settoggle{sentencecase:issuetitle}{#1}% + \settoggle{sentencecase:journaltitle}{#1}% + \settoggle{sentencecase:labeltitle}{#1}% + \settoggle{sentencecase:maintitle}{#1}% + \settoggle{sentencecase:origtitle}{#1}% + \settoggle{sentencecase:shortbooktitle}{#1}% + \settoggle{sentencecase:shortmaintitle}{#1}% + \settoggle{sentencecase:title}{#1}}% + % For setting 'minbibnames' and such, see CMOS, 17th ed., 14.76 and % 15.29. For 'citetracker' and 'loccittracker', 'constrict' is too % strict but seems to work well for 'ibidtracker'. @@ -386,7 +630,7 @@ } \DeclareStyleSourcemap{ \maps[datatype=bibtex]{ - \map[overwrite=false]{ + \map[overwrite]{ \pertype{inreference} \pertype{reference} \step[notfield=author, final] @@ -554,6 +798,7 @@ \let\anona\empty \let\anonb\empty \let\crossreflist\empty +\let\title@format\empty \let\pluga\empty \let\plugb\empty \let\xtitle\empty @@ -623,9 +868,22 @@ {\indexnames{labelname}}% {}} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% Field Formats for Names %% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%% +%% Field Formats %% +%%%%%%%%%%%%%%%%%%%%% + +% Generic formats: + +\DeclareFieldFormat{brackets}{\mkbibbrackets{#1}} +\DeclareFieldFormat{capital}{\MakeCapital{#1}} +\DeclareFieldFormat{emph}{\mkbibemph{#1}} +\DeclareFieldFormat{ifcapital}{\ifcapital{\MakeCapital{#1}}{#1}} +\DeclareFieldFormat{noformat}{#1} +\DeclareFieldFormat{parens}{\mkbibparens{#1}} +\DeclareFieldFormat{quotes}{\mkbibquote{#1}} +\DeclareFieldFormat{sentencecase}{\MakeSentenceCase{#1}} + +% Name formats (defaults set in biblatex.def): \DeclareNameAlias{author}{sortname} \DeclareNameAlias{afterword}{sortname} @@ -712,33 +970,32 @@ \ifdefvoid{#3}{}{ #3}% \ifdefvoid{#4}{}{, #4}}} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% Field Formats for Titles %% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Title formats: -\DeclareFieldFormat{blogtitle}{\mkbibemph{#1}} -\DeclareFieldFormat{bookbooktitle}{\mkbibemph{#1}} -\DeclareFieldFormat{booktitle}{\mkbibemph{#1}} -\DeclareFieldFormat{journaltitle}{\mkbibemph{#1}} -\DeclareFieldFormat{labeltitle}{\mkbibemph{#1}} -\DeclareFieldFormat{maintitle}{\mkbibemph{#1}} -\DeclareFieldFormat{shortbooktitle}{\mkbibemph{#1}} -\DeclareFieldFormat{title}{\mkbibemph{#1}} +\DeclareFieldAlias{blogtitle}{emph} +\DeclareFieldAlias{bookbooktitle}{emph} +\DeclareFieldAlias{booktitle}{emph} +\DeclareFieldAlias{journaltitle}{emph} +\DeclareFieldAlias{labeltitle}{emph} +\DeclareFieldAlias{maintitle}{emph} +\DeclareFieldAlias{shortbooktitle}{emph} +\DeclareFieldAlias{shortmaintitle}{emph} +\DeclareFieldAlias{title}{emph} \DeclareIndexFieldFormat{indextitle}{% \usebibmacro{index:title}{\index}{\mkbibemph{#1}}} \renewbibmacro*{index:title}[2]{% \usebibmacro{index:field}{#1}{\thefield{indexsorttitle}}{#2}}% -\DeclareFieldFormat{blogtitleaddon}{\mkbibparens{#1}} -\DeclareFieldFormat{journaltitleaddon}{\mkbibbrackets{#1}} -\DeclareFieldFormat{titleaddon}{\mkbibbrackets{#1}} +\DeclareFieldAlias{blogtitleaddon}{parens} +\DeclareFieldAlias{journaltitleaddon}{brackets} +\DeclareFieldAlias{titleaddon}{brackets} \DeclareFieldFormat[article,incollection,online,reference,review,thesis] {title}{\mkbibquote{#1}} \DeclareFieldFormat[article,incollection,online,reference,review,thesis] {labeltitle}{\mkbibquote{#1}} -\DeclareIndexFieldFormat[article,incollection,online,reference,review,thesis] +\DeclareIndexFieldFormat[article,incollection,reference,review,thesis] {indextitle}{\usebibmacro{index:title}{\index}{\mkbibquote{#1}}} \DeclareFieldFormat[letter,misc,patent]{title}{#1} @@ -746,13 +1003,13 @@ \DeclareIndexFieldFormat[letter,misc,patent] {indextitle}{\usebibmacro{index:title}{\index}{#1}} -\DeclareFieldAlias[inbook]{title}{title} -\DeclareFieldAlias[inbook]{labeltitle}{labeltitle} +\DeclareFieldAlias[inbook]{title}{emph} +\DeclareFieldAlias[inbook]{labeltitle}{emph} \DeclareIndexFieldAlias[inbook]{indextitle}{indextitle} -\DeclareFieldAlias[book]{origtitle}{title} +\DeclareFieldAlias[book]{origtitle}{emph} \DeclareFieldFormat{chapter}{\bibstring{chapter}\space #1} -\DeclareFieldFormat{issuetitle}{\ifcapital{\MakeCapital{#1}}{#1}} +\DeclareFieldAlias{issuetitle}{noformat} \DeclareFieldFormat[unpublished] {title}{\usebibmacro{unpublished:format}{#1}} @@ -766,20 +1023,18 @@ {\mkbibquote{#1}}% {#1}}% -%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% Other Field Formats %% -%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Other field formats: -\DeclareFieldFormat{addendum}{\ifcapital{\MakeCapital{#1}}{#1}}% +\DeclareFieldAlias{addendum}{ifcapital} \DeclareFieldFormat{annotation}{\\[\bibitemsep] #1} \DeclareFieldAlias{doi}{url} \DeclareFieldFormat{edition}{% \ifinteger{#1} {\mkbibordedition{#1}~\bibstring{edition}}% {\ifcapital{\MakeCapital{#1}}{#1}}} -\DeclareFieldFormat{endmonth}{\mkbibmonth{#1}}% -\DeclareFieldFormat{howpublished}{\ifcapital{\MakeCapital{#1}}{#1}}% -\DeclareFieldFormat{issue}{\MakeCapital{#1}}% always capitalize +\DeclareFieldAlias{endmonth}{month} +\DeclareFieldAlias{howpublished}{ifcapital} +\DeclareFieldAlias{issue}{capital} \DeclareFieldFormat{journum}{% \ifnumeral{#1} {no\adddotspace\printfield{number}}% @@ -789,28 +1044,58 @@ and test {\iffieldundef{bookyear}}} {\biblcstring{#1}}% {\ifbibstring{#1}{\bibstring{#1}}{\stripzeros{#1}}}} -\DeclareListFormat{location}{#1}% +\DeclareListFormat{location}{#1} \DeclareFieldFormat{month}{\mkbibmonth{#1}}% -\DeclareFieldFormat{note}{\ifcapital{\MakeCapital{#1}}{#1}}% -\DeclareFieldFormat{pages}{#1} +\DeclareFieldAlias{note}{ifcapital} +\DeclareFieldAlias{pages}{noformat} \DeclareFieldFormat{part}{\bibstring{part}\space#1} -\DeclareFieldFormat{postnote}{#1} +\DeclareFieldAlias{postnote}{noformat} \DeclareListFormat{publisher}{#1} -\DeclareFieldFormat{pubstate}{\ifcapital{\MakeCapital{#1}}{#1}}% -\DeclareFieldFormat{season}{\MakeCapital{#1}}% always capitalize -\DeclareFieldFormat{series}{\ifcapital{\MakeCapital{#1}}{#1}} +\DeclareFieldAlias{pubstate}{ifcapital} +\DeclareFieldAlias{season}{capital}% deprecated +\DeclareFieldAlias{series}{ifcapital} +\DeclareFieldAlias{yeardivision}{capital} % 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{shorthandwidth}{#1} -\DeclareFieldFormat{type}{\ifcapital{\MakeCapital{#1}}{#1}}% +\DeclareFieldAlias{shorthand}{noformat} +\DeclareFieldFormat[article,incollection,online,reference,review,thesis] + {shorthand}{\mkbibquote{#1}} +\DeclareFieldAlias{shorthandintro}{ifcapital} +\DeclareFieldAlias{type}{ifcapital} \DeclareFieldFormat{url}{\url{#1}} \DeclareFieldFormat{urldate}{\bibstring{urlseen}\space#1} +\newbibmacro*{test:format}[2]{% + \iftoggle{noformat:#1} + {\iftoggle{ifcapital:#1} + {\usebibmacro{print:#2}{#1}{noformat}{ifcapital}}% + {\iftoggle{sentencecase:#1} + {\usebibmacro{print:#2}{#1}{noformat}{sentencecase}}% + {\usebibmacro{print:#2}{#1}{noformat}{noformat}}}} + {\iftoggle{sentencecase:#1} + {\iftoggle{emph:#1} + {\usebibmacro{print:#2}{#1}{emph}{sentencecase}}% + {\iftoggle{quotes:#1} + {\usebibmacro{print:#2}{#1}{quotes}{sentencecase}}% + {\usebibmacro{print:#2}{#1}{#1}{sentencecase}}}} + {\iftoggle{emph:#1} + {\iftoggle{ifcapital:#1} + {\usebibmacro{print:#2}{#1}{emph}{ifcapital}}% + {\usebibmacro{print:#2}{#1}{emph}{noformat}}} + {\iftoggle{quotes:#1} + {\iftoggle{ifcapital:#1} + {\usebibmacro{print:#2}{#1}{quotes}{ifcapital}}% + {\usebibmacro{print:#2}{#1}{quotes}{noformat}}} + {\iftoggle{ifcapital:#1} + {\usebibmacro{print:#2}{#1}{#1}{ifcapital}}% + {\usebibmacro{print:#2}{#1}{#1}{noformat}}}}}}} + +\newbibmacro*{print:field}[3]{% + \printtext[#2]{\printfield[#3]{#1}}} + %%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Bibliography Aliases %% %%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1464,20 +1749,23 @@ \iffieldundef{#1title} {} {\renewcommand*{\xtitle}{#1}% - \iftoggle{shortlinks} - {\printtext[bibhyperref]{% - \usebibmacro{title+subtitle}{#1}}} - {\usebibmacro{title+subtitle}{#1}}% + \usebibmacro{title+shortlinks}{#1}% \usebibmacro{titleaddon}{#1}% \clearfield{#1title}}} -\newbibmacro*{title+subtitle}[1]{% - \printtext[#1title]{% - \printfield[noformat]{#1title}% - \iffieldundef{#1subtitle} +\newbibmacro*{title+shortlinks}[1]{% + \iftoggle{shortlinks} + {\printtext[bibhyperref]{% + \usebibmacro{test:format}{#1title}{title}}} + {\usebibmacro{test:format}{#1title}{title}}} + +\newbibmacro*{print:title}[3]{% + \printtext[#2]{% + \printfield[#3]{#1}% + \iffieldundef{\xtitle subtitle} {} {\subtitlepunct - \printfield[noformat]{#1subtitle}}% + \printfield[#3]{\xtitle subtitle}}% \isdot}}% \newbibmacro*{titleaddon}[1]{% @@ -1486,11 +1774,6 @@ {\addspace% '\space' has issues with quotation marks \printfield{#1titleaddon}}} -\newbibmacro*{shorttitle+shortlinks}{% - \iftoggle{shortlinks} - {\printtext[bibhyperref]{\usebibmacro{shorttitle+crossref}{}}} - {\usebibmacro{shorttitle+crossref}{}}} - \newbibmacro*{shorttitle+crossref}[1]{% \ifboolexpr{ togl {collection:#1bk} and togl {swapvol}} @@ -1501,11 +1784,13 @@ {\usebibmacro{shorttitle}{label}}}} \newbibmacro*{shorttitle}[1]{% + \renewcommand*{\xtitle}{#1}% + \clearfield{#1subtitle}% \ifstrequal{#1}{label} - {\printfield[\thefield{entrytype}]{labeltitle}\isdot}% + {\usebibmacro{title+shortlinks}{label}}% {\iffieldundef{short#1title} - {\printfield[#1title]{#1title}\isdot}% - {\printfield[#1title]{short#1title}\isdot}}} + {\usebibmacro{title+shortlinks}{#1}}% + {\usebibmacro{title+shortlinks}{short#1}}}} \renewbibmacro*{booktitle}{% \iffieldundef{booktitle} @@ -1648,28 +1933,25 @@ \newbibmacro*{issue+month+etc}[1]{% \iffieldundef{year} - {\setunit{\space}% - \iffieldundef{month} - {\usebibmacro{pubstate}{parens}}% - {\printtext[parens]{\printdate}}} + {\ifstrequal{#1}{parens} + {\setunit{\space}}% + {\setunit{\addcomma\space}}% + \usebibmacro{pubstate}{#1}}% {\ifboolexpr{ test {\iffieldundef{volume}} and test {\iffieldundef{number}}} - {\iffieldundef{journal} - {} - {\setunit{\addcomma\space}}% - \iffieldundef{month} + {\iffieldundef{month} {\usebibmacro{issue+season+year}}% {\usebibmacro{reflist+year+day}% \printdate}}% {\iffieldundef{month} - {\usebibmacro{reflist+issue+season}}% - {\ifstrequal{#1}{noparens} - {\usebibmacro{reflist+year+day}% - \newunit - \usebibmacro{pubstate}{date}}% - {\usebibmacro{reflist+year+day}% - \setunit{\space}% - \printtext[parens]{\printdate}}}}}} + {\setunit{\space}% + \usebibmacro{reflist+issue+season}}% + {\usebibmacro{reflist+year+day}% + \ifstrequal{#1}{parens} + {\setunit{\space}% + \printtext[parens]{\printdate}}% + {\newunit + \usebibmacro{pubstate}{date}}}}}} \newbibmacro*{pubstate}[1]{% \iftoggle{authposition} @@ -1694,21 +1976,27 @@ \setunit{\addcomma\space}}% {\ifstrequal{#1}{parens} {\printtext[parens]{\printfield{pubstate}}} - {\printfield{pubstate}}}}}% needs '%' - \clearfield{pubstate}}}} + {\printfield{pubstate}}}}}}}} \newbibmacro*{labeldate+date}[1]{% \ifstrequal{#1}{label} {\printlabeldate}% {\ifstrequal{#1}{date} - {\printdate}% + {\ifboolexpr{ test {\iffieldundef{year}} + and test {\iffieldundef{month}}} + {\iffieldundef{yeardivision} + {\printfield{season}}% deprecated + {\printfield{yeardivision}}} + {\printdate}}% {}}} \newbibmacro*{reflist+year+day}{% \ifboolexpr{ togl {bibliography} and togl {reflist} - and test {\iffieldundef{day}}} - {\iffieldundef{endyear} + and test {\iffieldundef{day}} + and test {\iffieldundef{season}}% deprecated + and test {\iffieldundef{yeardivision}}} + {\iffieldundef{endyear} {\clearfield{year}}% {\iffieldsequal{year}{endyear} {\clearfield{year}% @@ -1716,32 +2004,28 @@ {}}} {}} -% Treat 'season' as an alternative for 'issue'. +% Treat 'yeardivision' and 'season' as alternatives for 'issue'. + +\newbibmacro*{issue+season+year}{% + \iffieldundef{issue} + {\usebibmacro{labeldate+date}{date}}% + {\ifboolexpr{ test {\iffieldundef{season}}% deprecated + and test {\iffieldundef{yeardivision}}} + {\printfield{issue}% + \setunit{\addspace}% not '\addspace' + \printfield{year}}% + {\usebibmacro{labeldate+date}{date}}}} \newbibmacro*{reflist+issue+season}{% \ifboolexpr{ togl {bibliography} and togl {reflist}} {\ifboolexpr{ test {\iffieldundef{issue}} - and test {\iffieldundef{season}}} + and test {\iffieldundef{season}}% deprecated + and test {\iffieldundef{yeardivision}}} {} - {\setunit{\space}% - \iffieldundef{issue} - {\printtext[parens]{\printfield{season}}} - {\printtext[parens]{\printfield{issue}}}}} - {\setunit{\space}% - \printtext[parens]{\usebibmacro{issue+season+year}}}} - -\newbibmacro*{issue+season+year}{% - \ifboolexpr{ test {\iffieldundef{issue}} - and test {\iffieldundef{season}}} - {\printfield{year}}% - {\iffieldundef{issue} - {\printfield{season}% - \space - \printfield{year}}% - {\printfield{issue}% - \space - \printfield{year}}}} + {\clearfield{year}% + \printtext[parens]{\usebibmacro{issue+season+year}}}} + {\printtext[parens]{\usebibmacro{issue+season+year}}}} % Per CMOS, 17th ed., 14.119, print the publication year of the % last-mentioned title. @@ -1784,23 +2068,14 @@ {} {\textendash\printfield{#1endyear}}} -\newbibmacro*{month+season+year}{% - \ifboolexpr{ togl {reflist} +\newbibmacro*{year+month+day}[1]{% + \ifboolexpr{ togl {bibliography} + and togl {reflist} and test {\iffieldundef{month}} - and test {\iffieldundef{season}}} + and test {\iffieldundef{season}}% deprecated + and test {\iffieldundef{yeardivision}}} {} - {\iffieldundef{year} - {\printlabeldate}% for 'n.d.' - {\printdate - \clearfield{year}}}} - -\newbibmacro*{year+month+day}{% - \iffieldundef{year} - {} - {\iffieldundef{month} - {\usebibmacro{reflist+year+day}% - \printdate}% - {\printdate}}} + {\usebibmacro{labeldate+date}{#1}}} % For reference lists. @@ -1936,12 +2211,12 @@ {\newunit}% {\setunit{\addcomma\space}}% \iffieldequalstr{type}{newsmag} - {\usebibmacro{issue+month+etc}{noparens}% + {\usebibmacro{issue+month+etc}{}% \usebibmacro{periodical:number}}% {\usebibmacro{periodical:number}% \iffieldequalstr{pubstate}{prepub} - {\usebibmacro{issue+month+etc}{noparens}}% - {\usebibmacro{issue+month+etc}{}}}% needs '%' + {\usebibmacro{issue+month+etc}{}}% + {\usebibmacro{issue+month+etc}{parens}}}% needs '%' \toggletrue{edshift}% \usebibmacro{edition}{noformat}}% @@ -1957,7 +2232,8 @@ {\ifboolexpr{test {\iffieldundef{number}} and test {\iffieldundef{month}} and test {\iffieldundef{issue}} - and test {\iffieldundef{season}}} + and test {\iffieldundef{season}}% deprecated + and test {\iffieldundef{yeardivision}}} {\setunit{\addcolon}% \printfield{pages}}% {\setunit{\addcolon\space}% @@ -1975,7 +2251,7 @@ \usebibmacro{author+bookauthor+etc}% \usebibmacro{title+titleaddon}{}% \newunit - \usebibmacro{month+season+year}% + \usebibmacro{year+month+day}{date}% \usebibmacro{type+typeaddon}% \usebibmacro{note}% \newunit @@ -2108,7 +2384,7 @@ \usebibmacro{institution+venue}% \printlist{location}% \setunit*{\addcomma\space}% - \usebibmacro{year+month+day}}% + \usebibmacro{year+month+day}{date}}% \newbibmacro*{type+typeaddon}{% \iffieldundef{type} @@ -2141,7 +2417,7 @@ \usebibmacro{title+titleaddon}{}% \usebibmacro{type+typeaddon}% \setunit{\addcomma\space}% - \usebibmacro{month+season+year}% + \usebibmacro{year+month+day}{label}% \iffieldundef{type} {\newunit \usebibmacro{unpublished:collection}}% @@ -2199,7 +2475,8 @@ {\ifboolexpr{ togl {bibliography} and togl {reflist} and test {\iffieldundef{issue}} - and test {\iffieldundef{season}} + and test {\iffieldundef{season}}% deprecated + and test {\iffieldundef{yeardivision}} and test {\iffieldundef{month}} and not test {\iffieldundef{volume}}} {\setunit{\space}% @@ -2431,10 +2708,9 @@ \newbibmacro*{loc+pub+year}{% \usebibmacro{loc+pub+etc}{}% - \setunit{\addcomma\space}% - \usebibmacro{month+season+year}% - \setunit{\addcomma\space}% - \usebibmacro{pubstate}{}}% + \iffieldundef{pubstate} + {\usebibmacro{year+month+day}{date}}% + {\usebibmacro{pubstate}{}}} % Thanks to David Fussner's biblatex-chicago for pointing me to this % command by Philipp Lehman. Source: @@ -2679,7 +2955,7 @@ \usebibmacro{author+title+etc}% \newunit \usebibmacro{websites}% - \usebibmacro{issue+month+etc}{}% + \usebibmacro{issue+month+etc}{parens}% \usebibmacro{doi+finentry+etc}}% \DeclareBibliographyDriver{patent}{% diff --git a/macros/latex/contrib/biblatex-contrib/windycity/windycity.cbx b/macros/latex/contrib/biblatex-contrib/windycity/windycity.cbx index 155407ad63..28d29a3265 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: Sat 04 Dec 2021 12:44:00 PM CST +% Last modified: Wed 03 May 2023 06:54:38 PM CDT % Permission is granted to copy, distribute and/or modify this % software under the terms of the LaTeX Project Public License (LPPL), @@ -11,7 +11,7 @@ % implied warranties of merchantability and fitness for a particular % purpose. -\ProvidesFile{windycity.cbx}[2021/12/04 Windy City citation style for +\ProvidesFile{windycity.cbx}[2023/05/03 Windy City citation style for biblatex] \@ifpackagelater{biblatex}{2019/08/17} {} @@ -242,7 +242,7 @@ \newbibmacro*{parencite:new}{% \iffieldundef{shorthand} {\usebibmacro{parencite:auth+title}}% - {\printfield{shorthand}}% + {\usebibmacro{test:format}{shorthand}{field}}% \setunit{\addspace}% not '\setunit{\space}' \usebibmacro{parencite:date}}% @@ -289,9 +289,9 @@ {\usebibmacro{cite:short}}} {\iftoggle{shortlinks} {\printtext[bibhyperref]{% - \printfield{shorthand}% + \usebibmacro{test:format}{shorthand}{field}% \usebibmacro{cite:volume}}} - {\printfield{shorthand}% + {\usebibmacro{test:format}{shorthand}{field}% \usebibmacro{cite:volume}}}} \newbibmacro*{test:loccit}{% @@ -322,14 +322,14 @@ \ifnameundef{author} {\bibcpstring{reviewnoauth}% \space - \usebibmacro{shorttitle+shortlinks}}% + \usebibmacro{shorttitle+crossref}{}}% {\usebibmacro{author+bookauthor+etc}}% \usebibmacro{cite:volume}}% \newbibmacro*{cite:author+title+etc}{% \usebibmacro{author+bookauthor+etc}% \iftoggle{noauth} - {\usebibmacro{shorttitle+shortlinks}}% + {\usebibmacro{shorttitle+crossref}{}}% {}% needs '%' \usebibmacro{cite:volume}}% @@ -339,7 +339,7 @@ \ifentrytype{review} {\usebibmacro{short:review}}% {\usebibmacro{collection+author+etc}% - \usebibmacro{shorttitle+shortlinks}% + \usebibmacro{shorttitle+crossref}{}% \ifboolexpr{ togl {ibidpage} and test \ifloccit and not test \iffirstonpage} @@ -360,14 +360,14 @@ \setunit{\space}% \usebibmacro{shorttitle}{book}}% {\ifnameundef{author} - {\usebibmacro{shorttitle+shortlinks}}% + {\usebibmacro{shorttitle+crossref}{}}% {\iffieldundef{title} {\usebibmacro{author+bookauthor+etc}% \bibstring{review}% \setunit{\space}% \usebibmacro{shorttitle}{book}}% {\usebibmacro{author+bookauthor+etc}% - \usebibmacro{shorttitle+shortlinks}}}}} + \usebibmacro{shorttitle+crossref}{}}}}} \newbibmacro*{collection+author+etc}{% \ifboolexpr{ test {\ifentrytype{unpublished}} @@ -540,7 +540,7 @@ {\setunit{\addspace}% \printtext[parens]{% \bibstring{citedas}\space - \printfield{shorthand}}} + \usebibmacro{test:format}{shorthand}{field}}} {\setunit{\addspace}% \printfield{shorthandintro}}}} @@ -599,7 +599,7 @@ \usebibmacro{author+title+etc}% \setunit*{\newunitpunct}% needs '*' \usebibmacro{websites}% - \usebibmacro{issue+month+etc}{}% + \usebibmacro{issue+month+etc}{parens}% \newunit}% \DeclareBibliographyDriver{cite:patent}{% diff --git a/macros/latex/contrib/biblatex-contrib/windycity/windycity.dbx b/macros/latex/contrib/biblatex-contrib/windycity/windycity.dbx index 165a90319c..a67ea7dfa9 100644 --- a/macros/latex/contrib/biblatex-contrib/windycity/windycity.dbx +++ b/macros/latex/contrib/biblatex-contrib/windycity/windycity.dbx @@ -1,7 +1,7 @@ -\ProvidesFile{windycity.dbx}[2021/12/04 Windy City data model file for biblatex] +\ProvidesFile{windycity.dbx}[2025/05/03 Windy City data model file for biblatex] \DeclareDatamodelFields[type=field,datatype=key]{% - booktitlekey, bookbooktitlekey, + booktitlekey, titlekey, translatortype, translatoratype, @@ -11,11 +11,11 @@ blogtitle, blogtitleaddon, bookauthortype, - bookbooktitle, bookbooksubtitle, + bookbooktitle, bookbooktitleaddon, - bookvolume, bookbookvolume, + bookvolume, bookyear, collection, editoraddon, -- cgit v1.2.3