From eeed32591ed8e985fd458c43d976027ad679d682 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 8 Jul 2023 03:01:46 +0000 Subject: CTAN sync 202307080301 --- macros/latex/contrib/koma-script/README.md | 54 +-- .../doc/common-pagestylemanipulation-de.tex | 14 +- .../doc/common-pagestylemanipulation-en.tex | 24 +- .../koma-script/doc/letter-example-00-de.pdf | Bin 15081 -> 14938 bytes .../koma-script/doc/letter-example-00-en.pdf | Bin 16127 -> 16140 bytes .../koma-script/doc/letter-example-01-de.pdf | Bin 17489 -> 17418 bytes .../koma-script/doc/letter-example-01-en.pdf | Bin 18886 -> 18858 bytes .../koma-script/doc/letter-example-02-de.pdf | Bin 17733 -> 17666 bytes .../koma-script/doc/letter-example-02-en.pdf | Bin 19190 -> 19155 bytes .../koma-script/doc/letter-example-03-de.pdf | Bin 17769 -> 17701 bytes .../koma-script/doc/letter-example-03-en.pdf | Bin 19224 -> 19188 bytes .../koma-script/doc/letter-example-04-de.pdf | Bin 17823 -> 17755 bytes .../koma-script/doc/letter-example-04-en.pdf | Bin 19266 -> 19231 bytes .../koma-script/doc/letter-example-05-de.pdf | Bin 17914 -> 17846 bytes .../koma-script/doc/letter-example-05-en.pdf | Bin 19283 -> 19246 bytes .../koma-script/doc/letter-example-06-de.pdf | Bin 17919 -> 17852 bytes .../koma-script/doc/letter-example-06-en.pdf | Bin 19282 -> 19247 bytes .../koma-script/doc/letter-example-07-de.pdf | Bin 17798 -> 17730 bytes .../koma-script/doc/letter-example-07-en.pdf | Bin 19242 -> 19206 bytes .../koma-script/doc/letter-example-08-de.pdf | Bin 29121 -> 29056 bytes .../koma-script/doc/letter-example-08-en.pdf | Bin 30752 -> 30718 bytes .../koma-script/doc/letter-example-09-de.pdf | Bin 29103 -> 29039 bytes .../koma-script/doc/letter-example-09-en.pdf | Bin 30731 -> 30699 bytes .../koma-script/doc/letter-example-10-de.pdf | Bin 29121 -> 29056 bytes .../koma-script/doc/letter-example-10-en.pdf | Bin 30752 -> 30718 bytes .../koma-script/doc/letter-example-11-de.pdf | Bin 29125 -> 29059 bytes .../koma-script/doc/letter-example-11-en.pdf | Bin 30752 -> 30719 bytes .../koma-script/doc/letter-example-12-de.pdf | Bin 29121 -> 29056 bytes .../koma-script/doc/letter-example-12-en.pdf | Bin 30752 -> 30718 bytes .../koma-script/doc/letter-example-13-de.pdf | Bin 30006 -> 29801 bytes .../koma-script/doc/letter-example-13-en.pdf | Bin 31986 -> 31988 bytes .../koma-script/doc/letter-example-14-de.pdf | Bin 29980 -> 29777 bytes .../koma-script/doc/letter-example-14-en.pdf | Bin 31954 -> 31957 bytes .../koma-script/doc/letter-example-15-de.pdf | Bin 30004 -> 29800 bytes .../koma-script/doc/letter-example-15-en.pdf | Bin 31986 -> 31987 bytes .../koma-script/doc/letter-example-16-de.pdf | Bin 31001 -> 30793 bytes .../koma-script/doc/letter-example-16-en.pdf | Bin 32974 -> 32976 bytes .../koma-script/doc/letter-example-17-de.pdf | Bin 31028 -> 30819 bytes .../koma-script/doc/letter-example-17-en.pdf | Bin 33007 -> 33010 bytes .../koma-script/doc/letter-example-18-de.pdf | Bin 31025 -> 30819 bytes .../koma-script/doc/letter-example-18-en.pdf | Bin 33000 -> 33002 bytes .../koma-script/doc/letter-example-19-de.pdf | Bin 31519 -> 31314 bytes .../koma-script/doc/letter-example-19-en.pdf | Bin 33277 -> 33279 bytes .../koma-script/doc/letter-example-20-de.pdf | Bin 31498 -> 31498 bytes .../koma-script/doc/letter-example-20-en.pdf | Bin 33284 -> 33285 bytes .../koma-script/doc/letter-example-21-de.pdf | Bin 42786 -> 42786 bytes .../koma-script/doc/letter-example-21-en.pdf | Bin 44408 -> 44409 bytes .../koma-script/doc/letter-example-22-de.pdf | Bin 43094 -> 43094 bytes .../koma-script/doc/letter-example-22-en.pdf | Bin 44706 -> 44705 bytes .../koma-script/doc/letter-example-23-de.pdf | Bin 43094 -> 43094 bytes .../koma-script/doc/letter-example-23-en.pdf | Bin 44706 -> 44705 bytes .../koma-script/doc/scrbookreportarticle-de.tex | 54 ++- .../koma-script/doc/scrbookreportarticle-en.tex | 50 ++- .../latex/contrib/koma-script/doc/scrguide-de.pdf | Bin 3255624 -> 3258688 bytes .../latex/contrib/koma-script/doc/scrguide-en.pdf | Bin 3163249 -> 3169325 bytes macros/latex/contrib/koma-script/doc/scrguide.cls | 14 +- .../contrib/koma-script/doc/scrjura-example-de.pdf | Bin 56780 -> 56780 bytes .../contrib/koma-script/doc/scrjura-example-en.pdf | Bin 57967 -> 57967 bytes .../latex/contrib/koma-script/doc/scrlayer-de.tex | 6 +- .../latex/contrib/koma-script/doc/scrlayer-en.tex | 6 +- .../doc/scrlayer-notecolumn-example-de.pdf | Bin 137423 -> 137423 bytes .../doc/scrlayer-notecolumn-example-en.pdf | Bin 135451 -> 135451 bytes .../latex/contrib/koma-script/doc/scrlttr2-de.tex | 35 +- .../latex/contrib/koma-script/doc/scrlttr2-en.tex | 60 ++-- macros/latex/contrib/koma-script/scrhack.dtx | 33 +- macros/latex/contrib/koma-script/scrjura.dtx | 36 +- .../latex/contrib/koma-script/scrkernel-basics.dtx | 30 +- .../koma-script/scrkernel-compatibility.dtx | 12 +- .../latex/contrib/koma-script/scrkernel-floats.dtx | 23 +- .../latex/contrib/koma-script/scrkernel-index.dtx | 64 +++- .../contrib/koma-script/scrkernel-pagestyles.dtx | 37 +- .../contrib/koma-script/scrkernel-sections.dtx | 41 ++- .../contrib/koma-script/scrkernel-tocstyle.dtx | 38 +- .../contrib/koma-script/scrkernel-version.dtx | 6 +- macros/latex/contrib/koma-script/scrlayer.dtx | 99 +++--- macros/latex/contrib/koma-script/tocbasic.dtx | 395 ++++++++++----------- 76 files changed, 712 insertions(+), 419 deletions(-) (limited to 'macros/latex/contrib') diff --git a/macros/latex/contrib/koma-script/README.md b/macros/latex/contrib/koma-script/README.md index d4c05adc89..fd359a2572 100644 --- a/macros/latex/contrib/koma-script/README.md +++ b/macros/latex/contrib/koma-script/README.md @@ -1,4 +1,4 @@ -# KOMA-Script 2023/04/24 v3.40 +# KOMA-Script 2023/07/07 v3.41 Copyright [Markus Kohm](mailto:komascript@gmx.info) 1994–2023 This material is subject to the LaTeX Project Public License Version 1.3c. See [`lppl.txt`](lppl.txt) (English) or [`lppl-de.txt`](lppl-de.txt) (German) for the details of that license. @@ -68,7 +68,7 @@ Requires: scrkbase - internal KOMA-Script package Recommended: scrlayer-scrpage - KOMA-Script package License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/24 v3.40 +Version: 2023/07/07 v3.41 *** @@ -85,7 +85,7 @@ Abstract: scrreport is a very simple wrapper class to scrartcl. It has Requires: scrartcl.cls - KOMA-Script class License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/24 v3.40 +Version: 2023/07/07 v3.41 *** @@ -126,7 +126,7 @@ Requires: keyval - key=value package from the graphics bundle manipulation License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/24 v3.40 +Version: 2023/07/07 v3.41 *** @@ -148,7 +148,7 @@ Requires: scrkbase - internal KOMA-Script package typearea - KOMA-Script package License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/24 v3.40 +Version: 2023/07/07 v3.41 *** @@ -169,7 +169,7 @@ Requires: scrkbase - KOMA-Script package for some basic features. manipulation License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/24 v3.40 +Version: 2023/07/07 v3.41 *** @@ -200,7 +200,7 @@ Requires: scrkbase - internal package with some basics of KOMA-Script etoolbox - tool-box for LaTeX programming using e-TeX License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/24 v3.40 +Version: 2023/07/07 v3.41 *** @@ -214,7 +214,7 @@ Abstract: scrfontsizes is a LaTeX package of the KOMA-Script bundle. Requires: scrextend - some KOMA-Script features for other classes License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/24 v3.40 +Version: 2023/07/07 v3.41 *** @@ -234,7 +234,7 @@ Requires: scrkbase - internal KOMA-Script package with basics xpatch - extending etoolbox patching commands License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/24 v3.40 +Version: 2023/07/07 v3.41 *** @@ -252,7 +252,7 @@ Requires: scrkbase - internal KOMA-Script package with basics tocbasic - features for helper files and float environments License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/24 v3.40 +Version: 2023/07/07 v3.41 *** @@ -269,7 +269,7 @@ Requires: scrbase - KOMA-Script package for some basic features. manipulation License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/24 v3.40 +Version: 2023/07/07 v3.41 *** @@ -314,7 +314,7 @@ Abstract: scrlayer-scrpage is a LaTeX package of the KOMA-Script Requires: scrlayer.sty License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/24 v3.40 +Version: 2023/07/07 v3.41 *** @@ -341,7 +341,7 @@ Abstract: scrlayer is a LaTeX package of the KOMA-Script bundle. Requires: scrkbase.sty License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/24 v3.40 +Version: 2023/07/07 v3.41 *** @@ -356,7 +356,7 @@ Requires: scrartcl.cls – KOMA-Script class scrletter.sty – KOMA-Script package License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/24 v3.40 +Version: 2023/07/07 v3.41 *** @@ -373,11 +373,11 @@ Requires: scrkbase - internal KOMA-Script package Recommended: marvosym - package by Martin Vogel providing symbols License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/24 v3.40 +Version: 2023/07/07 v3.41 *** -###scrlfile-hook-3.34 - internal subpackage of scrlfile +### `scrlfile-hook-3.34` — internal subpackage of scrlfile 
 Maintainer:     Markus Kohm
 E-Mail:         komascript@gmx.info
