diff options
Diffstat (limited to 'macros/latex/contrib/koma-script/doc')
63 files changed, 203 insertions, 60 deletions
diff --git a/macros/latex/contrib/koma-script/doc/common-pagestylemanipulation-de.tex b/macros/latex/contrib/koma-script/doc/common-pagestylemanipulation-de.tex index 70ad59f8a3..65e594df52 100644 --- a/macros/latex/contrib/koma-script/doc/common-pagestylemanipulation-de.tex +++ b/macros/latex/contrib/koma-script/doc/common-pagestylemanipulation-de.tex @@ -24,7 +24,7 @@ % ============================================================================ \KOMAProvidesFile{common-pagestylemanipulation-de.tex} - [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $ + [$Date: 2023-06-16 10:32:27 +0200 (Fr, 16. Jun 2023) $ KOMA-Script guide (common paragraph: Setting up defined page styles)] @@ -442,6 +442,18 @@ automatische Kolumnentitel mit Hilfe von \Macro{MakeUppercase} in Großbuchstaben gewandelt werden (Versalsatz).% }\\[-1.7ex] + \pventry{title}{\IndexOption[indexmain]{markcase~=title}% + \IfThisCommonLabelBase{scrlayer}{% + \ChangedAt{v3.41}{\Package{scrlayer}}}{% + \IfThisCommonLabelBase{scrlayer-scrpage}{% + \ChangedAt{v3.41}{\Package{scrlayer-scrpage}}}}{}% + definiert \DescRef{\LabelBase.cmd.MakeMarkcase} so um, dass + automatische Kolumnentitel mit Hilfe von \Macro{MakeTitlecase} + gewandelt werden (\emph{Englischer Titelsatz}). Dabei werden Nummer + und Titel getrennt behandelt. Ist \Macro{MakeTitlecase} wegen eines + zu alten \LaTeX{} Kerns nicht definiert, wird eine Warnung + ausgegeben und die Option ignoriert.% + }\\[-1.7ex] \pventry{used}{\IndexOption[indexmain]{markcase~=used}% definiert \DescRef{\LabelBase.cmd.MakeMarkcase} so um, dass für automatische Kolumnentitel keine automatische Veränderung der diff --git a/macros/latex/contrib/koma-script/doc/common-pagestylemanipulation-en.tex b/macros/latex/contrib/koma-script/doc/common-pagestylemanipulation-en.tex index c66ecb341b..f1c8c71a48 100644 --- a/macros/latex/contrib/koma-script/doc/common-pagestylemanipulation-en.tex +++ b/macros/latex/contrib/koma-script/doc/common-pagestylemanipulation-en.tex @@ -24,7 +24,7 @@ % ============================================================================ \KOMAProvidesFile{common-pagestylemanipulation-en.tex} - [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $ + [$Date: 2023-06-16 10:32:27 +0200 (Fr, 16. Jun 2023) $ KOMA-Script guide (common paragraph: Setting up defined page styles)] \translator{Markus Kohm\and Jana Schubert\and Karl Hagen} @@ -410,17 +410,29 @@ \pventry{lower}{\IndexOption[indexmain]{markcase~=lower}% redefines \DescRef{\LabelBase.cmd.MakeMarkcase} to convert the automatic running heads into lower-case letters using - \Macro{MakeLowercase} (lower case typesetting).% - }% + \Macro{MakeLowercase}.% + }\\[-1.7ex] \pventry{upper}{\IndexOption[indexmain]{markcase~=upper}% redefines \DescRef{\LabelBase.cmd.MakeMarkcase} to convert the automatic running heads into upper-case letters using - \Macro{MakeUppercase} (upper case typesetting).% - }% + \Macro{MakeUppercase}.% + }\\[-1.7ex] + \pventry{title}{\IndexOption[indexmain]{markcase~=title}% + \IfThisCommonLabelBase{scrlayer}{% + \ChangedAt{v3.41}{\Package{scrlayer}}}{% + \IfThisCommonLabelBase{scrlayer-scrpage}{% + \ChangedAt{v3.41}{\Package{scrlayer-scrpage}}}}{}% + redefines \DescRef{\LabelBase.cmd.MakeMarkcase} to convert the + automatic running heads into title-case using + \Macro{MakeTitlecase}. This is done separately for the number + and the text. If \Macro{MakeTitlecase} is not defined, i.\,e., + because you are using an old \LaTeX{} kernel, you will get a warning + message and the option will be ignored.% + }\\[-1.7ex] \pventry{used}{\IndexOption[indexmain]{markcase~=used}% redefines \DescRef{\LabelBase.cmd.MakeMarkcase} to use automatic running heads without any case changes.% - }% + }\\[-1.7ex] \entry{\PValue{ignoreuppercase}, \PValue{nouppercase}, \PValue{ignoreupper}, \PValue{noupper}}{\IndexOption[indexmain]{markcase~=noupper}% diff --git a/macros/latex/contrib/koma-script/doc/letter-example-00-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-00-de.pdf Binary files differindex 88b1b56266..c2d973a700 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-00-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-00-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-00-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-00-en.pdf Binary files differindex c6e38544fe..87cdef7ed8 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-00-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-00-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-01-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-01-de.pdf Binary files differindex 0d1331814c..e5ec6edd20 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-01-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-01-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-01-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-01-en.pdf Binary files differindex 3b61a9bfe8..361de55235 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-01-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-01-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-02-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-02-de.pdf Binary files differindex d6a18ca342..98f260a1cb 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-02-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-02-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-02-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-02-en.pdf Binary files differindex 94f25768c4..7accd7ab6a 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-02-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-02-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-03-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-03-de.pdf Binary files differindex fac8cf3af2..5db63e674c 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-03-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-03-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-03-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-03-en.pdf Binary files differindex f332391e62..eb066c03d6 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-03-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-03-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-04-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-04-de.pdf Binary files differindex 08921f8a13..e6c05f6be3 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-04-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-04-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-04-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-04-en.pdf Binary files differindex 27325ac5dc..f1a8f16425 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-04-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-04-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-05-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-05-de.pdf Binary files differindex 5345b63a61..d2f3a71754 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-05-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-05-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-05-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-05-en.pdf Binary files differindex 37d4e98a57..1a12133008 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-05-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-05-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-06-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-06-de.pdf Binary files differindex 881cf067f7..fa3155fe9e 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-06-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-06-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-06-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-06-en.pdf Binary files differindex a3c0546088..5e37dbeda0 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-06-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-06-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-07-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-07-de.pdf Binary files differindex 7415897736..7db808574a 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-07-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-07-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-07-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-07-en.pdf Binary files differindex 6724f248b9..b29a8acdb0 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-07-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-07-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-08-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-08-de.pdf Binary files differindex 47b926ea7c..885558256b 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-08-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-08-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-08-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-08-en.pdf Binary files differindex afb0b752aa..983861242f 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-08-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-08-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-09-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-09-de.pdf Binary files differindex 06a2758bb3..5bf6c3d38f 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-09-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-09-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-09-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-09-en.pdf Binary files differindex fdc0534cf7..13354547b2 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-09-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-09-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-10-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-10-de.pdf Binary files differindex 5643a04421..651a68e857 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-10-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-10-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-10-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-10-en.pdf Binary files differindex ed972856a8..448b02e3a5 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-10-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-10-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-11-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-11-de.pdf Binary files differindex 503f9e7005..7d84f64d04 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-11-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-11-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-11-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-11-en.pdf Binary files differindex 1b0452406b..163ac5e9f4 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-11-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-11-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-12-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-12-de.pdf Binary files differindex b6efd75f32..3761a12d4e 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-12-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-12-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-12-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-12-en.pdf Binary files differindex 3e7854f27d..f761f88764 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-12-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-12-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-13-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-13-de.pdf Binary files differindex dd3e44a94c..6980d43210 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-13-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-13-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-13-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-13-en.pdf Binary files differindex bbcef17343..f1249dd0e9 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-13-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-13-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-14-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-14-de.pdf Binary files differindex faae3c8c59..92532de29a 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-14-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-14-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-14-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-14-en.pdf Binary files differindex 215b0336f0..41f0d98ca0 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-14-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-14-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-15-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-15-de.pdf Binary files differindex 66f7bb08f5..83e7e295f6 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-15-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-15-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-15-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-15-en.pdf Binary files differindex 64413646ef..c4b6e7ebea 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-15-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-15-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-16-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-16-de.pdf Binary files differindex 76365f7445..ca02b64c97 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-16-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-16-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-16-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-16-en.pdf Binary files differindex 486b17b603..87f6d28f47 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-16-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-16-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-17-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-17-de.pdf Binary files differindex 0f571d2d46..6a81c2f4b3 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-17-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-17-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-17-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-17-en.pdf Binary files differindex fd8cb4f061..776194b0f0 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-17-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-17-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-18-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-18-de.pdf Binary files differindex 0b8fbb2159..c00aadfba7 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-18-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-18-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-18-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-18-en.pdf Binary files differindex 3c6d326fdf..3c7cc05e35 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-18-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-18-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-19-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-19-de.pdf Binary files differindex 40a27e9eac..6c897cebbe 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-19-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-19-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-19-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-19-en.pdf Binary files differindex 8effd9c436..fc7f007162 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-19-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-19-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-20-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-20-de.pdf Binary files differindex be00931b93..b02e3989c1 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-20-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-20-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-20-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-20-en.pdf Binary files differindex 110d513bfd..490d506142 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-20-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-20-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-21-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-21-de.pdf Binary files differindex 4a50318990..871fc4ec89 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-21-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-21-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-21-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-21-en.pdf Binary files differindex ea7b248e54..a0f19e31b1 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-21-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-21-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-22-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-22-de.pdf Binary files differindex f47b606f33..74b377140b 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-22-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-22-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-22-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-22-en.pdf Binary files differindex 30f4d55d5f..24fdd5545a 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-22-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-22-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-23-de.pdf b/macros/latex/contrib/koma-script/doc/letter-example-23-de.pdf Binary files differindex 89c53da25c..e171320149 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-23-de.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-23-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/letter-example-23-en.pdf b/macros/latex/contrib/koma-script/doc/letter-example-23-en.pdf Binary files differindex 336ee89b06..5a178001b9 100644 --- a/macros/latex/contrib/koma-script/doc/letter-example-23-en.pdf +++ b/macros/latex/contrib/koma-script/doc/letter-example-23-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/scrbookreportarticle-de.tex b/macros/latex/contrib/koma-script/doc/scrbookreportarticle-de.tex index 276d201a38..c60aacda95 100644 --- a/macros/latex/contrib/koma-script/doc/scrbookreportarticle-de.tex +++ b/macros/latex/contrib/koma-script/doc/scrbookreportarticle-de.tex @@ -24,7 +24,7 @@ % ============================================================================ \KOMAProvidesFile{scrbookreportarticle-de.tex} - [$Date: 2023-04-20 10:04:17 +0200 (Do, 20. Apr 2023) $ + [$Date: 2023-05-10 17:45:46 +0200 (Mi, 10. Mai 2023) $ KOMA-Script guide (chapter: scrbook, scrreprt, scrartcl)] \chapter{Die Hauptklassen \Class{scrbook}, \Class{scrreprt}, \Class{scrartcl}} @@ -3253,6 +3253,39 @@ wenn Sie ein Paket verwenden, das in die Generierung von Tabellen- und Abbildungstiteln eingreift und deren Aussehen verändert. Dies sollte selbstverständlich sein, wird aber leider häufig nicht bedacht. +\begin{Declaration} + \begin{Environment}{figure} + \end{Environment} + \begin{Environment}{figure*} + \end{Environment} + \begin{Environment}{figure-} + \end{Environment} + \begin{Environment}{table} + \end{Environment} + \begin{Environment}{table*} + \end{Environment} + \begin{Environment}{table-} + \end{Environment} +\end{Declaration} +Die \KOMAScript-Klassen \Class{scrbook}, \Class{scrreprt} und \Class{scrartcl} +verwenden die in \autoref{sec:tocbasic.declarenewtoc}, +\DescPageRef{tocbasic.cmd.DeclareNewTOC} dokumentierte Anweisung +\DescRef{tocbasic.cmd.DeclareNewTOC} zu Definition der von den Standardklassen +gewohnten Umgebungen \Environment{figure} und +\Environment{table}. Selbstverständlich werden dabei auch die für den +zweispaltigen Modus vorgesehenen Umgebungen \Environment{figure*} und +\Environment{table*} definiert, die für spaltenübergreifende Abbildungen und +Tabellen am Seitenanfang gedacht sind. Da bei der Definition neben der +Einstellung \Option{float} auch +\Option{nonfloat}\ChangedAt{v3.36}{\Class{scrartcl}\and \Class{scrbook}\and + \Class{scrreprt}} verwendet wird, werden außerdem auch die nicht gleitenden +Umgebungen \Environment{figure-} und \Environment{table-} definiert. Diese +können wie die anderen Umgebungen verwendet werden und spannen letztlich eine +\Environment{minipage} mit passendem Abstand davor und danach +auf. Bei\textnote{Achtung!} gemischter Verwendung von gleitenden und nicht +gleitenden Umgebungen ist der Anwender selbst für die korrekte Reihenfolge bei +der Ausgabe und damit bei der Nummerierung verantwortlich.% +\EndIndexGroup \begin{Declaration} \OptionVName{captions}{Einstellung} @@ -3748,13 +3781,18 @@ jedoch eventuell durch das Laden von Paketen wie \end{Example}% In gleicher Weise, wie in obigem Beispiel eine Tabelle innerhalb einer Abbildungsumgebung gesetzt und mit einem Titel versehen wird, könnte man auch -eine nicht gleitende Tabelle außerhalb jeder Gleitumgebung setzen. Auch dabei -sollte in der Regel eine \Environment{minipage} verwendet werden, um zu -verhindern, dass zwischen Überschrift und Tabelle ein Seitenumbruch erfolgen -kann. Zusätzlich sollte man die \Environment{minipage} dann noch in eine -\Environment{flushleft}-Umgebung einbetten, um einerseits einen gefälligen -Abstand zum Text davor und dahinter zu erreichen und andererseits den -Absatzeinzug vor der \Environment{minipage} zu verhindern.% +eine nicht gleitende Tabelle außerhalb jeder Gleitumgebung +setzen. Dabei\ChangedAt{v3.41}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}} versucht \KOMAScript{} auch einen Seitenumbruch zwischen +der Überschrift und der Tabelle zu verhindern. Das kann allerdings nicht in +allen Fällen sichergestellt werden. Daher sollte in der Regel eine +\Environment{minipage} verwendet werden, um zu verhindern, dass zwischen +Überschrift und Tabelle ein Seitenumbruch erfolgen kann. Zusätzlich sollte man +die \Environment{minipage} dann noch in eine \Environment{flushleft}-Umgebung +einbetten, um einerseits einen gefälligen Abstand zum Text davor und dahinter +zu erreichen und andererseits den Absatzeinzug vor der \Environment{minipage} +zu verhindern. Einfacher ist natürlich direkt die Umgebung +\DescRef{\LabelBase.env.table-}\IndexEnv{table-} zu verwenden.% \EndIndexGroup diff --git a/macros/latex/contrib/koma-script/doc/scrbookreportarticle-en.tex b/macros/latex/contrib/koma-script/doc/scrbookreportarticle-en.tex index 5bff239c30..b595999763 100644 --- a/macros/latex/contrib/koma-script/doc/scrbookreportarticle-en.tex +++ b/macros/latex/contrib/koma-script/doc/scrbookreportarticle-en.tex @@ -24,7 +24,7 @@ % ============================================================================ \KOMAProvidesFile{scrbookreportarticle-en.tex} - [$Date: 2023-04-20 10:04:17 +0200 (Do, 20. Apr 2023) $ + [$Date: 2023-05-10 17:45:46 +0200 (Mi, 10. Mai 2023) $ KOMA-Script guide (chapter: scrbook, scrreprt, scrartcl)] \translator{Jens-Uwe Morawski\and Gernot Hassenpflug\and Markus Kohm\and @@ -2972,6 +2972,37 @@ standard classes, no longer work correctly when used with packages that modify the appearance of figure and table captions. This should be self-evident, but it is often overlooked. +\begin{Declaration} + \begin{Environment}{figure} + \end{Environment} + \begin{Environment}{figure*} + \end{Environment} + \begin{Environment}{figure-} + \end{Environment} + \begin{Environment}{table} + \end{Environment} + \begin{Environment}{table*} + \end{Environment} + \begin{Environment}{table-} + \end{Environment} +\end{Declaration} +The KOMA-Script{} classes \Class{scrbook}, \Class{scrreprt}, +and \Class{scrartcl} use the \DescRef{tocbasic.cmd.DeclareNewTOC} statement +documented in \autoref{sec:tocbasic.declarenewtoc}, +\DescPageRef{tocbasic.cmd.DeclareNewTOC} to define the \Environment{figure} +and \Environment{table} environments familiar from the standard classes. Of +course, this also defines the \Environment{figure*} and \Environment{table*} +environments provided for the two-column mode, which are intended for +cross-column figures and tables at the top of the page. Since in addition to +the \Option{float} setting the definition also uses +\Option{nonfloat}\ChangedAt{v3.36}{\Class{scrartcl}\and \Class{scrbook}\and + \Class{scrreprt}}, the non-floating environments \Environment{figure-} and +\Environment{table-} are also defined. These can be used like the other +environments and ultimately span a \Environment{minipage} with appropriate +spacing before and after it. With\textnote{Attention!} mixed use of floating +and non-floating environments, the user himself is responsible for the correct +order in output and thus in numbering.% +\EndIndexGroup \begin{Declaration} \OptionVName{captions}{setting} @@ -3430,12 +3461,17 @@ option. But this feature may be lost if you load the \end{figure}% \end{Example}% You can produce a non-floating table with a caption in the same way as the -table inside a figure environment in the example above. In such a case, a -\Environment{minipage} environment should also be used to avoid page breaks -between the caption and the table. In addition, you should embed the -\Environment{minipage} environment in a \Environment{flushleft} environment -both to achieve a pleasing separation between the surrounding text and to -avoid the paragraph indentation of the \Environment{minipage} environment.% +table inside a figure environment in the example +above. Thereby\ChangedAt{v3.41}{\Class{scrbook}\and \Class{scrreprt}\and + \Class{scrartcl}} \KOMAScript{} also tries to prevent a page break between +the heading and the table. However, this cannot be ensured in all +cases. Therefore, a \Environment{minipage} environment should also be used to +avoid page breaks between the caption and the table. In addition, you should +embed the \Environment{minipage} environment in a \Environment{flushleft} +environment both to achieve a pleasing separation between the surrounding text +and to avoid the paragraph indentation of the \Environment{minipage} +environment. Of course, it is easier to use the environment +\DescRef{\LabelBase.env.table-}\IndexEnv{table-} directly.% \EndIndexGroup diff --git a/macros/latex/contrib/koma-script/doc/scrguide-de.pdf b/macros/latex/contrib/koma-script/doc/scrguide-de.pdf Binary files differindex 7ecb7978c8..99d9c00607 100644 --- a/macros/latex/contrib/koma-script/doc/scrguide-de.pdf +++ b/macros/latex/contrib/koma-script/doc/scrguide-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/scrguide-en.pdf b/macros/latex/contrib/koma-script/doc/scrguide-en.pdf Binary files differindex 3bcd49b7ab..dd99f78b82 100644 --- a/macros/latex/contrib/koma-script/doc/scrguide-en.pdf +++ b/macros/latex/contrib/koma-script/doc/scrguide-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/scrguide.cls b/macros/latex/contrib/koma-script/doc/scrguide.cls index d622ace1e4..7c0a63bdc1 100644 --- a/macros/latex/contrib/koma-script/doc/scrguide.cls +++ b/macros/latex/contrib/koma-script/doc/scrguide.cls @@ -178,7 +178,6 @@ % In future we should use biblatex instead of babelbib, but currently some % things are still missing: % \begin{itemize} -% \item prefix \texttt{CTAN://}, % \item line breaks after the author (but not full \texttt{openbib} style like % \texttt{block=nbpar}), % \item removing language tag \texttt{ngerman} from output. @@ -191,7 +190,18 @@ \newcommand*{\printbibliography}[1][]{\bibliography{scrguide}} \else \RequirePackage[backend=bibtex,style=alphabetic,block=ragged]{biblatex} - \DeclareFieldFormat{url}{\url{#1}} + \DeclareSourcemap{ + \maps[datatype=bibtex]{ + \map{ + \step[fieldsource=url, final=true] + \step[fieldset=verba, origfieldval, final=true] + \step[fieldsource=verba, match=\regexp{CTAN:\/\/}, replace={https://www.ctan.org/}] + } + } + } + \DeclareFieldFormat{url}{% + \href{\thefield{verba}}{\nolinkurl{#1}}% + } \fi \RequirePackage{afterpage} \RequirePackage{makeidx} diff --git a/macros/latex/contrib/koma-script/doc/scrjura-example-de.pdf b/macros/latex/contrib/koma-script/doc/scrjura-example-de.pdf Binary files differindex 37237fef5c..57d2efce69 100644 --- a/macros/latex/contrib/koma-script/doc/scrjura-example-de.pdf +++ b/macros/latex/contrib/koma-script/doc/scrjura-example-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/scrjura-example-en.pdf b/macros/latex/contrib/koma-script/doc/scrjura-example-en.pdf Binary files differindex 341f44e9d8..6fc41cf650 100644 --- a/macros/latex/contrib/koma-script/doc/scrjura-example-en.pdf +++ b/macros/latex/contrib/koma-script/doc/scrjura-example-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/scrlayer-de.tex b/macros/latex/contrib/koma-script/doc/scrlayer-de.tex index 4b10d91728..e4683106c1 100644 --- a/macros/latex/contrib/koma-script/doc/scrlayer-de.tex +++ b/macros/latex/contrib/koma-script/doc/scrlayer-de.tex @@ -1,6 +1,6 @@ % ====================================================================== % scrlayer-de.tex -% Copyright (c) Markus Kohm, 2013-2022 +% Copyright (c) Markus Kohm, 2013-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -24,7 +24,7 @@ % ============================================================================ \KOMAProvidesFile{scrlayer-de.tex}% - [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $ + [$Date: 2023-04-25 09:00:44 +0200 (Di, 25. Apr 2023) $ KOMA-Script guide (chapter:scrlayer)] \chapter[{Definition von Ebenen und Seitenstilen mit \Package{scrlayer}}] @@ -734,7 +734,7 @@ Laden von \Package{eso-pic}, definiert ist.% \iffalse% Umbruchkorrekturtext \par Es sei an dieser Stelle darauf hingewiesen, dass man bei Verwendung von Paket -\Package{picture}\IndexPackage{picture}\textnote{\Package{picture}} (siehe +\Package{picture}\IndexPackage{picture}\important{\Package{picture}} (siehe \cite{package:picture}) die Anweisung \Macro{LenToUnit} in der Regel nicht mehr benötigt. Das Paket erweitert die \Environment{picture}-Umgebung und deren Anweisung so, dass man für Koordinaten auch direkt \LaTeX-Längen diff --git a/macros/latex/contrib/koma-script/doc/scrlayer-en.tex b/macros/latex/contrib/koma-script/doc/scrlayer-en.tex index 94e9846397..c43b1b3120 100644 --- a/macros/latex/contrib/koma-script/doc/scrlayer-en.tex +++ b/macros/latex/contrib/koma-script/doc/scrlayer-en.tex @@ -1,6 +1,6 @@ % ====================================================================== % scrlayer-en.tex -% Copyright (c) Markus Kohm, 2013-2022 +% Copyright (c) Markus Kohm, 2013-2023 % % This file is part of the LaTeX2e KOMA-Script bundle. % @@ -24,7 +24,7 @@ % ============================================================================ \KOMAProvidesFile{scrlayer-en.tex} - [$Date: 2022-06-05 12:40:11 +0200 (So, 05. Jun 2022) $ + [$Date: 2023-04-25 09:00:44 +0200 (Di, 25. Apr 2023) $ KOMA-Script guide (chapter:scrlayer)] \translator{Markus Kohm\and Karl Hagen} @@ -636,7 +636,7 @@ already defined, e.\,g., by loading \Package{eso-pic} before \iffalse% Umbruchkorrekturtext \par It should be noted at this point that using package -\Package{picture}\IndexPackage{picture}\textnote{\Package{picture}} (see +\Package{picture}\IndexPackage{picture}\important{\Package{picture}} (see \cite{package:picture}) supersedes \Macro{LenToUnit} more or less. The package extends environment \Environment{picture} and the picture commands so that you can use \LaTeX{} lengths directly for coordinates.% diff --git a/macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-de.pdf b/macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-de.pdf Binary files differindex a800e99fda..5c8d7a10d8 100644 --- a/macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-de.pdf +++ b/macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-de.pdf diff --git a/macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-en.pdf b/macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-en.pdf Binary files differindex 3039687b56..540cc82230 100644 --- a/macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-en.pdf +++ b/macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-en.pdf diff --git a/macros/latex/contrib/koma-script/doc/scrlttr2-de.tex b/macros/latex/contrib/koma-script/doc/scrlttr2-de.tex index 5ab46d4813..5e528f13d5 100644 --- a/macros/latex/contrib/koma-script/doc/scrlttr2-de.tex +++ b/macros/latex/contrib/koma-script/doc/scrlttr2-de.tex @@ -24,7 +24,7 @@ % ============================================================================ \KOMAProvidesFile{scrlttr2-de.tex}% - [$Date: 2023-04-20 10:04:17 +0200 (Do, 20. Apr 2023) $ + [$Date: 2023-04-25 09:00:44 +0200 (Di, 25. Apr 2023) $ KOMA-Script guide (chapter: scrlttr2)] \chapter{Briefe mit Klasse \Class{scrlttr2} oder Paket \Package{scrletter}} @@ -4475,16 +4475,33 @@ Folgeseiten bei \Class{scrlttr2}\OnlyAt{\Class{scrlttr2}} im Seitenstil \IndexPagestyle{letter}\important{\DescRef{\LabelBase.pagestyle.letter}} frei. Dazu setzt man den gewünschten Aufbau als \PName{Inhalt} der Variablen\ChangedAt{v3.08}{\Class{scrlttr2}} \Variable{nexthead} -beziehungsweise \Variable{nextfoot}. Innerhalb des Inhalts von -\Variable{nexthead} und \Variable{nextfoot} können beispielsweise mit Hilfe -der \Macro{parbox}-Anweisung (siehe \cite{latex:usrguide}) mehrere Boxen +beziehungsweise \Variable{nextfoot}. + +Da die Seitenstile von \Class{scrlttr2}\important{\Class{scrlttr2}} nicht für +mehrzeilige Köpfe und Füße ausgelegt sind, geben sie die beider Variablen in +einer horizontalen Box aus. Damit sind zunächst weder Absätze noch +Zeilenumbrüche oder ähnliches möglich. Innerhalb des Inhalts von +\Variable{nexthead} und \Variable{nextfoot} können aber beispielsweise mit +Hilfe der \Macro{parbox}-Anweisung (siehe \cite{latex:usrguide}) mehrere Boxen neben- und untereinander gesetzt werden. Einem versierten Anwender sollte es -so möglich sein, eigene Seitenköpfe und "~füße zu gestalten. Natürlich kann +so möglich sein, eigene Seitenköpfe und "~füße zu gestalten. Natürlich kann und sollte im \PName{Inhalt} mit Hilfe von \DescRef{\LabelBase.cmd.usekomavar} -auch auf weitere Variablen zugegriffen werden. Die \PName{Bezeichnung} wird -von \KOMAScript{} bei beiden Variablen nicht genutzt.% -\EndIndexGroup \EndIndexGroup -% +auch auf weitere Variablen zugegriffen werden. + +Als Alternative für mehrzeilige Köpf und Füße bietet sich die Verwendung des +in \autoref{cha:scrlayer-scrpage} beschriebenen Pakets +\Package{scrlayer-scrpage}\IndexPackage{scrlayer-scrpage}% +\important{\Package{scrlayer-scrpage}} an. Das Paket +\Package{scrletter}\important{\Package{scrletter}} verwendet für die +Definition von Seitenstil \DescRef{\LabelBase.pagestyle.letter}% +\IndexPagestyle{letter}\important{\DescRef{\LabelBase.pagestyle.letter}} +ohnehin bereits \Package{scrlayer-scrpage} und ist daher von der genannten +Beschränkung nicht betroffen. + +Die \PName{Bezeichnung} wird von \KOMAScript{} bei beiden Variablen +nicht genutzt.% +\EndIndexGroup% +\EndIndexGroup% \EndIndexGroup diff --git a/macros/latex/contrib/koma-script/doc/scrlttr2-en.tex b/macros/latex/contrib/koma-script/doc/scrlttr2-en.tex index 8af84810a4..6d7953e509 100644 --- a/macros/latex/contrib/koma-script/doc/scrlttr2-en.tex +++ b/macros/latex/contrib/koma-script/doc/scrlttr2-en.tex @@ -24,7 +24,7 @@ % ============================================================================ \KOMAProvidesFile{scrlttr2-en.tex}% - [$Date: 2023-04-20 10:04:17 +0200 (Do, 20. Apr 2023) $ + [$Date: 2023-04-25 09:00:44 +0200 (Di, 25. Apr 2023) $ KOMA-Script guide (chapter: scrlttr2)] \translator{Harald Bongartz\and Georg Grandke\and Raimund Kohl\and Jens-Uwe @@ -3909,27 +3909,45 @@ available. \Variable{nexthead}% \Variable{nextfoot}% \end{Declaration} -At times, however, you may want to the header or the footer of subsequent pages -to more closely resemble the letterhead page. In these cases, you must dispense -with the predefined options that can be selected with the -\DescRef{\LabelBase.option.pagenumber}\IndexOption{pagenumber} option described above. -Instead, you can customise the header and footer of subsequent pages using the +At times, however, you may want to the header or the footer of subsequent +pages to more closely resemble the letterhead page. In these cases, you must +dispense with the predefined options that can be selected with the +\DescRef{\LabelBase.option.pagenumber}\IndexOption{pagenumber} option +described above. Instead, you can customise the header and footer of +subsequent pages using the \DescRef{\LabelBase.pagestyle.headings}\IndexPagestyle{headings}% \important{\DescRef{\LabelBase.pagestyle.headings}, \DescRef{\LabelBase.pagestyle.myheadings}} or -\DescRef{\LabelBase.pagestyle.myheadings}\IndexPagestyle{myheadings} page styles with \Class{scrlttr2}\OnlyAt{\Class{scrlttr2}}, -and the \DescRef{\LabelBase.pagestyle.letter}% -\IndexPagestyle{letter}\important{\DescRef{\LabelBase.pagestyle.letter}} page style -with \Package{scrletter}\OnlyAt{\Package{scrletter}}. To do so, you create the -structure you want in the \PName{content} of +\DescRef{\LabelBase.pagestyle.myheadings}\IndexPagestyle{myheadings} page +styles with \Class{scrlttr2}\OnlyAt{\Class{scrlttr2}}, and the +\DescRef{\LabelBase.pagestyle.letter}% +\IndexPagestyle{letter}\important{\DescRef{\LabelBase.pagestyle.letter}} page +style with \Package{scrletter}\OnlyAt{\Package{scrletter}}. To do so, you +create the structure you want in the \PName{content} of the\ChangedAt{v3.08}{\Class{scrlttr2}} \Variable{nexthead} or -\Variable{nextfoot} variables. Within the \PName{content} of -\Variable{nexthead} and \Variable{nextfoot} you can, for example, use the \Macro{parbox} -command to place several boxes next to or beneath each other (see \cite{latex:usrguide}). More advanced users should -be able to create their own headers and footers. Of course, you can -and should also make use of additional variables using -\DescRef{\LabelBase.cmd.usekomavar}. \KOMAScript{} does not use the -\PName{description} for either variable. +\Variable{nextfoot} variables. + +Since the page styles of \Class{scrlttr2}\important{\Class{scrlttr2}} are not +designed for multi-line heads and feet the output of both variables is done in +a horizontal box. With this initially neither paragraphs nor line breaks or +similar are possible. But within the \PName{content} of \Variable{nexthead} +and \Variable{nextfoot} you can, for example, use the \Macro{parbox} command +to place several boxes next to or beneath each other (see +\cite{latex:usrguide}). More advanced users should be able to create their own +headers and footers. Of course, you can and should also make use of additional +variables using \DescRef{\LabelBase.cmd.usekomavar}. + +An alternative for multi-line headers and footers it to use the +\Package{scrlayer-scrpage}\IndexPackage{scrlayer-scrpage}% +\important{\Package{scrlayer-scrpage}} package described in +\autoref{cha:scrlayer-scrpage}. The +\Package{scrletter}\important{\Package{scrletter}} package uses for definition +of page style \DescRef{\LabelBase.pagestyle.letter}% +\IndexPagestyle{letter}\important{\DescRef{\LabelBase.pagestyle.letter}} +already \Package{scrlayer-scrpage} anyway and is therefore not affected by the +above restriction. + +\KOMAScript{} does not use the \PName{description} for either variable.% % %Only\textnote{Attention!} for compatibility reason the deprecated commands %\Macro{nexthead}\IndexCmd[indexmain]{nexthead} and @@ -3937,9 +3955,8 @@ and should also make use of additional variables using %releases before 3.08 are also implemented. Nevertheless, you should not use %those.% % -\EndIndexGroup -\EndIndexGroup -% +\EndIndexGroup% +\EndIndexGroup% \EndIndexGroup @@ -4540,3 +4557,4 @@ its documentation.% %%% ispell-local-dictionary: "en_GB" %%% eval: (flyspell-mode 1) %%% End: + |