summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/koma-script
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-10-12 20:10:51 +0000
committerKarl Berry <karl@freefriends.org>2022-10-12 20:10:51 +0000
commit1d6906471eb88c119dc3a48f9a44e9cd345e2f41 (patch)
tree5bf0d5dd7a9496529a6f32af7ad24fc0f18b2d72 /Master/texmf-dist/source/latex/koma-script
parentd1a688fe4933bc485a8df8cdf30497c917e33146 (diff)
koma-script (12oct22)
git-svn-id: svn://tug.org/texlive/trunk@64685 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/koma-script')
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/common-fontsize-de.tex6
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/common-fontsize-en.tex5
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/scrbase-en.tex8
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/scrbookreportarticle-de.tex20
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/scrbookreportarticle-en.tex19
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/scrguide.bib32
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/scrguide.cls13
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/scrjura-de.tex4
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/scrlayer-notecolumn-de.tex4
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/scrlayer-notecolumn-en.tex2
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/scrlfile-de.tex4
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/scrlfile-en.tex4
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/scrlttr2-de.tex11
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/scrlttr2-en.tex14
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/scrwfile-de.tex8
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/scrwfile-en.tex6
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/tocbasic-de.tex11
-rw-r--r--Master/texmf-dist/source/latex/koma-script/doc/tocbasic-en.tex14
-rw-r--r--Master/texmf-dist/source/latex/koma-script/koma-script-source-doc.dtx8
-rw-r--r--Master/texmf-dist/source/latex/koma-script/scrkernel-compatibility.dtx16
-rw-r--r--Master/texmf-dist/source/latex/koma-script/scrkernel-floats.dtx38
-rw-r--r--Master/texmf-dist/source/latex/koma-script/scrkernel-fonts.dtx220
-rw-r--r--Master/texmf-dist/source/latex/koma-script/scrkernel-sections.dtx94
-rw-r--r--Master/texmf-dist/source/latex/koma-script/scrkernel-version.dtx4
-rw-r--r--Master/texmf-dist/source/latex/koma-script/scrlayer.dtx42
-rw-r--r--Master/texmf-dist/source/latex/koma-script/scrmain.ins4
-rw-r--r--Master/texmf-dist/source/latex/koma-script/scrstrip.inc4
-rw-r--r--Master/texmf-dist/source/latex/koma-script/scrwfile.dtx48
-rw-r--r--Master/texmf-dist/source/latex/koma-script/tocbasic.dtx28
29 files changed, 480 insertions, 211 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/common-fontsize-de.tex b/Master/texmf-dist/source/latex/koma-script/doc/common-fontsize-de.tex
index b14cbdd95c0..f6c51556d6d 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/common-fontsize-de.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/common-fontsize-de.tex
@@ -24,7 +24,7 @@
% ======================================================================
\KOMAProvidesFile{common-fontsize-de.tex}
- [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $
+ [$Date: 2022-10-06 14:30:20 +0200 (Do, 06. Okt 2022) $
KOMA-Script guide (common paragraphs: fontsize)]
\section{Wahl der Schriftgröße für das Dokument}
@@ -121,7 +121,9 @@ und der Klasse abhängig. %
Diese\textnote{Achtung!} Option sollte keinesfalls als Ersatz für
\Macro{fontsize} (siehe \cite{latex:fntguide}) missverstanden werden. Sie
sollte auch nicht anstelle einer der von der Grundschrift abhängigen
-Schriftgrößenanweisungen, \Macro{tiny} bis \Macro{Huge}, verwendet werden!
+Schriftgrößenanweisungen, \Macro{tiny} bis \Macro{Huge}, verwendet werden! Die
+Verwendung innerhalb eines Absatzes ist aus diesem Grund auch explizit
+verboten!
\IfThisCommonLabelBase{scrlttr2}{%
Bei \Class{scrlttr2} ist \OptionValue{fontsize}{12pt} voreingestellt.
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/common-fontsize-en.tex b/Master/texmf-dist/source/latex/koma-script/doc/common-fontsize-en.tex
index b1e8dcd1b0a..e8ad65e0779 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/common-fontsize-en.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/common-fontsize-en.tex
@@ -24,7 +24,7 @@
% ======================================================================
\KOMAProvidesFile{common-fontsize-en.tex}
- [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $
+ [$Date: 2022-10-06 14:30:20 +0200 (Do, 06. Okt 2022) $
KOMA-Script guide (common paragraphs: fontsize)]
\translator{Markus Kohm\and Krickette Murabayashi\and Karl Hagen}
@@ -105,7 +105,8 @@ depends on these packages and on the class. \IfThisCommonLabelBase{maincls}{%
This\textnote{Attention!} option should by no means be misinterpreted as a
substitute for \Macro{fontsize} (see \cite{latex:fntguide}). Also, you should
not use it in place of one of the font size commands that are relative to the
-main font, from \Macro{tiny} to \Macro{Huge}.
+main font, from \Macro{tiny} to \Macro{Huge}. The use within a paragraph is
+therefore also explicitly prohibited.
\IfThisCommonLabelBase{scrlttr2}{%
For \Class{scrlttr2} the default is \OptionValue{fontsize}{12pt}.
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/scrbase-en.tex b/Master/texmf-dist/source/latex/koma-script/doc/scrbase-en.tex
index bdba9ee1f5a..11358b0efc8 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/scrbase-en.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/scrbase-en.tex
@@ -24,7 +24,7 @@
% ======================================================================
\KOMAProvidesFile{scrbase-en.tex}
- [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $
+ [$Date: 2022-07-17 11:19:00 +0200 (So, 17. Jul 2022) $
KOMA-Script package scrbase]
\translator{Markus Kohm\and Melvin Hendrix\and Karl Hagen}
@@ -1360,9 +1360,9 @@ redefinition in the preamble is overwritten with
To define or change language-dependent terms, you normally have to redefine
commands like \Macro{captionsenglish} so that the new or redefined terms are
defined in addition to the previous terms. This is made more difficult by the
-fact that some packages like \Package{german}\IndexPackage{german} or
-\Package{ngerman}\IndexPackage{ngerman} redefine those settings when they are
-loaded. These definitions, unfortunately, occur in a way that undoes all the
+fact that some packages like \Package{babel}\IndexPackage{babel} or
+\Package{polyglossia}\IndexPackage{polyglossia} also redefine those
+commands. These definitions, unfortunately, occur in a way that undoes all the
previous changes. For this reason, it makes sense to delay changes until
\Macro{begin}\PParameter{document} by using \Macro{AtBeginDocument}, that is,
after all packages have been loaded. A user can also use
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/scrbookreportarticle-de.tex b/Master/texmf-dist/source/latex/koma-script/doc/scrbookreportarticle-de.tex
index 5e98e698c6f..7054166a7e6 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/scrbookreportarticle-de.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/scrbookreportarticle-de.tex
@@ -24,7 +24,7 @@
% ============================================================================
\KOMAProvidesFile{scrbookreportarticle-de.tex}
- [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $
+ [$Date: 2022-07-17 12:37:12 +0200 (So, 17. Jul 2022) $
KOMA-Script guide (chapter: scrbook, scrreprt, scrartcl)]
\chapter{Die Hauptklassen \Class{scrbook}, \Class{scrreprt}, \Class{scrartcl}}
@@ -1803,6 +1803,15 @@ ausschaltet. Bevor also versucht wird, die korrekte Darstellung über
Verwendung einer der Optionen zu erzwingen, sollte grundsätzlich ein weiterer
\LaTeX-Lauf ohne Dokumentänderung durchgeführt werden.
+Bei Verwendung der Spracheinstellung \PValue{russian} des Pakets
+\Package{polyglossia}\IndexPackage{polyglossia}\important{\Package{polyglossia}}
+wird die Einstellung der Option durch Umdefinierung von
+\DescRef{\LabelBase.cmd.autodot} übrigens hart überschrieben. Auch ein
+nachträgliches Setzen der Option hat dann keine Wirkung mehr. Seit Version
+1.50a bietet das Paket jedoch eine Option, um dieses sehr restriktive
+Verhalten abzuschalten. Näheres ist der Anleitung \cite{package:polyglossia}
+zu entnehmen.
+
Eine Zusammenfassung der möglichen Werte für die \PName{Einstellung} von
\PName{numbers} bietet \autoref{tab:maincls.numbers}. Im Unterschied zu den
meisten anderen Einstellungen kann diese Option nur in der Dokumentpräambel,
@@ -2830,7 +2839,14 @@ sowie
\DescRef{maincls-experts.cmd.sectionlinesformat}\IndexCmd{sectionlinesformat}
und das zugehörige \DescRef{maincls-experts.cmd.sectioncatchphraseformat}%
\IndexCmd{sectioncatchphraseformat} in \autoref{sec:maincls-experts.sections},
-ab \DescPageRef{maincls-experts.cmd.partlineswithprefixformat} verwiesen.%
+ab \DescPageRef{maincls-experts.cmd.partlineswithprefixformat} verwiesen.
+
+Es wird ausdrücklich darauf hingewiesen, dass das Paket
+\Package{polyglossia}\IndexPackage{polyglossia}\important{\Package{polyglossia}}
+einige der hier dokumentierten Anweisungen abhängig von der Sprache hart
+umdefiniert. Dies betrifft beispielsweise die Spracheinstellungen
+\PValue{russian} und \PValue{hungarian}. Näheres dazu ist dessen Anleitung
+\cite{package:polyglossia} zu entnehmen.%
\EndIndexGroup
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/scrbookreportarticle-en.tex b/Master/texmf-dist/source/latex/koma-script/doc/scrbookreportarticle-en.tex
index c1c8426c6a9..3cf7fc28a0c 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/scrbookreportarticle-en.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/scrbookreportarticle-en.tex
@@ -24,7 +24,7 @@
% ============================================================================
\KOMAProvidesFile{scrbookreportarticle-en.tex}
- [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $
+ [$Date: 2022-07-17 12:37:12 +0200 (So, 17. Jul 2022) $
KOMA-Script guide (chapter: scrbook, scrreprt, scrartcl)]
\translator{Jens-Uwe Morawski\and Gernot Hassenpflug\and Markus Kohm\and
@@ -1663,6 +1663,14 @@ next {\LaTeX} run. Therefore, before you try to use these options to force
the correct numbering format, you should always perform another \LaTeX{} run
without modifying the document.
+When using the language setting \PValue{russian} of the package
+\Package{polyglossia}\IndexPackage{polyglossia}\important{\Package{polyglossia}},
+the setting of the option is overwritten by redefining
+\DescRef{\LabelBase.cmd.autodot}. Subsequent setting of the option then also
+has no effect. However, from version 1.50a the package offers an option to
+switch off this very restrictive behaviour. More details can be found in the
+manual \cite{package:polyglossia}.
+
You can find a summary of the available values for the \PName{setting} of
\PName{numbers} in \autoref{tab:\LabelBase.numbers}. Unlike most other
settings, this option can only be set in the document preamble, i.\,e. before
@@ -2569,7 +2577,14 @@ as well as
and its \DescRef{maincls-experts.cmd.sectioncatchphraseformat}%
\IndexCmd{sectioncatchphraseformat} format in
\autoref{sec:maincls-experts.sections}, starting from
-\DescPageRef{maincls-experts.cmd.partlineswithprefixformat}.%
+\DescPageRef{maincls-experts.cmd.partlineswithprefixformat}.
+
+It is expressly stated that the package
+\Package{polyglossia}\IndexPackage{polyglossia}\important{\Package{polyglossia}}
+redefines some of the instructions documented here depending on the
+language. This concerns, for example, the language settings \PValue{russian}
+and \PValue{hungarian}. For more details, see its manual
+\cite{package:polyglossia}.%
\EndIndexGroup
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/scrguide.bib b/Master/texmf-dist/source/latex/koma-script/doc/scrguide.bib
index b6690530bf9..4c6b7e6da3d 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/scrguide.bib
+++ b/Master/texmf-dist/source/latex/koma-script/doc/scrguide.bib
@@ -56,6 +56,16 @@
note = {{DANTE} e.\,V.}
}
+@Article{ zeitung,
+ language = {ngerman},
+ author = {Martin Z. Schröder},
+ title = {Die Anmut des Unscheinbaren},
+ journal = {Berliner Zeitung},
+ year = 1998,
+ month = {10. Oktober},
+ url = {https://www.druckerey.de/files/druckerey/pdf/AnmutBZ1998.pdf}
+}
+
@Book{ DUDEN,
language= {ngerman},
author = {DUDEN},
@@ -177,16 +187,6 @@
address = {Berlin}
}
-@InCollection{ zeitung,
- language = {ngerman},
- author = {Martin Z. Schröder},
- title = {Die Anmut des Unscheinbaren},
- booktitle = {Berliner Zeitung},
- year = 1998,
- month = {10. Oktober},
- url = {http://www.berliner-zeitung.de/archiv}
-}
-
@Manual{ btxdoc,
language= {english},
author = {Oren Patashnik},
@@ -667,6 +667,18 @@ Schlegl},
url = {CTAN://macros/latex/contrib/oberdiek/}
}
+@Misc{ package:polyglossia,
+ language = {english},
+ author = {François Charette and Arthur Reutenauer and
+ Jürgen Spitzmüller and Bastien Roucariès},
+ title = {Polyglossia: Modern multilingual typesetting with
+ {\XeLaTeX} and {\LuaLaTeX}},
+ year = 2022,
+ month = apr,
+ edition = {1.56},
+ url = {CTAN://macros/unicodetex/latex/polyglossia}
+}
+
@Misc{ package:ragged2e,
language = {english},
author = {Martin Schröder},
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/scrguide.cls b/Master/texmf-dist/source/latex/koma-script/doc/scrguide.cls
index e27721dd0fe..d622ace1e49 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/scrguide.cls
+++ b/Master/texmf-dist/source/latex/koma-script/doc/scrguide.cls
@@ -38,7 +38,7 @@
% \section{Identification}
%
% \begin{macrocode}
-\ProvidesClass{scrguide}[2022/05/17 v1.27 internal KOMA-Script guide class]
+\ProvidesClass{scrguide}[2022/07/17 v1.28 internal KOMA-Script guide class]
% \end{macrocode}
%
%
@@ -2345,13 +2345,20 @@ KOMAScript \endcsname
% \section{Logos}
%
% I don't want to use package \textsf{hologo} for only one logo:
+% \changes{v1.28}{2022/07/17}{\cs{LuaTeX} and \cs{LuaLaTeX} added}
% \begin{macrocode}
\DeclareRobustCommand{\XeTeX}{%
- X\kern-.125em\lower.5ex\hbox{\reflectbox{E}}\kern-.10em\TeX%
+ X\kern-.125em\lower.5ex\hbox{\reflectbox{E}}\kern-.10em\TeX
}%
\DeclareRobustCommand{\XeLaTeX}{%
- X\kern-.125em\lower.5ex\hbox{\reflectbox{E}}\kern-.10em\LaTeX%
+ X\kern-.125em\lower.5ex\hbox{\reflectbox{E}}\kern-.10em\LaTeX
}%
+\DeclareRobustCommand{\LuaTeX}{%
+ Lua\TeX
+}
+\DeclareRobustCommand{\LuaLaTeX}{%
+ Lua\LaTeX
+}
% \end{macrocode}
%
% \section{Appendix}
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/scrjura-de.tex b/Master/texmf-dist/source/latex/koma-script/doc/scrjura-de.tex
index bc0ff85eab0..3889dd96a3e 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/scrjura-de.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/scrjura-de.tex
@@ -24,7 +24,7 @@
% ======================================================================
\KOMAProvidesFile{scrjura-de.tex}%
- [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $
+ [$Date: 2022-07-17 12:36:46 +0200 (So, 17. Jul 2022) $
KOMA-Script guide (chapter: scrjura)]
\chapter{Unterstützung für die Anwaltspraxis durch \Package{scrjura}}
@@ -1068,7 +1068,7 @@ erhalten. Diese Funktionalität ist seit \LaTeX{} 2020/02/01 jedoch in den
\LaTeX-Kern integriert.
Wie Sie am Laden von \Package{fontenc} erkennen können, wird für das Beispiel
-PDF\LaTeX{} verwendet. Soll stattdessen Lua\LaTeX{} oder \XeLaTeX{} verwendet
+PDF\LaTeX{} verwendet. Soll stattdessen \LuaLaTeX{} oder \XeLaTeX{} verwendet
werden, entfallen alle drei Zeilen. Wahlweise kann dann \Package{fontspec}
geladen oder einfach mit den Voreinstellungen gearbeitet werden.
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/scrlayer-notecolumn-de.tex b/Master/texmf-dist/source/latex/koma-script/doc/scrlayer-notecolumn-de.tex
index e1da0d969bd..8d924561fdb 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/scrlayer-notecolumn-de.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/scrlayer-notecolumn-de.tex
@@ -29,7 +29,7 @@
% ============================================================================
\KOMAProvidesFile{scrlayer-notecolumn.tex}
- [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $
+ [$Date: 2022-07-17 12:36:46 +0200 (So, 17. Jul 2022) $
KOMA-Script guide (chapter:scrlayer-notecolumn)]
\chapter{Notizspalten mit \Package{scrlayer-notecolumn}}
@@ -444,7 +444,7 @@ aus der definierten Position der Notizspalte. Für die korrekte Funktion ist
das Paket dabei auf \Macro{pdfsavepos}\IndexCmd{pdfsavepos},
\Macro{pdflastypos}\IndexCmd{pdflastypos} und
\Macro{pdfpageheight}\IndexLength{pdfpageheight} beziehungsweise deren
-Entsprechungen bei neueren Lua\TeX-Versionen angewiesen. Ohne diese Befehle
+Entsprechungen bei neueren \LuaTeX-Versionen angewiesen. Ohne diese Befehle
funktioniert \Package{scrlayer-notecolumn} nicht. %
\iffalse % Umbruchkorrektur
Dabei wird außerdem davon ausgegangen, dass die genannten Primitiven exakt
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/scrlayer-notecolumn-en.tex b/Master/texmf-dist/source/latex/koma-script/doc/scrlayer-notecolumn-en.tex
index 5e502c98233..709f68fb8fd 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/scrlayer-notecolumn-en.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/scrlayer-notecolumn-en.tex
@@ -395,7 +395,7 @@ note column. To work correctly, the package relies on
\Macro{pdfsavepos}\IndexCmd{pdfsavepos},
\Macro{pdflastypos}\IndexCmd{pdflastypos}, and
\Macro{pdfpageheight}\IndexLength{pdfpageheight} or their equivalent in newer
-Lua\TeX{} versions. Without these commands, \Package{scrlayer-notecolumn} will
+\LuaTeX{} versions. Without these commands, \Package{scrlayer-notecolumn} will
not work. The primitives should act exactly as they would using pdf\TeX.
However, if the package detects a collision\textnote{collision avoidance} with
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/scrlfile-de.tex b/Master/texmf-dist/source/latex/koma-script/doc/scrlfile-de.tex
index 6b161cdf07d..719aebcdede 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/scrlfile-de.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/scrlfile-de.tex
@@ -24,7 +24,7 @@
% ============================================================================
\KOMAProvidesFile{scrlfile-de.tex}%
- [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $
+ [$Date: 2022-07-17 12:36:46 +0200 (So, 17. Jul 2022) $
KOMA-Script guide (chapter: scrlfile)]
\chapter{Paketabhängigkeiten mit \Package{scrlfile}
@@ -610,7 +610,7 @@ der \PName{Paketliste} zu finden ist.
\RequirePackage{lmodern}
\end{lstcode}
Nun wollen Sie zum ersten Mal ein Dokument mit
- X\kern-.125em\lower.5ex\hbox{\reflectbox{E}}\LaTeX{} oder Lua\LaTeX{}
+ X\kern-.125em\lower.5ex\hbox{\reflectbox{E}}\LaTeX{} oder \LuaLaTeX{}
setzen. Da beim hierbei empfohlenen Paket \Package{fontspec} ohnehin
Latin-Modern voreingestellt ist und das Laden von \Package{fontenc} eher
störend wäre, wollen Sie das Laden beider Pakete verhindern. Sie laden die
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/scrlfile-en.tex b/Master/texmf-dist/source/latex/koma-script/doc/scrlfile-en.tex
index ece18e88819..4891101bc9e 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/scrlfile-en.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/scrlfile-en.tex
@@ -24,7 +24,7 @@
% ============================================================================
\KOMAProvidesFile{scrlfile-en.tex}
- [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $
+ [$Date: 2022-07-17 12:36:46 +0200 (So, 17. Jul 2022) $
KOMA-Script guide (chapter: scrlfile)]
\translator{Gernot Hassenpflug\and Markus Kohm\and Karl Hagen}
@@ -550,7 +550,7 @@ effectively prevents the package from being loaded if it is found in the the
\RequirePackage[T1]{fontenc}
\RequirePackage{lmodern}
\end{lstcode}
- But now, for the first time, you want to use \XeLaTeX{} or Lua\LaTeX{}.
+ But now, for the first time, you want to use \XeLaTeX{} or \LuaLaTeX{}.
Since the recommended \Package{fontspec} package uses Latin Modern as the
default font anyway, and loading \Package{fontenc} would not be a good idea,
you want to prevent both packages from being loaded. Therefore, you load the
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/scrlttr2-de.tex b/Master/texmf-dist/source/latex/koma-script/doc/scrlttr2-de.tex
index d61ed4adc0a..0f701ada8cb 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/scrlttr2-de.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/scrlttr2-de.tex
@@ -24,7 +24,7 @@
% ============================================================================
\KOMAProvidesFile{scrlttr2-de.tex}%
- [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $
+ [$Date: 2022-10-12 08:12:27 +0200 (Mi, 12. Okt 2022) $
KOMA-Script guide (chapter: scrlttr2)]
\chapter{Briefe mit Klasse \Class{scrlttr2} oder Paket \Package{scrletter}}
@@ -1383,14 +1383,13 @@ gesetzt werden. %
\iftrue% Umbruchkorrektur
Der \PName{Verteiler} wird der Anweisung dabei als Argument übergeben. %
\fi%
-Wenn der \PName{Inhalt} der Variablen
+Wenn die \PName{Bezeichnung} der Variablen
\Variable{ccseparator}\Index{Trennzeichen} nicht leer ist, wird dem
\PName{Verteiler} die \PName{Bezeichnung} und der \PName{Inhalt} dieser
Variablen vorangestellt. Der \PName{Verteiler} selbst wird dann um die
-entsprechende Breite eingerückt ausgegeben. Es empfiehlt\textnote{Tipp!}
-sich, den \PName{Verteiler} \Macro{raggedright}\IndexCmd{raggedright} zu
-setzen und die einzelnen Angaben durch doppelten Backslash voneinander zu
-trennen.
+entsprechende Breite eingerückt ausgegeben. Sollen die einzelnen Einträge
+untereinander gesetzt werden, können sie durch doppelten Backslash voneinander
+getrennt angegeben werden.
\begin{Example}
Der Beispielbrief soll dieses Mal nicht nur an die Vorsitzende, sondern mit
Verteiler auch an alle Mitglieder des Vereins gehen:
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/scrlttr2-en.tex b/Master/texmf-dist/source/latex/koma-script/doc/scrlttr2-en.tex
index 075d9173d50..bff4cba3545 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/scrlttr2-en.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/scrlttr2-en.tex
@@ -24,7 +24,7 @@
% ============================================================================
\KOMAProvidesFile{scrlttr2-en.tex}%
- [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $
+ [$Date: 2022-10-12 08:12:27 +0200 (Mi, 12. Okt 2022) $
KOMA-Script guide (chapter: scrlttr2)]
\translator{Harald Bongartz\and Georg Grandke\and Raimund Kohl\and Jens-Uwe
@@ -1231,13 +1231,13 @@ abbreviation is printed neither automatically nor optionally by the
\end{Declaration}
You can print a \PName{distribution list}\Index{recipient>additional}%
\Index{distribution list}\Index{carbon copy} with the \Macro{cc} command. The
-command takes the \PName{distribution list} as its argument. If the content of
-the variable \Variable{ccseparator}\Index{separator}\Index{delimiter} is not
-empty, the name and content of this variable are inserted before the
+command takes the \PName{distribution list} as its argument. If the
+\PName{name} of the variable
+\Variable{ccseparator}\Index{separator}\Index{delimiter} is not empty, the
+\PName{name} and \PName{content} of this variable are inserted before the
\PName{distribution list}. In this case, the \PName{distribution list} will be
-indented appropriately. It's a good idea\textnote{Hint!} to set the
-\PName{distribution list} \Macro{raggedright}\IndexCmd{raggedright} and to
-separate the individual entries with a double backslash.
+indented appropriately. If the individual entries are to be printed one below
+the other, they can be separated by a double backslash.
\begin{Example}
This time, the sample letter should go not only to the chairman but also to
all club members:
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/scrwfile-de.tex b/Master/texmf-dist/source/latex/koma-script/doc/scrwfile-de.tex
index 0b3fa398419..11f2107b848 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/scrwfile-de.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/scrwfile-de.tex
@@ -24,7 +24,7 @@
% ============================================================================
\KOMAProvidesFile{scrwfile-de.tex}
- [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $
+ [$Date: 2022-07-17 12:36:46 +0200 (So, 17. Jul 2022) $
KOMA-Script guide (chapter: scrwfile)]
\chapter{Dateien mit \Package{scrwfile} sparen und ersetzen}
@@ -48,7 +48,7 @@ Im Endeffekt kann es daher geschehen, dass irgendwann die Meldung
\fi
\end{lstcode}
erscheint. Seit einiger Zeit ist die einfachste Lösung dieses Problems die
-Verwendung von Lua\LaTeX{} anstelle von PDF\LaTeX{} oder \XeLaTeX. Damit
+Verwendung von \LuaLaTeX{} anstelle von PDF\LaTeX{} oder \XeLaTeX. Damit
entfällt die Beschränkung und die maximale Anzahl der gleichzeitig zum
Schreiben geöffneten Dateien wird nur noch durch das Betriebssystem
bestimmt. In der Realität braucht man sich darüber dann normalerweise keine
@@ -62,8 +62,8 @@ auch kein weiteres Mal gesetzt werden, da die zugehörige Hilfsdatei nach dem
jeweiligen Befehl bis zum Ende des Dokuments leer ist.
Das Paket \Package{scrwfile} bietet hier eine grundsätzliche Änderung im
-\LaTeX-Kern, durch die beide Probleme nicht nur für Lua\LaTeX{} sondern auch bei
-Verwendung von PDF\LaTeX{} oder \XeLaTeX{} gelöst werden können.
+\LaTeX-Kern, durch die beide Probleme nicht nur für \LuaLaTeX{} sondern auch
+bei Verwendung von PDF\LaTeX{} oder \XeLaTeX{} gelöst werden können.
\section{Grundsätzliche Änderungen am \LaTeX-Kern}
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/scrwfile-en.tex b/Master/texmf-dist/source/latex/koma-script/doc/scrwfile-en.tex
index 1782d26e65f..5d87d4f9941 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/scrwfile-en.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/scrwfile-en.tex
@@ -24,7 +24,7 @@
% ============================================================================
\KOMAProvidesFile{scrwfile-en.tex}%
- [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $
+ [$Date: 2022-07-17 12:36:46 +0200 (So, 17. Jul 2022) $
KOMA-Script guide (chapter: scrwfile)]
\translator{Markus Kohm\and Jana Schubert\and Karl Hagen}
@@ -52,7 +52,7 @@ The bottom line is that eventually you may get the following error message:
\end{lstcode}
For some time, the simplest solution to this problem has been to use
-\mbox{Lua\LaTeX} instead of \mbox{pdf\LaTeX} or \XeLaTeX. This eliminates the
+\mbox{\LuaLaTeX} instead of \mbox{pdf\LaTeX} or \XeLaTeX. This eliminates the
restriction, and the maximum number of files you can have open for writing is
then limited only by the operating system. In reality, you usually so not need
to worry about it any more.
@@ -67,7 +67,7 @@ output a second time because the associated auxiliary file\footnote{The term
after the respective command until the end of the document.
The \Package{scrwfile} package makes a fundamental change to the \LaTeX{}
-kernel, which can solve both problems not only for \mbox{Lua\LaTeX} but also
+kernel, which can solve both problems not only for \mbox{\LuaLaTeX} but also
for \mbox{pdf\LaTeX} or \XeLaTeX.
\section{Fundamental Changes to the \LaTeX{} Kernel}
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/tocbasic-de.tex b/Master/texmf-dist/source/latex/koma-script/doc/tocbasic-de.tex
index 06a53bad82f..bc9995cb3e3 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/tocbasic-de.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/tocbasic-de.tex
@@ -24,7 +24,7 @@
% ======================================================================
\KOMAProvidesFile{tocbasic-de.tex}
- [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $
+ [$Date: 2022-07-17 12:36:46 +0200 (So, 17. Jul 2022) $
KOMA-Script guide (package tocbasic)]
\chapter{Verzeichnisse verwalten mit Hilfe von \Package{tocbasic}}
@@ -535,7 +535,7 @@ dieser Anweisungen zu einer Fehlermeldung der Art
führen, wenn keine Schreibdateien mehr zur Verfügung stehen. Abhilfe kann in
diesem Fall das Laden des in \autoref{cha:scrwfile} beschriebenen Pakets
\Package{scrwfile}\important{\Package{scrwfile}}\IndexPackage{scrwfile}
-oder die Verwendung von Lua\LaTeX{} bieten.
+oder die Verwendung von \LuaLaTeX{} bieten.
Das Paket \hyperref[cha:scrhack]{\Package{scrhack}}\IndexPackage{scrhack}%
\important{ \hyperref[cha:scrhack]{\Package{scrhack}}} enthält übrigens
@@ -2135,7 +2135,7 @@ Anweisung zu einer Fehlermeldung der Art
führen, wenn keine Schreibdateien mehr zur Verfügung stehen. Abhilfe kann in
diesem Fall das Laden des in \autoref{cha:scrwfile} beschriebenen Pakets
\Package{scrwfile}\important{\Package{scrwfile}}\IndexPackage{scrwfile}
-oder die Verwendung von Lua\LaTeX{} bieten.%
+oder die Verwendung von \LuaLaTeX{} bieten.%
\EndIndexGroup
@@ -2836,13 +2836,14 @@ möglich. Siehe dazu \autoref{sec:tocbasic.tocstyle},
\end{center}%
\end{Example}%
-Benutzer von
+Benutzer von älteren Versionen von Paket
\Package{hyperref}\IndexPackage{hyperref}\important{\Package{hyperref}}
sollten Option \Option{listname} übrigens immer angeben. Anderenfalls kommt es
in der Regel zu einer Fehlermeldung, weil \Package{hyperref} nicht mit dem
\Macro{MakeUppercase}\IndexCmd{MakeUppercase} im Namen des Verzeichnisses
zurecht kommt, das benötigt wird, um den ersten Buchstaben des Wertes von
-\Option{types} in Großbuchstaben zu wandeln.%
+\Option{types} in Großbuchstaben zu wandeln. Besser ist natürlich die
+Verwendung eines aktuellen \Package{hyperref} mit einem aktuellen \LaTeX.%
\EndIndexGroup%
\section{Obsolete Befehle}
diff --git a/Master/texmf-dist/source/latex/koma-script/doc/tocbasic-en.tex b/Master/texmf-dist/source/latex/koma-script/doc/tocbasic-en.tex
index fe5be7f4a6a..b4f0a1174e5 100644
--- a/Master/texmf-dist/source/latex/koma-script/doc/tocbasic-en.tex
+++ b/Master/texmf-dist/source/latex/koma-script/doc/tocbasic-en.tex
@@ -24,7 +24,7 @@
% ======================================================================
\KOMAProvidesFile{tocbasic-en.tex}
- [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $
+ [$Date: 2022-07-17 12:36:46 +0200 (So, 17. Jul 2022) $
KOMA-Script guide (package tocbasic)]
\translator{Markus Kohm\and Arndt Schubert\and Karl Hagen}
@@ -1967,7 +1967,7 @@ message of the type
\end{lstoutput}
if no more write handles are available. You can solve this problem by loading
the \Package{scrwfile}\important{\Package{scrwfile}}\IndexPackage{scrwfile}
-package described in \autoref{cha:scrwfile}, or by using Lua\LaTeX{}.%
+package described in \autoref{cha:scrwfile}, or by using \LuaLaTeX{}.%
\EndIndexGroup
@@ -2579,10 +2579,12 @@ the styles.%
\end{center}%
\end{Example}
-Users of \Package{hyperref} should always use the \Option{listname} option.
-Otherwise they may get an error message because \Package{hyperref} usually has
-a problem with the \Macro{MakeUppercase}\IndexCmd{MakeUppercase} command that
-is needed to convert the first letter of \Option{types} to upper case.%
+Users of old versions of package \Package{hyperref} should always use the
+\Option{listname} option. Otherwise they may get an error message because
+\Package{hyperref} usually has a problem with the
+\Macro{MakeUppercase}\IndexCmd{MakeUppercase} command that is needed to
+convert the first letter of \Option{types} to upper case. Better is of course
+to use an up-to-date \Package{hyperref} with an up-to-date \LaTeX.%
\EndIndexGroup
diff --git a/Master/texmf-dist/source/latex/koma-script/koma-script-source-doc.dtx b/Master/texmf-dist/source/latex/koma-script/koma-script-source-doc.dtx
index d0ce38ca9ad..2cad321e5de 100644
--- a/Master/texmf-dist/source/latex/koma-script/koma-script-source-doc.dtx
+++ b/Master/texmf-dist/source/latex/koma-script/koma-script-source-doc.dtx
@@ -41,7 +41,7 @@
\ProvidesFile{koma-script-source-doc.dtx}
%</dtx>
%<+ins>\ProvidesFile{koma-script-source-doc.ins}
-[2022-03-10 v0.91 KOMA-Script source documentation]
+[2022-07-08 v0.92 KOMA-Script source documentation]
%<*dtx>
\ifx\documentclass\undefined
%</dtx>
@@ -729,6 +729,7 @@
%
% \begin{docitem}{PageStyle}
% \changes{v0.8}{2022/02/08}{added}
+% \changes{v0.92}{2022/07/08}{index group fixed}
% \begin{command}{\DescribePageStyle}
% \changes{v0.8}{2022/02/08}{added}
% \begin{environment}{pgstyle}
@@ -739,7 +740,7 @@
macrolike = false,
toplevel = true,
idxtype = \textit{pgstyle},
- idxgroup = page styles,
+ idxgroup = Page styles,
printtype = \textit{style}
]{PageStyle}{pgstyle}
% \end{macrocode}
@@ -749,6 +750,7 @@
%
% \begin{docitem}{DoHook}
% \changes{v0.91}{2022/03/10}{added}
+% \changes{v0.92}{2022/07/08}{index group fixed}
% \begin{command}{\DescribeDoHook}
% \changes{v0.91}{2022/03/10}{added}
% \begin{environment}{dohook}
@@ -759,7 +761,7 @@
macrolike = false,
toplevel = true,
idxtype = \textit{do hook},
- idxgroup = do hooks,
+ idxgroup = Do hooks,
printtype = \textit{dohook}
]{DoHook}{dohook}
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-compatibility.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-compatibility.dtx
index 104f9727f8c..ced2a0a0b86 100644
--- a/Master/texmf-dist/source/latex/koma-script/scrkernel-compatibility.dtx
+++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-compatibility.dtx
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-compatibility.dtx 3896 2022-06-21 09:06:07Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3949 2022-08-09 10:05:50Z kohm $
%<identify>%%% (run: identify)
%<init>%%% (run: init)
%<option>%%% (run: option)
@@ -27,9 +27,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\def\filedate{#2/#3/#4}}
- \filedate$Date: 2022-06-21 11:06:07 +0200 (Di, 21. Jun 2022) $
+ \filedate$Date: 2022-08-09 12:05:50 +0200 (Di, 09. Aug 2022) $
\def\filerevision$#1: #2 ${\def\filerevision{r#2}}
- \filerevision$Revision: 3896 $
+ \filerevision$Revision: 3949 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-compatibility.dtx}%
@@ -428,8 +428,10 @@
% \changes{v3.35}{2021/10/12}{added}
% \begin{macro}{\scr@v@3.36}
% \changes{v3.36}{2021/11/17}{added}
-% \begin{macro}{\scr@v@3.37 BETA}
-% \changes{v3.37 BETA}{2022/05/04}{added}
+% \begin{macro}{\scr@v@3.37}
+% \changes{v3.37}{2022/05/04}{added}
+% \begin{macro}{\scr@v@3.38}
+% \changes{v3.38}{2022/07/06}{added}
% \begin{macro}{\scr@v@last}
% \changes{v2.9u}{2005/03/05}{added}
% Nun die unterschiedlichen möglichen Werte (|\scr@v@last| ist jeweils die
@@ -515,7 +517,8 @@
\@namedef{scr@v@3.34}{18}
\@namedef{scr@v@3.35}{19}
\@namedef{scr@v@3.36}{20}
-\@namedef{scr@v@3.37 BETA}{20}
+\@namedef{scr@v@3.37}{20}
+\@namedef{scr@v@3.38}{20}
\@namedef{scr@v@last}{20}
% \end{macrocode}
% \end{macro}
@@ -601,6 +604,7 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
% \end{option}
% \begin{macrocode}
%</init>
diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-floats.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-floats.dtx
index b0b1b3a1a48..a687254eb30 100644
--- a/Master/texmf-dist/source/latex/koma-script/scrkernel-floats.dtx
+++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-floats.dtx
@@ -18,16 +18,16 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-floats.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 3946 2022-07-20 10:37:02Z kohm $
%<option>%%% (run: option)
%<body>%%% (run: body)
%<*dtx>
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-06-05 12:38:02 +0200 (So, 05. Jun 2022) $
+ \filedate$Date: 2022-07-20 12:37:02 +0200 (Mi, 20. Jul 2022) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3874 $
+ \filerevision$Revision: 3946 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-floats.dtx}%
@@ -544,15 +544,20 @@
% \end{macro}^^A \ifscap@alt
% \begin{macro}{\scap@currentlabel}
% \changes{v2.8q}{2001/11/24}{added}
+% \begin{macro}{\scap@currentcounter,\scap@currentlabelname,\scap@currentHref}
+% \changes{v3.38}{2022/07/30}{added}
% Because of using \cs{caption} inside a box and inside an environment, a
% label after the \env{captionbeside} environment usually would not reference
% the caption number. To preserve this after the end of the
-% \env{captionbeside} the current label is locally stored into global
-% \cs{scap@currentlabel} and restored after the end of the environment using
-% \cs{aftergroup}. Note: You can have only one \cs{label} inside!.
+% \env{captionbeside} the current label and counter are locally stored into
+% global \cs{scap@currentlabel} and restored after the end of the environment
+% using \cs{aftergroup}. Note: You can have only one \cs{label} inside!
% \begin{macrocode}
\newcommand*{\scap@currentlabel}{}
+\newcommand*{\scap@currentlabelname}{}
+\newcommand*{\scap@currentHref}{}
% \end{macrocode}
+% \end{macro}^^A \scap@currentcounter … \scap@currentHref
% \end{macro}^^A \scap@currentlabel
% \begin{macro}{\@@@captionbeside,\@@captionbeside,\@captionbeside}
% \changes{v2.8q}{2001/11/22}{added}
@@ -676,11 +681,18 @@
% \end{macrocode}
% \changes{v2.9p}{2003/12/10}{\cs{@temdima} replaced by
% \cs{wd}\cs{c@pti@nb@sid@b@x}, because \cs{@temdima} would be changed}
+% \changes{v3.38}{2022/07/20}{using \cs{scap@currentcounter}}
+% \changes{v3.38}{2022/07/20}{using \cs{scap@currentlabelname}}
+% \changes{v3.38}{2022/07/20}{using \cs{scap@currentHref}}
% \begin{macrocode}
\if l\@tempa
\rlap{%
\parbox[\scap@valign]{\@tempdimb}{\scap@caption
- \global\let\scap@currentlabel\@currentlabel}%
+ \global\let\scap@currentlabel\@currentlabel
+ \global\let\scap@currentcounter\@currentcounter
+ \global\let\scap@currentlabelname\@currentlabelname
+ \global\let\scap@currentHref\@currentHref
+ }%
\nobreak\hskip\columnsep
\parbox[\scap@valign]{\wd\c@pti@nb@sid@b@x}{\usebox\c@pti@nb@sid@b@x}%
}%
@@ -689,12 +701,18 @@
\parbox[\scap@valign]{\wd\c@pti@nb@sid@b@x}{\usebox\c@pti@nb@sid@b@x}%
\nobreak\hskip\columnsep
\parbox[\scap@valign]{\@tempdimb}{\scap@caption
- \global\let\scap@currentlabel\@currentlabel}%
+ \global\let\scap@currentlabel\@currentlabel
+ \global\let\scap@currentcounter\@currentcounter
+ \global\let\scap@currentlabelname\@currentlabelname
+ \global\let\scap@currentHref\@currentHref
+ }%
}%
\fi
\par
- \aftergroup\let\aftergroup\@currentlabel
- \aftergroup\scap@currentlabel
+ \aftergroup\let\aftergroup\@currentlabel\aftergroup\scap@currentlabel
+ \aftergroup\let\aftergroup\@currentcounter\aftergroup\scap@currentcounter
+ \aftergroup\let\aftergroup\@currentlabelname\aftergroup\scap@currentlabelname
+ \aftergroup\let\aftergroup\@currentHref\aftergroup\scap@currentHref
}
% \end{macrocode}
% \end{environment}^^A captionbeside
diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-fonts.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-fonts.dtx
index 7c4c1af971f..b5859b13313 100644
--- a/Master/texmf-dist/source/latex/koma-script/scrkernel-fonts.dtx
+++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-fonts.dtx
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-fonts.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3958 2022-10-06 12:44:28Z kohm $
%<identify>%%% (run: identify)
%<option>%%% (run: option)
%<body>%%% (run: body)
@@ -29,9 +29,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-06-05 12:38:02 +0200 (So, 05. Jun 2022) $
+ \filedate$Date: 2022-10-06 14:44:28 +0200 (Do, 06. Okt 2022) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3874 $
+ \filerevision$Revision: 3958 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-fonts.dtx}%
@@ -187,17 +187,14 @@
% \end{macrocode}
% \end{macro}
%
-% \changes{v3.17}{2015/03/10}{die Schriftgröße wird in der internen
-% Optionenliste gespeichert}
+% \changes{v3.17}{2015/03/10}{saving option values in internal list}
% \begin{option}{fontsize}
-% \changes{v2.96}{2006/08/11}{Funktion komplett geändert}
-% \changes{v2.98c}{2008/03/26}{lädt nach Möglichkeit die zugehörige
-% Schriftgrößendatei}
-% \changes{v3.12}{2013/03/05}{Status wird mit \cs{FamilyKeyStateProcessed}
-% gesetzt.}
-% Hier nun die Option, die tatsächlich verwendet wird. Es sei darauf
-% hingewiesen, dass damit auch Schriftgrößen wie \texttt{10.3pt} denkbar
-% wären.
+% \changes{v2.96}{2006/08/11}{function rewritten}
+% \changes{v2.98c}{2008/03/26}{loading font size file if available}
+% \changes{v3.12}{2013/03/05}{signaling using \cs{FamilyKeyStateProcessed}}
+% \changes{v3.38}{2022/10/06}{error message in horizontal mode added}
+% The option itself. Note, that it supports also font sizes like
+% \texttt{10.3pt}.
% \begin{macrocode}
\KOMA@key{fontsize}{%
%<*!extend>
@@ -206,6 +203,32 @@
\edef\@ptsize{#1}%
}{%
%</!extend>
+ \ifvmode\else
+ \par
+%<class> \ClassError{\KOMAClassName}{%
+%<extend> \PackageError{scrextend}{%
+ Option `fontsize' inside paragraph not allowed%
+ }{%
+ Option `fontsize' has been designed to change the base font size of
+ a\MessageBreak
+ document. It has not been made to change the current font
+ size. Moreover\MessageBreak
+ using it inside a paragraph mostly will not have the intended result,
+ because\MessageBreak
+ TeX always uses the setting of `\string\baselineskip' and other
+ parameters from the\MessageBreak
+ end of a paragraph for the whole paragraph. Therefore using option
+ `fontsize'\MessageBreak
+ in TeX's horizontal mode does not make sense and is not
+ permitted.\MessageBreak
+ You should use font size commands like `\string\Huge'…`\string\tiny'
+ or `\string\fontsize' here.\MessageBreak
+ See a LaTeX introduction for more information.\MessageBreak
+ But maybe you've just forgotten to make a paragraph. So if you'd
+ continue,\MessageBreak
+ I'll add `\expandafter\string\csname par\endcsname'.%
+ }%
+ \fi
\expandafter\@defaultunits\expandafter\@tempdima#1 pt\relax\@nnil
\edef\@tempa{#1}%
\setlength{\@tempdimb}{\@tempdima}%
@@ -285,8 +308,11 @@
% \begin{command}{\normalsize,\small,\footnotesize,\scriptsize,\tiny,\large,
% \Large,\LARGE,\huge,\Huge}
% \changes{v2.98c}{2008/03/26}{defined in the \file{scrsize\dots.clo} files}
+% \changes{v3.38}{2022/07/30}{define the macros robust as the \file{clo} files
+% from 2021/10/04}
% \begin{macrocode}
-\def\normalsize{%
+\let\normalsize\@undefined
+\DeclareRobustCommand\normalsize{%
%<*10pt>
\@setfontsize\normalsize\@xpt\@xiipt
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
@@ -308,7 +334,8 @@
\belowdisplayskip \abovedisplayskip
\let\@listi\@listI
}
-\def\small{%
+\let\small\@undefined
+\DeclareRobustCommand\small{%
%<*10pt>
\@setfontsize\small\@ixpt{11}%
\abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@
@@ -341,7 +368,8 @@
%</12pt>
\belowdisplayskip \abovedisplayskip
}
-\def\footnotesize{%
+\let\footnotesize\@undefined
+\DeclareRobustCommand\footnotesize{%
%<*10pt>
\@setfontsize\footnotesize\@viiipt{9.5}%
\abovedisplayskip 6\p@ \@plus2\p@ \@minus4\p@
@@ -375,31 +403,55 @@
\belowdisplayskip \abovedisplayskip
}
%<*10pt>
-\def\scriptsize{\@setfontsize\scriptsize\@viipt\@viiipt}
-\def\tiny{\@setfontsize\tiny\@vpt\@vipt}
-\def\large{\@setfontsize\large\@xiipt{14}}
-\def\Large{\@setfontsize\Large\@xivpt{18}}
-\def\LARGE{\@setfontsize\LARGE\@xviipt{22}}
-\def\huge{\@setfontsize\huge\@xxpt{25}}
-\def\Huge{\@setfontsize\Huge\@xxvpt{30}}
+\let\scriptsize\@undefined
+\DeclareRobustCommand\scriptsize{\@setfontsize\scriptsize\@viipt\@viiipt}
+\let\tiny\@undefined
+\DeclareRobustCommand\tiny{\@setfontsize\tiny\@vpt\@vipt}
+\let\large\@undefined
+\DeclareRobustCommand\large{\@setfontsize\large\@xiipt{14}}
+\let\Large\@undefined
+\DeclareRobustCommand\Large{\@setfontsize\Large\@xivpt{18}}
+\let\LARGE\@undefined
+\DeclareRobustCommand\LARGE{\@setfontsize\LARGE\@xviipt{22}}
+\let\huge\@undefined
+\DeclareRobustCommand\huge{\@setfontsize\huge\@xxpt{25}}
+\let\Huge\@undefined
+\DeclareRobustCommand\Huge{\@setfontsize\Huge\@xxvpt{30}}
%</10pt>
%<*11pt>
-\def\scriptsize{\@setfontsize\scriptsize\@viiipt{9.5}}
-\def\tiny{\@setfontsize\tiny\@vipt\@viipt}
-\def\large{\@setfontsize\large\@xiipt{14}}
-\def\Large{\@setfontsize\Large\@xivpt{18}}
-\def\LARGE{\@setfontsize\LARGE\@xviipt{22}}
-\def\huge{\@setfontsize\huge\@xxpt{25}}
-\def\Huge{\@setfontsize\Huge\@xxvpt{30}}
+\let\scriptsize\@undefined
+\DeclareRobustCommand\scriptsize{\@setfontsize\scriptsize\@viiipt{9.5}}
+\let\tiny\@undefined
+\DeclareRobustCommand\tiny{\@setfontsize\tiny\@vipt\@viipt}
+\let\large\@undefined
+\DeclareRobustCommand\large{\@setfontsize\large\@xiipt{14}}
+\let\Large\@undefined
+\DeclareRobustCommand\Large{\@setfontsize\Large\@xivpt{18}}
+\let\LARGE\@undefined
+\DeclareRobustCommand\LARGE{\@setfontsize\LARGE\@xviipt{22}}
+\let\huge\@undefined
+\DeclareRobustCommand\huge{\@setfontsize\huge\@xxpt{25}}
+\let\Huge\@undefined
+\DeclareRobustCommand\Huge{\@setfontsize\Huge\@xxvpt{30}}
%</11pt>
%<*12pt>
-\def\scriptsize{\@setfontsize\scriptsize\@viiipt{9.5}}
-\def\tiny{\@setfontsize\tiny\@vipt\@viipt}
-\def\large{\@setfontsize\large\@xivpt{18}}
-\def\Large{\@setfontsize\Large\@xviipt{22}}
-\def\LARGE{\@setfontsize\LARGE\@xxpt{25}}
-\def\huge{\@setfontsize\huge\@xxvpt{30}}
-\let\Huge=\huge
+\let\scriptsize\@undefined
+\DeclareRobustCommand\scriptsize{\@setfontsize\scriptsize\@viiipt{9.5}}
+\let\tiny\@undefined
+\DeclareRobustCommand\tiny{\@setfontsize\tiny\@vipt\@viipt}
+\let\large\@undefined
+\DeclareRobustCommand\large{\@setfontsize\large\@xivpt{18}}
+\let\Large\@undefined
+\DeclareRobustCommand\Large{\@setfontsize\Large\@xviipt{22}}
+\let\LARGE\@undefined
+\DeclareRobustCommand\LARGE{\@setfontsize\LARGE\@xxpt{25}}
+\let\huge\@undefined
+\DeclareRobustCommand\huge{\@setfontsize\huge\@xxvpt{30}}
+\@ifundefined{DeclareCommandCopy}{%
+ \let\Huge\huge
+}{%
+ \DeclareCommandCopy\Huge\huge
+}
%</12pt>
\normalsize
% \end{macrocode}
@@ -587,6 +639,8 @@
% \end{macrocode}
% \end{macro}
% \changes{v3.17}{2015/03/10}{\eTeX{} warning removed}
+% \changes{v3.38}{2022/07/30}{define the macros robust as the \file{clo} files
+% from 2021/10/04}
% \begin{macrocode}
\providecommand*{\simple@changefontsizes}[2][1.2\@tempdima]{%
\KOMA@kav@removekey{.%
@@ -626,7 +680,7 @@
{.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
\fi
\setlength{\belowdisplayskip}{\abovedisplayskip}%
- \edef\normalsize{%
+ \edef\reserved@a{%
\noexpand\@setfontsize\noexpand\normalsize
{\the\@tempdima}{\the\@tempdimb}%
\abovedisplayskip \the\abovedisplayskip
@@ -635,6 +689,8 @@
\belowdisplayshortskip \the\belowdisplayshortskip
\let\noexpand\@listi\noexpand\@listI
}%
+ \let\normalsize\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\normalsize\expandafter{\reserved@a}%
% \end{macrocode}
% Calculation and definition of \cs{small}:
% \begin{macrocode}
@@ -654,7 +710,7 @@
{.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
\fi
\setlength{\belowdisplayskip}{\abovedisplayskip}%
- \edef\small{%
+ \edef\reserved@a{%
\noexpand\@setfontsize\noexpand\small
{\the\@tempdima}{\the\@tempdimb}%
\abovedisplayskip \the\abovedisplayskip
@@ -663,6 +719,8 @@
\belowdisplayshortskip \the\belowdisplayshortskip
\let\noexpand\@listi\noexpand\@listi@small
}%
+ \let\small\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\small\expandafter{\reserved@a}%
% \end{macrocode}
% Calculation and definition of \cs{footnotesize}:
% \begin{macrocode}
@@ -682,7 +740,7 @@
{.5\@tempdimb}{.25\@tempdimb}{.25\@tempdimb}%
\fi
\setlength{\belowdisplayskip}{\abovedisplayskip}%
- \edef\footnotesize{%
+ \edef\reserved@a{%
\noexpand\@setfontsize\noexpand\footnotesize
{\the\@tempdima}{\the\@tempdimb}%
\abovedisplayskip \the\abovedisplayskip
@@ -691,69 +749,85 @@
\belowdisplayshortskip \the\belowdisplayshortskip
\let\noexpand\@listi\noexpand\@listi@footnotesize
}%
+ \let\footnotesize\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\footnotesize\expandafter{\reserved@a}%
% \end{macrocode}
% Calculation and definition of \cs{scriptsize}:
% \begin{macrocode}
\setlength{\@tempdima}{.66667\@tempdimc}%
\setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\scriptsize{%
+ \edef\reserved@a{%
\noexpand\@setfontsize\noexpand\scriptsize
{\the\@tempdima}{\the\@tempdimb}%
}%
+ \let\scriptsize\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\scriptsize\expandafter{\reserved@a}%
% \end{macrocode}
% Calculation and definition of \cs{tiny}:
% \begin{macrocode}
\setlength{\@tempdima}{.5\@tempdimc}%
\setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\tiny{%
+ \edef\reserved@a{%
\noexpand\@setfontsize\noexpand\tiny
{\the\@tempdima}{\the\@tempdimb}%
}%
+ \let\tiny\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\tiny\expandafter{\reserved@a}%
% \end{macrocode}
% Calculation and definition of \cs{large}:
% \begin{macrocode}
\setlength{\@tempdima}{1.2\@tempdimc}%
\setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\large{%
+ \edef\reserved@a{%
\noexpand\@setfontsize\noexpand\large
{\the\@tempdima}{\the\@tempdimb}%
}%
+ \let\large\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\large\expandafter{\reserved@a}%
% \end{macrocode}
% Calculation and definition of \cs{Large}:
% \begin{macrocode}
\setlength{\@tempdima}{1.44\@tempdimc}%
\setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Large{%
+ \edef\reserved@a{%
\noexpand\@setfontsize\noexpand\Large
{\the\@tempdima}{\the\@tempdimb}%
}%
+ \let\Large\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\Large\expandafter{\reserved@a}%
% \end{macrocode}
% Calculation and definition of \cs{LARGE}:
% \begin{macrocode}
\setlength{\@tempdima}{1.728\@tempdimc}%
\setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\LARGE{%
+ \edef\reserved@a{%
\noexpand\@setfontsize\noexpand\LARGE
{\the\@tempdima}{\the\@tempdimb}%
}%
+ \let\LARGE\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\LARGE\expandafter{\reserved@a}%
% \end{macrocode}
% Calculation and definition of \cs{huge}:
% \begin{macrocode}
\setlength{\@tempdima}{2.074\@tempdimc}%
\setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\huge{%
+ \edef\reserved@a{%
\noexpand\@setfontsize\noexpand\huge
{\the\@tempdima}{\the\@tempdimb}%
}%
+ \let\huge\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\huge\expandafter{\reserved@a}%
% \end{macrocode}
% Calculation and definition of \cs{Huge}:
% \begin{macrocode}
\setlength{\@tempdima}{2.488\@tempdimc}%
\setlength{\@tempdimb}{\@tempb\@tempdima}%
- \edef\Huge{%
+ \edef\reserved@a{%
\noexpand\@setfontsize\noexpand\Huge
{\the\@tempdima}{\the\@tempdimb}%
}%
+ \let\Huge\@undefined
+ \expandafter\DeclareRobustCommand\expandafter\Huge\expandafter{\reserved@a}%
% \end{macrocode}
% Activation of \cs{normalsize} and calculation of additional font size
% depending sized.
@@ -1076,6 +1150,8 @@
% \begin{macro}{\generate@fontfile}
% \changes{v3.09}{2011/02/23}{added}
% \changes{v3.16a}{2015/02/11}{\cs{footnotesize} fixed}
+% \changes{v3.38}{2022/07/30}{define the macros robust as the \file{clo} files
+% from 2021/10/04}
% Output of the font size file using the current font setting. It has to be
% used inside a local group!
% \begin{macrocode}
@@ -1092,7 +1168,8 @@
\the\year/\ifnum\month<10 0\fi\the\month/\ifnum\day<10 0\fi\the\day%
\space generated font size class option (#2)]}%
\immediate\write\@fontfile{%
- \string\def\string\normalsize{\@percentchar^^J%
+ \string\let\string\normalsize\string\@undefined
+ \string\DeclareRobustCommand\string\normalsize{\@percentchar^^J%
\@ind\string\@setfontsize\string\normalsize{\f@size}{\f@baselineskip}%
\@percentchar^^J%
\@ind\string\abovedisplayskip\space \the\abovedisplayskip^^J%
@@ -1104,7 +1181,8 @@
}%
\begingroup\small\@listi
\immediate\write\@fontfile{%
- \string\def\string\small{\@percentchar^^J%
+ \string\let\string\small\string\@undefined
+ \string\DeclareRobustCommand\string\small{\@percentchar^^J%
\@ind\string\@setfontsize\string\small{\f@size}{\f@baselineskip}%
\@percentchar^^J%
\@ind\string\abovedisplayskip\space \the\abovedisplayskip^^J%
@@ -1122,7 +1200,8 @@
\endgroup
\begingroup\footnotesize\@listi
\immediate\write\@fontfile{%
- \string\def\string\footnotesize{\@percentchar^^J%
+ \string\let\string\footnotesize\string\@undefined
+ \string\DeclareRobustCommand\string\footnotesize{\@percentchar^^J%
\@ind\string\@setfontsize\string\footnotesize{\f@size}{\f@baselineskip}%
\@percentchar^^J%
\@ind\string\abovedisplayskip\space \the\abovedisplayskip^^J%
@@ -1140,49 +1219,56 @@
\endgroup
\begingroup\scriptsize
\immediate\write\@fontfile{%
- \string\def\string\scriptsize{%
+ \string\let\string\scriptsize\string\@undefined
+ \string\DeclareRobustCommand\string\scriptsize{%
\string\@setfontsize\string\scriptsize{\f@size}{\f@baselineskip}%
}\@percentchar%
}%
\endgroup
\begingroup\tiny
\immediate\write\@fontfile{%
- \string\def\string\tiny{%
+ \string\let\string\tiny\string\@undefined
+ \string\DeclareRobustCommand\string\tiny{%
\string\@setfontsize\string\tiny{\f@size}{\f@baselineskip}%
}\@percentchar%
}%
\endgroup
\begingroup\large
\immediate\write\@fontfile{%
- \string\def\string\large{%
+ \string\let\string\large\string\@undefined
+ \string\DeclareRobustCommand\string\large{%
\string\@setfontsize\string\large{\f@size}{\f@baselineskip}%
}\@percentchar%
}%
\endgroup
\begingroup\Large
\immediate\write\@fontfile{%
- \string\def\string\Large{%
+ \string\let\string\Large\@undefined
+ \string\DeclareRobustCommand\string\Large{%
\string\@setfontsize\string\Large{\f@size}{\f@baselineskip}%
}\@percentchar%
}%
\endgroup
\begingroup\LARGE
\immediate\write\@fontfile{%
- \string\def\string\LARGE{%
+ \string\let\string\LARGE\@undefined
+ \string\DeclareRobustCommand\string\LARGE{%
\string\@setfontsize\string\LARGE{\f@size}{\f@baselineskip}%
}\@percentchar%
}%
\endgroup
\begingroup\huge
\immediate\write\@fontfile{%
- \string\def\string\huge{%
+ \string\let\string\huge\@undefined
+ \string\DeclareRobustCommand\string\huge{%
\string\@setfontsize\string\huge{\f@size}{\f@baselineskip}%
}\@percentchar%
}%
\endgroup
\begingroup\Huge
\immediate\write\@fontfile{%
- \string\def\string\Huge{%
+ \string\let\string\Huge\@undefined
+ \string\DeclareRobustCommand\string\Huge{%
\string\@setfontsize\string\Huge{\f@size}{\f@baselineskip}%
}\@percentchar%
}%
@@ -1445,13 +1531,17 @@
%</class&option>
% \end{macrocode}
% \end{macro}^^A \scr@degineobsoletefonts
-% \end{option}^^A enabledeprecatedfontscommands
+% \end{option}^^A enabledeprecatedfontcommands
%
% \begin{macro}{\scr@DeclareOldFontCommand}
% \changes{v3.12}{2013/10/31}{added}
% \changes{v3.20}{2015/10/14}{deprecated escalation}
+% \changes{v3.38}{2022/08/28}{deprecated definition delayed}
% The command is similar to \cs{DeclareOldFontCommand} but adds a warning,
-% info, error to the commands.
+% info, error to the commands and delays the definition until
+% |\begin{document}|. The delay is done to allow users or package authors to
+% define the commands in the document preamble if they are not yet defined. So
+% (package) authors do not need to detect \KOMAScript{} but only existence.
% \begin{macrocode}
%<*class&body>
\newcommand*{\scr@DeclareOldFontCommand}[3]{%
@@ -1459,10 +1549,14 @@
\ifnum\scr@defineobsoletefonts>\tw@
\DeclareOldFontCommand{#1}{#2}{#3}%
\else
- \DeclareOldFontCommand{#1}{%
- \scr@ErrorWarningInfo{#1}{#2}#2%
- }{%
- \scr@ErrorWarningInfo{#1}{#3}#3%
+ \AtBeginDocument{%
+ \ifdefined#1\else
+ \DeclareOldFontCommand{#1}{%
+ \scr@ErrorWarningInfo{#1}{#2}#2%
+ }{%
+ \scr@ErrorWarningInfo{#1}{#3}#3%
+ }%
+ \fi
}%
\fi
\fi
diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-sections.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-sections.dtx
index 5ed80eebaae..0a9a21dd265 100644
--- a/Master/texmf-dist/source/latex/koma-script/scrkernel-sections.dtx
+++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-sections.dtx
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-sections.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3954 2022-10-04 09:20:19Z kohm $
% The runs of run-time file generation:
%<preidentify>%%% (run: preidentify)
% - everything that is needed before selfidentification of resulting files
@@ -40,9 +40,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-06-05 12:38:02 +0200 (So, 05. Jun 2022) $
+ \filedate$Date: 2022-10-04 11:20:19 +0200 (Di, 04. Okt 2022) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3874 $
+ \filerevision$Revision: 3954 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-sections.dtx}%
@@ -1587,6 +1587,7 @@
% \DeclareSectionCommandStyleFontOption}
% \changes{v3.17}{2015/03/23}{added}
% \changes{v3.20}{2016/04/25}{argument expansion}
+% \changes{v3.38}{2022/09/16}{copy option added}
% All these commands have the four arguments:
% \begin{quote}
% \marg{style}\marg{option}\marg{prefix}\marg{postfix}
@@ -1628,6 +1629,17 @@
\fi
\fi
}%
+ \DeclareSectionCommandStyleOption{#1}{#2:}{%
+ \scr@ifundefinedorrelax{#3##1#4}{\FamilyKeyStateUnknownValue}{%
+ \ifscr@dsc@expandtopt
+ \setlength{\@tempskipa}{\@nameuse{#3##1#4}}%
+ \expandafter\edef\csname #3\scr@dsc@current#4\endcsname{\the\@tempskipa}%
+ \else
+ \@namedef{#3\scr@dsc@current#4}{\@nameuse{#3##1#4}}%
+ \fi
+ \FamilyKeyStateProcessed
+ }%
+ }%
}
\newcommand*{\DeclareSectionCommandStyleNumberOption}[4]{%
\DeclareSectionCommandStyleOption{#1}{#2}{%
@@ -1638,6 +1650,17 @@
\expandafter\let\csname #3\scr@dsc@current#4\endcsname\reserved@a
\fi
}%
+ \DeclareSectionCommandStyleOption{#1}{#2:}{%
+ \scr@ifundefinedorrelax{#3##1#4}{\FamilyKeyStateUnknownValue}{%
+ \ifscr@dsc@expandtopt
+ \@tempcnta=\@nameuse{#3##1#4}%
+ \expandafter\edef\csname #3\scr@dsc@current#4\endcsname{\the\@tempcnta}%
+ \else
+ \@namedef{#3\scr@dsc@current#4}{\@nameuse{#3##1#4}}%
+ \fi
+ \FamilyKeyStateProcessed
+ }%
+ }%
}
\newcommand*{\DeclareSectionCommandStyleFontOption}[4]{%
\DeclareSectionCommandStyleOption{#1}{#2}{%
@@ -1648,12 +1671,23 @@
}{#3\scr@dsc@current#4}{##1}%
\FamilyKeyStateProcessed
}%
+ \DeclareSectionCommandStyleOption{#1}{#2:}{%
+ \IfExistskomafont{#3##1#4}{%
+ \IfExistskomafont{#3\scr@dsc@current#4}{%
+ \setkomafont
+ }{%
+ \newkomafont
+ }{#3\scr@dsc@current#4}{\usekomafont{#3##1#4}}%
+ \FamilyKeyStateProcessed
+ }{\FamilyKeyStateUnknownValue}%
+ }%
}
% \end{macrocode}
% \end{command}^^A \DeclareSectionCommandStyleLengthOption …
% \begin{command}{\DeclareSectionCommandStyleFuzzyOption}
% \changes{v3.26}{2018/09/18}{added}
% \changes{v3.28}{2019/11/18}{\cs{ifstr} renamed to \cs{Ifstr}}
+% \changes{v3.38}{2022/09/16}{copy option added}
% We also have a kind of fuzzy option. A fuzzy option defined by
% \begin{quote}
% \cs{DeclareSectionCommandStyleFuzzyOption}\meta{style}\meta{option}%
@@ -1686,6 +1720,19 @@
}{}%
\fi
}%
+ \DeclareSectionCommandStyleOption{#1}{#2:}{%
+ \scr@ifundefinedorrelax{#3##1#4}{\FamilyKeyStateUnknownValue}{%
+ \ifscr@dsc@expandtopt
+ \expandafter\let\csname #3\scr@dsc@current#4\expandafter\endcsname
+ \csname #3##1#4\endcsname
+ \else
+ \expandafter\def\csname #3\scr@dsc@current#4\endcsname{%
+ \@nameuse{#3##1#4}%
+ }%
+ \fi
+ \FamilyKeyStateProcessed
+ }%
+ }%
}
% \end{macrocode}
% \end{command}^^A \DeclareSectionCommandStyleFuzzyOptions
@@ -3297,30 +3344,33 @@
}%
% \end{macrocode}
% \changes{v3.26b}{2019/01/17}{workaround for \cs{@beginmainauxhook} added}
+% \changes{v3.38}{2022/10/04}{\pkg{auxhook} not needed with newer \pkg{hyperref}}
% Sometimes \pkg{auxhook} is not able to recognize that it cannot use a
% patch of \cs{document} to execute \cs{@beginmainauxhook} if it is loaded via
% \cs{AtBeginDocument}. In this case we do it here.
% \begin{macrocode}
- \ifx\@beginmainauxhook\relax
- \else
- \if@filesw
- \ClassWarning{\KOMAClassName}{%
- seems someone has broken package `auxhook'.\MessageBreak
- Usually this happens, if `auxhook' is loaded or used\MessageBreak
- implicitly or explicitly by patching
- \string\document%
- \scr@ifundefinedorrelax{AtEndPreamble}{}{%
- \MessageBreak
- or via etoolbox command \string\AtEndPreamble%
- }.\MessageBreak
- Trying an emergency workaround.\MessageBreak
- You can avoid this warning adding:\MessageBreak
- \space\space\string\usepackage{auxhook}\MessageBreak
- before \string\begin{document}%
- }%
- \@beginmainauxhook
+ \@ifpackagelater{hyperref}{2022/09/22}{}{%
+ \ifx\@beginmainauxhook\relax
+ \else
+ \if@filesw
+ \ClassWarning{\KOMAClassName}{%
+ seems someone has broken package `auxhook'.\MessageBreak
+ Usually this happens, if `auxhook' is loaded or used\MessageBreak
+ implicitly or explicitly by patching
+ \string\document%
+ \scr@ifundefinedorrelax{AtEndPreamble}{}{%
+ \MessageBreak
+ or via etoolbox command \string\AtEndPreamble%
+ }.\MessageBreak
+ Trying an emergency workaround.\MessageBreak
+ You can avoid this warning adding:\MessageBreak
+ \space\space\string\usepackage{auxhook}\MessageBreak
+ before \string\begin{document}%
+ }%
+ \@beginmainauxhook
+ \fi
\fi
- \fi
+ }%
\fi
}%
}%
diff --git a/Master/texmf-dist/source/latex/koma-script/scrkernel-version.dtx b/Master/texmf-dist/source/latex/koma-script/scrkernel-version.dtx
index 68e66a542b1..96f1ac8db55 100644
--- a/Master/texmf-dist/source/latex/koma-script/scrkernel-version.dtx
+++ b/Master/texmf-dist/source/latex/koma-script/scrkernel-version.dtx
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-version.dtx 3920 2022-07-04 08:01:38Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3962 2022-10-12 06:33:06Z kohm $
%
% ATTENTION: In this file parts of the code and documentation are before the
% driver. This must be, because this part of the code is needed by the driver
@@ -138,7 +138,7 @@
% Note: Following line will be patched by \file{makebetaorrelase.sh} and
% therefore the syntax or general structure of the line must not be changed!
% \begin{macrocode}
- \@CheckKOMAScriptVersion{2022/07/04 v3.37 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2022/10/12 v3.38 KOMA-Script}%
\endgroup
% \end{macrocode}
% \end{macro}
diff --git a/Master/texmf-dist/source/latex/koma-script/scrlayer.dtx b/Master/texmf-dist/source/latex/koma-script/scrlayer.dtx
index 6fe55f5868a..104cb7257e7 100644
--- a/Master/texmf-dist/source/latex/koma-script/scrlayer.dtx
+++ b/Master/texmf-dist/source/latex/koma-script/scrlayer.dtx
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrlayer.dtx 3894 2022-06-19 10:25:46Z kohm $
+%%% From File: $Id: scrlayer.dtx 3945 2022-07-19 09:16:17Z kohm $
%<identify>%%% (run: identify)
%<init>%%% (run: init)
%<options>%%% (run: options)
@@ -28,9 +28,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-06-19 12:25:46 +0200 (So, 19. Jun 2022) $
+ \filedate$Date: 2022-07-19 11:16:17 +0200 (Di, 19. Jul 2022) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3894 $
+ \filerevision$Revision: 3945 $
\edef\reserved@a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrlayer.dtx}%
@@ -984,15 +984,10 @@
% defines additional levels later we'll do an additional test at
% \cs{begin}\texttt\{\env{document}\texttt\}. But we do not redo the part and
% the chapter test.
+% \changes{v3.38}{2022/07/19}{improved level initialization}
% \begin{macrocode}
-\scr@ifundefinedorrelax{part}{}{%
- \DeclareSectionNumberDepth{part}{-1}%
-}
-\if@chapter
- \DeclareSectionNumberDepth{chapter}{0}%
-\fi
\newcommand*{\scrlayer@level@init}{%
- \@tempcnta=1
+ \@tempcnta=\if@chapter \m@ne\else \z@\fi
\def\reserved@b##1{%
\@tempswatrue
\def\reserved@a{##1}%
@@ -1012,11 +1007,38 @@
}%
}%
}%
+ \reserved@b{part}%
+ \reserved@b{chapter}%
\reserved@b{section}%
\reserved@b{paragraph}%
\reserved@b{minisec}%
}
\scrlayer@level@init
+\renewcommand*{\scrlayer@level@init}{%
+ \@tempcnta=1
+ \def\reserved@b##1{%
+ \@tempswatrue
+ \def\reserved@a{##1}%
+ \@whilesw \if@tempswa \fi {%
+ \scr@ifundefinedorrelax{\reserved@a}{%
+ \@tempswafalse
+ }{%
+ \@ifundefined{\reserved@a numdepth}{%
+ \expandafter\DeclareSectionNumberDepth
+ \expandafter{\reserved@a}{\@tempcnta}%
+ }{%
+ \expandafter\DeclareSectionNumberDepth
+ \expandafter{\reserved@a}{\csname \reserved@a numdepth\endcsname}%
+ }%
+ \advance \@tempcnta by \@ne
+ \edef\reserved@a{sub\reserved@a}%
+ }%
+ }%
+ }%
+ \reserved@b{section}%
+ \reserved@b{paragraph}%
+ \reserved@b{minisec}%
+}
\AtBeginDocument{%
\scrlayer@level@init
}
diff --git a/Master/texmf-dist/source/latex/koma-script/scrmain.ins b/Master/texmf-dist/source/latex/koma-script/scrmain.ins
index 5974260a790..bd42e6186ba 100644
--- a/Master/texmf-dist/source/latex/koma-script/scrmain.ins
+++ b/Master/texmf-dist/source/latex/koma-script/scrmain.ins
@@ -18,7 +18,7 @@
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-% $Id: scrmain.ins 3889 2022-06-09 12:11:14Z kohm $
+% $Id: scrmain.ins 3959 2022-10-10 06:24:48Z kohm $
% ---------- KOMA-Script default docstrip declarations -----------------
@@ -320,7 +320,7 @@
\from{scrkernel-fonts.dtx}{package,letter,option}%
\from{scrkernel-variables.dtx}{package,letter,option}%
\from{scrkernel-pseudolengths.dtx}{package,letter,option}%
-% \from{scrkernel-typearea.dtx}{package,letter,option}%
+ \from{scrkernel-typearea.dtx}{package,letter,options}%
% \from{scrkernel-paragraphs.dtx}{package,letter,option}%
\from{scrkernel-pagestyles.dtx}{package,letter,option}%
% \from{scrkernel-floats.dtx}{package,letter,option}%
diff --git a/Master/texmf-dist/source/latex/koma-script/scrstrip.inc b/Master/texmf-dist/source/latex/koma-script/scrstrip.inc
index ba8bd193eee..094bc995ead 100644
--- a/Master/texmf-dist/source/latex/koma-script/scrstrip.inc
+++ b/Master/texmf-dist/source/latex/koma-script/scrstrip.inc
@@ -24,14 +24,14 @@
% This file will be included at startup of every KOMA-Script
% docstrip batch file.
% ======================================================================
-% $Id: scrstrip.inc 3915 2022-06-29 07:09:48Z kohm $
+% $Id: scrstrip.inc 3965 2022-10-12 08:28:57Z kohm $
% ---------- start of docstrip -----------------------------------------
\KOMAdefVariable{AUTHOR}{Markus Kohm}
\KOMAdefVariable{EMAIL}{[komascript at gmx info]}
\KOMAdefVariable{COPYRIGHTFROM}{1994}
-\KOMAdefVariable{COPYRIGHTTILL}{2021}
+\KOMAdefVariable{COPYRIGHTTILL}{2022}
\ifToplevel{%
\Msg{+======================================================================}
diff --git a/Master/texmf-dist/source/latex/koma-script/scrwfile.dtx b/Master/texmf-dist/source/latex/koma-script/scrwfile.dtx
index 39733636184..fb36f373e22 100644
--- a/Master/texmf-dist/source/latex/koma-script/scrwfile.dtx
+++ b/Master/texmf-dist/source/latex/koma-script/scrwfile.dtx
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrwfile.dtx 3889 2022-06-09 12:11:14Z kohm $
+%%% From File: $Id: scrwfile.dtx 3955 2022-10-06 08:13:32Z kohm $
%<*dtx>
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{scrwfile.dtx}
@@ -27,7 +27,7 @@
%<package&identify>\ProvidesPackage{scrwfile}
%<driver>\ProvidesFile{scrwfile.drv}
%<*dtx|(package&identify)|driver>
- [2021/05/30 v0.1.10 KOMA-Script package (write and clone files)]
+ [2022/10/06 v0.1.11 KOMA-Script package (write and clone files)]
%</dtx|(package&identify)|driver>
%<*dtx>
\ifx\documentclass\undefined
@@ -332,11 +332,13 @@
% \begin{macro}{\@starttoc,\scrwfile@saved@starttoc}
% We have to add the single handle feature to \cs{@starttoc} and therefore
% save the original definition.
-% \changes{v0.1.5}{2013/07/24}{take care for unfriendly \textsl{hyperref}}
+% \changes{v0.1.5}{2013/07/24}{take care for outdated \pkg{hyperref}}
+% \changes{v0.1.11}{2022/10/06}{ready for \pkg{hyperref} without
+% \cs{Hy@AtBeginDocumentHook}}
% \cs{scrwfile@saved@starttoc} is be used, whenever the file is not under
-% \pkg*{scrwfile}'s control. Because of package \textsl{hyperref}, that does
-% a hard redefinition without any care for changed definitions, we have to
-% take care for that unfriendly package and cannot do a simple
+% \pkg*{scrwfile}'s control. Because of old versions of package
+% \pkg{hyperref}, that do a hard redefinition without any care for changed
+% definitions, we have to take care for that and cannot do a simple
% \begin{verbatim}
% \let\scrwfile@saved@starttoc\@starttoc
% \let\@starttoc\scrwfile@starttoc
@@ -347,29 +349,41 @@
\begingroup
\@ifpackageloaded{hyperref}{%
\scr@ifundefinedorrelax{Hy@AtBeginDocument}{%
- \PackageWarning{scrwfile}{%
- Incompatible `hyperref` package detected!\MessageBreak
- You are using a `hyperref` version, that\MessageBreak
- doesn't provide `\string\Hy@AtBeginDocument`.\MessageBreak
- This may or may not work.\MessageBreak
- Using immediate redefinition%
+ \PackageInfo{scrwfile}{%
+ Using immediate redefinition of `\string\@starttoc'%
}%
\aftergroup\@firstofone
}{%
- \def\reserved@a{\AtBeginDocument}%
\ifx\Hy@AtBeginDocumentHook\@undefined
\PackageInfo{scrwfile}{%
- Using immediate redefinition%
+ Using immediate redefinition of `\string\@starttoc'%
}%
\aftergroup\@firstofone
\else
- \PackageInfo{scrwfile}{%
- Using `\string\Hy@AtBeginDocument`%
+% \end{macrocode}
+% From v7.00o \pkg{hyperref} does not redefine \cs{@starttoc} any more. So we
+% do need the usage of \cs{Hy@AtBeginDocument} only for versions before.
+% \begin{macrocode}
+ \@ifpackagelater{hyperref}{2022/02/22}{% newer than v7.00n
+ \PackageInfo{scrwfile}{%
+ Using immediate redefinition of `\string\@starttoc'%
+ }%
+ \aftergroup\@firstofone
+ }{%
+ \PackageWarning{scrwfile}{%
+ Outdated package `hyperref' detected.\MessageBreak
+ Using `\string\Hy@AtBeginDocument' for redefinition of
+ `\string\@starttoc'.\MessageBreak
+ We recommend to update `hyperref'
+ }%
+ \aftergroup\Hy@AtBeginDocument
}%
- \aftergroup\Hy@AtBeginDocument
\fi
}%
}{%
+ \PackageInfo{scrwfile}{%
+ Using immediate redefinition of `\string\@starttoc'%
+ }%
\aftergroup\@firstofone
}%
\endgroup
diff --git a/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx b/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx
index 1f93df3d810..98a021a2d20 100644
--- a/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx
+++ b/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: tocbasic.dtx 3874 2022-06-05 10:38:02Z kohm $
+%%% From File: $Id: tocbasic.dtx 3947 2022-07-22 05:59:41Z kohm $
%<identify>%%% (run: identify)
%<prepare>%%% (run: prepare)
%<option>%%% (run: option)
@@ -29,9 +29,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2022-06-05 12:38:02 +0200 (So, 05. Jun 2022) $
+ \filedate$Date: 2022-07-22 07:59:41 +0200 (Fr, 22. Jul 2022) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 3874 $
+ \filerevision$Revision: 3947 $
\endgroup
\ProvidesFile{tocbasic.dtx}[\filedate\space\filerevision\space
%</dtx>
@@ -407,18 +407,19 @@
% \begin{macro}{\tocbasic@extend@babel}
% \changes{v3.28}{2019/11/19}{\cs{iftocfeature} replaced by
% \cs{Iftocfeature}}
+% \changes{v3.38}{2022/07/22}{first test feature than availability}
% NOTE: To extend the original \cs{bbl@set@language} the argument of
% \cs{tocbasic@extend@babel} must not be a local macro (like \cs{@currext})
% \begin{macrocode}
\newcommand*{\tocbasic@extend@babel}[1]{%
- \scr@ifundefinedorrelax{bbl@set@language}{%
- \PackageInfo{tocbasic}{babel extension for `#1' omitted\MessageBreak
- because of missing \string\bbl@set@language}%
+ \Iftocfeature{#1}{nobabel}{%
+ \PackageInfo{tocbasic}{omitting babel extension for `#1'\MessageBreak
+ because of feature `nobabel' available\MessageBreak
+ for `#1'}%
}{%
- \Iftocfeature{#1}{nobabel}{%
+ \scr@ifundefinedorrelax{bbl@set@language}{%
\PackageInfo{tocbasic}{omitting babel extension for `#1'\MessageBreak
- because of feature `nobabel' available\MessageBreak
- for `#1'}%
+ because of missing \string\bbl@set@language}%
}{%
% \end{macrocode}
% \changes{v3.23}{2017/02/23}{using \cs{BabelContentsFiles} if available}
@@ -1279,6 +1280,15 @@
\edef\tb@nt@type{#2}%
\let\tb@nt@types\relax
\def\tb@nt@owner{float}%
+% \end{macrocode}
+% \begin{description}
+% \item[ToDo:] We still do not use \cs{MakeTitlecase} of \LaTeX{} from
+% 2022/06/01~PL\,5 here (and later), because \pkg{hyperref} 2022-06-20
+% v7.00s is still not able to process it. So we would get a warning message
+% instead of switching to uppercase. But maybe in some future, this could be
+% changed.
+% \end{description}
+% \begin{macrocode}
\def\tb@nt@name{\expandafter\protect\expandafter\MakeUppercase\tb@nt@type}%
\let\tb@nt@listname\relax
\let\tb@nt@counterwithin\@empty