summaryrefslogtreecommitdiff
path: root/macros/latex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-11-12 03:01:16 +0000
committerNorbert Preining <norbert@preining.info>2020-11-12 03:01:16 +0000
commit6280c0bca943a30d09e92916ab396082f6461c7f (patch)
tree5c3d978f3c46993c52991bcf7622caf2fe9ff169 /macros/latex
parente29975e266b9584a510953e24a4e8c7efee76e9e (diff)
CTAN sync 202011120301
Diffstat (limited to 'macros/latex')
-rw-r--r--macros/latex/contrib/biblatex-contrib/windycity/CHANGES.md57
-rw-r--r--macros/latex/contrib/biblatex-contrib/windycity/README.md2
-rw-r--r--macros/latex/contrib/biblatex-contrib/windycity/american-windycity.lbx34
-rw-r--r--macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.bib69
-rw-r--r--macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.pdfbin409884 -> 425304 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.sty40
-rw-r--r--macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.tex862
-rw-r--r--macros/latex/contrib/biblatex-contrib/windycity/windycity.bbx208
-rw-r--r--macros/latex/contrib/biblatex-contrib/windycity/windycity.cbx81
-rw-r--r--macros/latex/contrib/biblatex-contrib/windycity/windycity.dbx3
-rw-r--r--macros/latex/contrib/numspell/numspell-english.sty13
-rw-r--r--macros/latex/contrib/numspell/numspell.pdfbin234703 -> 223145 bytes
-rw-r--r--macros/latex/contrib/numspell/numspell.sty40
-rw-r--r--macros/latex/contrib/numspell/numspell.tex113
-rw-r--r--macros/latex/contrib/swfigure/#README.txt#46
-rw-r--r--macros/latex/contrib/tudscr/README.md34
-rw-r--r--macros/latex/contrib/tudscr/doc/tudscr.pdfbin1096996 -> 1096819 bytes
-rw-r--r--macros/latex/contrib/tudscr/doc/tudscr_print.pdfbin1081461 -> 1081286 bytes
-rw-r--r--macros/latex/contrib/tudscr/doc/tudscrsource.pdfbin1054258 -> 1053122 bytes
-rw-r--r--macros/latex/contrib/tudscr/doc/tutorials/mathswap.pdfbin121115 -> 121115 bytes
-rw-r--r--macros/latex/contrib/tudscr/doc/tutorials/mathtype.pdfbin138034 -> 138034 bytes
-rw-r--r--macros/latex/contrib/tudscr/doc/tutorials/treatise.pdfbin856620 -> 856613 bytes
-rw-r--r--macros/latex/contrib/tudscr/source/doc/sub-tudscr.tex17
-rw-r--r--macros/latex/contrib/tudscr/source/doc/tudscr.tex2
-rw-r--r--macros/latex/contrib/tudscr/source/tudscr-comp.dtx8
-rw-r--r--macros/latex/contrib/tudscr/source/tudscr-localization.dtx364
-rw-r--r--macros/latex/contrib/tudscr/source/tudscr-version.dtx2
-rw-r--r--macros/latex/contrib/univie-ling/README12
-rw-r--r--macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx6
-rw-r--r--macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx2
-rw-r--r--macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdfbin225826 -> 242469 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdfbin329616 -> 331535 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex38
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls2
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls2
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls2
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cfg20
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls92
38 files changed, 1273 insertions, 898 deletions
diff --git a/macros/latex/contrib/biblatex-contrib/windycity/CHANGES.md b/macros/latex/contrib/biblatex-contrib/windycity/CHANGES.md
index 45050c65fc..cf718404ab 100644
--- a/macros/latex/contrib/biblatex-contrib/windycity/CHANGES.md
+++ b/macros/latex/contrib/biblatex-contrib/windycity/CHANGES.md
@@ -8,21 +8,59 @@ indicate updates to Windy City's [repository on
GitHub](https://github.com/brianchase/windycity "GitHub:
brianchase/windycity").
+## 2020-11-10
+
+* added support for updaters, which, like other editorial roles, you
+ can combine with any other role:
+
+ - updated by...
+ - updated and compiled by...
+ - updated and edited by...
+ - updated and revised by...
+ - updated and translated by...
+ - compiled and updated by...
+ - edited and updated by...
+ - revised and updated by...
+ - translated and updated by...
+
+* when editors and translators are the same, and you haven't set the
+ `swaptrans` entry option, the value of the `editortype` field
+ determines which role goes first (example: `transrev` prints
+ "translated and revised by" without needing `swaptrans`)
+* dropped the `anonauth` and `anonqauth` entry options; instead, use
+ the `authortype` field with values `anon` and `anon?`, respectively
+* in addition to anonymous authors, `authortype` can handle some
+ pseudonymous authors with the value `pseudo` (the `nameaddon` field
+ still works for this and, in fact, remains the only way to list a
+ pseudonymous author's given name)
+* added a `nopages` bibliography option to stop automatic printing of
+ the `pages` field on first citations of `@article` and `@review`
+ entries (and their aliases) when the `postnote` is blank
+* added support for the `\fullcite` and `\footfullcite` citation
+ commands
+* new citation commands: `idemcite`, `idemcites`, `footidemcite`,
+ `footidemcites`
+* 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
* better punctuation handling in parenthetical citations, allowing
-examples in *CMOS* 15.24 and 15.30 (17th ed.)
+ examples in *CMOS* 15.24 and 15.30 (17th ed.)
* for `@reference` and `@inreference` entries, added support for
-printing the `organization` field in the author's position of short
-citations, fixing many of them (most of them? it was bad!)
+ printing the `organization` field in the author's position of short
+ citations, fixing many of them (most of them? it was bad!)
* also for `@reference` and `@inreference` entries, allowed the
-`author` field to substitute for `organization` (not recommended but
-could prevent confusion in some cases)
+ `author` field to substitute for `organization` (not recommended but
+ could prevent confusion in some cases)
* fixed `\cites` and `\parencites` for consecutive citations of the
-same author (most seriously affecting parenthetical citations but also
-standard and short citations in different ways)
+ same author (most seriously affecting parenthetical citations but
+ also standard and short citations in different ways)
* fixed parenthetical citations not printing volume numbers for
-certain collections
+ certain collections
## 2020-09-07
@@ -58,7 +96,8 @@ certain collections
types
* fixed `\parencite` failing to print names in `afterwords`,
`forewords`, and `introduction` fields
-* fixed printing `transcomp` and `transed` bibstrings when
+
+* fixed printing `transcomp` and `transed` bibliography strings when
`transcomp+` and `transed+` were needed
## 2019-07-17
diff --git a/macros/latex/contrib/biblatex-contrib/windycity/README.md b/macros/latex/contrib/biblatex-contrib/windycity/README.md
index f4c5df8cab..a2ad25cd12 100644
--- a/macros/latex/contrib/biblatex-contrib/windycity/README.md
+++ b/macros/latex/contrib/biblatex-contrib/windycity/README.md
@@ -34,9 +34,9 @@ you might be able to skip this step.
Windy City consists of four files:
-* [windycity.dbx](https://github.com/brianchase/windycity/blob/master/windycity.dbx "windycity.dbx")
* [windycity.bbx](https://github.com/brianchase/windycity/blob/master/bbx/windycity.bbx "windycity.bbx")
* [windycity.cbx](https://github.com/brianchase/windycity/blob/master/cbx/windycity.cbx "windycity.cbx")
+* [windycity.dbx](https://github.com/brianchase/windycity/blob/master/windycity.dbx "windycity.dbx")
* [american-windycity.lbx](https://github.com/brianchase/windycity/blob/master/lbx/american-windycity.lbx "american-windycity.lbx")
If you need to install Windy City on your system, you have several
diff --git a/macros/latex/contrib/biblatex-contrib/windycity/american-windycity.lbx b/macros/latex/contrib/biblatex-contrib/windycity/american-windycity.lbx
index f04e60e0a9..640202d8c0 100644
--- a/macros/latex/contrib/biblatex-contrib/windycity/american-windycity.lbx
+++ b/macros/latex/contrib/biblatex-contrib/windycity/american-windycity.lbx
@@ -1,4 +1,4 @@
-% Last modified: Tue 29 Sep 2020 06:29:33 PM CDT
+% Last modified: Tue 10 Nov 2020 05:25:31 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/09/29 Windy City
+\ProvidesFile{american-windycity.lbx}[2020/11/10 Windy City
localization module for biblatex]
\InheritBibliographyExtras{american}
\InheritBibliographyStrings{american}
@@ -119,23 +119,26 @@
}
\NewBibliographyString{by}
-\NewBibliographyString{comped,comped+,compiler,compiler+,comprev,comprev+,comptrans,comptrans+}
-\NewBibliographyString{editor+,edcomp,edcomp+,edrev,edrev+,edtrans,edtrans+}
+\NewBibliographyString{comped,comped+,compiler,compiler+,comprev,comprev+,comptrans,comptrans+,compup,compup+}
+\NewBibliographyString{editor+,edcomp,edcomp+,edrev,edrev+,edtrans,edtrans+,edup,edup+}
\NewBibliographyString{expanded}
\NewBibliographyString{noplace}
\NewBibliographyString{of}
\NewBibliographyString{origpub}
\NewBibliographyString{part}
\NewBibliographyString{preface}
+\NewBibliographyString{pseudo}
\NewBibliographyString{reprint,reprinted}
\NewBibliographyString{review,reviewnoauth}
-\NewBibliographyString{revcomp,revcomp+,reved,reved+,reviser,reviser+,revtrans,revtrans+}
+\NewBibliographyString{revcomp,revcomp+,reved,reved+,reviser,reviser+,revtrans,revtrans+,revup,revup+}
\NewBibliographyString{revised}
\NewBibliographyString{selfpub}
\NewBibliographyString{special}
\NewBibliographyString{subverbo,subverbos}
-\NewBibliographyString{transcomp,transcomp+,transed,transed+,translator+,transrev,transrev+}
+\NewBibliographyString{transcomp,transcomp+,transed,transed+,translator+,transrev,transrev+,transup,transup+}
+\NewBibliographyString{upcomp,upcomp+,updater,updater+,uped,uped+,uprev,uprev+,uptrans,uptrans+}
\NewBibliographyString{updated}
+\NewBibliographyString{updater}
\DeclareBibliographyStrings{%
am = {{a\adddot m\adddot}{a\adddot m\adddot}},
@@ -153,6 +156,8 @@
comprev+ = {{compiled and revised by}{comps\adddotspace and revs\adddot}},
comptrans = {{compiled and translated by}{comp\adddotspace and trans\adddot}},
comptrans+ = {{compiled and translated by}{comps\adddotspace and trans\adddot}},
+ compup = {{compiled and updated by}{comp\adddotspace and up\adddot}},
+ compup+ = {{compiled and updated by}{comps\adddotspace and up\adddot}},
edcomp = {{edit\-ed and compiled by}{ed\adddotspace and comp\adddot}},
edcomp+ = {{edit\-ed and compiled by}{eds\adddotspace and comps\adddot}},
edition = {{ed\adddot}{ed\adddot}},
@@ -162,6 +167,8 @@
edrev+ = {{edit\-ed and revised by}{eds\adddotspace and revs\adddot}},
edtrans = {{edit\-ed and translated by}{ed\adddotspace and trans\adddot}},
edtrans+ = {{edit\-ed and translated by}{eds\adddotspace and trans\adddot}},
+ edup = {{edit\-ed and updated by}{ed\adddotspace and up\adddot}},
+ edup+ = {{edit\-ed and updated by}{eds\adddotspace and up\adddot}},
expanded = {{expanded edition}{exp\adddotspace ed\adddot}},
foreword = {{foreword to}{foreword to}},
forthcoming = {{forthcoming}{forthcoming}},
@@ -179,6 +186,7 @@
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}},
references = {{Bibliography}{Bibliography}},
reprint = {{reprint}{repr\adddot}},
reprinted = {{reprinted in}{reprinted in}},
@@ -193,6 +201,8 @@
reviser+ = {{revised by}{revs\adddot}},
revtrans = {{revised and translated by}{rev\adddotspace and trans\adddot}},
revtrans+ = {{revised and translated by}{revs\adddotspace and trans\adddot}},
+ revup = {{revised and updated by}{rev\adddotspace and up\adddot}},
+ revup+ = {{revised and updated by}{revs\adddotspace and up\adddot}},
selfpub = {{Self-published}{self-pub\adddot}},
special = {{special issue}{special issue}},
subverbo = {{s\adddot v\adddot}{s\adddot v\adddot}},
@@ -205,7 +215,19 @@
translator+ = {{translated by}{trans\adddot}},
transrev = {{translated and revised by}{trans\adddotspace and rev\adddot}},
transrev+ = {{translated and revised by}{trans\adddotspace and revs\adddot}},
+ transup = {{translated and updated by}{trans\adddotspace and up\adddot}},
+ transup+ = {{translated and updated by}{trans\adddotspace and up\adddot}},
+ upcomp = {{updated and compiled by}{up\adddotspace and comp\adddot}},
+ upcomp+ = {{updated and compiled by}{up\adddotspace and comps\adddot}},
updated = {{updated edition}{up\adddotspace ed\adddot}},
+ updater = {{updated by}{up\adddot}},
+ updater+ = {{updated by}{up\adddot}},
+ uped = {{updated and edit\-ed by}{up\adddotspace and ed\adddot}},
+ uped+ = {{updated and edit\-ed by}{up\adddotspace and eds\adddot}},
+ uprev = {{updated and revised by}{up\adddotspace and rev\adddot}},
+ uprev+ = {{updated and revised by}{up\adddotspace and revs\adddot}},
+ uptrans = {{updated and translated by}{up\adddotspace and trans\adddot}},
+ uptrans+ = {{updated and translated by}{up\adddotspace and trans\adddot}},
urlseen = {{accessed}{accessed}},
volume = {{vol\adddot}{vol\adddot}},
volumes = {{vols\adddot}{vols\adddot}}
diff --git a/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.bib b/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.bib
index ebbdc03529..9a7b80d5fc 100644
--- a/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.bib
+++ b/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.bib
@@ -287,6 +287,70 @@
pages = {22–69}
}
+% 14.57 Several citations in one note
+
+@Article{sutton1959,
+ author = {Sutton, Walter},
+ title = {The Analysis of Free Verse Form, Illustrated by a Reading of Whitman},
+ journal = {Journal of Aesthetics and Art Criticism},
+ volume = {18},
+ number = {2},
+ date = {1959-12},
+ pages = {241-54}
+}
+@InCollection{fussell1962,
+ author = {Fussell, Paul},
+ title = {Whitman's Curious Warble},
+ subtitle = {Reminiscence and Reconciliation},
+ pages = {28-51},
+ crossref = {lewis1962}
+}
+@Collection{lewis1962,
+ title = {The Presence of Walt Whitman},
+ editor = {Lewis, R. W. B.},
+ address = {New York},
+ publisher = {Columbia University Press},
+ year = {1962},
+}
+@Article{coffman1954,
+ author = {Coffman, S. K.},
+ title = {`Crossing Brooklyn Ferry'},
+ subtitle = {A Note on the Catalog Technique in Whitman's Poetry},
+ journal = {Modern Philology},
+ volume = {51},
+ number = {4},
+ date = {1954-05},
+ pages = {225-32}
+}
+@Article{coffman1955,
+ author = {Coffman, S. K.},
+ title = {Form and Meaning in Whitman's `Passage to India'},
+ journal = {PMLA},
+ volume = {70},
+ number = {3},
+ date = {1955-06},
+ pages = {337-49}
+}
+@Article{rountree1958,
+ author = {Rountree, Thomas I.},
+ title = {Whitman's Indirect Expression and Its Application to `Song of Myself'},
+ journal = {PMLA},
+ volume = {73},
+ number = {5},
+ date = {1958-12},
+ pages = {549-55}
+}
+@Article{lovell1960,
+ author = {Lovell, John},
+ title = {Appreciating Whitman},
+ subtitle = {'Passage to India'},
+ journal = {Modern Language Quarterly},
+ volume = {21},
+ number = {2},
+ date = {1960-06},
+ pages = {131-41}
+}
+
% 14.59 Abbreviations for frequently cited works
@Collection{shurtleff1853,
@@ -455,15 +519,15 @@
year = {1547}
}
@Book{horsley1796,
- options = {anonauth},
author = {Horsley, Samuel},
+ authortype = {anon},
title = {On the Prosodies of the Greek and Latin Languages},
address = {London},
year = {1796}
}
@Book{hawkes1834,
- options = {anonqauth},
author = {Hawkes, James},
+ authortype = {anon?},
title = {A Retrospect of the Boston Tea-Party, with a Memoir of George R. T. Hewes},
note = {by a Citizen of New-York},
address = {New-York},
@@ -475,6 +539,7 @@
@Online{akmuckraker2008,
author = {{AK Muckraker}},
+% authortype = {pseudo},% alternative
nameaddon = {pseud.},
title = {Palin Is Back at Work},
blogtitle = {Mudflats},
diff --git a/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.pdf b/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.pdf
index fe729f964a..82c61cb5a5 100644
--- a/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.pdf
+++ b/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.sty b/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.sty
index 4d9b797722..718c4f6180 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: Sun 19 Jul 2020 11:58:38 AM CDT
+% Last modified: Tue 10 Nov 2020 07:45:15 AM CST
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{windycity}
\RequirePackage{ifxetex}
@@ -21,7 +21,7 @@
ItalicFont=*-italic,
BoldItalicFont=*-bolditalic]{texgyretermes}
\setmonofont[
- Scale=0.96,
+ Scale=0.94,
Numbers=Lining,
Extension=.otf,
UprightFont=*mono10-regular,
@@ -56,7 +56,7 @@
\vskip 4ex%
{\Large\@subtitle}%
\vskip 4ex%
- {\large\@author\par\@website\par\@email\par\@version\par\@date}%
+ {\large\@author\par\@website\par\@email\par\@version}% dropped '\par\@date'
\end{center}%
\vskip 4ex}%
@@ -195,20 +195,21 @@
\csname adddot@#1\endcsname\quad}%
\newcommand*{\adddot@section}{.}%
\renewcommand\thesubsubsection{%
- \normalfont\arabic{subsection}.\@arabic\c@subsubsection}
+ \normalfont\arabic{subsection}.\arabic{subsubsection}}%
-\renewcommand\section{\@startsection{section}{1}{\z@}%
- {-3.5ex \@plus -1ex \@minus -.2ex}%
- {2.3ex \@plus.2ex}%
- {\normalfont\large\bfseries}}
-\renewcommand\subsection{\@startsection{subsection}{2}{\z@}%
- {-3.5ex\@plus -1ex \@minus -.2ex}%
- {1.5ex \@plus .2ex}%
- {\normalfont\bfseries}}%
-\renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}%
- {-4ex\@plus -1ex \@minus -.2ex}%
- {1.5ex \@plus .2ex}%
- {\normalfont\it}}
+\usepackage[clearempty]{titlesec}
+\titleformat{\section}
+ {\large\bfseries}{\thesection.}{2ex}{}
+\titleformat{\subsection}
+ {\normalsize\bfseries}{\thesubsection}{2ex}{}
+\titleformat{\subsubsection}
+ {\normalsize\it}{\thesection.\thesubsubsection}{2ex}{}
+\titlespacing*{\section}
+ {0ex}{3.5ex plus 1ex minus .2ex}{1.5ex plus .2ex}[0ex]
+\titlespacing*{\subsection}
+ {0ex}{3.5ex plus 1ex minus .2ex}{1.5ex plus .2ex}[0ex]
+\titlespacing*{\subsubsection}
+ {0ex}{3.5ex plus 1ex minus .2ex}{1.5ex plus .2ex}[0ex]
\AtBeginEnvironment{quote}{\small}
\AtBeginEnvironment{verbatim}{\small}
@@ -218,14 +219,18 @@
citecolor=,
colorlinks=true,
linkcolor=blue,
- pdfauthor={Brian Michael Chase},
+ pdfauthor={Brian Chase},
pdftitle={Windy City for biblatex},
urlcolor=]{hyperref}
\urlstyle{rm}
+\newcommand{\babel}{%
+ \href{http://www.ctan.org/pkg/babel}{\textcolor{blue}{babel}}\xspace}%
\newcommand{\biblatex}{%
\href{http://www.ctan.org/pkg/biblatex}{\textcolor{blue}{biblatex}}\xspace}%
\newcommand{\BibTeX}{{\rm B\kern-.05em{\sc i\kern-.025em b}\kern-.08em
\TeX}}%
+\newcommand{\polyglossia}{%
+ \href{http://www.ctan.org/pkg/polyglossia}{\textcolor{blue}{polyglossia}}\xspace}%
\emergencystretch=1em
\hyphenation{bib-la-tex Chi-ca-go}
\usepackage{btxdockit}% For \bibfield, \bibtype, \cmd, marglist, optionlist, etc.
@@ -283,5 +288,6 @@
\usepackage{float}% For nonfloating tables
\usepackage[it,small]{caption}% Adjust captions
\gappto{\@floatboxreset}{\centering}% Center floats
+\AtBeginEnvironment{tabular}{\small}% Adjust fonts
\endinput
diff --git a/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.tex b/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.tex
index 6bd738fd12..e69a97ac38 100644
--- a/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.tex
+++ b/macros/latex/contrib/biblatex-contrib/windycity/doc/windycity.tex
@@ -1,14 +1,14 @@
-% Last modified: Tue 29 Sep 2020 05:38:35 PM CDT
+% Last modified: Tue 10 Nov 2020 05:20:31 PM CST
\documentclass[11pt,letterpaper,oneside]{article}
\usepackage{windycity}
\begin{document}
\title{Windy City}
\subtitle{A Chicago Style for \texttt{\biblatex}}
-\author{Brian Michael Chase}
+\author{Brian Chase}
\email{brianmichaelchase@gmail.com}
\website{https://github.com/brianchase/windycity}
-\version{2020-09-29}
+\version{2020-11-10}
\maketitle
\begingroup
\hypersetup{linkcolor=black}
@@ -17,11 +17,11 @@
\section{Introduction}
-\nfootnote{Copyright \textcopyright\ 2014--2020 Brian Michael 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 \url{https://www.latex-project.org/lppl/}.}
+\nfootnote{Copyright \textcopyright\ 2014--2020 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
+\url{https://www.latex-project.org/lppl/}.}
Windy City is a style for \biblatex that formats notes,
bibliographies, parenthetical citations, and reference lists according
@@ -29,9 +29,9 @@ to the 17th edition of \textit{The Chicago Manual of Style}
(\textit{CMOS}).\footnote{\cite{chicago2017}} It accurately handles a
wide range of citations in different formats and includes a set of
options and commands to support special circumstances. It also has
-extensive support for citing and arranging different kinds of editors,
-translators, compilers, and revisers within a single citation. These
-features make Windy City especially suitable for academic work.
+extensive support for citing and arranging different kinds of editors
+and translators within a single citation. These features make Windy
+City especially suitable for academic work.
The following sections assume familiarity with \textit{CMOS} and
\biblatex. Section \ref{overview} gives a brief overview of the
@@ -50,7 +50,7 @@ Windy City requires \biblatex version 3.13 or later.
This section covers basic information about Windy City. If you're
completely new to \biblatex, you should probably glance at its
-documentation. For the impatient, examples in sections \ref{default},
+documentation. For the impatient, examples in sections \ref{standard},
\ref{short}, \ref{notes}, and \ref{paren} might be of more immediate
interest.
@@ -71,9 +71,9 @@ GitHub}.\endgroup
Windy City consists of four files:
\begin{itemize}[before=\small]
-\item \file{windycity.dbx}
\item \file{windycity.bbx}
\item \file{windycity.cbx}
+\item \file{windycity.dbx}
\item \file{american-windycity.lbx}
\end{itemize}
@@ -96,28 +96,28 @@ its style files.
The localization file \file{american-windycity.lbx} is responsible for
Windy City's American-style punctuation and dates and many of the
-bibliography strings that appear in citations, such as \textit{edited
+bibliography strings that print in citations, such as \textit{edited
by}. Windy City loads this file if \biblatex determines that your
-document's language is English---either due to settings in \sty{babel}
-or \sty{polyglossia} or because neither \sty{babel} nor
-\sty{polyglossia} has been loaded. You can prevent Windy City from
-loading \file{american-windycity.lbx} by commenting the following line
-in \file{windycity.bbx}:
+document's language is English---either due to settings in \babel or
+\polyglossia or because neither \babel nor \polyglossia has been
+loaded. You can prevent Windy City from loading
+\file{american-windycity.lbx} by commenting the following line in
+\file{windycity.bbx}:
\begin{verbatim}
\DeclareLanguageMapping{english}{american-windycity}
\end{verbatim}
If you wish to use Windy City with a language other than English, set
-it accordingly with \sty{babel} or \sty{polyglossia} before loading
-\biblatex. Windy City will then try to load
-\file{<language>-windycity.lbx} and, if it's available, use it to
-override any other localization files that were loaded. This allows
-you to make your own localization files for Windy City without needing
-to edit other files. For example, if you load \sty{babel} with option
-\sty{german}, Windy City will try to load \file{german-windycity.lbx}.
-If it's available, it will override any other localization files that
-were loaded, including \biblatex's own \file{german.lbx}.
+it accordingly with \babel or \polyglossia before loading \biblatex.
+Windy City will then try to load \file{<language>-windycity.lbx} and,
+if it's available, use it to override any other localization files
+that were loaded. This allows you to make your own localization files
+for Windy City without needing to edit other files. For example, if
+you load \babel with option \sty{german}, Windy City will try to load
+\file{german-windycity.lbx}. If it's available, it will override any
+other localization files that were loaded, including \biblatex's own
+\file{german.lbx}.
For some entries in your bibliography database, you may need to add
fields or make other adjustments to get the right output. But since
@@ -128,10 +128,10 @@ bibliography database, \file{windycity.bib}, should serve as a guide
for how to manage your input for nearly every circumstance that the
style is meant to handle.
-\subsection{The Default Format}
-\label{default}
+\subsection{Standard Citations}
+\label{standard}
-For a first set of examples, consider a passage from \textit{CMOS}
+For a first set of examples, consider this passage from \textit{CMOS}
\ref{14.30}:
\begin{citeonly}
@@ -143,18 +143,16 @@ For a first set of examples, consider a passage from \textit{CMOS}
\item \cite[189--90]{kaiser1964}
\end{citeonly}
-The output shows Windy City's default format. The first citation of a
-work is similar to its entry in the bibliography. It includes all or
-most of its bibliographic information. Subsequent citations are
-shorter, usually consisting of a short form of the author's name and a
-short form of the work's title.
+A work's first citation is similar to its entry in the bibliography.
+It includes all or most of its bibliographic information. Subsequent
+citations are shorter, usually consisting of a short form of the
+author's name and a short form of the work's title.
Windy City supports variations on this format. For information on
-short forms of citations, including the use of \textit{ibid.}, see
-section \ref{short}. For options to skip parts of citations, change
-the order of editors and translators, and more, see sections
-\ref{preops} and \ref{entryops}. For parenthetical citations, see
-section \ref{paren}.
+short citations, including the use of \textit{ibid.}, see section
+\ref{short}. For options to skip parts of citations, change the order
+of editors and translators, and more, see sections \ref{preamble} and
+\ref{entry}. For parenthetical citations, see section \ref{paren}.
The block below shows Windy City's default bibliography for the
previously cited works:
@@ -163,8 +161,9 @@ previously cited works:
\nocite{kaiser1964,morley1995,schwartz1992}
\end{bibonly}
-\noindent You may also print a bibliography in the author-date format,
-what \textit{CMOS} calls a reference list:
+You may also print a bibliography in the author-date format (what
+\textit{CMOS} calls a reference list). The key difference is the
+placement of the publication date after the author's name:
\begin{refonly}
\nocite{kaiser1964,morley1995,schwartz1992}
@@ -177,7 +176,7 @@ To make \cmd{printbibliography} use the author-date format, load
\usepackage[reflist,style=windycity]{biblatex}
\end{verbatim}
-\noindent Note that \opt{reflist=true} has the same effect:
+\noindent Alternatively:
\begin{verbatim}
\usepackage[reflist=true,style=windycity]{biblatex}
@@ -187,17 +186,17 @@ To use the author-date format on a case-by-case basis, run
\cmd{printbibliography} with an appropriate \opt{env} option. With
Windy City, a so-called ``bib environment'' must set the style's
internal \opt{reflist} toggle to \opt{true}. Windy City's own such
-environment is called \opt{reflist}, which you may use as follows:
+environment is called \opt{reflist}. Use it as follows:
\begin{verbatim}
\printbibliography[env=reflist]
\end{verbatim}
-\noindent Unfortunately, while the \opt{env} option allows for
-differently formatted bibliographies within the same document, the
-reference lists may have problems with sorting. (You'll notice some in
-\ref{ref}, at the end of this document.) For best results, use the
-\opt{reflist} preamble option.
+Unfortunately, while the \opt{env} option allows for differently
+formatted bibliographies within the same document, the reference lists
+may have problems with sorting. (You'll notice some in \ref{ref}, at
+the end of this document.) For best results, use the \opt{reflist}
+preamble option.
As you proceed through the this guide, note that all examples of
citations and bibliographies are outputs of the style from commands
@@ -206,75 +205,81 @@ and in its style file, \file{windycity.sty}. Almost all citations are
from \cmd{cite} or \cmd{parencite}. A few are from more specialized
commands, such as \cmd{cite*} or \cmd{cites}. All example
bibliographies are outputs of the style from \cmd{printbibliography}.
-All bibliographic data resides in \file{windycity.bib}.
+All bibliographic data reside in \file{windycity.bib}.
\subsection{Short Citations}
\label{short}
-Aside from the author-date format, \textit{CMOS} offers scant
-documentation of alternative formats. Nevertheless, there are
-alternatives. Consider this example from \textit{CMOS}
-\ref{14.34}:\footnote{Switching formats within a document isn't a
-feature of the style. For demonstration purposes, though, it's
-possible.}
+Standard citations may take a variety of shorter forms. Windy City
+offers several preamble options and other means for reproducing them.
+
+Let's start with another passage of default output:
\begin{citeonly}
-\AtNextCitekey{\toggletrue{short}\toggletrue{firstshort}}
\item \cite[3]{morrison2004a}
-\AtNextCitekey{\toggletrue{short}}
\item \cite[18]{morrison2004a}
-\AtNextCitekey{\toggletrue{short}}
\item \cite[18]{morrison2004a}
-\AtNextCitekey{\toggletrue{short}}
\item \cite[24--26]{morrison2004a}
-\AtNextCitekey{\toggletrue{short}\toggletrue{firstshort}}
\item \cite[401-2]{morrison2004b}
-\AtNextCitekey{\toggletrue{short}}
\item \cite[433]{morrison2004b}
-\AtNextCitekey{\toggletrue{short}\toggletrue{firstshort}}
\item \cite[37--38]{diaz2008}
-\AtNextCitekey{\toggletrue{short}}
\item \cite[403]{morrison2004b}
-\AtNextCitekey{\toggletrue{short}}
\item \cite[152]{diaz2008}
-\AtNextCitekey{\toggletrue{short}}
\item \cite[201-2]{diaz2008}
-\AtNextMultiCite{\toggletrue{short}}
\item \cites[240]{morrison2004b}[32]{morrison2004a}
-\AtNextCitekey{\toggletrue{short}}
\item \cite[33]{morrison2004a}
\end{citeonly}
-\noindent Compare that with the style's default output:
+A shorter form of this passage appears in \textit{CMOS}
+\ref{14.34}:\footnote{Switching forms within a document isn't a
+feature of the style. For demonstration purposes, though, it's
+possible.}
+
+% The use of 'firstshort' 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}}
\item \cite[3]{morrison2004a}
+\AtNextCitekey{\toggletrue{short}}
\item \cite[18]{morrison2004a}
+\AtNextCitekey{\toggletrue{short}}
\item \cite[18]{morrison2004a}
+\AtNextCitekey{\toggletrue{short}}
\item \cite[24--26]{morrison2004a}
+\AtNextCitekey{\toggletrue{short}\toggletrue{firstshort}}
\item \cite[401-2]{morrison2004b}
+\AtNextCitekey{\toggletrue{short}}
\item \cite[433]{morrison2004b}
+\AtNextCitekey{\toggletrue{short}\toggletrue{firstshort}}
\item \cite[37--38]{diaz2008}
+\AtNextCitekey{\toggletrue{short}}
\item \cite[403]{morrison2004b}
+\AtNextCitekey{\toggletrue{short}}
\item \cite[152]{diaz2008}
+\AtNextCitekey{\toggletrue{short}}
\item \cite[201-2]{diaz2008}
+\AtNextMultiCite{\toggletrue{short}}
\item \cites[240]{morrison2004b}[32]{morrison2004a}
+\AtNextCitekey{\toggletrue{short}}
\item \cite[33]{morrison2004a}
\end{citeonly}
-\noindent In the short format, a work's first citation gives short
-names and titles and omits all other publication information.
-Consecutive citations of a work may omit the title or, as in the
-eleventh note, where the title is the key mark of distinction, the
-author's name. To use this format, start \biblatex with the preamble
-option \opt{short}. See section \ref{preops} for more information.
-
-\textit{CMOS} \ref{14.34} also shows how to render the passage above
-with \textit{ibid.} Unlike previous editions of \textit{CMOS}, the
-17th edition discourages its use. As such, \textit{ibid.} is no longer
-part of Windy City's default format. Enable it with the preamble
-option \opt{ibid} (again, see section \ref{preops}). Options
-\opt{short} and \opt{ibid} together give the following:
+In this version, a work's first citation gives short names and titles
+and omits all other publication information. Consecutive citations of
+a work may omit the title or, as in the eleventh note, the author's
+name. For citations in this form, use the preamble option \opt{short}.
+See section \ref{preamble} for more information.
+
+\textit{CMOS} \ref{14.34} also shows how to render the passage with
+\textit{ibid.} Unlike previous editions of \textit{CMOS}, the 17th
+edition discourages its use. Windy City makes it available with the
+preamble option \opt{ibid} (see section \ref{preamble}). Options
+\opt{short} and \opt{ibid} together give the following:\footnote{As
+explained in section \ref{preamble}, Windy City won't print
+\textit{ibid.} in reference to a citation on a previous page. A page
+break here may affect the output.}
\begin{citeonly}
\AtNextCitekey{\toggletrue{short}\toggletrue{firstshort}\toggletrue{ibid}}
@@ -303,19 +308,20 @@ option \opt{ibid} (again, see section \ref{preops}). Options
\item \cite[33]{morrison2004a}
\end{citeonly}
-Other ways to make citations more concise: In the default format, you
-can use the preamble option \opt{firstshort} to swap long first
-citations for short ones (see section \ref{preops}). Also in the
-default format, you can use the preamble option \opt{idemtracker} to
-shorten the author's name in the first citation if the previous
-citation is of the same author (see section \ref{preops}). The entry
-option \opt{noauth} omits the author's name altogether (see section
-\ref{entryops}). And the \bibfield{shorthand} field allows you to set
-an abbreviation to stand in place of the author's name, the work's
-title, and other elements of a citation (see \ref{14.59}).
+Other ways to make citations more concise: For a compromise between
+standard and short forms, try the preamble option \opt{firstshort}.
+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
+work's first citation if the previous citation is of the same author
+(see section \ref{preamble}). The entry option \opt{noauth} omits the
+author's name altogether (see section \ref{entry}). And the
+\bibfield{shorthand} field allows you to set an abbreviation to stand
+in place of the author's name, the work's title, and other elements of
+a citation (see sections \ref{otherfields} and \ref{14.59}).
\subsection{Preamble Options}
-\label{preops}
+\label{preamble}
A preamble option is an argument for the \cmd{usepackage} macro that
loads \biblatex. Preamble options affect the format of notes,
@@ -338,12 +344,12 @@ set in \file{windycity.bbx}. In particular, the style sets
\opt{idemtracker} to \opt{false}. If you set it to \opt{true} (or to
some value that implies \opt{true}), Windy City will detect when the
first citation of a work follows another citation of a work by the
-same author and print a short form of the author's name. Recall from
-the previous section the citation of Toni Morrison's \textit{Song of
-Solomon} immediately after a citation of her \textit{Beloved}. In a
-context like that, do you really need to remind readers of the
-author's full name? If you think not, change \opt{idemtracker} to an
-appropriate value (see section 3.1.2.3 of \biblatex's user
+same author and shorten the author's name. Recall from the previous
+section the citation of Toni Morrison's \textit{Song of Solomon}
+immediately after a citation of her \textit{Beloved}. In a context
+like that, do you really need to remind readers of the author's full
+name? If you think not, change \opt{idemtracker} to an appropriate
+value (see section 3.1.2.3 of \biblatex's user
guide).\footnote{\textit{CMOS} seems to have no policy on this point.
In the 16th edition, however, Figure 14.3 shows consecutive citations
of works by the same author, both of which give the author's full
@@ -354,7 +360,7 @@ name.}
\optitem[false]{annotate}{\opt{true}, \opt{false}}
\noindent This option is for printing annotated bibliographies.
-Annotations will print in block paragraphs below entries. To change
+Annotations print in block paragraphs below entries. To change
the spacing between entries and annotations, change the value of
\cmd{bibitemsep}. Save an annotation in the \bibfield{annotation}
field of a work's bibliography database entry.
@@ -372,7 +378,7 @@ collections. For discussion of multivolume works, see section
\optitem[false]{firstshort}{\opt{true}, \opt{false}}
\noindent Use this option to shorten a work's first citation. The
-resulting format consists mainly of the author's name and the work's
+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
@@ -387,7 +393,7 @@ same page'' means that \textit{ibid.} always refers to a work cited on
the current page without an \textit{ibid.} The latter isn't a
requirement of \textit{CMOS} but seems reasonable, since it prevents
readers from having to look at another page to find the referent of an
-\textit{ibid.} For examples of its output, see section \ref{short} and
+\textit{ibid}. For examples of its output, see section \ref{short} and
\ref{14.34}. As of the 17th edition, \textit{CMOS} discourages the use
of \textit{ibid.} (see \ref{14.34}).
@@ -395,20 +401,22 @@ of \textit{ibid.} (see \ref{14.34}).
\noindent Use this option to print ISBNs in bibliographies. A work's
ISBN goes in the \bibfield{isbn} field of its bibliography database
-entry. With this option, the style will print ISBNs at the end of
-every entry in the bibliography, before annotations. To print the ISBN
-of a particular work, use the \opt{isbn} entry option. Neither option
-effects the output of entries without an \bibfield{isbn} field.
+entry. With this option, the style prints ISBNs at the end of every
+entry in the bibliography, before annotations. To print the ISBN of a
+particular work, use the \opt{isbn} entry option.
+
+\optitem[false]{issn}{\opt{true}, \opt{false}}
+
+\noindent Similar to \opt{isbn} but for ISSNs.
\optitem[false]{library}{\opt{true}, \opt{false}}
-\noindent Like \opt{isbn}, this option prints the \bibfield{library}
-field of every work in the bibliography. Use it to print information
-about libraries, call numbers, and the like. If you use it with the
-\opt{isbn} and \opt{annotation} options, it will print after the
-former but before the latter. To print this information for selected
-works, use the \opt{library} entry option. Neither option effects the
-output of entries without a \bibfield{library} field.
+\noindent Like \opt{isbn} and \opt{issn}, this option prints the
+\bibfield{library} field of every work in the bibliography. Use it to
+print information about libraries, call numbers, and the like. If you
+use it with the \opt{isbn} and \opt{annotation} options, it prints
+after the former but before the latter. To print this information for
+selected works, use the \opt{library} entry option.
\optitem[false]{nolos}{\opt{true}, \opt{false}}
@@ -418,10 +426,19 @@ avoid duplication with the output of \cmd{printshorthands}, use
\opt{nolos}. Since \opt{collsonly} also excludes works from the
bibliography, their results may overlap.
+\optitem[false]{nopages}{\opt{true}, \opt{false}}
+
+\noindent On the first citation of \bibtype{article} or
+\bibtype{review} entries (and their aliases), Windy City prints the
+\bibfield{pages} field if the \bibfield{postnote} field is blank. This
+lets you cite the entirety of a work without having to duplicate the
+content of the \bibfield{pages} field in the \bibfield{postnote}. To
+override this feature, use the \opt{nopages} option.
+
\optitem[false]{reflist}{\opt{true}, \opt{false}}
\noindent Use this option to print a bibliography in the author-date
-format, what \textit{CMOS} calls a reference list. If you use
+format (what \textit{CMOS} calls a reference list). If you use
parenthetical citations, consider using \opt{reflist} to maintain
consistency with \textit{CMOS}. Again, another way to print a
reference list is to pass \opt{env=reflist} to
@@ -430,23 +447,21 @@ information.
\optitem[false]{short}{\opt{true}, \opt{false}}
-\noindent As shown in section \ref{short}, this option prints
-citations in a short format (see \textit{CMOS} \ref{14.34}). The use
-of \opt{short} has one feature in common with \opt{ibid}: Just as
-\textit{ibid.} appears only for consecutive citations of a work on the
-same page, and so never refers to a citation on a previous page,
-\opt{short} drops the title from consecutive citations of a work on
-the same page, never in reference to a citation on a previous page. As
-with \textit{ibid.}, this feature isn't required by \textit{CMOS}, but
-it prevents readers from having to look at another page to find the
-title of a citation.
+\noindent As shown in section \ref{short}, this option prints short
+citations (see \textit{CMOS} \ref{14.34}). The use of \opt{short} has
+one feature in common with \opt{ibid}: Just as \textit{ibid.} appears
+only for consecutive citations of a work on the same page, and so
+never refers to a citation on a previous page, \opt{short} affects
+consecutive citations of a work on the same page, never in reference
+to a citation on a previous page. As with \textit{ibid.}, this feature
+isn't required by \textit{CMOS}, but it prevents readers from having
+to look at another page to find the title of a citation.
In contexts where \opt{short} would drop a title from a citation, but
-where no name occupies the author's position, it will print the work's
+where no name occupies the author's position, it prints the work's
\bibfield{labeltitle}. This can be a short form of the title, either
-the title minus the subtitle or the \bibfield{shorttitle}, if
-applicable. In those situations, the short format is no different from
-the default.
+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
@@ -463,41 +478,26 @@ For more information, see section \ref{collorder}.
\end{optionlist}
\subsection{Entry Options}
-\label{entryops}
+\label{entry}
An entry option is a value for the \bibfield{options} field of a
work's database entry. It affects the format of that particular work.
For options that affect the format of every work, see section
-\ref{preops}.
+\ref{preamble}.
\begin{optionlist}
-\optitem[false]{anonauth}{\opt{true}, \opt{false}}
-
-\noindent This option prints the author's name of an anonymously
-published work in brackets, as in this example from \textit{CMOS}
-\ref{14.79}:
-
-\begin{citebib}
-\item \cite{horsley1796}
-\end{citebib}
-
-\optitem[false]{anonqauth}{\opt{true}, \opt{false}}
-
-\noindent Like \opt{anonauth} but adds a question mark after the
-author's name. From \textit{CMOS} \ref{14.79}:
-
-\begin{citebib}
-\item \cite{hawkes1834}
-\end{citebib}
-
\optitem[false]{isbn}{\opt{true}, \opt{false}}
\noindent Use this option to print the ISBN of a particular work in a
-bibliography. The ISBN will appear at the end of the work's entry (if
+bibliography. The ISBN appears at the end of the work's entry (if
applicable, before an annotation). To print ISBNs of every work in the
bibliography, see the \bibfield{isbn} preamble option.
+\optitem[false]{issn}{\opt{true}, \opt{false}}
+
+\noindent Similar to \opt{isbn} but for ISSNs.
+
\optitem[false]{library}{\opt{true}, \opt{false}}
\noindent This option prints the \bibfield{library} field of a work's
@@ -556,8 +556,8 @@ the option \bibfield{swaptrans} reverse this order: Their translators
print first. If a work's translators and editors are the same,
\bibfield{swaptrans} reverses the order of their roles, say, from
\textit{edited and translated by} to \textit{translated and edited
-by}. The same goes for compilers and revisers, which the style treats
-as specialized editors. For more information, see section
+by}. The same goes for compilers, revisers, and updaters, which the
+style treats as specialized editors. For more information, see section
\ref{edtranspos}.
\optitem[false]{swapvol}{\opt{true}, \opt{false}}
@@ -572,29 +572,51 @@ section \ref{collorder}.
\end{optionlist}
\subsection{Citation Commands}
-\label{citecmds}
Windy City supports most of the citation commands familiar from
-\biblatex:
+\biblatex, plus a small set of custom commands for tricky situations.
+
+\subsubsection{Standard Citation Commands}
+\label{std.cmd}
+
+The following list, though not exhaustive, shows the most important
+citation commands from \biblatex that Windy City supports:
\begin{ltxsyntax}
\cmditem{autocite}[prenote][postnote]{key}
\cmditem{autocites}(multiprenote)(multipostnote)[prenote][postnote]{key}|...|[prenote][postnote]{key}
\cmditem{cite}[prenote][postnote]{key}
+\cmditem{cite*}[prenote][postnote]{key}
\cmditem{cites}(multiprenote)(multipostnote)[prenote][postnote]{key}|...|[prenote][postnote]{key}
+\cmditem{cites*}(multiprenote)(multipostnote)[prenote][postnote]{key}|...|[prenote][postnote]{key}
\cmditem{footcite}[prenote][postnote]{key}
+\cmditem{footcite*}[prenote][postnote]{key}
\cmditem{footcites}(multiprenote)(multipostnote)[prenote][postnote]{key}|...|[prenote][postnote]{key}
-\cmditem{nocite}{key} \cmditem*{nocite}|\{*\}|
+\cmditem{footcites*}(multiprenote)(multipostnote)[prenote][postnote]{key}|...|[prenote][postnote]{key}
+\cmditem{footfullcite}[prenote][postnote]{key}
+\cmditem{footfullcite*}[prenote][postnote]{key}
+\cmditem{fullcite}[prenote][postnote]{key}
+\cmditem{fullcite*}[prenote][postnote]{key}
+\cmditem{nocite}{key}
+\cmditem*{nocite}|\{*\}|
\cmditem{parencite}[prenote][postnote]{key}
+\cmditem{parencite*}[prenote][postnote]{key}
\cmditem{parencites}(multiprenote)(multipostnote)[prenote][postnote]{key}|...|[prenote][postnote]{key}
\cmditem{smartcite}[prenote][postnote]{key}
+\cmditem{smartcite*}[prenote][postnote]{key}
\cmditem{smartcites}(multiprenote)(multipostnote)[prenote][postnote]{key}|...|[prenote][postnote]{key}
+\cmditem{smartcites*}(multiprenote)(multipostnote)[prenote][postnote]{key}|...|[prenote][postnote]{key}
+\cmditem{textcite}[prenote][postnote]{key}
+\cmditem{textcites}(multiprenote)(multipostnote)[prenote][postnote]{key}|...|[prenote][postnote]{key}
+\cmditem{textcites*}(multiprenote)(multipostnote)[prenote][postnote]{key}|...|[prenote][postnote]{key}
\end{ltxsyntax}
-\noindent New users should get comfortable first with \cmd{cite} and
+\noindent New users should get comfortable with \cmd{cite} and
\cmd{footcite} (for notes) and \cmd{parencite} (for parenthetical
citations). Their multicite forms---\cmd{cites}, \cmd{footcites}, and
-\cmd{parencites}---take a comma-separated list of entry keys.
+\cmd{parencites}---take comma-separated lists of entry keys, while
+allowing you to specify distinct \bibfield{prenote} and
+\bibfield{postnote} fields for each work.
Use \cmd{nocite} to add works to bibliographies even if you haven't
cited them in the text with citations commands. Use it with an
@@ -612,8 +634,6 @@ set the \opt{autocite} preamble option to \opt{inline}, \cmd{autocite}
is equivalent to \cmd{parencite}. If you set it to \opt{plain},
\cmd{autocite} is equivalent to \cmd{cite}.
-Other citation commands:
-
\begin{ltxsyntax}
\cmditem{cite*}[prenote][postnote]{key}
@@ -627,14 +647,6 @@ author's name clear. From \textit{CMOS} \ref{14.78}:
\item \cite*[234]{franklin1868}
\end{citebib}
-\cmditem{cites*}[prenote][postnote]{key}
-
-Like \cmd{cites} but suppresses the author's position.
-
-\cmditem{footcite*}[prenote][postnote]{key}
-
-Like \cmd{footcite} but suppresses the author's position.
-
\cmditem{parencite*}[prenote][postnote]{key}
Like \cmd{parencite} but suppresses the author's position---useful in
@@ -655,23 +667,15 @@ The source for the passage above contains:
\parencite*{abramowitz2005}... \end{quote}
\end{verbatim}
-\cmditem{smartcite*}[prenote][postnote]{key}
-
-Like \cmd{smartcite} but suppresses the author's position.
-
-\cmditem{smartcites*}[prenote][postnote]{key}
-
-Like \cmd{smartcites} but suppresses the author's position.
-
\cmditem{textcite}[prenote][postnote]{key}
-Use \cmd{textcite} for in-text citations in the standard format.
-Here's an example from \textit{CMOS} 13.65:
+Use \cmd{textcite} for in-text citations. Here's an example from
+\textit{CMOS} 13.65:
\begin{quote} ``If an astronaut falls into a black hole, its mass will
increase, but eventually the energy equivalent of that extra mass will
be returned to the universe in the form of radiation. Thus, in a
-sense, the astronaut will be {`recycled'}''
+sense, the astronaut will be `recycled'''
\mkbibparens{\textcite[112]{hawking1988}}. \end{quote}
The source for the passage above contains:
@@ -704,16 +708,72 @@ The source for the passage above contains:
...\parencite[xvii]{tocqueville1999}. \end{quote}
\end{verbatim}
-\cmditem{textcites}(multiprenote)(multipostnote)[prenote][postnote]{key}|...|[prenote][postnote]{key}
-
-Like \cmd{textcite} but for multiple sources.
+\end{ltxsyntax}
-\cmditem{textcites*}(multiprenote)(multipostnote)[prenote][postnote]{key}|...|[prenote][postnote]{key}
+\subsubsection{Other Citation Commands}
+\label{cust.cmd}
-Like \cmd{textcites} but suppresses the author's position.
+Windy City's custom citation commands are convenient but not strictly
+necessary. They make certain citations simpler than they would be with
+standard commands.
+\begin{ltxsyntax}
+\cmditem{idemcite}[prenote][postnote]{key}
+\cmditem{idemcites}(multiprenote)(multipostnote)[prenote][postnote]{key}|...|[prenote][postnote]{key}
+\cmditem{footidemcite}[prenote][postnote]{key}
+\cmditem{footidemcites}(multiprenote)(multipostnote)[prenote][postnote]{key}|...|[prenote][postnote]{key}
\end{ltxsyntax}
+Perhaps the best use case for these commands is the example in
+\textit{CMOS} \ref{14.57}. The sources mentioned in a passage receive
+long citations with shortened names:
+
+\begin{quote} Only when we gather the work of several
+scholars---Walter Sutton's explications of some of Whitman's shorter
+poems; Paul Fussell's careful study of structure in ``Cradle''; S. K.
+Coffman's close readings of ``Crossing Brooklyn Ferry'' and ``Passage
+to India''; and the attempts of Thomas I. Rountree and John Lovell,
+dealing with ``Song of Myself'' and ``Passage to India,''
+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}
+\item \idemcites{sutton1959,fussell1962,coffman1954,coffman1955,rountree1958}[and][]{lovell1960}
+\end{citeonly}
+
+Without commands like \cmd{idemcite}, there's often no easy way to
+tell Windy City to shorten names. The preamble option
+\opt{idemtracker} helps with consecutive citations of the same author,
+but that's no use when you want to shorten names because you've
+mentioned them in the text.
+
+Nevertheless, standard commands can reproduce the example in at least
+three ways:
+
+\begin{verbatim}
+ \footnote{\cites*[Sutton,][]{sutton1959}[Fussell,][]{fussell1962}...
+ \footcites*[Sutton,][]{sutton1959}[Fussell,][]{fussell1962}...
+ \footnote{Sutton, \cite*{sutton1959}; Fussell, \cite*{fussell1962}...
+\end{verbatim}
+
+\noindent They're ugly workarounds, exploiting starred citations
+commands to suppress the author's position while you add names
+manually---but they do work.
+
+With \cmd{idemcites} and \cmd{footidemcites}, on the other hand, you
+have simpler alternatives that make your intentions clearer and your
+file easier to read:
+
+\begin{verbatim}
+ \footnote{\idemcites{sutton1959,fussell1962,...}[and][]{lovell1960}}
+ \footidemcites{sutton1959,fussell1962,...}[and][]{lovell1960}
+ \footnote{\idemcite{sutton1959}; ... and \idemcite{lovell1960}}
+\end{verbatim}
+
+Notice that the only reason to use \cmd{footidemcites} rather than
+\cmd{footidemcite} is to insert \textit{and} before the last citation.
+
\subsection{Entry Types}
\label{entrytypes}
@@ -766,8 +826,8 @@ City processes it as a book.
One comment about \bibtype{reference} and \bibtype{inreference}
entries: You may cross-reference \bibtype{inreference} entries to
\bibtype{reference} entries, as with articles in books, but you can
-get the same output using one or the other type alone. Take an example
-from \textit{CMOS} \ref{14.232}:
+get the same output with one or the other alone. Take an example from
+\textit{CMOS} \ref{14.232}:
\begin{citeonly}
\item \cite{salvation1980}
@@ -806,9 +866,8 @@ either type with the same data:
For unusually complicated citations, or those just not supported by
the style, consider using the \bibtype{misc} entry type. The style
-formats these entries with a small number of fields but in way that
-makes it a fallback for almost anything. The example below is from
-\textit{CMOS} 14.264:
+handles these entries in way that makes it a fallback for almost
+anything. The example below is from \textit{CMOS} 14.264:
\begin{citebib}
\item \cite{roosevelt1959}
@@ -861,8 +920,8 @@ from printing \textit{n.d.} (no date) after the name to indicate a
missing publication date. After adding the \bibtype{misc} entries, use
\cmd{nocite} with their entry keys to add them to your bibliography,
and cite the remaining entries as usual. For examples of automatic
-cross-referencing in notes and bibliographies see section \ref{notes},
-\ref{14.108}; section \ref{paren}, \ref{15.42}; and section
+cross-referencing in notes and bibliographies see section \ref{notes}
+(\ref{14.108}), section \ref{paren} (\ref{15.42}), and section
\ref{collections}.
For more discussion of entry types, see section \ref{datafields}.
@@ -874,56 +933,29 @@ Windy City relies on a small number of data fields that aren't
recognized by \BibTeX\ or \biblatex. It also uses some standard ones
in perhaps unexpected ways.
-\subsubsection{Additional Data Fields}
-\label{datafields}
+\subsubsection{Standard Data Fields}
+\label{stdfields}
-Some of Windy City's nonstandard data fields are for its internal
-handling of cross-referencing. Those fields aren't listed below, as
-they're not meant for use in a bibliography database. The rest store
-information that's crucial for correct formatting. Without them, quite
-a few citations in this document wouldn't match their counterparts in
-\textit{CMOS}.
+Examples in this document don't always make it clear how Windy City
+uses standard data fields. The section discusses some of them.
\begin{marglist}
-\item[\smash{\tshortstack[l]{blogtitle\\blogsubtitle}}] The name of a
-blog goes in \bibfield{blogtitle} and \bibfield{blogsubtitle}. Keep in
-mind that blog posts take the usual \bibfield{title} and
-\bibfield{subtitle} fields.
-
-\item[editoraddon] Use this field to include additional editorial
-information about a book. It's available for \bibtype{book},
-\bibtype{incollection}, and \bibfield{review} entry types and their
-aliases. (For information on aliases in Windy City, see section
-\ref{entrytypes}.) When applicable, its content appears after the
-names of a book's editors and translators without intervening
-punctuation. For an example, see section \ref{entryops}, where the
-citation of \textit{Chaucer Life-Records} prints this
-\bibfield{editoraddon}: ``from materials compiled by John M. Manly and
-Edith Richert, with the assistance of Lilian J. Redstone et al.''
-
-\item[seriesaddon] This field is for additional information about a
-book's series. That includes information about the run of a series,
-such as \textit{2nd ser.} and \textit{n.s.} For examples, see
-\textit{CMOS} \ref{14.123} and \ref{14.126}. Keep in mind that, for
-journals, which occasionally have a series but no series name,
-information like \textit{2nd ser.} and \textit{n.s.} go in the
-\bibfield{series} field.
-
-\item[shortmaintitle] This field is for the short form of a
-\bibfield{maintitle}. This should only be necessary for certain works
-in collections. See the citation of \textit{The Complete Tales of
-Henry James} in section \ref{multivolume}.
-
-\end{marglist}
-
-\subsubsection{Other Data Fields}
-\label{fieldscon}
+\item[authtype] This field takes three values: \textit{anon} (to print
+an anonymous author's name in brackets), \textit{anon?} (to add a
+question mark inside the brackets), and \textit{pseudo} (to print
+\textit{pseud.} in brackets after the name of a pseudonymous author).
+From \textit{CMOS} \ref{14.79}:
-Examples in this document don't always make it clear how Windy City
-uses standard data fields. The list below discusses some of them.
+\begin{citebib}
+\item \cite{horsley1796}
+\item \cite{hawkes1834}
+\end{citebib}
-\begin{marglist}
+With respect to pseudonymous authors, another solution is to use the
+\bibfield{nameaddon} field. Unlike with \bibfield{authtype},
+\bibfield{nameaddon} allows you to include an author's given name in
+the brackets. For examples, see \textit{CMOS} \ref{14.81}.
\item[edition] To indicate a numbered edition of a work, put the
edition's number in this field---for example, \textit{2} for a second
@@ -931,7 +963,7 @@ edition. To indicate a revised edition, enter either \textit{revised}
or \textit{rev. ed.} Both options give the same output. For expanded
and updated editions, you may use \textit{expanded} or
\textit{updated}. Add additional data as necessary. For the following
-example from \textit{CMOS} Bibliography 2.4, \bibfield{edition}
+example from \textit{CMOS} bibliography 2.4, \bibfield{edition}
contains \textit{updated edition by Arlene O'Sean and Antoinette
Schleyer}:
@@ -972,9 +1004,21 @@ use the \bibfield{issue} field. In other words, for \textit{Fall
\noindent Remember that when \bibfield{date} contains just a year of
publication, you may use the classic \bibfield{year} field.
-\item[series] See the comments for \bibfield{seriesaddon} in section
+\item[pages] See comments on the \opt{nopages} bibliography
+option in section \ref{preamble}.
+
+\item[series] See comments on \bibfield{seriesaddon} in section
\ref{datafields}.
+\item[titleaddon] Like \bibfield{nameaddon}, this field encloses its
+content in brackets. This is especially useful for translated titles.
+From \textit{CMOS} \ref{14.99}:
+
+\begin{citebib}
+\item \cite{wereszycki1977}; includes a summary in German.
+\item \cite{pirumova1977b}
+\end{citebib}
+
\item[type] With the \bibtype{thesis} entry type, Windy City uses
\bibfield{type} to distinguish a Master's thesis from a PhD
dissertation. For the latter, \bibtype{type} should have the value
@@ -997,7 +1041,63 @@ Beattie in \ref{14.171}.
\end{marglist}
-\section{Editors, Translators, Compilers, and Revisers}
+\subsubsection{Other Data Fields}
+\label{otherfields}
+
+Some of Windy City's nonstandard data fields are for its internal
+handling of cross-referencing. Those fields aren't listed below, as
+they're not meant for use in a bibliography database. The rest store
+information that's crucial for correct formatting. Without them, quite
+a few citations in this document wouldn't match their counterparts in
+\textit{CMOS}.
+
+\begin{marglist}
+
+\item[\smash{\tshortstack[l]{blogtitle\\blogsubtitle}}] The name of a
+blog goes in \bibfield{blogtitle} and \bibfield{blogsubtitle}. Keep in
+mind that blog posts take the usual \bibfield{title} and
+\bibfield{subtitle} fields.
+
+\item[editoraddon] Use this field to include additional editorial
+information about a book. It's available for \bibtype{book},
+\bibtype{incollection}, and \bibfield{review} entry types and their
+aliases. (For information on aliases in Windy City, see section
+\ref{entrytypes}.) When applicable, its content appears after a book's
+editors and translators without intervening punctuation. For an
+example, see section \ref{entry}, where the citation of
+\textit{Chaucer Life-Records} prints: ``from materials compiled by
+John M. Manly and Edith Richert, with the assistance of Lilian J.
+Redstone et al.''
+
+\item[seriesaddon] This field is for additional information about a
+book's series. That includes information about the run of a series,
+such as \textit{2nd ser.} and \textit{n.s.} For examples, see
+\textit{CMOS} \ref{14.123} and \ref{14.126}. Keep in mind that, for
+journals, which occasionally have a series but no series name,
+information like \textit{2nd ser.} and \textit{n.s.} go in the
+\bibfield{series} field.
+
+\item[shorthand] Windy City doesn't automatically italicize a
+\bibfield{shorthand}. Per \textit{CMOS} 14.60, a shorthand should be
+italicized if the title that it abbreviates is italicized. Set it the
+bibliography database with \cmd{emph} or \cmd{mkbibemph}. For examples
+of a \bibfield{shorthand}, see section \ref{14.59} and the first
+citation of \textit{CMOS} in this document's introduction.
+
+\item[shorthandintro] You may override the default announcement of a
+\bibfield{shorthand} by adding your preferred content to
+\bibfield{shorthandintro}. For an example, see the first citation of
+\textit{CMOS} in this document's introduction, where the announcement
+is a separate sentence, rather than in parentheses.
+
+\item[shortmaintitle] This field contains the short form of a
+\bibfield{maintitle}. It should only be necessary for certain works in
+collections. See the citation of \textit{The Complete Tales of Henry
+James} in section \ref{multivolume}.
+
+\end{marglist}
+
+\section{Editors, Translators, and Friends}
\label{edtrans}
Windy City offers significant control over the handling of editors,
@@ -1104,10 +1204,11 @@ scope of the \bibtype{incollection} entry:
scope of \bibtype{collection}, the style associates it with
\textit{The Renaissance Philosophy of Man}.
-The style supports two other basic editorial roles: compiler and
-reviser. To assign them, you need to use the \bibfield{editortype}
-field. It may help to see the bibliography database entries for
-examples in \textit{CMOS} \ref{14.103} and \ref{14.142}:
+The style supports three more basic editorial roles: compiler,
+reviser, and updater. To assign them, you need to use the
+\bibfield{editortype} field. It may help to see the bibliography
+database entries for examples in \textit{CMOS} \ref{14.103} and
+\ref{14.142}:
\begin{verbatim}
@Book{schechter2011,
@@ -1139,70 +1240,60 @@ examples in \textit{CMOS} \ref{14.103} and \ref{14.142}:
\item \cite{turabian2013}
\end{citebib}
-In addition to the four basic roles (editor, translator, compiler, and
-reviser), you may assign names to any pair of them. A work's editor,
-for example, can also be its translator, or compiler, or reviser---but
-no more than one of these. And just as you can swap the order of the
-editor and translator roles (again, see section \ref{edtranspos}), you
-can swap all other combinations, say, to identify a work as
-\textit{compiled and edited by} Jane Doe rather than \textit{edited
-and compiled by} her. Simply change the value of
+In addition to the five basic roles (editor, translator, compiler,
+reviser, and updater), you may assign names to any pair of them. A
+work's editor, for example, can also be its translator, compiler,
+reviser, or updater---but no more than one of these. And just as you
+can swap the order of the editor and translator roles (again, see
+section \ref{edtranspos}), you can swap all other combinations, say,
+to identify a work as \textit{compiled and edited by} Jane Doe rather
+than \textit{edited and compiled by} her. Simply change the value of
\bibfield{editortype}. A summary of these values appears in Table
\ref{table:ed}.
\begin{table}[H]
-\begin{tabular}{@{}r l@{}}
-\bibfield{editortype} & Assignment\\
+\begin{tabular}{@{}r l r l@{}}
+\bibfield{editortype} & Assignment & \bibfield{editortype} & Assignment\\
\toprule
-compiler & compiler\\
-comped & compiler and editor\\
-comprev & compiler and reviser\\
-comptrans & compiler and translator\\
-edcomp & editor and compiler\\
-edrev & editor and reviser\\
-reviser & reviser\\
-revcomp & reviser and compiler\\
-reved & reviser and editor\\
-revtrans & reviser and translator\\
-transcomp & translator and compiler\\
-transrev & translator and reviser\\
+compiler & compiler & reviser & reviser\\
+comped & compiler and editor & revcomp & reviser and compiler\\
+comprev & compiler and reviser & reved & reviser and editor\\
+comptrans & compiler and translator & revtrans & reviser and translator\\
+compup & compiler and updater & revup & reviser and updater\\
+edcomp & editor and compiler & edrev & editor and reviser\\
+transcomp & translator and compiler & transrev & translator and reviser\\
+\midrule
+updater & updater & uptrans & updater and translator\\
+upcomp & updater and compiler & edup & editor and updater\\
+uped & updater and editor & transup & translator and updater\\
+uprev & updater and reviser & &\\
\end{tabular}
-\caption{} \label{table:ed}
+\caption{}\label{table:ed}
\end{table}
-For an example in \textit{CMOS}, we need turn the bibliography. This
-will do:
-
-\begin{verbatim}
- @Book{fowler1965,
- author = {Fowler, H. W.},
- title = {A Dictionary of Modern English Usage},
- edition = {2},
- editor = {Gowers, Sir Ernest},
- editortype = {reved},
- address = {Oxford},
- publisher = {Oxford University Press},
- year = {1965}
- }
-\end{verbatim}
+For examples in \textit{CMOS}, we need to turn to the bibliography.
+The first one below shows the output of \textit{reved} in the
+\bibfield{editortype} field, the second of \textit{revup}.
\begin{citebib}
\item \cite{fowler1965}
+\item \cite{gowers2015}
\end{citebib}
-Try swapping \textit{reved} in the entry above for other values in
-Table \ref{table:ed}. Notice that \textit{edrev} is the reverse of
-\textit{reved}---``edited and revised by'' instead of ``revised and
-edited by.'' Similarly for \textit{comprev} and \textit{revcomp},
-\textit{comptrans} and \textit{transcomp}, and so on.
+% Try swapping the editor type in the entries above for other values
+% in Table \ref{table:ed}. Note that \textit{edrev} is the reverse of
+% \textit{reved}---\textit{edited and revised by} instead of
+% \textit{revised and edited by}. So, too, for \textit{comprev} and
+% \textit{revcomp}, \textit{comptrans} and \textit{transcomp}, and so
+% on.
-Missing from the table are \textit{editor}, \textit{translator},
-\textit{edtrans}, and \textit{transed}. Windy City has bibstrings for
-them, too, but they're strictly for the style's internal use. It
-determines which of them applies, if any, based on the contents of the
-\bibfield{editor} and \bibfield{translator} fields and the option
-\opt{swaptrans}. You never need to use them in a bibliography
-database.
+Missing from Table \ref{table:ed} are \textit{editor},
+\textit{translator}, \textit{edtrans}, and \textit{transed}. Windy
+City has bibliography strings for them, too, but they're meant for the
+style's internal use. It determines which of them applies, if any,
+based on the contents of the \bibfield{editor} and
+\bibfield{translator} fields and the option \opt{swaptrans}. You never
+need to use them in a bibliography database.
Three more values of \bibfield{editortype} allow you to assign editors
to higher level titles: \textit{maintitle}, \textit{series}, and
@@ -1228,13 +1319,13 @@ to higher level titles: \textit{maintitle}, \textit{series}, and
\end{citebib}
\noindent If there were no \bibfield{editortype} assigning the editor
-to the series, Windy City would take her as the book's editor. In
-short, for a title's compilers and revisers and for any title at a
+to the series, the output would list a book's editor. In short, for a
+title's compilers, revisers, and updaters and for any title at a
higher level than \bibfield{title}, you need to use
\bibfield{editortype}. Combined with Windy City's support for citing
articles, chapters, books, and other works within books, this scheme
allows for several sets of editors per work, although it does limit
-you to just one set of compilers and revisers.
+you to just one set of compilers, revisers, and updaters.
What about translators? Unless a work's bibliography database entry
has a \bibfield{translatortype} field with the value
@@ -1317,12 +1408,16 @@ translated by}. Reverse them with \opt{swaptrans}. From \textit{CMOS}
\item \cite{menchu1999}
\end{citebib}
-Since Windy City treats a compiler as a kind of editor, the comments
-above apply to compilers: If a work has compilers and translators,
-compilers' names will print first, unless you use \opt{swaptrans}.
+To make switching roles easier in these cases, you may also use the
+relevant \bibfield{editortype} field with a bibliography string from
+Table \ref{table:ed}. After all, for compilers, revisers, and
+updaters, you need to put a value in \bibfield{editortype} anyway. So,
+if you pick one that begins with \textit{trans} (\textit{transcomp},
+\textit{transed}, \textit{transrev}, or \textit{transup}), Windy City
+will assume that the translator's role goes first.
-In rare cases, you may want to swap the position of an author and an
-editor or translator. \textit{CMOS} \ref{14.104} gives an example:
+On rare occasions, you may want to swap the position of an author and
+an editor or translator. \textit{CMOS} \ref{14.104} gives an example:
\begin{citebib}
\item \cite{pound1953}
@@ -1387,11 +1482,11 @@ priority, the collection's or the volume's. Consider an example from
\end{citebib}
\noindent The editor and title of the volume precede the editor and
-title of the collection. In notes and bibliographies in the default
-format, \textit{CMOS} gives you the option of reversing this order.
-(See especially \textit{CMOS} \ref{14.119}, \ref{14.121}, and
-\ref{14.122}, and compare \ref{14.144} and \ref{15.41}.) Windy City
-does as well, with the entry or preamble option \opt{swapvol}.
+title of the collection. In standard notes and bibliographies,
+\textit{CMOS} gives you the option of reversing this order. (See
+especially \textit{CMOS} \ref{14.119}, \ref{14.121}, and \ref{14.122},
+and compare \ref{14.144} and \ref{15.41}.) Windy City does as well,
+with the entry or preamble option \opt{swapvol}.
\begin{citebib}
\AtNextCitekey{\toggletrue{swapvol}}
@@ -1419,8 +1514,8 @@ below, the volume has priority:
\end{citeonly}
Notice the volume number in the second note above, separated from the
-page citation by a colon. When the collection has priority, the volume
-number should appear in the citation. There are enough examples in
+page by a colon. When the collection has priority, the volume number
+should appear in the citation. There are enough examples in
\textit{CMOS} to make that clear. But when the volume has priority,
the volume number is at best optional but probably incorrect. (It
could cause confusion, since the collection is what comes in volumes,
@@ -1439,10 +1534,10 @@ option. A good candidate for the latter is this example from
\item \cite*{james1963.5}
\end{citebib}
-\noindent The volume's title merely indicates a portion of the
-collection, somewhat like the volume of an encyclopedia with the title
-\textit{D–F}. There's nothing wrong with putting it first. But putting
-it second seems more intuitive.
+\noindent The volume's title (\textit{1883--1884}) merely indicates a
+portion of the collection, somewhat like the volume of an encyclopedia
+with the title \textit{D–F}. There's nothing wrong with putting it
+first. But putting it second seems more intuitive.
For other works, \opt{swapvol} may seem like a poor choice, even if
the output is formally correct:
@@ -1458,7 +1553,7 @@ the volume's title looks odd. But it's not wrong. The volume's author
didn't write every volume of the collection. In giving priority to the
collection, then, the first position, where an author's name normally
goes, should go to the collection's editor, not to the volume's
-author. By contrast, the default format looks more familiar:
+author. By contrast, the default output looks more familiar:
\begin{citebib}
\item \cite{barrows1959}
@@ -1476,7 +1571,7 @@ This drawback shouldn't affect \bibfield{bookinbook},
entries when they're cross-referenced to works that are changed by
\opt{swapvol}. They should have their own authors or titles that Windy
City can use for proper sorting. It seems that \textit{CMOS} gives
-exactly such example one in \ref{14.120}:
+exactly one such example in \ref{14.120}:
\begin{citebib}
\item \cite[169--71]{king2014}
@@ -1617,13 +1712,13 @@ Certain entries cross-referenced to entries that work with
\bibfield{armstrong2014} or \bibfield{carson2014}. The only difference
is that, with \opt{swapvol}, cross-referencing to
\bibfield{carson2014} once more gives the wrong publication date for
-the collection. With many other collections, this wouldn't be an
-issue. Convenience, then, is perhaps the only consideration in
-choosing how you do it. If you plan to cite more than one volume of a
-collection, and different works in those volumes or the collection as
-a whole, cross-referencing to \bibtype{bookinbook} or \bibtype{inbook}
-entries is probably simpler. The other way is simpler if you plan to
-cite just one work in one volume.
+the collection. With many collections, this wouldn't be an issue.
+Convenience, then, is perhaps the only consideration in choosing how
+you do it. If you plan to cite more than one volume of a collection,
+and different works in those volumes or the collection as a whole,
+cross-referencing to \bibtype{bookinbook} or \bibtype{inbook} entries
+is probably simpler. The other way is simpler if you plan to cite just
+one work in one volume.
As mentioned in \textit{CMOS} \ref{15.41}, reference lists should give
priority to the volume, not to the collection. Nevertheless, Windy
@@ -1692,7 +1787,7 @@ James}, only the second citation follows this pattern. In the first,
the volume number appears earlier, after the editor's name. Why?
Apparently, \textit{The Lisle Letters} count as a single, multivolume
work because every volume has the same title and publication date. Not
-so \textit{The Complete Tales of Henry James}, in which volumes have
+so \textit{The Complete Tales of Henry James}. Its volumes have
different titles and publication dates.
To get the right output, your bibliography database and citations need
@@ -1735,10 +1830,10 @@ the appropriate abbreviations (for some examples, see \textit{CMOS}
What if the \bibfield{postnote} is empty? Windy City assumes that you
mean to cite the collection as a whole. As such, the first, long
-citation of the work will print the collection's total number of
-volumes. Subsequent entries will indicate the collection in whatever
-short form corresponds to the preamble options. The following shows
-the default output for two such citations of the collection:
+citation of the work prints the collection's total number of volumes.
+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}
\item \cite{byrne1981}
@@ -1855,15 +1950,14 @@ accordingly:
\bibfield{spinoza1900.1.1}, Windy City would assume that \textit{A
Theological-Political Treatise} is volume one of \textit{The Chief
Works of Benedict de Spinoza}. The same error would occur if you put
-all the data for the citation into, say, a \bibfield{collection}
-entry. Windy City would associate \bibfield{volume} with
-\bibfield{title}, not with \bibfield{maintitle}. The upshot is that
-correctly citing a work like this requires cross-referencing an
-\bibtype{inbook} or \bibtype{bookinbook} entry to a
-\bibtype{collection}, \bibtype{book}, \bibtype{mvbook}, or
-\bibtype{mvcollection} entry. (Again, the alternatives give the same
-output.) Only then would Windy City associate \bibfield{volume} with
-the right \bibfield{title}.
+all the data for the citation into a \bibfield{collection} entry.
+Windy City would associate \bibfield{volume} with \bibfield{title},
+not with \bibfield{maintitle}. The upshot is that correctly citing a
+work like this requires cross-referencing an \bibtype{inbook} or
+\bibtype{bookinbook} entry to a \bibtype{collection}, \bibtype{book},
+\bibtype{mvbook}, or \bibtype{mvcollection} entry. (Again, the
+alternatives give the same output.) Only then would Windy City
+associate \bibfield{volume} with the right \bibfield{title}.
\section{Examples from \emph{CMOS} Chap. 14, ``Notes and
Bibliography''}
@@ -1873,6 +1967,7 @@ Examples in this section reproduce those in \textit{CMOS} chapter 14.
To help with cross-checking, subsection numbers and headings are from
\textit{CMOS}.
+\titleformat{\subsubsection}{\normalsize\it}{\arabic{subsection}.\arabic{subsubsection}}{2ex}{}
\subsection{Basic Format, with Examples and Variations}
\setcounter{subsection}{14}
@@ -1921,8 +2016,8 @@ To help with cross-checking, subsection numbers and headings are from
% 14.34:
\label{14.34}
-See section \ref{short} for a discussion of how to enable the short
-format and the use of \textit{ibid.} First, the short format:
+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}}
@@ -1950,7 +2045,7 @@ format and the use of \textit{ibid.} First, the short format:
\AtNextCitekey{\toggletrue{short}} \item \cite[33]{morrison2004a}
\end{citeonly}
-\noindent With \textit{ibid.}:
+\noindent With options \opt{short} and \opt{ibid}:
\begin{citeonly}
\AtNextCitekey{\toggletrue{short}\toggletrue{firstshort}\toggletrue{ibid}}
@@ -1989,20 +2084,33 @@ format and the use of \textit{ibid.} First, the short format:
Chicago. All rights reserved. Reprinted by permission]{manet1992}
\end{citebib}
+\setcounter{subsubsection}{56}
+\subsubsection{Several citations in one note}
+% 14.57 Several citations in one note
+\label{14.57}
+
+See \ref{cust.cmd} for information on how to reproduce this example.
+
+\begin{quote} Only when we gather the work of several
+scholars---Walter Sutton's explications of some of Whitman's shorter
+poems; Paul Fussell's careful study of structure in ``Cradle''; S. K.
+Coffman's close readings of ``Crossing Brooklyn Ferry'' and ``Passage
+to India''; and the attempts of Thomas I. Rountree and John Lovell,
+dealing with ``Song of Myself'' and ``Passage to India,''
+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}
+\item \idemcites{sutton1959,fussell1962,coffman1954,coffman1955,rountree1958}[and][]{lovell1960}
+\end{citeonly}
+
\setcounter{subsubsection}{58}
\subsubsection{Abbreviations for frequently cited works}
% 14.59 Abbreviations for frequently cited works
\label{14.59}
-You may override the default announcement of a \bibfield{shorthand} by
-adding your preferred content to \bibfield{shorthandintro}. For an
-example, one that prints the announcement in a separate sentence, see
-the first citation of \textit{CMOS} in this document's introduction.
-
-Note that Windy City doesn't automatically italicize a
-\bibfield{shorthand}. Per \textit{CMOS} 14.60, a shorthand should be
-italicized if the title that it abbreviates is also italicized. Set
-this in the bibliography database with \cmd{emph} or \cmd{mkbibemph}.
+For information on shorthands, see section \ref{otherfields}.
\begin{citebib}
% There's no way to suppress these fields in the bibliography:
@@ -2019,6 +2127,11 @@ this in the bibliography database with \cmd{emph} or \cmd{mkbibemph}.
\subsubsection{The 3-em dash for one repeated name}
% 14.68 The 3-em dash for one repeated name
+A 3-em dash replaces names in the author's position of a citation in
+consecutive citations on the same page. Thus, whether the example
+below exactly reproduces that in \textit{CMOS} 14.68 depends in part
+on whether a page break falls somewhere within the list.
+
\begin{bibonly}
\nocite{judt1996,judt2008,judt1989,squire1983,squire1987}
\end{bibonly}
@@ -2065,6 +2178,8 @@ this in the bibliography database with \cmd{emph} or \cmd{mkbibemph}.
% 14.78 Author's name in title
\label{14.78}
+On the use of starred citation commands, see section \ref{std.cmd}.
+
\begin{citebib}
\item \cite*[233]{franklin1868}
\item \cite*[234]{franklin1868}
@@ -2074,8 +2189,8 @@ this in the bibliography database with \cmd{emph} or \cmd{mkbibemph}.
% 14.79 No listed author (anonymous works)
\label{14.79}
-See section \ref{entryops} on the \opt{anonauth} and \opt{anonauthq}
-entry options.
+See section \ref{stdfields} on the use of the \bibfield{authtype}
+field for anonymous works.
\begin{citebib}
\item \cite{anon1610}
@@ -2097,10 +2212,9 @@ entry options.
% 14.81 Cross-references for pseudonyms
\label{14.81}
-For information on how to add entries that cross-references others,
-like several of those below, see section \ref{entrytypes}. For
-examples of automatic cross-referencing in a bibliography, see
-\ref{14.108} and \ref{15.42}.
+For information on how to add entries that cross-reference others, see
+section \ref{entrytypes}. For examples of automatic cross-referencing
+in a bibliography, see \ref{14.108} and \ref{15.42}.
\begin{bibonly}
\nocite{ashe,creasey1976,creasey1978,creasey1966,morton,york}
@@ -2204,6 +2318,7 @@ database.
\setcounter{subsubsection}{98}
\subsubsection{Translated titles of cited works}
% 14.99 Translated titles of cited works
+\label{14.99}
\begin{citebib}
\item \cite{wereszycki1977}; includes a summary in German.
@@ -2429,15 +2544,15 @@ For a discussion of how to handle these types of works, see section
% 14.120 Chapters and other parts of individual volumes
\label{14.120}
-There are some peculiarities with the first example. In the book, but
-not online, \textit{CMOS} errs in printing `.ed' rather than `editeb
-by' in the bibliography and neglects to invert the author's name. More
-worrisome are the striking differences between the note and
-bibliography. They may represent alternative ways of formatting the
-data, as other examples do. But the note seems inconsistent with
-\textit{CMOS} \ref{14.118}, and so doesn't make much sense as an
-alternative. Windy City ignores it and in both cases follows the
-example of the bibliography.
+There are some peculiarities with the first example. In the printed
+edition, but not online, \textit{CMOS} errs in having \textit{.ed}
+rather than \textit{edited by} in the bibliography and neglects to
+invert the author's name. More worrisome are the striking differences
+between the note and bibliography. They may represent alternative ways
+of formatting the data, as other examples do. But the note seems
+inconsistent with \textit{CMOS} \ref{14.118}, and so doesn't make much
+sense as an alternative. Windy City ignores it and in both cases
+follows the example of the bibliography.
\begin{citebib}
\item \cite[180]{chen2010.3}
@@ -2705,7 +2820,7 @@ the surname twice. Also, for Wilder's article, Windy City prints
has it. To print the correct season, Wilder's entry in the
bibliography database includes \textit{Fall} in the \bibfield{issue}
field. Using the \bibfield{date} field with \textit{2013-23} would
-give \textit{Autumn 2013}.
+print \textit{Autumn 2013}.
\begin{citebib}
\item \cite[155]{lock2015}
@@ -2759,9 +2874,9 @@ give \textit{Autumn 2013}.
\subsubsection{Articles published in installments}
% 14.180 Articles published in installments
-By default, Windy City will print each installment as a separate
-entry. To get the format for the series, you'd need to use the
-\bibtype{misc} entry type.
+By default, Windy City prints each installment as a separate entry. To
+get the format for the series, you'd need to use the \bibtype{misc}
+entry type.
\begin{citebib}
\item \cite[312]{brown1978}
@@ -2893,7 +3008,7 @@ entry. To get the format for the series, you'd need to use the
\label{14.204}
On the use of the \bibfield{type} field to format this example
-correctly, see section \ref{fieldscon}.
+correctly, see section \ref{stdfields}.
\begin{citebib}
\item \cite{zeitung1828}
@@ -2910,7 +3025,7 @@ correctly, see section \ref{fieldscon}.
In \textit{CMOS}, one citation refers to \textit{The Chronicle of
Higher Education} and another to \textit{Chronicle of Higher
-Education}. The latter appears in \ref{15.51}, so it's probably
+Education}. The latter also appears in \ref{15.51}, so it's probably
correct.
\begin{citebib}
@@ -3184,8 +3299,8 @@ midst. \end{citeref}
\subsubsection{Author-date format for anonymous works (no listed author)}
% 15.34 Author-date format for anonymous works (no listed author)
-See section \ref{entryops} on the \opt{anonauth} and \opt{anonauthq}
-entry options.
+See section \ref{stdfields} on the use of the \bibfield{authtype}
+field for anonymous works.
\begin{citeref}
\item \parencite{anon1610}
@@ -3212,8 +3327,9 @@ entry options.
\subsubsection{Organization as author in author-date references}
% 15.37 Organization as author in author-date references
-In the reference list, \textit{CMOS} errs in printing `:1997' after
-`ISO 4'. Compare it with the nearly identical example in \ref{14.84}.
+In the reference list, \textit{CMOS} errs in printing \textit{:1997}
+after \textit{ISO 4}. Compare it with the nearly identical example in
+\ref{14.84}.
\begin{citeref}
\item \parencite{iso1997.ref}
@@ -3340,7 +3456,7 @@ from the February 1931 issue of \textit{Poetry} magazine
with the argument \opt{shorthand}. Running \cmd{printshorthands}
produces the same output. By default, works in this list also appear
in bibliographies. To exclude them, use the preamble option
-\opt{nolos}. See section \ref{preops} for more information.\\}%
+\opt{nolos}. See section \ref{preamble} for more information.\\}%
\defbibnote{bib}{This section shows the default output of
\cmd{printbibliography}. The next section shows the author-date
@@ -3348,7 +3464,7 @@ format.\\}%
\defbibnote{ref}{This section shows the output of
\cmd{printbibliography} in the author-date format. For information on
-how to produce this output, see section \ref{preops}. Issues with
+how to produce this output, see section \ref{preamble}. Issues with
sorting in this section are mentioned there. Creating a reference list
in the preferred way, with the \opt{reflist} preamble option, should
prevent those issues.\\}%
diff --git a/macros/latex/contrib/biblatex-contrib/windycity/windycity.bbx b/macros/latex/contrib/biblatex-contrib/windycity/windycity.bbx
index 29bc593ddd..9bf9170ab8 100644
--- a/macros/latex/contrib/biblatex-contrib/windycity/windycity.bbx
+++ b/macros/latex/contrib/biblatex-contrib/windycity/windycity.bbx
@@ -1,4 +1,4 @@
-% Last modified: Tue 29 Sep 2020 06:28:58 PM CDT
+% Last modified: Tue 10 Nov 2020 05:24:28 PM CST
% Permission is granted to copy, distribute and/or modify this
% software under the terms of the LaTeX Project Public License (LPPL),
@@ -11,7 +11,7 @@
% implied warranties of merchantability and fitness for a particular
% purpose.
-\ProvidesFile{windycity.bbx}[2020/09/29 Windy City bibliography style
+\ProvidesFile{windycity.bbx}[2020/11/10 Windy City bibliography style
for biblatex]
\@ifpackagelater{biblatex}{2019/08/17}
{}
@@ -26,20 +26,6 @@
%% Bibliography and Entry Options %%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\providetoggle{anonauth}
-\DeclareBiblatexOption{entry}[boolean]{anonauth}[true]{%
- \ifstrequal{#1}{true}
- {\renewcommand*{\anona}{\bibopenbracket}%
- \renewcommand*{\anonb}{\bibclosebracket}}%
- {}}
-
-\providetoggle{anonqauth}
-\DeclareBiblatexOption{entry}[boolean]{anonqauth}[true]{%
- \ifstrequal{#1}{true}
- {\renewcommand*{\anona}{\bibopenbracket}%
- \renewcommand*{\anonb}{\addquestion\bibclosebracket}}%
- {}}
-
\providetoggle{annotate}
\DeclareBiblatexOption{global}[boolean]{annotate}[true]{%
\settoggle{annotate}{#1}}%
@@ -66,6 +52,10 @@
\DeclareBiblatexOption{entry,global}[boolean]{isbn}[true]{%
\settoggle{isbn}{#1}}%
+\providetoggle{issn}
+\DeclareBiblatexOption{entry,global}[boolean]{isnn}[true]{%
+ \settoggle{issn}{#1}}%
+
\providetoggle{library}
\DeclareBiblatexOption{entry,global}[boolean]{library}[true]{%
\settoggle{library}{#1}}%
@@ -83,6 +73,10 @@
{\AtBeginBibliography{\blx@key@bibcheck{nolos}}}
{}}
+\providetoggle{nopages}
+\DeclareBiblatexOption{global}[boolean]{nopages}[true]{%
+ \settoggle{nopages}{#1}}%
+
\providetoggle{reflist}
\DeclareBiblatexOption{global}[boolean]{reflist}[true]{%
\ifstrequal{#1}{true}
@@ -133,7 +127,6 @@
dateabbrev=false,
dateusetime=true,
ibidtracker=constrict,
-% Just one use of '\ifciteidem'. See note in windycity.cbx.
idemtracker=false,
indexing=true,
labeldateparts=true,
@@ -281,6 +274,7 @@
\DefaultInheritance[\except{*}{review}{all=false}]{all=true,override=false}
\DeclareDataInheritance{*}{incollection,inbook,letter,review}{%
\inherit{author}{bookauthor}
+ \inherit{authortype}{bookauthortype}
\inherit{shortauthor}{shortbookauthor}
\inherit{editor}{editora}
\inherit{editora}{editorb}
@@ -321,9 +315,9 @@
\noinherit{sortkey}
\noinherit{xref}}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Other Basic Settings %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Other Basic Settings %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\let\cbx@bibstring\empty
\let\cbx@deflabel\empty
@@ -347,6 +341,7 @@
\providetoggle{cbx:collection}
\providetoggle{cbx:first}
+\providetoggle{cbx:idem}
\providetoggle{cbx:short}
\providetoggle{collection}
@@ -614,9 +609,9 @@
\DeclareBibliographyAlias{*}{book}
-%%%%%%%%%%%%%%%%%%%%%%%%
-%% Author's Position %%
-%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Author's Position %%
+%%%%%%%%%%%%%%%%%%%%%%%%%
\renewcommand*{\revsdnamedelim}{%
\iftoggle{bibliography}
@@ -628,7 +623,7 @@
{\usebibmacro{authpos+deflabel}}%
{\usebibmacro{author+bookauthor}%
\ifnameundef{\cbx@namelist}
- {\usebibmacro{edtransuthpos}%
+ {\usebibmacro{edtrans:authpos}%
\ifnameundef{\cbx@namelist}
{\toggletrue{noauth}%
\usebibmacro{authpos+deflabel}%
@@ -659,13 +654,31 @@
\ifboolexpr{ test {\ifnameundef{shortauthor}}
or togl {bibliography}}
{\renewcommand*{\cbx@namelist}{author}}%
- {\renewcommand*{\cbx@namelist}{shortauthor}}}
+ {\renewcommand*{\cbx@namelist}{shortauthor}}%
+ \usebibmacro{author+bookauthor+type}}%
\newbibmacro*{bookauthor+namelist}{%
\ifboolexpr{ test {\ifnameundef{shortbookauthor}}
or togl {bibliography}}
{\renewcommand*{\cbx@namelist}{bookauthor}}%
- {\renewcommand*{\cbx@namelist}{shortbookauthor}}}
+ {\renewcommand*{\cbx@namelist}{shortbookauthor}}%
+ \usebibmacro{author+bookauthor+type}}%
+
+% See notes for 'handle' and 'nameaddon'.
+
+\newbibmacro*{author+bookauthor+type}{%
+ \iffieldundef{\cbx@namelist type}
+ {}
+ {\iffieldequalstr{\cbx@namelist type}{anon}
+ {\renewcommand*{\anona}{\bibopenbracket}%
+ \renewcommand*{\anonb}{\bibclosebracket}}%
+ {\iffieldequalstr{\cbx@namelist type}{anon?}
+ {\renewcommand*{\anona}{\bibopenbracket}%
+ \renewcommand*{\anonb}{\addquestion\bibclosebracket}}%
+ {\ifboolexpr{ test {\iffieldequalstr{\cbx@namelist type}{pseudo}}
+ and not togl {cbx:short}}
+ {\renewcommand*{\anonb}{\space\mkbibbrackets{\bibstring{pseudo}}}}
+ {}}}}}
% When 'journaltitle' goes in the author's position.
@@ -735,7 +748,7 @@
% For editors and translators in the author's position.
-\newbibmacro*{edtransuthpos}{%
+\newbibmacro*{edtrans:authpos}{%
\togglefalse{noed}%
\togglefalse{notrans}%
\usebibmacro{test:ed:authpos}%
@@ -842,55 +855,90 @@
\renewcommand*{\cbx@namelist}{\yeditor}%
\ifnamesequal{\xeditor}{\yeditor}
{\clearname{\xeditor}%
- \ifboolexpr{ test {\iffieldequalstr{\xeditor type}{compiler}}
- or test {\iffieldequalstr{\xeditor type}{comped}}
- or test {\iffieldequalstr{\xeditor type}{comprev}}
- or test {\iffieldequalstr{\xeditor type}{comptrans}}
+ \ifboolexpr{ test {\iffieldstart{editortype}{c}}
or test {\iffieldequalstr{\xeditor type}{transcomp}}}
{\renewcommand*{\cbx@bibstring}{transcomp}}%
- {\ifboolexpr{ test {\iffieldequalstr{\xeditor type}{reviser}}
- or test {\iffieldequalstr{\xeditor type}{revcomp}}
- or test {\iffieldequalstr{\xeditor type}{reved}}
- or test {\iffieldequalstr{\xeditor type}{revtrans}}
+ {\ifboolexpr{ test {\iffieldstart{\xeditor type}{r}}
or test {\iffieldequalstr{\xeditor type}{transrev}}}
{\renewcommand*{\cbx@bibstring}{transrev}}%
- {\renewcommand*{\cbx@bibstring}{transed}}}}
+ {\ifboolexpr{ test {\iffieldstart{\xeditor type}{u}}
+ or test {\iffieldequalstr{\xeditor type}{transup}}}
+ {\renewcommand*{\cbx@bibstring}{transup}}%
+ {\renewcommand*{\cbx@bibstring}{transed}}}}}
{\renewcommand*{\cbx@bibstring}{translator}}}
\newbibmacro*{edcombos}{%
\renewcommand*{\cbx@namelist}{\xeditor}%
\ifnamesequal{\xeditor}{\yeditor}
{\clearname{\yeditor}%
- \ifboolexpr{ test {\iffieldequalstr{\xeditor type}{compiler}}
- or test {\iffieldequalstr{\xeditor type}{comped}}
- or test {\iffieldequalstr{\xeditor type}{comprev}}
- or test {\iffieldequalstr{\xeditor type}{comptrans}}
- or test {\iffieldequalstr{\xeditor type}{transcomp}}}
- {\renewcommand*{\cbx@bibstring}{comptrans}}%
- {\ifboolexpr{ test {\iffieldequalstr{\xeditor type}{reviser}}
- or test {\iffieldequalstr{\xeditor type}{revcomp}}
- or test {\iffieldequalstr{\xeditor type}{reved}}
- or test {\iffieldequalstr{\xeditor type}{revtrans}}
- or test {\iffieldequalstr{\xeditor type}{transrev}}}
- {\renewcommand*{\cbx@bibstring}{revtrans}}%
- {\renewcommand*{\cbx@bibstring}{edtrans}}}}
- {\iffieldequalstr{\xeditor type}{compiler}
- {\renewcommand*{\cbx@bibstring}{compiler}}%
- {\iffieldequalstr{\xeditor type}{reviser}
- {\renewcommand*{\cbx@bibstring}{reviser}}%
+ \usebibmacro{edcombos:trans}}%
+ {\usebibmacro{edcombos:notrans}}}
+
+\newbibmacro*{edcombos:trans}{%
+ \iffieldstart{\xeditor type}{c}
+ {\renewcommand*{\cbx@bibstring}{comptrans}}%
+ {\iffieldstart{\xeditor type}{r}
+ {\renewcommand*{\cbx@bibstring}{revtrans}}%
+ {\iffieldstart{\xeditor type}{u}
+ {\renewcommand*{\cbx@bibstring}{uptrans}}%
+ {\iffieldequalstr{\xeditor type}{transcomp}
+ {\renewcommand*{\cbx@bibstring}{transcomp}}%
+ {\iffieldequalstr{\xeditor type}{transed}
+ {\renewcommand*{\cbx@bibstring}{transed}}%
+ {\iffieldequalstr{\xeditor type}{transrev}
+ {\renewcommand*{\cbx@bibstring}{transrev}}%
+ {\iffieldequalstr{\xeditor type}{transup}
+ {\renewcommand*{\cbx@bibstring}{transup}}%
+ {\renewcommand*{\cbx@bibstring}{edtrans}}}}}}}}}
+
+\newbibmacro*{edcombos:notrans}{%
+ \iffieldequalstr{\xeditor type}{compiler}
+ {\renewcommand*{\cbx@bibstring}{compiler}}%
+ {\iffieldequalstr{\xeditor type}{reviser}
+ {\renewcommand*{\cbx@bibstring}{reviser}}%
+ {\iffieldequalstr{\xeditor type}{updater}
+ {\renewcommand*{\cbx@bibstring}{updater}}%
{\iffieldequalstr{\xeditor type}{comped}
{\renewcommand*{\cbx@bibstring}{comped}}%
{\iffieldequalstr{\xeditor type}{comprev}
{\renewcommand*{\cbx@bibstring}{comprev}}%
- {\iffieldequalstr{\xeditor type}{edcomp}
- {\renewcommand*{\cbx@bibstring}{edcomp}}%
- {\iffieldequalstr{\xeditor type}{edrev}
- {\renewcommand*{\cbx@bibstring}{edrev}}%
- {\iffieldequalstr{\xeditor type}{revcomp}
- {\renewcommand*{\cbx@bibstring}{revcomp}}%
- {\iffieldequalstr{\xeditor type}{reved}
- {\renewcommand*{\cbx@bibstring}{reved}}%
- {\renewcommand*{\cbx@bibstring}{editor}}}}}}}}}}}
+ {\iffieldequalstr{\xeditor type}{compup}
+ {\renewcommand*{\cbx@bibstring}{compup}}%
+ {\iffieldequalstr{\xeditor type}{edcomp}
+ {\renewcommand*{\cbx@bibstring}{edcomp}}%
+ {\iffieldequalstr{\xeditor type}{edrev}
+ {\renewcommand*{\cbx@bibstring}{edrev}}%
+ {\iffieldequalstr{\xeditor type}{edup}
+ {\renewcommand*{\cbx@bibstring}{edup}}%
+ {\iffieldequalstr{\xeditor type}{revcomp}
+ {\renewcommand*{\cbx@bibstring}{revcomp}}%
+ {\iffieldequalstr{\xeditor type}{reved}
+ {\renewcommand*{\cbx@bibstring}{reved}}%
+ {\iffieldequalstr{\xeditor type}{revup}
+ {\renewcommand*{\cbx@bibstring}{revup}}%
+ {\iffieldequalstr{\xeditor type}{upcomp}
+ {\renewcommand*{\cbx@bibstring}{upcomp}}%
+ {\iffieldequalstr{\xeditor type}{uped}
+ {\renewcommand*{\cbx@bibstring}{uped}}%
+ {\iffieldequalstr{\xeditor type}{uprev}
+ {\renewcommand*{\cbx@bibstring}{uprev}}%
+ {\renewcommand*{\cbx@bibstring}{editor}}}}}}}}}}}}}}}}}
+
+% Thanks to David Fussner's biblatex-chicago for pointing me to this
+% command by Philipp Lehman. Source:
+% https://groups.google.com/forum/#!topic/comp.text.tex/kG003fkZK1I
+
+\newrobustcmd*{\iffieldstart}[2]{%
+ \iffieldundef{#1}
+ {\@secondoftwo}% originally '\@gobbletwo'
+ {\begingroup
+ \edef\@tempa{%
+ \long\def\noexpand\iffieldstart@i####1\detokenize{#2}####2}%
+ \@tempa\@nil{\endgroup\ifblank{##1}}%
+ \savefield*{#1}{\@tempa}%
+ \expandafter\iffieldstart@i\detokenize
+ \expandafter\expandafter\expandafter{%
+ \expandafter\@tempa\detokenize{#2}}\@nil}}%
\newbibmacro*{addplus:authpos}{%
\iftoggle{cbx:short}
@@ -1037,17 +1085,26 @@
or test {\iffieldequalstr{\xeditor type}{comped}}
or test {\iffieldequalstr{\xeditor type}{comprev}}
or test {\iffieldequalstr{\xeditor type}{comptrans}}
+ or test {\iffieldequalstr{\xeditor type}{compup}}
or test {\iffieldequalstr{\xeditor type}{editor}}
or test {\iffieldequalstr{\xeditor type}{edcomp}}
or test {\iffieldequalstr{\xeditor type}{edrev}}
or test {\iffieldequalstr{\xeditor type}{edtrans}}
+ or test {\iffieldequalstr{\xeditor type}{edup}}
or test {\iffieldequalstr{\xeditor type}{reviser}}
or test {\iffieldequalstr{\xeditor type}{revcomp}}
or test {\iffieldequalstr{\xeditor type}{reved}}
or test {\iffieldequalstr{\xeditor type}{revtrans}}
+ or test {\iffieldequalstr{\xeditor type}{revup}}
or test {\iffieldequalstr{\xeditor type}{transcomp}}
or test {\iffieldequalstr{\xeditor type}{transed}}
or test {\iffieldequalstr{\xeditor type}{transrev}}
+ or test {\iffieldequalstr{\xeditor type}{transup}}
+ or test {\iffieldequalstr{\xeditor type}{updater}}
+ or test {\iffieldequalstr{\xeditor type}{upcomp}}
+ or test {\iffieldequalstr{\xeditor type}{uped}}
+ or test {\iffieldequalstr{\xeditor type}{uprev}}
+ or test {\iffieldequalstr{\xeditor type}{uptrans}}
or test {\iffieldequalstr{\xeditor type}{title}}
or test {\iffieldundef{\xeditor type}}}
{}
@@ -1158,17 +1215,23 @@
{\anona\pluga\printnames[\cbx@deflabel]{%
\cbx@namelist}\plugb\anonb}}%
-% A screen name precedes 'nameaddon'. See CMOS, 17th ed., 14.208.
+% A screen name precedes 'nameaddon' and can be omitted from short
+% citations. See CMOS, 17th ed., 14.209.
\newbibmacro*{handle}{%
- \iffieldundef{handle}
+ \ifboolexpr{ test {\iffieldundef{handle}}
+ or togl {cbx:short}}
{}
{\space
\printfield[parens]{handle}%
\clearfield{handle}}}
+% In short citations, omit addons. See CMOS, 17th ed., 14.80 and
+% 14.209.
+
\newbibmacro*{nameaddon}{%
- \iffieldundef{nameaddon}
+ \ifboolexpr{ test {\iffieldundef{nameaddon}}
+ or togl {cbx:short}}
{}
{\space
\printfield[brackets]{nameaddon}%
@@ -1281,7 +1344,7 @@
{\printfield[title]{shortbooktitle}\isdot}}%
{\printfield[\thefield{entrytype}]{labeltitle}\isdot}}}
-\newbibmacro*{booktitle}{%
+\renewbibmacro*{booktitle}{%
\iffieldundef{booktitle}
{}
{\renewcommand*{\xtitle}{book}%
@@ -1297,7 +1360,7 @@
\renewcommand*{\xtitle}{bookbook}%
\usebibmacro{longtitle+titleaddon}}}
-\newbibmacro*{maintitle}{%
+\renewbibmacro*{maintitle}{%
\iffieldundef{maintitle}
{}
{\renewcommand*{\xtitle}{main}%
@@ -1760,6 +1823,7 @@
\newbibmacro*{doi+finentry+etc}{%
\usebibmacro{doi+url+etc}%
\usebibmacro{isbn}%
+ \usebibmacro{issn}%
\usebibmacro{library}%
\usebibmacro{pageref+finentry}}%
@@ -1982,6 +2046,16 @@
{}}
{}}}
+\newbibmacro*{issn}{%
+ \iffieldundef{issn}
+ {}
+ {\iftoggle{bibliography}
+ {\iftoggle{issn}
+ {\newunit
+ \printfield{issn}}%
+ {}}
+ {}}}
+
\newbibmacro*{library}{%
\iffieldundef{library}
{}
diff --git a/macros/latex/contrib/biblatex-contrib/windycity/windycity.cbx b/macros/latex/contrib/biblatex-contrib/windycity/windycity.cbx
index 3246927365..b98193313a 100644
--- a/macros/latex/contrib/biblatex-contrib/windycity/windycity.cbx
+++ b/macros/latex/contrib/biblatex-contrib/windycity/windycity.cbx
@@ -1,4 +1,4 @@
-% Last modified: Tue 29 Sep 2020 06:29:14 PM CDT
+% Last modified: Tue 10 Nov 2020 05:24:14 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/09/29 Windy City citation style for
+\ProvidesFile{windycity.cbx}[2020/11/10 Windy City citation style for
biblatex]
\@ifpackagelater{biblatex}{2019/08/17}
{}
@@ -29,6 +29,7 @@
\AtEveryCite{%
\global\togglefalse{bibliography}%
\global\togglefalse{cbx:first}%
+ \global\togglefalse{cbx:idem}%
\global\togglefalse{ibid:loccit}%
\global\togglefalse{multicite}%
\AtEveryItem}%
@@ -38,8 +39,10 @@
\InitializeCitationStyle{\let\crossreflist\empty}%
\renewcommand{\bibfootnotewrapper}[1]{%
+% \clearfield{postpunct}%
\bibsentence#1}%
\renewcommand{\bibendnotewrapper}[1]{%
+% \clearfield{postpunct}%
\bibsentence#1}%
% Protect commas against abbreviation dots and terminal punctuation.
@@ -85,6 +88,22 @@
{\multicitedelim}%
{\usebibmacro{cite:postnote}}%
+\DeclareCiteCommand{\footfullcite}[\mkbibfootnote]
+ {\usebibmacro{prenote}}%
+ {\citereset
+ \usebibmacro{citeindex}%
+ \usebibmacro{cite:new}}%
+ {\multicitedelim}%
+ {\usebibmacro{cite:postnote}}%
+
+\DeclareCiteCommand{\fullcite}
+ {\usebibmacro{prenote}}%
+ {\citereset
+ \usebibmacro{citeindex}%
+ \usebibmacro{cite:new}}%
+ {\multicitedelim}%
+ {\usebibmacro{cite:postnote}}%
+
\DeclareCiteCommand{\parencite}[\mkbibparens]
{\usebibmacro{prenote}}%
{\usebibmacro{citeindex}%
@@ -133,6 +152,25 @@
{\multicitedelim}%
{\usebibmacro{postnote}}%
+\DeclareCiteCommand{\idemcite}
+ {\usebibmacro{prenote}}%
+ {\usebibmacro{citeindex}%
+ \toggletrue{cbx:idem}%
+ \usebibmacro{cite}}%
+ {\multicitedelim}%
+ {\usebibmacro{cite:postnote}}%
+
+\DeclareCiteCommand{\footidemcite}[\mkbibfootnote]
+ {\usebibmacro{prenote}}%
+ {\usebibmacro{citeindex}%
+ \toggletrue{cbx:idem}%
+ \usebibmacro{cite}}%
+ {\multicitedelim}%
+ {\usebibmacro{cite:postnote}}%
+
+\DeclareMultiCiteCommand{\idemcites}{\idemcite}{\multicitedelim}%
+\DeclareMultiCiteCommand{\footidemcites}[\mkbibfootnote]{\footidemcite}{\multicitedelim}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Parenthetical Citations %%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -160,18 +198,6 @@
\usebibmacro{labeldate+endyear}%
\printfield{extradate}}}
-\newbibmacro*{parencite:date+old}{%
- \iffieldundef{labelyear}
- {}
- {\usebibmacro{parencite:origyear}%
- \ifboolexpr{ ( test {\iffieldundef{year}}
- and test {\iffieldundef{urlyear}} )
- or test {\iffieldequalstr{year}{forthcoming}}}
- {\addcomma}%
- {}% needs '%'
- \usebibmacro{labeldate+endyear}%
- \printfield{extradate}}}
-
\newbibmacro*{parencite:origyear}{%
\iffieldundef{origyear}
{}
@@ -322,22 +348,6 @@
{}
{\newunit}}%
-% Thanks to David Fussner's biblatex-chicago for pointing me to this
-% command by Philipp Lehman. Source:
-% https://groups.google.com/forum/#!topic/comp.text.tex/kG003fkZK1I
-
-\newrobustcmd*{\iffieldstart}[2]{%
- \iffieldundef{#1}
- {\@gobbletwo}%
- {\begingroup
- \edef\@tempa{%
- \long\def\noexpand\iffieldstart@i####1\detokenize{#2}####2}%
- \@tempa\@nil{\endgroup\ifblank{##1}}%
- \savefield*{#1}{\@tempa}%
- \expandafter\iffieldstart@i\detokenize
- \expandafter\expandafter\expandafter{%
- \expandafter\@tempa\detokenize{#2}}\@nil}}%
-
\newbibmacro*{volume+page}{%
\iffieldundef{volume}
{}
@@ -356,13 +366,13 @@
{\DeclareNameAlias{sortname}{default}}%
{cite:\thefield{entrytype}}}}}
-% By default, idemtracker is 'false'. As such, '\ifciteidem' returns
-% false. With idemtracker set to 'true' (or to some value that implies
-% 'true') the test below will print 'labelname' if it matches that of
-% the previous citation.
+% By default, idemtracker is 'false'. With idemtracker set to 'true'
+% (or to some value that implies 'true') the test below will print
+% 'labelname' if it matches that of the previous citation.
\newbibmacro*{idem+short+multicite}{%
\ifboolexpr{ test {\ifciteidem}
+ or togl {cbx:idem}
or togl {firstshort}}
{\renewcommand*{\cbx@deflabel}{labelname}}%
{\ifboolexpr{ test {\iffieldequals{namehash}{\bbx@lasthash}}
@@ -467,7 +477,8 @@
% bibliography database.
\newbibmacro*{cite:pages}{%
- \iffieldundef{pages}
+ \ifboolexpr{ test {\iffieldundef{pages}}
+ or togl {nopages}}
{}
{\ifboolexpr{ test {\ifentrytype{article}}
or test {\ifentrytype{review}}}
diff --git a/macros/latex/contrib/biblatex-contrib/windycity/windycity.dbx b/macros/latex/contrib/biblatex-contrib/windycity/windycity.dbx
index 231c4210a5..ea87948409 100644
--- a/macros/latex/contrib/biblatex-contrib/windycity/windycity.dbx
+++ b/macros/latex/contrib/biblatex-contrib/windycity/windycity.dbx
@@ -1,9 +1,10 @@
-\ProvidesFile{windycity.dbx}[2020/09/29 Windy City data model file for
+\ProvidesFile{windycity.dbx}[2020/11/10 Windy City data model file for
biblatex]
\DeclareDatamodelFields[type=field,datatype=literal]{%
blogsubtitle,
blogtitle,
blogtitleaddon,
+ bookauthortype,
bookbooktitle,
bookbookvolume,
bookvolume,
diff --git a/macros/latex/contrib/numspell/numspell-english.sty b/macros/latex/contrib/numspell/numspell-english.sty
index a3120e3ca8..4ad8bf476d 100644
--- a/macros/latex/contrib/numspell/numspell-english.sty
+++ b/macros/latex/contrib/numspell/numspell-english.sty
@@ -16,24 +16,31 @@
%% The Current Maintainer of this work is Tibor Tomacs.
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{numspell-english}[2020/11/07 v1.1 English language package for numspell]
+\ProvidesPackage{numspell-english}[2020/11/11 v1.2 English language package for numspell]
+
+\def\numspell@and@en{\numspell@{ and }}
+\def\numspell@and@@en{\numspell@{, }}% It was 'and' in v1.0
%% -----------
-%% \numspellGB (Default)
+%% \numspellGB
%% -----------
%% It changes to British English
%%
\def\numspellGB{%
+ \def\numspell@US{}%
\def\numspell@and@en{\numspell@{ and }}%
\def\numspell@and@@en{\numspell@{, }}% It was 'and' in v1.0
}
-\numspellGB
%% -----------
%% \numspellUS
%% -----------
%% It changes to American English
%%
+\def\numspell@US{%
+ \def\numspell@and@en{\numspell@{ }}%
+ \def\numspell@and@@en{\numspell@{, }}%
+}
\def\numspellUS{%
\def\numspell@and@en{\numspell@{ }}%
\def\numspell@and@@en{\numspell@{, }}%
diff --git a/macros/latex/contrib/numspell/numspell.pdf b/macros/latex/contrib/numspell/numspell.pdf
index 76152b5074..b3878a1650 100644
--- a/macros/latex/contrib/numspell/numspell.pdf
+++ b/macros/latex/contrib/numspell/numspell.pdf
Binary files differ
diff --git a/macros/latex/contrib/numspell/numspell.sty b/macros/latex/contrib/numspell/numspell.sty
index c74912b8d1..ccd615f396 100644
--- a/macros/latex/contrib/numspell/numspell.sty
+++ b/macros/latex/contrib/numspell/numspell.sty
@@ -17,12 +17,10 @@
%%
%% The Current Maintainer of this work is Tibor Tomacs.
%%
-\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{numspell}[2020/11/07 v1.3 Package for spelling cardinal and ordinal numbers]
+\NeedsTeXFormat{LaTeX2e}[2020/10/01]
+\ProvidesPackage{numspell}[2020/11/11 v1.4 Package for spelling cardinal and ordinal numbers]
-\RequirePackage{xstring}
-\RequirePackage{iflang}
-\RequirePackage{etoolbox}
+\RequirePackage{xstring,iflang}
\newcounter{numspell@counter@tempa}
\newcounter{numspell@counter@tempb}
@@ -235,38 +233,30 @@
\IfLanguageName{british}{\@numspell@lang@notsupported@false}{}%
\IfLanguageName{ukenglish}{\@numspell@lang@notsupported@false}{}%
\IfLanguageName{UKenglish}{\@numspell@lang@notsupported@false}{}%
- \IfLanguageName{american}{\@numspell@lang@notsupported@false\numspellUS}{}%
- \IfLanguageName{usenglish}{\@numspell@lang@notsupported@false\numspellUS}{}%
- \IfLanguageName{USenglish}{\@numspell@lang@notsupported@false\numspellUS}{}%
+ \IfLanguageName{american}{\@numspell@lang@notsupported@false\numspell@US}{}%
+ \IfLanguageName{usenglish}{\@numspell@lang@notsupported@false\numspell@US}{}%
+ \IfLanguageName{USenglish}{\@numspell@lang@notsupported@false\numspell@US}{}%
\IfLanguageName{magyar}{\@numspell@lang@notsupported@false\def\numspell@langname{hu}}{}%
\IfLanguageName{hungarian}{\@numspell@lang@notsupported@false\def\numspell@langname{hu}}{}%
\IfLanguageName{german}{\@numspell@lang@notsupported@false\def\numspell@langname{de}}{}%
\IfLanguageName{ngerman}{\@numspell@lang@notsupported@false\def\numspell@langname{de}}{}%
\IfLanguageName{french}{\@numspell@lang@notsupported@false\def\numspell@langname{fr}}{}%
\IfLanguageName{italian}{\@numspell@lang@notsupported@false\def\numspell@langname{it}}{}%
- \if@numspell@lang@notsupported@\PackageWarning{numspell}{Not supported language: \languagename}\fi%
+ \if@numspell@lang@notsupported@\PackageWarning{numspell}{\languagename\space is not supported language in numspell}\fi%
}
%% -------------------------
%% Loading language packages
%% -------------------------
%%
-\AtEndPreamble{%
-\newif\if@numspell@lang@loaded@
-\ifdefined\dateenglish\RequirePackage{numspell-english}\@numspell@lang@loaded@true\fi%
-\ifdefined\datebritish\RequirePackage{numspell-english}\@numspell@lang@loaded@true\fi%
-\ifdefined\dateukenglish\RequirePackage{numspell-english}\@numspell@lang@loaded@true\fi%
-\ifdefined\dateUKenglish\RequirePackage{numspell-english}\@numspell@lang@loaded@true\fi%
-\ifdefined\dateamerican\RequirePackage{numspell-english}\@numspell@lang@loaded@true\fi%
-\ifdefined\dateusenglish\RequirePackage{numspell-english}\@numspell@lang@loaded@true\fi%
-\ifdefined\dateUSenglish\RequirePackage{numspell-english}\@numspell@lang@loaded@true\fi%
-\ifdefined\datemagyar\RequirePackage{numspell-magyar}\@numspell@lang@loaded@true\fi%
-\ifdefined\datehungarian\RequirePackage{numspell-magyar}\@numspell@lang@loaded@true\fi%
-\ifdefined\dategerman\RequirePackage{numspell-german}\@numspell@lang@loaded@true\fi%
-\ifdefined\datengerman\RequirePackage{numspell-german}\@numspell@lang@loaded@true\fi%
-\ifdefined\datefrench\RequirePackage{numspell-french}\@numspell@lang@loaded@true\fi%
-\ifdefined\dateitalian\RequirePackage{numspell-italian}\@numspell@lang@loaded@true\fi%
-\if@numspell@lang@loaded@\else\RequirePackage{numspell-english}\fi%
+\AddToHook{begindocument/before}{
+\RequirePackage{numspell-english}
+\ifdefined\datemagyar\RequirePackage{numspell-magyar}\fi%
+\ifdefined\datehungarian\RequirePackage{numspell-magyar}\fi%
+\ifdefined\dategerman\RequirePackage{numspell-german}\fi%
+\ifdefined\datengerman\RequirePackage{numspell-german}\fi%
+\ifdefined\datefrench\RequirePackage{numspell-french}\fi%
+\ifdefined\dateitalian\RequirePackage{numspell-italian}\fi%
}
%% ---------------------------------
diff --git a/macros/latex/contrib/numspell/numspell.tex b/macros/latex/contrib/numspell/numspell.tex
index c28766044d..99128819f9 100644
--- a/macros/latex/contrib/numspell/numspell.tex
+++ b/macros/latex/contrib/numspell/numspell.tex
@@ -30,10 +30,14 @@
\setlength{\parskip}{6pt}
\lstnewenvironment{examplelst}{\lstset{
-belowskip=\bigskipamount,
+%belowskip=\bigskipamount,
basicstyle=\ttfamily,
backgroundcolor=\color{black!10},
+frame=trbl,
+framesep=3pt,
columns=fullflexible,
+xleftmargin=3.4pt,
+xrightmargin=3.4pt,
keepspaces}}{}
\newcommand{\commandinline}{\lstinline[
@@ -52,7 +56,7 @@ keepspaces]}
\begin{document}
-\title{The {\bfseries\sffamily numspell} package\\{\large v1.3 (2020/11/07)}}
+\title{The {\bfseries\sffamily numspell} package\\{\large v1.4 (2020/11/11)}}
\author{Tibor Tómács\\{\normalsize\url{tomacs.tibor@uni-eszterhazy.hu}}}
\date{}
\maketitle
@@ -63,7 +67,7 @@ The aim of the \texttt{numspell} package is to spell the cardinal and ordinal nu
The supported languages are English (British and American), French, German, Hungarian and Italian.
The spelling will happen in the current language.
-The \texttt{numspell} package requires the services of the following packages: \texttt{xstring}, \texttt{etoolbox}, \texttt{iflang}.
+The \texttt{numspell} package requires the services of the \texttt{xstring} and \texttt{iflang} packages.
Load the package as usual, with
\begin{flushleft}
@@ -231,6 +235,15 @@ For example
\thenumspellMyNum
\end{description}
+\section{Commands for English language}
+If the \texttt{english}, \texttt{british}, \texttt{ukenglish} or \texttt{UKenglish} language is active, then the number spelling will happen in British English. But it will be in American English, if the \texttt{american}, \texttt{usenglish} or \texttt{USenglish} language is active.
+\begin{description}
+\item\commandinline|\numspellUS|\\
+Using British English, you can rechange the number spelling to American English by this command.
+\item\commandinline|\numspellGB|\\
+Using American English, you can rechange the number spelling to British English by this command.
+\end{description}
+
\section{Commands for French language}
The following commands only work, if \texttt{french} language is active.
\begin{description}
@@ -246,7 +259,7 @@ but \verb|\numspellpremiere\ordnumspell{1}| $\to$ {\numspellpremiere\ordnumspell
\end{description}
\section{Commands for Hungarian language}
-The following commands only work, if \texttt{magyar} language is active.
+The following commands only work, if \texttt{magyar} or \texttt{hungarian} language is active.
\begin{description}
\item\commandinline|\anumspell[!<zeros>!]{!<num>!}|\\
It works like \verb|\numspell|, but the number spelling will start with Hungarian definite article. For example
@@ -337,10 +350,9 @@ The ordinal numbers will be printed in feminine form. For example\\
\end{description}
\section{Examples}
-\subsection*{Example \stepcounter{subsection}\arabic{subsection}}
+
\begin{examplelst}
\documentclass{article}
-\usepackage[utf8]{inputenc}
\usepackage[T1]{fontenc}
\usepackage[magyar,italian,ngerman,french,english]{babel}
\usepackage{numspell}
@@ -349,80 +361,56 @@ The ordinal numbers will be printed in feminine form. For example\\
\def\mynum{123456789}
\noindent
In British English the spelling of \num{\mynum} is
-\emph{``\numspell{\mynum}''}.
+\emph{\numspell{\mynum}}.
\par\smallskip\noindent
In American English the spelling of \num{\mynum} is
-{\selectlanguage{american}\emph{``\numspell{\mynum}''}}.
+\foreignlanguage{american}{\em\numspell{\mynum}}.
\par\smallskip\noindent
In French the spelling of \num{\mynum} is
-{\selectlanguage{french}\emph{``\numspell{\mynum}''}}.
+\foreignlanguage{french}{\em\numspell{\mynum}}.
\par\smallskip\noindent
In German the spelling of \num{\mynum} is
-{\selectlanguage{ngerman}\emph{``\numspell{\mynum}''}}.
+\foreignlanguage{ngerman}{\em\numspell{\mynum}}.
\par\smallskip\noindent
In Hungarian the spelling of \num{\mynum} is
-{\selectlanguage{magyar}\emph{`'\numspell{\mynum}''}}.
+\foreignlanguage{magyar}{\em\numspell{\mynum}}.
\par\smallskip\noindent
In Italian the spelling of \num{\mynum} is
-{\selectlanguage{italian}\emph{``\numspell{\mynum}''}}.
+\foreignlanguage{italian}{\em\numspell{\mynum}}.
\end{document}
\end{examplelst}
-
\def\mynum{123456789}
-
\noindent
In British English the spelling of \num{\mynum} is
-\emph{``\numspell{\mynum}''}.
-
-\smallskip\noindent
+\emph{\numspell{\mynum}}.
+\par\smallskip\noindent
In American English the spelling of \num{\mynum} is
-{\selectlanguage{american}\emph{``\numspell{\mynum}''}}.
-
-\smallskip\noindent
+\foreignlanguage{american}{\em\numspell{\mynum}}.
+\par\smallskip\noindent
In French the spelling of \num{\mynum} is
-{\selectlanguage{french}\emph{``\numspell{\mynum}''}}.
-
-\smallskip\noindent
+\foreignlanguage{french}{\em\numspell{\mynum}}.
+\par\smallskip\noindent
In German the spelling of \num{\mynum} is
-{\selectlanguage{ngerman}\emph{``\numspell{\mynum}''}}.
-
-\smallskip\noindent
+\foreignlanguage{ngerman}{\em\numspell{\mynum}}.
+\par\smallskip\noindent
In Hungarian the spelling of \num{\mynum} is
-{\selectlanguage{magyar}\emph{`'\numspell{\mynum}''}}.
-
-\smallskip\noindent
+\foreignlanguage{magyar}{\em\numspell{\mynum}}.
+\par\smallskip\noindent
In Italian the spelling of \num{\mynum} is
-{\selectlanguage{italian}\emph{``\numspell{\mynum}''}}.
+\foreignlanguage{italian}{\em\numspell{\mynum}}.
-\bigskip
-\subsection*{Example \stepcounter{subsection}\arabic{subsection}}
-\begin{examplelst}
-\documentclass{article}
-\usepackage{numspell}
-\usepackage[group-separator={,}]{siunitx}
-\begin{document}
-\def\mynum{123456789012345678901234567890123456789012345678901234567890123456}
-\Numspell{\mynum}, that is \num{\mynum}.
-\end{document}
-\end{examplelst}
-
-\def\mynum{123456789012345678901234567890123456789012345678901234567890123456}
-\Numspell{\mynum}, that is \num{\mynum}.
-
-\bigskip
-\subsection*{Example \stepcounter{subsection}\arabic{subsection}}
\begin{examplelst}
\documentclass{article}
\usepackage{numspell}
\newcounter{mycount}
-\makeatletter
\begin{document}
The
+\makeatletter
\@whilenum\value{mycount}<51
\do{\ordnumspell{\themycount}\stepcounter{mycount},\ }\dots
+\makeatother
\end{document}
\end{examplelst}
-
\makeatletter
\newcounter{mycount}
The
@@ -430,21 +418,19 @@ The
\do{\ordnumspell{\themycount}\stepcounter{mycount},\ }\dots
\makeatother
-\bigskip
-\subsection*{Example \stepcounter{subsection}\arabic{subsection}}
\begin{examplelst}
\documentclass{article}
\usepackage{numspell}
\newcounter{mycount}
\def\themycount{\numspell{\arabic{mycount}}}
-\makeatletter
\begin{document}
\Numspell{0},
+\makeatletter
\@whilenum\value{mycount}<30
\do{\stepcounter{mycount}\themycount,\ }\dots
+\makeatother
\end{document}
\end{examplelst}
-
\def\themycount{\numspell{\arabic{mycount}}}
\setcounter{mycount}{0}
\makeatletter
@@ -453,7 +439,6 @@ The
\do{\stepcounter{mycount}\themycount,\ }\dots
\makeatother
-\bigskip
\section{Limitations}
Do not use the \verb|\numspell|, \verb|\numspell*|, \verb|\Numspell|, \verb|\Numspell*|, etc.\ commands inside sectioning commands and \verb|\MakeUppercase|.
An example for the illustration of the problem:
@@ -469,24 +454,20 @@ An example for the illustration of the problem:
Text
\end{document}
\end{examplelst}
-\noindent
-\textbf{The bugs}
+
+The following mistakes occur:
\begin{enumerate}
\setlength{\labelsep}{5pt}
-\item
-On the page 1: ``\numspell{123}''\\
+\item On the page 1: ``\numspell{123}''\\
Required: \numspell*{123}\MakeUppercase{``\thenumspell''}
-
-\item
-On the heading: \emph{``THE \ordnumspell{123} FACTOR''}\\
+\item On the heading: \emph{``THE \ordnumspell{123} FACTOR''}\\
Required: \ordnumspell*{123}\MakeUppercase{\em``The \thenumspell\ factor''}
-
-\item
-On the pdf bookmark: ``The 123 factor''\\
+\item On the pdf bookmark: ``The 123 factor''\\
Required: ``The \ordnumspell{123} factor''
\end{enumerate}
-\noindent
-\textbf{The solution}
+
+\subsubsection*{The solution}
+
\begin{examplelst}
\documentclass{article}
\usepackage{hyperref}
diff --git a/macros/latex/contrib/swfigure/#README.txt# b/macros/latex/contrib/swfigure/#README.txt#
deleted file mode 100644
index e6099686f9..0000000000
--- a/macros/latex/contrib/swfigure/#README.txt#
+++ /dev/null
@@ -1,46 +0,0 @@
-q%%
-%% This is file `README.txt',
-%%
-%% Copyright (C) 2020 Claudio Beccari all rights reserved.
-%% License information appended
-%%
-
-File README.txt for package swfigure
- [2020-11-10 v.0.9.14 Managing large and spread wide figures]
-This bundle contains the swfigure.dtx, swfigure-examples.tex,
-and README.txt files plus some fake figures with extension .jpg
-or .pdf and a couple of scrrenshots with extension .pdf.
-
-This file README.txt contains the licence, the status, and some
-general information. Save the README.txt and swfigure.dtx file
-in a .../source/latex/swfigure/ folder either in the main TeX
-system tree or in your personal tree.
-
-Save the swfigure-examples.tex, the derived swfigures-examples.pdf,
-and the various .jpg and .pdf files in folder .../doc/latex/swfigure/.
-
-Process the self extracting swfigure.dtx file with pdfLaTeX;
-repeat at least twice in order to get all references correct;
-you obtain the swfigure.pdf and the swfigure.sty files.
-After extraction move the .sty file to the .../tex/latex/swfigure/
-folder, and move the .pdf file to the .../doc/latex/swfigure/ folder.
-From the original folder .../source/latex/swfigure/ move to the bin
-all files except the .dtx and the .txt ones.
-
-The author disclaims any liability from every possible inconvenience
-deriving from the use of this software; you use it at your own risk.
-
-%%
-%% Distributable under the LaTeX Project Public License,
-%% version 1.3c or higher (your choice). The latest version of
-%% this license is at: http://www.latex-project.org/lppl.txt
-%%
-%% This work is "maintained"
-%%
-%% This work consists of files swfigure.dtx, swfigure-examples.tex
-%% and README.txt, and the derived files swfigure.sty and swfigure.pdf.
-%%
-%% The other .jpg and .pdf files contained in this bundle are just
-%% fake figures and screenshots that anybody can replicate, copy
-%% or modify at will.
-%%
diff --git a/macros/latex/contrib/tudscr/README.md b/macros/latex/contrib/tudscr/README.md
index 19be3c777e..0985d55ac1 100644
--- a/macros/latex/contrib/tudscr/README.md
+++ b/macros/latex/contrib/tudscr/README.md
@@ -4,16 +4,19 @@
Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2012-2020
- tudscr 2020/09/29 v2.06j
+ tudscr 2020/11/10 v2.06k
+
+ The current release is shiped via CTAN: https://www.ctan.org/pkg/tudscr
----------------------------------------------------------------------------
This material is subject to the LaTeX Project Public License version 1.3c
or later. See http://www.latex-project.org/lppl.txt for details.
- English text below
+ English text below.
----------------------------------------------------------------------------
+
Zusammenfassung
---------------
@@ -50,11 +53,15 @@ Das Bundle beinhaltet:
im zweispaltigen Layout und
+ eine umfassende Anwenderdokumentation sowie mehrere Tutorials.
+
Versionen
---------
+**v2.06k** (2020/11/10)
++ Fix für doppelte Leerzeichen in `\confirmation` etc.
+
**v2.06j** (2020/09/29)
-+ Anpassungen an neue Version von `scrlfile v3.32` für LaTeX-Kernel `2020/10/01`
++ Anpassungen an neue Version von **scrlfile** v3.32 für LaTeX-Kernel 2020/10/01
**v2.06i** (2020/07/27)
+ Bugfix für duplizierte Outline-Einträg in Umgebung `abstract`
@@ -66,11 +73,11 @@ Versionen
+ Bugfix für Änderung des Satzspiegels im Dokument
**v2.06f** (2020/01/14)
-+ Anpassungen für Paket `scrbase v3.28`
++ Anpassungen für Paket **scrbase** v3.28
**v2.06e** (2019/10/23)
-+ Bugfix für Paket `scrlfile v3.27`
-
++ Bugfix für Paket **scrlfile** v3.27
+
**v2.06d** (2019/08/27)
+ Bugfix für griechische Glyphen im Mathematikmodus beim Einsatz von LuaLaTeX
(Ligaturen für angrenzende Glyphen sind entgegen der Definition aktiviert)
@@ -198,7 +205,7 @@ Versionen
+ Unterstützung der KOMA-Script-Schriftelemente für Titel und Umschlagseite
+ Befehle und Umgebungen für Zusammenfassung, Selbstständigkeitserklärung und
Sperrvermerk wurden verbessert
-+ Fussnoten in Ãœberschriften als Symbole per Option `footnotes`
++ Fußnoten in Überschriften als Symbole per Option `footnotes`
+ einige Befehle wurden für Kompatibilität zu anderen Paketen umbenannt
+ Funktionalität des Paketes **mathswap** im Dokument umschaltbar
@@ -225,6 +232,7 @@ Versionen
-------------------------------------------------------------------------------
+
Summary
-------
@@ -260,11 +268,15 @@ The bundle offers:
twocolumn layout and
+ an comprehensive user documentation as well as several tutorials.
+
Versions
--------
+**v2.06k** (2020/11/10)
++ bug fix for multiple spaces in `\confirmation` etc.
+
**v2.06j** (2020/09/29)
-+ adjustments to new version of `scrlfile v3.32` for LaTeX kernel `2020/10/01`
++ adjustments to new version of **scrlfile** v3.32 for LaTeX kernel 2020/10/01
**v2.06i** (2020/07/27)
+ bug fix for duplicated outline entries in environment `abstract`
@@ -276,10 +288,10 @@ Versions
+ bug fix when changing type area within document
**v2.06f** (2020/01/14)
-+ adaptions for package `scrbase v3.28`
++ adaptions for package **scrbase** v3.28
**v2.06e** (2019/10/23)
-+ bug fix for package `scrlfile v3.27`
++ bug fix for package **scrlfile** v3.27
**v2.06d** (2019/08/27)
+ bug fix for greek glyphs in math mode when using LuaLaTeX
@@ -354,7 +366,7 @@ Versions
**v2.05** (2016/07/26)
+ class **tudscrposter**
-+ crop marks with packages **crop** and **geometry** possible
++ crop marks with packages **crop** and **geometry** possible
+ new possible settings for type area
+ font size related skips with option `relspacing`
+ `\course` and `\discipline` available on title
diff --git a/macros/latex/contrib/tudscr/doc/tudscr.pdf b/macros/latex/contrib/tudscr/doc/tudscr.pdf
index 4f37a99376..d36387f505 100644
--- a/macros/latex/contrib/tudscr/doc/tudscr.pdf
+++ b/macros/latex/contrib/tudscr/doc/tudscr.pdf
Binary files differ
diff --git a/macros/latex/contrib/tudscr/doc/tudscr_print.pdf b/macros/latex/contrib/tudscr/doc/tudscr_print.pdf
index 4e72e41959..10dcded50f 100644
--- a/macros/latex/contrib/tudscr/doc/tudscr_print.pdf
+++ b/macros/latex/contrib/tudscr/doc/tudscr_print.pdf
Binary files differ
diff --git a/macros/latex/contrib/tudscr/doc/tudscrsource.pdf b/macros/latex/contrib/tudscr/doc/tudscrsource.pdf
index f4e145521b..865a9de198 100644
--- a/macros/latex/contrib/tudscr/doc/tudscrsource.pdf
+++ b/macros/latex/contrib/tudscr/doc/tudscrsource.pdf
Binary files differ
diff --git a/macros/latex/contrib/tudscr/doc/tutorials/mathswap.pdf b/macros/latex/contrib/tudscr/doc/tutorials/mathswap.pdf
index d1ef89f8ff..0d31232d5e 100644
--- a/macros/latex/contrib/tudscr/doc/tutorials/mathswap.pdf
+++ b/macros/latex/contrib/tudscr/doc/tutorials/mathswap.pdf
Binary files differ
diff --git a/macros/latex/contrib/tudscr/doc/tutorials/mathtype.pdf b/macros/latex/contrib/tudscr/doc/tutorials/mathtype.pdf
index a6ee85f561..6719c97d44 100644
--- a/macros/latex/contrib/tudscr/doc/tutorials/mathtype.pdf
+++ b/macros/latex/contrib/tudscr/doc/tutorials/mathtype.pdf
Binary files differ
diff --git a/macros/latex/contrib/tudscr/doc/tutorials/treatise.pdf b/macros/latex/contrib/tudscr/doc/tutorials/treatise.pdf
index 83e3ad86e6..2c8cd1543a 100644
--- a/macros/latex/contrib/tudscr/doc/tutorials/treatise.pdf
+++ b/macros/latex/contrib/tudscr/doc/tutorials/treatise.pdf
Binary files differ
diff --git a/macros/latex/contrib/tudscr/source/doc/sub-tudscr.tex b/macros/latex/contrib/tudscr/source/doc/sub-tudscr.tex
deleted file mode 100644
index 6c70d57083..0000000000
--- a/macros/latex/contrib/tudscr/source/doc/sub-tudscr.tex
+++ /dev/null
@@ -1,17 +0,0 @@
-%\AtBeginDocument{\TUDoptions{ToDo=no}}
-\includeonly{%
-% tudscr-preface,
-% tudscr-introduction,
-% tudscr-mainclasses,
-% tudscr-poster,
-% tudscr-supervisor,
-% tudscr-bundle,
-% tudscr-examples,
-% tudscr-packages,
-% tudscr-hints,
-% tudscr-installation,
- tudscr-obsolete,
-% tudscr-additional,
- tudscr-index,
-}
-\input{tudscr}
diff --git a/macros/latex/contrib/tudscr/source/doc/tudscr.tex b/macros/latex/contrib/tudscr/source/doc/tudscr.tex
index be3934ac93..847d3b1fe2 100644
--- a/macros/latex/contrib/tudscr/source/doc/tudscr.tex
+++ b/macros/latex/contrib/tudscr/source/doc/tudscr.tex
@@ -29,7 +29,7 @@
\endgroup%
}
\faculty{\cdurl}
-\date{2020-09-29}
+\date{2020-11-10}
\author{%
Falk Hanisch%
\expandafter\emailaddress\expandafter{\tudscrmail}%
diff --git a/macros/latex/contrib/tudscr/source/tudscr-comp.dtx b/macros/latex/contrib/tudscr/source/tudscr-comp.dtx
index b1532cbf69..4d25d8d346 100644
--- a/macros/latex/contrib/tudscr/source/tudscr-comp.dtx
+++ b/macros/latex/contrib/tudscr/source/tudscr-comp.dtx
@@ -1,4 +1,4 @@
-% \CheckSum{1457}
+% \CheckSum{1458}
% \iffalse meta-comment
%
% TUD-Script -- Corporate Design of Technische Universität Dresden
@@ -52,7 +52,7 @@
% \fi
%
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
-\ProvidesFile{tudscr-comp.dtx}[2020/09/29 v2.06j TUD-Script\space%
+\ProvidesFile{tudscr-comp.dtx}[2020/11/10 v2.06k TUD-Script\space%
%
% \iffalse
%</dtx>
@@ -391,6 +391,8 @@
% \changes{v2.06i}{2020/07/27}{neu}^^A
% \begin{macro}{\tud@v@2.06j}
% \changes{v2.06j}{2020/09/29}{neu}^^A
+% \begin{macro}{\tud@v@2.06k}
+% \changes{v2.06k}{2020/11/10}{neu}^^A
% \begin{macro}{\tud@v@last}
% \changes{v2.02}{2014/08/22}{neu}^^A
% \changes{v2.03}{2015/01/13}{angepasst}^^A
@@ -437,9 +439,11 @@
\csdef{tud@v@2.06h}{4}
\csdef{tud@v@2.06i}{4}
\csdef{tud@v@2.06j}{4}
+\csdef{tud@v@2.06k}{4}
\csdef{tud@v@last}{4}
% \end{macrocode}
% \end{macro}^^A \tud@v@last
+% \end{macro}^^A \tud@v@2.06k
% \end{macro}^^A \tud@v@2.06j
% \end{macro}^^A \tud@v@2.06i
% \end{macro}^^A \tud@v@2.06h
diff --git a/macros/latex/contrib/tudscr/source/tudscr-localization.dtx b/macros/latex/contrib/tudscr/source/tudscr-localization.dtx
index 103eeee132..b47cc7b68e 100644
--- a/macros/latex/contrib/tudscr/source/tudscr-localization.dtx
+++ b/macros/latex/contrib/tudscr/source/tudscr-localization.dtx
@@ -1,4 +1,4 @@
-% \CheckSum{774}
+% \CheckSum{763}
% \iffalse meta-comment
%
% TUD-Script -- Corporate Design of Technische Universität Dresden
@@ -52,7 +52,7 @@
% \fi
%
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
-\ProvidesFile{tudscr-localization.dtx}[2019/07/19 v2.06c TUD-Script\space%
+\ProvidesFile{tudscr-localization.dtx}[2020/11/10 v2.06k TUD-Script\space%
(localization)%
]
%
@@ -121,8 +121,8 @@
`\string#1' not defined for language `\languagename'%
}{%
Currently the class `\TUD@Class@Name' only supports the\MessageBreak%
- languages german and english an its dialects. You must\MessageBreak%
- define single patterns by yourself, e.g.:\MessageBreak%
+ languages german and english as well as its dialects. You\MessageBreak%
+ must define single patterns by yourself, e.g.:\MessageBreak%
`\string\providecaptionname{\languagename}\string#1{<text>}'\MessageBreak%
You can send your definitions to \tudscrmail\space in\MessageBreak%
order to implement support for additional languages.%
@@ -493,7 +493,7 @@
% angegeben werden muss, \cs{and} verwendet wurde. Ist dies der Fall, wird das
% zweite Argument ausgeführt, andernfalls das dritte.
% \begin{macrocode}
-\newcommand*\tud@ifin@and[1]{%
+\newrobustcmd*\tud@ifin@and[1]{%
\begingroup%
\let\and\relax%
\robustify\\%
@@ -506,7 +506,7 @@
}%
}%
\expandafter\@tempa\@tempb\and\relax%
- \endgroup
+ \endgroup%
}
% \end{macrocode}
% \end{macro}^^A \tud@ifin@and
@@ -543,7 +543,7 @@
%<*book|report|article>
\tud@localization@german{\graduationtext}{%
zur Erlangung des akademischen Grades%
-}%
+}
% \end{macrocode}
% Für die nachfolgenden Felder, für die es bedarfsweise einen Bezeichner für
% eine zweite Person gibt (\cs{\dots{}othername}), werden jeweils verschiedene
@@ -562,8 +562,8 @@
Erstgutachter%
\fi%
}{Gutachter}%
-}%
-\tud@localization@german{\refereeothername}{Zweitgutachter}%
+}
+\tud@localization@german{\refereeothername}{Zweitgutachter}
\tud@localization@german{\advisorname}{%
\tud@ifin@and{\@advisor}{%
\ifx\advisorothername\@empty%
@@ -572,8 +572,8 @@
Erster Fachreferent%
\fi%
}{Fachreferent}%
-}%
-\tud@localization@german{\advisorothername}{}%
+}
+\tud@localization@german{\advisorothername}{}
\tud@localization@german{\supervisorname}{%
\tud@ifin@and{\@supervisor}{%
\ifx\supervisorothername\@empty%
@@ -582,8 +582,8 @@
Erstbetreuer%
\fi%
}{Betreuer}%
-}%
-\tud@localization@german{\supervisorothername}{}%
+}
+\tud@localization@german{\supervisorothername}{}
\tud@localization@german{\professorname}{%
\tud@ifin@and{\@professor}{%
\ifx\professorothername\@empty%
@@ -592,73 +592,73 @@
Erster betreuender Hochschullehrer%
\fi%
}{Betreuender Hochschullehrer}%
-}%
-\tud@localization@german{\professorothername}{}%
-\tud@localization@german{\datetext}{Eingereicht am}%
-\tud@localization@german{\dateofbirthtext}{Geboren am}%
-\tud@localization@german{\placeofbirthtext}{in}%
-\tud@localization@german{\defensedatetext}{Verteidigt am}%
-\tud@localization@german{\matriculationyearname}{Immatrikulationsjahr}%
-\tud@localization@german{\matriculationnumbername}{Matrikelnummer}%
-\tud@localization@german{\coverpagename}{Umschlagseite}%
-\tud@localization@german{\titlepagename}{Titelblatt}%
-\tud@localization@german{\titlename}{Titel}%
+}
+\tud@localization@german{\professorothername}{}
+\tud@localization@german{\datetext}{Eingereicht am}
+\tud@localization@german{\dateofbirthtext}{Geboren am}
+\tud@localization@german{\placeofbirthtext}{in}
+\tud@localization@german{\defensedatetext}{Verteidigt am}
+\tud@localization@german{\matriculationyearname}{Immatrikulationsjahr}
+\tud@localization@german{\matriculationnumbername}{Matrikelnummer}
+\tud@localization@german{\coverpagename}{Umschlagseite}
+\tud@localization@german{\titlepagename}{Titelblatt}
+\tud@localization@german{\titlename}{Titel}
%<*book>
-\tud@localization@german{\abstractname}{Zusammenfassung}%
+\tud@localization@german{\abstractname}{Zusammenfassung}
%</book>
-\tud@localization@german{\confirmationname}{Selbstst\"andigkeitserkl\"arung}%
+\tud@localization@german{\confirmationname}{Selbstst\"andigkeitserkl\"arung}
\tud@localization@german{\confirmationtext}{%
- Hiermit versichere ich, dass ich die vorliegende Arbeit
- \ifx\@@title\@empty\else{} mit dem Titel \emph{\@@title} \fi
- selbstst\"andig und ohne unzul\"assige Hilfe Dritter verfasst habe.
- Es wurden keine anderen als die in der Arbeit angegebenen Hilfsmittel
- und Quellen benutzt. Die w\"ortlichen und sinngem\"a\ss{}
- \"ubernommenen Zitate habe ich als solche kenntlich gemacht.
+ Hiermit versichere ich, dass ich das vorliegende Dokument %
+ \ifx\@@title\@empty\else mit dem Titel \emph{\@@title} \fi%
+ selbstst\"andig und ohne unzul\"assige Hilfe Dritter verfasst habe. %
+ Es wurden keine anderen als die in diesem Dokument angegebenen Hilfsmittel %
+ und Quellen benutzt. Die w\"ortlichen und sinngem\"a\ss{} %
+ \"ubernommenen Zitate habe ich als solche kenntlich gemacht. %
\ifx\@supporter\@empty%
- Es waren keine weiteren Personen an der geistigen Herstellung
- der vorliegenden Arbeit beteiligt.
+ Es waren keine weiteren Personen an der geistigen Herstellung %
+ des vorliegenden Dokumentes beteiligt. %
\else%
- W\"ahrend der Anfertigung dieser Arbeit wurde ich nur von
+ W\"ahrend der Anfertigung dieses Dokumentes wurde ich nur von %
folgenden Personen unterst\"utzt:%
\begin{quote}\def\and{\newline}\@supporter\end{quote}%
- \noindent Weitere Personen waren an der geistigen Herstellung
- der vorliegenden Arbeit nicht beteiligt.
+ \noindent Zus\"atzliche Personen waren an der geistigen Herstellung %
+ des vorliegenden Dokumentes nicht beteiligt. %
\fi%
- Mir ist bekannt, dass die Nichteinhaltung dieser Erkl\"arung zum
+ Mir ist bekannt, dass die Nichteinhaltung dieser Erkl\"arung zum %
nachtr\"aglichen Entzug des Hochschulabschlusses f\"uhren kann.%
-}%
-\tud@localization@german{\blockingname}{Sperrvermerk}%
+}
+\tud@localization@german{\blockingname}{Sperrvermerk}
\tud@localization@german{\blockingtext}{%
- Diese Arbeit
- \ifx\@@title\@empty\else{} mit dem Titel \emph{\@@title} \fi
- enth\"alt vertrauliche Informationen\ifx\@company\@empty\else
- , offengelegt durch \emph{\@company}\fi. Ver\"offentlichungen,
- Vervielf\"altigungen und Einsichtnahme~-- auch nur auszugsweise~--
- sind ohne ausdr\"uckliche Genehmigung \ifx\@company\@empty\else
- durch \emph{\@company} \fi nicht gestattet, ebenso wie
- Ver\"offentlichungen \"uber den Inhalt dieser Arbeit. Die
- vorliegende Arbeit ist nur dem Betreuer an der Technischen
- Universit\"at Dresden, den Gutachtern sowie den Mitgliedern
- des Pr\"ufungsausschusses zug\"anglich zu machen.%
-}%
+ Dieses Dokument %
+ \ifx\@@title\@empty\else mit dem Titel \emph{\@@title} \fi%
+ enth\"alt vertrauliche Informationen%
+ \ifx\@company\@empty\else, offengelegt durch \emph{\@company}\fi. %
+ Ver\"offentlichungen, Vervielf\"altigungen und Einsichtnahme~-- auch nur %
+ auszugsweise~-- sind ohne ausdr\"uckliche Genehmigung %
+ \ifx\@company\@empty\else durch \emph{\@company} \fi%
+ nicht gestattet, ebenso wie Ver\"offentlichungen \"uber den Inhalt dieses %
+ Dokumentes. Es ist nur dem Betreuer an der Technischen Universit\"at %
+ Dresden, den Gutachtern sowie den Mitgliedern des Pr\"ufungsausschusses %
+ zug\"anglich zu machen.%
+}
%</book|report|article>
-\tud@localization@german{\coursename}{Studiengang}%
-\tud@localization@german{\disciplinename}{Studienrichtung}%
-\tud@localization@german{\listingname}{Quelltext}%
-\tud@localization@german{\listlistingname}{Quelltextverzeichnis}%
-\tud@localization@german{\dissertationname}{Dissertation}%
-\tud@localization@german{\diplomathesisname}{Diplomarbeit}%
-\tud@localization@german{\masterthesisname}{Master-Arbeit}%
-\tud@localization@german{\bachelorthesisname}{Bachelor-Arbeit}%
-\tud@localization@german{\studentthesisname}{Studienarbeit}%
-\tud@localization@german{\studentresearchname}{Gro\ss{}er Beleg}%
-\tud@localization@german{\projectpapername}{Projektarbeit}%
-\tud@localization@german{\seminarpapername}{Seminararbeit}%
-\tud@localization@german{\termpapername}{Hausarbeit}%
-\tud@localization@german{\researchname}{Forschungsbericht}%
-\tud@localization@german{\logname}{Protokoll}%
-\tud@localization@german{\internshipname}{Praktikumsbericht}%
-\tud@localization@german{\reportname}{Bericht}%
+\tud@localization@german{\coursename}{Studiengang}
+\tud@localization@german{\disciplinename}{Studienrichtung}
+\tud@localization@german{\listingname}{Quelltext}
+\tud@localization@german{\listlistingname}{Quelltextverzeichnis}
+\tud@localization@german{\dissertationname}{Dissertation}
+\tud@localization@german{\diplomathesisname}{Diplomarbeit}
+\tud@localization@german{\masterthesisname}{Master-Arbeit}
+\tud@localization@german{\bachelorthesisname}{Bachelor-Arbeit}
+\tud@localization@german{\studentthesisname}{Studienarbeit}
+\tud@localization@german{\studentresearchname}{Gro\ss{}er Beleg}
+\tud@localization@german{\projectpapername}{Projektarbeit}
+\tud@localization@german{\seminarpapername}{Seminararbeit}
+\tud@localization@german{\termpapername}{Hausarbeit}
+\tud@localization@german{\researchname}{Forschungsbericht}
+\tud@localization@german{\logname}{Protokoll}
+\tud@localization@german{\internshipname}{Praktikumsbericht}
+\tud@localization@german{\reportname}{Bericht}
% \end{macrocode}
%
% \iffalse
@@ -670,9 +670,9 @@
% Hier erfolgen für die Klasse \cls{tudscrposter} sowie das Paket
% \pkg{tudscrsupervisor} weitere Definitionen.
% \begin{macrocode}
-\tud@localization@german{\authorname}{Autor}%
-\tud@localization@german{\contactname}{Kontakt}%
-\tud@localization@german{\contactpersonname}{Ansprechpartner}%
+\tud@localization@german{\authorname}{Autor}
+\tud@localization@german{\contactname}{Kontakt}
+\tud@localization@german{\contactpersonname}{Ansprechpartner}
% \end{macrocode}
%
% \iffalse
@@ -682,22 +682,22 @@
%
% Hier erfolgen für das Paket \pkg{tudscrsupervisor} weitere Definitionen.
% \begin{macrocode}
-\tud@localization@german{\taskname}{Aufgabenstellung}%
-\tud@localization@german{\tasktext}{f\"ur die Anfertigung einer}%
-\tud@localization@german{\namesname}{Name}%
-\tud@localization@german{\issuedatetext}{Ausgeh\"andigt am}%
-\tud@localization@german{\duedatetext}{Einzureichen am}%
-\tud@localization@german{\chairmanname}{Pr\"ufungsausschussvorsitzender}%
-\tud@localization@german{\focusname}{Schwerpunkte der Arbeit}%
-\tud@localization@german{\objectivesname}{Ziele der Arbeit}%
-\tud@localization@german{\evaluationname}{Gutachten}%
-\tud@localization@german{\evaluationtext}{f\"ur die}%
-\tud@localization@german{\contentname}{Inhalt}%
-\tud@localization@german{\assessmentname}{Bewertung}%
+\tud@localization@german{\taskname}{Aufgabenstellung}
+\tud@localization@german{\tasktext}{f\"ur die Anfertigung einer}
+\tud@localization@german{\namesname}{Name}
+\tud@localization@german{\issuedatetext}{Ausgeh\"andigt am}
+\tud@localization@german{\duedatetext}{Einzureichen am}
+\tud@localization@german{\chairmanname}{Pr\"ufungsausschussvorsitzender}
+\tud@localization@german{\focusname}{Schwerpunkte der Arbeit}
+\tud@localization@german{\objectivesname}{Ziele der Arbeit}
+\tud@localization@german{\evaluationname}{Gutachten}
+\tud@localization@german{\evaluationtext}{f\"ur die}
+\tud@localization@german{\contentname}{Inhalt}
+\tud@localization@german{\assessmentname}{Bewertung}
\tud@localization@german{\gradetext}{%
Die Arbeit wird mit der Note \textbf{\@grade} bewertet.%
-}%
-\tud@localization@german{\noticename}{Aushang}%
+}
+\tud@localization@german{\noticename}{Aushang}
% \end{macrocode}
%
% \iffalse
@@ -707,8 +707,8 @@
%
% Dies sind die Bezeichner für die Quelltextdokumentation.
% \begin{macrocode}
-\tud@localization@german{\tud@general@name}{Allgemein}%
-\tud@localization@german{\tud@implementation@name}{Implementierung}%
+\tud@localization@german{\tud@general@name}{Allgemein}
+\tud@localization@german{\tud@implementation@name}{Implementierung}
\tud@localization@german{\tud@changes@name}{\"Anderungsliste}
\tud@localization@german{\tud@todo@name}{Liste der noch zu erledigenden Punkte}
\tud@localization@german{\tud@environment@name}{Umg.}
@@ -734,13 +734,13 @@
\tud@localization@german{\tud@parameter@name}{Param.}
\tud@localization@german{\tud@parameters@name}{Parameter}
\tud@localization@german{\tud@index@text}{%
- Kursive Zahlen entsprechen der Seite, auf welcher der korrespondierende
- Eintrag beschrieben wird. Unterstrichene Zahlen verweisen auf die
- \ifcodeline@index Codezeile der \fi Definition.
+ Kursive Zahlen entsprechen der Seite, auf welcher der korrespondierende %
+ Eintrag beschrieben wird. Unterstrichene Zahlen verweisen auf die %
+ \ifcodeline@index Codezeile der \fi Definition. %
\ifscan@allowed%
- Alle weiteren Eintr\"age sind
- \ifcodeline@index Zeilennummern\else Seitenzahlen\fi,
- wo der jeweilige Eintrag verwendet wird.
+ Alle weiteren Eintr\"age sind %
+ \ifcodeline@index Zeilennummern\else Seitenzahlen\fi, %
+ wo der jeweilige Eintrag verwendet wird.%
\fi%
}
% \end{macrocode}
@@ -776,7 +776,7 @@
% die deutsche Sprache und ihre Dialekte.
% \begin{macrocode}
%<*book|report|article>
-\tud@localization@english{\graduationtext}{to achieve the academic degree}%
+\tud@localization@english{\graduationtext}{to achieve the academic degree}
\tud@localization@english{\refereename}{%
\tud@ifin@and{\@referee}{%
\ifx\refereeothername\@empty%
@@ -785,8 +785,8 @@
First referee%
\fi%
}{Referee}%
-}%
-\tud@localization@english{\refereeothername}{Second referee}%
+}
+\tud@localization@english{\refereeothername}{Second referee}
\tud@localization@english{\advisorname}{%
\tud@ifin@and{\@advisor}{%
\ifx\advisorothername\@empty%
@@ -795,8 +795,8 @@
First advisor%
\fi%
}{Advisor}%
-}%
-\tud@localization@english{\advisorothername}{}%
+}
+\tud@localization@english{\advisorothername}{}
\tud@localization@english{\supervisorname}{%
\tud@ifin@and{\@supervisor}{%
\ifx\supervisorothername\@empty%
@@ -805,8 +805,8 @@
First supervisor%
\fi%
}{Supervisor}%
-}%
-\tud@localization@english{\supervisorothername}{}%
+}
+\tud@localization@english{\supervisorothername}{}
\tud@localization@english{\professorname}{%
\tud@ifin@and{\@professor}{%
\ifx\professorothername\@empty%
@@ -815,73 +815,71 @@
First supervising professor%
\fi%
}{Supervising professor}%
-}%
-\tud@localization@english{\professorothername}{}%
-\tud@localization@english{\datetext}{Submitted on}%
-\tud@localization@english{\dateofbirthtext}{Born on}%
-\tud@localization@english{\placeofbirthtext}{in}%
-\tud@localization@english{\defensedatetext}{Defended on}%
-\tud@localization@english{\matriculationyearname}{Matriculation year}%
-\tud@localization@english{\matriculationnumbername}{Matriculation number}%
-\tud@localization@english{\coverpagename}{Cover page}%
-\tud@localization@english{\titlepagename}{Title page}%
-\tud@localization@english{\titlename}{Title}%
+}
+\tud@localization@english{\professorothername}{}
+\tud@localization@english{\datetext}{Submitted on}
+\tud@localization@english{\dateofbirthtext}{Born on}
+\tud@localization@english{\placeofbirthtext}{in}
+\tud@localization@english{\defensedatetext}{Defended on}
+\tud@localization@english{\matriculationyearname}{Matriculation year}
+\tud@localization@english{\matriculationnumbername}{Matriculation number}
+\tud@localization@english{\coverpagename}{Cover page}
+\tud@localization@english{\titlepagename}{Title page}
+\tud@localization@english{\titlename}{Title}
%<*book>
-\tud@localization@english{\abstractname}{Abstract}%
+\tud@localization@english{\abstractname}{Abstract}
%</book>
-\tud@localization@english{\confirmationname}{Statement of authorship}%
+\tud@localization@english{\confirmationname}{Statement of authorship}
\tud@localization@english{\confirmationtext}{%
- I hereby certify that I have authored this
- \ifx\@@thesis\@empty thesis \else\@@thesis{} \fi
- \ifx\@@title\@empty\else{} entitled \emph{\@@title} \fi
- independently and without undue assistance from third
- parties. No other than the resources and references
- indicated in this thesis have been used. I have marked
- both literal and accordingly adopted quotations as such.
+ I hereby certify that I have authored this document %
+ \ifx\@@title\@empty\else entitled \emph{\@@title} \fi%
+ independently and without undue assistance from third %
+ parties. No other than the resources and references %
+ indicated in this document have been used. I have marked %
+ both literal and accordingly adopted quotations as such. %
\ifx\@supporter\@empty%
- There were no additional persons involved in the
- intellectual preparation of the present thesis.
+ There were no additional persons involved in the %
\else%
- During the preparation of this thesis I was only
+ During the preparation of this document I was only %
supported by the following persons:%
\begin{quote}\def\and{\newline}\@supporter\end{quote}%
- \noindent Additional persons were not involved in the
- intellectual preparation of the present thesis.
+ \noindent Additional persons were not involved in the %
\fi%
- I am aware that violations of this declaration may lead to
- subsequent withdrawal of the degree.%
-}%
-\tud@localization@english{\blockingname}{Restriction note}%
+ intellectual preparation of the present document. %
+ I am aware that violations of this declaration may lead to %
+ subsequent withdrawal of the academic degree.%
+}
+\tud@localization@english{\blockingname}{Restriction note}
\tud@localization@english{\blockingtext}{%
- This \ifx\@@thesis\@empty thesis \else\@@thesis{} \fi
- \ifx\@@title\@empty\else{} entitled \emph{\@@title} \fi
- contains confidential data\ifx\@company\@empty\else
- , disclosed by \emph{\@company}\fi. Publications, duplications
- and inspections---even in part---are prohibited without explicit
- permission\ifx\@company\@empty\else\space by \emph{\@company}\fi,
- as well as publications about the content of this thesis.
- This thesis may only be made accessible to the supervisor at
- Technische Universit\"at Dresden, the reviewers and also the
- members of the examination board.%
-}%
+ This document %
+ \ifx\@@title\@empty\else entitled \emph{\@@title} \fi%
+ contains confidential data%
+ \ifx\@company\@empty\else, disclosed by \emph{\@company}\fi. %
+ Publications, duplications and inspections---even in part---are prohibited %
+ without explicit permission%
+ \ifx\@company\@empty\else\space by \emph{\@company}\fi, %
+ as well as publications about the content of this document. %
+ It may only be made accessible to the supervisor at Technische Universit\"at %
+ Dresden, the reviewers and also the members of the examination board.%
+}
%</book|report|article>
-\tud@localization@english{\coursename}{Course}%
-\tud@localization@english{\disciplinename}{Discipline}%
-\tud@localization@english{\listingname}{Listing}%
-\tud@localization@english{\listlistingname}{List of Listings}%
-\tud@localization@english{\dissertationname}{Dissertation}%
-\tud@localization@english{\diplomathesisname}{Diploma Thesis}%
-\tud@localization@english{\masterthesisname}{Master Thesis}%
-\tud@localization@english{\bachelorthesisname}{Bachelor Thesis}%
-\tud@localization@english{\studentthesisname}{Student Thesis}%
-\tud@localization@english{\studentresearchname}{Student Research Project}%
-\tud@localization@english{\projectpapername}{Project Paper}%
-\tud@localization@english{\seminarpapername}{Seminar Paper}%
-\tud@localization@english{\termpapername}{Term Paper}%
-\tud@localization@english{\researchname}{Research Report}%
-\tud@localization@english{\logname}{Log}%
-\tud@localization@english{\internshipname}{Internship Report}%
-\tud@localization@english{\reportname}{Report}%
+\tud@localization@english{\coursename}{Course}
+\tud@localization@english{\disciplinename}{Discipline}
+\tud@localization@english{\listingname}{Listing}
+\tud@localization@english{\listlistingname}{List of Listings}
+\tud@localization@english{\dissertationname}{Dissertation}
+\tud@localization@english{\diplomathesisname}{Diploma Thesis}
+\tud@localization@english{\masterthesisname}{Master Thesis}
+\tud@localization@english{\bachelorthesisname}{Bachelor Thesis}
+\tud@localization@english{\studentthesisname}{Student Thesis}
+\tud@localization@english{\studentresearchname}{Student Research Project}
+\tud@localization@english{\projectpapername}{Project Paper}
+\tud@localization@english{\seminarpapername}{Seminar Paper}
+\tud@localization@english{\termpapername}{Term Paper}
+\tud@localization@english{\researchname}{Research Report}
+\tud@localization@english{\logname}{Log}
+\tud@localization@english{\internshipname}{Internship Report}
+\tud@localization@english{\reportname}{Report}
% \end{macrocode}
%
% \iffalse
@@ -893,9 +891,9 @@
% Hier erfolgen für die Klasse \cls{tudscrposter} sowie das Paket
% \pkg{tudscrsupervisor} weitere Definitionen.
% \begin{macrocode}
-\tud@localization@english{\authorname}{Author}%
-\tud@localization@english{\contactname}{Contact}%
-\tud@localization@english{\contactpersonname}{Counterpart}%
+\tud@localization@english{\authorname}{Author}
+\tud@localization@english{\contactname}{Contact}
+\tud@localization@english{\contactpersonname}{Counterpart}
% \end{macrocode}
%
% \iffalse
@@ -905,22 +903,22 @@
%
% Hier erfolgen für das Paket \pkg{tudscrsupervisor} weitere Definitionen.
% \begin{macrocode}
-\tud@localization@english{\taskname}{Task}%
-\tud@localization@english{\tasktext}{for the preparation of a}%
-\tud@localization@english{\namesname}{Name}%
-\tud@localization@english{\issuedatetext}{Issued on}%
-\tud@localization@english{\duedatetext}{Due date for submission}%
-\tud@localization@english{\chairmanname}{Chairman of the Audit Committee}%
-\tud@localization@english{\focusname}{Focus of work}%
-\tud@localization@english{\objectivesname}{Objectives of work}%
-\tud@localization@english{\evaluationname}{Evaluation}%
-\tud@localization@english{\evaluationtext}{for the}%
-\tud@localization@english{\contentname}{Content}%
-\tud@localization@english{\assessmentname}{Assessment}%
+\tud@localization@english{\taskname}{Task}
+\tud@localization@english{\tasktext}{for the preparation of a}
+\tud@localization@english{\namesname}{Name}
+\tud@localization@english{\issuedatetext}{Issued on}
+\tud@localization@english{\duedatetext}{Due date for submission}
+\tud@localization@english{\chairmanname}{Chairman of the Audit Committee}
+\tud@localization@english{\focusname}{Focus of work}
+\tud@localization@english{\objectivesname}{Objectives of work}
+\tud@localization@english{\evaluationname}{Evaluation}
+\tud@localization@english{\evaluationtext}{for the}
+\tud@localization@english{\contentname}{Content}
+\tud@localization@english{\assessmentname}{Assessment}
\tud@localization@english{\gradetext}{%
The thesis is evaluated with a grade of \textbf{\@grade}.%
-}%
-\tud@localization@english{\noticename}{Notice}%
+}
+\tud@localization@english{\noticename}{Notice}
% \end{macrocode}
%
% \iffalse
@@ -930,8 +928,8 @@
%
% Dies sind die Bezeichner für die Quelltextdokumentation.
% \begin{macrocode}
-\tud@localization@english{\tud@general@name}{General}%
-\tud@localization@english{\tud@implementation@name}{Implementation}%
+\tud@localization@english{\tud@general@name}{General}
+\tud@localization@english{\tud@implementation@name}{Implementation}
\tud@localization@english{\tud@changes@name}{Change History}
\tud@localization@english{\tud@todo@name}{List of ToDos}
\tud@localization@english{\tud@environment@name}{env.}
@@ -957,13 +955,13 @@
\tud@localization@english{\tud@parameter@name}{param.}
\tud@localization@english{\tud@parameters@name}{parameters}
\tud@localization@english{\tud@index@text}{%
- Numbers written in italic refer to the page where the corresponding entry is
- described. Numbers underlined refer to the
- \ifcodeline@index code line of the \fi definition.
+ Numbers written in italic refer to the page where the corresponding entry is %
+ described. Numbers underlined refer to the %
+ \ifcodeline@index code line of the \fi definition. %
\ifscan@allowed%
- All additional entries refer to the
- \ifcodeline@index code lines \else pages \fi
- where the entry is used.
+ All additional entries refer to the %
+ \ifcodeline@index code lines \else pages \fi, %
+ where the entry is used.%
\fi%
}
% \end{macrocode}
diff --git a/macros/latex/contrib/tudscr/source/tudscr-version.dtx b/macros/latex/contrib/tudscr/source/tudscr-version.dtx
index cfb82fc431..8632182178 100644
--- a/macros/latex/contrib/tudscr/source/tudscr-version.dtx
+++ b/macros/latex/contrib/tudscr/source/tudscr-version.dtx
@@ -128,7 +128,7 @@
%<*!(package|class)>
\fi
%</!(package|class)>
- \TUD@Version@Check{2020/09/29 v2.06j TUD-Script}
+ \TUD@Version@Check{2020/11/10 v2.06k TUD-Script}
\endgroup
% \end{macrocode}
% \end{macro}^^A \TUDScriptVersionNumber
diff --git a/macros/latex/contrib/univie-ling/README b/macros/latex/contrib/univie-ling/README
index cacaac168a..1670d15cae 100644
--- a/macros/latex/contrib/univie-ling/README
+++ b/macros/latex/contrib/univie-ling/README
@@ -80,6 +80,18 @@ also have a look at the example files.
== CHANGES ==
+V. 1.13 (2020-11-11)
+ - univie-ling.bbx:
+ * Fix whitespace issue in thematic issue string.
+ - univie-ling-wlg:
+ * Use totpages package rather than lastpage in order to fix
+ clash with totpages which is loaded by a secondary package.
+ * New option "peerrev".
+ * New option "preprint".
+ * Factor out editorial data to new univie-ling-wlg.cls file.
+ * Make editorial data configurable locally via \edboardGL, \edboardAL,
+ \edboardHL, and \techboard.
+
V. 1.12 (2020-06-25)
- univie-ling.bbx:
- univie-ling.cbx:
diff --git a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx
index 6653932124..c88d648c0c 100644
--- a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx
+++ b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx
@@ -36,7 +36,7 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ProvidesFile{univie-ling.bbx}[2019/05/21 v1.11dev biblatex bibliography style]
+\ProvidesFile{univie-ling.bbx}[2020/11/11 v1.13 biblatex bibliography style]
% Load base style (authoryear)
\RequireBibliographyStyle{authoryear}
@@ -314,8 +314,8 @@
\iffieldundef{issuetitle}{}{%
\usebibmacro{issue}%
\adddotspace%
- [\bibstring{specialissue}]%
- }
+ \printtext[brackets]{\bibstring{specialissue}}%
+ }%
\setunit{\addcolon\space}%
\usebibmacro{issue+date}%
\usebibmacro{periodical}%
diff --git a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx
index 3d7c4f8c20..8f9720a39a 100644
--- a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx
+++ b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx
@@ -34,7 +34,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ProvidesFile{univie-ling.cbx}[2019/05/21 v1.11dev biblatex citation style]
+\ProvidesFile{univie-ling.cbx}[2020/11/11 v1.13 biblatex citation style]
\RequireCitationStyle{authoryear}
diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf
index 4c6af984c7..7963775007 100644
--- a/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf
+++ b/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
index b2d5c3bc20..523eac6312 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
index 0b57dab8b1..627a7fe84e 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
@@ -59,7 +59,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 1.12, 2020/06/25}
+\date{Version 1.13, 2020/11/11}
\maketitle
@@ -131,20 +131,38 @@ The class can generate a titlepage in two different forms.
With \joption{issue}, a title page for a whole journal issue is output.
With \joption{specialprint}, a special print (``Sonderdruck'') title page suitable for single articles
is generated.
+ \item{\joption{peerrev=true|false}}: If \joption{true}, a statement is added to the imprint stating that the papers
+ of this issue have undergone double-blind peer review.
+ \item{\joption{preprint=true|false}}: If \joption{true}, the issue is marked as preprint on the titlepage and in
+ the journal metadata. Pagination info in these places is suppressed.
\end{description}
\section{General settings}
\subsection{Editorial data}
+Data for a particular issue can be set via:
+
\begin{description}
\setlength\itemsep{0pt}
\item{\jcsmacro{startpage\{<page>\}}} Set start pagination (default: 1).
\item{\jcsmacro{issue\{<number>\}\{<year>\}}} Set journal issue (number and year)
\item{\jcsmacro{issuetitle\{<title>\}}} Set title of special issue
\item{\jcsmacro{issuesubtitle\{<subtitle>\}}} Set subtitle of special issue
- \item{\jcsmacro{issueeditors\{<names>\}}} Set editors of special issue.
\end{description}
+%
+If needed, the editorial board (as printed in the imprint) can be adapted for a particular issue via:
+
+\begin{description}
+ \setlength\itemsep{0pt}
+ \item{\jcsmacro{edboardGL\{<name>\}}} Set editorial board member(s) for General Linguistics
+ \item{\jcsmacro{edboardAL\{<name>\}}} Set editorial board member(s) for Applied Linguistics
+ \item{\jcsmacro{edboardHL\{<name>\}}} Set editorial board member(s) for Historical Linguistics
+ \item{\jcsmacro{techboard\{<name>\}}} Set technical board member(s)
+\end{description}
+%
+In general, the data for the editorial board should be set/changed in a local copy of the file
+\texttt{univie-ling-wlg.cls} which is shipped with this class.
\subsection{Titling}
@@ -162,6 +180,8 @@ Use \jfcsmacro{maketitle} to set the title after the above settings have been ma
\subsection{Abstract and keywords}
The abstract is set with the \jmacro{abstract} environment.
Keywords (following the abstract) are set with the \jcsmacro{keywords\{<comma-separated keywords>\}} macro.
+Please note that language switches for abstracts in a different language should be done inside the \jmacro{abstract}
+environment. It is suggested to use \textsf{babel}'s \jfmacro{otherlanguage} environment for this purpose.
\subsection{Structuring}
@@ -207,18 +227,28 @@ A layout for \LyX\footnote{See \url{https://www.lyx.org}.}\ can be retrieved fro
A template is provided as well: \url{https://github.com/jspitz/univie-ling/raw/master/lyx/templates/template-wlg-article.lyx}.
-\clearpage
\section{Release History}
+\raggedright
\begin{itemize}
+ \item 2020/11/11 (v.\,1.13)
+ \begin{itemize}
+ \item Use \textsf{totpages} package rather than \textsf{lastpage} in order to fix
+ clash with \textsf{totpages} which is loaded by a secondary package.
+ \item New option \joption{peerrev}.
+ \item New option \joption{preprint}.
+ \item Factor out editorial data to new \texttt{univie-ling-wlg.cls} file
+ \item Make editorial data configurable locally via \jcsmacro{edboardGL}, \jcsmacro{edboardAL},
+ \jcsmacro{edboardHL}, and \jcsmacro{techboard}.
+ \end{itemize}
\item 2020/06/25 (v.\,1.12) Adapt to compatibility-breaking \textsf{doclicense} change.
\item 2020/05/05 (v.\,1.11) Update editorial board info.
\item 2020/05/01 (v.\,1.10) Fix encoding incompatibilities.
\item 2019/01/21 (v.\,1.9) No change to this class.
\item 2019/01/15 (v.\,1.8) No change to this class.
\item 2018/11/07 (v.\,1.7) No change to this class.
- \item 2018/11/04 (v.\,1.6) Remove \jmacro{subexamples} environment as this is now provided by \textsf{covington}.
+ \item 2018/11/04 (v.\,1.6) Remove \jmacro{subexamples} environment as this is now provided by \textsf{covington}.
\item 2018/09/03 (v.\,1.5)
\begin{itemize}
\item Introduce \jmacro{subexamples} environment.
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
index 93bd987bff..d283f4f3d0 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
@@ -31,7 +31,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-expose}[2020/06/25 v1.12 Univie Linguistic Exposes (JSp)]
+\ProvidesPackage{univie-ling-expose}[2020/11/11 v1.13 Univie Linguistic Exposes (JSp)]
\RequirePackage{xkeyval}
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
index e57d4ebbfc..a9ad7ed788 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
@@ -31,7 +31,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-paper}[2020/06/25 v1.12 Univie Linguistic Papers (JSp)]
+\ProvidesPackage{univie-ling-paper}[2020/11/11 v1.13 Univie Linguistic Papers (JSp)]
\RequirePackage{xkeyval}
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
index b3ede80b77..364d8519a1 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
@@ -31,7 +31,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-thesis}[2020/06/25 v1.12 Univie Linguistic Theses (JSp)]
+\ProvidesPackage{univie-ling-thesis}[2020/11/11 v1.13 Univie Linguistic Theses (JSp)]
\RequirePackage{xkeyval}
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cfg b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cfg
new file mode 100644
index 0000000000..5e6bfc32a7
--- /dev/null
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cfg
@@ -0,0 +1,20 @@
+%
+% Configuration for WLG class
+%
+
+%
+% Editorial Board
+%
+% General Linguistics
+\edboardGL{Markus P\"ochtrager}
+% Applied Linguistics
+\edboardAL{Mi-Cha Flubacher, Jonas Hassemer \& Sabine Lehner}%
+% Historical Linguistics
+\edboardHL{Stefan Schumacher}
+
+%
+% Technical Board
+%
+%\techboard{John Doe}
+
+% finis
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
index 2dcbbbbe83..c9b73cc905 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
@@ -32,7 +32,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-wlg}[2020/06/25 v1.12 WLG journal layout (JSp)]
+\ProvidesPackage{univie-ling-wlg}[2020/11/11 v1.13 WLG journal layout (JSp)]
%% ============================================================
@@ -103,6 +103,20 @@
}
\DeclareOptionX{titlepage}{\setkeys{wlg}{ttp=#1}}
+% preprint=<true|false>
+\define@boolkey+{wlg}{preprint}[true]{%
+}{%
+ \ClassWarning{univie-ling-wlg}{unknown preprint value}%
+}
+\DeclareOptionX{preprint}{\setkeys{wlg}{preprint=#1}}
+
+% peerrev=<true|false>
+\define@boolkey+{wlg}{peerrev}[true]{%
+}{%
+ \ClassWarning{univie-ling-wlg}{unknown peerrev value}%
+}
+\DeclareOptionX{peerrev}{\setkeys{wlg}{peerrev=#1}}
+
\DeclareOption*{%
\PassOptionsToClass{\CurrentOption}{scrartcl}%
}
@@ -130,6 +144,18 @@
\fi
\recalctypearea
+
+%% ============================================================
+%% CONFIGURATION:
+%% ============================================================
+
+\newcommand*\edboardAL[1]{\def\wlg@edboardAL{#1}}
+\newcommand*\edboardGL[1]{\def\wlg@edboardGL{#1}}
+\newcommand*\edboardHL[1]{\def\wlg@edboardHL{#1}}
+\newcommand*\techboard[1]{\def\wlg@techboard{#1}}
+
+\InputIfFileExists{univie-ling-wlg.cfg}
+
%% ============================================================
%% FONTS UND MICROTYPOGRAPHY:
%% ============================================================
@@ -182,6 +208,12 @@
\deftranslation[to=English]{published}{Published}
\deftranslation[to=German]{specialprint}{Sonderdruck aus:}
\deftranslation[to=English]{specialprint}{Special print from:}
+\deftranslation[to=German]{peerrev}{Die Beitr\"age dieser Ausgabe wurden einer Doppelblindbegutachtung unterzogen.}
+\deftranslation[to=English]{peerrev}{The papers of this issue have undergone double-blind peer review.}
+\deftranslation[to=German]{preprintfrom}{Vorabdruck aus:}
+\deftranslation[to=English]{preprintfrom}{Preprint from:}
+\deftranslation[to=German]{preprint}{Vorabdruck}
+\deftranslation[to=English]{preprint}{Preprint}
\deftranslation[to=German]{specialissue}{Themenheft}
\deftranslation[to=English]{specialissue}{Special Issue}
\deftranslation[to=German]{keywords}{Schlagw\"orter}
@@ -225,8 +257,8 @@
\AtBeginDocument{%
-\addto\captionsngerman{\renewcommand*\contentsname{Inhalt}}
-\addto\captionsnaustrian{\renewcommand*\contentsname{Inhalt}}
+\addto\captionsngerman{\renewcommand*\contentsname{Inhalt}}%
+\addto\captionsnaustrian{\renewcommand*\contentsname{Inhalt}}%
}
\AtEndPreamble{
% License
@@ -252,11 +284,22 @@
\setlength\itemsep{0pt}
\setlength\parsep{0pt}
\setlength{\parskip}{0pt}
+\def\wlg@lb{}
\item[\textbf{\translate{edboard}:}]
- Markus P\"ochtrager (\translate{general}),\\
- Mi-Cha Flubacher, Jonas Hassemer \& Sabine Lehner (\translate{applied}),\\
- Stefan Schumacher (\translate{hist})
-%\item[\textbf{\translate{techboard}:}] Markus Rheindorf
+ \ifcsname wlg@edboardGL\endcsname
+ \wlg@edboardGL\ (\translate{general}),%
+ \def\wlg@lb{\\}%
+ \fi
+ \ifcsname wlg@edboardAL\endcsname
+ \wlg@lb\wlg@edboardAL\ (\translate{applied}),%
+ \def\wlg@lb{\\}%
+ \fi
+ \ifcsname wlg@edboardHL\endcsname
+ \wlg@lb\wlg@edboardHL\ (\translate{hist})
+ \fi
+\ifcsname wlg@techboard\endcsname
+ \item[\textbf{\translate{techboard}:}] \wlg@techboard
+\fi
\item[\textbf{\translate{contact}:}] \href{mailto:wlg@univie.ac.at}{wlg@univie.ac.at}
\item[\textbf{Homepage:}] \expandafter\url{\wlgurl}
\end{labeling}
@@ -269,6 +312,9 @@
\item[\textbf{\textsc{nbn}:}] BI,078,1063
\end{labeling}
\vspace*{-.5em}
+\ifKV@wlg@peerrev
+ \noindent\translate{peerrev}\par\vspace*{.5em}
+\fi
\noindent\translate{appform}\par
\setlength{\doclicense@hsize}{\textwidth-\doclicense@imagewidth-\doclicense@imagedistance}%
\begin{center}
@@ -333,12 +379,12 @@
\immediate\write\@auxout{\noexpand\newlabel{LastFrontPage}{{}{\arabic{page}}}}%
\@mainmattertrue\@frontmatterfalse%
\pagenumbering{arabic}%
- \def\computelastpage{\pageref{LastPage}}%
+ \def\computelastpage{\pageref{TotPages}}%
\def\startpageref{\thestartpage}%
}
\newcommand*\backmatter{%
\if@openright\cleardoubleoddpage\else\clearpage\fi\@mainmatterfalse\@frontmatterfalse%
- \def\computelastpage{\pageref{LastPage}}%
+ \def\computelastpage{\pageref{TotPages}}%
\def\startpageref{\thestartpage}%
}
@@ -371,9 +417,9 @@
%% TITLING
%% ============================================================
-\RequirePackage{lastpage}
+\RequirePackage{totpages}
\RequirePackage{refcount}
-\def\computelastpage{\pageref{LastPage}}%
+\def\computelastpage{\pageref{TotPages}}%
\def\lastpageref{\computelastpage}%
\def\startpageref{\thestartpage}%
\RequirePackage{xcolor}
@@ -552,8 +598,10 @@ pdfborder={0 0 0}
}%
}%
\vfill
- {\usekomafont{date}{\translate{specialprint} \emph{Wiener Linguistische Gazette} (\versal{WLG})
- \@issue\ (\@pubyear): \startpageref--\lastpageref\par}}
+ {\usekomafont{date}{\ifKV@wlg@preprint\translate{preprintfrom}%
+ \else\translate{specialprint}\fi\ \emph{Wiener Linguistische Gazette}
+ (\versal{WLG})
+ \@issue\ (\@pubyear)\ifKV@wlg@preprint\else: \startpageref--\lastpageref\fi\par}}
{\ifx\@issuetitle\@empty\else
\vskip 1em
\usekomafont{date}{\translate{specialissue} \itshape\@issuetitle
@@ -691,7 +739,9 @@ pdfborder={0 0 0}
\emph{Wiener Linguistische Gazette} (\versal{WLG})\par
\translate{lingdep}\par
\translate{univie}\par
- \translate{issue} \@issue\ (\@pubyear): \thepage--\lastpageref
+ \translate{issue} \@issue\ (\@pubyear):
+ \ifKV@wlg@preprint\translate{preprint}%
+ \else\thepage--\lastpageref\fi%
}%
\vskip \z@ \@plus 1em
{\usekomafont{publishers}{\@publishers \par}}%
@@ -707,7 +757,7 @@ pdfborder={0 0 0}
% Rewrite \include for local LastPage counter
\def\@include#1 {%
\def\ljobname{#1}%
- \def\lastpageref{\pageref{LastPage#1}}%
+ \def\lastpageref{\pageref{TotPages#1}}%
\clearpage
\if@filesw
\immediate\write\@mainaux{\string\@input{#1.aux}}%
@@ -729,7 +779,7 @@ pdfborder={0 0 0}
\newrefsection
\fi
\@input@{#1.tex}%
- \label{LastPage#1}%
+ \label{TotPages#1}%
\clearpage
\@writeckpt{#1}%
\if@filesw
@@ -813,18 +863,18 @@ pdfborder={0 0 0}
\addsec*{\hspace*{2.4em}Abstract}
\quotation\noindent\ignorespaces%
}{%
- \if@twocolumn\else\endquotation\fi
+ \if@twocolumn\else\endquotation\fi%
}
% Keywords
\newcommand\keywords[1]{%
- \begin{quote}
- \begin{labeling}{\textbf{\translate{keywords}:}}
+ \begin{quote}%
+ \begin{labeling}{\textbf{\translate{keywords}:}}%
\RaggedRight\small%
\item[\textbf{\translate{keywords}:}]
#1%
- \end{labeling}
- \end{quote}
+ \end{labeling}%
+ \end{quote}%
}
% Motto