summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-06-09 03:03:06 +0000
committerNorbert Preining <norbert@preining.info>2021-06-09 03:03:06 +0000
commitf7fc4ad3995d7f6ebbed20c20bf06e3a9176ea04 (patch)
tree9c81426f705e4550bf9e6494f36ed2d417b28c9f /macros
parent19ec3a90133b7827c16b0ffde16152fb4d566138 (diff)
CTAN sync 202106090303
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md13
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty5
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdfbin833265 -> 835302 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex25
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua4
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx18
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx41
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-common.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note-common.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx2
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx2
-rw-r--r--macros/latex/contrib/csvsimple/CHANGES10
-rw-r--r--macros/latex/contrib/csvsimple/README4
-rw-r--r--macros/latex/contrib/csvsimple/csvsimple-example.pdfbin72195 -> 75627 bytes
-rw-r--r--macros/latex/contrib/csvsimple/csvsimple-example.tex4
-rw-r--r--macros/latex/contrib/csvsimple/csvsimple.pdfbin810437 -> 832329 bytes
-rw-r--r--macros/latex/contrib/csvsimple/csvsimple.sty24
-rw-r--r--macros/latex/contrib/csvsimple/csvsimple.tex40
-rw-r--r--macros/latex/contrib/easybook/README.md29
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx231
-rw-r--r--macros/latex/contrib/easybook/easybook.ins13
-rw-r--r--macros/latex/contrib/easybook/easybook.pdfbin314457 -> 324274 bytes
-rw-r--r--macros/latex/contrib/keyfloat/README.txt2
-rw-r--r--macros/latex/contrib/keyfloat/keyfloat.dtx107
-rw-r--r--macros/latex/contrib/keyfloat/keyfloat.pdfbin1008908 -> 1012669 bytes
-rw-r--r--macros/plain/contrib/xintsession/README.md37
-rw-r--r--macros/plain/contrib/xintsession/xintsession.tex20
93 files changed, 498 insertions, 269 deletions
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md b/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md
index 38eed64a6d..f869b92791 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/CHANGES.md
@@ -1,5 +1,18 @@
# Changelog
+## Version 0.13 (2021-06-08)
+
+See <https://github.com/moewew/biblatex-ext/compare/v0.12b...v0.13>
+
+### Added
+- `titlecase:biblabeltitle` and `biblabeltitle` formats to format
+ (replacement) title printed in `authoryear` styles instead of
+ missing author/editor.
+
+### Fixed
+- Fixed title printing for related entries in `authoryear` style family
+ <https://github.com/moewew/biblatex-ext/issues/22>.
+
## Version 0.12b (2021-04-22)
See <https://github.com/moewew/biblatex-ext/compare/v0.12a...v0.12b>
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty
index 662599201d..47710a0dd7 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa-doiapi.sty
@@ -1,5 +1,5 @@
\ProvidesPackage{biblatex-ext-oa-doiapi}
- [2021/04/22 v0.12b Obtain open access information from DOI via
+ [2021/06/08 v0.13 Obtain open access information from DOI via
unpaywall.org and doi.org (MW)]
\RequirePackage{etoolbox}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty
index 0dbb6d6552..a38bbb7031 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oa.sty
@@ -1,5 +1,5 @@
\ProvidesPackage{biblatex-ext-oa}
- [2021/04/22 v0.12b mark open access in biblatex bibliographies (MW)]
+ [2021/06/08 v0.13 mark open access in biblatex bibliographies (MW)]
\RequirePackage{etoolbox}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty
index 60c9af33b1..5e79a0c4b3 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-l3draw.sty
@@ -1,7 +1,7 @@
\RequirePackage{expl3}
\ProvidesExplPackage {biblatex-ext-oasymb-l3draw}
- {2021/04/22} {0.12b}
+ {2021/06/08} {0.13}
{open access symbols with l3draw (MW)}
\RequirePackage{xparse}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty
index a7f5563d61..dd7fd379d9 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-pict2e.sty
@@ -1,5 +1,5 @@
\ProvidesPackage{biblatex-ext-oasymb-pict2e}
- [2021/04/22 v0.12b open access symbols with pict2e (MW)]
+ [2021/06/08 v0.13 open access symbols with pict2e (MW)]
\RequirePackage{etoolbox}
\RequirePackage{kvoptions}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty
index 401ceb06bd..8e91d82ed4 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-oasymb-tikz.sty
@@ -1,5 +1,5 @@
\ProvidesPackage{biblatex-ext-oasymb-tikz}
- [2021/04/22 v0.12b open access symbols with TikZ (MW)]
+ [2021/06/08 v0.13 open access symbols with TikZ (MW)]
\RequirePackage{etoolbox}
\RequirePackage{kvoptions}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty
index 060060ae4e..3ced33d766 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext-tabular.sty
@@ -1,5 +1,5 @@
\ProvidesPackage{biblatex-ext-tabular}
- [2021/04/22 v0.12b tabular bibliographies for biblatex (MW)]
+ [2021/06/08 v0.13 tabular bibliographies for biblatex (MW)]
% Code based on Audrey's
% (https://tex.stackexchange.com/users/4483/audrey)
@@ -183,10 +183,7 @@
% break out of the first cell as soon as the row format has a & in it
% since the assignment will be counted as being in the first cell
\def\do##1{%
- \begingroup
- \blx@getdata{##1}%
\blx@setdefaultrefcontext{##1}%
- \endgroup
\gdef\extblxtab@tabrow@entrykey{##1}%
\csuse{extblxtab@tabrow@format@\blx@theenv}}%
\csuse{extblxtab@env@\blx@theenv}%
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf
index 0c64772d89..0557c4d30c 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex
index b128723479..bc425aebd3 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/biblatex-ext.tex
@@ -586,7 +586,7 @@
\newcommand*{\ctan}{\mkbibacro{CTAN}}
\newcommand*{\gitbaseurl}{https://github.com/moewew/biblatex-ext}
-\newcommand*{\extblxversion}{0.12b}
+\newcommand*{\extblxversion}{0.13}
\newcommand*{\biber}{Biber}
\newcommand*{\gitissuelink}[1]{%
\href{\gitbaseurl/issues/#1}{issue \##1 on github}}
@@ -659,7 +659,7 @@
author = {Moritz Wemheuer},
email = {mwemheu@posteo.de},%
revision = {\extblxversion},
- date = {\DTMDate{2021-04-22}},
+ date = {\DTMDate{2021-06-08}},
}
\hypersetup{%
@@ -2182,6 +2182,15 @@ A customisation example for \bibfield{issuedate} can be found in the
\exampleprintbib{knuth:ct:a}
\end{bibexample}
+\bibfieldformatitem{biblabeltitle}
+ The format for the title when it is used in \blxstyle{authoryear}
+ styles to replace a missing author/editor.
+ By default this field format is an alias for \bibfieldformat{title}.
+ \begin{bibexample}
+ \DeclareFieldFormat{biblabeltitle}{\highlight[1]{#1}}%
+ \exampleprintbib{jcg}
+ \end{bibexample}
+
\bibfieldformatitem{titlecase:title} The standard styles follow an
all-or-nothing approach when it comes to title casing. The field format
\bibfieldformat{titlecase} intended to enable sentence case with
@@ -2208,6 +2217,11 @@ A customisation example for \bibfield{issuedate} can be found in the
Like \hyperbibfieldformat{titlecase:title}, but controls the title casing
of the \bibfield{issuetitle} and \bibfield{issuesubtitle} fields.
+\bibfieldformatitem{titlecase:biblabeltitle}
+ Like \hyperbibfieldformat{titlecase:title}, but controls the title casing
+ of the title printed instead of missing author/editor name in
+ \blxstyle{authoryear} styles.
+
The \bibfieldformat{citetitle} field format can be used to change the title
case in author-title citations, so there is no
\bibfieldformat{citetitle:labeltitle}.
@@ -3923,6 +3937,13 @@ See also \filename{CHANGES.md}.
The numbers on the right indicate the relevant section of the manual.
\begin{changelog}
+\begin{release}{0.13}{2021-06-08}
+ \item Fixed title formatting with related entries in
+ \blxstyle{authoryear} style family
+ \item Added \hyperbibfieldformat{biblabeltitle} and
+ \hyperbibfieldformat{titlecase:biblabeltitle} field formats
+ \see{sec:opt:field}
+\end{release}
\begin{release}{0.12b}{2021-04-22}
\item Fixed bug with refcontext assignment in
\hypercmd{printbibtabular}\see{sec:tabularbib}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua b/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua
index 64969c1959..4218deef6a 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/blxextdoiapi.lua
@@ -2,8 +2,8 @@ blxextdoiapi = blxextdoiapi or {}
local blxextdoiapi_module = {
name = "blxextdoiapi",
- version = "v0.12b",
- date = "2021/04/22",
+ version = "v0.13",
+ date = "2021/06/08",
description = "Obtain open access information from DOI via unpaywall.org",
author = "Moritz Wemheuer",
license = "LPPL v1.3c",
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx
index 2634f165f2..91f9925778 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-alphabetic-verb.bbx}
- [2021/04/22 v0.12b extended biblatex alphabetic-verb
+ [2021/06/08 v0.13 extended biblatex alphabetic-verb
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx
index 887129297c..f77d84ea48 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic-verb.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-alphabetic-verb.cbx}
- [2021/04/22 v0.12b extended biblatex alphabetic-verb citation style
+ [2021/06/08 v0.13 extended biblatex alphabetic-verb citation style
(MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx
index 0b03d50bfe..0cfdeedfd3 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-alphabetic.bbx}
- [2021/04/22 v0.12b extended biblatex alphabetic bibliography style (MW)]
+ [2021/06/08 v0.13 extended biblatex alphabetic bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
\RequireBibliographyStyle{alphabetic}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx
index 3fda36aaa1..cd78c92994 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-alphabetic.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-alphabetic.cbx}
- [2021/04/22 v0.12b extended biblatex alphabetic citation style (MW)]
+ [2021/06/08 v0.13 extended biblatex alphabetic citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx
index 87746ae2c2..c4ce93a0ac 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-common.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-common.bbx}
- [2021/04/22 v0.12b common files for extended biblatex
+ [2021/06/08 v0.13 common files for extended biblatex
authortitle bibliography styles (MW)]
\RequireBibliographyStyle{ext-dashed-common}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx
index edf2be1d7b..7f8b5d1cfd 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-comp.bbx}
- [2021/04/22 v0.12b extended biblatex authortitle-comp
+ [2021/06/08 v0.13 extended biblatex authortitle-comp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx
index b0441c9300..a8dda2f73b 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-comp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-comp.cbx}
- [2021/04/22 v0.12b extended biblatex authortitle-comp
+ [2021/06/08 v0.13 extended biblatex authortitle-comp
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx
index b7b7898071..f1c414d68e 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-ibid.bbx}
- [2021/04/22 v0.12b extended biblatex authortitle-ibid
+ [2021/06/08 v0.13 extended biblatex authortitle-ibid
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx
index 0249fcf409..f8fd669adf 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ibid.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-ibid.cbx}
- [2021/04/22 v0.12b extended biblatex authortitle-ibid
+ [2021/06/08 v0.13 extended biblatex authortitle-ibid
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx
index b0415e351e..35628c3a94 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-icomp.bbx}
- [2021/04/22 v0.12b extended biblatex authortitle-icomp
+ [2021/06/08 v0.13 extended biblatex authortitle-icomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx
index e766e85538..970d14a937 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-icomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-icomp.cbx}
- [2021/04/22 v0.12b extended biblatex authortitle-icomp
+ [2021/06/08 v0.13 extended biblatex authortitle-icomp
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx
index a7e1aa4a11..19239c314f 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-tcomp.bbx}
- [2021/04/22 v0.12b extended biblatex authortitle-tcomp
+ [2021/06/08 v0.13 extended biblatex authortitle-tcomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx
index dd4fe46138..94f0d3ff69 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-tcomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-tcomp.cbx}
- [2021/04/22 v0.12b extended biblatex authortitle-tcomp
+ [2021/06/08 v0.13 extended biblatex authortitle-tcomp
citation style (MW)]
\RequireCitationStyle{ext-authortitle-comp}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx
index d323e30237..bb11205615 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-terse.bbx}
- [2021/04/22 v0.12b extended biblatex authortitle-terse
+ [2021/06/08 v0.13 extended biblatex authortitle-terse
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx
index 1a2a31eb2e..daf2d35cb4 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-terse.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-terse.cbx}
- [2021/04/22 v0.12b extended biblatex authortitle-terse
+ [2021/06/08 v0.13 extended biblatex authortitle-terse
citation style (MW)]
\RequireCitationStyle{ext-authortitle}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx
index a4d7023d7f..5c52351f76 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-ticomp.bbx}
- [2021/04/22 v0.12b extended biblatex authortitle-ticomp
+ [2021/06/08 v0.13 extended biblatex authortitle-ticomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx
index a879fa36c4..adc6e7fddb 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle-ticomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-ticomp.cbx}
- [2021/04/22 v0.12b extended biblatex authortitle-ticomp citation style
+ [2021/06/08 v0.13 extended biblatex authortitle-ticomp citation style
(MW)]
\RequireCitationStyle{ext-authortitle-icomp}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx
index 38780397a6..df694cddfa 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle.bbx}
- [2021/04/22 v0.12b extended biblatex authortitle
+ [2021/06/08 v0.13 extended biblatex authortitle
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx
index 3271ac91f1..41b1f0e4aa 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authortitle.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle.cbx}
- [2021/04/22 v0.12b extended biblatex authortitle citation style (MW)]
+ [2021/06/08 v0.13 extended biblatex authortitle citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx
index c4af3fe1b1..cdd9e8602e 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-common.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-common.bbx}
- [2021/04/22 v0.12b common files for extended biblatex
+ [2021/06/08 v0.13 common files for extended biblatex
authoryear bibliography styles (MW)]
\RequireBibliographyStyle{ext-dashed-common}
@@ -125,6 +125,22 @@
\usebibmacro{date}}%
\newunit}}
+\DeclareFieldAlias{biblabeltitle}{title}
+\DeclareFieldAlias{titlecase:biblabeltitle}{tilecase}
+\renewbibmacro*{labeltitle}{%
+ \iffieldundef{label}
+ {\iffieldundef{shorttitle}
+ {\iffieldundef{title}
+ {\printtext[biblabeltitle]{%
+ \printfield[titlecase:biblabeltitle]{maintitle}}%
+ \clearfield{maintitle}}
+ {\printtext[biblabeltitle]{%
+ \printfield[titlecase:biblabeltitle]{title}}%
+ \clearfield{title}}}
+ {\printtext[biblabeltitle]{%
+ \printfield[titlecase:biblabeltitle]{shorttitle}}}}
+ {\printfield{label}}}
+
\defbibenvironment{bibliography}
{\list
{\ifcsequal{extblx@introcite}{extblx@opt@introcite@label}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx
index ebe80cbdf4..7b8ff065cf 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-comp.bbx}
- [2021/04/22 v0.12b extended biblatex authoryear-comp
+ [2021/06/08 v0.13 extended biblatex authoryear-comp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx
index c768af135b..9f621acde8 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-comp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-comp.cbx}
- [2021/04/22 v0.12b extended biblatex authoryear-comp
+ [2021/06/08 v0.13 extended biblatex authoryear-comp
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx
index c659ecc398..ecbb2a2035 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ecomp.bbx}
- [2021/04/22 v0.12b biblatex authoryear-ecomp
+ [2021/06/08 v0.13 biblatex authoryear-ecomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx
index d2898dd65f..f764d0c763 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ecomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ecomp.cbx}
- [2021/04/22 v0.12b biblatex authoryear-ecomp
+ [2021/06/08 v0.13 biblatex authoryear-ecomp
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx
index 1825377999..35371ee6ce 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ibid.bbx}
- [2021/04/22 v0.12b extended biblatex authoryear-ibid
+ [2021/06/08 v0.13 extended biblatex authoryear-ibid
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx
index f8be083a75..8e83a69ce7 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ibid.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ibid.cbx}
- [2021/04/22 v0.12b extended biblatex authoryear-ibid
+ [2021/06/08 v0.13 extended biblatex authoryear-ibid
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx
index 6a48dfc92d..55cc87fbff 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-icomp.bbx}
- [2021/04/22 v0.12b extended biblatex authoryear-icomp
+ [2021/06/08 v0.13 extended biblatex authoryear-icomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx
index eeb648f4a4..3dcd322c20 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-icomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-icomp.cbx}
- [2021/04/22 v0.12b extended biblatex authoryear-icomp
+ [2021/06/08 v0.13 extended biblatex authoryear-icomp
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx
index 300607cb6c..7e52c85f5e 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-iecomp.bbx}
- [2021/04/22 v0.12b biblatex authoryear-iecomp
+ [2021/06/08 v0.13 biblatex authoryear-iecomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx
index d54b1ffc59..541305d258 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-iecomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-iecomp.cbx}
- [2021/04/22 v0.12b biblatex authoryear-iecomp
+ [2021/06/08 v0.13 biblatex authoryear-iecomp
citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx
index aed0f465d0..bf1ce45681 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tcomp.bbx}
- [2021/04/22 v0.12b extended biblatex authoryear-tcomp
+ [2021/06/08 v0.13 extended biblatex authoryear-tcomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx
index 668e57dbdd..875fba04a4 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tcomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tcomp.cbx}
- [2021/04/22 v0.12b extended biblatex authoryear-tcomp
+ [2021/06/08 v0.13 extended biblatex authoryear-tcomp
citation style (MW)]
\RequireCitationStyle{ext-authoryear-comp}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx
index 729f3afc02..46ee8ab8ed 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tecomp.bbx}
- [2021/04/22 v0.12b extended biblatex authoryear-tecomp
+ [2021/06/08 v0.13 extended biblatex authoryear-tecomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx
index f2bbd39c7c..63b017d056 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tecomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tecomp.cbx}
- [2021/04/22 v0.12b extended biblatex authoryear-tecomp
+ [2021/06/08 v0.13 extended biblatex authoryear-tecomp
citation style (MW)]
\RequireCitationStyle{ext-authoryear-ecomp}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx
index fe0b406409..e3cfa20125 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-terse.bbx}
- [2021/04/22 v0.12b extended biblatex authoryear-terse
+ [2021/06/08 v0.13 extended biblatex authoryear-terse
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx
index 509607123c..ba4fd61a66 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-terse.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-terse.cbx}
- [2021/04/22 v0.12b extended biblatex authoryear-terse
+ [2021/06/08 v0.13 extended biblatex authoryear-terse
citation style (MW)]
\RequireCitationStyle{ext-authoryear}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx
index 126e014efb..59c4f07fef 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ticomp.bbx}
- [2021/04/22 v0.12b extended biblatex authoryear-ticomp
+ [2021/06/08 v0.13 extended biblatex authoryear-ticomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx
index e833664d29..44266a8d9a 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-ticomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ticomp.cbx}
- [2021/04/22 v0.12b extended biblatex authoryear-ticomp citation style
+ [2021/06/08 v0.13 extended biblatex authoryear-ticomp citation style
(MW)]
\RequireCitationStyle{ext-authoryear-icomp}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx
index 510f3b0250..934611ea30 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tiecomp.bbx}
- [2021/04/22 v0.12b extended biblatex authoryear-tiecomp
+ [2021/06/08 v0.13 extended biblatex authoryear-tiecomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx
index 3fa36777a5..f8346f9d24 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear-tiecomp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tiecomp.cbx}
- [2021/04/22 v0.12b extended biblatex authoryear-tiecomp citation style
+ [2021/06/08 v0.13 extended biblatex authoryear-tiecomp citation style
(MW)]
\RequireCitationStyle{ext-authoryear-iecomp}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx
index 8c71341812..d32cce8a2b 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear.bbx}
- [2021/04/22 v0.12b extended biblatex authoryear bibliography style (MW)]
+ [2021/06/08 v0.13 extended biblatex authoryear bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
\RequireBibliographyStyle{authoryear}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx
index 320d35f962..303292ec60 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-authoryear.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear.cbx}
- [2021/04/22 v0.12b extended biblatex authoryear citation style (MW)]
+ [2021/06/08 v0.13 extended biblatex authoryear citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def
index 410eb9ddf0..aff330e29c 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-biblatex-aux.def
@@ -1,5 +1,5 @@
\ProvidesFile{ext-biblatex-aux.def}
- [2021/04/22 v0.12b auxiliaries for extended biblatex citation style
+ [2021/06/08 v0.13 auxiliaries for extended biblatex citation style
(MW)]
\def\extblx@requiredbiblatexversion{3.16}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx
index 758b0a2d09..abda2f4fee 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-dashed-common.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-dashed-common.bbx}
- [2021/04/22 v0.12b common files for extended biblatex
+ [2021/06/08 v0.13 common files for extended biblatex
dashed bibliography styles (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx
index 5a1f8a1458..88928c4300 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric-comp.bbx}
- [2021/04/22 v0.12b extended biblatex numeric-comp
+ [2021/06/08 v0.13 extended biblatex numeric-comp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx
index e12b7fec6b..5ac8ea0f28 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-comp.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric-comp.cbx}
- [2021/04/22 v0.12b extended biblatex numeric-comp citation style (MW)]
+ [2021/06/08 v0.13 extended biblatex numeric-comp citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx
index 236fbfcbb8..3dde2b96f4 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric-verb.bbx}
- [2021/04/22 v0.12b extended biblatex numeric-verb
+ [2021/06/08 v0.13 extended biblatex numeric-verb
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx
index fb01071283..c25d71d2a1 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric-verb.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric-verb.cbx}
- [2021/04/22 v0.12b extended biblatex numeric-verb citation style (MW)]
+ [2021/06/08 v0.13 extended biblatex numeric-verb citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx
index 0b8804b674..cdedfb81b1 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric.bbx}
- [2021/04/22 v0.12b extended biblatex numeric bibliography style (MW)]
+ [2021/06/08 v0.13 extended biblatex numeric bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
\RequireBibliographyStyle{numeric}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx
index f1defc9527..a5efe54826 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-numeric.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric.cbx}
- [2021/04/22 v0.12b extended biblatex numeric citation style (MW)]
+ [2021/06/08 v0.13 extended biblatex numeric citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx
index 0d2005dc27..e9e9526fd1 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-standard.bbx
@@ -1,9 +1,9 @@
-% biblatex-ext v0.12b (2021-04-22)
+% biblatex-ext v0.13 (2021-06-08)
% Maintainer: Moritz Wemheuer
% Licence: LaTeX Project Public License v1.3c or later
%
\ProvidesFile{ext-standard.bbx}
- [2021/04/22 v0.12b extended biblatex standard style (MW)]
+ [2021/06/08 v0.13 extended biblatex standard style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
@@ -1268,6 +1268,43 @@
\setunit*{\pubdatedelim}%
\printdate}}}
+% -------------------------------------------------------------------
+% Compatibility code for older biblatex
+% -------------------------------------------------------------------
+
+% fixed related:default will be in biblatex v3.17
+% it was added 2021-06-07, so that's the date we test against
+\@ifpackagelater{biblatex}{2021/06/07}
+ {}
+ {\renewbibmacro*{related:default}[1]{%
+ \entrydata*{#1}{%
+ \usedriver
+ {\ifnameundef{savedauthor}
+ {\ifnameundef{savededitor}
+ {}
+ {\ifnamesequal{editor}{savededitor}
+ {\clearname{editor}}
+ {}}}
+ {\ifnamesequal{author}{savedauthor}
+ {\clearname{author}}
+ {}}%
+ \DeclareNameAlias{sortname}{default}%
+ % from authortitle and authoryear
+ \ifbibmacroundef{bbx:dashcheck}
+ {}
+ {\renewbibmacro*{bbx:dashcheck}[2]{##2}}%
+ % authoryear
+ \ifbibmacroundef{labeltitle}
+ {}
+ {\renewbibmacro*{labeltitle}{}}%
+ \ifbibmacroundef{date+extradate}
+ {}
+ {\renewbibmacro*{date+extradate}{}%
+ \renewbibmacro*{bbx:ifmergeddate}{\@secondoftwo}}%
+ \renewbibmacro*{pageref}{}%
+ \renewbibmacro*{related:init}{}}
+ {\thefield{entrytype}}}}}
+
\endinput
% Copyright 2017-2021 Moritz Wemheuer
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-common.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-common.cbx
index 924e6e0d62..85dd5c3596 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-common.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-common.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-common.cbx}
- [2021/04/22 v0.12b extended biblatex verbose citation style (MW)]
+ [2021/06/08 v0.13 extended biblatex verbose citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx
index 06dabdd2f7..9e0f28c783 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-ibid.bbx}
- [2021/04/22 v0.12b extended biblatex verbose-ibid
+ [2021/06/08 v0.13 extended biblatex verbose-ibid
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx
index 48cb5bdd9e..f62bb975a3 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-ibid.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-ibid.cbx}
- [2021/04/22 v0.12b extended biblatex verbose-ibid citation style (MW)]
+ [2021/06/08 v0.13 extended biblatex verbose-ibid citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx
index 0aa09e3bae..1fc9165ffd 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-inote.bbx}
- [2021/04/22 v0.12b extended biblatex verbose-inote
+ [2021/06/08 v0.13 extended biblatex verbose-inote
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx
index 751facf3ac..6cddc781ee 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-inote.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-inote.cbx}
- [2021/04/22 v0.12b extended biblatex verbose-inote citation style (MW)]
+ [2021/06/08 v0.13 extended biblatex verbose-inote citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note-common.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note-common.cbx
index b225237733..ee47d58cbc 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note-common.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note-common.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-note-common.cbx}
- [2021/04/22 v0.12b extended biblatex verbose citation style (MW)]
+ [2021/06/08 v0.13 extended biblatex verbose citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx
index faa4741c21..43cefe940d 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-note.bbx}
- [2021/04/22 v0.12b extended biblatex verbose-note
+ [2021/06/08 v0.13 extended biblatex verbose-note
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx
index 3b53f83dc7..485b8fd274 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-note.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-note.cbx}
- [2021/04/22 v0.12b extended biblatex verbose-note citation style (MW)]
+ [2021/06/08 v0.13 extended biblatex verbose-note citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx
index fae5aabb4d..21541c5543 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad1.bbx}
- [2021/04/22 v0.12b extended biblatex verbose-trad1
+ [2021/06/08 v0.13 extended biblatex verbose-trad1
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx
index 9ca2625615..00e63a39ca 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad1.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad1.cbx}
- [2021/04/22 v0.12b extended biblatex verbose-trad1 citation style (MW)]
+ [2021/06/08 v0.13 extended biblatex verbose-trad1 citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx
index cb7ad82801..993e5c4d07 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad2.bbx}
- [2021/04/22 v0.12b extended biblatex verbose-trad2
+ [2021/06/08 v0.13 extended biblatex verbose-trad2
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx
index 8a04d72d29..2db10acc3c 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad2.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad2.cbx}
- [2021/04/22 v0.12b extended biblatex verbose-trad2 citation style (MW)]
+ [2021/06/08 v0.13 extended biblatex verbose-trad2 citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx
index 026a5f9519..a29268a06b 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad3.bbx}
- [2021/04/22 v0.12b extended biblatex verbose-trad3
+ [2021/06/08 v0.13 extended biblatex verbose-trad3
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx
index 06cf279c5f..0bdbd02ec5 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose-trad3.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad3.cbx}
- [2021/04/22 v0.12b extended biblatex verbose-trad3 citation style (MW)]
+ [2021/06/08 v0.13 extended biblatex verbose-trad3 citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx
index 00da2b30ca..9ffb44df4c 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.bbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose.bbx}
- [2021/04/22 v0.12b extended biblatex verbose
+ [2021/06/08 v0.13 extended biblatex verbose
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx
index 1daf247fce..24343f7466 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-ext/ext-verbose.cbx
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose.cbx}
- [2021/04/22 v0.12b extended biblatex verbose citation style (MW)]
+ [2021/06/08 v0.13 extended biblatex verbose citation style (MW)]
\blx@inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff --git a/macros/latex/contrib/csvsimple/CHANGES b/macros/latex/contrib/csvsimple/CHANGES
index 10a0bcd925..3e17f605c7 100644
--- a/macros/latex/contrib/csvsimple/CHANGES
+++ b/macros/latex/contrib/csvsimple/CHANGES
@@ -1,7 +1,7 @@
-%% The LaTeX package csvsimple - version 1.21 (2019/04/09)
+%% The LaTeX package csvsimple - version 1.22 (2021/06/07)
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2008-2019 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2008-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -107,3 +107,9 @@ version 1.21 (2019/04/09):
- spurious blank in sorting code removed
- package 'pgfrcs' added as required package
- (#3): introduction augmented with additional hints for first time users
+
+version 1.22 (2021/06/07):
+- (#7) new option 'head to column names prefix'
+- (#11) Due to changes in the LaTeX kernel 2021-06-01, the empty line
+ detection of csvsimple had to be adapted. Updating csvsimple is
+ essential to avoid problems with kernel 2021-06-01.
diff --git a/macros/latex/contrib/csvsimple/README b/macros/latex/contrib/csvsimple/README
index ee2f9c807e..58bc68766f 100644
--- a/macros/latex/contrib/csvsimple/README
+++ b/macros/latex/contrib/csvsimple/README
@@ -1,7 +1,7 @@
-%% The LaTeX package csvsimple - version 1.21 (2019/04/09)
+%% The LaTeX package csvsimple - version 1.22 (2021/06/07)
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2008-2019 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2008-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
diff --git a/macros/latex/contrib/csvsimple/csvsimple-example.pdf b/macros/latex/contrib/csvsimple/csvsimple-example.pdf
index 0965f75e26..b6c4967de6 100644
--- a/macros/latex/contrib/csvsimple/csvsimple-example.pdf
+++ b/macros/latex/contrib/csvsimple/csvsimple-example.pdf
Binary files differ
diff --git a/macros/latex/contrib/csvsimple/csvsimple-example.tex b/macros/latex/contrib/csvsimple/csvsimple-example.tex
index 87a327f300..030ad63878 100644
--- a/macros/latex/contrib/csvsimple/csvsimple-example.tex
+++ b/macros/latex/contrib/csvsimple/csvsimple-example.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package csvsimple - version 1.21 (2019/04/09)
+%% The LaTeX package csvsimple - version 1.22 (2021/06/07)
%% csvsimple-example.tex: an example for csvsimple
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2008-2019 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2008-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
diff --git a/macros/latex/contrib/csvsimple/csvsimple.pdf b/macros/latex/contrib/csvsimple/csvsimple.pdf
index 02f43bf81c..887cb48c39 100644
--- a/macros/latex/contrib/csvsimple/csvsimple.pdf
+++ b/macros/latex/contrib/csvsimple/csvsimple.pdf
Binary files differ
diff --git a/macros/latex/contrib/csvsimple/csvsimple.sty b/macros/latex/contrib/csvsimple/csvsimple.sty
index ed4b83b1c3..98d1a32866 100644
--- a/macros/latex/contrib/csvsimple/csvsimple.sty
+++ b/macros/latex/contrib/csvsimple/csvsimple.sty
@@ -1,8 +1,8 @@
-%% The LaTeX package csvsimple - version 1.21 (2019/04/09)
+%% The LaTeX package csvsimple - version 1.22 (2021/06/07)
%% csvsimple.sty: Simple LaTeX CSV file processing
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2008-2019 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2008-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{csvsimple}[2019/04/09 version 1.21 LaTeX CSV file processing]
+\ProvidesPackage{csvsimple}[2021/06/07 version 1.22 LaTeX CSV file processing]
\RequirePackage{pgfrcs,pgfkeys,ifthen,etoolbox,shellesc}
@@ -182,9 +182,9 @@
% auto head names
\def\set@csv@autohead{%
- \toks0=\expandafter{\csname\csv@current@col\endcsname}%
+ \toks0=\expandafter{\csname\csv@headnameprefix\csv@current@col\endcsname}%
\toks1=\expandafter{\csname csvcol\romannumeral\c@csvcol\endcsname}%
- \edef\csv@temp{\noexpand\gdef\the\toks0{\the\toks1}\noexpand\csv@AtEndLoop{\noexpand\gdef\the\toks0{}}}%
+ \begingroup\edef\csv@temp{\endgroup\noexpand\gdef\the\toks0{\the\toks1}\noexpand\csv@AtEndLoop{\noexpand\gdef\the\toks0{}}}%
\csv@temp%
}
@@ -192,16 +192,16 @@
\def\set@csv@head{%
\toks0={\gdef##1}%
\toks1=\expandafter{\csname csvcol\romannumeral\c@csvcol\endcsname}%
- \edef\csv@temp{\noexpand\pgfkeysdef{/csv head/\csv@current@col}{\the\toks0{\the\toks1}\noexpand\csv@AtEndLoop{\the\toks0{}}}}%
+ \begingroup\edef\csv@temp{\endgroup\noexpand\pgfkeysdef{/csv head/\csv@current@col}{\the\toks0{\the\toks1}\noexpand\csv@AtEndLoop{\the\toks0{}}}}%
\csv@temp%
- \edef\csv@temp{\noexpand\pgfkeysdef{/csv head/\thecsvcol}{\the\toks0{\the\toks1}\noexpand\csv@AtEndLoop{\the\toks0{}}}}%
+ \begingroup\edef\csv@temp{\endgroup\noexpand\pgfkeysdef{/csv head/\thecsvcol}{\the\toks0{\the\toks1}\noexpand\csv@AtEndLoop{\the\toks0{}}}}%
\csv@temp%
}
% head line
\def\csv@processheadline{%
\csvreadnext%
- \if\csv@par\csvline\relax%
+ \ifx\csv@par\csvline\relax%
\csv@error{File '\csv@input@filename' starts with an empty line!}{}%
\else\csv@escanline{\csvline}%
\fi%
@@ -222,7 +222,7 @@
\def\set@csv@nohead{%
\toks0={\gdef##1}%
\toks1=\expandafter{\csname csvcol\romannumeral\c@csvcol\endcsname}%
- \edef\csv@temp{\noexpand\pgfkeysdef{/csv head/\thecsvcol}{\the\toks0{\the\toks1}\noexpand\csv@AtEndLoop{\the\toks0{}}}}%
+ \begingroup\edef\csv@temp{\endgroup\noexpand\pgfkeysdef{/csv head/\thecsvcol}{\the\toks0{\the\toks1}\noexpand\csv@AtEndLoop{\the\toks0{}}}}%
\csv@temp%
}
@@ -281,7 +281,7 @@
\stepcounter{csvinputline}%
}
-\let\csv@par=\par
+\def\csv@par{\par}
% reads and processes a CSV file
\long\def\csvloop#1{%
@@ -329,7 +329,7 @@
\global\let\csv@next=\csv@empty%
\else%
\global\let\csv@next=\csv@iterate%
- \if\csv@par\csvline\relax%
+ \ifx\csv@par\csvline\relax%
\else%
\csv@escanline{\csvline}%
% check and decide
@@ -395,6 +395,7 @@
\pgfkeysalso{check column count}},%
head/false/.code={\global\let\csv@opt@processheadline=\csv@noheadline%
\pgfkeysalso{check column count=false,late after head=}},%
+ head to column names prefix/.store in=\csv@headnameprefix,%
head to column names/.is choice,%
head to column names/.default=true,%
head to column names/true/.code={\global\let\csv@opt@headtocolumnames=\set@csv@autohead},%
@@ -456,6 +457,7 @@
command=\csvline,
column names reset,
head,
+ head to column names prefix=,
head to column names=false,
column count=10,
on column count error=,
diff --git a/macros/latex/contrib/csvsimple/csvsimple.tex b/macros/latex/contrib/csvsimple/csvsimple.tex
index 73855697f6..924a819584 100644
--- a/macros/latex/contrib/csvsimple/csvsimple.tex
+++ b/macros/latex/contrib/csvsimple/csvsimple.tex
@@ -1,10 +1,10 @@
% \LaTeX-Main\
% !TeX encoding=UTF-8
-%% The LaTeX package csvsimple - version 1.21 (2019/04/09)
+%% The LaTeX package csvsimple - version 1.22 (2021/06/07)
%% csvsimple.tex: Manual
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2008-2019 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2008-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -124,8 +124,8 @@
pdfkeywords={csv file, comma separated values, key value syntax}
}
-\def\version{1.21}%
-\def\datum{2019/04/09}%
+\def\version{1.22}%
+\def\datum{2021/06/07}%
\makeindex
@@ -143,7 +143,7 @@
\footnote{Prof.~Dr.~Dr.~Thomas F.~Sturm, Institut f\"{u}r Mathematik und Informatik,
Universit\"{a}t der Bundeswehr M\"{u}nchen, D-85577 Neubiberg, Germany;
email: \href{mailto:thomas.sturm@unibw.de}{thomas.sturm@unibw.de}}\par\medskip
-\normalsize\url{http://www.ctan.org/pkg/csvsimple}\par
+\normalsize\url{https://www.ctan.org/pkg/csvsimple}\par
\url{https://github.com/T-F-S/csvsimple}
}
\end{center}
@@ -181,7 +181,7 @@ Mind the following restrictions:
with external tools, see \Fullref{sec:Sorting}.
\item Values are expected to be comma separated, but the package
provides support for other separators, see \Fullref{sec:separators}.
-\item Values are expected to be not quoted or quoted with
+\item Values are expected to be either not quoted or quoted with
curly braces |{}| of \TeX\ groups. Other quotes like doublequotes
are not supported directly, but can be achieved
with external tools, see \Fullref{sec:importeddata}.
@@ -290,16 +290,19 @@ The next example shows such a style definition with the convenience macro
entries to column names by \refKey{/csv/head to column names}.
For this, the header entries have to be without spaces and special characters.
But you can always assign entries to canonical macro names by hand like in the examples
-above.
+above. Here, we also add a \refKey{/csv/head to column names prefix} to avoid
+macro name clashes.
\begin{dispExample}
\csvstyle{myTableStyle}{tabular=|r|l|c|,
table head=\hline & Person & Matr.~No.\\\hline\hline,
late after line=\\\hline,
- head to column names}
+ head to column names,
+ head to column names prefix=MY,
+ }
\csvreader[myTableStyle]{grade.csv}{}%
- {\thecsvrow & \givenname~\name & \matriculation}%
+ {\thecsvrow & \MYgivenname~\MYname & \MYmatriculation}%
\end{dispExample}
@@ -781,7 +784,7 @@ to be used inside these macros.
Additional command definition keys are provided for the supported tables,
see Section~\ref{subsec:tabsupport} from page~\pageref{subsec:tabsupport}.
-
+\clearpage
\subsection{Header Processing and Column Name Assignment}%
\begin{docCsvKey}{head}{\colOpt{=true\textbar false}}{default |true|, initially |true|}
@@ -814,6 +817,22 @@ see Section~\ref{subsec:tabsupport} from page~\pageref{subsec:tabsupport}.
as macro names for the columns. This option can be used only, if
the header entries do not contain spaces and special characters to be
used as feasible \LaTeX\ macro names.
+ Note that the macro definition is \emph{global} and may therefore override
+ existing macros for the rest of the document. Adding
+ \refKey{/csv/head to column names prefix} may help to avoid unwanted
+ overrides.
+\end{docCsvKey}
+
+
+\begin{docCsvKey}[][doc new=2019-07-16]{head to column names prefix}{=\meta{text}}{no default, initially empty}
+ The given \meta{text} is prefixed to the name of all macros generated by
+ \refKey{/csv/head to column names}. For example, if you use the settings
+\begin{dispListing}
+ head to column names,
+ head to column names prefix=MY,
+\end{dispListing}
+ a header entry |section| will generate the corresponding macro
+ |\MYsection| instead of destroying the standard \LaTeX\ |\section| macro.
\end{docCsvKey}
@@ -1798,7 +1817,6 @@ add an invisible dummy column with |c@{}| as first column:
\end{dispExample}
-
\clearpage
Now, the preceding table shall be sorted by the \emph{cats} values.
If the \csvsorter\ program is properly installed,
diff --git a/macros/latex/contrib/easybook/README.md b/macros/latex/contrib/easybook/README.md
index 291c226006..d3e2188e8a 100644
--- a/macros/latex/contrib/easybook/README.md
+++ b/macros/latex/contrib/easybook/README.md
@@ -1,20 +1,10 @@
# Easybook document class
-Easybook is based on the ctexbook book document class to create a minimalist style template, which can be seen as a further packaging and enhancement of ctexbook. Although the ctex document class provides better Chinese support, it is generally necessary to load more macro packages for customization if you want to achieve personalized functions. Easybook has considered some details and has loaded some commonly used macro packages to achieve general typesetting requirements. It also has the function of article file type, so that users can easily set it up. It is suitable for typesetting Chinese and English academic books, notes or dissertations.
-## Reference
-
-- [CTeX macro collection manual](https://ctan.org/pkg/ctex)
-- [The LaTeX3 Interfaces](https://www.ctan.org/pkg/l3kernel)
-- Latex2e Text Classes and Macro Packages Learning Manual — Hu Wei
-- Introduction to LaTeX — Liu Haiyang
-- [Fudan University graduation thesis template](https://github.com/stone-zeng/fduthesis)
-- [Xiamen University graduation thesis template](https://github.com/CamuseCao/XMU-thesis)
-- [Wuhan University graduation thesis template](https://github.com/mtobeiyf/whu-thesis)
-- [ElegantBook book template](https://ctan.org/pkg/elegantbook)
+Easybook is based on the ctexbook book document class to create a minimalist style template, which can be seen as a further packaging and enhancement of ctexbook. Although the ctex document class provides better Chinese support, it is generally necessary to load more macro packages for customization if you want to achieve personalized functions. Easybook has considered some details and has loaded some commonly used macro packages to achieve general typesetting requirements. It also has the function of article file type, so that users can easily set it up. It is suitable for typesetting Chinese and English dissertations, academic books or notes.
## License
-This work may be distributed and/or modified under the conditions of the CC-BY 4.0 License. The latest version of this license is in https://creativecommons.org/licenses/by/4.0/legalcode.
+This work may be distributed and/or modified under the conditions of the CC-BY 4.0 License. The latest version of this license is in https://creativecommons.org/licenses/by/4.0/legalcode
## Website
@@ -22,22 +12,11 @@ This work may be distributed and/or modified under the conditions of the CC-BY 4
# easybook 文档类
-easybook 是基于 ctexbook 书籍文档类创建以极简为风格的模板,可以看作对 ctexbook 的进一步包装与增强。虽然 ctex 文档类提供了较好的中文支持,但想实现个性化功能一般需要在其基础上载入更多宏包来定制。easybook 考虑了一些细节并已载入一些常用宏包用于实现一般的排版需求,同时也具有 article 档类的功能,使用户可以简便地进行设置。它适用于排版中英文学术书籍、笔记或者是学位论文。
-
-## 参考文献
-
-- [CTeX 宏集手册](https://ctan.org/pkg/ctex)
-- [The LaTeX3 Interfaces](https://www.ctan.org/pkg/l3kernel)
-- LaTeX2e 文类与宏包学习手册 — 胡伟
-- LaTeX 入门 — 刘海洋
-- [复旦大学毕业论文模板](https://github.com/stone-zeng/fduthesis)
-- [厦门大学毕业论文模板](https://github.com/CamuseCao/XMU-thesis)
-- [武汉大学毕业论文模板](https://github.com/mtobeiyf/whu-thesis)
-- [ElegantBook 书籍模板](https://ctan.org/pkg/elegantbook)
+easybook 是基于 ctexbook 书籍文档类创建以极简为风格的模板,可以看作对 ctexbook 的进一步包装与增强。虽然 ctex 文档类提供了较好的中文支持,但想实现个性化功能一般需要在其基础上载入更多宏包来定制。easybook 考虑了一些细节并已载入一些常用宏包用于实现一般的排版需求,同时也具有 article 档类的功能,使用户可以简便地进行设置。它适用于排版中英文学位论文、学术书籍或者是笔记。
## 协议
-可以使用 CC-BY 4.0 许可协议传播和修改此作品。此许可协议的最新版本位于 https://creativecommons.org/licenses/by/4.0/legalcode。
+可以使用 CC-BY 4.0 许可协议传播和修改此作品。此许可协议的最新版本位于 https://creativecommons.org/licenses/by/4.0/legalcode
## 网址
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index 8b0f06cada..43e86f831b 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -23,16 +23,16 @@
%
% \changes{v1.20}{2021/01/09}{修改和完善用户文档。}
% \changes{v1.20}{2021/01/09}{模板更改为使用 CC-BY 许可协议。}
-% \changes{v1.25v}{2021/05/03}{取消附带的示例文件,可查看历史版本及其它来源的使用样例。}
-% \changes{v1.25v}{2021/06/02}{将模块的代码独立出来为 \pkg{easybase} 宏包,适用于 \CTeX 文档类。}
+% \changes{v1.25w}{2021/05/03}{取消附带的示例文件,可查看历史版本及其它来源的使用样例。}
+% \changes{v1.25w}{2021/06/02}{将模块的代码独立出来为 \pkg{easybase} 宏包,适用于 \CTeX 文档类。}
%
% \title{\sffamily easybook 文档类手册}
% \author{瞿毅}
-% \date{2021/06/07\hskip\ccwd\relax v1.25v\thanks{\url{https://gitee.com/texl3/easybook}}}
+% \date{2021/06/08\hskip\ccwd\relax v1.25w\thanks{\url{https://gitee.com/texl3/easybook}}}
%
% \maketitle
% \begin{abstract}
-% \cls{easybook} 是基于 \cls{ctexbook} 书籍文档类创建以极简为风格的模板,可以看作对 \cls{ctexbook} 的进一步包装与增强。虽然 \CTeX 文档类提供了较好的中文支持,但想实现个性化功能一般需要在其基础上载入更多宏包来定制。\cls{easybook} 考虑了一些细节并已载入一些常用宏包用于实现一般的排版需求,同时也具有 \cls{article} 文档类的功能,使用户可以简便地进行设置。它适用于排版中英文学术书籍、笔记或者是学位论文。
+% \cls{easybook} 是基于 \cls{ctexbook} 书籍文档类创建以极简为风格的模板,可以看作对 \cls{ctexbook} 的进一步包装与增强。虽然 \CTeX 文档类提供了较好的中文支持,但想实现个性化功能一般需要在其基础上载入更多宏包来定制。\cls{easybook} 考虑了一些细节并已载入一些常用宏包用于实现一般的排版需求,同时也具有 \cls{article} 文档类的功能,使用户可以简便地进行设置。它适用于排版中英文学位论文、学术书籍或者是笔记。
% \end{abstract}
% \tableofcontents
%
@@ -134,7 +134,7 @@
% \end{syntax}
% 传递给 \cls{ctexbook} 设置字体,最好不要使用原有的 \opt{fontset} 选项,默认情况下使用自定义字体而不开启这个选项,可根据安装的字体及电脑系统选取。\opt{noto} 与 \opt{none} 选项的相关描述见小节 \ref{subsec:font settings},\opt{overleaf} 是一个各系统通用选项,会检测系统环境选取对应字体。
% \changes{v1.21}{2021/01/12}{默认字体与 \CTeX 一致,不再是自定义字体。}
-% \changes{v1.25v}{2021/05/04}{修复使用 \pkg{xeCJK} 与 \pkg{fontspec} 宏包的字体设置命令在 \hologo{LuaLaTeX} 下失效的问题。}
+% \changes{v1.25w}{2021/05/04}{修复使用 \pkg{xeCJK} 与 \pkg{fontspec} 宏包的字体设置命令在 \hologo{LuaLaTeX} 下失效的问题。}
% \end{function}
%
% \begin{function}[rEXP,added = 2021-01-05,updated = 2021-01-13]{paper}
@@ -183,8 +183,8 @@
% \tn{listoftables*+}\oarg{键值列表}
% \tn{listoflstlistings*+}\oarg{键值列表}
% \end{syntax}
-% \tn{listoffigures} 命令输出图片目录,\tn{listoftables} 输出表格目录,\tn{listoflstlistings} 输出代码目录。带有星号的目录命令不将标题添加进主文档目录,带有+号的目录命令可以使当前标题编号。\tn{tableofcontents+} 与其它命令不同是用于输出双语目录,需要与双语目录标题命令 \tn{bichapter} 等或设置图片、表格和代码等英文目录的标题配合使用,附加代码是中文与英文目录之间的代码,可以插入文本和换页命令等。目录的键值列表选项如下
-% \changes{v1.25v}{2021/05/05}{命令 \tn{tableofcontents} 可以输出双语目录。}
+% \tn{listoffigures} 命令输出图片目录,\tn{listoftables} 输出表格目录,\tn{listoflstlistings} 输出代码目录。带有星号的目录命令不将标题添加进主文档目录,带有+号的目录命令可以使当前标题编号。\tn{tableofcontents+} 与其它命令不同是用于输出双语目录,需要与双语目录标题命令 \tn{bichapter} 等或设置图片、表格和代码等英文目录的标题配合使用,附加代码是中文与英文目录之间的代码,可以插入目录样式和换页等命令。目录的键值列表选项如下
+% \changes{v1.25w}{2021/05/05}{命令 \tn{tableofcontents} 可以输出双语目录。}
% \end{function}
%
% \begin{function}{multoc,columns,title,format,aftertitle,pagestyle,chapter,section}
@@ -201,7 +201,7 @@
% 在书籍模式且 \opt{chapter} 选项开启或者文章模式的情况下,\opt{format} 用于设置目录标题的格式,\opt{aftertitle} 选项的代码将被插入到目录标题内容之后,\opt{pagestyle} 是目录标题所在页的页面格式,除此之外还支持 \opt{ctexset/chapter} 或 \opt{ctexset/section} 所有的章节标题样式选项。\opt{chapter} 选项使目录标题按照 chapter 级别输出,\opt{section} 选项使目录标题按照 section 级别输出,默认为 chapter 级别。
% \changes{v1.23}{2021/03/15}{为几个目录增加键值列表的选项,可设置标题输出级别以及是否加入主目录。}
% \changes{v1.24}{2021/04/04}{目录命令的可选参数增加标题键值。}
-% \changes{v1.25v}{2021/06/02}{目录可设置多栏,并在 article 模式仍然生效。}
+% \changes{v1.25w}{2021/06/02}{目录可设置多栏,并在 article 模式仍然生效。}
% \end{function}
%
% \subsubsection{标题命令}
@@ -214,7 +214,7 @@
% 双语目录的标题命令目前设置了常用的三个级别,它们将中文标题正常输出,并使中英文标题加入双语目录,这个功能是为国内一些大学的学位论文模板的要求设计,在一般情况和英文模式下不需要使用。
%
% 它们的星号变体命令使文中标题不编号,但是仍然加入双语目录,若英文标题参数空置那么仅加入中文目录而不加入英文目录,这一特点与 \tn{chapter*} 等命令的行为不太一样,在一些情况下会用到。可选参数是目录中的中文标题,默认与中文标题一致,正文标题过长时可用它设置在目录中显示的标题。双语目录的格式是一致的,共享使用 \tn{tocset} 的设置,英文目录的章级别标题名及编号的修改方式如下
-% \changes{v1.25v}{2021/05/05}{增加与双语目录配合的标题命令。}
+% \changes{v1.25w}{2021/05/05}{增加与双语目录配合的标题命令。}
% \end{function}
%
% \begin{function}{chapter/biname,chapter/binmuber}
@@ -314,7 +314,7 @@
% \changes{v1.10}{2021/01/08}{修复了 \opt{linktopage} 选项关闭时目录中标题编号无超链接的问题。}
% \changes{v1.23}{2021/03/19}{修复在 \pkg{ctex} v2.5.6 更新后 \cls{easybook} 与 \pkg{hyperref} 冲突问题。}
% \changes{v1.24}{2021/04/05}{增加 \pkg{hyperref} 超链接选项完整的支持。}
-% \changes{v1.25v}{2021/05/06}{模块名 \opt{link} 改为 \opt{refset},\opt{link} 作为兼容性保留。}
+% \changes{v1.25w}{2021/05/06}{模块名 \opt{link} 改为 \opt{refset},\opt{link} 作为兼容性保留。}
% \end{function}
%
% \begin{optdesc}
@@ -371,7 +371,7 @@
% \ding{229} 以上选项路径为 \opt{subfont/...}
% \changes{v1.10}{2021/01/08}{加入自定义非正文字体选项。}
% \changes{v1.23}{2021/02/08}{修复使用 \tn{zihao} 命令设置字体失效的问题。}
-% \changes{v1.25v}{2021/05/31}{其它字体模块名由 \opt{elsefont} 改为 \opt{subfont},并增加数学字体的选项 \opt{subfont/math}。}
+% \changes{v1.25w}{2021/05/31}{其它字体模块名由 \opt{elsefont} 改为 \opt{subfont},并增加数学字体的选项 \opt{subfont/math}。}
% \end{function}
%
% \begin{optdesc}
@@ -396,7 +396,7 @@
% \changes{v1.21}{2021/01/11}{增加 \opt{bibset} 选项,可以使用 \hologo{BibTeX} 或 \hologo{biber} 编译参考文献。}
% \changes{v1.23}{2021/02/23}{使用 \opt{bibset} 选项时可设置标注风格。}
% \changes{v1.24}{2021/04/09}{可以不载入参考文献包手动配置参考文献格式。}
-% \changes{v1.25v}{2021/05/12}{取消 \opt{bib-loadpkg} 选项,由是否设置参考文献数据库来决定载入宏包。}
+% \changes{v1.25w}{2021/05/12}{取消 \opt{bib-loadpkg} 选项,由是否设置参考文献数据库来决定载入宏包。}
% \end{function}
%
% \begin{optdesc}
@@ -406,7 +406,7 @@
% \item[datafile] 参考文献数据库的文件名,使用 \hologo{biber} 处理时要带有 \opt{bib} 后缀,若不在当前文件夹名称需要包含路径。只有设置数据库的文件名才会载入 \pkg{natbib} 或 \pkg{biblatex} 宏包,之后才可使用相关配置命令,否则需要自行配置参考文献。
% \end{optdesc}
%
-% \begin{function}[added = 2021-01-11,updated = 2021-04-09]{\printbibliography,\EbBibtexSet,\EbBiblatexPreset,\EbBiblatexPostset}
+% \begin{function}[added = 2021-01-11,updated = 2021-04-09]{\printbibliography,\EBibtexSet,\EBiblatexPreset,\EBiblatexPostset}
% \begin{syntax}
% \tn{printbibliography}\oarg{键值列表}
% \end{syntax}
@@ -422,9 +422,9 @@
% \end{syntax}
% \opt{heading} 为参考文献标题的处理方式,\opt{bibliography} 选项以 \opt{chapter} 级别输出参考文献,不加进目录,\opt{subbibliography} 选项以 \opt{section} 级别输出参考文献,不加进目录,\opt{bibintoc} 选项以 \opt{chapter} 级别输出参考文献,加进目录,\opt{subbibintoc} 选项以 \opt{section} 级别输出参考文献,加进目录。\opt{title} 选项覆盖由 \opt{heading} 选项提供的缺省标题名。除此之外其他支持选项可见 \pkg{biblatex} 宏包说明文档。
% \end{function}
-% \item[\tn{EbBibtexSet}] 这是 \pkg{natbib} 宏包的配置命令,需要与 \pkg{natbib} 配合并放在载入其之后使用,默认保存了参考文献风格和标题的设置。
-% \item[\tn{EbBiblatexPreset}] 这是 \pkg{biblatex} 宏包的前配置命令,需要与 \pkg{biblatex} 配合并放在载入其之前使用,默认保存了参考文献风格的设置。若重新定义可使用 \tn{PassOptionsToPackage} 命令向 \pkg{biblatex} 传递它支持的各种参考文献选项。
-% \item[\tn{EbBiblatexPostset}] 这是 \pkg{biblatex} 宏包的后配置命令,需要与 \pkg{biblatex} 配合并放在载入其之后使用,默认保存了参考文献标题的设置。
+% \item[\tn{EBibtexSet}] 这是 \pkg{natbib} 宏包的配置命令,需要与 \pkg{natbib} 配合并放在载入其之后使用,默认保存了参考文献风格和标题的设置。
+% \item[\tn{EBiblatexPreset}] 这是 \pkg{biblatex} 宏包的前配置命令,需要与 \pkg{biblatex} 配合并放在载入其之前使用,默认保存了参考文献风格的设置。若重新定义可使用 \tn{PassOptionsToPackage} 命令向 \pkg{biblatex} 传递它支持的各种参考文献选项。
+% \item[\tn{EBiblatexPostset}] 这是 \pkg{biblatex} 宏包的后配置命令,需要与 \pkg{biblatex} 配合并放在载入其之后使用,默认保存了参考文献标题的设置。
% \end{optdesc}
%
% \subsection{定理样式}
@@ -459,15 +459,15 @@
% \item[spacepost] 定理标题后与第一段内容的间隔。
% \end{optdesc}
%
-% \begin{function}[added = 2021-01-12,updated = 2021-04-25]{\newtheorem,\EbNewTheorem,\declaretheoremstyle}
+% \begin{function}[added = 2021-01-12,updated = 2021-04-25]{\newtheorem,\EBNewTheorem,\declaretheoremstyle}
% \begin{syntax}
% \tn{newtheorem}\oarg{键值列表}\marg{定理环境名}
-% \tn{EbNewTheorem}\marg{定理环境名}\oarg{英文标题}\marg{中文标题}\parg{盒子样式|(tc-theorem)}\oarg{键值列表}
+% \tn{EBNewTheorem}\marg{定理环境名}\oarg{英文标题}\marg{中文标题}\parg{盒子样式|(tc-theorem)}\oarg{键值列表}
% \tn{declaretheoremstyle}\oarg{键值列表}\marg{定理样式名}
% \end{syntax}
% 文档类已预置8个定理环境,环境名及对应的定理标题名见小节 \ref{subsec:theorem},如果需要新的定理标题名或定理样式可使用这两个命令。
% \changes{v1.23}{2021/03/12}{重新定义了新定理环境命令 \tn{newtheorem}。}
-% \changes{v1.24}{2021/04/25}{增加定义定理环境命令 \tn{EbNewTheorem}。}
+% \changes{v1.24}{2021/04/25}{增加定义定理环境命令 \tn{EBNewTheorem}。}
% \end{function}
%
% \begin{optdesc}
@@ -478,7 +478,7 @@
% \item[numberlike] 定理将使用此计数器进行编号,通常这是另一个定理环境的名称。
% \item[style] 用 \tn{declaretheoremstyle} 定义的定理样式的名称,定理将使用这种样式的设置。
% \end{description}
-% \item[\tn{EbNewTheorem}] \tn{EbNewTheorem} 是更便捷的定理命令,它定义一个新的定理环境,键值列表支持的选项与 \tn{newtheorem} 相同,但它们的区别有
+% \item[\tn{EBNewTheorem}] \tn{EBNewTheorem} 是更便捷的定理命令,它定义一个新的定理环境,键值列表支持的选项与 \tn{newtheorem} 相同,但它们的区别有
% \begin{itemize}
% \item 中英文模式下标题不同,英文标题为可选项,默认为首字母大写的环境名。
% \item 自动定义交叉引用的格式,引用标签前缀为定理名称。
@@ -491,7 +491,7 @@
% \subsubsection{新的定理样式}
% 定理由 \pkg{thmtools} 设置,预置定理的样式为 \opt{easy-theorem},上述定理样式选项将对这个定理样式生效。如果使用这个样式而只是增加新的定理名称,可以这样
% \begin{ctexexam}
-% \EbNewTheorem{定理环境名}{中文标题}[style = other theorem]
+% \EBNewTheorem{定理环境名}{中文标题}[style = other theorem]
% \newtheorem[style = easy-theorem,name = 定理名]{定理环境名}
% \end{ctexexam}
% \tn{newtheorem} 定义的定理环境需要手动增加盒子边框,可以如下进行设置
@@ -602,7 +602,7 @@
% 上面几个选项用于设置脚注格式,\opt{fnparskip} 和 \opt{fnparindent} 选项仅在 \opt{fnhang = true} 时有效。\opt{fnhang} 用于将脚注设置为悬挂缩进的格式,\opt{fnmark-pos} 选项设置脚注编号的位置,正常文本或是上标形式。\opt{fnmark-num} 选项设置脚注编号的格式,默认为原生样式 \opt{plain},还可以改为 \opt{pifont} 的各个版本,从左往右依次为普通版、阴文衬线版、阳文无衬线版和阴文无衬线版,缺点是它们的编号仅包括1-10。
%
% \opt{fnmark-form} 是脚注标记的格式,在此设置字体命令会覆盖 \opt{subfont/footnote} 的设置,最后一个格式命令可以带有一个参数,这个参数接受脚注编号,一般配合 \opt{fnmark-num = plain} 使用。\opt{afterfnmark} 是脚注标记后的代码,一般用于设置标记与文本间的距离。
-% \changes{v1.25v}{2021/05/12}{增加脚注样式设置选项。}
+% \changes{v1.25w}{2021/05/12}{增加脚注样式设置选项。}
% \end{function}
%
% \subsection{目录样式}
@@ -621,17 +621,17 @@
% \opt{format} 是目录中标题的格式,可以设置字体和加入垂直间距等,垂直间距最好使用无间距重合的 \tn{addvspace} 命令,带有加号的 \opt{format+} 选项用于在已有的格式命令后附加内容。\opt{indent} 是目录中标题在页面左侧的缩进距离,应该有长度单位。\opt{rule} 选项中一般应当使用 \tn{tocrule} 命令,将会在接下来介绍。\opt{numsep} 是有编号的标题在目录中编号与标题的间距。
% \changes{v1.21}{2021/01/13}{增加配置目录样式的选项。}
% \changes{v1.24}{2021/04/20}{增加目录中编号与标题的间距选项 \opt{numsep}。}
-% \changes{v1.25v}{2021/05/14}{可以分别设置图片、表格和代码目录的格式。}
+% \changes{v1.25w}{2021/05/14}{可以分别设置图片、表格和代码目录的格式。}
% \end{function}
%
-% \begin{function}[added = 2021-01-13,updated = 2021-04-20]{\tocrule,\EbNumberLine}
+% \begin{function}[added = 2021-01-13,updated = 2021-04-20]{\tocrule,\EBNumberLine}
% \begin{syntax}
% \tn{tocrule}*\oarg{引导点间距|(0.7pc)}\parg{引导点大小|(1.2)}\marg{引导点}\oarg{页码格式}
-% \tn{EbNumberLine}\marg{编号类型}
+% \tn{EBNumberLine}\marg{编号类型}
% \end{syntax}
% \tn{tocrule} 命令生成目录引导线,需要在 \opt{rule} 选项中使用。带有星号的命令会使当前级别的目录引导线右边与页码连接而不是对齐。引导点间距需带有长度单位,引导点大小不带单位,为引导点符号正常大小的倍数,引导点一般为英文句号或 \tn{cdot} 中心点符号。页码格式的内容位于页码前面,可以设置页码字体、距离。
%
-% \tn{EbNumberLine} 命令类似 \CTeX 的 \tn{CTEXnumberline} 命令,用于 \opt{tocline} 选项中设置目录标签的编号。区别是它需要在 \opt{tocset/hang = false} 时使用,否则目录中无法显示标题编号,使用它的时候 \opt{numsep} 选项仍然有效。\meta{编号类型} 为 \opt{chapter} 和 \opt{section} 等,也可用参数 \#1 代替当前级别类型,标题名用参数 \#2 代替一般不变。
+% \tn{EBNumberLine} 命令类似 \CTeX 的 \tn{CTEXnumberline} 命令,用于 \opt{tocline} 选项中设置目录标签的编号。区别是它需要在 \opt{tocset/hang = false} 时使用,否则目录中无法显示标题编号,使用它的时候 \opt{numsep} 选项仍然有效。\meta{编号类型} 为 \opt{chapter} 和 \opt{section} 等,也可用参数 \#1 代替当前级别类型,标题名用参数 \#2 代替一般不变。
% \end{function}
%
% \begin{ctexexam}
@@ -706,7 +706,7 @@
% \tn{end}\marg{环境名}
% \end{syntax}
% \pkg{tabularray} 是一个较新的宏包,不仅提供了 \pkg{tabularx}、\pkg{multirow}、和 \pkg{booktabs} 宏包的功能,并且不依赖其它宏包与它们同时使用不会产生冲突,还实现了用简便的键值列表方式设置表格样式。目前除了表头斜线以及跨页功能存在不足,其它方面已满足对表格绝大多数格式的需求,具体用法可见宏包的说明文档。
-% \changes{v1.25v}{2021/05/17}{使用功能更便捷齐全的 \pkg{tabularray} 宏包设置表格样式。}
+% \changes{v1.25w}{2021/05/17}{使用功能更便捷齐全的 \pkg{tabularray} 宏包设置表格样式。}
% \end{function}
%
% \subsection{列表}
@@ -879,7 +879,7 @@
% \tn{qtyrange}\oarg{键值列表}\marg{数字1}\marg{数字2}\marg{单位}
% \end{syntax}
% \pkg{siunitx} 宏包的 \tn{num} 命令可以输出以科学计数法表示的数值,单位格式化命令 \tn{unit} 包含文字项目(例如字母或数字)时,使用 . 和 \~{} 放置在单元乘积中间,并使用 \_ 和 \^{} 正确放置指定的下标和上标。格式化方法可在数学和文本模式下使用。而 \tn{qty} 命令可用来输出带有单位的量,\tn{qtyrange} 可以输出带有范围和单位的量。
-% \changes{v1.25v}{2021/05/18}{\pkg{siunitx} 宏包 v3.0.0 更新后用法改变,修改相关配置选项。}
+% \changes{v1.25w}{2021/05/18}{\pkg{siunitx} 宏包 v3.0.0 更新后用法改变,修改相关配置选项。}
% \end{function}
%
% \begin{ctexexam}
@@ -978,9 +978,6 @@
% \pkg{ulem} 宏包提供了多种下划线命令,下划线的粗细由命令 \tn{ULthickness} 控制,重新定义它需要使用 \tn{renewcommand} 命令。下划线的深度由 \tn{ULdepth} 控制,默认值 \tn{maxdimen} 是一个允许深度根据当前字体变化的特殊标志,当然也可以使用 \tn{setlength} 设定特定深度。
% \end{function}
%
-% \subsection{封面}
-% 目前仍然使用由 \tn{maketitle} 命令生成的标准 \cls{book} 文档类的封面,并未做任何改动。可以自行设计或用其它软件制作封面,也可以使用热心网友 nangeng 已经为 \cls{easybook} 制作的\href{https://gitee.com/texl3/easybook/issues/I3NXVQ}{一个封面}。
-%
% \section{载入的宏包}
% 以下为 \cls{easybook} 直接调用的关键宏包,带有 \ding{75} 符号的宏包并未载入它们,仅做了预配置和兼容性处理,可根据需要在导言区手动载入以实现相关的功能。
% \begin{description}
@@ -1006,18 +1003,66 @@
% \item[listings] 可以在 \LaTeX 中排版程序/编程代码。
% \item[hyperref] 处理交叉引用命令以及在文档中生成超文本链接。
% \item[\ding{75} tcolorbox] 为带有标题线的彩色和带框文本框提供了一个环境。
-% \item[\ding{75} tasks] 将练习题组织成水平而不是垂直计数的列。
% \item[\ding{75} imakeidx] 可以让文档同时生成和排版一个或多个索引。
% \item[\ding{75} bicaption] 提供图表的双语题注。
% \item[\ding{75} mathtools] 增强 \pkg{amsmath} 的数学功能。
% \item[\ding{75} unicode-math] 处理使用 unicode 编码的数学字体。
% \end{description}
%
+% \newcommand\urlprefix{\newline\hspace*{\fill}}
+% \let\OldUrl\url
+% \renewcommand\url[2][]{{\small\textit{#1}~\OldUrl{#2}}}
+% \begin{thebibliography}{99}
+% \bibitem{CTeX}
+% \textsc{CTEX.ORG}.
+% \newblock \textit{\CTeX 宏集手册} [EB/OL].
+% \newblock version 2.5.6,
+% \newblock (2021-03-14)
+% \urlprefix\url{https://ctan.org/pkg/ctex}
+%
+% \bibitem{fduthesis}
+% 曾祥东.
+% \newblock \textit{\pkg{fduthesis}:复旦大学论文模板} [EB/OL].
+% \newblock version 0.7e,
+% \newblock (2020-08-30)
+% \urlprefix\url{https://github.com/stone-zeng/fduthesis}
+%
+% \bibitem{source3}
+% \textsc{The \LaTeX3 Project}.
+% \newblock \textit{The \LaTeX3 Interfaces} [CP/OL].
+% \newblock (2020-10-27)
+% \urlprefix\url{https://ctan.org/pkg/l3kernel}
+%
+% \bibitem{胡伟2017latex2e}
+% 胡伟.
+% \newblock \textit{\LaTeXe 文类和宏包学习手册} [M].
+% \newblock 北京: 清华大学出版社, 2017
+%
+% \bibitem{刘海洋2013latex入门}
+% 刘海洋.
+% \newblock \textit{\LaTeX 入门} [M].
+% \newblock 北京: 电子工业出版社, 2013
+%
+% \bibitem{xmuthesis}
+% Camuse Cao.
+% \newblock \textit{\pkg{xmuthesis}:厦门大学论文模板} [EB/OL].
+% \newblock version 0.4.1,
+% \newblock (2020-10-09)
+% \urlprefix\url{https://github.com/CamuseCao/XMU-thesis}
+%
+% \bibitem{whuthesis}
+% WHUTUG.
+% \newblock \textit{\pkg{whuthesis}:武汉大学论文模板} [EB/OL].
+% \newblock version 0.6d,
+% \newblock (2021-05-20)
+% \urlprefix\url{https://github.com/whutug/whu-thesis}
+% \end{thebibliography}
+%
% \StopEventually{}
%<*class>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/06/07}{1.25v}{beta}
+\ProvidesExplClass{easybook}{2021/06/08}{1.25w}{beta}
\bool_set_false:N \l__eb_compile_draft_bool
\bool_set_false:N \l__eb_title_newline_bool
@@ -1197,7 +1242,7 @@
part =
{
pagestyle = empty,
- tocline = \EbNumberLine{#1}#2,
+ tocline = \EBNumberLine{#1}#2,
format = \color{ctex@frame}\sffamily\Huge,
aftername =
{
@@ -1261,7 +1306,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{etoolbox}
-\ProvidesExplPackage{easybase}{2021/06/07}{1.25v}{beta}
+\ProvidesExplPackage{easybase}{2021/06/08}{1.25w}{beta}
\cs_generate_variant:Nn \eb_ctex_define:nn { nx }
\cs_generate_variant:Nn \int_to_arabic:n { v }
@@ -1635,6 +1680,17 @@
}
\cs_new:Npn \eb@number@markright #1#2
{ \markright{\eb_upper_number_mark_bool:nn {#1} {#2}} }
+\cs_new:Npn \eb@number@section@mark #1
+ {
+ \bool_if:NTF \l__eb_class_book_bool
+ { \eb@number@markright{section}{#1} }
+ { \eb@number@markdouble{section}{#1} }
+ }
+\cs_new:Npn \eb@number@subsection@mark #1
+ {
+ \bool_if:NF \l__eb_class_book_bool
+ { \eb@number@markright{subsection}{#1} }
+ }
\ctex_at_end_preamble:n
{
\exp_args:NV \geometry \g__eb_geometry_clist
@@ -1642,19 +1698,9 @@
\tl_use:N \l__eb_fancyhf_content_tl
\cs_gset_eq:NN \ps@plain \ps@empty
\pagestyle{fancy}
- \bool_if:NTF \l__eb_class_book_bool
- {
- \cs_gset:Npn \chaptermark #1
- { \eb@number@markdouble{chapter}{#1} }
- \cs_gset:Npn \sectionmark #1
- { \eb@number@markright{section}{#1} }
- }
- {
- \cs_gset:Npn \sectionmark #1
- { \eb@number@markdouble{section}{#1} }
- \cs_gset:Npn \subsectionmark #1
- { \eb@number@markright{subsection}{#1} }
- }
+ \cs_gset:Npn \chaptermark #1 { \eb@number@markdouble{chapter}{#1} }
+ \cs_gset_eq:NN \sectionmark \eb@number@section@mark
+ \cs_gset_eq:NN \subsectionmark \eb@number@subsection@mark
\bool_if:NT \l__eb_compile_draft_bool
{
\easyfoot[C]{\color{SlateGray}\sffamily\today}
@@ -1826,7 +1872,7 @@
}
}
-\cs_new:Npn \EbNumberLine #1
+\cs_new:Npn \EBNumberLine #1
{
\CTEXifname
{
@@ -1889,9 +1935,9 @@
{
\ctex_set:n
{
- chapter/tocline = \EbNumberLine{##1}##2,
- section/tocline = \EbNumberLine{##1}##2,
- subsection/tocline = \EbNumberLine{##1}##2
+ chapter/tocline = \EBNumberLine{##1}##2,
+ section/tocline = \EBNumberLine{##1}##2,
+ subsection/tocline = \EBNumberLine{##1}##2
}
},
hang .default:n = true,
@@ -2004,6 +2050,7 @@
{ chapter,section,subsection }
\seq_map_inline:Nn \c__eb_bitoc_title_level_seq
{
+ \tl_const:cn { c__eb_bitoc_mark_title_#1_tl } {#1}
\exp_args:Nc \NewDocumentCommand { bi#1 }{sO{##3}mm}
{
\IfBooleanTF{##1}
@@ -2011,6 +2058,16 @@
\use:c {#1}*{\phantomsection ##3}
\CTEX@addtocline{#1}{##2}
\tl_if_empty:oF {##4} { \CTEX@addbitocline{#1}{##4} }
+ \tl_set:Nn \l__eb__bitoc_mark_title_level_tl {#1}
+ \tl_case:Nn \l__eb__bitoc_mark_title_level_tl
+ {
+ \c__eb_bitoc_mark_title_chapter_tl
+ { \eb@nonumber@markdouble{##2} }
+ \c__eb_bitoc_mark_title_section_tl
+ { \eb@nonumber@section@mark{##2} }
+ \c__eb_bitoc_mark_title_subsection_tl
+ { \eb@nonumber@subsection@mark{##2} }
+ }
}{
\use:c {#1}[##2]{##3}
\tl_if_empty:oF {##4} { \CTEX@addbitocline{#1}{##4} }
@@ -2088,6 +2145,17 @@
}
\cs_new:Npn \eb@nonumber@markright #1
{ \markright{\eb_upper_nonumber_mark_bool:n {#1}} }
+\cs_new:Npn \eb@nonumber@section@mark #1
+ {
+ \bool_if:NTF \l__eb_class_book_bool
+ { \eb@nonumber@markright{#1} }
+ { \eb@nonumber@markdouble{#1} }
+ }
+\cs_new:Npn \eb@nonumber@subsection@mark #1
+ {
+ \bool_if:NF \l__eb_class_book_bool
+ { \eb@nonumber@markright{#1} }
+ }
\cs_new_protected:Npn \eb_title_mark_intoc:n #1
{
@@ -2098,9 +2166,7 @@
}
{
\bisection*{#1}{\eb@bitoc@title}
- \bool_if:NTF \l__eb_class_book_bool
- { \eb@nonumber@markright{#1} }
- { \eb@nonumber@markdouble{#1} }
+ \eb@nonumber@section@mark{#1}
}
}
\cs_new_protected:Npn \eb_title_mark_notoc:n #1
@@ -2112,9 +2178,7 @@
}
{
\section*{\phantomsection #1}
- \bool_if:NTF \l__eb_class_book_bool
- { \eb@nonumber@markright{#1} }
- { \eb@nonumber@markdouble{#1} }
+ \eb@nonumber@section@mark{#1}
}
}
\cs_new_protected:Npn \eb_title_number_intoc_bool:nn #1#2
@@ -2135,9 +2199,9 @@
\bool_if:NTF \l__eb_class_book_bool
{ \bichapter*{#1}{\l__eb_bib_bitoc_title} }
{ \bisection*{#1}{\l__eb_bib_bitoc_title} }
- \eb@nonumber@markdouble{#1}
+ \eb@nonumber@section@mark{#1}
}
-\cs_new_protected:Npn \eb_toc_multicol_bool:n #1
+\cs_new_protected:Npn \eb_toc_start_multicol_bool:n #1
{
\bool_if:NTF \l__eb_multoc_bool
{
@@ -2157,7 +2221,7 @@
\exp_args:NNc \dim_add:NV
\l__eb_toc_offset_dim { l__eb_toc_#4_offset_dim }
\vspace*{\dim_use:N \l__eb_toc_offset_dim}
- \eb_toc_multicol_bool:n {#5}
+ \eb_toc_start_multicol_bool:n {#5}
\group_end:
}
\clist_map_inline:nn
@@ -2184,12 +2248,12 @@
\IfValueT{#2}{\keys_set:nn { eb/listoc } {#2}}
\eb_title_mark_notoc:n { \eb@toc@title }
\vspace*{\dim_use:N \l__eb_toc_offset_dim}
- \eb_toc_multicol_bool:n { toc }#3
+ \eb_toc_start_multicol_bool:n { toc }#3
\IfBooleanT{#1}
{
\eb_title_mark_notoc:n { \eb@bitoc@title }
\vspace*{\dim_use:N \l__eb_toc_offset_dim}
- \eb_toc_multicol_bool:n { tec }
+ \eb_toc_start_multicol_bool:n { tec }
}
\group_end:
}
@@ -2389,9 +2453,12 @@
}
\SetTblrDefault
{
- rows = {abovesep = 4pt,belowsep = 2pt},
+ rows = {abovesep = 4pt,belowsep = 2pt},
stretch = \fp_use:N \l__eb_spread_table_fp
}
+\NewTableCommand{\toprule}[1][1pt]{\hline[#1]}
+\NewTableCommand{\midrule}[1][0.5pt]{\hline[#1]}
+\NewTableCommand{\bottomrule}[1][1pt]{\hline[#1]}
\eb_at_begin_environment:nn { tabular,tabularx }
{
\exp_args:Nx \linespread { \fp_use:N \l__eb_spread_table_fp }
@@ -2418,7 +2485,7 @@
\int_compare:nNnT { \c@chapter } > { 0 }
{
\thechapter
- \use:c { l__eb_#1_separator_tl }
+ \tl_use:c { l__eb_#1_separator_tl }
}
\eb_arabic:n {#1}
}
@@ -2479,7 +2546,7 @@
{ \tl_const:cn { c__eb_name_#1_tl } {#3} }
{ \tl_const:cn { c__eb_name_#1_tl } {#2} }
}
-\NewDocumentCommand{\EbNewTheorem}
+\NewDocumentCommand{\EBNewTheorem}
{mO{\text_titlecase_first:n {#1}}mD(){tc-theorem}O{}}
{
\ctex_at_end_preamble:n
@@ -2487,7 +2554,7 @@
\eb_thmname_set:nnn {#1} {#2} {#3}
\exp_args:No \declaretheorem@i
{
- name = \use:c { c__eb_name_#1_tl },
+ name = \tl_use:c { c__eb_name_#1_tl },
style = easy-theorem,#5
}{#1}[]
\bool_if:NT \l__eb_thmbox_bool
@@ -2495,7 +2562,7 @@
\@ifpackageloaded{tcolorbox}
{\tcolorboxenvironment{#1}{#4}}{}
}
- \labelformat{#1}{\use:c { c__eb_name_#1_tl }~##1}
+ \labelformat{#1}{\tl_use:c { c__eb_name_#1_tl }~##1}
}
}
@@ -2567,21 +2634,9 @@
{ remark } { 注 } [ numbered = no ],
{ { proof } { 证明 } [ numbered = no,qed = \qedsymbol ] }
}
- { \EbNewTheorem #1 }
+ { \EBNewTheorem #1 }
}
-\ctex_at_end_package:nn { tasks }
- {
- \settasks
- {
- label = (\Alph*),
- column-sep = \ccwd,
- item-indent = 2\ccwd,
- label-offset = 0.5\ccwd,
- label-width = 1.5\ccwd,
- after-item-skip = 0ex plus .1ex
- }
- }
\setchemformula
{
math-scripts = false,
@@ -2800,7 +2855,7 @@
{
standard~jigsaw,
nobeforeafter,tcbox~raise~base,
- top = 1.25vt,bottom = 1.25vt,left = 1.25vt,right = 1.25vt,
+ top = 1.25wt,bottom = 1.25wt,left = 1.25wt,right = 1.25wt,
boxrule = 0.75pt,arc = 1pt,
colback = #1,opacityback = 0.12,colframe = #1,#3
}{#2}
@@ -2843,7 +2898,7 @@
bitoc-title .initial:n = Reference
}
-\cs_new_protected:Npn \EbBibtexSet
+\cs_new_protected:Npn \EBibtexSet
{
\tl_if_empty:NTF \l__eb_bib_otherstyle_tl
{
@@ -2879,7 +2934,7 @@
}
\cs_new_protected:Npn \eb_put_biblatex:n #1
{ \PassOptionsToPackage{#1}{biblatex} }
-\cs_new_protected:Npn \EbBiblatexPreset
+\cs_new_protected:Npn \EBiblatexPreset
{
\tl_if_empty:NTF \l__eb_bib_otherstyle_tl
{
@@ -2893,7 +2948,7 @@
{ \eb_put_biblatex:n { citestyle = \l__eb_bib_citestyle_tl } }
\eb_put_biblatex:n { backend = biber }
}
-\cs_new_protected:Npn \EbBiblatexPostset
+\cs_new_protected:Npn \EBiblatexPostset
{
\exp_args:NV \addbibresource \l__eb_bib_datafile_tl
\tl_gset:Nn \blx@default@theheading { bibintoc }
@@ -2908,12 +2963,12 @@
\bool_if:NTF \l__eb_backend_bibtex_bool
{
\eb@package@load[sort&compress]{natbib}
- \EbBibtexSet
+ \EBibtexSet
}
{
- \EbBiblatexPreset
+ \EBiblatexPreset
\eb@package@load{biblatex}
- \EbBiblatexPostset
+ \EBiblatexPostset
}
}
}
diff --git a/macros/latex/contrib/easybook/easybook.ins b/macros/latex/contrib/easybook/easybook.ins
index b70169f22a..484d0da0da 100644
--- a/macros/latex/contrib/easybook/easybook.ins
+++ b/macros/latex/contrib/easybook/easybook.ins
@@ -26,4 +26,17 @@ The latest version of this license is in
\file{easybase.sty}{\from{\jobname.dtx}{package}}
}
+\obeyspaces
+\Msg{*************************************************************}
+\Msg{* *}
+\Msg{* To finish the installation you have to move the following *}
+\Msg{* files into a directory searched by TeX: *}
+\Msg{* *}
+\Msg{* easybook.cls *}
+\Msg{* easybase.sty *}
+\Msg{* *}
+\Msg{* Happy TeXing! *}
+\Msg{* *}
+\Msg{*************************************************************}
+
\endbatchfile \ No newline at end of file
diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf
index 99052846ad..d1ab5cccd4 100644
--- a/macros/latex/contrib/easybook/easybook.pdf
+++ b/macros/latex/contrib/easybook/easybook.pdf
Binary files differ
diff --git a/macros/latex/contrib/keyfloat/README.txt b/macros/latex/contrib/keyfloat/README.txt
index 21aec3ea01..181f780ee7 100644
--- a/macros/latex/contrib/keyfloat/README.txt
+++ b/macros/latex/contrib/keyfloat/README.txt
@@ -1,7 +1,7 @@
The LaTeX keyfloat package
Provides a key/value interface for generating floats.
-v2.03
+v2.04
Copyright 2016-2021 Brian Dunn — www.BDTechConcepts.com
LaTeX Project Public License, version 1.3
diff --git a/macros/latex/contrib/keyfloat/keyfloat.dtx b/macros/latex/contrib/keyfloat/keyfloat.dtx
index 317856b7da..7be362c421 100644
--- a/macros/latex/contrib/keyfloat/keyfloat.dtx
+++ b/macros/latex/contrib/keyfloat/keyfloat.dtx
@@ -17,7 +17,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\ProvidesPackage{keyfloat}
-%<package> [2021/05/28 v2.03 Key/value interface for floats and subfloats.]
+%<package> [2021/06/08 v2.04 Key/value interface for floats and subfloats.]
%
%<*driver>
\documentclass{ltxdoc}
@@ -317,7 +317,7 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
%<*package>
% \fi
%
-% \CheckSum{1298}
+% \CheckSum{1326}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -355,6 +355,7 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% \changes{v2.02}{2021/05/28}{2021/05/27}
% \changes{v2.03}{2021/05/28}{Fixed \cs{hbadness} w/ \cs{relax}.}
% \changes{v2.03}{2021/05/28}{2021/05/28}
+% \changes{v2.04}{2021/06/08}{2021/06/08}
@@ -811,7 +812,7 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% cont & \largebullet & Continued float? & cont \\
% l & \largebullet & The label. Enclose in braces if a comma is included.
% Ignored in unnumbered floats. & l=fig:A name \\
-% ap, aup & \largebullet & Artist/author's prefix, such as ``Mr.''\tnote{b} & ap=Mr. \\
+% ap, aup & \largebullet & Artist/author's prefix, such as ``Mr.''\,\tnote{b} & ap=Mr. \\
% af, auf & \largebullet & Artist/author's first name.\tnote{b} & af=First \\
% al, aul & \largebullet & Artist/author's last name.\tnote{b} & al=Last \\
% as, aus & \largebullet & Artist/author's suffix, such as |~III|.\tnote{b} & |al=~III| \\
@@ -849,44 +850,46 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% \index{keys>and values}
% \begin{threeparttable}
% \small
-% \begin{tabular}{>{\ttfamily}c>{\raggedright}p{2.5in}>{\centering\arraybackslash}>{\ttfamily\arraybackslash}p{1in}}
+% \begin{tabular}{>{\ttfamily}cc>{\raggedright}p{2.5in}>{\centering\arraybackslash}>{\ttfamily\arraybackslash}p{1in}}
% \toprule
-% \textrm{Key}\tnote{a} & Description & \textrm{Example} \\
+% \textrm{Key} & Sub\tnote{c} & Description & \textrm{Example} \\
% \midrule
-% lw & Set the width to a fraction of \cs{linewidth}. Cancels |w|.
+% lw & --- & Set the width to a fraction of \cs{linewidth}. Cancels |w|.
% If a non-image float, sets the width of the text box.
% For wrapped objects, may be used with \optn{wlw} for a smaller item
% with a larger caption.
% & lw=.5 \\
-% w & Set the actual width. Cancels |lw|.
+% w & --- & Set the actual width. Cancels |lw|.
% If a non-image float, sets the width of the text box.
% For wrapped objects, may be used with \optn{ww} for a smaller item
% with a larger caption.
% & w=2in \\
-% h & Set the actual height, images only. & w=2in \\
-% s & Set the image scale, images only. & s=3 \\
-% a & Set the rotation angle; counter-clockwise degrees. & r=90 \\
-% f & Selects a loose frame with the current \cs{fboxsep}.
+% h & --- & Set the actual height, images only. & w=2in \\
+% s & --- & Set the image scale, images only. & s=3 \\
+% a & --- & Set the rotation angle; counter-clockwise degrees. & r=90 \\
+% f & --- & Selects a loose frame with the current \cs{fboxsep}.
% Only rotated with \cs{keyfig}. & f \\
-% ft & Selects a tight frame with no \cs{fboxsep}. Useful for photographs,
+% ft & --- & Selects a tight frame with no \cs{fboxsep}. Useful for photographs,
% or diagrams which already have some margin built in. & ft \\
-% stretch & Sets \cs{arraystretch} inside the float. & stretch=1.5 \\
-% mo & Sets the vertical offset for a margin float. & mo=-1.2ex \\
-% wp & Sets the wrap placement for a wrapped float. The default
+% stretch & --- & Sets \cs{arraystretch} inside the float. & stretch=1.5 \\
+% mo & --- & Sets the vertical offset for a margin float. & mo=-1.2ex \\
+% wn & --- & Sets the number of lines for a wrapped float. & wn=2 \\
+% wp & --- & Sets the wrap placement for a wrapped float. The default
% is |O|, which places the wrapped float at the outside edge of the text.
% See \cref{tab:wrapplacement}.
% & wp=I \\
-% wlw & Sets the total width of the wrapped item to a fraction of \cs{linewidth}.
+% wo & --- & Sets the wrap overhang for a wrapped float. & wo=8em \\
+% wlw & --- & Sets the total width of the wrapped item to a fraction of \cs{linewidth}.
% May be more than the \optn{w} or \optn{lw} width. & wlw=.6 \\
-% ww & Sets the total width of the wrapped item.
+% ww & --- & Sets the total width of the wrapped item.
% May be more than the \optn{w} or \optn{lw} width. & ww=2in \\
-% va & Sets the vertical alignment of the outermost minipage container for the keyfloat.
+% va & --- & Sets the vertical alignment of the outermost minipage container for the keyfloat.
% Defaults to 'c'.
% & va=t \\
% \bottomrule
% \end{tabular}
% \begin{tablenotes}
-% \item[a:] None of the keys in Part II are used in the
+% \item[c:] None of the keys in Part II are used in the
% \env{keysubfigs}, \env{keysubtabs}, and \env{keysubfloats} environments.
% \end{tablenotes}
% \end{threeparttable}
@@ -1476,7 +1479,7 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% \begin{dtxexample}[\Cref{fig:keyfigw,tab:keytabw}]
% {Using \cs{keyfig}\optn{[W]} and \cs{keytab}\optn{[W]}\label{ex:keyfigw}}
% \keyfig[W]{c={A \cs{keyfig}\optn{[W]}},
-% l=fig:keyfigw,ft,lw=.4,wp=I,
+% l=fig:keyfigw,ft,lw=.4,wp=I, wo=8em, wn=12,
% t={.4\cs{linewidth} wide, placed \optn{I}.}
% }{image2}
% \blindtext
@@ -1489,7 +1492,7 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% \begin{dtxexample}[\Cref{fig:keyfigboxw} and the \cs{keyparbox}.]
% {Using \cs{keyfigbox}\optn{[W]} and \cs{keyparbox}\optn{[W]}\label{ex:keyfigboxw}}
% \keyfigbox[W]{c={A \cs{keyfigbox}\optn{[W]}},
-% l=fig:keyfigboxw,f,lw=.25,wp=I,
+% l=fig:keyfigboxw,f,lw=.25,wp=I, wn=7,
% t=Text text text text text text text text text
% }{The contents.}
% \blindtext
@@ -1502,7 +1505,7 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% \begin{dtxexample}[\Cref{fig:keyfigurew,tab:keytablew}]
% {Using \cs{keyfigure}\optn{[W]} and \cs{keytable}\optn{[W]}\label{ex:keyfiguretablew}}
% \begin{keyfigure}[W]{c={A \cs{keyfigure}\optn{[W]}},
-% l=fig:keyfigurew,f,w=1.5in}
+% l=fig:keyfigurew,f,w=1.5in, wo=4em,wn=5}
% This is a keyfigure.
% \end{keyfigure}
% \blindtext
@@ -1936,6 +1939,32 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
%
+% \subsection{Patching \pkg{wrapfig}}
+%
+% A minor patch to allow \pkg{wrapfig} to expand its argument for the
+% number of narrow lines.
+% This allows it to be programmed by \pkg{keyfloat}.
+%
+% \cs{WF@wr} will not be defined if using \pkg{lwarp} with \HTML\ output.
+% \changes{v2.04}{2021/06/08}{Patch \pkg{wrapfig}.}
+% \begin{macrocode}
+\RequirePackage{xpatch}
+
+\ifdef{\WF@wr}
+{
+ \xpatchcmd{\WF@wr}
+ {\gdef}
+ {\xdef}
+ {}
+ {
+ \PackageError{keyfloat}
+ {Unable to patch wrapfig \protect\WF@wr}
+ {Please inform the keyfloat author.}
+ }
+}
+{}
+% \end{macrocode}
+
% \DescribePackage{gettitlestring} Used by \pkg{hyperref} and \pkg{nameref}.
@@ -2372,6 +2401,20 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% \end{macro}
+% \DescribeKey[main]{wn} Set wrap number of narrow lines for a wrapped float.
+%
+% \changes{v2.04}{2021/06/08}{Added \optn{wn} key.}
+% \begin{macrocode}
+\define@key{KFLT@keys}{wn}{\renewcommand{\KFLT@wn}{#1}}
+% \end{macrocode}
+%
+% \begin{macro}{\KFLT@wn} Storage for the wrap placement.
+% \begin{macrocode}
+\newcommand{\KFLT@wn}{}
+% \end{macrocode}
+% \end{macro}
+
+
% \DescribeKey[main]{wp} Set wrap placement for a wrapped float.
%
% See \cref{tab:wrapplacement} on \cpageref{tab:wrapplacement}.
@@ -2387,6 +2430,21 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% \end{macrocode}
% \end{macro}
+
+% \DescribeKey[main]{wo} Set wrap overhang for a wrapped float.
+%
+% \changes{v2.04}{2021/06/08}{Added \optn{wo} key.}
+% \begin{macrocode}
+\define@key{KFLT@keys}{wo}{\renewcommand{\KFLT@wo}{#1}}
+% \end{macrocode}
+%
+% \begin{macro}{\KFLT@wo} Storage for the wrap placement.
+% \begin{macrocode}
+\newcommand{\KFLT@wo}{\wrapoverhang}
+% \end{macrocode}
+% \end{macro}
+
+
% \DescribeKey[main]{wlw} Wrapped figure, fraction of \cs{linewidth}
% \changes{v2.02}{2021/05/27}{Added \optn{ww} and \optn{wlw}.}
% \begin{macrocode}
@@ -3190,7 +3248,9 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
\setboolean{KFLT@ft}{false}%
\renewcommand{\KFLT@stretch}{1}%
\setlength{\KFLT@mo}{-1.2ex}%
+ \renewcommand{\KFLT@wn}{}%
\renewcommand{\KFLT@wp}{O}%
+ \renewcommand{\KFLT@wo}{\wrapoverhang}%
\renewcommand{\KFLT@wlw}{}%
\setlength{\KFLT@ww}{0pt}%
\renewcommand{\KFLT@va}{c}%
@@ -3600,9 +3660,10 @@ Keywords={LaTeX, floats, key/val, subcaption, rows}%
% and make the wrapped figure environment as wide as the
% desired image size plus frame:
% \changes{v2.02}{2021/05/27}{Added \optn{ww} and \optn{wlw}.}
+% \changes{v2.04}{2021/06/08}{Added \optn{wn} and \optn{wo}.}
% \begin{macrocode}
\KFLT@findwidths%
- \wrapfloat{\KFLT@type}{\KFLT@wp}%
+ \wrapfloat{\KFLT@type}[\KFLT@wn]{\KFLT@wp}[\KFLT@wo]%
{\KFLT@wrapwidth+2\KFLTlooseframewidth}%
\minipage{\KFLT@wrapwidth+2\KFLTlooseframewidth}%
% \end{macrocode}
diff --git a/macros/latex/contrib/keyfloat/keyfloat.pdf b/macros/latex/contrib/keyfloat/keyfloat.pdf
index c102b8e14f..3127cfeab0 100644
--- a/macros/latex/contrib/keyfloat/keyfloat.pdf
+++ b/macros/latex/contrib/keyfloat/keyfloat.pdf
Binary files differ
diff --git a/macros/plain/contrib/xintsession/README.md b/macros/plain/contrib/xintsession/README.md
index 4b9e918a82..a062562b67 100644
--- a/macros/plain/contrib/xintsession/README.md
+++ b/macros/plain/contrib/xintsession/README.md
@@ -1,6 +1,6 @@
# xintsession README #
-Release: 0.3 (2021-05-31)
+Release: 0.3a (2021-06-08)
## Usage ##
@@ -8,27 +8,29 @@ xintsession.tex is to be used with etex (or pdftex or the other engines
with Plain as preloaded format) *interactively on the command line*.
It will load [xintexpr](http://www.ctan.org/pkg/xint) and
-[polexpr](http://www.ctan.org/pkg/polexpr)
-(its version `0.8` or later is needed).
+[polexpr](http://www.ctan.org/pkg/polexpr).
To start a session:
-1. execute `etex xintsession`, or if available, `rlwrap etex xintsession`
+1. Execute `etex xintsession`, or if available, `rlwrap etex xintsession`
to benefit from arrow keys navigation and other improvements such
- as parentheses highlighting.
+ as parentheses highlighting.\
+ \
Alternatively, execute `rlwrap etex` and enter `xintsession` at the `**`
- prompt.
- One can also use the `-jobname` option of `etex` at this step.
-2. an `>>>` invite appears, start entering input, terminate it via `;`.
- You can say `&help` for help.
+ prompt.\
+ \
+ One can also use the `-jobname` option of `etex` at this step.\
+ \
+ At my locale I added `alias xs="rlwrap etex xintsession"` to my `.bashrc`
+ so I only have to type `xs` at the command line.
+2. An `>>>` invite appears, and computations can begin!\
+ \
+ Start entering input, terminate it via a semi-colon `;`.
+ Say `&help` for help and `&bye` to quit.
The above explanations have been tested on a Unixen (Mac OS), and probably
`rlwrap` is not available on all platforms, but it is not a requirement.
-At my locale I added `alias xs="rlwrap etex xintsession"` to my `.bashrc`
-so I only have to type `xs` at the command line.
-
-You are now ready to make computations!
Here is a sample session (spaces do not matter):
>>> 1+1/2+1/3+1/4+1/5;
@@ -60,8 +62,8 @@ Here is a sample session (spaces do not matter):
As this example illustrates, the computational engine can work in
various modes: exact, fp, int, and pol. Say `&fp=number` at the
-`>>>` prompt
-to activate floating point mode with "Digits" set to `number`.
+`>>>` prompt to activate floating point mode with `number` digits
+of precision.
If ill-formed input drops you deep into TeX error interaction mode,
try hitting `S` as it may work to bring you back to normal session.
@@ -70,6 +72,11 @@ For additional explanations, enter `&help` at the `>>>` prompt.
## Change log ##
+- 0.3a (2021-06-08)
+ - fix extremely weird `0.3` breakage of user function definition
+ interface, caused by last line being `\endinput\xintsession`,
+ and the latter using `\scantokens` in certain circumstances
+ - fix extra `(` in a help panel
- 0.3 (2021-05-31)
- implement `>>>` primary and `...` secondary invite prompts
- breaking: rename `\xintresume` into `\xintsession`
diff --git a/macros/plain/contrib/xintsession/xintsession.tex b/macros/plain/contrib/xintsession/xintsession.tex
index d7f6cffb06..1cf708bab5 100644
--- a/macros/plain/contrib/xintsession/xintsession.tex
+++ b/macros/plain/contrib/xintsession/xintsession.tex
@@ -1,4 +1,4 @@
-% Release 0.3 (2021-05-31) of xintsession.tex
+% Release 0.3a (2021-06-08) of xintsession.tex
% author: Jean-Francois Burnol
% License: LPPL 1.3c (author-maintained)
% Usage: execute "etex (or pdftex) xintsession"
@@ -55,7 +55,7 @@ _ / _ / / / /_ / __/ / / /_/ // /__ / /_ _ / __ |/ // __/__
/_/ /_/ /_/\__/ \___//_/ \__,_/ \___/ \__/ /_/ _____/ \___//_/%
}%
?xdef?xs_copyright{%
- xintsession 0.3 (2021-05-31)
+ xintsession 0.3a (2021-06-08)
Copyright (c) Jean-Francois Burnol, 2021.%
}}%
\def\xs_no{0}%
@@ -151,8 +151,8 @@ _ / _ / / / /_ / __/ / / /_/ // /__ / /_ _ / __ |/ // __/__
\immediate\write\xs_out
{\expandafter\string\xs_xintdefvar\space @_\xs_no:=%
\detokenize\expandafter{\xs_in};}%
- \XINT_expr_defvar_one{@___}{\csname XINT_expr_varvalue_@__\endcsname}%
- \XINT_expr_defvar_one{@__}{\csname XINT_expr_varvalue_@_\endcsname}%
+ \XINT_expr_defvar_one{@___}{\XINT_expr_varvalue_@__}%
+ \XINT_expr_defvar_one{@__}{\XINT_expr_varvalue_@_}%
\XINT_expr_defvar_one{@_}{\csname XINT_expr_varvalue_@_\xs_no\endcsname}%
\xs_message{%
@_\expandafter\xs_keepsix\xs_no\space\space\space\space\space\relax
@@ -191,8 +191,8 @@ _ / _ / / / /_ / __/ / / /_/ // /__ / /_ _ / __ |/ // __/__
\immediate\write\xs_out
{\expandafter\string\xs_xintdefvar\space\detokenize\expandafter{\xs_left}:=%
\detokenize\expandafter{\xs_right};}%
- \XINT_expr_defvar_one{@___}{\csname XINT_expr_varvalue_@__\endcsname}%
- \XINT_expr_defvar_one{@__}{\csname XINT_expr_varvalue_@_\endcsname}%
+ \XINT_expr_defvar_one{@___}{\XINT_expr_varvalue_@__}%
+ \XINT_expr_defvar_one{@__}{\XINT_expr_varvalue_@_}%
\XINT_expr_defvar_one{@_}{\csname XINT_expr_varvalue_@_\xs_no\endcsname}%
% this is to allow multiple assignments
\expandafter\xs_xintdefvar\xs_left=@_\xs_no;%
@@ -308,7 +308,7 @@ _ / _ / / / /_ / __/ / / /_/ // /__ / /_ _ / __ |/ // __/__
- The computing kernel can work in various modes:
exact (uses \xintexpr), fp (uses \xintfloatexpr), int (uses
- (\xintiiexpr), and pol (makes definitions using \poldef).
+ \xintiiexpr), and pol (makes definitions using \poldef).
To activate a mode enter `&<mode name>' at the prompt
- Issue `&mode' if you forgot in what mode you are currently in.
@@ -484,4 +484,8 @@ _ / _ / / / /_ / __/ / / /_/ // /__ / /_ _ / __ |/ // __/__
%
\xsrestorecatcodes%
\csname xs\string _storeenv\endcsname\endlinechar13\relax%
-\endinput\xintsession%
+% extremely eTeX-weird bug of 0.3 which had here \endinput\xintsession,
+% causing breakage if the latter attempts a \scantokens in an \edef
+% (which is what happens for function definitions).
+% bugfix 0.3a by simply moving \xintsession to before the \endinput
+\xintsession\endinput%