texlive[65037] Master/texmf-dist: biblatex-chicago (17nov22)
commits+karl at tug.org
commits+karl at tug.org
Thu Nov 17 21:58:20 CET 2022
Revision: 65037
http://tug.org/svn/texlive?view=revision&revision=65037
Author: karl
Date: 2022-11-17 21:58:19 +0100 (Thu, 17 Nov 2022)
Log Message:
-----------
biblatex-chicago (17nov22)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/biblatex-chicago/README
trunk/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE
trunk/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex
trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-intro.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-intro.tex
trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.tex
trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-legal-sample.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-legal-sample.tex
trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-noteref-demo.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-noteref-demo.tex
trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-intro.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-intro.tex
trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.tex
trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-appendix.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-appendix.tex
trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.pdf
trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.tex
trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common16.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes16.bbx
trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes16.cbx
trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cmsdocs.sty
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-chicago/README 2022-11-17 00:49:44 UTC (rev 65036)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-chicago/README 2022-11-17 20:58:19 UTC (rev 65037)
@@ -1,7 +1,7 @@
IMPORTANT NOTE:
This is the package formerly known as biblatex-chicago-notes-df. It
-is designed for use with the latest version (3.18) of biblatex. The
+is designed for use with the latest version (3.18b) of biblatex. The
package contains the 17th-edition Chicago style files, and I am also
maintaining the 16th-edition files for those for whom they remain a
necessity, though I have deprecated these older files and will remove
@@ -15,7 +15,7 @@
backend for all the included styles (version 2.18 is designed for use
with the latest biblatex).
-README (version 2.3, 2022-07-02):
+README (version 2.3a, 2022-11-17):
Biblatex-chicago contains three biblatex styles implementing the
specifications of the Chicago Manual of Style, 17th edition. The
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE 2022-11-17 00:49:44 UTC (rev 65036)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-chicago/RELEASE 2022-11-17 20:58:19 UTC (rev 65037)
@@ -1,3 +1,12 @@
+Release notes for version 2.3a [2022-11-17]:
+
+This release backports a bug-fix from the most recent LaTeX3
+programming layer. If you are using biblatex 3.18b and an older L3
+layer then the processing of your documents could fail and fall into
+an infinite loop, leaving behind an inscrutable message in your log
+file. This update should prevent that, and also fixes a few other
+minor glitches.
+
Release notes for version 2.3 [2022-07-02]:
All styles now require the current biblatex (3.18) and biber (2.18).
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex 2022-11-17 00:49:44 UTC (rev 65036)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-chicago/biblatex-chicago.tex 2022-11-17 20:58:19 UTC (rev 65037)
@@ -26,10 +26,10 @@
% \usepackage[scaled=0.9]{ClearSans}
% \usepackage[p]{zlmtt}
% \usepackage{gentium}
-\setmainfont{GentiumPlus-R.ttf}[
-ItalicFont = GentiumPlus-I.ttf,
-BoldFont = GenBasB.ttf,
-BoldItalicFont = GenBasBI.ttf]
+\setmainfont{GentiumPlus-Regular.ttf}[
+ItalicFont = GentiumPlus-Italic.ttf,
+BoldFont = GentiumPlus-Bold.ttf,
+BoldItalicFont = GentiumPlus-BoldItalic.ttf]
\setsansfont{ClearSans-Regular.ttf}[
BoldFont = ClearSans-Bold.ttf,
ItalicFont = ClearSans-Italic.ttf,
@@ -117,7 +117,7 @@
Style files for biblatex
\vspace{.3\baselineskip}
-\sffamily\normalsize\bfseries David Fussner\qquad Version 2.3\\
+\sffamily\normalsize\bfseries David Fussner\qquad Version 2.3a\\
\href{mailto:djf027 at googlemail.com}{djf027 at googlemail.com}\\ \today
\end{center}
@@ -150,6 +150,8 @@
to let me know, and of course any suggestions for solving problems
more elegantly or accurately would be most welcome.}
+\enlargethispage{\baselineskip}
+
\mylittlespace\textbf{Important Note:} If you have used
\textsf{biblatex-chicago} before, especially if you've been using
anything earlier than version 2.0, please make sure you have read the
@@ -215,7 +217,7 @@
\begin{itemize}{}{}
\item The \textsf{biblatex} package, of course! The current version
- --- 3.18 at the time of writing --- has received extensive testing,
+ --- 3.18b at the time of writing --- has received extensive testing,
and contains features and bug fixes upon which my code relies.
Please don't use any earlier version. \textsf{Biblatex} requires
several packages, and it strongly recommends several more:
@@ -223,7 +225,7 @@
\item \textsf{biber} --- the next-generation \textsc{Bib}\TeX\
replacement by Philip Kime and Fran\c{c}ois Charette, available
from SourceForge (required). You should use the latest version,
- 2.18, to work with \textsf{biblatex} 3.18 and
+ 2.18, to work with \textsf{biblatex} 3.18b and
\textsf{biblatex-chicago}; please note that any other backend will
not produce accurate results.
\item e-\TeX\ (required)
@@ -238,8 +240,11 @@
\item \textsf{babel} --- a standard package (\emph{strongly}
recommended)
\item \textsf{csquotes} --- available from CTAN (recommended).
- Please upgrade to the latest version of \textsf{csquotes} (5.2l).
+ Please upgrade to the latest version of \textsf{csquotes} (5.2n).
\end{itemize}
+\item The standard \textsf{expl3} and \textsf{xparse} packages are
+ loaded automatically for most users, and if they aren't
+ \textsf{biblatex-chicago} does it for you.
\item With recent changes both to \textsf{biblatex} and to
\textsf{biblatex-chicago}, \textsf{biblatex-chicago} itself now
requires two packages, which are both loaded for you if you load
@@ -1028,7 +1033,7 @@
information about the app's version and about the system on which it
runs (14.268; angry:birds).
-%\enlargethispage{-\baselineskip}
+%%\enlargethispage{-\baselineskip}
\mybigspace This \mymarginpar{\textbf{bookinbook}} type provides the
means of referring to parts of books that are considered, in other
@@ -1717,7 +1722,7 @@
affected by this, and of course you must be using \textsf{Biber} for
the settings to apply.
-% \enlargethispage{\baselineskip}
+% %\enlargethispage{\baselineskip}
\mylittlespace Should you wish to employ the new,
\textsf{maintitle}-first syntax, then you'll
@@ -1800,6 +1805,8 @@
please see all of the (multifarious) details in
section~\ref{sec:related}, below.
+\enlargethispage{\baselineskip}
+
\paragraph*{\protect\mymarginpar{\textbf{online}}}
\label{sec:online}
@@ -1941,7 +1948,7 @@
simplify most of your choices. If something remains unclear, please
let me know and I'll see if I can improve it.
-\enlargethispage{\baselineskip}
+%\enlargethispage{\baselineskip}
\mylittlespace A few more notes are in order. I designed the
\textsf{relatedtype} \texttt{commenton} to facilitate citation of
@@ -2000,7 +2007,7 @@
\textsf{timezone}, \textsf{urldate}, and \textsf{userd} in
section~\ref{sec:entryfields}, below.
-% \enlargethispage{\baselineskip}
+% %\enlargethispage{\baselineskip}
\mybigspace The \mymarginpar{\textbf{patent}} \emph{Manual} is very
brief on this subject (14.258), but very clear about which information
@@ -2567,7 +2574,7 @@
then \textsf{biblatex-chicago-notes} will concatenate these fields in
the formatted references.
-%\enlargethispage{-\baselineskip}
+%%\enlargethispage{-\baselineskip}
\mylittlespace As noted above, however, this field has a special
meaning in the \textsf{suppbook} entry type, used to make an
@@ -2657,7 +2664,7 @@
latter doesn't work as smoothly and completely as \textsf{biblatex's}
own name toggles.
-% \enlargethispage{\baselineskip}
+% %\enlargethispage{\baselineskip}
\mylittlespace This system of options, then, can turn off
\textsf{biblatex-chicago-notes}'s mechanism for finding a name to
@@ -2760,6 +2767,8 @@
(\textsf{suppbook}) uses \textsf{bookauthor} as the author of
\textsf{title} (polakow:afterw, prose:intro).
+\enlargethispage{2\baselineskip}
+
\mybigspace This, \mymarginpar{\vspace{-8pt}\textbf{bookpagination}}
a standard \textsf{biblatex} field, allows you automatically to prefix
the appropriate string to information you provide in a \textsf{pages}
@@ -3038,7 +3047,7 @@
preamble or in the \textsf{options} field of individual entries,
allowing you to change the settings on an entry-by-entry basis.
-\enlargethispage{2\baselineskip}
+%\enlargethispage{2\baselineskip}
\mylittlespace Please further note that in earlier releases of
\textsf{biblatex-chicago} I recommended against using
@@ -3422,7 +3431,7 @@
abbreviated references to online content than conventional URLs,
though I can find no specific reference to them in the \emph{Manual}.
-% \enlargethispage{-\baselineskip}
+% %\enlargethispage{-\baselineskip}
\mybigspace This \mymarginpar{\textbf{eventdate}} is a standard
\textsf{biblatex} field which has gradually accumulated functions in
@@ -3530,7 +3539,7 @@
while in a \textsf{report} entry it may identify any sort of
institution issuing the report.
-% \enlargethispage{\baselineskip}
+% %\enlargethispage{\baselineskip}
\mybigspace As \mymarginpar{\textbf{introduction}} with the
\textsf{afterword} and \textsf{foreword} fields above,
@@ -3722,7 +3731,7 @@
of those entry types in section~\ref{sec:entrytypes}, above, and also
table~\ref{tab:online:types} (14.208; amlen:hoot).
-% \enlargethispage{\baselineskip}
+% %\enlargethispage{\baselineskip}
\mybigspace An \mymarginpar{\textbf{maintitleaddon}} annex to the
\textsf{maintitle}, for which see previous entry. Such an annex would
@@ -4157,7 +4166,7 @@
14.133--41; aristotle:metaphy:gr, cohen:schiff, creasey:ashe:blast,
dunn:revolutions.)
-%\enlargethispage{.5\baselineskip}
+%%\enlargethispage{.5\baselineskip}
\mylittlespace There are, as one might expect, a few further
subtleties involved here. If you give two publishers in the field
@@ -4615,7 +4624,7 @@
your .bib database. See\,\textbf{\textbackslash autocap} in
section~\ref{sec:formatcommands} below for more details.
-% \enlargethispage{-\baselineskip}
+% %\enlargethispage{-\baselineskip}
\mybigspace Standard \colmarginpar{\textbf{titleaddon}}
\textsf{biblatex} intends this field for use with additions to titles
@@ -4822,7 +4831,7 @@
(See 14.81--82; creasey:ashe:blast, creasey:morton:hide,
creasey:york:death, lecarre:quest.)
-%\enlargethispage{2\baselineskip}
+%%\enlargethispage{2\baselineskip}
\mybigspace The \mymarginpar{\textbf{userd}} \textsf{userd} field acts
as a sort of \enquote{\textsf{datetype}} field, allowing you in most
@@ -5098,7 +5107,7 @@
functionality currently has no equivalent using the \textsf{related}
field.
-% \enlargethispage{\baselineskip}
+% %\enlargethispage{\baselineskip}
\mybigspace This \mymarginpar{\textbf{related}} field is required to
use \textsf{biblatex's} \textsf{related} functionality, and it should
@@ -5737,6 +5746,8 @@
standard styles support this feature, and I shall add them when they
come to my attention.
+\enlargethispage{\baselineskip}
+
\mybigspace These \mymarginpar{\textbf{\textbackslash
foottextcite\\\textbackslash foottextcites}} two commands look
like citation commands, but are in fact wrappers for customizing the
@@ -5758,8 +5769,6 @@
\cmd{headlessparencite(s)} command if you want to retain the long
citations inside the parentheses.)
-\enlargethispage{\baselineskip}
-
\mybigspace I \mymarginpar{\textbf{\textbackslash letterdatelong}}
have provided this macro mainly for use in the optional postnote field
of the various citation commands. When citing a letter (published or
@@ -5992,7 +6001,7 @@
the most common citation command you will use, and also works fine in
its multicite form, \textbf{\textbackslash autocites}.
-% \enlargethispage{\baselineskip}
+% %\enlargethispage{\baselineskip}
\mybigspace While \mymarginpar{\textbf{\textbackslash cite*}} the
\cmd{cite} command works just as you would expect it to, I have also
@@ -6492,7 +6501,7 @@
further options available to you for presenting and formatting these
two types of \texttt{biblist}.
-% \enlargethispage{\baselineskip}
+% %\enlargethispage{\baselineskip}
\mylittlespace Formerly
\mymarginpar{\cmd{Declare-}\\\texttt{Labelname}} available only to
@@ -7435,7 +7444,7 @@
section~\ref{sec:entryfields} above for information on further options
available to you for presenting and formatting the list of shorthands.
-% \enlargethispage{\baselineskip}
+% %\enlargethispage{\baselineskip}
\mylittlespace Chris Sparks \mymarginpar{\texttt{shorthandibid}}
pointed out that \textsf{biblatex-chicago-notes} would never use
@@ -7741,7 +7750,7 @@
about capitalization because the word always appears after the
\verb+\bibstring{see}+.
-% \enlargethispage{\baselineskip}
+% %\enlargethispage{\baselineskip}
\mylittlespace Now, it's perfectly possible for an introduction to
have numbered sections of its own, so a citation there may produce a
@@ -7990,7 +7999,7 @@
provisions, then move on to the two handcrafted options, leaving you
to judge which seems best suited to your needs.
-%\enlargethispage{\baselineskip}
+%%\enlargethispage{\baselineskip}
\mylittlespace For \mymarginpar{\texttt{\textbf{split}}} the automatic
subdivision of an endnotes section I have borrowed a concept, if not
@@ -9057,7 +9066,7 @@
entry is a podcast episode, and helps it construct the entry
appropriately (danforth:podcast).
-% \enlargethispage{\baselineskip}
+% %\enlargethispage{\baselineskip}
\mybigspace This \mymarginpar{\textbf{book}} is the standard
\textsf{biblatex} and \textsc{Bib}\TeX\ entry type, but the package
@@ -9208,7 +9217,7 @@
either in individual entries or in the preamble for all examples of
the entry type.
-%\enlargethispage{\baselineskip}
+%%\enlargethispage{\baselineskip}
\mybigspace This \mymarginpar{\textbf{image}} entry type is now a
clone of the \textsf{artwork} type, which see. I retain it here for
@@ -9469,7 +9478,7 @@
collections. In such entries, you may wish to use the word
\enquote{\texttt{classical}} as your \textsf{entrysubtype}, which will
have no effect on the list of references but will change the look of
-the in-text citations (house:papers). Instead of any date, the
+the in-text citations (house:\break papers). Instead of any date, the
citation will include the \textsf{title}, separated from the
\textsf{author's} name by a space, e.g., (House Papers). This same
arrangement, happily, allows you easily to cite individual books of
@@ -9875,7 +9884,7 @@
simplify most of your choices. If something remains unclear, please
let me know and I'll see if I can improve it.
-% \enlargethispage{\baselineskip}
+% %\enlargethispage{\baselineskip}
\mylittlespace A few more notes are in order. I designed the new
\textsf{relatedtype} \texttt{commenton} to facilitate citation of
@@ -10166,7 +10175,7 @@
you'll also need \texttt{useauthor=false} in the \textsf{options}
field. Other surplus fields will be ignored. (See osborne:poison.)
-% \enlargethispage{\baselineskip}
+% %\enlargethispage{\baselineskip}
\mylittlespace \textsf{Biblatex-chicago} also, at the behest of
Bertold Schweitzer, supports the \textsf{relatedtype}
@@ -10407,7 +10416,7 @@
\textsf{introduction} field. (See \emph{Manual} 14.110;
friedman:intro, polakow:afterw, prose:intro).
-%\enlargethispage{\baselineskip}
+%%\enlargethispage{\baselineskip}
\mybigspace This \mymarginpar{\textbf{suppcollection}} fulfills a
function analogous to \textsf{suppbook}. Indeed, I believe the
@@ -10481,7 +10490,7 @@
provided here, and will be printed as-is, contextually capitalized.
(Cf.\ hitchcock:nbynw.)
\item[title, titleaddon, booktitle, booktitleaddon, maintitle:] As
- with the other two audiovisual types, \textsf{video} serves as an
+ with the other 2 audiovisual types, \textsf{video} serves as an
analogue both to books and to collections, so the \textsf{title} may
be of a whole film DVD or of a TV series, or it may identify one
episode in a series or one scene in a film. In the latter cases,
@@ -10730,7 +10739,7 @@
\texttt{nameaddonsep} in sections~\ref{sec:authuseropts} and
\ref{sec:authpreset}, below.
-%\enlargethispage{2\baselineskip}
+%%\enlargethispage{2\baselineskip}
\mylittlespace As its name suggests, the author-date style very much
wants to have a name of some sort present both for the entries in the
@@ -11657,7 +11666,7 @@
(\textsf{namea} or \textsf{editor}) appears at the head of the
reference-list entry.
-% \enlargethispage{\baselineskip}
+% %\enlargethispage{\baselineskip}
\mylittlespace In \textsf{biblatex} 0.9 Lehman reworked the string
concatenation mechanism, for reasons he outlines in his RELEASE file,
@@ -11928,7 +11937,7 @@
field, for providing the International Standard Book Number of a
publication. Not typically required by the \emph{Manual}.
-%\enlargethispage{-2\baselineskip}
+%%\enlargethispage{-2\baselineskip}
\mybigspace Standard \mymarginpar{\textbf{isrn}} \textsf{biblatex}
field, for providing the International Standard Technical Report
@@ -12388,7 +12397,7 @@
\textsf{inproceedings} entry, and I have retained this as a
possibility, though the \emph{Manual} is silent on the matter.
-% \enlargethispage{\baselineskip}
+% %\enlargethispage{\baselineskip}
\mybigspace This \mymarginpar{\textbf{origdate}} is a standard
\textsf{biblatex} field which allows more than one full date
@@ -12555,7 +12564,7 @@
all the details on this functionality, as aside from the difference
just mentioned the two fields are equivalent.
-\enlargethispage{\baselineskip}
+%\enlargethispage{\baselineskip}
\mybigspace Standard \mymarginpar{\textbf{part}} \textsf{biblatex}
field, which identifies physical parts of a single logical volume in
@@ -12664,7 +12673,7 @@
\mybigspace See \mymarginpar{\textbf{reprinttitle}}
section~\ref{sec:authrelated}, below.
-% \enlargethispage{\baselineskip}
+% %\enlargethispage{\baselineskip}
\mybigspace A \mymarginpar{\textbf{series}} standard \textsf{biblatex}
field, usually just a number in an \textsf{article},
@@ -12770,7 +12779,7 @@
conventions of your field or, alternately, provide a list of journal
abbreviations using \cmd{printbiblist\{shortjournal\}}.
-% \enlargethispage{-\baselineskip}
+% %\enlargethispage{-\baselineskip}
\mylittlespace For long institutional names the \emph{Manual's}
recommendation (15.37) involves using an abbreviation which will
@@ -13100,7 +13109,7 @@
\textsf{biblatex-chicago-authordate-trad} might need your help in
order to comply with them.
-%\enlargethispage{2\baselineskip}
+%%\enlargethispage{2\baselineskip}
\mylittlespace With regard to sentence-style capitalization, the rules
of the Chicago \textsf{authordate-trad} style are fairly simple:
@@ -13415,7 +13424,7 @@
like \enquote{EST} for this purpose, and you can provide parentheses
around it at your discretion (cp.\ 10.41 and 14.191).
-%\enlargethispage{\baselineskip}
+%%\enlargethispage{\baselineskip}
\mybigspace A \mymarginpar{\textbf{usera}} supplemental
\textsf{biblatex} field which in certain contexts in
@@ -13973,7 +13982,7 @@
and \textsf{review} entries (along with the latter's clone,
\textsf{suppperiodical}).
-% \enlargethispage{\baselineskip}
+% %\enlargethispage{\baselineskip}
In \textsf{article} entries it replaces the \textsf{titleaddon} with
the \textsf{relatedstring} followed by the \textsf{title} of the
@@ -14547,7 +14556,7 @@
now compressed automatically according to the \emph{Manual's}
instructions (9.64; section~\ref{sec:authpreset}).
-\enlargethispage{\baselineskip}
+\enlargethispage{-\baselineskip}
\mylittlespace In \mymarginpar{\texttt{alltimes=12h}} entries which
print time stamps, they will, when the stamp is part of a
@@ -14617,7 +14626,7 @@
minor problem with punctuation in titles, ensuring that the colon
between a title and a subtitle appears in the correct, matching font.
-\enlargethispage{-\baselineskip}
+%\enlargethispage{-\baselineskip}
\mylittlespace This \mymarginpar{\texttt{related=true}} is the
standard \textsf{biblatex} bibliography option, and it enables the use
@@ -14701,6 +14710,8 @@
parameters. You can also disable it by using the \texttt{footmarkoff}
package option, on which see below.
+\enlargethispage{\baselineskip}
+
\mylittlespace Gildas Hamel pointed out that my default definition, in
\textsf{biblatex-chicago.sty}, of \textsf{biblatex's}
\cmd{bibnamedash} didn't work well with many fonts, leaving a line of
@@ -14817,7 +14828,7 @@
this latter method it would make sense to eliminate the \textsf{pages}
field from the affected entries).
-\enlargethispage{\baselineskip}
+%\enlargethispage{\baselineskip}
\mylittlespace This \colmarginpar{\texttt{doi=true}} option controls
whether any \textsf{doi} fields present in the .bib file will be
@@ -15670,7 +15681,7 @@
\textsf{postnote} field of citation commands, not the \textsf{pages}
field in your .bib file.
-% \enlargethispage{\baselineskip}
+% %\enlargethispage{\baselineskip}
\mylittlespace This \mymarginpar{\texttt{seriesabbrev}} option
controls the printing, in the reference list, of the
@@ -16164,7 +16175,7 @@
commercial electronic database, of a legislative publication. It
will be associated with the \textsf{date} in long notes but won't
appear in short ones. (Cf.\ congress:debate:new and
- state:statute:ky.)%\enlargethispage{\baselineskip}
+ state:statute:ky.)%%\enlargethispage{\baselineskip}
\item[addendum] You can use this field to specify the speaker at
hearings or in debates, the Canadian or British jurisdiction of some
laws if not otherwise clear from the citation, or possibly simply
@@ -16759,8 +16770,17 @@
\section{Revision History}
\label{sec:history}
-\textbf{2.3: Released \today}
+\textbf{2.3a: Released \today}
+\mylittlespace This release backports a bug-fix from the most recent
+\LaTeX 3 programming layer. If you are using \textsf{biblatex} 3.18b
+and an older L3 layer then the processing of your documents could fail
+and fall into an infinite loop, leaving behind an inscrutable message
+in your log file. This update should prevent that, and also fixes a
+few other minor glitches.
+
+\mybigspace\textbf{2.3: Released July 2, 2022}
+
\mylittlespace All styles require the current \textsf{biblatex} (3.18)
and \textsf{biber} (2.18).
@@ -18246,7 +18266,7 @@
\item In \textbf{suppbook} entries, the \emph{Manual} now requires you
to provide the page range (in the \textsf{pages} field) for the
specific part you are citing, e.g., an introduction, foreword, or
- afterword.%%\enlargethispage{-2\baselineskip}
+ afterword.%%%\enlargethispage{-2\baselineskip}
\item In \textbf{patent} entries, the \emph{Manual} now prefers
sentence-style capitalization for titles, which you'll need to
provide yourself by hand.
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-intro.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-intro.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-intro.tex 2022-11-17 00:49:44 UTC (rev 65036)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-intro.tex 2022-11-17 20:58:19 UTC (rev 65037)
@@ -40,10 +40,10 @@
\usepackage[colorlinks,urlcolor=DarkSlateGrey,citecolor=MidnightBlue,
plainpages=false,breaklinks=true,linkcolor=DarkSlateGrey,filecolor=Teal,
baseurl=biblatex-chicago.pdf\#]{hyperref}
-\setmainfont{GentiumPlus-R.ttf}[
-ItalicFont = GentiumPlus-I.ttf,
-BoldFont = GenBasB.ttf,
-BoldItalicFont = GenBasBI.ttf]
+\setmainfont{GentiumPlus-Regular.ttf}[
+ItalicFont = GentiumPlus-Italic.ttf,
+BoldFont = GentiumPlus-Bold.ttf,
+BoldItalicFont = GentiumPlus-BoldItalic.ttf]
\setsansfont{ClearSans-Regular.ttf}[
BoldFont = ClearSans-Bold.ttf,
ItalicFont = ClearSans-Italic.ttf,
@@ -102,7 +102,7 @@
process your .bib files, as \textsc{Bib}\TeX\ (and its more recent
variants) will no longer provide all the features the style requires.
For this release, you really need the current versions of
-\textsf{biber} (2.18) and \textsf{biblatex} (3.18), which contain
+\textsf{biber} (2.18) and \textsf{biblatex} (3.18b), which contain
features and bug-fixes on which my own code relies. The advice that
follows in this document assumes that you are using \textsf{biber}; if
you wish to continue using \textsc{Bib}\TeX\ then you need
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.tex 2022-11-17 00:49:44 UTC (rev 65036)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-dates-sample.tex 2022-11-17 20:58:19 UTC (rev 65037)
@@ -33,10 +33,10 @@
\newcommand{\cmd}[1]{\texttt{\textbackslash #1}}
\usepackage[colorlinks,urlcolor=blue,citecolor=black,
plainpages=false,breaklinks=true]{hyperref}
-\setmainfont{GentiumPlus-R.ttf}[
-ItalicFont = GentiumPlus-I.ttf,
-BoldFont = GenBasB.ttf,
-BoldItalicFont = GenBasBI.ttf]
+\setmainfont{GentiumPlus-Regular.ttf}[
+ItalicFont = GentiumPlus-Italic.ttf,
+BoldFont = GentiumPlus-Bold.ttf,
+BoldItalicFont = GentiumPlus-BoldItalic.ttf]
\setsansfont{ClearSans-Regular.ttf}[
BoldFont = ClearSans-Bold.ttf,
ItalicFont = ClearSans-Italic.ttf,
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-legal-sample.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-legal-sample.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-legal-sample.tex 2022-11-17 00:49:44 UTC (rev 65036)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-legal-sample.tex 2022-11-17 20:58:19 UTC (rev 65037)
@@ -21,10 +21,10 @@
\usepackage[colorlinks,urlcolor=DarkSlateGrey,citecolor=MidnightBlue,
plainpages=false,breaklinks=true,linkcolor=DarkSlateGrey,
filecolor=Teal]{hyperref}
-\setmainfont{GentiumPlus-R.ttf}[
-ItalicFont = GentiumPlus-I.ttf,
-BoldFont = GenBasB.ttf,
-BoldItalicFont = GenBasBI.ttf]
+\setmainfont{GentiumPlus-Regular.ttf}[
+ItalicFont = GentiumPlus-Italic.ttf,
+BoldFont = GentiumPlus-Bold.ttf,
+BoldItalicFont = GentiumPlus-BoldItalic.ttf]
\setsansfont{ClearSans-Regular.ttf}[
BoldFont = ClearSans-Bold.ttf,
ItalicFont = ClearSans-Italic.ttf,
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-noteref-demo.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-noteref-demo.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-noteref-demo.tex 2022-11-17 00:49:44 UTC (rev 65036)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-noteref-demo.tex 2022-11-17 20:58:19 UTC (rev 65037)
@@ -31,10 +31,10 @@
\usepackage[colorlinks,filecolor=Teal,citecolor=black,
plainpages=false,breaklinks=true,urlcolor=DarkSlateBlue,
linkcolor=DarkSlateBlue,baseurl=biblatex-chicago.pdf\#]{hyperref}
-\setmainfont{GentiumPlus-R.ttf}[
-ItalicFont = GentiumPlus-I.ttf,
-BoldFont = GenBasB.ttf,
-BoldItalicFont = GenBasBI.ttf]
+\setmainfont{GentiumPlus-Regular.ttf}[
+ItalicFont = GentiumPlus-Italic.ttf,
+BoldFont = GentiumPlus-Bold.ttf,
+BoldItalicFont = GentiumPlus-BoldItalic.ttf]
\setsansfont{ClearSans-Regular.ttf}[
BoldFont = ClearSans-Bold.ttf,
ItalicFont = ClearSans-Italic.ttf,
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-intro.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-intro.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-intro.tex 2022-11-17 00:49:44 UTC (rev 65036)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-intro.tex 2022-11-17 20:58:19 UTC (rev 65037)
@@ -35,10 +35,10 @@
\usepackage[colorlinks,filecolor=Teal,citecolor=black,
plainpages=false,breaklinks=true,urlcolor=DarkSlateBlue,
linkcolor=DarkSlateBlue,baseurl=biblatex-chicago.pdf\#]{hyperref}
-\setmainfont{GentiumPlus-R.ttf}[
-ItalicFont = GentiumPlus-I.ttf,
-BoldFont = GenBasB.ttf,
-BoldItalicFont = GenBasBI.ttf]
+\setmainfont{GentiumPlus-Regular.ttf}[
+ItalicFont = GentiumPlus-Italic.ttf,
+BoldFont = GentiumPlus-Bold.ttf,
+BoldItalicFont = GentiumPlus-BoldItalic.ttf]
\setsansfont{ClearSans-Regular.ttf}[
BoldFont = ClearSans-Bold.ttf,
ItalicFont = ClearSans-Italic.ttf,
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.tex 2022-11-17 00:49:44 UTC (rev 65036)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-notes-sample.tex 2022-11-17 20:58:19 UTC (rev 65037)
@@ -22,10 +22,10 @@
\hyphenation{A-p-ril}
%\renewcommand{\sfdefault}{phv}
%\renewcommand{\ttdefault}{pcr}
-\setmainfont{GentiumPlus-R.ttf}[
-ItalicFont = GentiumPlus-I.ttf,
-BoldFont = GenBasB.ttf,
-BoldItalicFont = GenBasBI.ttf]
+\setmainfont{GentiumPlus-Regular.ttf}[
+ItalicFont = GentiumPlus-Italic.ttf,
+BoldFont = GentiumPlus-Bold.ttf,
+BoldItalicFont = GentiumPlus-BoldItalic.ttf]
\setsansfont{ClearSans-Regular.ttf}[Scale = MatchLowercase]
\setmonofont{lmmono9-regular.otf}
% \usepackage[fallback,CJKspace=true]{xeCJK}
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-appendix.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-appendix.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-appendix.tex 2022-11-17 00:49:44 UTC (rev 65036)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-appendix.tex 2022-11-17 20:58:19 UTC (rev 65037)
@@ -32,10 +32,10 @@
\usepackage[hyperref,svgnames]{xcolor}
\usepackage[colorlinks,urlcolor=DarkSlateGrey,citecolor=black,
plainpages=false,breaklinks=true,linkcolor=DarkSlateGrey]{hyperref}
-\setmainfont{GentiumPlus-R.ttf}[
-ItalicFont = GentiumPlus-I.ttf,
-BoldFont = GenBasB.ttf,
-BoldItalicFont = GenBasBI.ttf]
+\setmainfont{GentiumPlus-Regular.ttf}[
+ItalicFont = GentiumPlus-Italic.ttf,
+BoldFont = GentiumPlus-Bold.ttf,
+BoldItalicFont = GentiumPlus-BoldItalic.ttf]
\setsansfont{ClearSans-Regular.ttf}[
BoldFont = ClearSans-Bold.ttf,
ItalicFont = ClearSans-Italic.ttf,
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.tex 2022-11-17 00:49:44 UTC (rev 65036)
+++ trunk/Master/texmf-dist/doc/latex/biblatex-chicago/cms-trad-sample.tex 2022-11-17 20:58:19 UTC (rev 65037)
@@ -31,10 +31,10 @@
\newcommand{\cmd}[1]{\texttt{\textbackslash #1}}
\usepackage[colorlinks,urlcolor=blue,citecolor=black,
plainpages=false,breaklinks=true]{hyperref}
-\setmainfont{GentiumPlus-R.ttf}[
-ItalicFont = GentiumPlus-I.ttf,
-BoldFont = GenBasB.ttf,
-BoldItalicFont = GenBasBI.ttf]
+\setmainfont{GentiumPlus-Regular.ttf}[
+ItalicFont = GentiumPlus-Italic.ttf,
+BoldFont = GentiumPlus-Bold.ttf,
+BoldItalicFont = GentiumPlus-BoldItalic.ttf]
\setsansfont{ClearSans-Regular.ttf}[
BoldFont = ClearSans-Bold.ttf,
ItalicFont = ClearSans-Italic.ttf,
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx 2022-11-17 00:49:44 UTC (rev 65036)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx 2022-11-17 20:58:19 UTC (rev 65037)
@@ -2,7 +2,7 @@
% Lehman's standard.bbx and from chicago-notes.bbx. It provides the
% reference list formatting for the Chicago author-date style.
-\ProvidesFile{chicago-authordate.bbx}[2022/07/02 v 3.18 biblatex
+\ProvidesFile{chicago-authordate.bbx}[2022/11/17 v 3.18b biblatex
bibliography style]
%%%% Initialize and format bibliography and los %%%%
@@ -849,46 +849,14 @@
match=\regexp{\\citeincites(((\{|(\[[^\]]*\])+\{|\([^\)]*\)\(\)\{|\([^\)]*\)\(\)(\[[^\]]*\])+\{)[^\}]+\})+)((\{|\[[^\]]*\]\[\]\{)[^\}]+)\}$},%$
replace=\regexp{\\citeincitefs$1$6\}}]
}
- \map[overwrite]{
- \step[fieldsource=titleaddon,
+ \map[overwrite, foreach={titleaddon,annotation,annote,addendum,note}]{
+ \step[fieldsource=$MAPLOOP,
match=\regexp{\\citeincite(\{|\[[^\]]*\]\[\]\{)([^\}]+)\}$},%$
replace=\regexp{\\citeincitef$1$2\}}]
- \step[fieldsource=titleaddon,
+ \step[fieldsource=$MAPLOOP,
match=\regexp{\\citeincites(((\{|(\[[^\]]*\])+\{|\([^\)]*\)\(\)\{|\([^\)]*\)\(\)(\[[^\]]*\])+\{)[^\}]+\})+)((\{|\[[^\]]*\]\[\]\{)[^\}]+)\}$},%$
replace=\regexp{\\citeincitefs$1$6\}}]
}
- \map[overwrite]{
- \step[fieldsource=annotation,
- match=\regexp{\\citeincite(\{|\[[^\]]*\]\[\]\{)([^\}]+)\}$},%$
- replace=\regexp{\\citeincitef$1$2\}}]
- \step[fieldsource=annotation,
- match=\regexp{\\citeincites(((\{|(\[[^\]]*\])+\{|\([^\)]*\)\(\)\{|\([^\)]*\)\(\)(\[[^\]]*\])+\{)[^\}]+\})+)((\{|\[[^\]]*\]\[\]\{)[^\}]+)\}$},%$
- replace=\regexp{\\citeincitefs$1$6\}}]
- }
- \map[overwrite]{
- \step[fieldsource=annote,
- match=\regexp{\\citeincite(\{|\[[^\]]*\]\[\]\{)([^\}]+)\}$},%$
- replace=\regexp{\\citeincitef$1$2\}}]
- \step[fieldsource=annote,
- match=\regexp{\\citeincites(((\{|(\[[^\]]*\])+\{|\([^\)]*\)\(\)\{|\([^\)]*\)\(\)(\[[^\]]*\])+\{)[^\}]+\})+)((\{|\[[^\]]*\]\[\]\{)[^\}]+)\}$},%$
- replace=\regexp{\\citeincitefs$1$6\}}]
- }
- \map[overwrite]{
- \step[fieldsource=addendum,
- match=\regexp{\\citeincite(\{|\[[^\]]*\]\[\]\{)([^\}]+)\}$},%$
- replace=\regexp{\\citeincitef$1$2\}}]
- \step[fieldsource=addendum,
- match=\regexp{\\citeincites(((\{|(\[[^\]]*\])+\{|\([^\)]*\)\(\)\{|\([^\)]*\)\(\)(\[[^\]]*\])+\{)[^\}]+\})+)((\{|\[[^\]]*\]\[\]\{)[^\}]+)\}$},%$
- replace=\regexp{\\citeincitefs$1$6\}}]
- }
- \map[overwrite]{
- \step[fieldsource=note,
- match=\regexp{\\citeincite(\{|\[[^\]]*\]\[\]\{)([^\}]+)\}$},%$
- replace=\regexp{\\citeincitef$1$2\}}]
- \step[fieldsource=note,
- match=\regexp{\\citeincites(((\{|(\[[^\]]*\])+\{|\([^\)]*\)\(\)\{|\([^\)]*\)\(\)(\[[^\]]*\])+\{)[^\}]+\})+)((\{|\[[^\]]*\]\[\]\{)[^\}]+)\}$},%$
- replace=\regexp{\\citeincitefs$1$6\}}]
- }
\map[overwrite]{% Backward compatibility kludges
\step[fieldsource=year,
match=\regexp{^\[(.+)\](.*)},
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common.cbx 2022-11-17 00:49:44 UTC (rev 65036)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common.cbx 2022-11-17 20:58:19 UTC (rev 65037)
@@ -4,7 +4,7 @@
% list) for the two author-date styles of the Chicago Manual of Style,
% 17th edition.
-\ProvidesFile{chicago-dates-common.cbx}[2022/07/02 v 3.18 biblatex
+\ProvidesFile{chicago-dates-common.cbx}[2022/11/17 v 3.18b biblatex
citation style]
%%%% Biblatex initialization + Chicago options + Toggles %%%%
@@ -17,6 +17,34 @@
\newbool{cms:tcit}
\newbool{cms:postsh}
+% Here we provide a slightly improved \if at cms@capital replacement
+% using expl3 facilities, and also backport a patch for a bug in
+% (older versions of) expl3's case-changing code.
+
+\ifdef{\ExplSyntaxOff}{}{\RequirePackage{xparse}\RequirePackage{expl3}}%
+
+\ExplSyntaxOn%
+
+\NewDocumentCommand \IfCMSFieldInitCS {m}
+{
+ \regex_match:nnTF
+ {\A(?:\c{citeincite(?:f|s){0,2}}|\cM.)}
+ {#1}
+ {\use_i:nn}
+ {\use_ii:nn}
+}
+
+\cs_if_exist:NTF \__text_change_case_switch_titleonly:nnNnnnn
+{}
+{\cs_new:Npn \__text_change_case_switch_titleonly:nnNnnnn #1#2#3#4#5#6#7
+ {
+ \__text_change_case_store:n {#7}
+ \__text_change_case_break:w
+ }
+}
+
+\ExplSyntaxOff
+
\providecommand*{\mkibid}[1]{#1}
\providetoggle{cms at inlineibid}
@@ -597,9 +625,9 @@
{\ExecuteBibliographyOptions[jurisdiction,legal,legislation]{skipbib}}%
{}%
-\AtEndPreamble{% Automatic sorting by shorthand when it appears
- \iftoggle{cms at los}% at the head of the entry.
- {\DeclareSourcemap{
+\AtEndPreamble{%
+ \iftoggle{cms at los}% Automatic sorting by shorthand when it appears
+ {\DeclareSourcemap{% at the head of the entry.
\maps[datatype=bibtex]{
\map{
\step[fieldsource=shorthand, final]
@@ -867,10 +895,8 @@
\ifx\cms at ldt@cmsnameparts\cms at tpl
#1{#3}%
#1[#2]{#3}
- \blx at warning@noline{#2 is the So Global Template}
\else
#1[#2]{#3}
- \blx at warning@noline{#2 is the Local Template}
\fi}
%% Name format declarations for bibliography and notes. The
@@ -2729,7 +2755,9 @@
\DeclareFieldFormat{shortvol}{#1}
\DeclareFieldFormat[jurisdiction,legal,legislation]{addendum}{%
- \ifcapital{\mkbibparens{\MakeCapital{#1\isdot}}}{\mkbibparens{#1\isdot}}}
+ \ifcapital{\IfCMSFieldInitCS{#1}{\mkbibparens{#1\isdot}}%
+ {\mkbibparens{\MakeCapital{#1\isdot}}}}%
+ {\mkbibparens{#1\isdot}}}
\DeclareFieldFormat[legal,legislation]{part}{%
\ifnumerals{#1}%
@@ -3121,7 +3149,7 @@
\DeclareFieldFormat{letterday}{\mkbibcurdinal{#1}}
\DeclareFieldFormat{note}{%
- \if at cms@capital{#1}{\MakeCapital{#1}}{#1}}%
+ \ifcapital{\IfCMSFieldInitCS{#1}{#1}{\MakeCapital{#1}}}{#1}}%
\DeclareFieldFormat{capital}{%
\ifcapital{\MakeCapital{#1}}{#1}}
@@ -3279,7 +3307,7 @@
\DeclareFieldFormat{edition}{% New in 0.8
\ifinteger{#1}%
{\mkbibordedition{#1}~\bibstring{edition}}%
- {\ifcapital
+ {\ifcapital%
{\MakeCapital{#1\isdot}}%
{#1\isdot}}}
@@ -3286,10 +3314,12 @@
\DeclareFieldFormat{usere}{[#1]} % Better than mkbibbrackets?
\DeclareFieldFormat{titleaddon}{%
- \if at cms@capital{#1}{\MakeCapital{#1\isdot}}{#1\isdot}}%\custpunctc?
+ \ifcapital{\IfCMSFieldInitCS{#1}{#1\isdot}%
+ {\MakeCapital{#1\isdot}}}{#1\isdot}}%\custpunctc?
\DeclareFieldFormat[periodical]{titleaddon}{%
- \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}
+ \ifcapital{\IfCMSFieldInitCS{#1}{#1\isdot}%
+ {\MakeCapital{#1\isdot}}}{#1\isdot}}
\DeclareFieldAlias{booktitleaddon}{titleaddon}
@@ -3327,31 +3357,9 @@
\DeclareFieldFormat{shortseries}{#1\isdot}
\DeclareFieldFormat{addendum}{%
- \if at cms@capital{#1}{\MakeCapital{#1\isdot}}{#1\isdot}}
+ \ifcapital{\IfCMSFieldInitCS{#1}{#1\isdot}%
+ {\MakeCapital{#1\isdot}}}{#1\isdot}}
-% There was unfortunate interaction between the case-changing code and
-% cite commands when the latter were at the beginning of the
-% field. This modified \ifcapital will be used in the fields in which
-% the \citeincite(f|s) commands can appear.
-
-\newrobustcmd*{\if at cms@capital}[1]{%
- \noexpandarg
- \StrChar{#1}{1}[\cms at char]%
- \ifboolexpr{%
- test {\ifcapital}%
- and
- not test {\ifdefstring{\cms at char}{\citeincite}}%
- and
- not test {\ifdefstring{\cms at char}{\citeincites}}%
- and
- not test {\ifdefstring{\cms at char}{\citeincitef}}%
- and
- not test {\ifdefstring{\cms at char}{\citeincitefs}}%
- }%
- {\@firstoftwo}%
- {\@secondoftwo}%
-}
-
% For annotation fixes move all code for separators to the entrytail
% macro, below.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common16.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common16.cbx 2022-11-17 00:49:44 UTC (rev 65036)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-dates-common16.cbx 2022-11-17 20:58:19 UTC (rev 65037)
@@ -4,7 +4,7 @@
% for the two author-date styles of the Chicago Manual of Style, 16th
% edition.
-\ProvidesFile{chicago-dates-common16.cbx}[2022/07/02 v 3.18 biblatex
+\ProvidesFile{chicago-dates-common16.cbx}[2022/11/16 v 3.18b biblatex
citation style]
%%%% Biblatex initialization + Chicago options + Toggles %%%%
@@ -14,6 +14,21 @@
\newbool{cms:extraparens}
\newbool{cms:comma}
+\ifdef{\ExplSyntaxOff}{}{\RequirePackage{xparse}\RequirePackage{expl3}}%
+
+\ExplSyntaxOn%
+
+\cs_if_exist:NTF \__text_change_case_switch_titleonly:nnNnnnn
+{}
+{\cs_new:Npn \__text_change_case_switch_titleonly:nnNnnnn #1#2#3#4#5#6#7
+ {
+ \__text_change_case_store:n {#7}
+ \__text_change_case_break:w
+ }
+}
+
+\ExplSyntaxOff
+
\providecommand*{\mkibid}[1]{#1}
\providetoggle{cms at inlineibid}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx 2022-11-17 00:49:44 UTC (rev 65036)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx 2022-11-17 20:58:19 UTC (rev 65037)
@@ -2,7 +2,7 @@
% Lehman's standard.bbx. It provides the bibliography formatting for
% the Chicago notes + bibliography style.
-\ProvidesFile{chicago-notes.bbx}[2022/07/02 v 3.18 biblatex bibliography style]
+\ProvidesFile{chicago-notes.bbx}[2022/11/17 v 3.18b biblatex bibliography style]
%%%% Initialize and format bibliography and los %%%%
@@ -859,46 +859,14 @@
final]
\step[fieldset=maintitle, fieldvalue=\csgdef{@cmsst}{\@ne}, append]
}
- \map[overwrite]{
- \step[fieldsource=titleaddon,
+ \map[overwrite, foreach={titleaddon,annotation,annote,addendum,note}]{
+ \step[fieldsource=$MAPLOOP,
match=\regexp{\\citeincite(\{|\[[^\]]*\]\[\]\{)([^\}]+)\}$},%$
replace=\regexp{\\citeincitef$1$2\}}]
- \step[fieldsource=titleaddon,
+ \step[fieldsource=$MAPLOOP,
match=\regexp{\\citeincites(((\{|(\[[^\]]*\])+\{|\([^\)]*\)\(\)\{|\([^\)]*\)\(\)(\[[^\]]*\])+\{)[^\}]+\})+)((\{|\[[^\]]*\]\[\]\{)[^\}]+)\}$},%$
replace=\regexp{\\citeincitefs$1$6\}}]
}
- \map[overwrite]{
- \step[fieldsource=annotation,
- match=\regexp{\\citeincite(\{|\[[^\]]*\]\[\]\{)([^\}]+)\}$},%$
- replace=\regexp{\\citeincitef$1$2\}}]
- \step[fieldsource=annotation,
- match=\regexp{\\citeincites(((\{|(\[[^\]]*\])+\{|\([^\)]*\)\(\)\{|\([^\)]*\)\(\)(\[[^\]]*\])+\{)[^\}]+\})+)((\{|\[[^\]]*\]\[\]\{)[^\}]+)\}$},%$
- replace=\regexp{\\citeincitefs$1$6\}}]
- }
- \map[overwrite]{
- \step[fieldsource=annote,
- match=\regexp{\\citeincite(\{|\[[^\]]*\]\[\]\{)([^\}]+)\}$},%$
- replace=\regexp{\\citeincitef$1$2\}}]
- \step[fieldsource=annote,
- match=\regexp{\\citeincites(((\{|(\[[^\]]*\])+\{|\([^\)]*\)\(\)\{|\([^\)]*\)\(\)(\[[^\]]*\])+\{)[^\}]+\})+)((\{|\[[^\]]*\]\[\]\{)[^\}]+)\}$},%$
- replace=\regexp{\\citeincitefs$1$6\}}]
- }
- \map[overwrite]{
- \step[fieldsource=addendum,
- match=\regexp{\\citeincite(\{|\[[^\]]*\]\[\]\{)([^\}]+)\}$},%$
- replace=\regexp{\\citeincitef$1$2\}}]
- \step[fieldsource=addendum,
- match=\regexp{\\citeincites(((\{|(\[[^\]]*\])+\{|\([^\)]*\)\(\)\{|\([^\)]*\)\(\)(\[[^\]]*\])+\{)[^\}]+\})+)((\{|\[[^\]]*\]\[\]\{)[^\}]+)\}$},%$
- replace=\regexp{\\citeincitefs$1$6\}}]
- }
- \map[overwrite]{
- \step[fieldsource=note,
- match=\regexp{\\citeincite(\{|\[[^\]]*\]\[\]\{)([^\}]+)\}$},%$
- replace=\regexp{\\citeincitef$1$2\}}]
- \step[fieldsource=note,
- match=\regexp{\\citeincites(((\{|(\[[^\]]*\])+\{|\([^\)]*\)\(\)\{|\([^\)]*\)\(\)(\[[^\]]*\])+\{)[^\}]+\})+)((\{|\[[^\]]*\]\[\]\{)[^\}]+)\}$},%$
- replace=\regexp{\\citeincitefs$1$6\}}]
- }
\map[overwrite, foreach=related]{
\pertype{mvbook}
\pertype{mvcollection}
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx 2022-11-17 00:49:44 UTC (rev 65036)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx 2022-11-17 20:58:19 UTC (rev 65037)
@@ -4,7 +4,7 @@
% formatted according to the specifications of the Chicago Manual of
% Style.
-\ProvidesFile{chicago-notes.cbx}[2022/07/02 v 3.18 biblatex citation style]
+\ProvidesFile{chicago-notes.cbx}[2022/11/17 v 3.18b biblatex citation style]
%%%% Biblatex initialization + Chicago options + Toggles %%%%
@@ -13,6 +13,34 @@
\newbool{cms:comma}
\newbool{cms:nd}
+% Here we provide a slightly improved \if at cms@capital replacement
+% using expl3 facilities, and also backport a patch for a bug in
+% (older versions of) expl3's case-changing code.
+
+\ifdef{\ExplSyntaxOff}{}{\RequirePackage{xparse}\RequirePackage{expl3}}%
+
+\ExplSyntaxOn%
+
+\NewDocumentCommand \IfCMSFieldInitCS {m}
+{
+ \regex_match:nnTF
+ {\A(?:\c{citeincite(?:f|s){0,2}}|\cM.)}
+ {#1}
+ {\use_i:nn}
+ {\use_ii:nn}
+}
+
+\cs_if_exist:NTF \__text_change_case_switch_titleonly:nnNnnnn
+{}
+{\cs_new:Npn \__text_change_case_switch_titleonly:nnNnnnn #1#2#3#4#5#6#7
+ {
+ \__text_change_case_store:n {#7}
+ \__text_change_case_break:w
+ }
+}
+
+\ExplSyntaxOff
+
\providecommand*{\mkibid}[1]{#1}
\providetoggle{cms at oneyear}% Needed for author-date
@@ -1456,10 +1484,8 @@
\ifx\cms at ldt@cmsnameparts\cms at tpl
#1{#3}%
#1[#2]{#3}
- \blx at warning@noline{#2 is the So Global Template}
\else
#1[#2]{#3}
- \blx at warning@noline{#2 is the Local Template}
\fi}
%% Name format declarations for bibliography and notes. The
@@ -6971,7 +6997,8 @@
\DeclareFieldFormat[patent]{lostitle}{\MakeSentenceCase*{#1}\isdot}
-\DeclareFieldFormat{prenote}{\ifcapital{\MakeCapital{#1}}{#1}\isdot}
+\DeclareFieldFormat{prenote}{%
+ \ifcapital{\MakeCapital{#1}}{#1}\isdot}
%% comprange code moved to .sty
@@ -7233,7 +7260,7 @@
\DeclareFieldFormat{letterday}{\mkbibcurdinal{#1}}
\DeclareFieldFormat{note}{%
- \if at cms@capital{#1}{\MakeCapital{#1}}{#1}}%
+ \ifcapital{\IfCMSFieldInitCS{#1}{#1}{\MakeCapital{#1}}}{#1}}%
\DeclareFieldFormat{capital}{%
\ifcapital{\MakeCapital{#1}}{#1}}
@@ -7388,7 +7415,7 @@
\DeclareFieldFormat{edition}{% New in 0.8
\ifinteger{#1}
{\mkbibordedition{#1}~\bibstring{edition}}%
- {\ifcapital
+ {\ifcapital%
{\MakeCapital{#1\isdot}}%
{#1\isdot}}}
@@ -7413,10 +7440,12 @@
\DeclareFieldFormat{usere}{[#1]} % Better than mkbibbrackets?
\DeclareFieldFormat{titleaddon}{%
- \if at cms@capital{#1}{\MakeCapital{#1\isdot}}{#1\isdot}}%
+ \ifcapital{\IfCMSFieldInitCS{#1}{#1\isdot}%
+ {\MakeCapital{#1\isdot}}}{#1\isdot}}%
\DeclareFieldFormat[periodical]{titleaddon}{%
- \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}
+ \ifcapital{\IfCMSFieldInitCS{#1}{#1\isdot}%
+ {\MakeCapital{#1\isdot}}}{#1\isdot}}
\DeclareFieldAlias{booktitleaddon}{titleaddon}
@@ -7502,34 +7531,14 @@
\DeclareFieldFormat{shortseries}{#1\isdot}
\DeclareFieldFormat{addendum}{%
- \if at cms@capital{#1}{\MakeCapital{#1\isdot}}{#1\isdot}}
+ \ifcapital{\IfCMSFieldInitCS{#1}{#1\isdot}%
+ {\MakeCapital{#1\isdot}}}{#1\isdot}}
\DeclareFieldFormat[jurisdiction,legal,legislation]{addendum}{%
- \ifcapital{\mkbibparens{\MakeCapital{#1\isdot}}}{\mkbibparens{#1\isdot}}}
+ \ifcapital%
+ {\mkbibparens{\IfCMSFieldInitCS{#1}{#1\isdot}%
+ {\MakeCapital{#1\isdot}}}}{\mkbibparens{#1\isdot}}}
-% There was unfortunate interaction between the case-changing code and
-% cite commands when the latter were at the beginning of the
-% field. This modified \ifcapital will be used in the fields in which
-% the \citeincite(s) commands can appear.
-
-\newrobustcmd*{\if at cms@capital}[1]{%
- \noexpandarg
- \StrChar{#1}{1}[\cms at char]%
- \ifboolexpr{%
- test {\ifcapital}%
- and
- not test {\ifdefstring{\cms at char}{\citeincite}}%
- and
- not test {\ifdefstring{\cms at char}{\citeincitef}}%
- and
- not test {\ifdefstring{\cms at char}{\citeincites}}%
- and
- not test {\ifdefstring{\cms at char}{\citeincitefs}}%
- }%
- {\@firstoftwo}%
- {\@secondoftwo}%
-}
-
% For annotation fixes move all code for separators to the entrytail
% macro, below.
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes16.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes16.bbx 2022-11-17 00:49:44 UTC (rev 65036)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes16.bbx 2022-11-17 20:58:19 UTC (rev 65037)
@@ -2,7 +2,7 @@
% standard.bbx It provides the bibliography formatting for the Chicago
% notes + bibliography style.
-\ProvidesFile{chicago-notes16.bbx}[2022/07/02 v 3.18 biblatex
+\ProvidesFile{chicago-notes16.bbx}[2022/11/16 v 3.18b biblatex
bibliography style]
%%%% Initialize and format bibliography and los %%%%
@@ -678,7 +678,7 @@
\usebibmacro{issuetitle}%
\setunit*{\addcomma\addspace}%
\usebibmacro{byeditor+others}%
- \usebibmacro{editorpunct}%\newunit\newblock
+ \newunit\newblock
\printfield{note}%
\setunit*{\addcomma\addspace}\newblock%
\usebibmacro{mag+news+date}%
@@ -722,7 +722,7 @@
\usebibmacro{issuetitle}%
\setunit*{\addcomma\addspace}%
\usebibmacro{byeditor+others}%
- \usebibmacro{editorpunct}%\newunit\newblock
+ \newunit\newblock
\printfield{note}%
\setunit*{\addcomma\addspace}\newblock% (changed for 0.7)??
\usebibmacro{journal+issue+year+pages}%
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes16.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes16.cbx 2022-11-17 00:49:44 UTC (rev 65036)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes16.cbx 2022-11-17 20:58:19 UTC (rev 65037)
@@ -3,7 +3,7 @@
% of providing footnote citations and a bibliography formatted
% according to the specifications of the Chicago Manual of Style.
-\ProvidesFile{chicago-notes16.cbx}[2022/07/02 v 3.18 biblatex citation style]
+\ProvidesFile{chicago-notes16.cbx}[2022/11/16 v 3.18b biblatex citation style]
%%%% Biblatex initialization + Chicago options + Toggles %%%%
@@ -12,6 +12,21 @@
\newbool{cms:comma}
\newbool{cms:nd}
+\ifdef{\ExplSyntaxOff}{}{\RequirePackage{xparse}\RequirePackage{expl3}}%
+
+\ExplSyntaxOn%
+
+\cs_if_exist:NTF \__text_change_case_switch_titleonly:nnNnnnn
+{}
+{\cs_new:Npn \__text_change_case_switch_titleonly:nnNnnnn #1#2#3#4#5#6#7
+ {
+ \__text_change_case_store:n {#7}
+ \__text_change_case_break:w
+ }
+}
+
+\ExplSyntaxOff
+
\providecommand*{\mkibid}[1]{#1}
\providetoggle{cms at oneyear}% Needed for author-date
Modified: trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cmsdocs.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cmsdocs.sty 2022-11-17 00:49:44 UTC (rev 65036)
+++ trunk/Master/texmf-dist/tex/latex/biblatex-chicago/cmsdocs.sty 2022-11-17 20:58:19 UTC (rev 65037)
@@ -326,7 +326,8 @@
{#1}}}%
{}%
-\renewbibmacro*{cite:journal}{%
+\ifbibmacroundef{cite:journal}{}%
+ {\renewbibmacro*{cite:journal}{%
\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
{\iffieldundef{prenote}%
{\bibsentence\usebibmacro{cite:ibid}}%
@@ -364,7 +365,7 @@
\ifthenelse{\iffieldundef{pagination}\AND%
\iffieldundef{bookpagination}}%
{\setunit{\postvolpunct}}%
- {\setunit{\addcolon\addspace}}}}}}
+ {\setunit{\addcolon\addspace}}}}}}}
\DeclareFieldFormat{cmsbiblink}{%
\hyperlink{\getrefbykeydefault{\abx at field@entrykey}{anchor}{}}{#1}}
More information about the tex-live-commits
mailing list.