From c798e727d6f0e70ecd4ef8fd459cd0c472a81578 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 31 Jan 2021 21:35:01 +0000 Subject: windycity (31jan21) git-svn-id: svn://tug.org/texlive/trunk@57577 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/windycity/CHANGES.md | 44 ++- .../texmf-dist/doc/latex/windycity/windycity.bib | 77 +++- .../texmf-dist/doc/latex/windycity/windycity.pdf | Bin 425304 -> 436673 bytes .../texmf-dist/doc/latex/windycity/windycity.tex | 210 +++++++--- .../tex/latex/windycity/american-windycity.lbx | 14 +- .../texmf-dist/tex/latex/windycity/windycity.bbx | 440 ++++++++++++++------- .../texmf-dist/tex/latex/windycity/windycity.cbx | 111 +++--- .../texmf-dist/tex/latex/windycity/windycity.dbx | 4 +- 8 files changed, 634 insertions(+), 266 deletions(-) diff --git a/Master/texmf-dist/doc/latex/windycity/CHANGES.md b/Master/texmf-dist/doc/latex/windycity/CHANGES.md index cf718404ab0..960197f84f5 100644 --- a/Master/texmf-dist/doc/latex/windycity/CHANGES.md +++ b/Master/texmf-dist/doc/latex/windycity/CHANGES.md @@ -8,6 +8,48 @@ indicate updates to Windy City's [repository on GitHub](https://github.com/brianchase/windycity "GitHub: brianchase/windycity"). +## 2021-01-30 + +* added support for the `pubstate` field to indicate when a work is + forthcoming (with value *forthcoming*), a preprint (with value + preprint*), a working paper (with value *working*), or an electronic + article published ahead of the official publication date (with value + *prepub*) +* added support for the `eprint` field, plus related fields and + options +* added `shortlinks` preamble option to "shorten" embedded links from + `bibhyperref` in standard citations; instead of encompassing an + entire citation, links apply to just one element: the title or, if + no title is present, whatever part of the citation occupies the + author's position, such as the author's name, *ibid.*, or a + shorthand +* somewhat related to the previous, changed preamble option + `firstshort` to `shortfirst` +* sorting in bibliographies and reference lists now respond to the + month, day, hour, and minute or entries (e.g. in a reference list, + two articles by the same author published on the same day, minutes + apart, will sort the earliest article first) +* added `noreprint` entry option to exclude the `reprint` bibliography + string from citations of certain reprints +* fixed the `shortauthor` field printing in long, first citations + (sorry about that!) +* fixed several bugs, mostly affecting parenthetical citations, having + to do with the placement, punctuation, and tracking of citations + with `journaltitle`, `organization`, or `blogtitle` in the author's + position +* related to the previous, added support for the `shortjournal` field + and added `shortorganization` and `shortblog` fields +* fixed several macros in which the preamble option `reflist` could + cause errors in standard citations +* fixed parenthetical citations for `@online` entries that should have + nothing in the date's position, not even "n.d." (no date), such as + when you cite a blog but not any particular post +* fixed punctuation after `title` when an `@unpublished` entry has no + `type`, `location`, or `pubstate` field +* [accidentally dropped from previous release:] fixed `autopunct` when + `\footcites` follows `\cite` plus an `autopunct` mark (e.g. + `\cite{key1}?\footcites{key2}{key3}`) + ## 2020-11-10 * added support for updaters, which, like other editorial roles, you @@ -43,8 +85,6 @@ brianchase/windycity"). * added support for printing ISSNs with `issn` entry and bibliography options * fixed `nameaddon` and `handle` fields printing in short citations -* fixed `autopunct` when `\footcites` follows `\cite` plus an - `autopunct` mark (e.g. `\cite{key1}?\footcites{key2}{key3}`) ## 2020-09-29 diff --git a/Master/texmf-dist/doc/latex/windycity/windycity.bib b/Master/texmf-dist/doc/latex/windycity/windycity.bib index 9a7b80d5fcc..c26415de376 100644 --- a/Master/texmf-dist/doc/latex/windycity/windycity.bib +++ b/Master/texmf-dist/doc/latex/windycity/windycity.bib @@ -343,7 +343,7 @@ @Article{lovell1960, author = {Lovell, John}, title = {Appreciating Whitman}, - subtitle = {'Passage to India'}, + subtitle = {`Passage to India'}, journal = {Modern Language Quarterly}, volume = {21}, number = {2}, @@ -539,7 +539,7 @@ @Online{akmuckraker2008, author = {{AK Muckraker}}, -% authortype = {pseudo},% alternative +% authortype = {pseudo},% alternative to below: nameaddon = {pseud.}, title = {Palin Is Back at Work}, blogtitle = {Mudflats}, @@ -682,6 +682,7 @@ @Book{maclean1976, author = {Maclean, Norman}, title = {A River Runs through It, and Other Stories}, + shorttitle = {A River Runs through It}, address = {Chicago}, publisher = ucp, year = {1976} @@ -1630,7 +1631,8 @@ title = {Book Title}, address = {Place}, publisher = {Publisher}, - year = {forthcoming} +% year = {forthcoming}% alternative to below: + pubstate = {forthcoming} } @Book{writer, keywords = {notinbib,notinref}, @@ -1638,7 +1640,8 @@ title = {Another Book Title}, address = {Place}, publisher = {Publisher}, - year = {forthcoming} +% year = {forthcoming}% alternative to below: + pubstate = {forthcoming} } @InCollection{contributor, keywords = {notinbib,notinref}, @@ -1652,7 +1655,8 @@ editor = {Editor, Ellen}, address = {Place}, publisher = {Publisher}, - year = {forthcoming} +% year = {forthcoming}% alternative to below: + pubstate = {forthcoming} } % 14.159 Books requiring a specific application or device (e-books) @@ -1789,7 +1793,28 @@ title = {Article Title}, journal = {Journal Name}, volume = {98}, - year = {forthcoming} +% year = {forthcoming}% alternative to below: + pubstate = {forthcoming} +} +@Article{jubb2015, + author = {Jubb, Robert}, + title = {The Real Value of Equality}, + journal = {Journal of Politics}, + volume = {77}, + number = {3}, + pubstate = {prepub}, + date = {2015-04-14}, + url = {https://doi.org/10.1086/681262} +} + +% 14.173 Journal article preprints + +@Unpublished{huang2015, + author = {Huang, Zhiqi}, + title = {Revisiting the Cosmological Bias Due to Local Gravitational Redshifts}, + pubstate = {preprint}, + date = {2015-04-24}, + url = {http://arxiv.org/abs/1504.06600v1} } % 14.174 Journal page references @@ -1926,13 +1951,12 @@ % 14.184 New series for journal volumes @Article{sewall1896, - sortname = {Proceedings}, title = {Letter of Jonathan Sewall}, journal = {Proceedings of the Massachusetts Historical Society}, series = {2nd ser.}, volume = {10}, date = {1896-01}, - pages = {414} + pages = {413--15} } @Article{moraes1950, author = {Moraes, G. M.}, @@ -2040,7 +2064,6 @@ date = {1992-09-23} } @Article{forester2000, - sortname = {{Lake Forester}}, title = {Pushcarts Evolve to Trendy Kiosks}, journal = {Lake Forester}, address = {Lake Forest, IL}, @@ -2067,7 +2090,6 @@ url = {http://www.nytimes.com/2015/03/08/style/finding-equilibrium-in-seesawing-libidos.html} } @Article{editorial2015, - sortname = {{New York Times}}, title = {Junk Science at the F.B.I.}, journal = {New York Times}, note = {editorial}, @@ -2089,7 +2111,6 @@ % 15.49 Newspapers and magazines in reference lists @Article{nytimes2002, - sortname = {{New York Times}}, title = {In Texas, Ad Heats Up Race for Governor}, journal = {New York Times}, date = {2002-07-30} @@ -2164,7 +2185,6 @@ % 14.204 Unsigned reviews @Review{zeitung1828, - sortname = {Ergänzungsblätter}, journal = {Ergänzungsblätter zur Allgemeinen Literatur-Zeitung}, date = {1828-02}, number = {23–24}, @@ -2290,11 +2310,21 @@ author = {Lucki, Deborah D. and Pollay, Richard W.}, title = {Content Analyses of Advertising}, subtitle = {A Review of the Literature}, - type = {working paper}, +% type = {working},% alternative to below: + pubstate = {working}, institution = {History of Advertising Archives, Faculty of Commerce, University of British Columbia}, address = {Vancouver}, year = {1980} } +@Unpublished{bronfenbrenner2011, + 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}, + address = {New York, NY}, + date = {2011-06}, + url = {http://hdl.handle.net/10022/AC:P:10603} +} % 14.220 Pamphlets, reports, and the like @@ -2327,7 +2357,7 @@ crossref = {britannica1980} } @Reference{britannica1980, - organization = {{\emph{Encyclopaedia Britannica}}}, + organization = {\emph{Encyclopaedia Britannica}}, edition = {15}, year = {1980} } @@ -2336,14 +2366,14 @@ crossref = {oxford2009} } @Reference{oxford2009, - organization = {{\emph{Oxford English Dictionary}}}, + organization = {\emph{Oxford English Dictionary}}, edition = {2}, howpublished = {CD-ROM}, version = {4.0}, year = {2009} } @Reference{dab1937, - organization = {{\emph{Dictionary of American Biography}}}, + organization = {\emph{Dictionary of American Biography}}, title = {Wadsworth, Jeremiah}, year = {1937} } @@ -2374,7 +2404,7 @@ crossref = {britannica2016} } @Reference{britannica2016, - organization = {{\emph{Encyclopaedia Britannica Online}}}, + organization = {\emph{Encyclopaedia Britannica Online}}, edition = {Academic ed\adddot}, } @Reference{cairns2016, @@ -2753,6 +2783,16 @@ origpublisher = {T. Egerton}, addendum = {citations refer to the Penguin edition} } +@Book{darwin1964, + options = {noreprint}, + author = {Darwin, Charles}, + title = {On the Origin of Species}, + edition = {facsimile of the first edition, with an introduction by Ernest Mayr}, + address = {Cambridge, MA}, + publisher = {Harvard University Press}, + origdate = {1859}, + year = {1964} +} @Book{maitland1998, author = {Maitland, Frederic W.}, title = {Roman Canon Law in the Church of England}, @@ -2790,7 +2830,8 @@ editor = {Oring, James}, address = {Cape Canaveral, FL}, publisher = {Launch Press}, - year = {forthcoming} +% year = {forthcoming}% alternative to below: + pubstate = {forthcoming} } % 15.47 Parentheses or comma with issue number diff --git a/Master/texmf-dist/doc/latex/windycity/windycity.pdf b/Master/texmf-dist/doc/latex/windycity/windycity.pdf index 82c61cb5a59..02d6ab3aa11 100644 Binary files a/Master/texmf-dist/doc/latex/windycity/windycity.pdf and b/Master/texmf-dist/doc/latex/windycity/windycity.pdf differ diff --git a/Master/texmf-dist/doc/latex/windycity/windycity.tex b/Master/texmf-dist/doc/latex/windycity/windycity.tex index e69a97ac386..f6ca4e64263 100644 --- a/Master/texmf-dist/doc/latex/windycity/windycity.tex +++ b/Master/texmf-dist/doc/latex/windycity/windycity.tex @@ -1,4 +1,4 @@ -% Last modified: Tue 10 Nov 2020 05:20:31 PM CST +% Last modified: Sat 30 Jan 2021 06:32:36 PM CST \documentclass[11pt,letterpaper,oneside]{article} \usepackage{windycity} @@ -8,7 +8,7 @@ \author{Brian Chase} \email{brianmichaelchase@gmail.com} \website{https://github.com/brianchase/windycity} -\version{2020-11-10} +\version{2021-01-30} \maketitle \begingroup \hypersetup{linkcolor=black} @@ -17,7 +17,7 @@ \section{Introduction} -\nfootnote{Copyright \textcopyright\ 2014--2020 Brian Chase. Under the +\nfootnote{Copyright \textcopyright\ 2014--2021 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 @@ -235,12 +235,12 @@ A shorter form of this passage appears in \textit{CMOS} feature of the style. For demonstration purposes, though, it's possible.} -% The use of 'firstshort' below might be confusing. It's necessary to +% The use of 'shortfirst' below might be confusing. It's necessary to % simulate the effect of 'short' within a document that otherwise % gives default output. \begin{citeonly} -\AtNextCitekey{\toggletrue{short}\toggletrue{firstshort}} +\AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}} \item \cite[3]{morrison2004a} \AtNextCitekey{\toggletrue{short}} \item \cite[18]{morrison2004a} @@ -248,11 +248,11 @@ possible.} \item \cite[18]{morrison2004a} \AtNextCitekey{\toggletrue{short}} \item \cite[24--26]{morrison2004a} -\AtNextCitekey{\toggletrue{short}\toggletrue{firstshort}} +\AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}} \item \cite[401-2]{morrison2004b} \AtNextCitekey{\toggletrue{short}} \item \cite[433]{morrison2004b} -\AtNextCitekey{\toggletrue{short}\toggletrue{firstshort}} +\AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}} \item \cite[37--38]{diaz2008} \AtNextCitekey{\toggletrue{short}} \item \cite[403]{morrison2004b} @@ -282,7 +282,7 @@ explained in section \ref{preamble}, Windy City won't print break here may affect the output.} \begin{citeonly} -\AtNextCitekey{\toggletrue{short}\toggletrue{firstshort}\toggletrue{ibid}} +\AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}\toggletrue{ibid}} \item \cite[3]{morrison2004a} \AtNextCitekey{\toggletrue{short}\toggletrue{ibid}} \item \cite[18]{morrison2004a} @@ -290,11 +290,11 @@ break here may affect the output.} \item \cite[18]{morrison2004a} \AtNextCitekey{\toggletrue{short}\toggletrue{ibid}} \item \cite[24--26]{morrison2004a} -\AtNextCitekey{\toggletrue{short}\toggletrue{firstshort}\toggletrue{ibid}} +\AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}\toggletrue{ibid}} \item \cite[401-2]{morrison2004b} \AtNextCitekey{\toggletrue{short}\toggletrue{ibid}} \item \cite[433]{morrison2004b} -\AtNextCitekey{\toggletrue{short}\toggletrue{firstshort}\toggletrue{ibid}} +\AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}\toggletrue{ibid}} \item \cite[37--38]{diaz2008} \AtNextCitekey{\toggletrue{short}\toggletrue{ibid}} \item \cite[403]{morrison2004b} @@ -302,14 +302,14 @@ break here may affect the output.} \item \cite[152]{diaz2008} \AtNextCitekey{\toggletrue{short}\toggletrue{ibid}} \item \cite[201-2]{diaz2008} -\AtNextMultiCite{\toggletrue{short}\toggletrue{firstshort}} +\AtNextMultiCite{\toggletrue{short}\toggletrue{shortfirst}} \item \cites[240]{morrison2004b}[32]{morrison2004a} \AtNextCitekey{\toggletrue{short}\toggletrue{ibid}} \item \cite[33]{morrison2004a} \end{citeonly} Other ways to make citations more concise: For a compromise between -standard and short forms, try the preamble option \opt{firstshort}. +standard and short forms, try the preamble option \opt{shortfirst}. It swaps long first citations for short ones but otherwise follows the standard (see section \ref{preamble}). Also with standard citations, the preamble option \opt{idemtracker} shortens the author's name of a @@ -375,16 +375,6 @@ it does filter out chapters of books, books in books, and volumes of collections. For discussion of multivolume works, see section \ref{multivolume}. -\optitem[false]{firstshort}{\opt{true}, \opt{false}} - -\noindent Use this option to shorten a work's first citation. The -resulting output consists mainly of the author's name and the work's -title. According to \textit{CMOS}, this approach is optional for -documents with complete bibliographies. (See \textit{CMOS} -\ref{14.23}, also 14.29--14.36.) You may use \opt{firstshort} in -conjunction with \opt{ibid}. However, it adds nothing to \opt{short}, -which has the same effect on first citations. - \optitem[false]{ibid}{\opt{true}, \opt{false}} \noindent This option controls whether consecutive citations of a work @@ -464,9 +454,59 @@ the title minus the subtitle or the content of the \bibfield{shorttitle} field, if available. As noted earlier, \opt{short} has the same effect on first citations -as \opt{firstshort}. But recall from section \ref{short} that you can +as \opt{shortfirst}. But recall from section \ref{short} that you can combine \opt{short} and \opt{ibid} for more concise output. +\optitem[false]{shortfirst}{\opt{true}, \opt{false}} + +\noindent Use this option to shorten a work's first citation. The +resulting output consists mainly of the author's name and the work's +title. According to \textit{CMOS}, this approach is optional for +documents with complete bibliographies. (See \textit{CMOS} +\ref{14.23}, also 14.29--14.36.) You may use \opt{shortfirst} in +conjunction with \opt{ibid}. However, it adds nothing to \opt{short}, +which has the same effect on first citations. + +\optitem[false]{shortlinks}{\opt{true}, \opt{false}} + +\noindent If you use Windy City with +\href{http://www.ctan.org/pkg/hyperref}{\textcolor{blue}{hyerref}}, +citations contain embedded links to their respective entries in the +bibliography. In standard citations, these links encompass the entire +citation (minus some punctuation). With \opt{shortlinks}, they're +embedded in just one element: the title or, if no title is present, +whatever part of the citation occupies the author's position, such as +the author's name, \textit{ibid.}, or a shorthand. For comparison, +here's what default links are like in blue: + +\hypersetup{citecolor=blue} +\begin{citeonly} +\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} + +\noindent And here they are with \opt{shortlinks}: + +\begin{citeonly} +\AtNextCitekey{\toggletrue{shortlinks}} +\item \cite[24--25]{morley1995} +\AtNextCitekey{\toggletrue{shortlinks}} +\item \cite{schwartz1992} +\AtNextCitekey{\toggletrue{shortlinks}} +\item \cite{kaiser1964} +\AtNextCitekey{\toggletrue{shortlinks}} +\item \cite[43]{morley1995} +\AtNextCitekey{\toggletrue{shortlinks}} +\item \cite[138]{schwartz1992} +\AtNextCitekey{\toggletrue{shortlinks}} +\item \cite[189--90]{kaiser1964} +\end{citeonly} +\hypersetup{citecolor=} + \optitem[false]{swapvol}{\opt{true}, \opt{false}} \noindent In bibliographies and long citations, works in collections @@ -533,6 +573,26 @@ title's position. Below is an example from \textit{CMOS} \ref{14.105}: affecting the bibliography, use starred versions of citation commands, such as \cmd{cite*}, \cmd{footcite*}, and \cmd{parencite*}. +\optitem[false]{noreprint}{\opt{true}, \opt{false}} + +\noindent This option helps if you need to indicate a work's original +year of publication with the \bibfield{origdate} or +\bibfield{origyear} field but want to depart from the style's usual +output by excluding the \textit{reprint} bibliography string. First, +an example of the default output from \textit{CMOS} \ref{15.40} (in +the author-year format): + +\begin{refonly} +\nocite{maitland1998} +\end{refonly} + +\noindent Now, from the same section, an example that requires +\opt{noreprint}: + +\begin{refonly} +\nocite{darwin1964} +\end{refonly} + \optitem[false]{skipdate}{\opt{true}, \opt{false}} \noindent On rare occasions, you may need an entry in a reference list @@ -975,13 +1035,22 @@ Schleyer}: edition, such as \textit{Sunday Book Review} (see \textit{CMOS} \ref{14.202}). -\item[issue] Windy City uses this field with the \bibtype{article}, -\bibtype{online}, and \bibtype{review} entry types to record a work's -season of publication (spring, summer, autumn/fall, winter). The -\bibtype{date} field also records seasons---but the value \textit{23}, -for the third season, returns \textit{Autumn}. To print \textit{Fall}, -use the \bibfield{issue} field. In other words, for \textit{Fall -2013}, a work's bibliography database entry should contain: +\item[eprint] Windy City supports the built-in resources that +\biblatex provides for electronic publishing information, even though +the output doesn't conform to \textit{CMOS}. To that end, you may use +the \bibfield{eprint} field, along with its cousins +\bibfield{eprinttype} and \bibfield{eprintclass}, and all the +associated options (\opt{eprint}, \opt{doi}, and \opt{url}), which are +set to \textit{true} by default. + +\item[issue] Windy City uses this field with \bibtype{article}, +\bibtype{online}, and \bibtype{review} entry types (and their aliases) +to record a work's season of publication (spring, summer, autumn/fall, +winter). The \bibtype{date} field also records seasons---but the value +\textit{23}, for the third season, returns \textit{Autumn}. To print +\textit{Fall}, use the \bibfield{issue} field. In other words, for +\textit{Fall 2013}, a work's bibliography database entry should +contain: \begin{verbatim} issue = {Fall}, @@ -1001,11 +1070,28 @@ use the \bibfield{issue} field. In other words, for \textit{Fall date = {2013}, \end{verbatim} -\noindent Remember that when \bibfield{date} contains just a year of +\noindent Note that when \bibfield{date} contains just a year of publication, you may use the classic \bibfield{year} field. -\item[pages] See comments on the \opt{nopages} bibliography -option in section \ref{preamble}. +\item[pages] See comments on the \opt{nopages} bibliography option in +section \ref{preamble}. + +\item[pubstate] This fields indicates when a work is forthcoming (with +value \textit{forthcoming}), a preprint (with value +\textit{preprint}), a working paper (with value \textit{working}), or +an electronic article published ahead of the official publication date +(with value \textit{prepub}). A preprint or working paper needs an +\bibtype{unpublished} entry in your bibliography database (see +\textit{CMOS} \ref{14.173} and \ref{14.218}). A prepublication should +have an \bibtype{article} or \bibtype{periodical} entry (see +\textit{CMOS} \ref{14.172}). For forthcoming works, see \textit{CMOS} +\ref{14.146}, \ref{14.172}, and \ref{15.45}. Forthcoming works also +print correctly with \textit{forthcoming} in the \bibfield{year} +field, as previous versions of the style required. + +\begin{bibonly} +\nocite{faraday,huang2015,jubb2015,lucki1980} +\end{bibonly} \item[series] See comments on \bibfield{seriesaddon} in section \ref{datafields}. @@ -1027,17 +1113,17 @@ dissertation. For the latter, \bibtype{type} should have the value field is needed for the \bibtype{mathesis} and \bibtype{phdthesis} entry types. -In rare cases, \bibfield{type} is necessary for the \bibtype{article} -and \bibtype{review} entry types when a work's bibliographic -information doesn't allow Windy City to distinguish a journal article -from a magazine or newspaper article. This happens when a magazine or -newspaper article has an issue number. Normally, Windy City would -respond by printing the issue number before the date and enclosing the -date in parentheses. But the issue number needs to go first, and the -date shouldn't be in parentheses. The workaround is to include a -\bibfield{type} field with the value \textit{newsmag}. For an example, -see \textit{CMOS} \ref{14.204} and compare it with the citation of -Beattie in \ref{14.171}. +In rare cases, \bibfield{type} is necessary for \bibtype{article} and +\bibtype{review} entry types (and their aliases) when a work's +bibliographic information doesn't allow Windy City to distinguish a +journal article from a magazine or newspaper article. This happens +when a magazine or newspaper article has an issue number. Normally, +Windy City would respond by printing the issue number before the date +and enclosing the date in parentheses. But the issue number needs to +go first, and the date shouldn't be in parentheses. The workaround is +to include a \bibfield{type} field with the value \textit{newsmag}. +For an example, see \textit{CMOS} \ref{14.204} and compare it with the +citation of Beattie in \ref{14.171}. \end{marglist} @@ -2020,7 +2106,7 @@ On short citations and the \opt{short} and \opt{ibid} preamble options, see sections \ref{short} and \ref{preamble}. \begin{citeonly} -\AtNextCitekey{\toggletrue{short}\toggletrue{firstshort}} +\AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}} \item \cite[3]{morrison2004a} \AtNextCitekey{\toggletrue{short}} \item \cite[18]{morrison2004a} @@ -2028,11 +2114,11 @@ options, see sections \ref{short} and \ref{preamble}. \item \cite[18]{morrison2004a} \AtNextCitekey{\toggletrue{short}} \item \cite[24--26]{morrison2004a} -\AtNextCitekey{\toggletrue{short}\toggletrue{firstshort}} +\AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}} \item \cite[401-2]{morrison2004b} \AtNextCitekey{\toggletrue{short}} \item \cite[433]{morrison2004b} -\AtNextCitekey{\toggletrue{short}\toggletrue{firstshort}} +\AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}} \item \cite[37--38]{diaz2008} \AtNextCitekey{\toggletrue{short}} \item \cite[403]{morrison2004b} @@ -2048,7 +2134,7 @@ options, see sections \ref{short} and \ref{preamble}. \noindent With options \opt{short} and \opt{ibid}: \begin{citeonly} -\AtNextCitekey{\toggletrue{short}\toggletrue{firstshort}\toggletrue{ibid}} +\AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}\toggletrue{ibid}} \item \cite[3]{morrison2004a} \AtNextCitekey{\toggletrue{short}\toggletrue{ibid}} \item \cite[18]{morrison2004a} @@ -2056,11 +2142,11 @@ options, see sections \ref{short} and \ref{preamble}. \item \cite[18]{morrison2004a} \AtNextCitekey{\toggletrue{short}\toggletrue{ibid}} \item \cite[24--26]{morrison2004a} -\AtNextCitekey{\toggletrue{short}\toggletrue{firstshort}\toggletrue{ibid}} +\AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}\toggletrue{ibid}} \item \cite[401-2]{morrison2004b} \AtNextCitekey{\toggletrue{short}\toggletrue{ibid}} \item \cite[433]{morrison2004b} -\AtNextCitekey{\toggletrue{short}\toggletrue{firstshort}\toggletrue{ibid}} +\AtNextCitekey{\toggletrue{short}\toggletrue{shortfirst}\toggletrue{ibid}} \item \cite[37--38]{diaz2008} \AtNextCitekey{\toggletrue{short}\toggletrue{ibid}} \item \cite[403]{morrison2004b} @@ -2068,7 +2154,7 @@ options, see sections \ref{short} and \ref{preamble}. \item \cite[152]{diaz2008} \AtNextCitekey{\toggletrue{short}\toggletrue{ibid}} \item \cite[201-2]{diaz2008} -\AtNextMultiCite{\toggletrue{short}\toggletrue{firstshort}} +\AtNextMultiCite{\toggletrue{short}\toggletrue{shortfirst}} \item \cites[240]{morrison2004b}[32]{morrison2004a} \AtNextCitekey{\toggletrue{short}\toggletrue{ibid}} \item \cite[33]{morrison2004a} @@ -2673,9 +2759,11 @@ field for the second example below contains \textit{vol. 6}. % 14.132 No place of publication \begin{citeonly} -\item \cite{windsor1910} -\item \cite{vliet1890} +%\begin{itemize}[before=\small,itemindent=0ex] +\item[] \cite{windsor1910} +\item[] \cite{vliet1890} \end{citeonly} +%\end{itemize} \setcounter{subsubsection}{136} \subsubsection{Self-published or privately published books} @@ -2740,6 +2828,7 @@ field for the second example below contains \textit{vol. 6}. \subsubsection{Forthcoming publications} % 14.146 Forthcoming publications +\label{14.146} \begin{citebib} \item \cite{author} @@ -2832,12 +2921,21 @@ print \textit{Autumn 2013}. \subsubsection{Forthcoming journal articles} % 14.172 Forthcoming journal articles +\label{14.172} \begin{citebib} \item \cite{authora} +\item \cite{jubb2015} +\end{citebib} + +\subsubsection{Journal article preprints} +% 14.173 Journal article preprints +\label{14.173} + +\begin{citebib} +\item \cite{huang2015} \end{citebib} -\setcounter{subsubsection}{173} \subsubsection{Journal page references} % 14.174 Journal page references @@ -3069,9 +3167,11 @@ correct. \subsubsection{Working papers and the like} % 14.218 Working papers and the like +\label{14.218} \begin{citebib} \item \cite{lucki1980} +\item \cite{bronfenbrenner2011} \end{citebib} \setcounter{subsubsection}{219} @@ -3342,6 +3442,7 @@ after \textit{ISO 4}. Compare it with the nearly identical example in \begin{citeref} \item \parencite{austen2003} +\item \parencite{darwin1964} \item \parencite{maitland1998} \end{citeref} @@ -3376,6 +3477,7 @@ after \textit{ISO 4}. Compare it with the nearly identical example in \subsubsection{``Forthcoming'' in author-date references} % 15.45 ``Forthcoming'' in author-date references +\label{15.45} \begin{citeref} \item \parencite{faraday} diff --git a/Master/texmf-dist/tex/latex/windycity/american-windycity.lbx b/Master/texmf-dist/tex/latex/windycity/american-windycity.lbx index 640202d8c0b..c368285793c 100644 --- a/Master/texmf-dist/tex/latex/windycity/american-windycity.lbx +++ b/Master/texmf-dist/tex/latex/windycity/american-windycity.lbx @@ -1,4 +1,4 @@ -% Last modified: Tue 10 Nov 2020 05:25:31 PM CST +% Last modified: Sat 30 Jan 2021 06:17:59 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}[2020/11/10 Windy City +\ProvidesFile{american-windycity.lbx}[2021/01/30 Windy City localization module for biblatex] \InheritBibliographyExtras{american} \InheritBibliographyStrings{american} @@ -127,6 +127,8 @@ \NewBibliographyString{origpub} \NewBibliographyString{part} \NewBibliographyString{preface} +\NewBibliographyString{preprint} +\NewBibliographyString{prepub} \NewBibliographyString{pseudo} \NewBibliographyString{reprint,reprinted} \NewBibliographyString{review,reviewnoauth} @@ -139,6 +141,7 @@ \NewBibliographyString{upcomp,upcomp+,updater,updater+,uped,uped+,uprev,uprev+,uptrans,uptrans+} \NewBibliographyString{updated} \NewBibliographyString{updater} +\NewBibliographyString{working} \DeclareBibliographyStrings{% am = {{a\adddot m\adddot}{a\adddot m\adddot}}, @@ -186,7 +189,9 @@ phdthesis = {{PhD diss\adddot}{PhD diss\adddot}}, pm = {{p\adddot m\adddot}{p\adddot m\adddot}}, preface = {{preface to}{preface to}}, - pseudo = {{pseud\adddot}{pseud\adddot}}, + preprint = {{preprint\addcomma\space submitted}{preprint\addcomma\space submitted}}, + prepub = {{published ahead of print}{published ahead of print}}, + pseudo = {{pseud\adddot}{pseud\adddot}}, references = {{Bibliography}{Bibliography}}, reprint = {{reprint}{repr\adddot}}, reprinted = {{reprinted in}{reprinted in}}, @@ -230,7 +235,8 @@ uptrans+ = {{updated and translated by}{up\adddotspace and trans\adddot}}, urlseen = {{accessed}{accessed}}, volume = {{vol\adddot}{vol\adddot}}, - volumes = {{vols\adddot}{vols\adddot}} + volumes = {{vols\adddot}{vols\adddot}}, + working = {{working paper}{working paper}} } \endinput diff --git a/Master/texmf-dist/tex/latex/windycity/windycity.bbx b/Master/texmf-dist/tex/latex/windycity/windycity.bbx index 9bf9170ab8f..f52a3160f45 100644 --- a/Master/texmf-dist/tex/latex/windycity/windycity.bbx +++ b/Master/texmf-dist/tex/latex/windycity/windycity.bbx @@ -1,4 +1,4 @@ -% Last modified: Tue 10 Nov 2020 05:24:28 PM CST +% Last modified: Sat 30 Jan 2021 06:17:53 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}[2020/11/10 Windy City bibliography style +\ProvidesFile{windycity.bbx}[2021/01/30 Windy City bibliography style for biblatex] \@ifpackagelater{biblatex}{2019/08/17} {} @@ -37,9 +37,13 @@ \AtBeginBibliography{\blx@key@bibcheck{collsonly}}} {}} -\providetoggle{firstshort} -\DeclareBiblatexOption{global}[boolean]{firstshort}[true]{% - \settoggle{firstshort}{#1}}% +\providetoggle{doi} +\DeclareBiblatexOption{entry,global}[boolean]{doi}[true]{% + \settoggle{doi}{#1}} + +\providetoggle{eprint} +\DeclareBiblatexOption{entry,global}[boolean]{eprint}[true]{% + \settoggle{eprint}{#1}} \providetoggle{ibid} \DeclareBiblatexOption{global}[boolean]{ibid}[true]{% @@ -68,6 +72,10 @@ \DeclareBiblatexOption{entry}[boolean]{noauth}[true]{% \settoggle{noauth}{#1}}% +\providetoggle{noreprint} +\DeclareBiblatexOption{entry}[boolean]{noreprint}[true]{% + \settoggle{noreprint}{#1}}% + \DeclareBiblatexOption{global}[boolean]{nolos}[true]{% \ifstrequal{#1}{true} {\AtBeginBibliography{\blx@key@bibcheck{nolos}}} @@ -95,9 +103,17 @@ \DeclareBiblatexOption{global}[boolean]{short}[true]{% \ifstrequal{#1}{true} {\toggletrue{short}% - \toggletrue{firstshort}}% + \toggletrue{shortfirst}}% {\togglefalse{short}}} +\providetoggle{shortfirst} +\DeclareBiblatexOption{global}[boolean]{shortfirst}[true]{% + \settoggle{shortfirst}{#1}}% + +\providetoggle{shortlinks} +\DeclareBiblatexOption{global}[boolean]{shortlinks}[true]{% + \settoggle{shortlinks}{#1}}% + \providetoggle{skipdate} \DeclareBiblatexOption{entry}[boolean]{skipdate}[true]{% \settoggle{skipdate}{#1}}% @@ -106,6 +122,10 @@ \DeclareBiblatexOption{entry}[boolean]{swapauth}[true]{% \settoggle{swapauth}{#1}}% +\providetoggle{newauth} +\DeclareBiblatexOption{entry}[boolean]{newauth}[true]{% + \settoggle{newauth}{#1}}% + \providetoggle{swaptrans} \DeclareBiblatexOption{entry}[boolean]{swaptrans}[true]{% \settoggle{swaptrans}{#1}}% @@ -114,6 +134,10 @@ \DeclareBiblatexOption{entry,global}[boolean]{swapvol}[true]{% \settoggle{swapvol}{#1}}% +\providetoggle{url} +\DeclareBiblatexOption{entry,global}[boolean]{url}[true]{% + \settoggle{url}{#1}} + % For setting 'minbibnames' and such, see CMOS, 17th ed., 14.76 and % 15.29. @@ -126,6 +150,8 @@ date=long, dateabbrev=false, dateusetime=true, + doi=true, + eprint=true, ibidtracker=constrict, idemtracker=false, indexing=true, @@ -148,6 +174,7 @@ timezones=true, uniquelist=minyear, uniquename=minfull, + url=true, urldate=long, useeditor=true, useprefix=false, @@ -208,9 +235,13 @@ \field{sortyear} \field{year} \field{labelyear}} + \sort{\field{month}} + \sort{\field{day}} + \sort{\field{hour}} + \sort{\field{minute}} \sort{% - \field[padside=left,padwidth=4,padchar=0]{volume} - \literal{0000}}} + \field{volume} + \literal{0}}} \DeclareSortingTemplate{nyt}{% \sort{\field{presort}} \sort[final]{\field{sortkey}} @@ -232,6 +263,10 @@ \field{origyear} \field{labelyear} \field{year}} + \sort{\field{month}} + \sort{\field{day}} + \sort{\field{hour}} + \sort{\field{minute}} \sort{% \field{sorttitle} \field{title} @@ -240,8 +275,89 @@ \field{blogtitle} \field{journaltitle}} \sort{% - \field[padside=left,padwidth=4,padchar=0]{volume} - \literal{0000}}} + \field{volume} + \literal{0}}} + +% Mapping for when 'journal', 'journaltitle', 'organization', or +% 'blogtitle' goes in the author's position. + +\DeclareSourcemap{ + \maps[datatype=bibtex]{ + \map[overwrite]{ + \pertype{article} + \pertype{review} + \step[notfield=author, final] + \step[notfield=editor, final] + \step[notfield=translator, final] + \step[fieldsource=journal] + \step[fieldsource=journaltitle] + \step[fieldset=author, origfieldval] + \step[fieldsource=author, + match=\regexp{(.+)}, + replace=\regexp{\\mkbibemph{{$1}}}] + \step[fieldset=options, fieldvalue={,newauth}, append] + \step[fieldset=verba, fieldvalue=journaltitle] + \step[fieldsource=shortjournal] + \step[fieldset=shortauthor, origfieldval] + \step[fieldsource=shortauthor, + match=\regexp{(.+)}, + replace=\regexp{\\mkbibemph{{$1}}}] + \step[fieldsource=journaltitleaddon, final] + \step[fieldset=nameaddon, origfieldval] + \step[fieldsource=nameaddon, + match=\regexp{(.+)}, + replace=\regexp{\\mkbibbrackets{$1}}] + } + } +} +\DeclareSourcemap{ + \maps[datatype=bibtex]{ + \map[overwrite]{ + \pertype{online} + \step[notfield=author, final] + \step[notfield=editor, final] + \step[notfield=translator, final] + \step[fieldsource=blogtitle] + \step[fieldset=author, origfieldval] + \step[fieldsource=author, + match=\regexp{(.+)}, + replace=\regexp{\\mkbibemph{{$1}}}] + \step[fieldset=options, fieldvalue={,newauth}, append] + \step[fieldset=verba, fieldvalue=blogtitle] + \step[fieldsource=shortblog] + \step[fieldset=shortauthor, origfieldval] + \step[fieldsource=shortauthor, + match=\regexp{(.+)}, + replace=\regexp{\\mkbibemph{{$1}}}] + \step[fieldsource=blogtitleaddon, final] + \step[fieldset=nameaddon, origfieldval] + \step[fieldsource=nameaddon, + match=\regexp{(.+)}, + replace=\regexp{\\mkbibparens{$1}}] + } + } +} +\DeclareSourcemap{ + \maps[datatype=bibtex]{ + \map[overwrite=false]{ + \pertype{inreference} + \pertype{reference} + \step[notfield=author, final] + \step[fieldsource=organization] + \step[fieldset=author, origfieldval] + \step[fieldsource=author, + match=\regexp{(.+)}, + replace=\regexp{{$1}}] + \step[fieldset=options, fieldvalue={,newauth}, append] + \step[fieldset=verba, fieldvalue=organization] + \step[fieldsource=shortorganization] + \step[fieldset=shortauthor, origfieldval] + \step[fieldsource=shortauthor, + match=\regexp{(.+)}, + replace=\regexp{{$1}}] + } + } +} \defbibcheck{collsonly}{% \ifentrytype{inbook} @@ -296,8 +412,6 @@ \DeclareDataInheritance{collection}{collection,inbook}{% \inherit{year}{bookyear} \inherit{endyear}{endbookyear}} -\DeclareDataInheritance{reference}{reference}{% - \inherit{author}{bookauthor}} \DeclareDataInheritance{*}{*}{% \noinherit{crossref} \noinherit{entryset} @@ -336,7 +450,6 @@ \providetoggle{authposition} \providetoggle{bibliography} \providetoggle{ibid:loccit} -\providetoggle{journalfirst} \providetoggle{multicite} \providetoggle{cbx:collection} @@ -492,6 +605,7 @@ \usebibmacro{index:field}{#1}{\thefield{indexsorttitle}}{#2}}% \DeclareFieldFormat{blogtitleaddon}{\mkbibparens{#1}} +\DeclareFieldFormat{journaltitleaddon}{\mkbibbrackets{#1}} \DeclareFieldFormat{titleaddon}{\mkbibbrackets{#1}} \DeclareFieldFormat[article,incollection,online,reference,review] @@ -553,6 +667,7 @@ \DeclareFieldFormat{part}{\bibstring{part}\space#1} \DeclareFieldFormat{postnote}{#1} \DeclareListFormat{publisher}{#1} +\DeclareFieldFormat{pubstate}{\ifcapital{\MakeCapital{#1}}{#1}}% \DeclareFieldFormat{season}{\MakeCapital{#1}}% always capitalize % A shorthand should be italicized if the title that it abbreviates is @@ -626,10 +741,9 @@ {\usebibmacro{edtrans:authpos}% \ifnameundef{\cbx@namelist} {\toggletrue{noauth}% - \usebibmacro{authpos+deflabel}% - \usebibmacro{journalfirst}}% + \usebibmacro{authpos+deflabel}}% {\usebibmacro{addplus:authpos}% - \usebibmacro{namehash+etc}}}% + \usebibmacro{namehash+etc}}} {\usebibmacro{namehash+etc}}}} \newbibmacro*{authpos+deflabel}{% @@ -652,6 +766,7 @@ \newbibmacro*{author+namelist}{% \ifboolexpr{ test {\ifnameundef{shortauthor}} + or togl {cbx:first} or togl {bibliography}} {\renewcommand*{\cbx@namelist}{author}}% {\renewcommand*{\cbx@namelist}{shortauthor}}% @@ -664,8 +779,6 @@ {\renewcommand*{\cbx@namelist}{shortbookauthor}}% \usebibmacro{author+bookauthor+type}}% -% See notes for 'handle' and 'nameaddon'. - \newbibmacro*{author+bookauthor+type}{% \iffieldundef{\cbx@namelist type} {} @@ -680,43 +793,6 @@ {\renewcommand*{\anonb}{\space\mkbibbrackets{\bibstring{pseudo}}}} {}}}}} -% When 'journaltitle' goes in the author's position. - -\newbibmacro*{journalfirst}{% - \ifboolexpr{ ( test {\ifentrytype{article}} - or test {\ifentrytype{review}} ) - and togl {bibliography}} - {\toggletrue{journalfirst}% - \usebibmacro{bibjournaldash}% - \setunit{\space}% - \usebibmacro{journallocation}% - \clearlist{location}% - \usebibmacro{labeldate+extradate}% - \newunit}% - {\usebibmacro{blogtitlefirst}}} - -% When 'blogtitle' goes in the author's position. - -\newbibmacro*{blogtitlefirst}{% - \ifboolexpr{ test {\ifentrytype{online}} - and togl {bibliography}} - {\toggletrue{journalfirst}% - \usebibmacro{bibblogdash}% - \setunit{\space}% - \usebibmacro{labeldate+extradate}% - \newunit}% - {\usebibmacro{orgfirst}}} - -% When 'organization' goes in the author's position. - -\newbibmacro*{orgfirst}{% - \ifboolexpr{ test {\ifentrytype{reference}} - and not test {\iflistundef{organization}}} - {\printlist{organization}% - \setunit{\space}% - \newunit}% - {}} - \newbibmacro*{namehash+etc}{% \usebibmacro{printnames+etc}% \ifboolexpr{ togl {authposition}% false in 'crossref' macro @@ -1186,6 +1262,7 @@ %% Names and Dashes %% %%%%%%%%%%%%%%%%%%%%%%%% +% HERE \newbibmacro*{printnames+etc}{% \ifboolexpr{ togl {authposition} and togl {bibliography}} @@ -1193,6 +1270,7 @@ {\usebibmacro{printnames}}% \usebibmacro{handle}% \usebibmacro{nameaddon}% + \usebibmacro{newauth+journallocation}% \usebibmacro{a:labeldate+extradate}% \usebibmacro{clearnames+empty}}% @@ -1234,8 +1312,20 @@ or togl {cbx:short}} {} {\space - \printfield[brackets]{nameaddon}% - \clearfield{nameaddon}}} + \iftoggle{newauth} + {\printfield[noformat]{nameaddon}% + \clearfield{nameaddon}}% + {\printfield[brackets]{nameaddon}% + \clearfield{nameaddon}}}} + +\newbibmacro*{newauth+journallocation}{% + \iftoggle{newauth} + {\ifboolexpr{ test {\ifentrytype{article}} + and togl {bibliography}} + {\usebibmacro{journallocation}% + \newunit}% + {}} + {}} \newbibmacro*{clearnames+empty}{% \clearname{\cbx@namelist}% @@ -1245,33 +1335,6 @@ \let\pluga\empty \let\plugb\empty}% -% When a dash replaces 'journaltitle' in the author's position. - -\newbibmacro*{bibjournaldash}{% - \ifboolexpr{ test {\iffieldequals{journaltitle}{\bbx@lasthash}} - and not test \iffirstonpage} - {\bibnamedash - \clearfield{journaltitle}% - \clearlist{location}% - \newunit}% - {\savefield{journaltitle}{\bbx@lasthash}% - \renewcommand*{\xtitle}{journal}% - \usebibmacro{longtitle+titleaddon}% - \let\xtitle\empty}}% - -% When a dash replaces 'blogtitle' in the author's position. - -\newbibmacro*{bibblogdash}{% - \ifboolexpr{ test {\iffieldequals{blogtitle}{\bbx@lasthash}} - and not test \iffirstonpage} - {\bibnamedash - \clearfield{blogtitle}% - \newunit}% - {\savefield{blogtitle}{\bbx@lasthash}% - \renewcommand*{\xtitle}{blog}% - \usebibmacro{longtitle+titleaddon}% - \let\xtitle\empty}}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Titles and Subtitles %% %%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1281,10 +1344,13 @@ \newbibmacro*{longtitle+titleaddon}{% \iffieldundef{\xtitle title} {} - {\usebibmacro{longtitle}% + {\iftoggle{shortlinks} + {\togglefalse{shortlinks}% + \printtext[bibhyperref]{\usebibmacro{longtitle}}} + {\usebibmacro{longtitle}}% \usebibmacro{titleaddon}% \usebibmacro{test:titledupes}% - \clearfield{\xtitle title}}} + \clearfield{\xtitle title}}}% test \newbibmacro*{longtitle}{% \printtext[\xtitle title]{% @@ -1300,8 +1366,8 @@ {\ifboolexpr{ test {\iffieldundef{subtitle}} or test {\iffieldsequal{subtitle}{booksubtitle}}} {\clearfield{booktitle}}% - {}} - {}} + {}}% test + {}}% test \newbibmacro*{titleaddon}{% \iffieldundef{\xtitle titleaddon} @@ -1314,8 +1380,10 @@ {\usebibmacro{longtitle+titleaddon}% \usebibmacro{b:labeldate+extradate}}% {\ifboolexpr{ test \ifciteseen - or togl {firstshort}} - {\usebibmacro{shorttitle}}% + or togl {shortfirst}} + {\iftoggle{shortlinks} + {\printtext[bibhyperref]{\usebibmacro{shorttitle}}} + {\usebibmacro{shorttitle}}} {\usebibmacro{longtitle+titleaddon}}}} \newbibmacro*{shorttitle}{% @@ -1390,7 +1458,8 @@ \printtext[parens]{% \usebibmacro{origlocation}% \usebibmacro{origpublisher}% - \iftoggle{reflist} + \ifboolexpr{ togl {bibliography} + and togl {reflist}} {} {\usebibmacro{origyear+origendyear}}}}} @@ -1495,10 +1564,10 @@ \newbibmacro*{issue+month+etc}[1]{% \iffieldundef{year} - {\iffieldundef{month} - {} - {\setunit{\space}% - \printtext[parens]{\printdate}}} + {\setunit{\space}% + \iffieldundef{month} + {\usebibmacro{pubstate}{parens}}% + {\printtext[parens]{\printdate}}} {\ifboolexpr{ test {\iffieldundef{volume}} and test {\iffieldundef{number}}} {\iffieldundef{journal} @@ -1509,16 +1578,45 @@ {\usebibmacro{reflist+year+day}% \printdate}}% {\iffieldundef{month} - {\setunit{\space}% - \usebibmacro{reflist+issue+season}}% + {\usebibmacro{reflist+issue+season}}% {\ifstrequal{#1}{noparens} {\usebibmacro{reflist+year+day}% \newunit - \printdate}% + \usebibmacro{pubstate}{date}}% {\usebibmacro{reflist+year+day}% \setunit{\space}% \printtext[parens]{\printdate}}}}}} +\newbibmacro*{pubstate}[1]{% + \iftoggle{authposition} + {\iffieldequalstr{pubstate}{forthcoming} + {\printfield{pubstate}% + \clearfield{pubstate}}% + {\usebibmacro{labeldate+date}{#1}}} + {\iffieldundef{pubstate} + {\usebibmacro{labeldate+date}{#1}}% + {\iffieldequalstr{pubstate}{preprint} + {\bibstring{preprint}}% + {\iffieldequalstr{pubstate}{prepub} + {\newunit% necessary if no 'date' + \bibstring{prepub}% + \setunit{\addcomma\space}% + \printdate}% + {\iffieldequalstr{pubstate}{working} + {\bibstring{working}% + \setunit{\addcomma\space}}% + {\ifstrequal{#1}{parens} + {\printtext[parens]{\printfield{pubstate}}} + {\printfield{pubstate}}}}}% needs '%' + \clearfield{pubstate}}}} + +\newbibmacro*{labeldate+date}[1]{% + \ifstrequal{#1}{label} + {\printlabeldate}% + {\ifstrequal{#1}{date} + {\printdate}% + {}}} + \newbibmacro*{reflist+year+day}{% \ifboolexpr{ togl {bibliography} and togl {reflist} @@ -1541,8 +1639,8 @@ {} {\setunit{\space}% \iffieldundef{issue} - {\printtext[parens]{\printfield{season}}} - {\printtext[parens]{\printfield{issue}}}}} + {\printtext[parens]{\printfield{season}}} + {\printtext[parens]{\printfield{issue}}}}} {\setunit{\space}% \printtext[parens]{\usebibmacro{issue+season+year}}}} @@ -1573,7 +1671,7 @@ \usebibmacro{endbookyear}}} {\ifboolexpr{ test {\iffieldundef{year}} and test {\iffieldundef{bookyear}}} - {\bibstring{nodate}}% + {\usebibmacro{pubstate}{label}}% {\iffieldundef{bookyear} {\printfield{year}% \usebibmacro{endyear}}% @@ -1617,8 +1715,7 @@ {\usebibmacro{labeldate+extradate}}} \newbibmacro*{b:labeldate+extradate}{% - \ifboolexpr{ togl {noauth} - and not togl {journalfirst}} + \iftoggle{noauth} {\usebibmacro{labeldate+extradate}}% {}} @@ -1654,10 +1751,10 @@ \newbibmacro*{labeldate+endyear}{% \iffieldequalstr{labeldatesource}{bookyear} {\iffieldundef{year} - {\printlabeldate}% - {\printfield{year}% + {\usebibmacro{pubstate}{label}}% + {\usebibmacro{pubstate}{date}% \usebibmacro{endyear}}} - {\printlabeldate}}% + {\usebibmacro{pubstate}{label}}} %%%%%%%%%%%%%%%%% %% Locations %% @@ -1709,6 +1806,7 @@ \DeclareBibliographyDriver{article}{% \usebibmacro{bibindex}% + \usebibmacro{newauth}% \usebibmacro{author+title+etc}% \usebibmacro{articles}% \usebibmacro{colon+pages+etc}% @@ -1735,6 +1833,7 @@ \DeclareBibliographyDriver{online}{% \usebibmacro{bibindex}% + \usebibmacro{newauth}% \usebibmacro{author+title+etc}% \newunit \usebibmacro{websites}% @@ -1752,6 +1851,7 @@ \DeclareBibliographyDriver{review}{% \usebibmacro{bibindex}% + \usebibmacro{newauth}% \usebibmacro{reviews}% \usebibmacro{articles}% \usebibmacro{colon+pages+etc}% @@ -1775,6 +1875,13 @@ \usebibmacro{annotation}% \finentry}% +\newbibmacro*{newauth}{% + \iftoggle{newauth} + {\iftoggle{bibliography} + {\clearfield{\thefield{verba}}} + {\toggletrue{noauth}}} + {}} + \newbibmacro*{author+title+etc}{% \usebibmacro{author+bookauthor+etc}% \usebibmacro{title+labelyear}% @@ -1787,18 +1894,19 @@ \usebibmacro{issuetitle}% \renewcommand*{\xtitle}{journal}% \usebibmacro{longtitle+titleaddon}% - \usebibmacro{journalseries}% - \setunit{\space}% \usebibmacro{journallocation}% - \printfield[noformat]{volume}% - \iftoggle{journalfirst} + \usebibmacro{journalseries}% + \usebibmacro{volume}% + \iftoggle{newauth} {\newunit}% {\setunit{\addcomma\space}}% \iffieldequalstr{type}{newsmag} {\usebibmacro{issue+month+etc}{noparens}% \usebibmacro{periodical:number}}% {\usebibmacro{periodical:number}% - \usebibmacro{issue+month+etc}{}}% + \iffieldequalstr{pubstate}{prepub} + {\usebibmacro{issue+month+etc}{noparens}}% + {\usebibmacro{issue+month+etc}{}}}% needs '%' \toggletrue{edshift}% \usebibmacro{edition}{noformat}}% @@ -1809,7 +1917,8 @@ \ifboolexpr{ test {\iffieldundef{pages}} or not test {\iffieldundef{eid}}} {} - {\iftoggle{reflist} + {\ifboolexpr{ togl {bibliography} + and togl {reflist}} {\ifboolexpr{test {\iffieldundef{number}} and test {\iffieldundef{month}} and test {\iffieldundef{issue}} @@ -1917,21 +2026,27 @@ \usebibmacro{note}% \usebibmacro{review+title}% \setunit{\addcomma\space}% - \iftoggle{firstshort} + \iftoggle{shortfirst} {} {\toggletrue{edshift}% \usebibmacro{edtrans}}} \newbibmacro*{inst+loc+date}{% \usebibmacro{thesis+type}% - \setunit{\addcomma\space}% - \iflistundef{institution} - {\printfield{venue}}% - {\printlist{institution}}% - \setunit{\addcomma\space}% - \printlist{location}% - \setunit{\addcomma\space}% - \usebibmacro{reflist+year+day}% + \ifboolexpr{ test {\iflistundef{institution}} + and test {\iflistundef{venue}}} + {} + {\iflistundef{institution} + {\printfield{venue}}% + {\printlist{institution}}% + \setunit{\addcomma\space}}% + \iflistundef{location} + {} + {\printlist{location}% + \setunit{\addcomma\space}}% + \iffieldundef{month} + {\usebibmacro{reflist+year+day}}% + {} \printdate}% %%%%%%%%%%%%%%%%%%%%%%%%% @@ -1962,24 +2077,35 @@ \setunit{\addcomma\space}% \clearfield{part}}} +\newbibmacro*{journallocation}{% + \iflistundef{location} + {} + {\nopunct\setunit{\space}% + \printtext[parens]{% + \printlist{location}}}% + \clearlist{location}}% + \newbibmacro*{journalseries}{% \iffieldundef{series} {} - {\iflistundef{location} - {\setunit{\addcomma\space}% + {\iftoggle{newauth} + {\newunit \printfield{series}}% - {\setunit{\space}% + {\setunit{\addcomma\space}% \printfield{series}}% \isdot\addcomma \usebibmacro{seriesaddon}% \usebibmacro{editortypes}{series}% \newunit}}% -\newbibmacro*{journallocation}{% - \iflistundef{location} +\newbibmacro*{volume}{% + \iffieldundef{volume} {} - {\nopunct\printtext[parens]{% - \printlist{location}}\space}}% + {\ifboolexpr{ togl {bibliography} + and togl {newauth}} + {\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. @@ -2019,20 +2145,21 @@ \ifboolexpr{ test {\iffieldundef{howpublished}} and test {\iffieldundef{url}} and test {\iffieldundef{doi}} + and test {\iffieldundef{eprint}} and test {\iffieldundef{addendum}} - or ( togl {firstshort} and not togl {bibliography} )} + or ( togl {shortfirst} and not togl {bibliography} )} {} {\usebibmacro{eid}% \newunit \printfield{howpublished}% \newunit - \printurldate - \newunit \printfield[noformat]{version}% \newunit - \printfield{url}% + \usebibmacro{urldate+url}% + \newunit + \usebibmacro{doi}% \newunit - \printfield{doi}% + \usebibmacro{eprint+etc}% \newunit \printfield{addendum}}} @@ -2202,7 +2329,8 @@ \renewcommand*{\cbx@deflabel}{labelname}% \global\toggletrue{cbx:short}% \entrydata{\thefield{crossref}}{% - \iftoggle{reflist} + \ifboolexpr{ togl {bibliography} + and togl {reflist}} {\usebibmacro{parencite:new}}% {\usebibmacro{author+bookauthor+etc}% \usebibmacro{shorttitle+crossref}}% @@ -2219,13 +2347,13 @@ {}}} \newbibmacro*{review+title}{% - \iftoggle{noauth} + \iftoggle{newauth} {\bibcpstring{reviewnoauth}}% {\bibstring{review}}% \space \renewcommand*{\xtitle}{book}% \usebibmacro{title+labelyear}% - \iftoggle{firstshort} + \iftoggle{shortfirst} {\clearfield{booktitle}}% {\setunit{\addcomma\space}% \ifdefempty{\reviewee} @@ -2237,14 +2365,17 @@ \newbibmacro*{thesis+type}{% \ifentrytype{mathesis} - {\bibstring{mathesis}}% + {\bibstring{mathesis}% + \setunit{\addcomma\space}}% {\ifentrytype{phdthesis} - {\bibstring{phdthesis}}% + {\bibstring{phdthesis}% + \setunit{\addcomma\space}}% {\iffieldundef{type} - {} + {\usebibmacro{pubstate}{}}% {\iffieldbibstring{type} {\bibstring{\thefield{type}}} - {\printfield{type}}}}}} + {\printfield{type}}% + \setunit{\addcomma\space}}}}} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Fourth and Higher Tier Macros %% @@ -2258,6 +2389,29 @@ {\newunit}% \printfield{eid}}} +\newbibmacro*{urldate+url}{% + \iffieldundef{url} + {} + {\iftoggle{url} + {\printurldate + \newunit + \printfield{url}}% + {}}} + +\newbibmacro*{doi}{% + \iffieldundef{doi} + {} + {\iftoggle{doi} + {\printfield{doi}}% + {}}} + +\newbibmacro*{eprint+etc}{% + \iffieldundef{eprint} + {} + {\iftoggle{eprint} + {\usebibmacro{eprint}}% + {}}} + \newbibmacro*{volumes}{% \iffieldundef{volumes} {} @@ -2326,7 +2480,8 @@ \newbibmacro*{orig+etc}{% \usebibmacro{origlocation}% \usebibmacro{origpublisher}% - \iftoggle{reflist} + \ifboolexpr{ togl {bibliography} + and togl {reflist}} {} {\usebibmacro{origyear+origendyear}}% \usebibmacro{reprint}% @@ -2340,7 +2495,8 @@ \newbibmacro*{reprint}{% \ifboolexpr{ test {\iffieldundef{origyear}} - and test {\iflistundef{origpublisher}}} + and test {\iflistundef{origpublisher}} + or togl {noreprint}} {} {\iftoggle{bibliography} {\newunit}% diff --git a/Master/texmf-dist/tex/latex/windycity/windycity.cbx b/Master/texmf-dist/tex/latex/windycity/windycity.cbx index b98193313aa..bb0ca85e87b 100644 --- a/Master/texmf-dist/tex/latex/windycity/windycity.cbx +++ b/Master/texmf-dist/tex/latex/windycity/windycity.cbx @@ -1,4 +1,4 @@ -% Last modified: Tue 10 Nov 2020 05:24:14 PM CST +% Last modified: Sat 30 Jan 2021 06:17:55 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}[2020/11/10 Windy City citation style for +\ProvidesFile{windycity.cbx}[2021/01/30 Windy City citation style for biblatex] \@ifpackagelater{biblatex}{2019/08/17} {} @@ -39,10 +39,10 @@ \InitializeCitationStyle{\let\crossreflist\empty}% \renewcommand{\bibfootnotewrapper}[1]{% -% \clearfield{postpunct}% + \clearfield{postpunct}% \bibsentence#1}% \renewcommand{\bibendnotewrapper}[1]{% -% \clearfield{postpunct}% + \clearfield{postpunct}% \bibsentence#1}% % Protect commas against abbreviation dots and terminal punctuation. @@ -182,19 +182,21 @@ \iffieldundef{postnote} {\printtext[bibhyperref]{% \usebibmacro{parencite:date}% - \usebibmacro{cite:volume}}} + \usebibmacro{cite:volume}}}% needs '%' {}} {\usebibmacro{test:collection}% \usebibmacro{parencite:crossref}% \usebibmacro{parencite:multicite}}} \newbibmacro*{parencite:date}{% - \iffieldundef{labelyear} - {} + \ifboolexpr{ test {\ifentrytype{online}} + and test {\iffieldundef{year}}} + {\newunit + \usebibmacro{pubstate}{}}% {\usebibmacro{parencite:origyear}% \iffieldnums{labelyear} {}% needs '%' - {\addcomma}% + {\newunit}% \usebibmacro{labeldate+endyear}% \printfield{extradate}}} @@ -221,10 +223,10 @@ {}% needs '%' \printtext[bibhyperref]{% \usebibmacro{parencite:date}% - \usebibmacro{cite:volume}}} + \usebibmacro{cite:volume}}}% needs '%' {\printtext[bibhyperref]{% \usebibmacro{parencite:new}% - \usebibmacro{cite:volume}}}} + \usebibmacro{cite:volume}}}}% needs '%' \newbibmacro*{parencite:new}{% \iffieldundef{shorthand} @@ -238,9 +240,7 @@ {} {\ifboolexpr{ test {\ifnameundef{labelname}} or test {\iffieldundef{labelyear}}} - {\iffieldundef{label} - {\usebibmacro{parencite:journal}}% - {\printfield{label}}} + {\printfield[citetitle]{labeltitle}}% {\global\toggletrue{cbx:short}% \renewcommand*{\cbx@deflabel}{labelname}% \clearfield{handle}% @@ -252,14 +252,6 @@ {\usebibmacro{author+bookauthor+etc}}% {\usebibmacro{supplement}}}}} -\newbibmacro*{parencite:journal}{% - {\ifentrytype{article} - {\iffieldundef{shortjournal} - {\renewcommand*{\xtitle}{journal}% - \usebibmacro{longtitle}}% - {\printfield[journal]{shortjournal}}} - {\printfield[citetitle]{labeltitle}}}} - %%%%%%%%%%%%%%%%%%%%%%%%%% %% Citations in Notes %% %%%%%%%%%%%%%%%%%%%%%%%%%% @@ -268,8 +260,12 @@ \ifciteseen {\usebibmacro{test:collection}% \renewcommand*{\cbx@deflabel}{labelname}% - \printtext[bibhyperref]{\usebibmacro{cite:seen}}} - {\printtext[bibhyperref]{\usebibmacro{cite:new}}}% needs '%' + \iftoggle{shortlinks} + {\usebibmacro{cite:seen}}% + {\printtext[bibhyperref]{\usebibmacro{cite:seen}}}} + {\iftoggle{shortlinks} + {\usebibmacro{cite:new}}% + {\printtext[bibhyperref]{\usebibmacro{cite:new}}}}% needs '%' \usebibmacro{savefields}}% \newbibmacro*{cite:seen}{% @@ -279,23 +275,32 @@ and not test \iffirstonpage} {\usebibmacro{cite:ibid}}% {\usebibmacro{cite:short}}} - {\printfield{shorthand}% - \usebibmacro{cite:volume}}} + {\iftoggle{shortlinks} + {\printtext[bibhyperref]{% + \printfield{shorthand}% + \usebibmacro{cite:volume}}} + {\printfield{shorthand}% + \usebibmacro{cite:volume}}}} \newbibmacro*{cite:ibid}{% \iftoggle{ibid} - {\bibcpstring{ibidem}% - \ifloccit - {\global\toggletrue{ibid:loccit}}% - {\usebibmacro{cite:volume}}} + {\iftoggle{shortlinks} + {\printtext[bibhyperref]{% + \usebibmacro{cite:ibid+loccit}}} + {\usebibmacro{cite:ibid+loccit}}} {\global\toggletrue{cbx:short}% \ifentrytype{review} {\usebibmacro{ibid:review}}% - {\usebibmacro{author+bookauthor+etc}% - \iftoggle{noauth} - {\usebibmacro{title+labelyear}}% - {}% needs '%' - \usebibmacro{cite:volume}}}} + {\iftoggle{shortlinks} + {\printtext[bibhyperref]{% + \usebibmacro{cite:author+title+etc}}} + {\usebibmacro{cite:author+title+etc}}}}} + +\newbibmacro*{cite:ibid+loccit}{% + \bibcpstring{ibidem}% + \ifloccit + {\global\toggletrue{ibid:loccit}}% + {\usebibmacro{cite:volume}}} \newbibmacro*{ibid:review}{% \ifnameundef{author} @@ -305,6 +310,13 @@ {\usebibmacro{author+bookauthor+etc}}% \usebibmacro{cite:volume}}% +\newbibmacro*{cite:author+title+etc}{% + \usebibmacro{author+bookauthor+etc}% + \iftoggle{noauth} + {\usebibmacro{title+labelyear}}% + {}% needs '%' + \usebibmacro{cite:volume}}% + \newbibmacro*{cite:short}{% \global\toggletrue{cbx:short}% \usebibmacro{short:multicite}% @@ -359,7 +371,7 @@ \newbibmacro*{cite:new}{% \global\toggletrue{cbx:first}% \usebibmacro{idem+short+multicite}% - \iftoggle{firstshort} + \iftoggle{shortfirst} {\usebibmacro{cite:short}}% {\printtext{% \usedriver @@ -373,7 +385,7 @@ \newbibmacro*{idem+short+multicite}{% \ifboolexpr{ test {\ifciteidem} or togl {cbx:idem} - or togl {firstshort}} + or togl {shortfirst}} {\renewcommand*{\cbx@deflabel}{labelname}}% {\ifboolexpr{ test {\iffieldequals{namehash}{\bbx@lasthash}} and togl {multicite}} @@ -417,13 +429,15 @@ {\setunit{\addcolon\space}}}}} \newbibmacro*{reference:authpos}{% - \iflistundef{organization} - {\ifnameundef{bookauthor} - {\renewcommand*{\cbx@namelist}{author}}% - {\renewcommand*{\cbx@namelist}{bookauthor}}% - \usebibmacro{printnames+etc}}% - {\printlist{organization}% - \clearlist{organization}}} + \iftoggle{newauth} + {\usebibmacro{author+bookauthor+etc}% + \togglefalse{newauth}% + \clearlist{organization}% + \clearname{author}}% + {\iflistundef{organization} + {\usebibmacro{author+bookauthor+etc}}% + {\printlist{organization}% + \clearlist{organization}}}} \newbibmacro*{reference:howpublished+etc}{% \ifboolexpr{ test {\iffieldundef{howpublished}} @@ -483,14 +497,18 @@ {\ifboolexpr{ test {\ifentrytype{article}} or test {\ifentrytype{review}}} {\iffieldundef{postnote} - {\printtext[bibhyperref]{\printfield{pages}}} + {\iftoggle{shortlinks} + {\printfield{pages}}% + {\printtext[bibhyperref]{\printfield{pages}}}} {}} {}}} \renewbibmacro*{postnote}{% \iffieldundef{postnote} {} - {\printtext[bibhyperref]{\printfield{postnote}}}} + {\iftoggle{shortlinks} + {\printfield{postnote}}% + {\printtext[bibhyperref]{\printfield{postnote}}}}} \newbibmacro*{shorthand+intro}{% \iffieldundef{shorthand} @@ -515,6 +533,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \DeclareBibliographyDriver{cite:article}{% + \usebibmacro{newauth}% \usebibmacro{author+title+etc}% \usebibmacro{articles}% \usebibmacro{colon+comma+etc}}% @@ -549,6 +568,7 @@ \newunit}% \DeclareBibliographyDriver{cite:online}{% + \usebibmacro{newauth}% \usebibmacro{author+title+etc}% \setunit*{\newunitpunct}% needs '*' \usebibmacro{websites}% @@ -573,6 +593,7 @@ \usebibmacro{reference:authpos}}% \DeclareBibliographyDriver{cite:review}{% + \usebibmacro{newauth}% \usebibmacro{reviews}% \usebibmacro{articles}% \usebibmacro{colon+comma+etc}}% diff --git a/Master/texmf-dist/tex/latex/windycity/windycity.dbx b/Master/texmf-dist/tex/latex/windycity/windycity.dbx index ea87948409e..51a83057e7e 100644 --- a/Master/texmf-dist/tex/latex/windycity/windycity.dbx +++ b/Master/texmf-dist/tex/latex/windycity/windycity.dbx @@ -1,4 +1,4 @@ -\ProvidesFile{windycity.dbx}[2020/11/10 Windy City data model file for +\ProvidesFile{windycity.dbx}[2021/01/30 Windy City data model file for biblatex] \DeclareDatamodelFields[type=field,datatype=literal]{% blogsubtitle, @@ -13,8 +13,10 @@ endbookyear, handle, seriesaddon, + shortblog, shortbooktitle, shortmaintitle, + shortorganization, translatoratype, translatortype} \DeclareDatamodelFields[type=list,datatype=name]{% -- cgit v1.2.3