@@ -387,7 +387,7 @@ Abstract:       scrlfile-hook-3.34 is an internal subpackage of scrlfile to
 Requires:       scrlogo.sty
 License:        LPPL 1.3c or later
 State:          Author maintained
-Version:        2023/04/24 v3.40 
+Version:        2023/07/07 v3.41
*** @@ -400,7 +400,7 @@ Abstract: scrlfile-hook is an internal subpackage of scrlfile to be Requires: scrlogo.sty License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/24 v3.40 +Version: 2023/07/07 v3.41 *** @@ -413,7 +413,7 @@ Abstract: scrlfile-patcholdlatex is an internal subpackage of scrlfile Requires: scrlogo.sty License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/24 v3.40 +Version: 2023/07/07 v3.41 *** @@ -433,7 +433,7 @@ Abstract: scrlfile is a LaTeX package of the KOMA-Script bundle. It Requires: scrlfile-hook.sty, scrlfile-patcholdlatex.sty, scrlogo.sty License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/24 v3.40 +Version: 2023/07/07 v3.41 *** @@ -447,7 +447,7 @@ Abstract: scrlogo is a LaTeX package of the KOMA-Script bundle. It Requires: License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/24 v3.40 +Version: 2023/07/07 v3.41 *** @@ -482,7 +482,7 @@ Requires: scrkbase - internal KOMA-Script package Recommended: marvosym - package by Martin Vogel providing symbols License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/24 v3.40 +Version: 2023/07/07 v3.41 *** @@ -499,7 +499,7 @@ Abstract: scrreport is a very simple wrapper class to scrreprt. It has Requires: scrreprt.cls - KOMA-Script class License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/24 v3.40 +Version: 2023/07/07 v3.41 *** @@ -521,7 +521,7 @@ Requires: scrkbase - internal KOMA-Script package typearea - KOMA-Script package License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/24 v3.40 +Version: 2023/07/07 v3.41 *** @@ -535,7 +535,7 @@ Abstract: scrtime is a LaTeX package of the KOMA-Script bundle. It Requires: scrkbase - internal package with some basics of KOMA-Script License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/24 v3.40 +Version: 2023/07/07 v3.41 *** @@ -562,7 +562,7 @@ Abstract: tocbasic is a LaTeX package of the KOMA-Script bundle. The Requires: scrbase - KOMA-Script package for some basic features. License: LPPL 1.3c or later State: Author maintained -Version: 2023/04/24 v3.40 +Version: 2023/07/07 v3.41 *** @@ -585,7 +585,7 @@ Abstract: Many LaTeX classes, including the standard classes, present Requires: scrkbase - internal basic features for KOMA-Script packages License: LPPL 1.3c or later State: Autor maintained -Version: 2023/04/24 v3.40 +Version: 2023/07/07 v3.41 *** 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 index 88b1b56266..c2d973a700 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-00-de.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-00-de.pdf differ 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 index c6e38544fe..87cdef7ed8 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-00-en.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-00-en.pdf differ 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 index 0d1331814c..e5ec6edd20 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-01-de.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-01-de.pdf differ 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 index 3b61a9bfe8..361de55235 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-01-en.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-01-en.pdf differ 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 index d6a18ca342..98f260a1cb 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-02-de.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-02-de.pdf differ 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 index 94f25768c4..7accd7ab6a 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-02-en.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-02-en.pdf differ 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 index fac8cf3af2..5db63e674c 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-03-de.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-03-de.pdf differ 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 index f332391e62..eb066c03d6 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-03-en.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-03-en.pdf differ 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 index 08921f8a13..e6c05f6be3 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-04-de.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-04-de.pdf differ 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 index 27325ac5dc..f1a8f16425 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-04-en.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-04-en.pdf differ 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 index 5345b63a61..d2f3a71754 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-05-de.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-05-de.pdf differ 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 index 37d4e98a57..1a12133008 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-05-en.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-05-en.pdf differ 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 index 881cf067f7..fa3155fe9e 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-06-de.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-06-de.pdf differ 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 index a3c0546088..5e37dbeda0 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-06-en.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-06-en.pdf differ 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 index 7415897736..7db808574a 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-07-de.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-07-de.pdf differ 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 index 6724f248b9..b29a8acdb0 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-07-en.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-07-en.pdf differ 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 index 47b926ea7c..885558256b 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-08-de.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-08-de.pdf differ 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 index afb0b752aa..983861242f 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-08-en.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-08-en.pdf differ 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 index 06a2758bb3..5bf6c3d38f 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-09-de.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-09-de.pdf differ 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 index fdc0534cf7..13354547b2 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-09-en.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-09-en.pdf differ 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 index 5643a04421..651a68e857 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-10-de.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-10-de.pdf differ 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 index ed972856a8..448b02e3a5 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-10-en.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-10-en.pdf differ 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 index 503f9e7005..7d84f64d04 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-11-de.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-11-de.pdf differ 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 index 1b0452406b..163ac5e9f4 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-11-en.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-11-en.pdf differ 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 index b6efd75f32..3761a12d4e 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-12-de.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-12-de.pdf differ 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 index 3e7854f27d..f761f88764 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-12-en.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-12-en.pdf differ 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 index dd3e44a94c..6980d43210 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-13-de.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-13-de.pdf differ 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 index bbcef17343..f1249dd0e9 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-13-en.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-13-en.pdf differ 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 index faae3c8c59..92532de29a 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-14-de.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-14-de.pdf differ 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 index 215b0336f0..41f0d98ca0 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-14-en.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-14-en.pdf differ 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 index 66f7bb08f5..83e7e295f6 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-15-de.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-15-de.pdf differ 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 index 64413646ef..c4b6e7ebea 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-15-en.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-15-en.pdf differ 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 index 76365f7445..ca02b64c97 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-16-de.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-16-de.pdf differ 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 index 486b17b603..87f6d28f47 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-16-en.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-16-en.pdf differ 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 index 0f571d2d46..6a81c2f4b3 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-17-de.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-17-de.pdf differ 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 index fd8cb4f061..776194b0f0 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-17-en.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-17-en.pdf differ 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 index 0b8fbb2159..c00aadfba7 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-18-de.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-18-de.pdf differ 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 index 3c6d326fdf..3c7cc05e35 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-18-en.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-18-en.pdf differ 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 index 40a27e9eac..6c897cebbe 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-19-de.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-19-de.pdf differ 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 index 8effd9c436..fc7f007162 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-19-en.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-19-en.pdf differ 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 index be00931b93..b02e3989c1 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-20-de.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-20-de.pdf differ 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 index 110d513bfd..490d506142 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-20-en.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-20-en.pdf differ 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 index 4a50318990..871fc4ec89 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-21-de.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-21-de.pdf differ 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 index ea7b248e54..a0f19e31b1 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-21-en.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-21-en.pdf differ 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 index f47b606f33..74b377140b 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-22-de.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-22-de.pdf differ 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 index 30f4d55d5f..24fdd5545a 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-22-en.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-22-en.pdf differ 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 index 89c53da25c..e171320149 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-23-de.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-23-de.pdf differ 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 index 336ee89b06..5a178001b9 100644 Binary files a/macros/latex/contrib/koma-script/doc/letter-example-23-en.pdf and b/macros/latex/contrib/koma-script/doc/letter-example-23-en.pdf differ 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 index 7ecb7978c8..99d9c00607 100644 Binary files a/macros/latex/contrib/koma-script/doc/scrguide-de.pdf and b/macros/latex/contrib/koma-script/doc/scrguide-de.pdf differ diff --git a/macros/latex/contrib/koma-script/doc/scrguide-en.pdf b/macros/latex/contrib/koma-script/doc/scrguide-en.pdf index 3bcd49b7ab..dd99f78b82 100644 Binary files a/macros/latex/contrib/koma-script/doc/scrguide-en.pdf and b/macros/latex/contrib/koma-script/doc/scrguide-en.pdf differ 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 index 37237fef5c..57d2efce69 100644 Binary files a/macros/latex/contrib/koma-script/doc/scrjura-example-de.pdf and b/macros/latex/contrib/koma-script/doc/scrjura-example-de.pdf differ diff --git a/macros/latex/contrib/koma-script/doc/scrjura-example-en.pdf b/macros/latex/contrib/koma-script/doc/scrjura-example-en.pdf index 341f44e9d8..6fc41cf650 100644 Binary files a/macros/latex/contrib/koma-script/doc/scrjura-example-en.pdf and b/macros/latex/contrib/koma-script/doc/scrjura-example-en.pdf differ 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 index a800e99fda..5c8d7a10d8 100644 Binary files a/macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-de.pdf and b/macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-de.pdf differ 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 index 3039687b56..540cc82230 100644 Binary files a/macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-en.pdf and b/macros/latex/contrib/koma-script/doc/scrlayer-notecolumn-example-en.pdf differ 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: + diff --git a/macros/latex/contrib/koma-script/scrhack.dtx b/macros/latex/contrib/koma-script/scrhack.dtx index a8cb84e062..a08943ed50 100644 --- a/macros/latex/contrib/koma-script/scrhack.dtx +++ b/macros/latex/contrib/koma-script/scrhack.dtx @@ -21,7 +21,7 @@ % To create `scrhack.sty' run `tex scrhack.dtx'. Using LaTeX instead % of TeX would generate the implementation documentation. % ====================================================================== -%%% From File: $Id: scrhack.dtx 4032 2023-04-17 09:45:11Z kohm $ +%%% From File: $Id: scrhack.dtx 4063 2023-06-28 08:28:26Z kohm $ %%%% using: package,identify %%%% using: package,option %%%% using: package,body @@ -30,9 +30,9 @@ \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ + \filedate$Date: 2023-06-28 10:28:26 +0200 (Mi, 28. Jun 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 4032 $ + \filerevision$Revision: 4063 $ \endgroup \ProvidesFile{scrhack.dtx}[\filedate\space\filerevision\space % @@ -766,14 +766,19 @@ % % % \begin{macro}{\scr@do@hack@listings} +% \changes{v3.41}{2023/06/28}{patching \cs{lst@MakeCaption} to use +% \cs{ext@lstlisting}} % \begin{command}{\lstlistoflistings} % \cs{scr@do@hack@listings} patches \pkg{listings} to use \pkg*{tocbasic} for % the whole output of the list of listings. This adds several new features to % \pkg{listings}. -% \begin{macro}{\float@addtolists} -% The deprecated macro \cs{float@addtolists} is not needed any longer an will -% be reset to the original definition. But, because \pkg{listings} delays the -% redefinition with \cs{AtBeginDocument} we have to do the same here. +% \begin{macro}{\ext@lstlisting,\lst@MakeCaption,\float@addtolists} +% Macro \cs{ext@lstlisting} is defined, to make \cs{captionof} work with +% argument \texttt{lstlisting}. Additionally \cs{lst@MakeCaption} is patched +% to use the new macro. The deprecated macro \cs{float@addtolists} is not +% needed any longer an will be reset to the original definition. But, because +% \pkg{listings} delays the redefinition with \cs{AtBeginDocument} we have to +% do the same here. % \begin{macrocode} %<*listings&body> \newcommand*{\scr@do@hack@listings}{% @@ -782,6 +787,20 @@ \setuptoc{lol}{chapteratlist}% \PackageInfo{scrhack}{redefining \string\lstlistoflistings}% \renewcommand*{\lstlistoflistings}{\listoftoc[{\lstlistlistingname}]{lol}}% + \providecommand*{\ext@lstlisting}{lol}% + \@tempswafalse + \xpatchcmd\lst@MakeCaption + {\addcontentsline{lol}}% + {\addcontentsline{\ext@lstlisting}}% + {\PackageInfo{scrhack}{patching \string\lst@MakeCaption}\@tempswatrue}% + {\PackageWarning{scrhack}{cannot patch \string\lst@MakeCaption}}% + \@whilesw\if@tempswa\fi{% + \xpatchcmd\lst@MakeCaption + {\addcontentsline{lol}}% + {\addcontentsline{\ext@lstlisting}}% + {}% + {\@tempswafalse}% + }% \AtBeginDocument{% \scr@ifexpected{\float@addtolists}{% \def\float@addtolists##1{\addtocontents{lol}{##1}}% diff --git a/macros/latex/contrib/koma-script/scrjura.dtx b/macros/latex/contrib/koma-script/scrjura.dtx index a7c05c5427..ee0f36a24c 100644 --- a/macros/latex/contrib/koma-script/scrjura.dtx +++ b/macros/latex/contrib/koma-script/scrjura.dtx @@ -18,7 +18,7 @@ % % The KOMA-Script bundle consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrjura.dtx 4032 2023-04-17 09:45:11Z kohm $ +%%% From File: $Id: scrjura.dtx 4062 2023-06-24 15:55:11Z kohm $ %%%% (run: identify) %%%% (run: init) %%%% (run: options) @@ -28,9 +28,9 @@ %<*dtx> \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $ + \filedate$Date: 2023-06-24 17:55:11 +0200 (Sa, 24. Jun 2023) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} - \filerevision$Revision: 4032 $ + \filerevision$Revision: 4062 $ \endgroup \expandafter\ifx\csname ProvidesFile\endcsname\relax \def\ProvidesFile#1[#2]{} @@ -945,13 +945,17 @@ % \end{fontelement} % \begin{counter}{@AbsClause} % \begin{macro}{\theH@AbsClause} +% \changes{v3.41}{2023/06/24}{Ulrike Fischer requested to use \cs{def} instead +% of \cs{newcommand*}} % \begin{command}{\theHClause,\theHSubClause} +% \changes{v3.41}{2023/06/24}{Ulrike Fischer requested to use \cs{def} instead +% of \cs{newcommand*}} % \begin{macrocode} % Here we have some not good tested code for \pkg{hyperref}. \newcounter{@AbsClause} -\newcommand*{\theH@AbsClause}{P-\arabic{@AbsClause}} -\newcommand*{\theHClause}{\theH@AbsClause} -\newcommand*{\theHSubClause}{\theH@AbsClause} +\def\theH@AbsClause{P-\arabic{@AbsClause}} +\def\theHClause{\theH@AbsClause} +\def\theHSubClause{\theH@AbsClause} % \end{macrocode} % \end{command} % \end{macro} @@ -1004,11 +1008,13 @@ % \end{macrocode} % \changes{v0.9f}{2016/02/24}{\cs{protect}\cs{\@nameuse} instead of % \cs{csname}\dots\cs{endcsname}} +% \changes{v3.41}{2023/06/24}{update of \cs{@currentcounter} added} % \begin{macrocode} \protected@edef\theClause{% \protect\@nameuse{\scrjura@env@type @Clauseformat}{\contract@number}% }% \protected@edef\@currentlabel{\theClause}% + \def\@currentcounter{Clause}% \fi \stepcounter{@AbsClause}% \begingroup\expandafter\expandafter\expandafter\endgroup @@ -1059,12 +1065,13 @@ % \end{macro} % % \begin{macro}{\contract@subparagraph} -% \changes{v0.6a}{2012/10/08}{fehlendes \cs{par} ergänzt}%^^A +% \changes{v0.6a}{2012/10/08}{fehlendes \cs{par} ergänzt} % \changes{v0.7}{2013/04/18}{Zähler \texttt{contractAbsoluteClause} wird -% erhöht}%^^A +% erhöht} % \changes{v0.7}{2013/04/28}{Abstand nach der Nummer als Bestandteil der -% Nummer setzen}%^^A -% \changes{v0.9i}{2017/02/23}{Verwendung von \cs{ext@toc}}%^^A +% Nummer setzen} +% \changes{v0.9i}{2017/02/23}{Verwendung von \cs{ext@toc}} +% \changes{v3.41}{2023/06/24}{update of \cs{@currentcounter} added} % Das entspricht bis auf wenige Kleinigkeiten, die Unterparagraphen betreffen, % |\contract@paragraph| % \begin{macrocode} @@ -1094,6 +1101,7 @@ \endgroup \protected@edef\theSubClause{\theClause\contract@number}% \protected@edef\@currentlabel{\theSubClause}% + \def\@currentcounter{SubClause}% \fi \stepcounter{@AbsClause}% \begingroup\expandafter\expandafter\expandafter\endgroup @@ -1340,6 +1348,8 @@ % option} % \begin{counter}{par} % \begin{command}{\thepar,\theHpar} +% \changes{v3.41}{2023/06/24}{Ulrike Fischer requested to use \cs{def} instead +% of \cs{newcommand*}} % \begin{command}{\parformat} % \changes{v0.7}{2013/06/07}{new font element \fnt{parnumber}} % \begin{command}{\parformatseparation} @@ -1358,7 +1368,7 @@ %<*body> \newcounter{par} \renewcommand*{\thepar}{\arabic{par}} -\newcommand*{\theHpar}{\theH@AbsClause-\Roman{par}} +\def\theHpar{\theH@AbsClause-\Roman{par}} \newcommand*{\parformat}{(\thepar)} \newcommand*{\parformatseparation}{\nobreakspace} \newkomafont{parnumber}{} @@ -1810,6 +1820,8 @@ % Numbering of sentences. % \begin{counter}{sentence} % \begin{command}{\thesentence,\theHsentence} +% \changes{v3.41}{2023/06/24}{Ulrike Fischer requested to use \cs{def} instead +% of \cs{newcommand*}} % \begin{macro}{\p@sentence} % \changes{v3.27}{2019/10/09}{adaption for \LaTeX{} 2019-10-01} % The counter is used for numbering the sentences. It is important to add the @@ -1825,7 +1837,7 @@ %<*body> \newcounter{sentence}[par] \renewcommand*{\thesentence}{\arabic{sentence}} -\newcommand*{\theHsentence}{\theHpar-\arabic{sentence}} +\def\theHsentence{\theHpar-\arabic{sentence}} \scr@ifundefinedorrelax{labelformat}{% \renewcommand*{\p@sentence}{\expandafter\p@@sentence} \newcommand*{\p@@sentence}[1]{\p@par{{\par@cite{\thepar}}% diff --git a/macros/latex/contrib/koma-script/scrkernel-basics.dtx b/macros/latex/contrib/koma-script/scrkernel-basics.dtx index 3b205f7ff1..63264a8d3f 100644 --- a/macros/latex/contrib/koma-script/scrkernel-basics.dtx +++ b/macros/latex/contrib/koma-script/scrkernel-basics.dtx @@ -18,7 +18,7 @@ % % This work consists of all files listed in MANIFEST.md. % ====================================================================== -%%% From File: $Id: scrkernel-basics.dtx 4032 2023-04-17 09:45:11Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 4051 2023-04-26 16:01:28Z kohm $ %%%% (run: prepare) %