summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-03-20 03:01:11 +0000
committerNorbert Preining <norbert@preining.info>2021-03-20 03:01:11 +0000
commitd3b06b2254431c03e127876a07ae654091314c72 (patch)
tree4fa5e40c55aae3ceeeab0048fabbb778ee06e284 /macros
parent6ad1cf68ae6add67e56faf5ec4390fead04e31b4 (diff)
CTAN sync 202103200301
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/beamer/AUTHORS.md1
-rw-r--r--macros/latex/contrib/beamer/CHANGELOG.md10
-rw-r--r--macros/latex/contrib/beamer/README.md4
-rw-r--r--macros/latex/contrib/beamer/base/beamer.cls2
-rw-r--r--macros/latex/contrib/beamer/base/beamerarticle.sty2
-rw-r--r--macros/latex/contrib/beamer/base/beamerbasecompatibility.sty45
-rw-r--r--macros/latex/contrib/beamer/base/beamerbasemodes.sty1
-rw-r--r--macros/latex/contrib/beamer/base/beamerbasesection.sty14
-rw-r--r--macros/latex/contrib/beamer/doc/beamerexample-conference-talk.pdfbin323856 -> 324851 bytes
-rw-r--r--macros/latex/contrib/beamer/doc/beamerexample-lecture-beamer-version.pdfbin531267 -> 531872 bytes
-rw-r--r--macros/latex/contrib/beamer/doc/beamerexample-lecture-print-version.pdfbin425054 -> 425300 bytes
-rw-r--r--macros/latex/contrib/beamer/doc/beameruserguide.pdfbin1837679 -> 1839214 bytes
-rw-r--r--macros/latex/contrib/beamer/doc/beameruserguide.tex2
-rw-r--r--macros/latex/contrib/easybook/doc/chapter2.tex4
-rw-r--r--macros/latex/contrib/easybook/doc/easybook-demo.pdfbin268534 -> 262611 bytes
-rw-r--r--macros/latex/contrib/easybook/doc/easybook-demo.tex8
-rw-r--r--macros/latex/contrib/easybook/doc/easybook.pdfbin257018 -> 258261 bytes
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx359
-rw-r--r--macros/latex/contrib/graphics-def/README.md2
-rw-r--r--macros/latex/contrib/graphics-def/dvipdfmx.def34
-rw-r--r--macros/latex/contrib/graphics-def/xetex.def36
-rw-r--r--macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdfbin2573778 -> 2577327 bytes
-rw-r--r--macros/latex/contrib/profcollege/latex/ProfCollege.sty264
-rw-r--r--macros/latex/contrib/tuda-ci/README.md4
-rw-r--r--macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdfbin574086 -> 574086 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdfbin621765 -> 621765 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdfbin594959 -> 594862 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLeaflet.pdfbin583234 -> 583234 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdfbin589930 -> 589931 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdfbin653905 -> 653906 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdfbin558963 -> 558963 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdfbin680495 -> 680494 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdfbin550591 -> 550575 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdfbin586772 -> 586772 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdfbin645600 -> 645600 bytes
-rw-r--r--macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex2
-rw-r--r--macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex2
-rw-r--r--macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib2
-rw-r--r--macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex2
-rw-r--r--macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco2
-rw-r--r--macros/latex/contrib/tuda-ci/example/DEMO-TUDaLeaflet.tex2
-rw-r--r--macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex2
-rw-r--r--macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex2
-rw-r--r--macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex2
-rw-r--r--macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex2
-rw-r--r--macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex2
-rw-r--r--macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex2
-rw-r--r--macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex2
-rw-r--r--macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa-mecheng.sty6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudabeamer.cls6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudacolors.def6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudacolors.sty6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudaexercise.cls11
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudafonts.sty6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudaleaflet.cls6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudaletter.cls6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo2
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudaposter.cls6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudapub.cls6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudarules.sty6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudasciposter.cls6
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo2
-rw-r--r--macros/latex/contrib/tuda-ci/tex/tudathesis.cfg6
-rw-r--r--macros/luatex/generic/luatexja/README14
-rw-r--r--macros/luatex/generic/luatexja/doc/luatexja-en.pdfbin700774 -> 689752 bytes
-rw-r--r--macros/luatex/generic/luatexja/doc/luatexja-ja.pdfbin1136034 -> 1124961 bytes
-rw-r--r--macros/luatex/generic/luatexja/doc/luatexja.dtx15
-rw-r--r--macros/luatex/generic/luatexja/src/ltj-base.sty87
-rw-r--r--macros/luatex/generic/luatexja/src/ltj-direction.lua13
-rw-r--r--macros/luatex/generic/luatexja/src/ltj-kinsoku.tex4
-rw-r--r--macros/luatex/generic/luatexja/src/ltj-latex.sty36
-rw-r--r--macros/luatex/generic/luatexja/src/ltj-plain.sty22
-rw-r--r--macros/luatex/generic/luatexja/src/ltj-ruby.lua2
-rw-r--r--macros/luatex/generic/luatexja/src/luatexja-core.sty12
-rw-r--r--macros/luatex/generic/luatexja/src/luatexja.lua7
-rw-r--r--macros/luatex/generic/luatexja/src/luatexja.sty4
-rw-r--r--macros/luatex/generic/luatexja/src/patches/lltjcore.sty118
-rw-r--r--macros/luatex/generic/luatexja/src/patches/lltjfont.sty51
-rw-r--r--macros/luatex/generic/luatexja/src/patches/lltjp-atbegshi.sty39
-rw-r--r--macros/luatex/generic/luatexja/src/patches/lltjp-footmisc.sty6
-rw-r--r--macros/luatex/generic/luatexja/src/patches/lltjp-stfloats.sty6
-rw-r--r--macros/xetex/latex/zbmath-review-template/README.md48
-rw-r--r--macros/xetex/latex/zbmath-review-template/figures/screenshot.pngbin0 -> 62717 bytes
-rw-r--r--macros/xetex/latex/zbmath-review-template/zb-basics.sty58
-rw-r--r--macros/xetex/latex/zbmath-review-template/zb-main.pdfbin0 -> 14915 bytes
-rw-r--r--macros/xetex/latex/zbmath-review-template/zb-main.tex68
-rw-r--r--macros/xetex/latex/zbmath-review-template/zb-manual.pdfbin0 -> 110147 bytes
-rw-r--r--macros/xetex/latex/zbmath-review-template/zb-manual.tex233
-rw-r--r--macros/xetex/latex/zbmath-review-template/zb-metadata.tex24
-rw-r--r--macros/xetex/latex/zbmath-review-template/zb-review.tex1
103 files changed, 1254 insertions, 597 deletions
diff --git a/macros/latex/contrib/beamer/AUTHORS.md b/macros/latex/contrib/beamer/AUTHORS.md
index 25368a8c61..9a1ae9a782 100644
--- a/macros/latex/contrib/beamer/AUTHORS.md
+++ b/macros/latex/contrib/beamer/AUTHORS.md
@@ -4,6 +4,7 @@
- Louis Stuart <louisstuart96@gmail.com>
- Joseph Wright <joseph.wright@morningstar2.co.uk>
+- samcarter <sam.carter8@aol.com>
## Former
diff --git a/macros/latex/contrib/beamer/CHANGELOG.md b/macros/latex/contrib/beamer/CHANGELOG.md
index 1d675b28be..25609aee6c 100644
--- a/macros/latex/contrib/beamer/CHANGELOG.md
+++ b/macros/latex/contrib/beamer/CHANGELOG.md
@@ -8,6 +8,12 @@ a major and minor version only.
## [Unreleased]
+## [v3.62]
+
+### Fixed
+- Issue with naming of file hooks (#670)
+- fixed problem with `\insertmainframenumber` in combination with `ignorenonframetext` (see #665)
+
## [v3.61]
### Fixed
@@ -15,6 +21,7 @@ a major and minor version only.
- `\beamer@bibiconwidth` already defined bug (see #652)
- shadowboxes and transparent overlays (see #654)
- workaround for misaligment of biblatex with sidebar theme (see #645)
+- bug with nonshadow rounded boxed (see #660)
## [v3.60]
@@ -123,7 +130,8 @@ a major and minor version only.
- Support for `noxcolor` with `beamerarticle` (see #483)
- Treatment of mixed overlay/alert specifications
-[Unreleased]: https://github.com/josephwright/beamer/compare/v3.61...HEAD
+[Unreleased]: https://github.com/josephwright/beamer/compare/v3.62...HEAD
+[v3.62]: https://github.com/josephwright/beamer/compare/v3.61...v3.62
[v3.61]: https://github.com/josephwright/beamer/compare/v3.60...v3.61
[v3.60]: https://github.com/josephwright/beamer/compare/v3.59...v3.60
[v3.59]: https://github.com/josephwright/beamer/compare/v3.58...v3.59
diff --git a/macros/latex/contrib/beamer/README.md b/macros/latex/contrib/beamer/README.md
index 29bac8c6e3..a9a23c85e9 100644
--- a/macros/latex/contrib/beamer/README.md
+++ b/macros/latex/contrib/beamer/README.md
@@ -2,7 +2,7 @@
## Overview
-The `beamer` class is focussed on producing (on-screen) presentations, along
+The `beamer` class is focused on producing (on-screen) presentations, along
with support material such as handouts and speaker notes. Content is created
in a `frame` environment, each of which can be divided up into a number of
slides (actual output pages). A simple 'action' notation is used to specify
@@ -12,7 +12,7 @@ range of environments to enable complex slide relationships to be constructed.
The appearance of slides is controlled by a template system. Many of the
elements of slides can be adjusted by setting simple key-based values in
the preamble. More complex changes can be implemented by altering specific,
-targeted definitions without needing to re-write entire blocks of code. This
+targeted definitions without needing to rewrite entire blocks of code. This
allows a variety of visual appearances to be selected for the same content
source.
diff --git a/macros/latex/contrib/beamer/base/beamer.cls b/macros/latex/contrib/beamer/base/beamer.cls
index cc2bc8082e..7854b07b04 100644
--- a/macros/latex/contrib/beamer/base/beamer.cls
+++ b/macros/latex/contrib/beamer/base/beamer.cls
@@ -12,7 +12,7 @@
% See the file doc/licenses/LICENSE for more details.
\ProvidesClass{beamer}
- [2021/02/09 v3.61 A class for typesetting presentations]
+ [2021/03/19 v3.62 A class for typesetting presentations]
% Setup modes and check for article option
% Also loads packages required by both beamer and beamerarticle
diff --git a/macros/latex/contrib/beamer/base/beamerarticle.sty b/macros/latex/contrib/beamer/base/beamerarticle.sty
index e0430e6aeb..f855632e28 100644
--- a/macros/latex/contrib/beamer/base/beamerarticle.sty
+++ b/macros/latex/contrib/beamer/base/beamerarticle.sty
@@ -12,7 +12,7 @@
% See the file doc/licenses/LICENSE for more details.
\ProvidesPackage{beamerarticle}
- [2021/02/09 v3.61 beamer input in article mode]
+ [2021/03/19 v3.62 beamer input in article mode]
% Setup modes and check for article option
% Also loads packages required by both beamer and beamerarticle
diff --git a/macros/latex/contrib/beamer/base/beamerbasecompatibility.sty b/macros/latex/contrib/beamer/base/beamerbasecompatibility.sty
index 4a51568934..75050cfcab 100644
--- a/macros/latex/contrib/beamer/base/beamerbasecompatibility.sty
+++ b/macros/latex/contrib/beamer/base/beamerbasecompatibility.sty
@@ -51,7 +51,27 @@
%
% Fixes right before the start of the document.
%
-\@ifundefined{AddToHook}
+\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}
+\IfFormatAtLeastTF{2020-10-01}
+ {%
+ \AddToHook{env/document/begin}[beamer]{\beamer@firstminutepatches}%
+ \AddToHook{env/document/begin}[beamer]{%
+ \@ifpackageloaded{paralist}{\RequirePackage{beamerpatchparalist}}{}%
+ }%
+ \AddToHook{begindocument/end}[beamer]%need to be later than spanish.ldf?
+ {%
+ \@ifundefined{deactivatequoting}{}{\deactivatequoting}%
+ % Fix meddline with enumerate items
+ \renewcommand\theenumi{\@arabic\c@enumi}%
+ \renewcommand\theenumii{\@arabic\c@enumii}%
+ \renewcommand\theenumiii{\@arabic\c@enumiii}%
+ \catcode`<=12 \catcode`>=12 %% right place??
+ \beamer@lastminutepatches
+ \ifbeamer@ignorenonframe
+ \expandafter\mode\expandafter*%
+ \fi
+ }
+ }
{%
\let\beamer@origdocument\document
\def\document{%
@@ -82,37 +102,18 @@
\expandafter\mode\expandafter*%
\fi}%
}
- {%
- \AddToHook{env/begin/document}[beamer]{\beamer@firstminutepatches}%
- \AddToHook{env/begin/document}[beamer]{%
- \@ifpackageloaded{paralist}{\RequirePackage{beamerpatchparalist}}{}%
- }%
- \AddToHook{begindocument/end}[beamer]%need to be later than spanish.ldf?
- {%
- \@ifundefined{deactivatequoting}{}{\deactivatequoting}%
- % Fix meddline with enumerate items
- \renewcommand\theenumi{\@arabic\c@enumi}%
- \renewcommand\theenumii{\@arabic\c@enumii}%
- \renewcommand\theenumiii{\@arabic\c@enumiii}%
- \catcode`<=12 \catcode`>=12 %% right place??
- \beamer@lastminutepatches
- \ifbeamer@ignorenonframe
- \expandafter\mode\expandafter*%
- \fi
- }
- }
\mode
<article>
{
- \@ifundefined{AddToHook}
+ \IfFormatAtLeastTF{2020-10-01}
+ {\AddToHook{env/begin/document}[beamer]{\beamer@lastminutepatches}}
{%
\let\beamer@origdocument\document
\def\document{%
\beamer@origdocument%
\beamer@lastminutepatches}
}
- {\AddToHook{env/begin/document}[beamer]{\beamer@lastminutepatches}}
\g@addto@macro\beamer@lastminutepatches{%
\ifbeamer@articleactive
diff --git a/macros/latex/contrib/beamer/base/beamerbasemodes.sty b/macros/latex/contrib/beamer/base/beamerbasemodes.sty
index d68e0c0c15..79091d9cd5 100644
--- a/macros/latex/contrib/beamer/base/beamerbasemodes.sty
+++ b/macros/latex/contrib/beamer/base/beamerbasemodes.sty
@@ -122,6 +122,7 @@
\ifx\beamer@nexttoken\lecture\let\next=\beamer@stopoutsidemode\fi
\ifx\beamer@nexttoken\note\let\next=\beamer@stopoutsidemode\fi
\ifx\beamer@nexttoken\appendix\let\next=\beamer@stopoutsidemode\fi
+ \ifx\beamer@nexttoken\beamer@appendixwrite\let\next=\beamer@stopoutsidemode\fi
\ifx\beamer@nexttoken\againframe\let\next=\beamer@stopoutsidemode\fi
\ifx\beamer@nexttoken\section\let\next=\beamer@stopoutsidemode\fi
\ifx\beamer@nexttoken\subsection\let\next=\beamer@stopoutsidemode\fi
diff --git a/macros/latex/contrib/beamer/base/beamerbasesection.sty b/macros/latex/contrib/beamer/base/beamerbasesection.sty
index 9193f5ca45..b28b9ea853 100644
--- a/macros/latex/contrib/beamer/base/beamerbasesection.sty
+++ b/macros/latex/contrib/beamer/base/beamerbasesection.sty
@@ -372,13 +372,19 @@
\newcommand<>\beamer@appendix{}
\def\beamer@resetappendix{\global\let\appendix\beamer@appendix}
-\newcommand<>\appendix{%
- \beamer@inappendixtrue%
- \only#1{\part{\appendixname}%
+\def\beamer@appendixwrite{%
\immediate\write\@auxout{\string\@writefile{nav}%
{\noexpand\headcommand{\noexpand\gdef\noexpand\insertmainframenumber{\the\c@framenumber}}}}%
\addtocontents{nav}{\protect\headcommand{\protect\beamer@appendixpages{\the\c@page}}}%
- \beamer@resetappendix}%
+}
+
+\newcommand<>\appendix{%
+ \beamer@inappendixtrue%
+ \only#1{%
+ \part{\appendixname}%
+ \beamer@appendixwrite%
+ \beamer@resetappendix%
+ }%
}
\def\insertappendixframenumber{\the\numexpr\inserttotalframenumber-\insertmainframenumber\relax}
diff --git a/macros/latex/contrib/beamer/doc/beamerexample-conference-talk.pdf b/macros/latex/contrib/beamer/doc/beamerexample-conference-talk.pdf
index 98aa255019..9f9e5e7b62 100644
--- a/macros/latex/contrib/beamer/doc/beamerexample-conference-talk.pdf
+++ b/macros/latex/contrib/beamer/doc/beamerexample-conference-talk.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer/doc/beamerexample-lecture-beamer-version.pdf b/macros/latex/contrib/beamer/doc/beamerexample-lecture-beamer-version.pdf
index c5202584f0..24fec63675 100644
--- a/macros/latex/contrib/beamer/doc/beamerexample-lecture-beamer-version.pdf
+++ b/macros/latex/contrib/beamer/doc/beamerexample-lecture-beamer-version.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer/doc/beamerexample-lecture-print-version.pdf b/macros/latex/contrib/beamer/doc/beamerexample-lecture-print-version.pdf
index 21e45e9d4f..a4e92838cd 100644
--- a/macros/latex/contrib/beamer/doc/beamerexample-lecture-print-version.pdf
+++ b/macros/latex/contrib/beamer/doc/beamerexample-lecture-print-version.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer/doc/beameruserguide.pdf b/macros/latex/contrib/beamer/doc/beameruserguide.pdf
index 766914a0bf..838932df6e 100644
--- a/macros/latex/contrib/beamer/doc/beameruserguide.pdf
+++ b/macros/latex/contrib/beamer/doc/beameruserguide.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer/doc/beameruserguide.tex b/macros/latex/contrib/beamer/doc/beameruserguide.tex
index eda698782a..fd0f7bcadf 100644
--- a/macros/latex/contrib/beamer/doc/beameruserguide.tex
+++ b/macros/latex/contrib/beamer/doc/beameruserguide.tex
@@ -13,7 +13,7 @@
\documentclass{ltxdoc}
-\def\beamerugversion{3.61}
+\def\beamerugversion{3.62}
\def\beamerugpgfversion{1.00}
\def\beamerugxcolorversion{2.00}
diff --git a/macros/latex/contrib/easybook/doc/chapter2.tex b/macros/latex/contrib/easybook/doc/chapter2.tex
index 4cf3e8113c..5b42327bd1 100644
--- a/macros/latex/contrib/easybook/doc/chapter2.tex
+++ b/macros/latex/contrib/easybook/doc/chapter2.tex
@@ -58,7 +58,7 @@ The Stokes formula is an extension of the basic calculus formula in the case of
这是一个证明,末尾自动添加证明结束符。
\end{proof}
-\begin{mybox}*[My title][MintCream]
+\begin{mybox}*[MintCream](My title)
\index{z@自定义盒子}
\zhlipsum*[3][name = aspirin]
\tcblower
@@ -66,7 +66,7 @@ The Stokes formula is an extension of the basic calculus formula in the case of
\end{mybox}
\zhlipsum*[3][name = aspirin]
-\begin{exercise}[LightYellow][1.][习题]
+\begin{exercise}[LightYellow][1.](习题)
\index{x@习题环境}
\item 设$w = f(x + y + z,xyz)$,$f$具有二阶连续偏导数,求$\dfrac{{\partial w}}{{\partial x}}$和$\dfrac{{{\partial ^2}w}}{{\partial x\partial z}}$。
\item 已知$y = y(x)$在任意点$x$处的增量$\Delta y = \dfrac{y\Delta x}{1 + x^2} + \alpha$,其中$\alpha$是$\Delta x$的高阶无穷小($\Delta x\to 0$时),$y(0) = \pi$,则$y(1) = \uline{\mbox{\hspace{2em}}}$。
diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.pdf b/macros/latex/contrib/easybook/doc/easybook-demo.pdf
index 294969ee65..1be2e7f933 100644
--- a/macros/latex/contrib/easybook/doc/easybook-demo.pdf
+++ b/macros/latex/contrib/easybook/doc/easybook-demo.pdf
Binary files differ
diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.tex b/macros/latex/contrib/easybook/doc/easybook-demo.tex
index 616abff281..867240ca0c 100644
--- a/macros/latex/contrib/easybook/doc/easybook-demo.tex
+++ b/macros/latex/contrib/easybook/doc/easybook-demo.tex
@@ -44,7 +44,7 @@
thmset =
{
thmbox = true,
- numberwith = {chapter},
+ numberwith = chapter,
bodyfont = \normalfont,
headpunct = {.}
},
@@ -77,7 +77,7 @@
{
format = \addvspace{1pc}\sffamily\large,
indent = 0\ccwd,
- rule = \tocrule[0.7pc][1.2]{$\cdot$}[\bfseries]
+ rule = \tocrule[0.7pc](1.2){$\cdot$}[\bfseries]
}
},
bibset =
@@ -89,6 +89,8 @@
% tocdepth = 2
}
+\usepackage{zhlipsum,bicaption,tcolorbox}
+
\begin{document}
\title{\sffamily easybook书籍文档类}
\author
@@ -97,7 +99,7 @@
\url{https://latexstudio.net} \\
\url{https://gitee.com/texl3/easybook}\thanks{Gitee为项目的主要发布地址。}
}
-\date{2021/03/18\hskip\ccwd\relax v1.23u}
+\date{2021/03/19\hskip\ccwd\relax v1.23v}
\frontmatter[roman]
\maketitle
diff --git a/macros/latex/contrib/easybook/doc/easybook.pdf b/macros/latex/contrib/easybook/doc/easybook.pdf
index 9346232eb7..dc22bed42d 100644
--- a/macros/latex/contrib/easybook/doc/easybook.pdf
+++ b/macros/latex/contrib/easybook/doc/easybook.pdf
Binary files differ
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index e894992e1a..7269f8bcd5 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -51,7 +51,7 @@ The latest version of this license is in
%
% \changes{v1.20}{2021/01/09}{修改和完善用户文档。}
% \changes{v1.20}{2021/01/09}{模板更改为使用 CC-BY 许可协议。}
-% \changes{v1.23u}{2021/03/18}{修复在 \pkg{ctex} v2.5.6 更新后 \cls{easybook} 与 \pkg{hyperref} 冲突问题。}
+% \changes{v1.23v}{2021/03/19}{修复在 \pkg{ctex} v2.5.6 更新后 \cls{easybook} 与 \pkg{hyperref} 冲突问题。}
%
% \CheckSum{0}
%
@@ -73,7 +73,7 @@ The latest version of this license is in
%
% \title{\sffamily easybook书籍文档类}
% \author{瞿毅}
-% \date{2021/03/18\hskip\ccwd\relax v1.23u\thanks{\url{https://gitee.com/texl3/easybook}}}
+% \date{2021/03/19\hskip\ccwd\relax v1.23v\thanks{\url{https://gitee.com/texl3/easybook}}}
% \maketitle
% \begin{abstract}
% \cls{easybook} 是基于 \cls{ctexbook} 书籍文档类创建以极简为风格的模板,可以看作对 \cls{ctexbook} 的进一步包装。虽然\CTeX 文档类提供了较好的中文支持,但想实现个性化功能一般需要在其基础上载入更多宏包来定制。\cls{easybook} 考虑了一些细节并载入一些常用宏包实现一般的排版需求,它适用于排版中英文书籍或笔记,甚至可稍加调整成为学位论文模板。
@@ -85,8 +85,7 @@ The latest version of this license is in
% 模板含有一个使用示例文件 \opt{easybook-demo.tex},编译前建议满足以下的条件
% \begin{itemize}
% \item 使用 \hologo{XeLaTeX}(推荐)或 \hologo{LuaLaTeX} 两种编译方式。
-% \item 参考文献支持用 \hologo{BibTeX}(默认)或 \hologo{biber} 后端处理。
-% \item 由于用到了一些较新的宏包,建议安装最新的\TeX 发行版并将宏包升级为最新。
+% \item 由于用到了一些宏包较新的功能,建议安装最新的\TeX 发行版并将所有宏包升级为最新,目前在 \hologo{MiKTeX} 21.2和 \TeX Live 2020可以正常编译。
% \end{itemize}
%
% \subsection{编译步骤}
@@ -123,7 +122,7 @@ The latest version of this license is in
% \end{itemize}
%
% \begin{function}[rEXP,added = 2021-01-05]{draft}
-% 开启草稿模式会加快编译速度,表现有显示页面边框、行溢出的地方显示黑色方块、图片变成占位方框、显示当前日期和关闭超链接渲染。
+% 开启草稿模式会加快编译速度,表现有显示页面边框、行溢出的地方显示黑色方块、图片变成占位方框、显示当前日期和关闭超链接渲染。不载入 \pkg{tcolorbox} 宏包支持盒子环境也会提高编译速度,详情见小节 \ref{subsec:box}。
% \end{function}
%
% \begin{function}[rEXP,added = 2021-01-05]{newline}
@@ -165,7 +164,7 @@ The latest version of this license is in
% class = <(book)|article>
% \end{syntax}
% 设置文类风格,默认为 \opt{book} 文档类。选用 \opt{article} 使文档编号、结构等与 \cls{article} 文档类的特性相似,可用于短篇幅的文章,不要再使用 \tn{chapter} 命令,此时设置双栏目录的 \opt{style/multoc} 选项、小节 \ref{subsec:document command} 中打印目录命令的 \opt{multoc} 及 \opt{book} 选项均会失效,会以 \opt{section} 标题级别输出目录。
-% \changes{v1.23u}{2021/03/16}{增加 article 文章模式,可用于短篇幅的文章。}
+% \changes{v1.23v}{2021/03/16}{增加 article 文章模式,可用于短篇幅的文章。}
% \end{function}
%
% \subsection{文档命令}
@@ -181,7 +180,7 @@ The latest version of this license is in
% \tn{listoflistings*}\oarg{键值列表}
% \end{syntax}
% \tn{frontmatter} 为前言区命令,章标题不编号,页码可设置为例如 \opt{roman}、\opt{Alph} 等格式,带有星号的命令 \tn{frontmatter*} 不使用 \tn{cleardoublepage}。\tn{mainmatter} 为主文区命令,章标题正常编号且页码为从1开始计数的阿拉伯数字,\tn{mainmatter*} 命令不使用 \tn{cleardoublepage}。\tn{backmatter} 为后记区命令,页码格式与编号保持不变,章标题不编号。\tn{listoffigures} 命令输出图片目录,\tn{listoftables} 命令输出表格目录,\tn{listoflistings} 命令输出代码目录。带有星号的目录命令不会添加进主文档目录中,目录的键值列表选项如下
-% \changes{v1.23u}{2021/02/20}{重新定义文档结构划分命令。}
+% \changes{v1.23v}{2021/02/20}{重新定义文档结构划分命令。}
% \end{function}
%
% \begin{function}{multoc,book,article}
@@ -189,7 +188,7 @@ The latest version of this license is in
% multoc = <true|(false)>
% \end{syntax}
% \opt{multoc} 与 \opt{style/multoc} 选项具有相同的效果,但是具有优先性且可单独设置不同目录是否双栏排版。\opt{book} 选项使目录标题按照 \opt{chapter} 级别输出,\opt{article} 选项使目录标题按照 \opt{article} 级别输出,默认为 \opt{chapter} 级别。
-% \changes{v1.23u}{2021/03/15}{为几个目录增加键值列表的选项,可设置标题输出级别以及是否加入主目录。}
+% \changes{v1.23v}{2021/03/15}{为几个目录增加键值列表的选项,可设置标题输出级别以及是否加入主目录。}
% \end{function}
%
% \section{接口选项}
@@ -226,9 +225,9 @@ The latest version of this license is in
% \end{syntax}
% \ding{229} 以上选项路径为 \opt{style/...}
% \changes{v1.10}{2021/01/08}{更改颜色实现方式与选项名。}
-% \changes{v1.23u}{2021/02/02}{noto风格的数学字体独立出来,可自定义设置。}
-% \changes{v1.23u}{2021/02/09}{增加控制页面横线粗细的选项。}
-% \changes{v1.23u}{2021/03/15}{增加控制编号连接符的选项。}
+% \changes{v1.23v}{2021/02/02}{noto风格的数学字体独立出来,可自定义设置。}
+% \changes{v1.23v}{2021/02/09}{增加控制页面横线粗细的选项。}
+% \changes{v1.23v}{2021/03/15}{增加控制编号连接符的选项。}
% \end{function}
%
% \begin{optdesc}
@@ -290,7 +289,7 @@ The latest version of this license is in
% \ding{229} 以上选项路径为 \opt{spread/...} \\
% 行距因子用于设置各种行距倍数,只能是浮点数,不能带有长度单位。\tn{ctexset} 原有的行距选项 \opt{linespread} 失效。各行距既可在导言区全局设置也可正文中设置对后面生效,行距的意义为
% \changes{v1.21}{2021/01/12}{增加脚注线间的距离选项。}
-% \changes{v1.23u}{2021/02/09}{取消使用 \pkg{zhlineskip} 宏包设置数学间距。}
+% \changes{v1.23v}{2021/02/09}{取消使用 \pkg{zhlineskip} 宏包设置数学间距。}
% \end{function}
%
% \begin{optdesc}
@@ -302,17 +301,17 @@ The latest version of this license is in
% \end{optdesc}
%
% \subsection{其它字体}
-% \begin{function}[EXP,added = 2021-01-08,updated = 2021-02-13]{table-cap,figure-cap,listing-cap,footnote,marginpart}
+% \begin{function}[EXP,added = 2021-01-08,updated = 2021-02-13]{table-cap,figure-cap,listing-cap,footnote,marginpar}
% \begin{syntax}
% table-cap = <\tn{sffamily}\tn{small}>
% figure-cap = <\tn{sffamily}\tn{small}>
% listing-cap = <\tn{sffamily}\tn{small}>
% footnote = <\tn{rmfamily}>
-% marginpart = <\tn{rmfamily}\tn{footnotesize}>
+% marginpar = <\tn{rmfamily}\tn{footnotesize}>
% \end{syntax}
% \ding{229} 以上选项路径为 \opt{elsefont/...}
% \changes{v1.10}{2021/01/08}{加入自定义非正文字体选项。}
-% \changes{v1.23u}{2021/02/08}{修复使用 \tn{zihao} 命令设置字体失效的问题。}
+% \changes{v1.23v}{2021/02/08}{修复使用 \tn{zihao} 命令设置字体失效的问题。}
% \end{function}
%
% \begin{optdesc}
@@ -333,7 +332,7 @@ The latest version of this license is in
% \end{syntax}
% \ding{229} 以上选项路径为 \opt{bibset/...}
% \changes{v1.21}{2021/01/11}{增加 \opt{bibset} 选项,可以使用 \hologo{BibTeX} 或 \hologo{biber} 编译参考文献。}
-% \changes{v1.23u}{2021/02/23}{使用 \opt{bibset} 选项时可设置标注风格。}
+% \changes{v1.23v}{2021/02/23}{使用 \opt{bibset} 选项时可设置标注风格。}
% \end{function}
%
% \begin{optdesc}
@@ -377,7 +376,7 @@ The latest version of this license is in
% \end{function}
%
% \begin{optdesc}
-% \item[thmbox] 开启定理及习题环境的盒子边框。
+% \item[thmbox] 开启定理及习题环境的盒子边框,需载入 \pkg{tcolorbox} 宏包才生效。
% \item[numberwith] 定理编号跟随的计数器,默认跟随章的编号,也可以跟随其它定理环境的编号,当计数器增加时定理编号会从零开始,空置时不跟随其它计数器。
% \item[headpunct] 定理标题末尾后的标记,在换行符或第一段内容的间隔之前。
% \item[bodyfont] 定理内容部分的字体。
@@ -395,7 +394,7 @@ The latest version of this license is in
% \tn{declaretheoremstyle}\oarg{键值列表}\marg{定理样式名}
% \end{syntax}
% 文档类已预置8个定理环境,环境名及对应的定理标题名见小节 \ref{subsec:theorem},如果需要新的定理标题名或定理样式可使用这两个命令。
-% \changes{v1.23u}{2021/03/12}{重新定义了新定理环境命令 \tn{newtheorem}。}
+% \changes{v1.23v}{2021/03/12}{重新定义了新定理环境命令 \tn{newtheorem}。}
% \end{function}
%
% \begin{optdesc}
@@ -463,8 +462,8 @@ The latest version of this license is in
% \opt{hdrset} 设置的命令由 \pkg{fancyhdr} 宏包提供支持,\opt{headrule}、\opt{footrule} 和 \opt{footnoterule} 三个横线选项一般可以使用 \tn{hrule} width \meta{长度} height \meta{高度} 命令来绘制,脚注横线默认为空。当然,手动绘制横线时线条粗细选项 \opt{style/rulewidth} 会失效。
% \changes{v1.21}{2021/01/11}{修复单面文档时页眉横线消失的问题。}
% \changes{v1.21}{2021/01/13}{增加配置页眉页脚的选项。}
-% \changes{v1.23u}{2021/03/08}{优化页眉页脚设置,增加 \opt{chap-mark} 和 \opt{sec-mark} 选项。}
-% \changes{v1.23u}{2021/03/14}{可以手动绘制页眉、页脚和脚注的横线。}
+% \changes{v1.23v}{2021/03/08}{优化页眉页脚设置,增加 \opt{chap-mark} 和 \opt{sec-mark} 选项。}
+% \changes{v1.23v}{2021/03/14}{可以手动绘制页眉、页脚和脚注的横线。}
% \end{function}
%
% \begin{function}[added = 2021-01-13,updated = 2021-03-14]{,\easyhead,\easyfoot}
@@ -516,7 +515,7 @@ The latest version of this license is in
%
% \begin{function}[added = 2021-01-13,updated = 2021-01-15]{\tocrule}
% \begin{syntax}
-% \tn{tocrule} = \oarg{引导点间距|(0.7pc)}\oarg{引导点大小|(1.2)}\marg{引导点}\oarg{页码格式}
+% \tn{tocrule} = \oarg{引导点间距|(0.7pc)}\parg{引导点大小|(1.2)}\marg{引导点}\oarg{页码格式}
% \end{syntax}
% \tn{tocrule} 命令生成目录引导线,需要在 \opt{rule} 选项中使用,其中引导线间距需带有长度单位,引导点大小不带单位,为引导点符号正常大小的倍数,引导点一般为英文句号或 \tn{cdot} 中心点符号。页码格式的内容位于页码前面,可以设置页码字体、距离。
% \begin{ctexexam}
@@ -528,7 +527,7 @@ The latest version of this license is in
% {
% format = \addvspace{8pt}\large,
% indent = 1.5\ccwd,
-% rule = \tocrule[0.6pc][1.1]{.}[\zihao{5}]
+% rule = \tocrule[0.6pc](1.1){.}[\zihao{5}]
% }
% }
% }
@@ -544,7 +543,7 @@ The latest version of this license is in
% \tn{item} <行间公式>
% \tn{end}\marg{环境名}
% \end{syntax}
-% \opt{amsmath} 宏包提供了一系列数学环境,它们可以排布各种对齐或不对齐的公式组。\opt{multline} 环境用于一行无法放下的长公式,\opt{gather} 环境用于每行居中的公式组,\opt{align} 环境用于多列对齐的公式组。
+% \pkg{amsmath} 宏包提供了一系列数学环境,它们可以排布各种对齐或不对齐的公式组。\env{multline} 环境用于一行无法放下的长公式,\env{gather} 环境用于每行居中的公式组,\env{align} 环境用于多列对齐的公式组。
% \end{function}
%
% \subsection{列表}
@@ -554,7 +553,7 @@ The latest version of this license is in
% \tn{item} <列表内容>
% \tn{end}\marg{环境名}
% \end{syntax}
-% \pkg{enumitem} 宏包为系统预置的列表环境提供了更灵活的标签以及间距的控制,可使用 \tn{setlist} 命令设置原有的三种列表格式。已设置默认格式,若自定义标签可例如
+% \pkg{enumitem} 宏包为系统预置的列表环境 \env{enumerate}、\env{itemize}和 \env{description} 提供了更灵活的标签以及间距的控制,可使用 \tn{setlist} 命令设置原有的三种列表格式。已设置默认格式,若自定义标签可例如
% \begin{ctexexam}
% \begin{enumerate}[label = \arabic*(a),leftmargin = 1cm,resume]
% \begin{itemize}[label = \textbullet]
@@ -564,14 +563,14 @@ The latest version of this license is in
%
% \subsubsection{排序列表}
% \label{subsec:sort list}
-% 使用 \opt{enumerate} 环境可创建排序列表,使用 \opt{enumerate*} 环境产生行内部列表,可以使用\textbf{A、a、I、i和1}作为可选项为 \opt{enumerate} 与 \opt{enumerate*} 格式化标签。若生成\textbf{Item I、Item II、Item III}格式可以这样
+% 使用 \opt{enumerate} 环境可创建排序列表,使用 \env{enumerate*} 环境产生行内部列表,可以使用\textbf{A、a、I、i和1}作为可选项为 \env{enumerate} 与 \env{enumerate*} 格式化标签。若生成\textbf{Item I、Item II、Item III}格式可以这样
% \begin{ctexexam}
% \begin{enumerate*}[(a)]
% \begin{enumerate}[\bfseries{Item} I]
% \end{ctexexam}
%
% \subsubsection{常规列表}
-% 使用 \opt{itemize} 环境可创建不计数列表,列表环境中若换行不缩进,若在列表中分段后则缩进两字符。 \opt{itemize*} 为行内常规列表,也提供一个可选参数。
+% 使用 \env{itemize} 环境可创建不计数列表,列表环境中若换行不缩进,若在列表中分段后则缩进两字符。 \opt{itemize*} 为行内常规列表,也提供一个可选参数。
%
% 用$\star$取代默认的符号
% \begin{ctexexam}
@@ -580,7 +579,7 @@ The latest version of this license is in
% \end{ctexexam}
%
% \subsubsection{主题列表}
-% 使用 \opt{description} 环境可创建带有主题词的列表。
+% 使用 \env{description} 环境可创建带有主题词的列表。
% \begin{ctexexam}
% \begin{description}
% \item[主题一] 内容一
@@ -609,35 +608,36 @@ The latest version of this license is in
%
% \subsection{习题}
% \label{subsec:exercise}
-% \begin{function}[added = 2021-01-05,updated = 2021-03-13]{exercise}
+% \begin{function}[added = 2021-01-05,updated = 2021-03-19]{exercise}
% \begin{syntax}
-% \tn{begin}\marg{exercise}\oarg{颜色名|(LightYellow)}\oarg{编号|(1.)}\oarg{标题|(习题)}\oarg{配置选项}
+% \tn{begin}\marg{exercise}\oarg{颜色名|(LightYellow)}\oarg{编号|(1.)}\parg{标题|(习题)}\oarg{配置选项}
% \tn{item} <习题内容>
% \tn{end}\marg{exercise}
% \end{syntax}
-% 习题环境 \opt{exercise} 的标题紧接上一节编号并加入目录与页眉,当使用星号环境时不进行编号。三个可选参数中颜色为自定义或 \pkg{xcolor} 包含的颜色名称,正文编号格式与小节 \ref{subsec:sort list} 排序列表相同,标题名默认为摘要,参数只能\textbf{从右往左}省略。
+% 习题环境 \env{exercise} 的标题紧接上一节编号并加入目录与页眉,当使用星号环境时不进行编号。三个可选参数中颜色为自定义或 \pkg{xcolor} 包含的颜色名称,正文编号格式与小节 \ref{subsec:sort list} 排序列表相同,标题名默认为摘要。注意,环境具有相同定界符的可选参数只能\textbf{从右往左}省略,省略的参数使用默认值。
% \begin{ctexexam}
-% \begin{exercise}[LightYellow][1.][习题]
+% \begin{exercise}[LightYellow][1.](习题)
% \item 习题内容
% \item 习题内容
% \end{exercise}
% \end{ctexexam}
-% \changes{v1.23u}{2021/02/08}{增加准确的习题盒子标题目录锚点。}
+% \changes{v1.23v}{2021/02/08}{增加准确的习题盒子标题目录锚点。}
% \end{function}
%
% \subsection{盒子}
-% 盒子以及小节 \ref{subsec:exercise} 中 \opt{exercise} 环境配置的选项由 \pkg{tcolorbox} 提供支持,具体选项可见宏包文档的 Option Keys 一节,可以进行边距、字体及背景颜色等各种个性化设置,一些配置会覆盖之前预置的设置。
+% \label{subsec:box}
+% 使用盒子以及小节 \ref{subsec:exercise} 中的 \env{exercise} 环境需要在导言区\textbf{手动载入} \pkg{tcolorbox} 宏包,它们的配置的选项同样由 \pkg{tcolorbox} 提供支持,具体选项可见宏包文档的 Option Keys 一节,可以进行边距、字体及背景颜色等各种个性化设置,一些配置会覆盖之前预置的设置。
%
% \subsubsection{摘要盒子}
-% \begin{function}[added = 2021-01-05,updated = 2021-03-13]{outline}
+% \begin{function}[added = 2021-01-05,updated = 2021-03-19]{outline}
% \begin{syntax}
-% \tn{begin}\marg{outline}\oarg{标题名称}\oarg{配置选项}
+% \tn{begin}\marg{outline}\parg{标题名称}\oarg{配置选项}
% \tn{item} <摘要内容>
% \tn{end}\marg{outline}
% \end{syntax}
% 摘要盒子可用于章前摘要,它的标题是可选参数,默认标题是摘要。
% \begin{ctexexam}
-% \begin{outline}[标题名称]
+% \begin{outline}(标题名称)
% \item 摘要内容
% \item 摘要内容
% \end{outline}
@@ -645,15 +645,15 @@ The latest version of this license is in
% \end{function}
%
% \subsubsection{段落盒子}
-% \begin{function}[added = 2021-01-05,updated = 2021-03-13]{mybox}
+% \begin{function}[added = 2021-01-05,updated = 2021-03-19]{mybox}
% \begin{syntax}
-% \tn{begin}\marg{mybox}\oarg{段落标题}\oarg{颜色名|(MintCream)}\oarg{配置选项}
+% \tn{begin}\marg{mybox}\oarg{颜色名|(MintCream)}\parg{段落标题}\oarg{配置选项}
% <盒子内容>
% \tn{end}\marg{mybox}
% \end{syntax}
% 环境 \opt{mybox} 创建一个段落盒子,可以添加可选参数的标题,否则无标题框。当使用带有星号的环境时 \oarg{颜色名} 选项生效,可以自定义背景颜色,否则无背景颜色。
% \begin{ctexexam}
-% \begin{mybox}*[段落标题][MintCream]
+% \begin{mybox}*[MintCream](段落标题)
% 盒子内容
% \tcblower % 盒子上下部分分界线
% 盒子内容
@@ -706,7 +706,7 @@ The latest version of this license is in
% \tn{ch}\oarg{选项}\marg{输入}
% \tn{chemfig}\oarg{键值列表}\marg{分子代码}
% \end{syntax}
-% 除了以普通公式的方式,化学式还可用 \pkg{chemformula} 实现,无机化学式使用 \tn{ch} 命令书写。有机化学式推荐使用 \pkg{chemfig}(并未载入)的 \tn{chemfig} 命令完成。
+% 除了以普通公式的方式,化学式还可用 \pkg{chemformula} 实现,无机化学式使用 \tn{ch} 命令书写。有机化学式推荐在导言区载入 \pkg{chemfig} 宏包,使用\tn{chemfig} 命令完成。
% \end{function}
%
% \subsection{引用}
@@ -747,22 +747,22 @@ The latest version of this license is in
% 命令 \tn{marginnote} 可以生成简单的边注,如果只给定了 \meta{右文本},那么边注在奇偶数页文字相同。如果同时给定了 \meta{左文本},则偶数页使用 \meta{左文本} 的文字。
% \end{function}
%
-% \subsection{插入文档}
-% \begin{function}[added = 2021-03-14]{\includepdf}
+% \subsection{双语标题}
+% \begin{function}[added = 2021-03-19]{\bicaption,\bicaptionbox}
% \begin{syntax}
-% \tn{includepdf}\oarg{键值列表}\marg{文档名}
+% \tn{bicaption}\oarg{目录标题1}\marg{标题2}\oarg{目录标题1}\marg{标题2}
+% \tn{bicaptionbox}\oarg{目录标题1}\marg{标题2}\oarg{目录标题1}\marg{标题2}
+% \oarg{宽度}\oarg{内部位置}\marg{内容}
% \end{syntax}
-% 该命令由 \pkg{pdfpages} 提供,将其他 pdf 文档插入当前文档,比如插入封面,可以指定插入页数、逻辑页和横向等,详情查看宏包文档。
+% 可以实现中英文双语标题,使用此功能需要在导言区载入 \pkg{bicaption} 宏包,具体用法见说明文档。
% \end{function}
%
-% \subsection{横向页面}
-% \begin{function}[added = 2021-03-14]{sidewaysfigure,sidewaystable}
+% \subsection{插入文档}
+% \begin{function}[added = 2021-03-14]{\includepdf}
% \begin{syntax}
-% \tn{begin}\marg{环境名}\oarg{位置}
-% <插入图片或表格>
-% \tn{end}\marg{环境名}
+% \tn{includepdf}\oarg{键值列表}\marg{文档名}
% \end{syntax}
-% 该环境由 \pkg{rotfloat} 提供,用于横向插入宽大的图片或表格,用法与 \opt{figure} 和 \opt{table} 环境类似。
+% 该命令由 \pkg{pdfpages} 提供,将其他 pdf 文档插入当前文档,比如插入封面,可以指定插入页数、逻辑页和横向等,详情查看宏包文档。
% \end{function}
%
% \subsection{指定行距的段落}
@@ -780,7 +780,7 @@ The latest version of this license is in
%<*class>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/03/18}{1.23u}{}
+\ProvidesExplClass{easybook}{2021/03/19}{1.23v}{}
\cs_generate_variant:Nn \keys_define:nn {nx}
\cs_generate_variant:Nn \int_to_arabic:n {v}
@@ -863,7 +863,7 @@ The latest version of this license is in
{normalem}{ulem},
{protrusion = false}{microtype},
{shortlabels,inline}{enumitem},
- {most}{tcolorbox},
+ {many}{tcolorbox},
{xindy}{imakeidx},
{CJKmath = true}{xeCJK},
{no-math}{fontspec},
@@ -932,18 +932,17 @@ The latest version of this license is in
\RequirePackage
{
xcolor,
- pdfpages,
footmisc,setspace,
amsmath,amsthm,thmtools,cases,
chemformula,siunitx,ulem,
geometry,marginnote,nccfoots,
- rotfloat,graphicx,
+ pdfpages,graphicx,
fancyhdr,titletoc,
- caption,bicaption,subcaption,
- microtype,zhlipsum,pifont,
+ caption-light,subcaption,
+ pifont,microtype,
tabularx,multirow,makecell,booktabs,
- paralist,tasks,enumitem,
- tcolorbox,
+ tasks,enumitem,
+ listings,
imakeidx
}
\ctex_at_end_preamble:n
@@ -1089,7 +1088,6 @@ The latest version of this license is in
}
\cs_gset_eq:NN \easyhead\fancyhead
\cs_gset_eq:NN \easyfoot\fancyfoot
-\cs_gset_eq:NN \easypagestyle\fancypagestyle
\__ctex_define:nn {hdrset}
{
head-foot .tl_set:N = \l__fancyhf_content_tl,
@@ -1243,7 +1241,7 @@ The latest version of this license is in
belowoffset .initial:n = -1pc
}
-\NewDocumentCommand{\tocrule}{O{0.7pc}O{1.2}mO{}}
+\NewDocumentCommand{\tocrule}{O{0.7pc}D(){1.2}mO{}}
{
\normalsize\normalfont
\titlerule*[#1]{\scalebox{#2}{#3}}#4\contentspage
@@ -1342,8 +1340,7 @@ The latest version of this license is in
{
\if@twocolumn
\@restonecoltrue
- \onecolumn
- \bool_if:NT \l__multoc_bool{\twocolumn}
+ \bool_if:NTF \l__multoc_bool{\twocolumn}{\onecolumn}
\else
\@restonecolfalse
\bool_if:NT \l__multoc_bool{\twocolumn}
@@ -1476,8 +1473,11 @@ The latest version of this license is in
font += figure@font,
belowskip = 2pt,aboveskip = 6pt
}
-\captionsetup[figure][bi-second]{name = Figure}
-\captionsetup[table][bi-second]{name = Table}
+\ctex_at_end_package:nn {bicaption}
+ {
+ \captionsetup[figure][bi-second]{name = Figure}
+ \captionsetup[table][bi-second]{name = Table}
+ }
\cs_new:Npn \__arabic:n #1{\int_to_arabic:v {c@#1}}
\cs_new_protected:Npn \__separator_set:n #1
{
@@ -1571,7 +1571,14 @@ The latest version of this license is in
\setlist
{
labelsep = .75\ccwd,listparindent = 2\ccwd,
- itemsep = .75ex plus .1ex,parsep = 0ex,topsep = .75ex plus .1ex,partopsep = 0ex
+ itemsep = .75ex plus .1ex,topsep = .75ex plus .1ex,
+ partopsep = 0ex,parsep = 0ex
+ }
+\newlist{outlinelist}{itemize}{1}
+\setlist[outlinelist]
+ {
+ label = \color{ctex@emph}\upshape\ding{111},
+ itemsep = .5ex plus .1ex,leftmargin = *
}
\setlist[itemize,1]
{label = \color{ctex@emph}\ensuremath{\bullet},leftmargin = *}
@@ -1583,13 +1590,6 @@ The latest version of this license is in
{label = \color{ctex@emph}(\alph*),ref = \theenumi(\alph*),leftmargin = *}
\setlist[description]
{font = \color{ctex@emph}\sf,labelwidth = *,leftmargin = 2\ccwd}
-\newlist{outlinelist}{itemize}{1}
-\setlist[outlinelist]
- {label = \color{ctex@emph}\upshape\ding{111},itemsep = .5ex plus .1ex,leftmargin = *}
-\skip_set:Nn \pltopsep{.75ex plus .1ex}
-\skip_set:Nn \plpartopsep{0ex}
-\skip_set:Nn \plitemsep{.75ex plus .1ex}
-\skip_set:Nn \plparsep{0ex}
\cs_new_protected:Npn \__thmname_set:nn #1#2
{\tl_const:cn {c__name_#1_tl}{#2}}
@@ -1754,123 +1754,130 @@ The latest version of this license is in
\cs_gset:Npn \tagform@#1
{\maketag@@@{\color{ctex@emph}(\ignorespaces#1\unskip\@@italiccorr)}}
-\tcbset
+\ctex_at_end_package:nn {tcolorbox}
{
- thmsty/.style =
+ \tcbset
+ {
+ thmsty/.style =
+ {
+ enhanced~jigsaw,pad~at~break* = 3pt,
+ opacityback = 0,
+ colframe = ctex@emph,
+ left = .2pc,right = .2pc,top = .5pc,bottom = .5pc,middle= .5pc,
+ arc = 0pt
+ },
+ outlinesty/.style =
+ {
+ enhanced,nofloat,
+ tikznode~boxed~title,
+ interior~style = white,colframe = ctex@emph,
+ colbacktitle = white,coltitle = ctex@emph,
+ fonttitle = \large\sffamily,fontupper = \itshape,
+ boxed~title~style = {size = normal,opacityframe = 0,boxrule = 0pt},
+ attach~boxed~title~to~top~center = {yshift = -\tcboxedtitleheight/2},
+ arc = 3pt,
+ after~skip = 3ex,
+ left = 1.5pc,right = 1.5pc,top = 1pc,bottom = 0.5pc,
+ boxsep = 5pt
+ },
+ exersty/.style =
+ {
+ enhanced,on~line,
+ arc = 5pt,
+ fontupper = \sffamily\Large,
+ boxrule = 1pt,boxsep = 0pt,
+ left = 6pt,right = 6pt,top = 3.5pt,bottom = 3.5pt,
+ before~skip = 4ex,after~skip = 2.25ex
+ },
+ breakable,
+ boxrule = \l__rule_width_dim
+ }
+ \NewDocumentEnvironment{outline}{D(){\abstractname}o+b}
+ {
+ \begin{tcolorbox}[outlinesty,title = #1,IfValueT = {#2}{#2}]
+ \begin{outlinelist}
+ #3
+ \end{outlinelist}
+ \end{tcolorbox}
+ }{}
+ \NewDocumentEnvironment{exercise}
+ {sO{LightYellow}O{1.}D(){\c__name_exercise_tl}o+b}
+ {
+ \begin{center}
+ \bool_if:NTF \l__thmbox_bool
+ {
+ \tcbox[
+ exersty,
+ colback = #2,colframe = black,
+ drop~fuzzy~shadow = #2,
+ IfValueT = {#5}{#5},
+ phantom =
+ \IfBooleanF{#1}
+ {
+ \CTEX@ifnametrue
+ \refstepcounter{section}
+ \markright{\CTEXthesection\hspace{0.5\ccwd}#4}
+ \CTEX@addtocline{section}{#4}
+ }
+ ]{\IfBooleanF{#1}{\CTEXthesection\hspace{0.5\ccwd}}#4}
+ }{
+ \sffamily\Large
+ \IfBooleanF{#1}
+ {
+ \CTEX@ifnametrue
+ \refstepcounter{section}
+ \markright{\CTEXthesection\hspace{0.5\ccwd}#4}
+ \CTEX@addtocline{section}{#4}
+ \CTEXthesection\hspace{0.5\ccwd}
+ }#4
+ }
+ \end{center}
+ \begin{enumerate}[#3,labelsep = 0.5\ccwd]
+ #6
+ \end{enumerate}
+ }{}
+ \DeclareTColorBox{mybox}{sO{MintCream}d()O{}}
{
enhanced~jigsaw,pad~at~break* = 3pt,
- opacityback = 0,
- colframe = ctex@emph,
+ IfBooleanTF = {#1}{colback = #2}{opacityback = 0,colframe = ctex@emph},
+ IfValueT = {#3}{title = #3},
+ coltitle = black,colbacktitle = white,
+ fonttitle = \sffamily,
left = .2pc,right = .2pc,top = .5pc,bottom = .5pc,middle= .5pc,
- arc = 0pt
- },
- outlinesty/.style =
+ arc = 0pt,
+ toptitle = 2pt,bottomtitle = 2pt,
+ beforeafter~skip=2ex,
+ halign~upper = left,halign~lower = left,
+ center~title,#4
+ }
+ \DeclareTotalTCBox{\fuzzy}{O{DarkSeaGreen}vO{}}
{
- enhanced,nofloat,
- tikznode~boxed~title,
- interior~style = white,colframe = ctex@emph,
- colbacktitle = white,coltitle = ctex@emph,
- fonttitle = \large\sffamily,fontupper = \itshape,
- boxed~title~style = {size = normal,opacityframe = 0,boxrule = 0pt},
- attach~boxed~title~to~top~center = {yshift = -\tcboxedtitleheight/2},
- arc = 3pt,
- after~skip = 3ex,
- left = 1.5pc,right = 1.5pc,top = 1pc,bottom = 0.5pc,
- boxsep = 5pt
- },
- exersty/.style =
+ nobeforeafter,tcbox~raise~base,
+ blank,fuzzy~halo = 2pt~with~#1,#3
+ }{#2}
+ \DeclareTotalTCBox{\concise}{O{Aqua}vO{}}
{
- enhanced,on~line,
- arc = 5pt,
- fontupper = \sffamily\Large,
- boxrule = 1pt,boxsep = 0pt,
- left = 6pt,right = 6pt,top = 3.5pt,bottom = 3.5pt,
- before~skip = 4ex,after~skip = 2.25ex
- },
- breakable,
- boxrule = \l__rule_width_dim
+ nobeforeafter,tcbox~raise~base,
+ top = 2pt,bottom = 2.5pt,left = 2pt,right = 2pt,
+ boxsep = 0pt,boxrule = 0.75pt,arc = 1pt,
+ colback = #1!15!white,#3
+ }{#2}
}
\ctex_at_end_preamble:n
{
\bool_if:NT \l__thmbox_bool
{
- \tcolorboxenvironment{theorem}{thmsty}
- \tcolorboxenvironment{definition}{thmsty}
- \tcolorboxenvironment{lemma}{thmsty}
- \tcolorboxenvironment{corollary}{thmsty}
- \tcolorboxenvironment{proposition}{thmsty}
- \tcolorboxenvironment{example}{thmsty}
+ \@ifpackageloaded{tcolorbox}
+ {
+ \tcolorboxenvironment{theorem}{thmsty}
+ \tcolorboxenvironment{definition}{thmsty}
+ \tcolorboxenvironment{lemma}{thmsty}
+ \tcolorboxenvironment{corollary}{thmsty}
+ \tcolorboxenvironment{proposition}{thmsty}
+ \tcolorboxenvironment{example}{thmsty}
+ }{}
}
}
-\NewDocumentEnvironment{outline}{O{\abstractname}o}
- {
- \begin{tcolorbox}[outlinesty,title = #1,IfValueT = {#2}{#2}]
- \begin{outlinelist}
- }{
- \end{outlinelist}
- \end{tcolorbox}
- }
-\NewDocumentEnvironment{exercise}{sO{LightYellow}O{1.}O{\c__name_exercise_tl}o}
- {
- \begin{center}
- \bool_if:NTF \l__thmbox_bool
- {
- \tcbox[
- exersty,
- colback = #2,colframe = black,
- drop~fuzzy~shadow = #2,
- IfValueT = {#5}{#5},
- phantom =
- \IfBooleanF{#1}
- {
- \CTEX@ifnametrue
- \refstepcounter{section}
- \markright{\CTEXthesection\hspace{0.5\ccwd}#4}
- \CTEX@addtocline{section}{#4}
- }
- ]{\IfBooleanF{#1}{\CTEXthesection\hspace{0.5\ccwd}}#4}
- }{
- \sffamily\Large
- \IfBooleanF{#1}
- {
- \CTEX@ifnametrue
- \refstepcounter{section}
- \markright{\CTEXthesection\hspace{0.5\ccwd}#4}
- \CTEX@addtocline{section}{#4}
- \CTEXthesection\hspace{0.5\ccwd}
- }#4
- }
- \end{center}
- \begin{compactenum}[#3]
- }{
- \end{compactenum}
- }
-\DeclareTColorBox{mybox}{soO{MintCream}O{}}
- {
- enhanced~jigsaw,pad~at~break* = 3pt,
- IfBooleanTF = {#1}{colback = #3}{opacityback = 0,colframe = ctex@emph},
- IfValueT = {#2}{title = #2},
- coltitle = black,colbacktitle = white,
- fonttitle = \sffamily,
- left = .2pc,right = .2pc,top = .5pc,bottom = .5pc,middle= .5pc,
- arc = 0pt,
- toptitle = 2pt,bottomtitle = 2pt,
- beforeafter~skip=2ex,
- halign~upper = left,halign~lower = left,
- center~title,#4
- }
-\DeclareTotalTCBox{\fuzzy}{O{DarkSeaGreen}vO{}}
- {
- nobeforeafter,tcbox~raise~base,
- blank,fuzzy~halo = 2pt~with~#1,#3
- }{#2}
-\DeclareTotalTCBox{\concise}{O{Aqua}vO{}}
- {
- nobeforeafter,tcbox~raise~base,
- top = 2pt,bottom = 2.5pt,left = 2pt,right = 2pt,
- boxsep = 0pt,boxrule = 0.75pt,arc = 1pt,
- colback = #1!15!white,#3
- }{#2}
\bool_set_true:N \l__backend_bibtex_bool
\tl_new:N \l__bib_style_tl
diff --git a/macros/latex/contrib/graphics-def/README.md b/macros/latex/contrib/graphics-def/README.md
index f97f5793ea..53dbcadf52 100644
--- a/macros/latex/contrib/graphics-def/README.md
+++ b/macros/latex/contrib/graphics-def/README.md
@@ -1,7 +1,7 @@
LaTeX support for color and graphics
====================================
-Release 2021-02-26
+Release 2021-03-18
This bundle contains the 'engine-dependent' part of support for
color and graphics in LaTeX2e (the code here will also function
diff --git a/macros/latex/contrib/graphics-def/dvipdfmx.def b/macros/latex/contrib/graphics-def/dvipdfmx.def
index a8ebdad500..0d73189fe2 100644
--- a/macros/latex/contrib/graphics-def/dvipdfmx.def
+++ b/macros/latex/contrib/graphics-def/dvipdfmx.def
@@ -17,7 +17,7 @@
%% https://github.com/latex3/graphics-def/issues
%%
\ProvidesFile{dvipdfmx.def}
- [2021/03/02 v5.0i Graphics/color driver for dvipdfmx]
+ [2021/03/18 v5.0j Graphics/color driver for dvipdfmx]
\def\GPT@space{ }
\def\c@lor@arg#1{%
\dimen@#1\p@
@@ -260,8 +260,7 @@
\def\Gin@extensions{% order here is like xetex.def, except for PS
.pdf,.PDF,.ai,.AI,%
.png,.PNG,.jpg,.JPG,.jpeg,.JPEG,.jp2,.JP2,.jpf,.JPF,.bmp,.BMP,%
- .ps,.PS,.eps,.EPS,.mps,.MPS,%
- .pz,.eps.Z,.ps.Z,.ps.gz,.eps.gz}
+ .ps,.PS,.eps,.EPS,.mps,.MPS}
%
\@namedef{Gin@rule@.pdf}#1{{pdf}{.xbb}{#1}}
\@namedef{Gin@rule@.PDF}#1{{pdf}{.xbb}{#1}}
@@ -301,12 +300,6 @@
%
\@namedef{Gin@rule@.mps}#1{{mps}{.mps}{#1}}
\@namedef{Gin@rule@.MPS}#1{{mps}{.mps}{#1}}
-% (don't bother with uppercase versions for these Unixish extensions)
-\@namedef{Gin@rule@.pz}#1{{eps}{.xbb}{`gunzip -c #1}}
-\@namedef{Gin@rule@.eps.Z}#1{{eps}{.eps.xbb}{`gunzip -c #1}}
-\@namedef{Gin@rule@.ps.Z}#1{{eps}{.ps.xbb}{`gunzip -c #1}}
-\@namedef{Gin@rule@.ps.gz}#1{{eps}{.ps.xbb}{`gunzip -c #1}}
-\@namedef{Gin@rule@.eps.gz}#1{{eps}{.eps.xbb}{`gunzip -c #1}}
%
\@namedef{Gin@rule@*}#1{{eps}{\Gin@ext}{#1}}
\@ifundefined{ifGin@setpagesize}
@@ -336,6 +329,8 @@
}
\fi
\fi
+% Disable use of new multiple stacks pending further testing
+\endinput
% Updates for newer dvipdfmx versions
% Loaded last as we can then bail-out if not required
\begingroup
@@ -409,3 +404,24 @@
\def\reset@color{%
\special{pdfcolorstack \@pdfcolorstack pop}%
}
+% Reinsert stack color to over-ride built-in reinsertion of pdf:bc color
+\def\Grot@end{\special{pdf:etrans}\special{pdfcolorstack \@pdfcolorstack current}}
+\let\Gscale@end\Grot@end
+\def\GPT@clipbox#1{%
+ \setbox#1=\hbox{%
+ \Gin@defaultbp\WIDTH{\wd#1}%
+ \Gin@defaultbp\DEPTH{\dp#1}%
+ \@tempdima\ht#1%
+ \advance\@tempdima\dp#1%
+ \Gin@defaultbp\TOTALHEIGHT{\@tempdima}%
+ \special{x:gsave}%
+ \special{%
+ pdf:literal
+ 0 -\DEPTH\GPT@space \WIDTH\GPT@space \TOTALHEIGHT\GPT@space re W n
+ }%
+ \rlap{\box#1}%
+ \special{x:grestore}%
+ \special{pdfcolorstack \@pdfcolorstack current}%
+ \hskip\wd#1%
+ }%
+}
diff --git a/macros/latex/contrib/graphics-def/xetex.def b/macros/latex/contrib/graphics-def/xetex.def
index 25dd2cefa0..ba109f78aa 100644
--- a/macros/latex/contrib/graphics-def/xetex.def
+++ b/macros/latex/contrib/graphics-def/xetex.def
@@ -17,7 +17,7 @@
%% https://github.com/latex3/graphics-def/issues
%%
\ProvidesFile{xetex.def}
- [2021/03/02 v5.0j Graphics/color driver for xetex]
+ [2021/03/18 v5.0k Graphics/color driver for xetex]
\def\GPT@space{ }
\def\c@lor@arg#1{%
\dimen@#1\p@
@@ -84,7 +84,7 @@
background \current@color}}
\def\define@color@named#1#2{%
\expandafter\let\csname col@#1\endcsname\@nnil}
-% white is special cased as "no bacground color" by dvipdfmx
+% white is special cased as "no background color" by dvipdfmx
\def\no@page@color{\special{background gray 1}}
\@ifundefined{Gin@decode}
{\let\Gin@decode\@empty}
@@ -354,8 +354,7 @@
\def\Gin@extensions{% order here is like pdftex.def, except for PS
.pdf,.PDF,.ai,.AI,%
.png,.PNG,.jpg,.JPG,.jpeg,.JPEG,.jp2,.JP2,.jpf,.JPF,.bmp,.BMP,%
- .ps,.PS,.eps,.EPS,.mps,.MPS,%
- .pz,.eps.Z,.ps.Z,.ps.gz,.eps.gz}
+ .ps,.PS,.eps,.EPS,.mps,.MPS}
%
\@namedef{Gin@rule@.pdf}#1{{pdf}{.xbb}{#1}}
\@namedef{Gin@rule@.PDF}#1{{pdf}{.xbb}{#1}}
@@ -395,12 +394,6 @@
%
\@namedef{Gin@rule@.mps}#1{{mps}{.mps}{#1}}
\@namedef{Gin@rule@.MPS}#1{{mps}{.mps}{#1}}
-% (don't bother with uppercase versions for these Unixish extensions)
-\@namedef{Gin@rule@.pz}#1{{eps}{.xbb}{`gunzip -c #1}}
-\@namedef{Gin@rule@.eps.Z}#1{{eps}{.eps.xbb}{`gunzip -c #1}}
-\@namedef{Gin@rule@.ps.Z}#1{{eps}{.ps.xbb}{`gunzip -c #1}}
-\@namedef{Gin@rule@.ps.gz}#1{{eps}{.ps.xbb}{`gunzip -c #1}}
-\@namedef{Gin@rule@.eps.gz}#1{{eps}{.eps.xbb}{`gunzip -c #1}}
%
\@namedef{Gin@rule@*}#1{{eps}{\Gin@ext}{#1}}
\@ifundefined{ifGin@setpagesize}
@@ -435,6 +428,8 @@
}
\fi
\fi
+% Disable use of new multiple stacks pending further testing
+\endinput
% Updates for newer dvipdfmx versions
% Loaded last as we can then bail-out if not required
\begingroup
@@ -508,3 +503,24 @@
\def\reset@color{%
\special{pdfcolorstack \@pdfcolorstack pop}%
}
+% Reinsert stack color to over-ride built-in reinsertion of pdf:bc color
+\def\Grot@end{\special{pdf:etrans}\special{pdfcolorstack \@pdfcolorstack current}}
+\let\Gscale@end\Grot@end
+\def\GPT@clipbox#1{%
+ \setbox#1=\hbox{%
+ \Gin@defaultbp\WIDTH{\wd#1}%
+ \Gin@defaultbp\DEPTH{\dp#1}%
+ \@tempdima\ht#1%
+ \advance\@tempdima\dp#1%
+ \Gin@defaultbp\TOTALHEIGHT{\@tempdima}%
+ \special{x:gsave}%
+ \special{%
+ pdf:literal
+ 0 -\DEPTH\GPT@space \WIDTH\GPT@space \TOTALHEIGHT\GPT@space re W n
+ }%
+ \rlap{\box#1}%
+ \special{x:grestore}%
+ \special{pdfcolorstack \@pdfcolorstack current}%
+ \hskip\wd#1%
+ }%
+}
diff --git a/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf b/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
index 0238567ab0..5e74a7620b 100644
--- a/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
+++ b/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/profcollege/latex/ProfCollege.sty b/macros/latex/contrib/profcollege/latex/ProfCollege.sty
index 215caf5503..c706dd53c5 100644
--- a/macros/latex/contrib/profcollege/latex/ProfCollege.sty
+++ b/macros/latex/contrib/profcollege/latex/ProfCollege.sty
@@ -3,7 +3,7 @@
% or later, see http://www.latex-project.org/lppl.txtf
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ProfCollege}[2021/03/10 v0.95 Aide pour l'utilisation de LaTeX au collège]
+\ProvidesPackage{ProfCollege}[2021/03/18 v0.96 Aide pour l'utilisation de LaTeX au collège]
\RequirePackage{verbatim}
@@ -542,8 +542,8 @@
\def\MPCalculatrice#1#2#3{
% #1 Calcul %2 réponse
\ifluatex
- \mplibforcehmode
- \begin{mplibcode}
+ \mplibforcehmode%
+ \begin{mplibcode}%
input PfC-Calculatrice;
LCD(#1)(#2)(#3);
\end{mplibcode}
@@ -554,10 +554,10 @@
\fi
}
-\setKVdefault[ClesCalculatrice]{Ecran=false,NbLignes=0}
+\setKVdefault[ClesCalculatrice]{Ecran=false,NbLignes=0,BL=0.775}
\newcommand\Calculatrice[2][]{%
- \setstackgap{L}{0.775\baselineskip}%
+ \setstackgap{L}{\useKV[ClesCalculatrice]{BL}\baselineskip}%
\useKVdefault[ClesCalculatrice]%
\setKV[ClesCalculatrice]{#1}%
\ifboolKV[ClesCalculatrice]{Ecran}{%
@@ -2256,7 +2256,7 @@
%%%
% Le théorème de Pythagore
%%%
-\setKVdefault[ClesPythagore]{Exact=false,AvantRacine=false,Racine=false,Entier=false,Egalite=false,Precision=2,Soustraction=false,Figure=false,FigureSeule=false,Angle=0,Reciproque=false,ReciColonnes=false,Faible=false,Unite=cm,EnchaineA=false,EnchaineB=false,EnchaineC=false,ValeurA=0,ValeurB=0,ValeurC=0}
+\setKVdefault[ClesPythagore]{Exact=false,AvantRacine=false,Racine=false,Entier=false,Egalite=false,Precision=2,Soustraction=false,Figure=false,FigureSeule=false,Angle=0,Reciproque=false,ReciColonnes=false,Faible=false,Unite=cm,EnchaineA=false,EnchaineB=false,EnchaineC=false,ValeurA=0,ValeurB=0,ValeurC=0,Perso=false}
% On définit les figures à utiliser
\def\MPFigurePytha#1#2#3#4#5#6{%
@@ -2438,6 +2438,8 @@
\fi
}
+\newcommand\RedactionPythagore{}
+
\newcommand{\Pythagore}[5][]{%
% #1 Paramètres sous forme de clés
% #2 Nom "complet" du triangle : ABC par exemple
@@ -2536,6 +2538,10 @@
\StrMid{#2}{1}{1}[\NomA]%
\StrMid{#2}{2}{2}[\NomB]%
\StrMid{#2}{3}{3}[\NomC]%
+ \xdef\NomTriangle{\NomA\NomB\NomC}%
+ \xdef\NomAngleDroit{\NomB}%
+ \xdef\NomSommetA{\NomA}%
+ \xdef\NomSommetC{\NomC}%
% On trace une figure ou pas ?
\ifboolKV[ClesPythagore]{FigureSeule}{%
\MPFigurePytha{\NomA}{\NomB}{\NomC}{#3}{#4}{\useKV[ClesPythagore]{Angle}}
@@ -2546,7 +2552,8 @@
\[\MPFigurePytha{\NomA}{\NomB}{\NomC}{#3}{#4}{\useKV[ClesPythagore]{Angle}}\]
\par\columnbreak\par%
% On démarre la résolution
- \ifboolKV[ClesPythagore]{Egalite}{Comme le triangle $#2$ est rectangle en $\NomB$, alors l'égalité de Pythagore est vérifiée :}{Dans le triangle $#2$ rectangle en $\NomB$, le th\'eor\`eme de Pythagore permet d'\'ecrire :%
+ \ifboolKV[ClesPythagore]{Perso}{\RedactionPythagore}{\ifboolKV[ClesPythagore]{Egalite}{Comme le triangle $#2$ est rectangle en $\NomB$, alors l'égalité de Pythagore est vérifiée :}{Dans le triangle $#2$ rectangle en $\NomB$, le th\'eor\`eme de Pythagore permet d'\'ecrire :%
+ }%
}%
\xintifboolexpr{#3<#4 || #3=#4}{%\ifnum#3<#4%
\xdef\ResultatPytha{\fpeval{round(sqrt(#3^2+#4^2),\useKV[ClesPythagore]{Precision})}}%
@@ -2578,8 +2585,8 @@
\end{multicols}
}{%
% On démarre la résolution
- \ifboolKV[ClesPythagore]{Egalite}{Comme le triangle $#2$ est rectangle en $\NomB$, alors l'égalité de Pythagore est vérifiée :}{Dans le triangle $#2$ rectangle en $\NomB$, le th\'eor\`eme de Pythagore permet d'\'ecrire :%
- }%
+ \ifboolKV[ClesPythagore]{Perso}{\RedactionPythagore}{\ifboolKV[ClesPythagore]{Egalite}{Comme le triangle $#2$ est rectangle en $\NomB$, alors l'égalité de Pythagore est vérifiée :}{Dans le triangle $#2$ rectangle en $\NomB$, le th\'eor\`eme de Pythagore permet d'\'ecrire :%
+ }}%
\xintifboolexpr{#3<#4 || #3=#4}{%\ifnum#3<#4%
\xdef\ResultatPytha{\fpeval{round(sqrt(#3^2+#4^2),\useKV[ClesPythagore]{Precision})}}%
\begin{align*}
@@ -5716,7 +5723,9 @@ vardef Positions(expr Step)=
\fi
}
-\setKVdefault[ClesTrigo]{Angle=0,Propor=false,Figure=false,FigureSeule=false,Precision=2,Unite=cm,Sinus=false,Cosinus=false,Tangente=false}%
+\setKVdefault[ClesTrigo]{Angle=0,Propor=false,Figure=false,FigureSeule=false,Precision=2,Unite=cm,Sinus=false,Cosinus=false,Tangente=false,Perso=false}%
+
+\newcommand\RedactionTrigo{}%
\newcommand\TrigoCalculs[5][]{%
\setKV[ClesTrigo]{#1}%
@@ -5729,7 +5738,16 @@ vardef Positions(expr Step)=
\StrMid{#2}{1}{1}[\NomA]%
\StrMid{#2}{2}{2}[\NomB]%
\StrMid{#2}{3}{3}[\NomC]%
- Dans le triangle $\NomA\NomB\NomC$, rectangle en $\NomB$, on a :%
+ \xdef\NomTriangle{\NomA\NomB\NomC}%
+ \xdef\NomAngleDroit{\NomB}%
+ \xdef\NomSommetA{\NomA}%
+ \xdef\NomSommetB{\NomB}%
+ \xdef\NomSommetC{\NomC}%
+ \ifboolKV[ClesTrigo]{Perso}{%
+ \RedactionTrigo%
+ }{%
+ Dans le triangle $\NomA\NomB\NomC$, rectangle en $\NomB$, on a :%
+ }%
\ifboolKV[ClesTrigo]{Cosinus}{%
\ifx\bla#3\bla%on calcule le côté adjacent
\xdef\ResultatTrigo{\fpeval{round(\fpeval{#4*cosd(#5)},\useKV[ClesTrigo]{Precision})}}%
@@ -8764,6 +8782,78 @@ Unite={},Largeur=1cm,Precision=2,Donnee=Valeurs,Effectif=Effectif,Origine=0,Angl
..Fn[k]
endfor;
\end{mplibcode}
+ \else
+ \begin{mpost}
+ x.u:=#2;
+ y.u:=#3;
+ X.u:=#4;
+ Y.u:=#5;
+ numeric dirav[],dirap[];
+ pair Fn[],Gn[];
+ n=0;
+ for p_=#1:
+ Gn[n]=p_;
+ Fn[n]=cm*(X.u*xpart(p_),Y.u*ypart(p_));
+ n:=n+1;
+ endfor;
+ N:=(n-1);
+ MinX=999;
+ MaxX=-999;
+ MinY=999;
+ MaxY=-999;
+ for k=0 upto N:
+ if xpart(Gn[k])<MinX:
+ MinX:=xpart(Gn[k]);
+ fi;
+ if xpart(Gn[k])>MaxX:
+ MaxX:=xpart(Gn[k]);
+ fi;
+ if ypart(Gn[k])<MinY:
+ MinY:=ypart(Gn[k]);
+ fi;
+ if ypart(Gn[k])>MaxY:
+ MaxY:=ypart(Gn[k]);
+ fi;
+ endfor;
+ if #6=0:
+ for k=MinY-1 step y.u until MaxY+1:
+ draw cm*((MinX-1)*X.u,k*Y.u)--cm*((MaxX+1)*X.u,k*Y.u) withcolor 0.75white;
+ endfor;
+ for k=MinX-1 step x.u until MaxX+1:
+ draw cm*(k*X.u,(MinY-1)*Y.u)--cm*(k*X.u,(MaxY+1)*Y.u) withcolor 0.75white;
+ endfor;
+ else:
+ for k=MinY-1 step y.u until MaxY+1:
+ draw cm*((MinX)*X.u,k*Y.u)--cm*((MaxX)*X.u,k*Y.u) withcolor 0.75white;
+ endfor;
+ for k=MinX step x.u until MaxX:
+ draw cm*(k*X.u,(MinY-1)*Y.u)--cm*(k*X.u,(MaxY+1)*Y.u) withcolor 0.75white;
+ endfor;
+ fi;
+ if #6=0:
+ for k=0 upto N:
+ fill cercles(Fn[k],0.5mm);
+ endfor;
+ else:
+ for k=1 upto N-1:
+ fill cercles(Fn[k],0.5mm);
+ endfor;
+ fi;
+ if #6=0:
+ drawarrow (0,(MinY-1)*Y.u*cm)--(0,(MaxY+1)*Y.u*cm);
+ drawarrow ((MinX-1)*X.u*cm,0)--((MaxX+1)*X.u*cm,0);
+ else:
+ drawarrow (0,(MinY-1)*Y.u*cm)--(0,(MaxY+1)*Y.u*cm);
+ drawarrow ((MinX)*X.u*cm,0)--((MaxX)*X.u*cm,0);
+ fi;
+ label.llft(btex O etex,(0,0));
+ dotlabel.bot(btex 1 etex,cm*X.u*(1,0));
+ dotlabel.lft(btex 1 etex,cm*Y.u*(0,1));
+ draw Fn[0]
+ for k=1 upto N:
+ ..Fn[k]
+ endfor;
+ \end{mpost}
\fi
}
@@ -8850,6 +8940,87 @@ Unite={},Largeur=1cm,Precision=2,Donnee=Valeurs,Effectif=Effectif,Origine=0,Angl
endfor
..{dir dirav[N]}Fn[N];
\end{mplibcode}
+ \else
+ \begin{mpost}
+ x.u:=#2;
+ y.u:=#3;
+ X.u:=#4;
+ Y.u:=#5;
+ numeric dirav[],dirap[];
+ pair Fn[],Gn[];
+ n=0;
+ for p_=#1:
+ if (n mod 3)=0:
+ dirav[n div 3]=p_;
+ fi;
+ if (n mod 3)=1:
+ Gn[n div 3]=p_;
+ Fn[n div 3]=cm*(X.u*xpart(p_),Y.u*ypart(p_));
+ fi;
+ if (n mod 3)=2:
+ dirap[n div 3]=p_;
+ fi;
+ n:=n+1;
+ endfor;
+ N:=(n-1) div 3;
+ MinX=999;
+ MaxX=-999;
+ MinY=999;
+ MaxY=-999;
+ for k=0 upto N:
+ if xpart(Gn[k])<MinX:
+ MinX:=xpart(Gn[k]);
+ fi;
+ if xpart(Gn[k])>MaxX:
+ MaxX:=xpart(Gn[k]);
+ fi;
+ if ypart(Gn[k])<MinY:
+ MinY:=ypart(Gn[k]);
+ fi;
+ if ypart(Gn[k])>MaxY:
+ MaxY:=ypart(Gn[k]);
+ fi;
+ endfor;
+ if #6=0:
+ for k=MinY-1 step y.u until MaxY+1:
+ draw cm*((MinX-1)*X.u,k*Y.u)--cm*((MaxX+1)*X.u,k*Y.u) withcolor 0.75white;
+ endfor;
+ for k=MinX-1 step x.u until MaxX+1:
+ draw cm*(k*X.u,(MinY-1)*Y.u)--cm*(k*X.u,(MaxY+1)*Y.u) withcolor 0.75white;
+ endfor;
+ else:
+ for k=MinY-1 step y.u until MaxY+1:
+ draw cm*((MinX)*X.u,k*Y.u)--cm*((MaxX)*X.u,k*Y.u) withcolor 0.75white;
+ endfor;
+ for k=MinX step x.u until MaxX:
+ draw cm*(k*X.u,(MinY-1)*Y.u)--cm*(k*X.u,(MaxY+1)*Y.u) withcolor 0.75white;
+ endfor;
+ fi;
+ if #6=0:
+ for k=0 upto N:
+ fill cercles(Fn[k],0.5mm);
+ endfor;
+ else:
+ for k=1 upto N-1:
+ fill cercles(Fn[k],0.5mm);
+ endfor;
+ fi;
+ if #6=0:
+ drawarrow (0,(MinY-1)*Y.u*cm)--(0,(MaxY+1)*Y.u*cm);
+ drawarrow ((MinX-1)*X.u*cm,0)--((MaxX+1)*X.u*cm,0);
+ else:
+ drawarrow (0,(MinY-1)*Y.u*cm)--(0,(MaxY+1)*Y.u*cm);
+ drawarrow ((MinX)*X.u*cm,0)--((MaxX)*X.u*cm,0);
+ fi;
+ label.llft(btex O etex,(0,0));
+ dotlabel.bot(btex 1 etex,cm*X.u*(1,0));
+ dotlabel.lft(btex 1 etex,cm*Y.u*(0,1));
+ draw Fn[0]{dir dirap[0]}
+ for k=1 upto (N-1):
+ ..{dir dirav[k]}Fn[k]{dir dirap[k]}
+ endfor
+ ..{dir dirav[N]}Fn[N];
+ \end{mpost}
\fi
}
@@ -13039,4 +13210,73 @@ Unite={},Largeur=1cm,Precision=2,Donnee=Valeurs,Effectif=Effectif,Origine=0,Angl
\end{MyDominoMini}%
}%
}%
-}% \ No newline at end of file
+}%
+
+%%%%
+% Prog de calculs "simples"
+%%%%
+\setKVdefault[ClesProg]{Ecart=2em,SansCalcul=false,Direct=true}
+
+\newcounter{nbprog}
+\setcounter{nbprog}{0}%
+
+\newcommand\ProgCalcul[2][]{%
+ % #1 : clés
+ % #2 : étapes
+ \useKVdefault[ClesProg]%
+ \setKV[ClesProg]{#1}%
+ \setsepchar[*]{,* }\ignoreemptyitems%
+ \readlist*\ListeProg{#2}%
+ \stepcounter{nbprog}%
+ \xdef\NbDepart{\ListeProg[1]}%
+ \ifboolKV[ClesProg]{SansCalcul}{%
+ $\NbDepart$\foreachitem\compteur\in\ListeProg[2]{%
+ \hspace{0.2em}\tikzmark{A-\thenbprog-\compteurcnt}\hspace{\useKV[ClesProg]{Ecart}}\tikzmark{B-\thenbprog-\compteurcnt}\hspace{0.2em}$\ListeProg[3,\compteurcnt]$%
+ }%
+ \begin{tikzpicture}[remember picture, overlay]
+ \foreachitem\compteur\in\ListeProg[2]{%
+ \edef\Test{\ListeProg[2,\compteurcnt]}
+ \expandarg%
+ \StrSubstitute{\Test}{^}{\empty\dots{}^}[\tempa]
+ \StrSubstitute{\tempa}{**}{^}[\tempab]
+ \StrSubstitute{\tempab}{*}{\times}[\tempac]
+ \StrSubstitute{\tempac}{/}{\div}[\tempad]
+ \draw[-stealth,transform canvas={yshift=0.25em}] (pic cs:A-\thenbprog-\compteurcnt) --
+ node[above]{\scriptsize$\tempad$}(pic cs:B-\thenbprog-\compteurcnt);
+ }
+ \end{tikzpicture}
+ }{%
+ \num{\NbDepart}\foreachitem\compteur\in\ListeProg[2]{%
+ \hspace{0.2em}\tikzmark{A-\thenbprog-\compteurcnt}\hspace{\useKV[ClesProg]{Ecart}}\tikzmark{B-\thenbprog-\compteurcnt}\xdef\NbDepart{\fpeval{(\NbDepart)\ListeProg[2,\compteurcnt]}}\hspace{0.2em}\num{\NbDepart}%
+ }%
+ \ifboolKV[ClesProg]{Direct}{%
+ \begin{tikzpicture}[remember picture, overlay]
+ \foreachitem\compteur\in\ListeProg[2]{%
+ \edef\Test{\ListeProg[2,\compteurcnt]}
+ \expandarg%
+ \StrSubstitute{\Test}{^}{\empty\dots{}^}[\tempa]
+ \StrSubstitute{\tempa}{**}{^}[\tempab]
+ \StrSubstitute{\tempab}{*}{\times}[\tempac]
+ \StrSubstitute{\tempac}{/}{\div}[\tempad]
+ \draw[-stealth,transform canvas={yshift=0.25em}] (pic cs:A-\thenbprog-\compteurcnt) --
+ node[above]{\scriptsize$\tempad$}(pic
+ cs:B-\thenbprog-\compteurcnt);
+ }
+ \end{tikzpicture}
+ }{%
+ \begin{tikzpicture}[remember picture, overlay]
+ \foreachitem\compteur\in\ListeProg[2]{%
+ \edef\Test{\ListeProg[2,\compteurcnt]}
+ \expandarg%
+ \StrSubstitute{\Test}{^2}{\empty\sqrt{\dots{}}}[\tempa]
+ \StrSubstitute{\tempa}{**}{^}[\tempab]
+ \StrSubstitute{\tempab}{*}{\div}[\tempac]
+ \StrSubstitute{\tempac}{/}{\times}[\tempad]
+ \StrSubstitute{\tempad}{-}{+}[\tempae]
+ \StrSubstitute{\tempae}{++}{-}[\tempaf]
+ \draw[-stealth,transform canvas={yshift=0.25em}] (pic cs:B-\thenbprog-\compteurcnt) -- node[above]{\scriptsize$\tempaf$}(pic cs:A-\thenbprog-\compteurcnt);
+ }
+ \end{tikzpicture}
+ }%
+ }%
+} \ No newline at end of file
diff --git a/macros/latex/contrib/tuda-ci/README.md b/macros/latex/contrib/tuda-ci/README.md
index 0653ce54e1..2a29ef526c 100644
--- a/macros/latex/contrib/tuda-ci/README.md
+++ b/macros/latex/contrib/tuda-ci/README.md
@@ -2,7 +2,7 @@
Copyright (C) Marei Peischl <marei@peitex.de>, 2018–2021
- tuda-ci 2021/03/16 v3.13
+ tuda-ci 2021/03/19 v3.13a
***************************************************************************
@@ -266,4 +266,6 @@ leaflets | DEMO-TUDaLeaflet.tex | tudaleaflet.cls
* v3.13 (2021-03-16)
- enhancement of tudaexercise to be more flexible to be used with exams
- convert points to a floating point variable
+ * v3.13a (2021-03-19)
+ - patch to fix the automatic reset of points=auto option (tudaexercise)
\ No newline at end of file
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf
index e72fe648c1..83a67e1605 100644
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf
+++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf
Binary files differ
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf
index 1b43044759..d00214c57f 100644
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf
+++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf
Binary files differ
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdf
index ce2b6c0c32..2e1f0e71ab 100644
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdf
+++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdf
Binary files differ
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLeaflet.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLeaflet.pdf
index 0c250fa420..062dd0b53d 100644
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLeaflet.pdf
+++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLeaflet.pdf
Binary files differ
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf
index 968f8c3b58..badedb9742 100644
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf
+++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf
Binary files differ
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf
index fb495eb615..4ac8303526 100644
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf
+++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf
Binary files differ
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf
index 5607deb898..0b5154fce3 100644
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf
+++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf
Binary files differ
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf
index 4392bf56c1..8b27ab91a8 100644
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf
+++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf
Binary files differ
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdf
index 4a964dde4c..2f4cc61bbe 100644
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdf
+++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdf
Binary files differ
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf
index 722606bbf0..3634547218 100644
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf
+++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf
Binary files differ
diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf
index b8b57d3547..6d15accbec 100644
--- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf
+++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf
Binary files differ
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex
index 8852f2211c..f59361b19e 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaAnnouncement.tex' version 3.13 (2021/03/16),
+%% This is file `DEMO-TUDaAnnouncement.tex' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex
index 168aa7ae37..dc2bd54e8a 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaBeamer.tex' version 3.13 (2021/03/16),
+%% This is file `DEMO-TUDaBeamer.tex' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib
index 3e316c2308..5c3f6bdef0 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaBibliography.bib' version 3.13 (2021/03/16),
+%% This is file `DEMO-TUDaBibliography.bib' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex
index be4e716fd6..efa5c13acc 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaExercise.tex' version 3.13 (2021/03/16),
+%% This is file `DEMO-TUDaExercise.tex' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco
index b5deeaecb5..0a11916b18 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaFromaddress.lco' version 3.13 (2021/03/16),
+%% This is file `DEMO-TUDaFromaddress.lco' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLeaflet.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLeaflet.tex
index f95704c568..5f8bd41518 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLeaflet.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLeaflet.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaLeaflet.tex' version 3.13 (2021/03/16),
+%% This is file `DEMO-TUDaLeaflet.tex' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex
index cee47fcc22..bca895f4b7 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaLetter.tex' version 3.13 (2021/03/16),
+%% This is file `DEMO-TUDaLetter.tex' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex
index c8cf27a6df..d4d92a8095 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaPhD.tex' version 3.13 (2021/03/16),
+%% This is file `DEMO-TUDaPhD.tex' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex
index 23f4c8282e..275e537c72 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaPoster.tex' version 3.13 (2021/03/16),
+%% This is file `DEMO-TUDaPoster.tex' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex
index 65e4587714..a3d26dd98a 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaPub.tex' version 3.13 (2021/03/16),
+%% This is file `DEMO-TUDaPub.tex' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex
index f923ea81b7..1f175b030a 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaReport.tex' version 3.13 (2021/03/16),
+%% This is file `DEMO-TUDaReport.tex' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex
index 0bcc907a4a..3c474a6482 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaSciPoster.tex' version 3.13 (2021/03/16),
+%% This is file `DEMO-TUDaSciPoster.tex' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex
index 52e9b50710..04365f25cb 100644
--- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex
+++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex
@@ -1,4 +1,4 @@
-%% This is file `DEMO-TUDaThesis.tex' version 3.13 (2021/03/16),
+%% This is file `DEMO-TUDaThesis.tex' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty
index 8293ce8e43..a20e86d8a6 100644
--- a/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty
+++ b/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamercolorthemeTUDa.sty' version 3.13 (2021/03/16),
+%% This is file `beamercolorthemeTUDa.sty' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.13}
-\def\filedate{2021/03/16}
+\def\fileversion{3.13a}
+\def\filedate{2021/03/19}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{beamercolorthemeTUDa}
[\filedate\space\fileversion]
diff --git a/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty
index 3e4d20a20f..3c591d91d9 100644
--- a/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty
+++ b/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerfontthemeTUDa.sty' version 3.13 (2021/03/16),
+%% This is file `beamerfontthemeTUDa.sty' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.13}
-\def\filedate{2021/03/16}
+\def\fileversion{3.13a}
+\def\filedate{2021/03/19}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{beamerfontthemeTUDa}
[\filedate\space\fileversion]
diff --git a/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty
index ddc9a8571a..4c113d8943 100644
--- a/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty
+++ b/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerinnerthemeTUDa.sty' version 3.13 (2021/03/16),
+%% This is file `beamerinnerthemeTUDa.sty' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.13}
-\def\filedate{2021/03/16}
+\def\fileversion{3.13a}
+\def\filedate{2021/03/19}
\NeedsTeXFormat{LaTeX2e}
\ProvidesExplPackage{beamerinnerthemeTUDa}{\filedate}{\fileversion}{Inner~beamer~theme~of~tuda-ci}
diff --git a/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty
index 341de964a0..2c9cb53679 100644
--- a/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty
+++ b/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerouterthemeTUDa.sty' version 3.13 (2021/03/16),
+%% This is file `beamerouterthemeTUDa.sty' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.13}
-\def\filedate{2021/03/16}
+\def\fileversion{3.13a}
+\def\filedate{2021/03/19}
\NeedsTeXFormat{LaTeX2e}
\ProvidesExplPackage{beamerouterthemeTUDa}{\filedate}{\fileversion}{Outer~beamer~theme~of~tuda-ci}
diff --git a/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa-mecheng.sty b/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa-mecheng.sty
index fec0470d92..62f6bbd109 100644
--- a/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa-mecheng.sty
+++ b/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa-mecheng.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerthemeTUDa-mecheng.sty' version 3.13 (2021/03/16),
+%% This is file `beamerthemeTUDa-mecheng.sty' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.13}
-\def\filedate{2021/03/16}
+\def\fileversion{3.13a}
+\def\filedate{2021/03/19}
\RequirePackage{expl3}
\ProvidesExplPackage{beamerthemeTUDa-mecheng}{\filedate}{\fileversion}{specific tudabeamer configuration for the department of mechanical engineering}
diff --git a/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty
index ce1f21b228..1b8032c0ef 100644
--- a/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty
+++ b/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty
@@ -1,4 +1,4 @@
-%% This is file `beamerthemeTUDa.sty' version 3.13 (2021/03/16),
+%% This is file `beamerthemeTUDa.sty' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.13}
-\def\filedate{2021/03/16}
+\def\fileversion{3.13a}
+\def\filedate{2021/03/19}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{beamerthemeTUDa}
[\filedate\space\fileversion\space beamer theme using the Corporate Design of TU Darmstadt]
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo
index f0c6be9068..139baded6c 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a0paper.clo' version 3.13 (2021/03/16),
+%% This is file `tuda-a0paper.clo' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.13}
-\def\filedate{2021/03/16}
+\def\fileversion{3.13a}
+\def\filedate{2021/03/19}
\ProvidesExplFile{tuda-a0paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a0paper}
\cs_set:Nn \ptxcd_setup_title_sizes: {
\cs_set:Nn \ptxcd_title_fontsize: {{125pt}{165pt}}
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo
index 7501b3832d..f521c1c7b5 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a1paper.clo' version 3.13 (2021/03/16),
+%% This is file `tuda-a1paper.clo' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.13}
-\def\filedate{2021/03/16}
+\def\fileversion{3.13a}
+\def\filedate{2021/03/19}
\ProvidesExplFile{tuda-a1paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a0paper}
\cs_set:Nn \ptxcd_setup_title_sizes: {
\cs_set:Nn \ptxcd_title_fontsize: {{86pt}{120pt}}
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo
index 23ad5ed2ce..6a57d509e0 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a2paper.clo' version 3.13 (2021/03/16),
+%% This is file `tuda-a2paper.clo' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.13}
-\def\filedate{2021/03/16}
+\def\fileversion{3.13a}
+\def\filedate{2021/03/19}
\ProvidesExplFile{tuda-a2paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a0paper}
\cs_set:Nn \ptxcd_setup_title_sizes: {
\cs_set:Nn \ptxcd_title_fontsize: {{65pt}{82pt}}
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo
index bf4ac89315..f0c983ff3c 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a3paper.clo' version 3.13 (2021/03/16),
+%% This is file `tuda-a3paper.clo' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.13}
-\def\filedate{2021/03/16}
+\def\fileversion{3.13a}
+\def\filedate{2021/03/19}
\ProvidesExplFile{tuda-a3paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a3paper}
\cs_set:Nn \ptxcd_setup_title_sizes: {
\cs_set:Nn \ptxcd_title_fontsize: {{47pt}{61pt}}
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo
index dc5559281b..ab0aa99b87 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a4paper.clo' version 3.13 (2021/03/16),
+%% This is file `tuda-a4paper.clo' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.13}
-\def\filedate{2021/03/16}
+\def\fileversion{3.13a}
+\def\filedate{2021/03/19}
\ProvidesExplFile{tuda-a4paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a4paper}
\cs_set:Nn \ptxcd_setup_title_sizes: {
\cs_set:Nn \ptxcd_title_fontsize: {{36pt}{47pt}}
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo
index 20ad91d1bc..73afb902c2 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo
@@ -1,4 +1,4 @@
-%% This is file `tuda-a5paper.clo' version 3.13 (2021/03/16),
+%% This is file `tuda-a5paper.clo' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.13}
-\def\filedate{2021/03/16}
+\def\fileversion{3.13a}
+\def\filedate{2021/03/19}
\ProvidesExplFile{tuda-a5paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a5paper}
\cs_set:Nn \ptxcd_setup_title_sizes: {
\cs_set:Nn \ptxcd_title_fontsize: {{22pt}{28pt}}
diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty b/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty
index a26051caa4..df968de505 100644
--- a/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty
+++ b/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty
@@ -1,4 +1,4 @@
-%% This is file `tuda-pgfplots.sty' version 3.13 (2021/03/16),
+%% This is file `tuda-pgfplots.sty' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.13}
-\def\filedate{2021/03/16}
+\def\fileversion{3.13a}
+\def\filedate{2021/03/19}
% Special thanks to: Sebastian Schöps Institut Theorie Elektromagnetischer Felder (TEMF), TU Darmstadt
% The original version of this file has been inspired by the colorscheme in the Metropolis beamer theme by Matthias Vogelgesang https://github.com/matze/mtheme
\ProvidesPackage{tuda-pgfplots}[\filedate\space\fileversion\space tuda-ci pgfplots color schemes]
diff --git a/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls b/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls
index 3ed55f9488..27257ec199 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls
@@ -1,4 +1,4 @@
-%% This is file `tudabeamer.cls' version 3.13 (2021/03/16),
+%% This is file `tudabeamer.cls' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.13}
-\def\filedate{2021/03/16}
+\def\fileversion{3.13a}
+\def\filedate{2021/03/19}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{tudabeamer}
[\filedate\space\fileversion\space]
diff --git a/macros/latex/contrib/tuda-ci/tex/tudacolors.def b/macros/latex/contrib/tuda-ci/tex/tudacolors.def
index 43c525207c..c4a6ada6ba 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudacolors.def
+++ b/macros/latex/contrib/tuda-ci/tex/tudacolors.def
@@ -1,4 +1,4 @@
-%% This is file `tudacolors.def' version 3.13 (2021/03/16),
+%% This is file `tudacolors.def' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.13}
-\def\filedate{2021/03/16}
+\def\fileversion{3.13a}
+\def\filedate{2021/03/19}
\ProvidesFile{tudacolors.def}
[\filedate\space\fileversion\space Color definitions for tuda-ci]
diff --git a/macros/latex/contrib/tuda-ci/tex/tudacolors.sty b/macros/latex/contrib/tuda-ci/tex/tudacolors.sty
index b94d84e8c4..d080197bf3 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudacolors.sty
+++ b/macros/latex/contrib/tuda-ci/tex/tudacolors.sty
@@ -1,4 +1,4 @@
-%% This is file `tudacolors.sty' version 3.13 (2021/03/16),
+%% This is file `tudacolors.sty' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.13}
-\def\filedate{2021/03/16}
+\def\fileversion{3.13a}
+\def\filedate{2021/03/19}
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplPackage{tudacolors}{\filedate}{\fileversion}{Color definition for TU Darmstadt's tuda-ci bundle}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls b/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls
index 2f7af0470f..778bbc9508 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls
@@ -1,4 +1,4 @@
-%% This is file `tudaexercise.cls' version 3.13 (2021/03/16),
+%% This is file `tudaexercise.cls' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.13}
-\def\filedate{2021/03/16}
+\def\fileversion{3.13a}
+\def\filedate{2021/03/19}
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplClass{tudaexercise}
@@ -226,11 +226,9 @@
points / auto .code:n =
\bool_set_true:N \l__ptxcd_points_auto_bool,
points / unknown .code:n = \fp_set:Nn \l_ptxcd_ex_task_points_fp {#1}
- \bool_set_false:N \l__ptxcd_points_auto_bool,
- points .initial:n = 0,
+ \bool_set_false:N \l__ptxcd_points_auto_bool,
credit .code:n = \tl_set:Nn \l_ptxcd_ex_task_credit_tl {#1}
\bool_set_false:N \l__ptxcd_points_auto_bool,
- credit .initial:n =,
solution .meta:nn ={ptxcd/exercise}{solution=#1},
}
@@ -240,7 +238,6 @@
credit .initial:n =,
points .code:n = \fp_set:Nn \l_ptxcd_ex_subtask_points_fp {#1}
\bool_set_false:N \l__ptxcd_points_auto_bool,
- points .initial:n = 0,
title .tl_set:N = \l_ptxcd_ex_title_tl,
title .initial:n =,
unknown .code:n = \bool_set_true:N \l_ptxcd_ex_subtask_fallback_bool \tl_clear:N \l_ptxcd_ex_subtask_credit_tl \fp_zero:N \l_ptxcd_ex_subtask_points_fp,
diff --git a/macros/latex/contrib/tuda-ci/tex/tudafonts.sty b/macros/latex/contrib/tuda-ci/tex/tudafonts.sty
index 31ef304f4a..a0281b6297 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudafonts.sty
+++ b/macros/latex/contrib/tuda-ci/tex/tudafonts.sty
@@ -1,4 +1,4 @@
-%% This is file `tudafonts.sty' version 3.13 (2021/03/16),
+%% This is file `tudafonts.sty' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.13}
-\def\filedate{2021/03/16}
+\def\fileversion{3.13a}
+\def\filedate{2021/03/19}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{tudafonts}
[\filedate\space\fileversion\space
diff --git a/macros/latex/contrib/tuda-ci/tex/tudaleaflet.cls b/macros/latex/contrib/tuda-ci/tex/tudaleaflet.cls
index 04d3f39512..42aee5ebff 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudaleaflet.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudaleaflet.cls
@@ -1,4 +1,4 @@
-%% This is file `tudaleaflet.cls' version 3.13 (2021/03/16),
+%% This is file `tudaleaflet.cls' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.13}
-\def\filedate{2021/03/16}
+\def\fileversion{3.13a}
+\def\filedate{2021/03/19}
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplPackage{tudaleaflet}{\filedate}{\fileversion}{Leaflets using the Corporate Design of TU Darmstadt}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudaletter.cls b/macros/latex/contrib/tuda-ci/tex/tudaletter.cls
index 06617572b5..79560854e5 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudaletter.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudaletter.cls
@@ -1,4 +1,4 @@
-%% This is file `tudaletter.cls' version 3.13 (2021/03/16),
+%% This is file `tudaletter.cls' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.13}
-\def\filedate{2021/03/16}
+\def\fileversion{3.13a}
+\def\filedate{2021/03/19}
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplClass{tudaletter}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo b/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo
index 5e863de126..965cec6cac 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo
@@ -1,4 +1,4 @@
-%% This is file `tudalettersize10pt.clo' version 3.13 (2021/03/16),
+%% This is file `tudalettersize10pt.clo' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg b/macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg
index 1a1f53aca2..c9c60cdcf7 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg
+++ b/macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg
@@ -1,4 +1,4 @@
-%% This is file `tudamecheng.cfg' version 3.13 (2021/03/16),
+%% This is file `tudamecheng.cfg' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.13}
-\def\filedate{2021/03/16}
+\def\fileversion{3.13a}
+\def\filedate{2021/03/19}
\RequirePackage{expl3}
\ProvidesExplFile{tudamecheng.cfg}
{\filedate}{\fileversion}{Special Features the department of mechanical engineering of Darmstadt's Corporate Design (tuda-ci)}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudaposter.cls b/macros/latex/contrib/tuda-ci/tex/tudaposter.cls
index bd3f85cf22..2cb3003ace 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudaposter.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudaposter.cls
@@ -1,4 +1,4 @@
-%% This is file `tudaposter.cls' version 3.13 (2021/03/16),
+%% This is file `tudaposter.cls' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.13}
-\def\filedate{2021/03/16}
+\def\fileversion{3.13a}
+\def\filedate{2021/03/19}
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplPackage{tudaposter}{\filedate}{\fileversion}{Poster Layouts for the Corporate Design of TU Darmstadt}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudapub.cls b/macros/latex/contrib/tuda-ci/tex/tudapub.cls
index 3765e51882..a7139b4da4 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudapub.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudapub.cls
@@ -1,4 +1,4 @@
-%% This is file `tudapub.cls' version 3.13 (2021/03/16),
+%% This is file `tudapub.cls' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.13}
-\def\filedate{2021/03/16}
+\def\fileversion{3.13a}
+\def\filedate{2021/03/19}
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplClass{tudapub}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudarules.sty b/macros/latex/contrib/tuda-ci/tex/tudarules.sty
index 6c3c3f826c..bf3e14e83c 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudarules.sty
+++ b/macros/latex/contrib/tuda-ci/tex/tudarules.sty
@@ -1,4 +1,4 @@
-%% This is file `tudarules.sty' version 3.13 (2021/03/16),
+%% This is file `tudarules.sty' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.13}
-\def\filedate{2021/03/16}
+\def\fileversion{3.13a}
+\def\filedate{2021/03/19}
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplPackage{tudarules}{\filedate}{\fileversion}{Creation of colored bars for tuda-ci bundle}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls b/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls
index 7b1bfc0a98..4148fd0ca9 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls
+++ b/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls
@@ -1,4 +1,4 @@
-%% This is file `tudasciposter.cls' version 3.13 (2021/03/16),
+%% This is file `tudasciposter.cls' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.13}
-\def\filedate{2021/03/16}
+\def\fileversion{3.13a}
+\def\filedate{2021/03/19}
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\ProvidesExplPackage{tudasciposter}{\filedate}{\fileversion}{Scientific Poster Layout for TU Darmstadt}
diff --git a/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo b/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo
index adb9f88a50..68b7236324 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo
+++ b/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo
@@ -1,4 +1,4 @@
-%% This is file `tudasize9pt.clo' version 3.13 (2021/03/16),
+%% This is file `tudasize9pt.clo' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
diff --git a/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg b/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg
index e9ddbdcab1..8bfcaccf9f 100644
--- a/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg
+++ b/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg
@@ -1,4 +1,4 @@
-%% This is file `tudathesis.cfg' version 3.13 (2021/03/16),
+%% This is file `tudathesis.cfg' version 3.13a (2021/03/19),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
@@ -26,8 +26,8 @@
%%
%% ============================================================================
%%
-\def\fileversion{3.13}
-\def\filedate{2021/03/16}
+\def\fileversion{3.13a}
+\def\filedate{2021/03/19}
\RequirePackage{expl3}
\ProvidesExplFile{tudathesis.cfg}
{\filedate}{\fileversion}{Special Features for publication type 'thesis' using TU Darmstadt's Corporate Design (tuda-ci)}
diff --git a/macros/luatex/generic/luatexja/README b/macros/luatex/generic/luatexja/README
index de1f90c0a2..c8513509e7 100644
--- a/macros/luatex/generic/luatexja/README
+++ b/macros/luatex/generic/luatexja/README
@@ -1,4 +1,4 @@
-The LuaTeX-ja Package 20210214.0
+The LuaTeX-ja Package 20210319.0
--------------------------------
Copyright (c) 2011--2021 The LuaTeX-ja project
License: modified BSD (see COPYING)
@@ -26,8 +26,6 @@ Installation
- luaotfload (v3.1 or later recommended)
- adobemapping (Adobe CMap files)
- LaTeX2e 2020-02-02 patch level 5 or later (if you want to use with LaTeX)
- Note that the adaptation for LaTeX2e 2021-05-01 is
- work in progress; it will be done after the freeze of TL'20
- etoolbox package
- ltxcmds package, pdftexcmds package
- filehook package, atbegshi package (for LaTeX2e 2020-02-02)
@@ -39,14 +37,14 @@ Installation
One might be able to typeset documents without an error, but with
some unwanted results.
-1. If you are using TeX Live 2020, you can install LuaTeX-ja via tlmgr.
+1. If you are using TeX Live 2021, you can install LuaTeX-ja via tlmgr.
2. If you must/want to install manually:
a. Download the source archive from CTAN,
- or tagged as 20210214.0 in the Git repository by
+ or tagged as 20210319.0 in the Git repository by
<http://git.osdn.jp/view?p=luatex-ja/luatexja.git
- ;a=snapshot;h=refs/tags/20210214.0;sf=tgz>
+ ;a=snapshot;h=refs/tags/20210319.0;sf=tgz>
b. Extract the archive and process following three files by LuaLaTeX
to generate classes for Japanese typesetting:
@@ -91,8 +89,8 @@ Notes
* src/*.{ins.dtx} are not needed in regular use.
-* ltj-kinsoku_make.tex is removed in version 20200808.0.
+* ltj-kinsoku_make.tex is removed in version 20200808.0.
This file and ltj-kinsoku.lua are not used anymore.
(Do not remove ltj-kinsoku.tex.)
-Last commit date: Sun Feb 14 10:04:35 2021 +0900
+Last commit date: Fri Mar 19 19:52:23 2021 +0900
diff --git a/macros/luatex/generic/luatexja/doc/luatexja-en.pdf b/macros/luatex/generic/luatexja/doc/luatexja-en.pdf
index a40501866e..e0bc2215ff 100644
--- a/macros/luatex/generic/luatexja/doc/luatexja-en.pdf
+++ b/macros/luatex/generic/luatexja/doc/luatexja-en.pdf
Binary files differ
diff --git a/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf b/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf
index ee3964dc09..41f5012b67 100644
--- a/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf
+++ b/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf
Binary files differ
diff --git a/macros/luatex/generic/luatexja/doc/luatexja.dtx b/macros/luatex/generic/luatexja/doc/luatexja.dtx
index 308288dabc..7e6ccb9f42 100644
--- a/macros/luatex/generic/luatexja/doc/luatexja.dtx
+++ b/macros/luatex/generic/luatexja/doc/luatexja.dtx
@@ -25,10 +25,11 @@
\setmonofont[RawFeature=-notdef, Ligatures=CommonOff, %CharacterVariant={31,45,61,36},
%<en> Scale=0.8132073118633364, FakeStretch=1.183236,
%<ja> Scale=MatchLowercase, FakeStretch=1.137121,
- Contextuals=AlternateOff,
- ItalicFont=Iosevka Term Slab Oblique,
- BoldFont=Iosevka Term Slab Bold, BoldItalicFont=Iosevka Term Slab Bold Oblique,
-]{Iosevka Term Slab}
+ Contextuals=AlternateOff, Kerning=Off,
+ Ligatures={CommonOff,RequiredOff,ContextualOff,RareOff,HistoricOff,TeXOff},
+ ItalicFont=Iosevka Slab Oblique,
+ BoldFont=Iosevka Slab Bold, BoldItalicFont=Iosevka Slab Bold Oblique,
+]{Iosevka Slab}
\setsansfont[Scale=MatchLowercase,Ligatures=TeX,RawFeature=-notdef]{Linux Biolinum O}
\usepackage[match]{luatexja-fontspec}
\usepackage[haranoaji]{luatexja-preset}
@@ -225,7 +226,7 @@
}
\catcode`\<=13
-\def<#1>{{\normalfont\rm\itshape$\langle$#1\/$\rangle$}}
+\def<#1>{{\normalfont\rmfamily\itshape$\langle$#1\/$\rangle$}}
\let\LARG=<
\maketitle
@@ -5667,7 +5668,7 @@ The default value is \texttt{paverage}. \dots
\item[\DParam{jacharrange}\,=<ranges>]
\item[\DParam{kansujichar}\,=\{<digit>, <chr\_code>\}$^\ast$] [\cs{kansujichar}]
-\item[\DParam{direction}\,=<dir>\ \hbox{\rm (always local)}]\
+\item[\DParam{direction}\,=<dir>\ \hbox{\normalfont\rmfamily (always local)}]\
%<*en>
Assigning to this parameter has the same effect as
@@ -10458,7 +10459,7 @@ If this attempt fails, \LuaTeX-ja use the method ``\textsf{\Param{kanjiskip}~[K]
\item \textit{Np}の中身の文字コードについて,「直前への\Param{xkanjiskip}の挿入」が禁止されている
(つまり,\Param{jaxspmode}~(or \Param{alxspmode})パラメータが偶数).
\end{itemize}
-\item ユーザ側から見た\Param{xkanjiskip}パラメータの自然長が$\cs{maxdimen}=(2^{30}-1)\,{\rm sp}$で
+\item ユーザ側から見た\Param{xkanjiskip}パラメータの自然長が$\cs{maxdimen}=(2^{30}-1)\,\textrm{sp}$で
なければ,\Param{xkanjiskip}パラメータの値を持つglueを採用する.
\item 2.でない場合は,\textit{Nq}, \textit{Np}(\textsf{和文A}/\textsf{和文B}なのは片方だけ)
で使われているJFMに指定されている\Param{xkanjiskip}の値を用いる.
diff --git a/macros/luatex/generic/luatexja/src/ltj-base.sty b/macros/luatex/generic/luatexja/src/ltj-base.sty
index 622b387723..2ce01d71b1 100644
--- a/macros/luatex/generic/luatexja/src/ltj-base.sty
+++ b/macros/luatex/generic/luatexja/src/ltj-base.sty
@@ -13,7 +13,7 @@
\ifltj@in@latex %<*LaTeX>
\NeedsTeXFormat{LaTeX2e}
- \ProvidesPackage{ltj-base}[2020-08-04]
+ \ProvidesPackage{ltj-base}[2021-03-16]
\fi %</LaTeX>
%%------------------ Tiny helpers
@@ -40,17 +40,7 @@
%% \ltj@q@mark
\protected\def\ltj@q@mark{\ltj@q@mark@}
-%! etoolbox の \letcs, \cslet, \csletcs.
-%% \ltj@letcs
-\protected\def\ltj@letcs#1#2{
- \expandafter\let\expandafter#1\csname#2\endcsname
-}
-
-%% \ltj@cslet
-\protected\def\ltj@cslet#1#2{
- \expandafter\let\csname#1\endcsname#2
-}
-
+%! etoolbox の \csletcs.
%% \ltj@csletcs
\protected\def\ltj@csletcs#1#2{
\expandafter\let\csname#1\expandafter\endcsname
@@ -66,12 +56,6 @@
\else\expandafter\ltx@secondoftwo\fi
}
-%% \ltj@if@empty{<stuff>}{<yes>}{<no>}
-%! <stuff> が空であるか.
-% Checks if <stuff> is empty.
-\long\def\ltj@if@empty#1{
- \ltj@ifx{\ltj@@q@empty#1\ltj@@q@empty}
-}
\protected\def\ltj@@q@empty{\ltj@@q@empty@}
%% \ltj@if@blank{<stuff>}{<yes>}{<no>}
@@ -96,10 +80,6 @@
%! plain であるか.
\ltj@csletcs{ifltj@in@plain}{iffalse}
-%% \ltj@print{<message>}
-%! 端末への出力.
-\let\ltj@print\typeout
-
\else %<*!LaTeX>
%% \ifltj@in@plain
@@ -109,11 +89,6 @@
\ltj@csletcs{ifltj@in@plain}{iffalse}
\fi
-%% \ltj@print{<message>}
-\def\ltj@print#1{
- \immediate\write16{#1}
-}
-
\fi %</LaTeX>
%%------------------ Value-token handling
@@ -201,28 +176,6 @@
}
}
-%% \ltj@safe@real{<real>}
-%! 実数. これは十進表記に限る.
-% For a real number given in decimal notation or a macro that
-% expands to such notation.
-\def\ltj@safe@real#1{
- (tonumber("\luatexluaescapestring{#1}"))
-}
-
-%% \ltj@val@counter{<counter>}
-%! LaTeX カウンタの現在値.
-% For the current value of a LaTeX counter.
-\def\ltj@val@counter#1{
- (\expandafter\number\csname c@#1\endcsname)
-}
-
-%% \ltj@val@skip{<skip>}
-% For the current value of a skip (or LaTeX-length) parameter.
-%! グルーレジスタ(LaTeX 長さ変数).
-%! 整形式のグルー値にも使える.
-\def\ltj@val@skip#1{
- (luatexja.base.to_skip("\the\glueexpr#1\relax"))
-}
%! 整形式の整数 → 数値 : \number#1
%! 内部寸法 → 数値 : \number#1
%! 整形式の寸法 → 数値 : \number\dimexpr#1\relax
@@ -234,17 +187,6 @@
"\luatexluaescapestring{\detokenize{#1}}"
}
-%% \ltj@luaescape{<text>}
-%! 非トークン化して Lua エスケープ.
-\def\ltj@luaescape#1{
- \luatexluaescapestring{\detokenize{#1}}
-}
-%% \ltj@luaxescape{<text>}
-%! 非トークン化せずに(展開ありで) Lua エスケープ.
-%! つまり単なる \luatexescape.
-\let\ltj@luaxescape\luatexluaescapestring
-
-
%%------------------ debug logging
\ifdefined\LuaTeXjaDebugEnabled
@@ -284,30 +226,15 @@
%% \ltj@afterbox <token><box>
%% -> \setbox\ltj@afbox<box><token>
-%% from Sonja Maus, ``Looking Ahead for a <box>'',
-%% TUGBoat, 11, No. 4, 1990.
+%% idea from the atbegshi package
\newbox\ltj@afbox
\directlua{luatexja.afbox_number=\the\ltj@afbox}
\protected\def\ltj@afterbox#1{%
- \def\ltj@afb@xarg{#1}%
- \afterassignment\ltj@afb@x
- \chardef\ltj@@next`.}
-\def\ltj@afb@x{\futurelet\ltj@@next\ltj@afb@xtest}
-\def\ltj@afb@xtest{%
- \ifcase\ifx\ltj@@next\hbox\tw@\fi
- \ifx\ltj@@next\vbox\tw@\fi
- \ifx\ltj@@next\vtop\tw@\fi
- \ifx\ltj@@next\box\@ne\fi
- \ifx\ltj@@next\copy\@ne\fi
- \ifx\ltj@@next\vsplit\@ne\fi
- \ifx\ltj@@next\lastbox\@ne\fi
- 0% ``A <box> was ...'' error will be causes by \setbox later anyway.
- \or\afterassignment\ltj@afb@xarg
- \or\afterassignment\ltj@afb@xagarg
- \fi
- \setbox\ltj@afbox
+ \def\ltj@afbox@@arg{#1}\edef\ltj@afbox@@grouplevel{\number\currentgrouplevel}%
+ \afterassignment\ltj@afbox@@\setbox\ltj@afbox}
+\def\ltj@afbox@@{%
+ \ifnum\ltj@afbox@@grouplevel<\currentgrouplevel\expandafter\aftergroup\fi\ltj@afbox@@arg
}
-\def\ltj@afb@xagarg{\aftergroup\ltj@afb@xarg}
%%------------------ all done
diff --git a/macros/luatex/generic/luatexja/src/ltj-direction.lua b/macros/luatex/generic/luatexja/src/ltj-direction.lua
index 4c6c3b6bd7..47b4aec1d0 100644
--- a/macros/luatex/generic/luatexja/src/ltj-direction.lua
+++ b/macros/luatex/generic/luatexja/src/ltj-direction.lua
@@ -1113,21 +1113,18 @@ do
end
end
end
- local getbox, shipout = tex.getbox, tex.shipout
- local setbox, copy = node.direct.setbox, node.direct.copy
- local afbox
- function luatexja.direction.shipout()
+ local copy = node.direct.copy
+ function luatexja.direction.shipout_lthook (head)
start_time_measure 'box_primitive_hook'
- if (not afbox) and luatexja.afbox_number then afbox = luatexja.afbox_number end
- local a = to_direct(getbox 'ltj@afbox')
+ local a = to_direct(head)
local a_dir = get_box_dir(a, dir_yoko)
if a_dir~=dir_yoko then
local b = create_dir_node(a, a_dir, dir_yoko, false)
setfield(b, 'head', a); a = b
end
setfield(shipout_temp, 'head', a); finalize_inner(shipout_temp)
- setbox(afbox, copy(getlist(shipout_temp))); setfield(shipout_temp, 'head',nil)
- shipout(afbox)
+ a = copy(getlist(shipout_temp)); setfield(shipout_temp, 'head',nil)
stop_time_measure 'box_primitive_hook'
+ return to_node(a)
end
end
diff --git a/macros/luatex/generic/luatexja/src/ltj-kinsoku.tex b/macros/luatex/generic/luatexja/src/ltj-kinsoku.tex
index a0fd69a864..179e621054 100644
--- a/macros/luatex/generic/luatexja/src/ltj-kinsoku.tex
+++ b/macros/luatex/generic/luatexja/src/ltj-kinsoku.tex
@@ -226,6 +226,7 @@
\ltjsetparameter{alxspmode={`],postonly}}
\ltjsetparameter{alxspmode={``,preonly}}
\ltjsetparameter{alxspmode={`',postonly}}
+\ltjsetparameter{alxspmode={`:,postonly}}
\ltjsetparameter{alxspmode={`;,postonly}}
\ltjsetparameter{alxspmode={44,postonly}}
\ltjsetparameter{alxspmode={`.,postonly}}
@@ -364,6 +365,7 @@
\ltjsetparameter{jaxspmode={`。,postonly}}
\ltjsetparameter{jaxspmode={`,,postonly}}
\ltjsetparameter{jaxspmode={`.,postonly}}
+\ltjsetparameter{jaxspmode={`:,postonly}}
\ltjsetparameter{jaxspmode={`;,postonly}}
\ltjsetparameter{jaxspmode={`?,postonly}}
\ltjsetparameter{jaxspmode={`!,postonly}}
@@ -465,5 +467,5 @@
\directlua{%
local s = table.copy(luatexja.stack.charprop_stack_table[0])
- luatexja.base.save_cache('ltj-kinsoku_default', {s, version=2})
+ luatexja.base.save_cache('ltj-kinsoku_default', {s, version=3})
}
diff --git a/macros/luatex/generic/luatexja/src/ltj-latex.sty b/macros/luatex/generic/luatexja/src/ltj-latex.sty
index 213f2f7109..6517262f56 100644
--- a/macros/luatex/generic/luatexja/src/ltj-latex.sty
+++ b/macros/luatex/generic/luatexja/src/ltj-latex.sty
@@ -12,19 +12,11 @@
\def\luatexjalatexLoaded{\endinput}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ltj-latex}[2020-12-29 LaTeX support of LuaTeX-ja]
-
-% cleanup at end of the document
-%\let\ltj@@orig@end=\@@end
-%\protected\def\@@end{%
-% \directlua{luatexja.ext_cleanup()}\ltj@@orig@end}
+\ProvidesPackage{ltj-latex}[2021-03-18 LaTeX support of LuaTeX-ja]
\endlinechar=13
%%% LaTeX version detection
-\ifcsname tex_shipout:D\endcsname
- \expandafter\let\csname tex_shipout:D\endcsname\ltj@shipout
-\fi
\newif\ifltj@ltfilehook@avail
\@ifl@t@r\fmtversion{2020-10-01}{%
\@ifl@t@r\fmtversion{2020-10-02}%
@@ -34,6 +26,32 @@
\else\ltj@ltfilehook@availtrue\fi
}%
}{}
+\@ifl@t@r\fmtversion{2021-05-01}{\count@=1 }{\count@=0 }
+\ifnum \count@<1
+%%%% \shipout
+ \newluafunction\ltj@@lua@shipout@inner
+ \directlua{
+ local t = lua.get_functions_table()
+ local getbox, setbox = tex.getbox, tex.setbox
+ local shipout_lthook = luatexja.direction.shipout_lthook
+ t[\the\ltj@@lua@shipout@inner]=function ()
+ local a = shipout_lthook(getbox(\the\ltj@afbox))
+ if a then setbox(\the\ltj@afbox, a) end
+ end
+ }
+ \protected\luadef\ltj@@lua@shipout\ltj@@lua@shipout@inner
+ \def\ltj@shipout@{\ltj@@lua@shipout\primitive\shipout\box\ltj@afbox}%
+ \protected\def\ltj@shipout{\ltj@afterbox\ltj@shipout@}
+ \ifprimitive\shipout\let\shipout\ltj@shipout\fi
+ \ifcsname tex_shipout:D\endcsname
+ \expandafter\let\csname tex_shipout:D\endcsname\ltj@shipout
+ \fi
+ \directlua{luatexja.direction.shipout_lthook = nil}
+\else
+ \directlua{%
+ luatexbase.add_to_callback('pre_shipout_filter',luatexja.direction.shipout_lthook, 'ltj.direction', 1)
+ }
+\fi
%%% patch for LaTeX
\usepackage{lltjfont}
diff --git a/macros/luatex/generic/luatexja/src/ltj-plain.sty b/macros/luatex/generic/luatexja/src/ltj-plain.sty
index 58baa9ff9d..c6f976767f 100644
--- a/macros/luatex/generic/luatexja/src/ltj-plain.sty
+++ b/macros/luatex/generic/luatexja/src/ltj-plain.sty
@@ -23,10 +23,25 @@
%! ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓
% LuaTeX-ja macros against plain TeX
+%%%%\shipout
+\newluafunction\ltj@@lua@shipout@inner
+\directlua{
+ local t = lua.get_functions_table()
+ local getbox, setbox = tex.getbox, tex.setbox
+ local shipout_lthook = luatexja.direction.shipout_lthook
+ t[\the\ltj@@lua@shipout@inner]=function ()
+ local a = shipout_lthook(getbox(\the\ltj@afbox))
+ if a then setbox(\the\ltj@afbox, a) end
+ end
+}
+\protected\luadef\ltj@@lua@shipout\ltj@@lua@shipout@inner
+\def\ltj@shipout@{\ltj@@lua@shipout\primitive\shipout\box\ltj@afbox}%
+\protected\def\ltj@shipout{\ltj@afterbox\ltj@shipout@}
+\ifprimitive\shipout\let\shipout\ltj@shipout\fi
+\directlua{luatexja.direction.shipout_lthook = nil}
+
\ifdefined\ltj@stdmcfont\else\def\ltj@stdmcfont{file:HaranoAjiMincho-Regular.otf}\fi
\ifdefined\ltj@stdgtfont\else\def\ltj@stdgtfont{file:HaranoAjiGothic-Medium.otf}\fi
-%\ifdefined\ltj@stdmcfont\else\def\ltj@stdmcfont{IPAExMincho}\fi
-%\ifdefined\ltj@stdgtfont\else\def\ltj@stdgtfont{IPAExGothic}\fi
\ifdefined\ltj@stdyokojfm\else\def\ltj@stdyokojfm{ujis}\fi
\ifdefined\ltj@stdtatejfm\else\def\ltj@stdtatejfm{ujisv}\fi
\newread\ltj@@cfgread
@@ -96,9 +111,6 @@
\ltjsetparameter{jacharrange={-1, +2, +3, -4, -5, +6, +7, -8, +9}}
\directlua{for x=128,255 do luatexja.math.is_math_letters[x] = true end}
-\let\ltj@@orig@end=\@@end
-\protected\def\@@end{%
- \directlua{luatexja.ext_cleanup()}\ltj@@orig@end}
\directlua{luatexja.jfont.register_vert_replace{
[',']='、', ['.']='。', ['“']=0x301D, ['”']=0x301F,
diff --git a/macros/luatex/generic/luatexja/src/ltj-ruby.lua b/macros/luatex/generic/luatexja/src/ltj-ruby.lua
index 9824ff155a..cd8b98aa27 100644
--- a/macros/luatex/generic/luatexja/src/ltj-ruby.lua
+++ b/macros/luatex/generic/luatexja/src/ltj-ruby.lua
@@ -312,7 +312,7 @@ local function enlarge_parent(r, p, tmp_tbl, no_begin, no_end)
local intmode = floor(tmp_tbl.mode/4)%4
if no_begin then mapre = mapre + tmp_tbl.before_jfmgk end
if no_end then mapost = mapost + tmp_tbl.after_jfmgk end
- if (tmp_tbl.mode%4 >=2) and (tmp.pre<0) and (tmp.post<0) then
+ if (tmp_tbl.mode%4 >=2) and (tmp_tbl.pre<0) and (tmp_tbl.post<0) then
mapre = min(mapre,mapost); mapost = mapre
end
if intmode == 0 then -- とりあえず組んでから決める
diff --git a/macros/luatex/generic/luatexja/src/luatexja-core.sty b/macros/luatex/generic/luatexja/src/luatexja-core.sty
index e1baefbf19..3f3f102191 100644
--- a/macros/luatex/generic/luatexja/src/luatexja-core.sty
+++ b/macros/luatex/generic/luatexja/src/luatexja-core.sty
@@ -65,7 +65,7 @@
\expandafter\let\csname ifltj@in@latex\expandafter\endcsname
\csname iftrue\endcsname
\NeedsTeXFormat{LaTeX2e}
- \ProvidesPackage{luatexja-core}[2021-01-02 Core of LuaTeX-ja]
+ \ProvidesPackage{luatexja-core}[2021-03-16 Core of LuaTeX-ja]
\fi %</LaTeX>
%% Load prerequisite packages.
@@ -701,16 +701,6 @@
\ltj@@lua@raisebox\ltj@@orig@vcenter{\box\ltj@afbox}%
}
-%%%% \shipout
-\newluafunction\ltj@@lua@shipout@inner
-\directlua{
- local t = lua.get_functions_table()
- t[\the\ltj@@lua@shipout@inner]=luatexja.direction.shipout
-}
-\protected\luadef\ltj@@lua@shipout\ltj@@lua@shipout@inner
-\protected\def\ltj@shipout{\ltj@afterbox\ltj@@lua@shipout}
-\ifprimitive\shipout\let\shipout\ltj@shipout\fi
-
%%%% \unhbox and \unvbox
\newluafunction\ltj@@lua@unboxcheckdir@inner
\directlua{
diff --git a/macros/luatex/generic/luatexja/src/luatexja.lua b/macros/luatex/generic/luatexja/src/luatexja.lua
index fbda46e344..8c01db173b 100644
--- a/macros/luatex/generic/luatexja/src/luatexja.lua
+++ b/macros/luatex/generic/luatexja/src/luatexja.lua
@@ -332,11 +332,6 @@ do
ltjb.add_to_callback('hpack_filter', adjust_icflag, 'ltj.adjust_icflag', 1)
end
--- cleanup process
-function luatexja.ext_cleanup()
- ltjf.cleanup_size_cache(); ltjd.remove_end_whatsit()
-end
-
-- lastnodechar
do
local id_glyph = node.id('glyph')
@@ -356,7 +351,7 @@ do
end
do
- local cache_ver = 2 -- must be same as ltj-kinsoku.tex
+ local cache_ver = 3 -- must be same as ltj-kinsoku.tex
local cache_outdate_fn = function (t) return t.version~=cache_ver end
local t = ltjs.charprop_stack_table
function luatexja.load_kinsoku()
diff --git a/macros/luatex/generic/luatexja/src/luatexja.sty b/macros/luatex/generic/luatexja/src/luatexja.sty
index c389cf8d50..13e67dc392 100644
--- a/macros/luatex/generic/luatexja/src/luatexja.sty
+++ b/macros/luatex/generic/luatexja/src/luatexja.sty
@@ -35,13 +35,13 @@
\expandafter\let\csname ifltj@in@latex\expandafter\endcsname
\csname iftrue\endcsname
\NeedsTeXFormat{LaTeX2e}
- \ProvidesPackage{luatexja}[2021-02-14 Japanese Typesetting with Lua(La)TeX]
+ \ProvidesPackage{luatexja}[2021-03-19 Japanese Typesetting with Lua(La)TeX]
\DeclareOption{disablejfam}{\ltj@disablejfamtrue}
\DeclareOption*{}
\ProcessOptions\relax
\fi %</LaTeX>
%%%% VERSION
-\def\LuaTeXjaversion{20210214.0}
+\def\LuaTeXjaversion{20210319.0}
\directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs
diff --git a/macros/luatex/generic/luatexja/src/patches/lltjcore.sty b/macros/luatex/generic/luatexja/src/patches/lltjcore.sty
index 2af25035a5..19fe320fad 100644
--- a/macros/luatex/generic/luatexja/src/patches/lltjcore.sty
+++ b/macros/luatex/generic/luatexja/src/patches/lltjcore.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjcore}[2020-09-28 Patch to LaTeX2e Kernel for LuaTeX-ja]
+\ProvidesPackage{lltjcore}[2021-03-19 Patch to LaTeX2e Kernel for LuaTeX-ja]
\RequirePackage{etoolbox}
%%% expl3
@@ -72,7 +72,10 @@
\fi\fi}
\patchcmd\@vtryfc{\global\setbox\@outputbox\vbox{}}
- {\global\setbox\@outputbox\vbox{\unless\ifnum\ltjgetparameter{direction}=4\hskip\z@\fi}}{}{}
+ {\global\setbox\@outputbox\vbox{%
+ \unless\ifnum\ltjgetparameter{direction}=4
+ \primitive\everypar{}\hskip\z@\fi
+ }}{}{}
\newif\iftombow \tombowfalse
\newif\iftombowdate \tombowdatetrue
@@ -86,7 +89,7 @@
\newbox\@BR\newbox\@Br
\newbox\@CL
\newbox\@CR
-\font\@bannerfont=cmtt9
+\font\@bannerfont=file:lmmono9-regular.otf % cmtt9 in pLaTeX
\newtoks\@bannertoken
\@bannertoken{}
\def\maketombowbox{%
@@ -134,23 +137,23 @@
}
\def\@outputtombow{%
\iftombow
- \vbox to\z@{\kern-\dimexpr 10mm+\@tombowbleed\relax
+ \vbox to\z@{\kern\dimexpr-10mm-\@tombowbleed\relax
\boxmaxdepth\maxdimen
\moveleft\@tombowbleed\vbox to\@@paperheight{%
\color@begingroup
\@tombowcolor
\hbox to\@@paperwidth{\hskip\@tombowbleed\relax
\copy\@TL\hfill\copy\@TC\hfill\copy\@TR\hskip\@tombowbleed}%
- \kern-10mm
+ \kern-10mm%
\hbox to\@@paperwidth{\copy\@Tl\hfill\copy\@Tr}%
\vfill
\hbox to\@@paperwidth{\copy\@CL\hfill\copy\@CR}%
\vfill
\hbox to\@@paperwidth{\copy\@Bl\hfill\copy\@Br}%
- \kern-10mm
+ \kern-10mm%
\hbox to\@@paperwidth{\hskip\@tombowbleed\relax
\copy\@BL\hfill\copy\@BC\hfill\copy\@BR\hskip\@tombowbleed}%
- \color@endgroup
+ \color@endgroup
}\vss
}%
\fi
@@ -158,80 +161,45 @@
\def\@tombowcolor{\normalcolor}
\def\@tombowbleed{3mm}
\def\@tombowreset@@paper{%
- \@@topmargin\topmargin
- \iftombow
- \@@paperwidth\paperwidth
- \advance\@@paperwidth 2\dimexpr\@tombowbleed\relax
- \@@paperheight\paperheight\advance\@@paperheight 10mm\relax
- \advance\@@paperheight 2\dimexpr\@tombowbleed\relax
- \advance\@@topmargin 1in\relax \advance\@themargin 1in\relax
- \fi
+ \@@topmargin \topmargin % only for compatibility
+ \iftombow
+ \@@paperwidth\dimexpr\paperwidth+2\dimexpr\@tombowbleed\relax
+ \@@paperheight\dimexpr\paperheight+10mm+2\dimexpr\@tombowbleed\relax
+ \advance\@@topmargin 1in\relax \advance\@themargin 1in\relax
+ \fi
}
\newdimen\@@paperheight
\newdimen\@@paperwidth
-\newdimen\@@topmargin
-\def\@outputpage{%
-\begingroup % the \endgroup is put in by \aftergroup
+\newdimen\@@topmargin % not used by LuaTeX-ja; only to avoid existing codes
+\patchcmd\@outputpage{\begingroup\let\protect\noexpand}{% tate direction
+\begingroup
\ifnum\ltjgetparameter{direction}=4\else
\dimen\z@\textwidth \textwidth\textheight \textheight\dimen\z@
\fi
\let \protect \noexpand
- \language\document@default@language %LaTeX2e 2017/05/01
- \@resetactivechars
- \global\let\@@if@newlist\if@newlist
- \global\@newlistfalse
- \@parboxrestore
- \shipout\vbox{\yoko
+}{}{}
+\patchcmd\@outputpage{% supply \yoko
\set@typeset@protect
- \aftergroup\endgroup
- \aftergroup\set@typeset@protect
- \if@specialpage
- \global\@specialpagefalse\@nameuse{ps@\@specialstyle}%
- \fi
- \if@twoside
- \ifodd\count\z@ \let\@thehead\@oddhead \let\@thefoot\@oddfoot
- \ifnum\ltjgetparameter{direction}=3 \let\@themargin\evensidemargin
- \else\let\@themargin\oddsidemargin\fi
- \else \let\@thehead\@evenhead
- \let\@thefoot\@evenfoot
- \ifnum\ltjgetparameter{direction}=3 \let\@themargin\oddsidemargin
- \else\let\@themargin\evensidemargin\fi
- \fi\fi
- \@tombowreset@@paper
- \reset@font
- \normalsize
- \normalsfcodes
- \let\label\@gobble
- \let\index\@gobble
- \let\glossary\@gobble
- \baselineskip\z@skip \lineskip\z@skip \lineskiplimit\z@
- \@begindvi
- \@outputtombow
- \vskip \@@topmargin
- \moveright\@themargin\vbox{%
- \setbox\@tempboxa \vbox to\headheight{%
- \vfil
- \color@hbox
- \normalcolor
- \hb@xt@\textwidth{\@thehead}%
- \color@endbox
- }% %% 22 Feb 87
- \dp\@tempboxa \z@
- \box\@tempboxa
- \vskip \headsep
- \box\@outputbox
- \baselineskip \footskip
- \color@hbox
- \normalcolor
- \hb@xt@\textwidth{\@thefoot}%
- \color@endbox
- }%
- }%
- \global\let\if@newlist\@@if@newlist
- \global \@colht \textheight
- \stepcounter{page}%
- \let\firstmark\botmark
-}
+ \aftergroup \endgroup
+}{%
+ \yoko \set@typeset@protect
+ \aftergroup \endgroup
+}{}{}
+\patchcmd\@outputpage{\let\@thefoot\@oddfoot\let\@themargin\oddsidemargin}{% tate direction
+ \let\@thefoot\@oddfoot
+ \ifnum\ltjgetparameter{direction}=3 \let\@themargin\evensidemargin
+ \else\let\@themargin\oddsidemargin\fi
+}{}{}
+\patchcmd\@outputpage{\let\@thefoot\@evenfoot\let\@themargin\evensidemargin}{% tate direction
+ \let\@thefoot\@evenfoot
+ \ifnum\ltjgetparameter{direction}=3 \let\@themargin\oddsidemargin
+ \else\let\@themargin\evensidemargin\fi
+}{}{}
+
+% 将来は shipout hook で書き直したい
+\patchcmd\@outputpage{\vskip\topmargin}{\vskip\topmargin\iftombow\vskip1in\fi}{}{}
+\patchcmd\@outputpage{\reset@font}{\@tombowreset@@paper\reset@font}{}{}
+\patchcmd\@outputpage{\@begindvi}{\@begindvi\@outputtombow}{}{}
%%% Remove extra xkanjiskip
\renewcommand\@makefnmark{%
@@ -327,7 +295,9 @@
\@texttop
\dimen@ \dp\@outputbox
\unvbox \@outputbox
- \unless\ifnum\ltjgetparameter{direction}=4\vbox{\hskip\z@}\fi %%% LuaTeX-ja
+ \unless\ifnum\ltjgetparameter{direction}=4
+ \vbox{\primitive\everypar{}\hskip\z@}%
+ \fi %%% LuaTeX-ja
\vskip -\dimen@
\ifltj@ftn@unvboxed\iffnfixbottom\else\@textbottom\fi\else\@textbottom\fi
}%
diff --git a/macros/luatex/generic/luatexja/src/patches/lltjfont.sty b/macros/luatex/generic/luatexja/src/patches/lltjfont.sty
index 8ebe8e7af2..4932e07480 100644
--- a/macros/luatex/generic/luatexja/src/patches/lltjfont.sty
+++ b/macros/luatex/generic/luatexja/src/patches/lltjfont.sty
@@ -279,6 +279,19 @@
\def\default@k@series{#3}%
\def\default@k@shape{#4}}%
\fi}
+\@onlypreamble\DeclareKanjiSubstitution
+
+\def\DeclareErrorKanjiFont#1#2#3#4#5{%
+ \xdef\error@kfontshape{%
+ \noexpand\expandafter\noexpand\split@name\noexpand\string
+ \expandafter\noexpand\csname#1/#2/#3/#4/#5\endcsname
+ \noexpand\@nil}%
+ \gdef\default@k@family{#2}%
+ \gdef\default@k@series{#3}%
+ \gdef\default@k@shape{#4}%
+ }
+\@onlypreamble\DeclareErrorKanjiFont
+
\let\wrong@ja@fontshape\wrong@fontshape
\let\wrong@al@fontshape\wrong@fontshape
\patchcmd\wrong@ja@fontshape{\default@shape}{\default@k@shape}{}{}
@@ -291,17 +304,6 @@
\wrong@al@fontshape
\fi
}
-\@onlypreamble\DeclareKanjiSubstitution
-\def\DeclareErrorKanjiFont#1#2#3#4#5{%
- \xdef\error@kfontshape{%
- \noexpand\expandafter\noexpand\split@name\noexpand\string
- \expandafter\noexpand\csname#1/#2/#3/#4/#5\endcsname
- \noexpand\@nil}%
- \gdef\default@k@family{#2}%
- \gdef\default@k@series{#3}%
- \gdef\default@k@shape{#4}%
- }
-\@onlypreamble\DeclareErrorKanjiFont
\newif\ifltjselectfont@force@define
\def\DeclareFixedFont#1#2#3#4#5#6{%
@@ -310,16 +312,16 @@
\every@math@size{}%
\fontsize{#6}\z@
\ltj@@is@kyenc{#2}\ifin@%
- \ltjselectfont@force@definetrue
+ \ltjselectfont@force@definetrue
\usekanji{#2}{#3}{#4}{#5}%
\global\let#1\getjfont
- \ltjselectfont@force@definefalse
+ \ltjselectfont@force@definefalse
\else
\ltj@@is@ktenc{#2}\ifin@%
- \ltjselectfont@force@definetrue
+ \ltjselectfont@force@definetrue
\usekanji{#2}{#3}{#4}{#5}%
\global\let#1\gettfont
- \ltjselectfont@force@definefalse
+ \ltjselectfont@force@definefalse
\else
\useroman{#2}{#3}{#4}{#5}%
\global\expandafter\let\expandafter#1\the\font
@@ -639,7 +641,7 @@
\fi
}
\DeclareRobustCommand\fontencoding[1]{%
- \ltj@@is@kyenc{#1}\ifin@\kanjiencoding{#1}\else\romanencoding{#1}\fi}
+ \ltj@@is@kenc{#1}\ifin@\kanjiencoding{#1}\else\romanencoding{#1}\fi}
\def\@@kenc@update{%
\default@KT
\csname T@\k@encoding\endcsname
@@ -892,21 +894,13 @@
\ifnum\ltj@@latex@plv=300 % 2020-02-02 pl3, 4
\DeclareRobustCommand\romanseries[1]{\merge@font@series{#1}}
\DeclareRobustCommand\kanjiseries[1]{\merge@kanji@series{#1}}
- \DeclareRobustCommand\fontseries[1]{%
- \merge@font@series{#1}\merge@kanji@series{#1}}
\DeclareRobustCommand\romanseriesforce[1]{\edef\f@series{#1}}
\DeclareRobustCommand\kanjiseriesforce[1]{\edef\k@series{#1}}
- \DeclareRobustCommand\fontseriesforce[1]{%
- \edef\f@series{#1}\edef\k@series{#1}}
\else\ifnum\ltj@@latex@plv<1500% >=2020-02-02 pl5 and <=2020-10-01
\DeclareRobustCommand\romanseries[1]{\@forced@seriesfalse\merge@font@series{#1}}
\DeclareRobustCommand\kanjiseries[1]{\@forced@seriesfalse\merge@kanji@series{#1}}
- \DeclareRobustCommand\fontseries[1]{%
- \@forced@seriesfalse\merge@font@series{#1}\merge@kanji@series{#1}}
- \DeclareRobustCommand\romanseriesforce[1]{\@forced@seriestrue\merge@font@series{#1}}
- \DeclareRobustCommand\kanjiseriesforce[1]{\@forced@seriestrue\merge@kanji@series{#1}}
- \DeclareRobustCommand\fontseriesforce[1]{%
- \@forced@seriestrue\merge@font@series{#1}\merge@kanji@series{#1}}
+ \DeclareRobustCommand\romanseriesforce[1]{\@forced@seriestrue\edef\f@series{#1}}
+ \DeclareRobustCommand\kanjiseriesforce[1]{\@forced@seriestrue\edef\k@series{#1}}
\else% >=2021-05-01
\DeclareRobustCommand\romanseries[1]{\@forced@seriesfalse
\expandafter\def\expandafter\delayed@f@adjustment\expandafter
@@ -914,16 +908,17 @@
\DeclareRobustCommand\kanjiseries[1]{\@forced@seriesfalse
\expandafter\def\expandafter\delayed@k@adjustment\expandafter
{\delayed@k@adjustment\delayed@merge@kanji@series{#1}}}
- \DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}}
\DeclareRobustCommand\romanseriesforce[1]{\@forced@seriestrue
\expandafter\def\expandafter\delayed@f@adjustment\expandafter
{\delayed@f@adjustment\edef\f@series{#1}}}
\DeclareRobustCommand\kanjiseriesforce[1]{\@forced@seriestrue
\expandafter\def\expandafter\delayed@k@adjustment\expandafter
{\delayed@k@adjustment\edef\k@series{#1}}}
- \DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}}%
\let\delayed@k@adjustment\@empty
\fi\fi
+\DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}}%
+\DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}}%
+
\ifnum\ltj@@latex@plv<1500% <=2020-10-01
\DeclareRobustCommand\romanshape[1]{\merge@font@shape{#1}}
\DeclareRobustCommand\kanjishape[1]{\merge@kanji@shape{#1}}
diff --git a/macros/luatex/generic/luatexja/src/patches/lltjp-atbegshi.sty b/macros/luatex/generic/luatexja/src/patches/lltjp-atbegshi.sty
index a9ca6a2c14..d1a21a0e5c 100644
--- a/macros/luatex/generic/luatexja/src/patches/lltjp-atbegshi.sty
+++ b/macros/luatex/generic/luatexja/src/patches/lltjp-atbegshi.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-atbegshi}[2020-09-30 Patching \string\shipout\space hooks for LuaTeX-ja]
+\ProvidesPackage{lltjp-atbegshi}[2021-03-14 Patching \string\shipout\space hooks for LuaTeX-ja]
% concept: execute all hooks inside yoko direction \vbox
@@ -13,22 +13,24 @@
\RequirePackage{expl3}
\ExplSyntaxOn\makeatletter
\box_new:N \l__platex_shipout_dummy_box
-\cs_new_eq:NN \__platex_original_shipout_execute_cont: \__shipout_execute_cont:
-\cs_set:Npn \__shipout_execute_cont:
-{
- % if \l_shipout_box is not a \yoko-box (= horizontal writing),
+\if_cs_exist:N \__shipout_execute_main_cont:Nnnn %% 2021-05-01
+\cs_new_eq:NN \__platex_original_shipout_execute_main_cont:Nnnn
+ \__shipout_execute_main_cont:Nnnn
+\cs_set:Npn \__shipout_execute_main_cont:Nnnn #1#2#3#4 {
+ % if the box #1 is not a \yoko-box (= horizontal writing),
% then make it a \yoko-box behorehand.
- \platex_if_box_yoko:NF \l_shipout_box {
- \vbox_set:Nn \l_shipout_box { \platex_direction_yoko: \box_use:N \l_shipout_box }
+ \platex_if_box_yoko:NF #1 {
+ \vbox_set:Nn #1 { \platex_direction_yoko: \box_use:N #1 }
}
% if the current direction is not \yoko,
- % then enclose \__shipout_execute_cont: with
+ % then enclose \__shipout_execute_main_cont:Nnnn with
% a dummy \yoko-box named \l__platex_shipout_dummy_box.
\platex_if_direction_yoko:TF {
- \__platex_original_shipout_execute_cont:
+ \__platex_original_shipout_execute_main_cont:Nnnn { #1 } { #2 } { #3 } { #4 }
}{
\vbox_set:Nn \l__platex_shipout_dummy_box {
- \platex_direction_yoko: \__platex_original_shipout_execute_cont:
+ \platex_direction_yoko:
+ \__platex_original_shipout_execute_main_cont:Nnnn { #1 } { #2 } { #3 } { #4 }
}
% [Limitation] the code above may discard some contents,
% so we'd like to put it back by \box\l__platex_shipout_dummy_box.
@@ -37,6 +39,23 @@
%\box_use:N \l__platex_shipout_dummy_box
}
}
+
+\else: %% 2020-10-01
+\cs_new_eq:NN \__platex_original_shipout_execute_cont: \__shipout_execute_cont:
+\cs_set:Npn \__shipout_execute_cont:
+{
+ \platex_if_box_yoko:NF \l_shipout_box {
+ \vbox_set:Nn \l_shipout_box { \platex_direction_yoko: \box_use:N \l_shipout_box }
+ }
+ \platex_if_direction_yoko:TF {
+ \__platex_original_shipout_execute_cont:
+ }{
+ \vbox_set:Nn \l__platex_shipout_dummy_box {
+ \platex_direction_yoko: \__platex_original_shipout_execute_cont:
+ }
+ }
+}
+\fi:
%</ltshipout>-----------------------------------
\ExplSyntaxOff
\expandafter\endinput
diff --git a/macros/luatex/generic/luatexja/src/patches/lltjp-footmisc.sty b/macros/luatex/generic/luatexja/src/patches/lltjp-footmisc.sty
index f74c496308..99ed190631 100644
--- a/macros/luatex/generic/luatexja/src/patches/lltjp-footmisc.sty
+++ b/macros/luatex/generic/luatexja/src/patches/lltjp-footmisc.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-footmisc}[2017/05/05 Patch to footmisc for LuaTeX-ja]
+\ProvidesPackage{lltjp-footmisc}[2021-03-17 Patch to footmisc for LuaTeX-ja]
\RequirePackage{footmisc}
\let \if@tempswa \ifFN@bottom
@@ -47,7 +47,9 @@
\setbox\@outputbox \vbox to\@colht{%
\@texttop \dimen@\dp\@outputbox
\unvbox\@outputbox
- \ifnum\ltjgetparameter{direction}=3 \vbox{\hskip\z@}\fi %%% LuaTeX-ja
+ \unless\ifnum\ltjgetparameter{direction}=4
+ \vbox{\primitive\everypar{}\hskip\z@}%
+ \fi %%% LuaTeX-ja
\vskip -\dimen@\@textbottom
}%
\fi
diff --git a/macros/luatex/generic/luatexja/src/patches/lltjp-stfloats.sty b/macros/luatex/generic/luatexja/src/patches/lltjp-stfloats.sty
index e7535bd7e1..6ce9528d72 100644
--- a/macros/luatex/generic/luatexja/src/patches/lltjp-stfloats.sty
+++ b/macros/luatex/generic/luatexja/src/patches/lltjp-stfloats.sty
@@ -1,5 +1,5 @@
%
-% lltjp-stfloats.sty 2017-05-05
+% lltjp-stfloats.sty 2021-03-17
%
\NeedsTeXFormat{LaTeX2e}
@@ -14,7 +14,9 @@
\global\let\org@makecol\ltj@orig@makecol
\patchcmd\fn@makecol{\vskip -\dimen@\@textbottom}%
- {\ifnum\ltjgetparameter{direction}=4\else\vbox{\hskip\z@}\fi %%% LuaTeX-ja
+ {\unless\ifnum\ltjgetparameter{direction}=4
+ \vbox{\primitive\everypar{}\hskip\z@}%
+ \fi %%% LuaTeX-ja
\vskip -\dimen@
\ifltj@ftn@unvboxed\iffnfixbottom\else\@textbottom\fi\else\@textbottom\fi}{}{}
\patchcmd\fn@makecol{\vskip\skip\footins}{\iffnfixbottom\vskip\z@\@plus.0001fil\fi\vskip\skip\footins}{}{}
diff --git a/macros/xetex/latex/zbmath-review-template/README.md b/macros/xetex/latex/zbmath-review-template/README.md
new file mode 100644
index 0000000000..bce5bee86e
--- /dev/null
+++ b/macros/xetex/latex/zbmath-review-template/README.md
@@ -0,0 +1,48 @@
+# zbmath-review-template
+
+This package contains a template for zbMATH Open reviews. It has to be compiled using XeLaTeX.
+
+## Instruction
+
+Delete all the text in **zb-review.tex** and write your own review into this file. If you want, you can change the metadata information at **zb-metadata.tex**. This is optional and just gives you a feeling how the final pdf at https://zbmath.org will look like. Finally, compile **zb-main.tex** using XeLaTeX.
+
+### Files
+
+The package contains the following files:
+
+* README.md
+* zb-basics.sty
+* zb-main.tex
+* zb-metadata.tex
+* zb-review.tex
+* zb-manual.tex
+* zb-main.pdf (a sample review document)
+* zb-manual.pdf (a short documentation)
+* figures/screenshot.png
+
+### Packages
+
+The following packages are used:
+
+* scrartcl
+* babel
+* scrlayer-scrpage
+* geometry
+* graphicx
+* enumitem
+* fontspec
+* amsmath, amsfonts, amssymb
+* mathtools
+* stmaryrd
+* mathrsfs
+* tikz-cd
+* textcomp
+* gensymb
+
+### License
+
+GNU General Public License, Version 3.
+
+### Version History
+
+19 March 2021: Version 1.0 \ No newline at end of file
diff --git a/macros/xetex/latex/zbmath-review-template/figures/screenshot.png b/macros/xetex/latex/zbmath-review-template/figures/screenshot.png
new file mode 100644
index 0000000000..734787d09a
--- /dev/null
+++ b/macros/xetex/latex/zbmath-review-template/figures/screenshot.png
Binary files differ
diff --git a/macros/xetex/latex/zbmath-review-template/zb-basics.sty b/macros/xetex/latex/zbmath-review-template/zb-basics.sty
new file mode 100644
index 0000000000..726d0d8dbe
--- /dev/null
+++ b/macros/xetex/latex/zbmath-review-template/zb-basics.sty
@@ -0,0 +1,58 @@
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{zb-basics}[2021/2/23 zb-basics]
+
+\RequirePackage[UKenglish]{babel}
+
+\RequirePackage{scrlayer-scrpage}
+
+\RequirePackage{graphicx}
+\RequirePackage{enumitem}
+
+% Font selection
+\RequirePackage[no-math]{fontspec}
+\setmainfont{cmun}[
+ Extension = .otf,
+ UprightFont = *rm,
+ BoldFont = *bx,
+ ItalicFont = *ti,
+ BoldItalicFont = *ti,
+ SlantedFont = *sl,
+ SmallCapsFont = *rm,
+ SmallCapsFeatures = {Letters=SmallCaps},
+]
+
+% standard LaTeX packages supported by zbMATH
+\RequirePackage{amsmath,amsfonts,amssymb}
+\RequirePackage{mathtools}
+\RequirePackage{stmaryrd}
+\RequirePackage{mathrsfs}
+\RequirePackage{tikz-cd}
+\RequirePackage{textcomp,gensymb}
+
+% Special Math Operators used by zbMATH
+% \Im, \Re (redefinition)
+\let\Im\relax\DeclareMathOperator{\Im}{Im}
+\let\Re\relax\DeclareMathOperator{\Re}{Re}
+
+% \Aut, \Hom
+\DeclareMathOperator{\Aut}{Aut}
+\DeclareMathOperator{\Hom}{Hom}
+
+% \ran (analogous to \ker)
+\DeclareMathOperator{\ran}{ran}
+
+% \1 (indicator function, from package bbold)
+\DeclareSymbolFont{bbold}{U}{bbold}{m}{n}
+\DeclareMathSymbol{\1}{\mathord}{bbold}{`1}
+
+% \fint (integral average with slash, from package esint)
+\DeclareSymbolFont{esint}{U}{esint}{m}{n}
+\DeclareMathSymbol{\fintsymbol}{\mathop}{esint}{'037}
+\def\fint{\fintsymbol\nolimits}
+
+% \Sha (Tate-Shafarevich group)
+\DeclareMathOperator{\Sha}{\textup{Ш}}
+
+% write text in zbMath Blue
+\definecolor{zbMATHBlue}{rgb}{0, 0.289, 0.6}
+\newcommand{\blue}[1]{\textcolor{zbMATHBlue}{#1}}
diff --git a/macros/xetex/latex/zbmath-review-template/zb-main.pdf b/macros/xetex/latex/zbmath-review-template/zb-main.pdf
new file mode 100644
index 0000000000..14ea47efe1
--- /dev/null
+++ b/macros/xetex/latex/zbmath-review-template/zb-main.pdf
Binary files differ
diff --git a/macros/xetex/latex/zbmath-review-template/zb-main.tex b/macros/xetex/latex/zbmath-review-template/zb-main.tex
new file mode 100644
index 0000000000..785084c7a9
--- /dev/null
+++ b/macros/xetex/latex/zbmath-review-template/zb-main.tex
@@ -0,0 +1,68 @@
+% Do not change anything from here.
+% Use review.tex for the text of your review and metadata.tex for metadata information
+
+\documentclass[a4paper,10pt,leqno]{scrartcl}
+\usepackage{zb-basics}
+\usepackage[margin=2.5cm,tmargin=2cm,bmargin=3cm]{geometry}
+
+\input{zb-metadata}
+
+\begin{document}
+
+% display copyright in footer
+\pagestyle{scrheadings}
+\setkomafont{pageheadfoot}{
+ \rmfamily
+ \footnotesize
+ \color[rgb]{.5,.5,.5}
+}
+\lofoot{%
+ \makebox[\linewidth][s]{Edited by FIZ Karlsruhe, the European Mathematical Society and the Heidelberg Academy of Sciences and Humanities}\\
+ \copyright{} \the\year{} FIZ Karlsruhe GmbH
+}
+\cofoot{}
+\rofoot{\\Page \thepage}
+
+\setlength{\parindent}{0cm}
+\setlength{\parskip}{1ex}
+\setlength{\parfillskip}{0pt plus 1fill}
+\setlength{\footheight}{19pt}
+
+\newsavebox{\citationbox}
+\newdimen{\msclen}
+
+\frenchspacing
+
+%\includegraphics[width=.3\textwidth]{zbmath.jpg}
+
+\vspace{7ex}
+% Metadata of article under review
+\parbox{\textwidth}{\setlength{\parfillskip}{0pt plus 1fill}
+\au
+
+\ti
+
+\reference
+}
+
+\vspace{2ex}
+
+% Text of the review
+\input{zb-review}
+
+\par\nopagebreak\hspace*{0pt plus 1filll} Reviewer: \rv
+
+% MSC Classes
+\vspace{2ex}
+\msclen=\textwidth
+\advance\msclen by -\wd\citationbox
+\advance\msclen by -5em
+\textbf{MSC:}\par\nopagebreak
+\msc
+
+% Keywords
+\vspace{2ex}
+\textbf{Keywords:}\par\nopagebreak
+\kw
+
+\end{document} \ No newline at end of file
diff --git a/macros/xetex/latex/zbmath-review-template/zb-manual.pdf b/macros/xetex/latex/zbmath-review-template/zb-manual.pdf
new file mode 100644
index 0000000000..5e20954a88
--- /dev/null
+++ b/macros/xetex/latex/zbmath-review-template/zb-manual.pdf
Binary files differ
diff --git a/macros/xetex/latex/zbmath-review-template/zb-manual.tex b/macros/xetex/latex/zbmath-review-template/zb-manual.tex
new file mode 100644
index 0000000000..e6334c6cb2
--- /dev/null
+++ b/macros/xetex/latex/zbmath-review-template/zb-manual.tex
@@ -0,0 +1,233 @@
+\documentclass[a4paper,10pt,leqno]{scrartcl}
+\usepackage{zb-basics}
+\usepackage{scrlayer-scrpage}
+\usepackage{hyperref}
+
+\hypersetup{colorlinks=true,allcolors=[rgb]{0,.289,.6}}
+
+
+\begin{document}
+% display copyright in footer
+\pagestyle{scrheadings}
+\setkomafont{pageheadfoot}{
+ \rmfamily
+ \footnotesize
+ \color[rgb]{.5,.5,.5}
+}
+\lofoot{%
+ \copyright{} \the\year{} FIZ Karlsruhe GmbH
+}
+\cofoot{}
+\rofoot{Page \thepage}
+
+\setlength{\parindent}{0cm}
+\setlength{\parskip}{1ex}
+\setlength{\parfillskip}{0pt plus 1fill}
+\setlength{\footheight}{19pt}
+
+\newsavebox{\citationbox}
+\newdimen{\msclen}
+
+\frenchspacing
+
+\section*{LaTeX-Template for zbMATH Open Reviews}
+
+\subsection*{Purpose of this template}
+
+This template shows how your review will look like at zbMATH Open. You can test whether your LaTeX-code will compile properly on our system. However, be aware that there might be manual changes to your review and its published version on zbMATH Open will look slightly different than on this template.
+
+\subsection*{How to use this template}
+
+Delete all the text in \texttt{zb-review.tex} and write your review into this file. If you want, you can change the metadata information at \texttt{zb-metadata.tex}. This is optional and just gives you a feeling how the final pdf at zbmath.org will look like. Finally, compile \texttt{zb-main.tex} using XeLaTeX.
+
+\vspace{2ex}
+\subsection*{LaTeX Format}
+
+Please prepare your review in standard LaTeX. You might use functions and macros from the following packages:
+\begin{itemize}[nosep]
+ \item \href{https://www.ams.org/arc/resources/amslatex-about.html}{amsmath, amsfonts, amssymb}
+ \item \href{https://ctan.org/pkg/stmaryrd}{stmaryrd}
+ \item \href{https://ctan.org/pkg/mathrsfs}{mathrsfs}
+ \item \href{https://ctan.org/pkg/tikz-cd}{tikz-cd}
+ \item \href{https://ctan.org/pkg/mathtools}{mathtools}
+ \item \href{https://ctan.org/pkg/gensymb}{gensymb}
+ \item \href{https://ctan.org/pkg/textcomp}{textcomp}
+\end{itemize}
+Furthermore, you might use the macros defined in zb-basics.sty, that are:
+\begin{itemize}[nosep]
+ \item \verb|\Im| and \verb|\Re| for the imaginary and real part of a complex number, for example, \(\Re(x+iy)=x\) and \(\Im(x+iy)=y\).
+ \item \verb|\Aut| for the automorphism group of a set, e.g., \(\Aut(X)\) for a set \(X\).
+ \item \verb|\Hom| for the hom-Functor, e.g., \(\Hom(A,B)\) stands for the set of homomorphisms from a set \(A\) to a set \(B\).
+ \item \verb|\ran| for the range or image of a vector space, e.g., \(\ker A = \left(\ran A^*\right)^\bot\).
+ \item \verb|\1| for the indicator function of a set, e.g.
+ \[\1_A = \begin{cases}1 &\text{if }x\in A\\
+ 0 &\text{if }x\notin A
+ \end{cases}.\]
+ \item \verb|\fint| for \(\fint\), e.g.,
+ \[\fint_A u(y)\,d\mu(y)=\frac{1}
+ {\mu(A)}\int_A u(y)\,d\mu(y)\]
+ \item \verb|\Sha| for the Tate–Shafarevich group $\Sha(A/K)$ of an abelian variety \(A\) defined over a number field \(K\).
+\end{itemize}
+Please do not use any self-defined macros or packages not listed above. If you feel that there is a missing package that we should add, please let us know.
+
+Our PDFs are compiled using XeLaTeX, which supports unicode characters in the source files. Unicode allows the user to include accents and special characters coming from different Asian and European languages. For example you may enter accented characters directly (e.g., \verb|Lévy| instead of \verb|L\'evy|). However, please avoid including unicode characters in mathematical mode. For example, when you type Greek characters for variables please use \verb|\(\beta\)| or \verb|$\beta$| obtaining \(\beta\), instead of typing the unicode character directly.
+
+Please do not include tables, large diagrams, drawings or formulas of minor importance. Use alternative fonts (bold, italics etc.) only if necessary, e.g., in formulas or for highlighting the authors of cited publications.
+
+\subsection*{Mathematical Typesetting}
+
+When writing equations or diagrams please avoid the automatic numbering environments and replace them with their "*" analogues. For example, use
+
+\verb|\begin{equation*} \end{equation*}|
+
+instead of
+
+\verb|\begin{equation} \end{equation}|.
+
+The numbers on equations, definitions, diagrams, etc. should be set manually. You can do this by typing, for instance, \verb|\tag{1}| or \verb|\tag{*}|.
+
+For example
+\begin{verbatim}
+\begin{equation*}
+ \sum_{n=1}^\infty \frac{1}{n^2} = \frac{\pi^2}{6} \tag{1}\label{eq:1}
+\end{equation*}
+\end{verbatim}
+gives
+\begin{equation*}
+ \sum_{n=1}^\infty \frac{1}{n^2}=\frac{\pi^2}{6} \tag{1}\label{eq:1}
+\end{equation*}
+An equation can be referenced via \verb|\ref{key}| if it is labeled by \verb|\label{key}|. The formula above can be referenced via \verb|\ref{eq:1}|:
+
+Equation~\ref{eq:1} was proven by Leonhard Euler in his paper \textit{De summis serierum reciprocarum}.
+
+For inline mathematical formula we prefer to use \verb|\(...\)| over \verb|$...$|. Similarly, we recommend to use \verb|\[...\]| instead of \verb|$$...$$|.
+
+\paragraph{Matrices}
+
+We give a short description how to type matrices with \texttt{amsmath}. For more details we refer to the documentation of \href{https://www.ams.org/arc/resources/amslatex-about.html}{amsmath} on ctan.
+
+\texttt{amsmath} provides several environments for matrices using different brackets. For example the code
+\begin{verbatim}
+\[
+\begin{pmatrix} a & b \\ c & d \end{pmatrix}\quad
+\begin{matrix} a & b \\ c & d \end{matrix}\quad
+\begin{bmatrix} a & b \\ c & d \end{bmatrix}\quad
+\begin{Bmatrix} a & b \\ c & d \end{Bmatrix}\quad
+\begin{vmatrix} a & b \\ c & d \end{vmatrix} \quad
+\begin{Vmatrix} a & b \\ c & d \end{Vmatrix}
+\]
+\end{verbatim}
+
+generates these four matrices
+\[
+\begin{pmatrix} a & b \\ c & d \end{pmatrix}\quad
+\begin{matrix} a & b \\ c & d \end{matrix}\quad
+\begin{bmatrix} a & b \\ c & d \end{bmatrix}\quad
+\begin{Bmatrix} a & b \\ c & d \end{Bmatrix}\quad
+\begin{vmatrix} a & b \\ c & d \end{vmatrix} \quad
+\begin{Vmatrix} a & b \\ c & d \end{Vmatrix}.
+\]
+
+If you want to use a matrix in inline math mode, then you might use \verb|\smallmatrix|, e.g. \(\left(\begin{smallmatrix} 1&2\\ 3&4 \end{smallmatrix}\right)\) is typed via
+\begin{verbatim}
+\(\left(\begin{smallmatrix} 1&2\\ 3&4 \end{smallmatrix}\right)|\).
+\end{verbatim}
+Observe that you have to add your own deliminator to the smallmatrix environment, here we use \verb|\left(| and \verb|\right)|.
+
+\paragraph{Commutative Diagrams}
+
+The package \texttt{tikz-cd} is designed to draw commutative diagrams. They are constructed inside \verb|\begin{tikzcd}...\end{tikzcd}|. Its usage is similar to the one of tables (\verb|&| for columns and \verb|\\| for rows). Arrows are drawn using the command \verb|\arrow[options]|. The direction of an arrow is specified by a string of characters \texttt{r}, \texttt{l}, \texttt{u}, \texttt{d} (right, left, up, down) and labels are added using quotes \texttt{"<label>"}. We give examples of some commutative diagrams that occur regularly.
+
+A short exact sequence
+\(
+\begin{tikzcd}
+ 0\arrow[r] & A \arrow[r, "f"] & B\arrow[r, "g"] & C\arrow[r] & 0
+\end{tikzcd}
+\)
+can be easily typed using \texttt{tikz-cd} by
+\begin{verbatim}
+\begin{tikzcd}
+ 0\arrow[r] & A \arrow[r, "f"] & B\arrow[r, "g"] & C\arrow[r] & 0
+\end{tikzcd}
+\end{verbatim}
+The option \texttt{column sep} specifies the space between two consecutive columns. If we set this option to small
+\begin{verbatim}
+\begin{tikzcd}[column sep=small]
+ 0\arrow[r] &A \arrow[r, "f"] &B\arrow[r, "g"] &C\arrow[r] &0,
+\end{tikzcd}
+\end{verbatim}
+the arrows of the short exact sequence
+\(
+\begin{tikzcd}[column sep=small]
+ 0\arrow[r] & A \arrow[r, "f"] & B\arrow[r, "g"] & C\arrow[r] & 0
+\end{tikzcd}
+\)
+are shorter.
+
+Next, we give an example of a classical "square" commutative diagram, where we use \verb|column sep| and \verb|row sep| to specify the space between consecutive columns and rows, respectively. The diagram
+\[
+\begin{tikzcd}[column sep=large, row sep=large]
+ A \arrow[r, "f"] \arrow[d, "g"] & B \arrow[d, "h"]\\
+ C \arrow[r, "k"]& D
+\end{tikzcd}
+\]
+is generated by
+\begin{verbatim}
+\[
+\begin{tikzcd}[column sep=large, row sep=large]
+ A \arrow[r, "f"] \arrow[d, "g"] & B \arrow[d, "h"] \\
+ C \arrow[r, "k"] & D
+\end{tikzcd}
+\].
+\end{verbatim}
+
+A "triangular" diagram as
+\[
+\begin{tikzcd}[row sep = large]
+ A\arrow[d, "\pi" ']\arrow[r, "f"] & B \\
+ A/\ker(f)\arrow[ru, dashrightarrow, "\tilde f" '] &
+\end{tikzcd}
+\]
+can be drawn using
+\begin{verbatim}
+\[
+\begin{tikzcd}[row sep = large]
+ A\arrow[d, "\pi" ']\arrow[r, "f"] & B \\
+ A/\ker(f)\arrow[ru, dashrightarrow, "\tilde f" '] &
+\end{tikzcd}
+\].
+\end{verbatim}
+
+For more details on the use of \href{https://ctan.org/pkg/tikz-cd}{tikz-cd} we refer to its documentation on ctan where examples of more complicated diagrams are given.
+
+\paragraph{References}
+
+References to related work are always appreciated. When giving references, please try to be as specific and accurate as possible so that the references can be identified unambiguously. You may use the \href{https://zbmath.org/}{zbMATH Document Search} or the \href{https://zbmath.org/citationmatching/}{zbMATH Citation Matcher} to look up references. The Cite Button for the respective zbMATH item gives the reference in the proper format for a zbMATH Open review, see Figure~\ref{fig:cite}.
+
+\begin{figure}
+ \centering
+ \includegraphics[width=\textwidth]{figures/screenshot.png}
+ \caption{Cite Button at zbmath.org.}
+ \label{fig:cite}
+\end{figure}
+Example 1: Book Article (\href{https://zbmath.org/?q=an\%3A0970.90052}{Zbl 0970.90052})
+
+{[\textit{A. Schrijver}, Theory of linear and integer programming. Repr. Chichester: Wiley (1998; Zbl 0970.90052)]}
+
+Example 2: Journal Article (\href{https://zbmath.org/?q=an\%3A0239.05111}{Zbl 0239.05111})
+
+{[\textit{L. Lovász}, Discrete Math. 2, 253--267 (1972; Zbl 0239.05111)]}
+
+\subsection*{Review Submission}
+
+We prefer to receive your review electronically via our \href{https://zbmath.org/reviewer-service/}{Web Submission Form}. Just copy the text of \texttt{zb-review.tex} into the field for the review text, please do not copy anything from \texttt{zb-main.tex} or \texttt{zb-basics.sty} into this field. There are two extra fields for keywords and MSC codes, respectively.
+
+Alternatively, you may send your review by e-mail to review-submission@zbmath.org or via mail to our \href{https://zbmath.org/contact/}{postal address}.
+
+For more information on the zbMATH Open Reviewer Service we refer to our \href{https://zbmath.org/reviewer-service/info_texts/guide_for_reviewers}{guide for reviewers}.
+
+\subsection*{License}
+
+The package zbmath-review-template is distributed under the GNU General Public License, Version 3.
+
+\end{document} \ No newline at end of file
diff --git a/macros/xetex/latex/zbmath-review-template/zb-metadata.tex b/macros/xetex/latex/zbmath-review-template/zb-metadata.tex
new file mode 100644
index 0000000000..8d39a61a83
--- /dev/null
+++ b/macros/xetex/latex/zbmath-review-template/zb-metadata.tex
@@ -0,0 +1,24 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Metadata of the reviewed paper
+% Change accordingly
+\newcommand{\au}{\blue{\bfseries Surname1, Forename1; Surname2, Forename2}}
+\newcommand{\ti}{\textbf{Title.}}
+\newcommand{\reference}{\blue{Journal, Issue, pages (year).}}
+%
+% Name of the reviewer
+\newcommand{\rv}{\blue{Forename Surname}}
+% Keywords
+\newcommand{\kw}{
+ \blue{first keyword};
+ \blue{second keyword};
+ \blue{third keyword}
+}
+% MSC
+\newcommand{\msc}{
+\begin{tabular}[t]{@{}lp{\msclen}}
+ \blue{MSC Class 1} & description 1 \\
+ \blue{MSC Class 2} & description 2 \\
+ \blue{MSC Class 3} & description 3
+\end{tabular}
+}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ No newline at end of file
diff --git a/macros/xetex/latex/zbmath-review-template/zb-review.tex b/macros/xetex/latex/zbmath-review-template/zb-review.tex
new file mode 100644
index 0000000000..fcf313ab2e
--- /dev/null
+++ b/macros/xetex/latex/zbmath-review-template/zb-review.tex
@@ -0,0 +1 @@
+Delete all text written in \texttt{zb-review.tex} and write your review into it. If you want, you can change the metadata information at \texttt{zb-metadata.tex} (this is optional). Finally, compile \texttt{zb-main.tex} using XeLaTeX. More detailed information of this template can be found at zb-manual.pdf.