texlive[67572] Master/texmf-dist: koma-script (7jul23)
commits+karl at tug.org
commits+karl at tug.org
Fri Jul 7 22:41:07 CEST 2023
Revision: 67572
http://tug.org/svn/texlive?view=revision&revision=67572
Author: karl
Date: 2023-07-07 22:41:06 +0200 (Fri, 07 Jul 2023)
Log Message:
-----------
koma-script (7jul23)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/koma-script/README.md
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-00-de.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-00-en.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-01-de.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-01-en.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-02-de.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-02-en.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-03-de.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-03-en.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-04-de.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-04-en.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-05-de.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-05-en.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-06-de.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-06-en.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-07-de.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-07-en.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-08-de.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-08-en.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-09-de.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-09-en.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-10-de.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-10-en.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-11-de.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-11-en.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-12-de.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-12-en.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-13-de.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-13-en.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-14-de.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-14-en.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-15-de.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-15-en.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-16-de.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-16-en.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-17-de.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-17-en.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-18-de.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-18-en.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-19-de.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-19-en.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-20-de.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-20-en.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-21-de.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-21-en.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-22-de.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-22-en.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-23-de.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-23-en.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/scrjura-example-de.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/scrjura-example-en.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/scrlayer-notecolumn-example-de.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/examples/scrlayer-notecolumn-example-en.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/scrguide-de.pdf
trunk/Master/texmf-dist/doc/latex/koma-script/scrguide-en.pdf
trunk/Master/texmf-dist/source/latex/koma-script/doc/common-pagestylemanipulation-de.tex
trunk/Master/texmf-dist/source/latex/koma-script/doc/common-pagestylemanipulation-en.tex
trunk/Master/texmf-dist/source/latex/koma-script/doc/scrbookreportarticle-de.tex
trunk/Master/texmf-dist/source/latex/koma-script/doc/scrbookreportarticle-en.tex
trunk/Master/texmf-dist/source/latex/koma-script/doc/scrguide.cls
trunk/Master/texmf-dist/source/latex/koma-script/doc/scrlayer-de.tex
trunk/Master/texmf-dist/source/latex/koma-script/doc/scrlayer-en.tex
trunk/Master/texmf-dist/source/latex/koma-script/doc/scrlttr2-de.tex
trunk/Master/texmf-dist/source/latex/koma-script/doc/scrlttr2-en.tex
trunk/Master/texmf-dist/source/latex/koma-script/scrhack.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrjura.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-basics.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-compatibility.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-floats.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-index.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-pagestyles.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-sections.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-tocstyle.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-version.dtx
trunk/Master/texmf-dist/source/latex/koma-script/scrlayer.dtx
trunk/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx
trunk/Master/texmf-dist/tex/latex/koma-script/DIN.lco
trunk/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco
trunk/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco
trunk/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
trunk/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
trunk/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
trunk/Master/texmf-dist/tex/latex/koma-script/NF.lco
trunk/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
trunk/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
trunk/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
trunk/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
trunk/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
trunk/Master/texmf-dist/tex/latex/koma-script/SN.lco
trunk/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
trunk/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
trunk/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
trunk/Master/texmf-dist/tex/latex/koma-script/float.hak
trunk/Master/texmf-dist/tex/latex/koma-script/floatrow.hak
trunk/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
trunk/Master/texmf-dist/tex/latex/koma-script/listings.hak
trunk/Master/texmf-dist/tex/latex/koma-script/lscape.hak
trunk/Master/texmf-dist/tex/latex/koma-script/nomencl.hak
trunk/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
trunk/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls
trunk/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
trunk/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
trunk/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
trunk/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
trunk/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
trunk/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
trunk/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
trunk/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
trunk/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
trunk/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty
trunk/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty
trunk/Master/texmf-dist/tex/latex/koma-script/scrletter.cls
trunk/Master/texmf-dist/tex/latex/koma-script/scrletter.sty
trunk/Master/texmf-dist/tex/latex/koma-script/scrlfile-hook-3.34.sty
trunk/Master/texmf-dist/tex/latex/koma-script/scrlfile-hook.sty
trunk/Master/texmf-dist/tex/latex/koma-script/scrlfile-patcholdlatex.sty
trunk/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
trunk/Master/texmf-dist/tex/latex/koma-script/scrlogo.sty
trunk/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
trunk/Master/texmf-dist/tex/latex/koma-script/scrreport.cls
trunk/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
trunk/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
trunk/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
trunk/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
trunk/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
trunk/Master/texmf-dist/tex/latex/koma-script/setspace.hak
trunk/Master/texmf-dist/tex/latex/koma-script/standardsections.hak
trunk/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
trunk/Master/texmf-dist/tex/latex/koma-script/typearea.sty
trunk/Master/texmf-dist/tex/latex/koma-script/visualize.lco
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/koma-script/README.md 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/doc/latex/koma-script/README.md 2023-07-07 20:41:06 UTC (rev 67572)
@@ -1,4 +1,4 @@
-# KOMA-Script 2023/04/24 v3.40
+# KOMA-Script 2023/07/07 v3.41
Copyright [Markus Kohm](mailto:komascript at 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 @@
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
</pre>
***
@@ -85,7 +85,7 @@
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
</pre>
***
@@ -126,7 +126,7 @@
manipulation
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/24 v3.40
+Version: 2023/07/07 v3.41
</pre>
***
@@ -148,7 +148,7 @@
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
</pre>
***
@@ -169,7 +169,7 @@
manipulation
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/24 v3.40
+Version: 2023/07/07 v3.41
</pre>
***
@@ -200,7 +200,7 @@
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
</pre>
***
@@ -214,7 +214,7 @@
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
</pre>
***
@@ -234,7 +234,7 @@
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
</pre>
***
@@ -252,7 +252,7 @@
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
</pre>
***
@@ -269,7 +269,7 @@
manipulation
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/24 v3.40
+Version: 2023/07/07 v3.41
</pre>
***
@@ -314,7 +314,7 @@
Requires: scrlayer.sty
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/24 v3.40
+Version: 2023/07/07 v3.41
</pre>
***
@@ -341,7 +341,7 @@
Requires: scrkbase.sty
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/24 v3.40
+Version: 2023/07/07 v3.41
</pre>
***
@@ -356,7 +356,7 @@
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
</pre>
***
@@ -373,11 +373,11 @@
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
</pre>
***
-###scrlfile-hook-3.34 - internal subpackage of scrlfile
+### `scrlfile-hook-3.34` — internal subpackage of scrlfile
<pre>
Maintainer: Markus Kohm
E-Mail: komascript at gmx.info
@@ -387,7 +387,7 @@
Requires: scrlogo.sty
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/24 v3.40
+Version: 2023/07/07 v3.41
</pre>
***
@@ -400,7 +400,7 @@
Requires: scrlogo.sty
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/24 v3.40
+Version: 2023/07/07 v3.41
</pre>
***
@@ -413,7 +413,7 @@
Requires: scrlogo.sty
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/24 v3.40
+Version: 2023/07/07 v3.41
</pre>
***
@@ -433,7 +433,7 @@
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
</pre>
***
@@ -447,7 +447,7 @@
Requires:
License: LPPL 1.3c or later
State: Author maintained
-Version: 2023/04/24 v3.40
+Version: 2023/07/07 v3.41
</pre>
***
@@ -482,7 +482,7 @@
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
</pre>
***
@@ -499,7 +499,7 @@
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
</pre>
***
@@ -521,7 +521,7 @@
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
</pre>
***
@@ -535,7 +535,7 @@
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
</pre>
***
@@ -562,7 +562,7 @@
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
</pre>
***
@@ -585,7 +585,7 @@
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
</pre>
***
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-00-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-00-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-01-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-01-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-02-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-02-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-03-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-03-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-04-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-04-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-05-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-05-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-06-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-06-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-07-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-07-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-08-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-08-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-09-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-09-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-10-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-10-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-11-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-11-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-12-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-12-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-13-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-13-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-14-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-14-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-15-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-15-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-16-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-16-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-17-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-17-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-18-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-18-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-19-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-19-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-20-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-20-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-21-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-21-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-22-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-22-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-23-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/letter-example-23-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/scrjura-example-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/scrjura-example-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/scrlayer-notecolumn-example-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/examples/scrlayer-notecolumn-example-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/scrguide-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/koma-script/scrguide-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/koma-script/doc/common-pagestylemanipulation-de.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/doc/common-pagestylemanipulation-de.tex 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/source/latex/koma-script/doc/common-pagestylemanipulation-de.tex 2023-07-07 20:41:06 UTC (rev 67572)
@@ -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
Modified: trunk/Master/texmf-dist/source/latex/koma-script/doc/common-pagestylemanipulation-en.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/doc/common-pagestylemanipulation-en.tex 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/source/latex/koma-script/doc/common-pagestylemanipulation-en.tex 2023-07-07 20:41:06 UTC (rev 67572)
@@ -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}%
Modified: trunk/Master/texmf-dist/source/latex/koma-script/doc/scrbookreportarticle-de.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/doc/scrbookreportarticle-de.tex 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/source/latex/koma-script/doc/scrbookreportarticle-de.tex 2023-07-07 20:41:06 UTC (rev 67572)
@@ -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 @@
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 @@
\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
Modified: trunk/Master/texmf-dist/source/latex/koma-script/doc/scrbookreportarticle-en.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/doc/scrbookreportarticle-en.tex 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/source/latex/koma-script/doc/scrbookreportarticle-en.tex 2023-07-07 20:41:06 UTC (rev 67572)
@@ -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 @@
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 @@
\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
Modified: trunk/Master/texmf-dist/source/latex/koma-script/doc/scrguide.cls
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/doc/scrguide.cls 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/source/latex/koma-script/doc/scrguide.cls 2023-07-07 20:41:06 UTC (rev 67572)
@@ -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}
Modified: trunk/Master/texmf-dist/source/latex/koma-script/doc/scrlayer-de.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/doc/scrlayer-de.tex 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/source/latex/koma-script/doc/scrlayer-de.tex 2023-07-07 20:41:06 UTC (rev 67572)
@@ -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 @@
\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
Modified: trunk/Master/texmf-dist/source/latex/koma-script/doc/scrlayer-en.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/doc/scrlayer-en.tex 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/source/latex/koma-script/doc/scrlayer-en.tex 2023-07-07 20:41:06 UTC (rev 67572)
@@ -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 @@
\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.%
Modified: trunk/Master/texmf-dist/source/latex/koma-script/doc/scrlttr2-de.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/doc/scrlttr2-de.tex 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/source/latex/koma-script/doc/scrlttr2-de.tex 2023-07-07 20:41:06 UTC (rev 67572)
@@ -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 @@
\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
Modified: trunk/Master/texmf-dist/source/latex/koma-script/doc/scrlttr2-en.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/doc/scrlttr2-en.tex 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/source/latex/koma-script/doc/scrlttr2-en.tex 2023-07-07 20:41:06 UTC (rev 67572)
@@ -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 @@
\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,10 +3955,9 @@
%releases before 3.08 are also implemented. Nevertheless, you should not use
%those.%
%
+\EndIndexGroup%
+\EndIndexGroup%
\EndIndexGroup
-\EndIndexGroup
-%
-\EndIndexGroup
\LoadCommonFile{interleafpage}% \section{Interleaf Pages}
@@ -4540,3 +4557,4 @@
%%% ispell-local-dictionary: "en_GB"
%%% eval: (flyspell-mode 1)
%%% End:
+
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrhack.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrhack.dtx 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrhack.dtx 2023-07-07 20:41:06 UTC (rev 67572)
@@ -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 $
%<package&identify>%%% using: package,identify
%<package&option>%%% using: package,option
%<package&body>%%% 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
%</dtx>
@@ -766,14 +766,19 @@
%
%
% \begin{macro}{\scr at do@hack at listings}
+% \changes{v3.41}{2023/06/28}{patching \cs{lst at MakeCaption} to use
+% \cs{ext at lstlisting}}
% \begin{command}{\lstlistoflistings}
% \cs{scr at do@hack at 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 at addtolists}
-% The deprecated macro \cs{float at 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 at lstlisting,\lst at MakeCaption,\float at addtolists}
+% Macro \cs{ext at lstlisting} is defined, to make \cs{captionof} work with
+% argument \texttt{lstlisting}. Additionally \cs{lst at MakeCaption} is patched
+% to use the new macro. The deprecated macro \cs{float at 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 at do@hack at listings}{%
@@ -782,6 +787,20 @@
\setuptoc{lol}{chapteratlist}%
\PackageInfo{scrhack}{redefining \string\lstlistoflistings}%
\renewcommand*{\lstlistoflistings}{\listoftoc[{\lstlistlistingname}]{lol}}%
+ \providecommand*{\ext at lstlisting}{lol}%
+ \@tempswafalse
+ \xpatchcmd\lst at MakeCaption
+ {\addcontentsline{lol}}%
+ {\addcontentsline{\ext at lstlisting}}%
+ {\PackageInfo{scrhack}{patching \string\lst at MakeCaption}\@tempswatrue}%
+ {\PackageWarning{scrhack}{cannot patch \string\lst at MakeCaption}}%
+ \@whilesw\if at tempswa\fi{%
+ \xpatchcmd\lst at MakeCaption
+ {\addcontentsline{lol}}%
+ {\addcontentsline{\ext at lstlisting}}%
+ {}%
+ {\@tempswafalse}%
+ }%
\AtBeginDocument{%
\scr at ifexpected{\float at addtolists}{%
\def\float at addtolists##1{\addtocontents{lol}{##1}}%
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrjura.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrjura.dtx 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrjura.dtx 2023-07-07 20:41:06 UTC (rev 67572)
@@ -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 $
%<identify>%%% (run: identify)
%<init>%%% (run: init)
%<options>%%% (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 at 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 at AbsClause}{P-\arabic{@AbsClause}}
-\newcommand*{\theHClause}{\theH at AbsClause}
-\newcommand*{\theHSubClause}{\theH at AbsClause}
+\def\theH at AbsClause{P-\arabic{@AbsClause}}
+\def\theHClause{\theH at AbsClause}
+\def\theHSubClause{\theH at 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 at edef\theClause{%
\protect\@nameuse{\scrjura at env@type @Clauseformat}{\contract at number}%
}%
\protected at edef\@currentlabel{\theClause}%
+ \def\@currentcounter{Clause}%
\fi
\stepcounter{@AbsClause}%
\begingroup\expandafter\expandafter\expandafter\endgroup
@@ -1059,12 +1065,13 @@
% \end{macro}
%
% \begin{macro}{\contract at 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 at toc}}%^^A
+% Nummer setzen}
+% \changes{v0.9i}{2017/02/23}{Verwendung von \cs{ext at toc}}
+% \changes{v3.41}{2023/06/24}{update of \cs{@currentcounter} added}
% Das entspricht bis auf wenige Kleinigkeiten, die Unterparagraphen betreffen,
% |\contract at paragraph|
% \begin{macrocode}
@@ -1094,6 +1101,7 @@
\endgroup
\protected at edef\theSubClause{\theClause\contract at number}%
\protected at 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 at AbsClause-\Roman{par}}
+\def\theHpar{\theH at 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 at 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 at ifundefinedorrelax{labelformat}{%
\renewcommand*{\p at sentence}{\expandafter\p@@sentence}
\newcommand*{\p@@sentence}[1]{\p at par{{\par at cite{\thepar}}%
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-basics.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-basics.dtx 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-basics.dtx 2023-07-07 20:41:06 UTC (rev 67572)
@@ -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 $
%<prepare>%%% (run: prepare)
%<option>%%% (run: option)
%<body>%%% (run: body)
@@ -28,9 +28,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\def\filedate{#2/#3/#4}}
- \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
+ \filedate$Date: 2023-04-26 18:01:28 +0200 (Mi, 26. Apr 2023) $
\def\filerevision$#1: #2 ${\def\filerevision{r#2}}
- \filerevision$Revision: 4032 $
+ \filerevision$Revision: 4051 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-basics.dtx}%
@@ -916,7 +916,13 @@
\@for\CurrentOption:=\@raw at classoptionslist\do{%
\scr at trim@spaces\CurrentOption
\ifx\CurrentOption\@empty\else
- \@ifundefined{ds@\CurrentOption}{%
+% \end{macrocode}
+% \changes{v3.41}{2023/04/26}{only one step expansion while classic option
+% test}
+% Because we are using the raw option list, we do only a one step expansion of
+% \cs{CurrentOption} here, because a full expansion could break.
+% \begin{macrocode}
+ \@ifundefined{ds@\expandafter\detokenize\expandafter{\CurrentOption}}{%
\scr at ifprocess@curroption{#1}{#2}{%
\@expandtwoargs\@removeelement{%
\expandafter\@remove at eq@value\CurrentOption=\@nil}%
@@ -942,7 +948,13 @@
%<*dontusethis>
\@for\CurrentOption:=\@curroptions\do{%
\scr at trim@spaces\CurrentOption
- \@ifundefined{ds@\CurrentOption}{%
+% \end{macrocode}
+% \changes{v3.41}{2023/04/26}{only one step expansion while classic option
+% test}
+% Because we are using the raw option list, we do only a one step expansion of
+% \cs{CurrentOption} here, because a full expansion could break.
+% \begin{macrocode}
+ \@ifundefined{ds@\expandafter\detokenize\expandafter{\CurrentOption}}{%
\@use at ption
\scr at ifprocess@curroption{#1}{#2}{}\default at ds
}\@use at ption
@@ -982,7 +994,13 @@
\else
\let\CurrentOption\reserved at a
\fi
- \@ifundefined{ds@\CurrentOption}{%
+% \end{macrocode}
+% \changes{v3.41}{2023/04/26}{only one step expansion while classic option
+% test}
+% Because we are using the raw option list, we do only a one step expansion of
+% \cs{CurrentOption} here, because a full expansion could break.
+% \begin{macrocode}
+ \@ifundefined{ds@\expandafter\detokenize\expandafter{\CurrentOption}}{%
\@use at ption
\scr at ifprocess@curroption{#1}{#2}{}\default at ds
}\@use at ption
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-compatibility.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-compatibility.dtx 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-compatibility.dtx 2023-07-07 20:41:06 UTC (rev 67572)
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-compatibility.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 4054 2023-05-10 14:35:36Z kohm $
%<identify>%%% (run: identify)
%<init>%%% (run: init)
%<option>%%% (run: option)
@@ -27,9 +27,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\def\filedate{#2/#3/#4}}
- \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
+ \filedate$Date: 2023-05-10 16:35:36 +0200 (Mi, 10. Mai 2023) $
\def\filerevision$#1: #2 ${\def\filerevision{r#2}}
- \filerevision$Revision: 4032 $
+ \filerevision$Revision: 4054 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-compatibility.dtx}%
@@ -458,6 +458,8 @@
% \changes{v3.39}{2022/10/13}{added}
% \begin{macro}{\scr at v@3.40}
% \changes{v3.40}{2023/04/17}{added}
+% \begin{macro}{\scr at v@3.41}
+% \changes{v3.41}{2023/04/24}{added}
% \begin{macro}{\scr at v@last}
% \changes{v2.9u}{2005/03/05}{added}
% Nun die unterschiedlichen möglichen Werte (|\scr at v@last| ist jeweils die
@@ -547,7 +549,8 @@
\@namedef{scr at v@3.38}{20}
\@namedef{scr at v@3.39}{20}
\@namedef{scr at v@3.40}{20}
-\@namedef{scr at v@last}{20}
+\@namedef{scr at v@3.41}{21}
+\@namedef{scr at v@last}{21}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -599,6 +602,7 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
% \end{macro}
% \end{macro}
% \end{macro}
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-floats.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-floats.dtx 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-floats.dtx 2023-07-07 20:41:06 UTC (rev 67572)
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-floats.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 4054 2023-05-10 14:35:36Z kohm $
%<option>%%% (run: option)
%<body>%%% (run: body)
%<*dtx>
@@ -25,9 +25,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-05-10 16:35:36 +0200 (Mi, 10. Mai 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 4032 $
+ \filerevision$Revision: 4054 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-floats.dtx}%
@@ -865,21 +865,32 @@
% \changes{v2.8j}{2001/07/30}{using \cs{@@makecaption}}
% \changes{v2.8q}{2001/11/17}{special treatment of one line captions is optional}
% \changes{v2.8q}{2001/11/17}{caption width can be limited}
+% \changes{v3.41}{2023/05/10}{no page break below caption above or above
+% caption below content}
+% \begin{command}{\captionnopagebreak}
+% \changes{v3.41}{2023/05/10}{new}
+% Can be redefined by users to allow page breaks between content and caption.
% \begin{macrocode}
+\expandafter\ifnum\scr at v@is at ge{3.41}%
+ \newcommand*{\captionnopagebreak}{\nopagebreak}
+\else
+ \newcommand*{\captionnopagebreak}{}
+\fi
\newcommand{\@makecaption}[2]{%
\if at captionabove
\vskip\belowcaptionskip
\else
- \vskip\abovecaptionskip
+ \captionnopagebreak\vskip\abovecaptionskip\captionnopagebreak
\fi
\@@makecaption\@firstofone{#1}{#2}%
\if at captionabove
- \vskip\abovecaptionskip
+ \captionnopagebreak\vskip\abovecaptionskip\captionnopagebreak
\else
\vskip\belowcaptionskip
\fi
}
% \end{macrocode}
+% \end{command}
% \begin{macro}{\cap at width,\cap at left,\cap at right}
% \changes{v2.8q}{2001/11/17}{added}
% Multi line captions can printed with a reduced with. If the width is reduced
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-index.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-index.dtx 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-index.dtx 2023-07-07 20:41:06 UTC (rev 67572)
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-index.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 4052 2023-05-05 11:41:51Z kohm $
%<option>%%% (run: option)
%<body>%%% (run: body)
%<*dtx>
@@ -25,9 +25,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-05-05 13:41:51 +0200 (Fr, 05. Mai 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 4032 $
+ \filerevision$Revision: 4052 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-index.dtx}%
@@ -137,6 +137,42 @@
\fi*%
}
% \end{macrocode}
+% \begin{macro}{\idx@@mark,\idx@@forcemark,\idx@@forcemarknumbered}
+% \changes{v3.41}{2023/05/05}{new}
+% We also need a command to do the mark for the running head to be used if a
+% sectioning command without automatic usage of \cs{chaptermark},
+% \cs{sectionmark} or \cs{subsectionmark} is used. For headings with automatic
+% usage of \cs{chaptermark}, \cs{sectionmark} or \cs{subsectionmark} it should
+% not be used, despite the fact, that this usually would result in not setting
+% both marks. The command has the same argument as \cs{idx@@heading}. This is
+% the same code, previously used in \cs{idx at heading}.
+% \begin{macrocode}
+\newcommand*{\idx@@forcemark}[1]{%
+ \ifidx at leveldown
+%<report|book> \addsecmark{#1}%
+%<*article>
+ \begingroup
+ \value{secnumdepth}=-\maxdimen
+ \subsectionmark{#1}%
+ \endgroup
+%</article>
+ \else
+ \@mkdouble{\MakeMarkcase{#1}}%
+ \fi
+}
+\newcommand*{\idx@@forcemarknumbered}[1]{%
+ \ifidx at leveldown
+%<report|book> \sectionmark{#1}%
+%<article> \subsectionmark{#1}%
+ \else
+%<report|book> \chaptermark{#1}%
+%<article> \sectionmark{#1}%
+ \fi
+}
+\newcommand*{\idx@@mark}{}
+\let\idx@@mark\idx@@forcemark
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\idx at leveldowntrue,\idx at leveldownfalse,\ifidx at leveldown}
% \changes{v3.18}{2015/06/15}{added}
% The boolean switch \cs{ididx at leveldown} is needed to distinguish the heading
@@ -171,6 +207,7 @@
%<book|report> \expandafter\chapter
\fi*%
}%
+ \let\idx@@mark\idx@@forcemark
\or
\KOMA at kav@remove{\KOMAClassFileName}{toc}{noindex}%
\KOMA at kav@remove{\KOMAClassFileName}{toc}{indexnumbered}%
@@ -182,7 +219,7 @@
\KOMA at kav@add{\KOMAClassFileName}{index}{toc}%
\renewcommand*{\idx@@heading}{%
\ifidx at leveldown
-%<article> \expandafter\subsection\expandafter*
+%<article> \expandafter\expandafter\expandafter\subsection\expandafter*%
%<book|report> \expandafter\addsec
\else
%<article> \expandafter\addsec
@@ -189,6 +226,7 @@
%<book|report> \expandafter\addchap
\fi
}%
+ \let\idx@@mark\idx@@forcemark
\or
\KOMA at kav@remove{\KOMAClassFileName}{toc}{noindex}%
\KOMA at kav@remove{\KOMAClassFileName}{toc}{indexnumbered}%
@@ -207,6 +245,7 @@
%<book|report> \expandafter\chapter
\fi
}%
+ \let\idx@@mark\idx@@forcemarknumbered
\or
\KOMA at kav@remove{\KOMAClassFileName}{index}{leveldown}%
\KOMA at kav@remove{\KOMAClassFileName}{index}{standardlevel}%
@@ -277,24 +316,17 @@
% \changes{v3.25}{2017/10/13}{using \cs{@mkright} and \cs{@mkdouble}}
% \changes{v3.26}{2018/09/03}{usage of \cs{addsecmark} or \cs{subsectionmark}
% instead of \cs{@mkright}}
+% \changes{v3.41}{2023/05/05}{using \cs{idx@@mark}}
+% \changes{v3.41}{2023/05/05}{\cs{cleardoublepage} or \cs{clearpage} only, if
+% not \opt{leveldown}}
% Macro to make the index heading and preamble.
% \begin{macrocode}
\newcommand*{\idx at heading}{%
-%<report|book> \if at openright\cleardoublepage\else\clearpage\fi%
+%<report|book> \ifidx at leveldown\else\if at openright\cleardoublepage\else\clearpage\fi\fi
\twocolumn[%
%<report|book> \@chaptertolistsfalse
\idx@@heading{\indexname}]%
- \ifidx at leveldown
-%<report|book> \addsecmark{\indexname}%
-%<*article>
- \begingroup
- \c at secnumdepth=-\maxdimen
- \subsectionmark{\indexname}%
- \endgroup
-%</article>
- \else
- \@mkdouble{\MakeMarkcase{\indexname}}%
- \fi
+ \idx@@mark{\indexname}%
}
% \end{macrocode}
% \end{macro}
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-pagestyles.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-pagestyles.dtx 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-pagestyles.dtx 2023-07-07 20:41:06 UTC (rev 67572)
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-pagestyles.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 4058 2023-06-16 08:32:27Z kohm $
%<option>%%% (run: option)
%<body>%%% (run: body)
%<*dtx>
@@ -25,9 +25,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-16 10:32:27 +0200 (Fr, 16. Jun 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 4032 $
+ \filerevision$Revision: 4058 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-pagestyles.dtx}%
@@ -334,13 +334,23 @@
\hb at xt@ \@tempdima{{\hfil\pagemark
\if at twoside\else\hfil\fi}}}}\hss}%
%<*article>
+% \end{macrocode}
+% \changes{v3.41}{2023/06/16}{split usage of \cs{MakeMarkcase}}
+% From version 3.41 usage of \cs{MakeMarkcase} is split for number and text,
+% to also support \cs{MakeTitlecase}.
+% \begin{macrocode}
\renewcommand*{\sectionmark}[1]{%
\if at twoside\expandafter\markboth\else\expandafter\markright\fi
- {\MakeMarkcase{\Ifnumbered{section}{\sectionmarkformat}{}##1}}{}}%
+ {%
+ \Ifnumbered{section}{\MakeMarkcase{\sectionmarkformat}}{}%
+ \MakeMarkcase{##1}%
+ }{}%
+ }%
\renewcommand*{\subsectionmark}[1]{%
\if at twoside
\markright{%
- \MakeMarkcase{\Ifnumbered{subsection}{\subsectionmarkformat}{}##1}%
+ \Ifnumbered{subsection}{\MakeMarkcase{\subsectionmarkformat}}{}%
+ \MakeMarkcase{##1}%
}%
\fi
}%
@@ -348,17 +358,20 @@
%<*report|book>
\renewcommand*{\chaptermark}[1]{%
\if at twoside\expandafter\markboth\else\expandafter\markright\fi
- {\MakeMarkcase{\Ifnumbered{chapter}{%
-%<book> \if at mainmatter
- \chaptermarkformat
-%<book> \fi
- }{}##1}%
+ {%
+ \Ifnumbered{chapter}{%
+%<book> \if at mainmatter
+ \MakeMarkcase{\chaptermarkformat}%
+%<book> \fi
+ }{}\MakeMarkcase{##1}%
}{}%
}%
\renewcommand*{\sectionmark}[1]{%
\if at twoside
- \markright{\MakeMarkcase{\Ifnumbered{section}{\sectionmarkformat}{}%
- ##1}}%
+ \markright{%
+ \Ifnumbered{section}{\MakeMarkcase{\sectionmarkformat}}{}%
+ \MakeMarkcase{##1}%
+ }%
\fi
}%
%</report|book>
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-sections.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-sections.dtx 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-sections.dtx 2023-07-07 20:41:06 UTC (rev 67572)
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-sections.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4069 2023-06-29 08:55:54Z kohm $
% The runs of run-time file generation:
%<preidentify>%%% (run: preidentify)
% - everything that is needed before selfidentification of resulting files
@@ -40,9 +40,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
+ \filedate$Date: 2023-06-29 10:55:54 +0200 (Do, 29. Jun 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 4032 $
+ \filerevision$Revision: 4069 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-sections.dtx}%
@@ -1184,10 +1184,43 @@
\providecommand*\@currentlabelname{}
\FamilyStringKey[.section]{KOMAarg}{tocentry}{\@currenttocentry}
\FamilyStringKey[.section]{KOMAarg}{head}{\@currentheadentry}
+\IfLTXAtLeastTF{2020/10/01}{%
+ \NewHook{\KOMAClassName/option/section/reference/fallback}%
+}{}%
\DefineFamilyKey[.section]{KOMAarg}{reference}{%
\scr at ifundefinedorrelax{NR at gettitle}{%
\scr at ifundefinedorrelax{GetTitleString}{%
- \def\@currentlabelname{#1}%
+% \end{macrocode}
+% \changes{v3.41}{2023/06/29}{substitute definition of \cs{@currentlabelname}
+% changed}
+% This case is complicated. Up to \LaTeX{} 2022/11/01 it was good enough to
+% use:
+% \begin{verbatim}
+% \def\@currentlabelname{#1}
+% \end{verbatim}
+% But from \LaTeX{} 2023/06/01 the kernel definition of \cs{label}
+% additionally writes \cs{@currentlabelname} to the \file{aux}-file. So this
+% breaks, if \cs{label} is part of the argument, because it results in an
+% infinite expansion loop. To avoid this, the code has been changed. To
+% remove \cs{label}, \cs{index}, \cs{glossary}.
+% \begin{description}
+% \item[ToDo:] The current \cs{@currentlabelname} code is only a workaround
+% for \href{https://sourceforge.net/p/koma-script/tickets/55/}{issue 55}.
+% Maybe using an empty value would be better. But in this case, what to do
+% with \cs{TG at gettitle} and \cs{ztitlerefsetup}?
+% \end{description}
+% \begin{macrocode}
+ \begingroup
+ \let\label\@gobble
+ \let\index\@gobble
+ \let\glossary\@gobble
+ \scr at ifundefinedorrelax{UseHook}{}{%
+ \UseHook{\KOMAClassName/option/section/reference/fallback}%
+ }%
+ \protected at edef\@currentlabelname{#1}%
+ \expandafter\expandafter\expandafter\endgroup
+ \expandafter\def\expandafter\@currentlabelname\expandafter{%
+ \@currentlabelname}%
}{%
\GetTitleString{#1}%
\let\@currentlabelname\GetTitleStringResult
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-tocstyle.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-tocstyle.dtx 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-tocstyle.dtx 2023-07-07 20:41:06 UTC (rev 67572)
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 4060 2023-06-20 08:59:01Z kohm $
% The runs of run-time file generation:
%<preidentify>%%% (run: preidentify)
% - everything that is needed before selfidentification of resulting files
@@ -42,9 +42,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-20 10:59:01 +0200 (Di, 20. Jun 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 4032 $
+ \filerevision$Revision: 4060 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrkernel-tocstyle.dtx}%
@@ -1010,8 +1010,10 @@
% \end{macrocode}
% \end{macro}^^A \@TOCEntryStyleNeedsCommandByOption
%
-% \begin{command}{\TOCEntryStyleInitCode,\TOCEntryStyleStartInitCode}
+% \begin{command}{\TOCEntryStyleInitCode,\TOCEntryStyleInitCode*,
+% \TOCEntryStyleStartInitCode}
% \changes{v3.20}{2015/11/25}{added}
+% \changes{v3.41}{2023/06/20}{star variant \cs{TOCEntryStyleInitCode*} added}
% Executes commands before a ToC entry level command of this style is defined
% and before the \emph{needs} list will be executed. The parameters are:
% \begin{description}
@@ -1022,12 +1024,13 @@
% \end{description}
% \begin{macrocode}
%<*body>
-\newcommand{\TOCEntryStyleInitCode}[1]{%
- \scr at ifundefinedorrelax{scr at dte@#1 at init}{%
- \expandafter\providecommand\expandafter*%
- \csname scr at dte@#1 at init\endcsname[1]%
+\NewDocumentCommand\TOCEntryStyleInitCode{sm}{%
+ \IfBooleanT{#1}{\expandafter\let\csname scr at dte@#2 at init\endcsname\relax}%
+ \scr at ifundefinedorrelax{scr at dte@#2 at init}{%
+ \expandafter\newcommand\expandafter*%
+ \csname scr at dte@#2 at init\endcsname[1]%
}{%
- \expandafter\l at addto@macro at a\csname scr at dte@#1 at init\endcsname
+ \expandafter\l at addto@macro at a\csname scr at dte@#2 at init\endcsname
}%
}
\newcommand{\TOCEntryStyleStartInitCode}[1]{%
@@ -1039,7 +1042,7 @@
}%
}
% \end{macrocode}
-% \end{command}^^A \TOCEntryStyleInitCode,\TOCEntryStyleStartInitCode
+% \end{command}^^A \TOCEntryStyleInitCode … \TOCEntryStyleStartInitCode
% \begin{macro}{\@ExecuteTOCEntryStyleInitCode}
% \changes{v3.20}{2015/12/04}{added}
% Executes the init code of one style. The first argument is the name of the
@@ -1096,6 +1099,7 @@
% \begin{command}{\DeclareTOCStyleEntry}
% \changes{v3.20}{2015/11/13}{added}
% \changes{v3.39}{2022/10/24}{error message about missing options improved}
+% \changes{v3.41}{2023/06/20}{usage of style definition files supported}
% This user command defines a new ToC entry command. It tests, if all needed
% style macros are already defined. Otherwise an error will be shown and the
% ToC entry command will not be defined. The arguments are:
@@ -1112,6 +1116,16 @@
%<*body>
\newcommand*{\DeclareTOCStyleEntry}[3][]{%
\scr at ifundefinedorrelax{scr at dte@def at l@#2}{%
+ \IfFileExists{tocbasic-tocstyle-#2.def}{%
+ \edef\reserved at a{%
+ \unexpanded{%
+ \makeatletter
+ \input{tocbasic-tocstyle-#2.def}%
+ \catcode`\@=}\the\catcode`\@\relax
+ }\reserved at a
+ }{}%
+ }{}%
+ \scr at ifundefinedorrelax{scr at dte@def at l@#2}{%
\PackageError{tocbasic}{toc entry style `#2' undefined}{%
Somebody told me to define toc entry `#3' with style `#2',\MessageBreak
but I do not know style `#2'.\MessageBreak
@@ -1229,6 +1243,8 @@
% \changes{v3.20}{2015/11/17}{added}
% \begin{macro}{\@DeclareTOCEntryStyle}
% \changes{v3.20}{2015/11/17}{added}
+% \changes{v3.41}{2023/06/20}{using \cs{TOCEntryStyleInitCode*} instead of
+% \cs{TOCEntryStyleInitCode}}
% The user command is used to define a new style for ToC entries. The
% arguments are:
% \begin{description}
@@ -1257,7 +1273,7 @@
\TOC at EntryEndHook{##1}%
}%
}%
- \TOCEntryStyleInitCode{#1}{%
+ \TOCEntryStyleInitCode*{#1}{%
\DefineTOCEntryNumberOption{level}{}{tocdepth}{toc entry level}%
#2%
}%
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-version.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-version.dtx 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrkernel-version.dtx 2023-07-07 20:41:06 UTC (rev 67572)
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
%
% ATTENTION: In this file parts of the code and documentation are before the
% driver. This must be, because this part of the code is needed by the driver
@@ -141,9 +141,9 @@
% therefore the syntax or general structure of the line must not be changed!
% \begin{macrocode}
%<*!v4>
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
%</!v4>
-%<v4> \@nameuse{@CheckKOMAScriptVersion}{2023/04/24 v3.40 KOMA-Script}%
+%<v4> \@nameuse{@CheckKOMAScriptVersion}{2023/07/07 v3.41 KOMA-Script}%
\endgroup
% \end{macrocode}
% \end{macro}
Modified: trunk/Master/texmf-dist/source/latex/koma-script/scrlayer.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/scrlayer.dtx 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/source/latex/koma-script/scrlayer.dtx 2023-07-07 20:41:06 UTC (rev 67572)
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: scrlayer.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrlayer.dtx 4058 2023-06-16 08:32:27Z kohm $
%<identify>%%% (run: identify)
%<init>%%% (run: init)
%<options>%%% (run: options)
@@ -28,9 +28,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
+ \filedate$Date: 2023-06-16 10:32:27 +0200 (Fr, 16. Jun 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 4032 $
+ \filerevision$Revision: 4058 $
\edef\reserved at a{%
\noexpand\endgroup
\noexpand\ProvidesFile{scrlayer.dtx}%
@@ -311,9 +311,11 @@
% \begin{option}{markcase}
% \changes{v3.39}{2022/11/11}{initial dot in member argument of option storage
% commands removed}
+% \changes{v3.41}{2023/06/16}{new value \texttt{title} to support
+% \cs{MakeTitlecase}}
% \begin{description}
% \item[\texttt{=\meta{setting}}] one of: \texttt{upper}, \texttt{lower},
-% \texttt{used}, or \texttt{ignoreuppercase}.
+% \texttt{title}, \texttt{used}, or \texttt{ignoreuppercase}.
% \end{description}\noindent
% The two options \opt{markuppercase} and \opt{markusedcase} become
% deprecated and are replace be the single option \opt{markcase}. Note,
@@ -325,9 +327,9 @@
%<interface&scrpage>\scrlayer at AtEndOfPackage{%
\begingroup
\KOMA at set@ncmdkey{markcase}{reserved at a}{%
- {upper}{0},{lower}{1},{used}{2},%
- {ignoreuppercase}{3},{nouppercase}{3},%
- {ignoreupper}{3},{noupper}{3}%
+ {upper}{0},{lower}{1},{title}{2},{used}{3},%
+ {ignoreuppercase}{4},{nouppercase}{4},%
+ {ignoreupper}{4},{noupper}{4}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\aftergroup\FamilyKeyStateProcessed
@@ -340,6 +342,15 @@
\aftergroup\MakeLowercase
\aftergroup\scrlayer at forceignoreuppercasefalse
\or
+ \scr at ifundefinedorrelax{MakeTitlecase}{%
+ \PackageWarning{scrlayer}{`markcase=title' ignored because
+ \string\MakeTitlecase\space not available}%
+ \aftergroup\MakeMarkcase
+ }{%
+ \aftergroup\MakeTitlecase
+ }%
+ \aftergroup\scrlayer at forceignoreuppercasefalse
+ \or
\aftergroup\@firstofone
\aftergroup\scrlayer at forceignoreuppercasefalse
\else
@@ -376,9 +387,11 @@
\KOMA at kav@replacevalue{scrlayer.sty}{markcase}{upper}%
\else\ifx\MakeMarkcase\MakeLowercase
\KOMA at kav@replacevalue{scrlayer.sty}{markcase}{lower}%
- \else\ifx\MakeMarkcase\scr at ignoreuppercase
- \KOMA at kav@replacevalue{scrlayer.sty}{markcase}{ignoreuppercase}%
-\fi\fi\fi\fi
+ \else\ifx\MakeMarkcase\MakeTitlecase
+ \KOMA at kav@replacevalue{scrlayer.sty}{markcase}{title}%
+ \else\ifx\MakeMarkcase\scr at ignoreuppercase
+ \KOMA at kav@replacevalue{scrlayer.sty}{markcase}{ignoreuppercase}%
+\fi\fi\fi\fi\fi
% \end{macrocode}
% \begin{macro}{\scrlayer at ignoreuppercase}
% We span a group and set \cs{uppercase} and \cs{MakeUppercase} to
@@ -784,6 +797,8 @@
% \end{macrocode}
% \end{macro}^^A \automark at basics
% \begin{macro}{\automark at righthigh}
+% \changes{v3.41}{2023/06/16}{split usage of \cs{MakeMarkcase} to support
+% \cs{MakeTitlecase}}
% Set up the right mark of a higher level, but in single-side layout only if
% \opt{autooneside} hasn't been used. Note, that with this definition no
% special handling for \KOMAScript's \cs{addchap} and \cs{addsec} is
@@ -799,11 +814,11 @@
\expandafter\endgroup
\if at tempswa
\@mkright{%
- \MakeMarkcase{%
- \ifnum \c at secnumdepth<\numexpr \csname #1numdepth\endcsname +0\relax
- \else\if at mainmatter \csname #1markformat\endcsname\fi\fi
- ##1%
- }%
+ \ifnum \c at secnumdepth<\numexpr \csname #1numdepth\endcsname +0\relax
+ \else
+ \if at mainmatter \MakeMarkcase{\csname #1markformat\endcsname}\fi
+ \fi
+ \MakeMarkcase{##1}%
}%
\fi
}%
@@ -832,15 +847,17 @@
% instead of only a left high mark, we set up both marks.
% \changes{v3.27}{2019/07/25}{replaced \cs{@empty} by \texttt{\{\}} to avoid
% \textsf{babel} issue}
+% \changes{v3.41}{2023/06/16}{split usage of \cs{MakeMarkcase} to support
+% \cs{MakeTitlecase}}
% \begin{macrocode}
\expandafter\@mkdouble
\fi
{%
- \MakeMarkcase{%
- \ifnum \c at secnumdepth<\numexpr \csname #1numdepth\endcsname +0\relax
- \else\if at mainmatter \csname #1markformat\endcsname\fi\fi
- ##1%
- }%
+ \ifnum \c at secnumdepth<\numexpr \csname #1numdepth\endcsname +0\relax
+ \else
+ \if at mainmatter \MakeMarkcase{\csname #1markformat\endcsname}\fi
+ \fi
+ \MakeMarkcase{##1}%
}{}%
}%
}{}%
@@ -867,17 +884,17 @@
% \end{macrocode}
% Level of left mark is equal to level of right mark. This is
% nice and very easy to handle.
+% \changes{v3.41}{2023/06/16}{split usage of \cs{MakeMarkcase} to support
+% \cs{MakeTitlecase}}
% \begin{macrocode}
\expandafter\def\csname #2mark\endcsname##1{%
\@mkdouble{%
- \MakeMarkcase{%
- \ifnum \c at secnumdepth<\numexpr
- \csname #2numdepth\endcsname +0\relax
- \else
- \if at mainmatter \csname #2markformat\endcsname\fi
- \fi
- ##1%
- }%
+ \ifnum \c at secnumdepth<\numexpr
+ \csname #2numdepth\endcsname +0\relax
+ \else
+ \if at mainmatter \MakeMarkcase{\csname #2markformat\endcsname}\fi
+ \fi
+ \MakeMarkcase{##1}%
}%
}%
\else
@@ -893,25 +910,23 @@
\expandafter\endgroup
\if at tempswa
\@mkleft{%
- \MakeMarkcase{%
- \ifnum \c at secnumdepth
- < \numexpr\csname #1numdepth\endcsname +0\relax
- \else
- \if at mainmatter \csname #1markformat\endcsname\fi
- \fi
- ##1%
- }%
+ \ifnum \c at secnumdepth
+ < \numexpr\csname #1numdepth\endcsname +0\relax
+ \else
+ \if at mainmatter \MakeMarkcase{\csname #1markformat\endcsname}\fi
+ \fi
+ \MakeMarkcase{##1}%
}%
\fi
}%
\expandafter\def\csname #2mark\endcsname##1{%
\@mkboth{}{%
- \MakeMarkcase{%
- \ifnum \c at secnumdepth
- < \numexpr \csname #2numdepth\endcsname +0\relax
- \else\if at mainmatter \csname #2markformat\endcsname\fi\fi
- ##1%
- }%
+ \ifnum \c at secnumdepth
+ < \numexpr \csname #2numdepth\endcsname +0\relax
+ \else
+ \if at mainmatter \MakeMarkcase{\csname #2markformat\endcsname}\fi
+ \fi
+ \MakeMarkcase{##1}%
}%
}%
\fi
Modified: trunk/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx 2023-07-07 20:41:06 UTC (rev 67572)
@@ -18,7 +18,7 @@
%
% This work consists of all files listed in MANIFEST.md.
% ======================================================================
-%%% From File: $Id: tocbasic.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: tocbasic.dtx 4067 2023-06-28 14:37:03Z kohm $
%<identify>%%% (run: identify)
%<prepare>%%% (run: prepare)
%<option>%%% (run: option)
@@ -29,9 +29,9 @@
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\begingroup
\def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
- \filedate$Date: 2023-04-17 11:45:11 +0200 (Mo, 17. Apr 2023) $
+ \filedate$Date: 2023-06-28 16:37:03 +0200 (Mi, 28. Jun 2023) $
\def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
- \filerevision$Revision: 4032 $
+ \filerevision$Revision: 4067 $
\endgroup
\ProvidesFile{tocbasic.dtx}[\filedate\space\filerevision\space
%</dtx>
@@ -61,10 +61,9 @@
\file{tocbasic.sty}{%
\from{tocbasic.dtx}{package,identify}%
\from{tocbasic.dtx}{package,prepare}%
- \from{scrkernel-tocstyle.dtx}{package,prepare}%
\from{tocbasic.dtx}{package,option}%
- \from{scrkernel-tocstyle.dtx}{package,option}%
- \from{tocbasic.dtx}{package,body}%
+ \from{tocbasic.dtx}{package,execoption}%
+ \from{tocbasic.dtx}{package,body,deprecated}%
\from{scrkernel-tocstyle.dtx}{package,body}%
\from{scrkernel-tocstyle.dtx}{package,style,gobble}%
\from{scrkernel-tocstyle.dtx}{package,style,dottedtocline}%
@@ -145,6 +144,28 @@
% out-sourced into file \file{scrkernel-tocbasic.dtx}.
%
%
+% \subsection{Required packages}
+% \label{sec:packages}
+%
+% \changes{v3.41}{2023/06/28}{required packages moved to \texttt{prepare} run}
+% \changes{v3.41}{2023/06/28}{\pkg{expl3} and \pkg{xparse} are required}
+% Package \pkg*{scrbase} is needed to process all macro options.
+% \begin{macrocode}
+%<*prepare>
+\RequirePackage{scrbase}
+%</prepare>
+% \end{macrocode}
+%
+% Now we can load \pkg{xparse} if needed, which also would load \pkg{expl3}:
+% \begin{macrocode}
+%<*prepare>
+\scr at ifundefinedorrelax{NewDocumentCommand}{%
+ \RequirePackage{xparse}[2018-04-12]%
+}{}
+%</prepare>
+% \end{macrocode}
+%
+%
% \subsection{Options}
% \label{sec:options}
%
@@ -154,28 +175,12 @@
% result in an option clash. Nevertheless, the not existing options are
% processed.
% \begin{macrocode}
-%<*option>
+%<*execoption>
\ProcessOptions\relax
-%</option>
+%</execoption>
% \end{macrocode}
%
%
-% \subsection{Required packages}
-% \label{sec:packages}
-%
-% Package \pkg*{scrbase} is needed to process all macro options. As long as
-% no package options are provided, the \texttt{body}-run is early enough to
-% load it.
-% \begin{macrocode}
-%<*body>
-\RequirePackage{scrbase}
-%</body>
-% \end{macrocode}
-% We load it after processing the options, because we don't need it for
-% processing options.
-%
-%
-%
% \subsection{Unwanted packages}
% \label{sec:unpackages}
%
@@ -272,19 +277,33 @@
% \end{macrocode}
% \end{command}^^A \ifattoclist,\Ifattoclist
%
+% \begin{macro}{\tb at optowner}
+% \changes{v3.41}{2023/06/28}{new}
+% Several of the following commands use an optional argument for the
+% owner. Almost always if the argument is not given but \cs{@currname} is not
+% empty \texttt{\cs{@currname}.\cs{@currext}} should be used. If the argument
+% is not given but \cs{@currname} is empty, an empty value should be used. And
+% if the optional argument is given, it should be used unchanged. So here is a
+% helper macro for exactly this logic. Note, that argument here is not
+% optional but mandatory and should be an optional argument of
+% \cs{NewDocumentCommand}.
+% \begin{macrocode}
+\newcommand*{\tb at optowner}[1]{%
+ \IfValueTF{#1}{%
+ #1%
+ }{%
+ \ifx\@currname\@empty\else
+ \@currname.\@currext%
+ \fi
+ }%
+}
+% \end{macrocode}
+% \end{macro}
% \begin{command}{\addtotoclist}
% \changes{v3.06a}{2010/09/14}{expand the arguments while adding them to the
% internal list}
-% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-% \cs{kernel at ifnextchar}}
-% \begin{macro}{\@addtotoclist,\scr at addtotoclist}
-% \changes{v1.0a}{2008/11/11}{\cs{@addtotoclist} renamed to
-% \cs{scr at addtotoclist} because of package \pkg{flowfram}}
-% \begin{macro}{\@@addtotoclist,\scr@@addtotoclist}
-% \changes{v1.0a}{2008/11/11}{\cs{@@addtotoclist} renamed to
-% \cs{scr@@addtotoclist} because of package \pkg{flowfram}}
-% \changes{v3.28}{2019/11/19}{\cs{ifattoclist} replaced by
-% \cs{Ifattoclist}}
+% \changes{v3.41}{2023/06/28}{using \cs{NewDocumentCommand} to not need all
+% the helpers}
% This command adds an extension to the list of toc-files. The first,
% optional argument is the class or package name with the corresponding
% extension of class or package files. If this argument was omitted
@@ -294,19 +313,8 @@
% second, mandatory argument is the extension of the toc-file. NOTE: An
% empty first argument is not the same like omitting the first argument!
% \begin{macrocode}
-\newcommand*{\addtotoclist}{%
- \kernel at ifnextchar [%]
- \scr@@addtotoclist\scr at addtotoclist
-}
-\newcommand*{\scr at addtotoclist}{%
- \ifx\@currname\@empty
- \def\reserved at a{\scr@@addtotoclist[]}%
- \else
- \edef\reserved at a{\noexpand\scr@@addtotoclist[\@currname.\@currext]}%
- \fi
- \reserved at a
-}
-\newcommand*{\scr@@addtotoclist}[2][]{%
+\NewDocumentCommand\addtotoclist{om}{%
+ \edef\reserved at b{\tb at optowner{#1}}%
\Ifattoclist{#2}{%
\PackageError{tocbasic}{%
file extension `#2' cannot be used twice
@@ -320,15 +328,15 @@
}%
}{%
\begingroup
- \protected at edef\reserved at a{%
+ \edef\reserved at a{%
\noexpand\g at addto@macro\noexpand\tb at listoftocs{%
- \noexpand\do{#2}{#1}}}\reserved at a
+ \noexpand\do{#2}{\reserved at b}}}\reserved at a
\endgroup
- \ifx\relax #1\relax\else
- \@ifundefined{tb@#1 at add@hook}{}{%
+ \ifx\reserved at b\@empty\else
+ \@ifundefined{tb@\reserved at b @add at hook}{}{%
\edef\reserved at a{%
\noexpand\def\noexpand\@currext{#2}%
- \noexpand\@nameuse{tb@#1 at add@hook}%
+ \noexpand\@nameuse{tb@\reserved at b @add at hook}%
\noexpand\def\noexpand\@currext{\@currext}%
}\reserved at a
}%
@@ -341,8 +349,16 @@
}%
}
% \end{macrocode}
+% \begin{macro}[noprint]{\@addtotoclist,\scr at addtotoclist,
+% \@@addtotoclist,\scr@@addtotoclist}
+% \changes{v1.0a}{2008/11/11}{\cs{@addtotoclist} renamed to
+% \cs{scr at addtotoclist} because of package \pkg{flowfram}}
+% \changes{v1.0a}{2008/11/11}{\cs{@@addtotoclist} renamed to
+% \cs{scr@@addtotoclist} because of package \pkg{flowfram}}
+% \changes{v3.28}{2019/11/19}{\cs{ifattoclist} replaced by
+% \cs{Ifattoclist}}
+% \changes{v3.41}{2023/06/28}{removed}
% \end{macro}
-% \end{macro}
% \end{command}
%
% \begin{command}{\owneroftoc}
@@ -371,7 +387,8 @@
% \begin{command}{\AtAddToTocList}
% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
% \cs{kernel at ifnextchar}}
-% \begin{macro}{\@AtAddToTocList,\@@AtAddToTocList}
+% \changes{v3.41}{2023/06/28}{using \cs{NewDocumentCommand} to not need all
+% the helpers}
% Action to be done, when adding a toc-file of a known owner. The first
% optional argument is the owner. The second, mandatory argument is the
% action. While doing the action \cs{@currext} will be the extension of the
@@ -386,23 +403,16 @@
% the general hook). But the individual hook will not be processed for
% toc-files without any owner!
% \begin{macrocode}
-\newcommand*{\AtAddToTocList}{%
- \kernel at ifnextchar [%]
- \@@AtAddToTocList\@AtAddToTocList
+\NewDocumentCommand\AtAddToTocList{o}{%
+ \edef\reserved at a{\tb at optowner{#1}}%
+ \@ifundefined{tb@\reserved at a @add at hook}%
+ {\@namedef{tb@\reserved at a @add at hook}{}}%
+ {}%
+ \expandafter\g at addto@macro\csname tb@\reserved at a @add at hook\endcsname
}
-\newcommand*{\@AtAddToTocList}{%
- \ifx\@currname\@empty
- \def\reserved at a{\@@AtAddToTocList[]}%
- \else
- \edef\reserved at a{\noexpand\@@AtAddToTocList[\@currname.\@currext]}%
- \fi
- \reserved at a
-}
-\newcommand*{\@@AtAddToTocList}[1][]{%
- \@ifundefined{tb@#1 at add@hook}{\@namedef{tb@#1 at add@hook}{}}{}%
- \expandafter\g at addto@macro\csname tb@#1 at add@hook\endcsname
-}
% \end{macrocode}
+% \begin{macro}[noprint]{\@AtAddToTocList,\@@AtAddToTocList}
+% \changes{v3.41}{2023/06/28}{removed}
% \end{macro}
% \end{command}
%
@@ -461,109 +471,96 @@
% \begin{command}{\removefromtoclist}
% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
% \cs{kernel at ifnextchar}}
-% \begin{macro}{\scr at removefromtoclist,\@removefromtoclist}
% \changes{v3.22}{2016/09/06}{missing \cs{global} added}
-% \changes{v3.28}{2019/11/22}{\cs{@removefromtoclist} renamed to
-% \cs{scr at removefromtoclist}}
-% \begin{macro}{\scr@@removefromtoclist,\@@removefromtoclist}
-% \changes{v3.22}{2016/09/06}{missing \cs{global} added}
-% \changes{v3.28}{2019/11/22}{\cs{@@removefromtoclist} renamed to
-% \cs{scr at removefromtoclist}}
+% \changes{v3.41}{2023/06/28}{using \cs{NewDocumentCommand} to not need all
+% the helpers}
% This command will remove an extension from the list of toc-files. If the
% first, optional argument is given, the extension will only be removed, if
% it was added by the given owner. NOTE: An empty first argument is not the
% same like omitting the first argument!
% \begin{macrocode}
-\newcommand*{\removefromtoclist}{%
- \kernel at ifnextchar [%]
- \scr at removefromtoclist\scr@@removefromtoclist
-}
-\newcommand*{\scr at removefromtoclist}[2][]{%
+\NewDocumentCommand\removefromtoclist{om}{%
\begingroup
\let\tb at oldlist\tb at listoftocs
+ \edef\reserved at b{#2}%
+ \global\let\tb at listoftocs\empty
\def\do##1##2{%
\edef\reserved at a{##1}%
\ifx\reserved at a\reserved at b
- \begingroup
- \edef\@currext{##2}%
- \edef\reserved at b{#1}%
- \ifx\@currext\reserved at b
- \else
- \g at addto@macro\tb at listoftocs{\do{##1}{##2}}%
- \fi
- \endgroup
+ \IfValueT{#1}{%
+ \begingroup
+ \edef\@currext{##2}%
+ \edef\reserved at b{#1}%
+ \ifx\@currext\reserved at b
+ \else
+ \g at addto@macro\tb at listoftocs{\do{##1}{##2}}%
+ \fi
+ \endgroup
+ }%
\else
\g at addto@macro\tb at listoftocs{\do{##1}{##2}}%
\fi
}%
- \edef\reserved at b{#2}\global\let\tb at listoftocs\@empty
\tb at oldlist
\endgroup
}
-\newcommand*{\scr@@removefromtoclist}[1]{%
- \begingroup
- \let\tb at oldlist\tb at listoftocs
- \def\do##1##2{%
- \edef\reserved at a{##1}%
- \ifx\reserved at a\reserved at b
- \else
- \g at addto@macro\tb at listoftocs{\do{##1}{##2}}%
- \fi
- }%
- \edef\reserved at b{#1}\global\let\tb at listoftocs\@empty
- \tb at oldlist
- \endgroup
-}
% \end{macrocode}
+% \begin{macro}[noprint]{\scr at removefromtoclist,\@removefromtoclist,
+% \scr@@removefromtoclist,\@@removefromtoclist}
+% \changes{v3.28}{2019/11/22}{\cs{@removefromtoclist} renamed to
+% \cs{scr at removefromtoclist}}
+% \changes{v3.28}{2019/11/22}{\cs{@@removefromtoclist} renamed to
+% \cs{scr at removefromtoclist}}
+% \changes{v3.41}{2023/06/28}{removed}
% \end{macro}
-% \end{macro}
% \end{command}
%
% \begin{command}{\doforeachtocfile}
+% \changes{v3.09}{2011/03/01}{\cs{@currext} defined using \cs{edef} instead
+% of \cs{def}}
% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
% \cs{kernel at ifnextchar}}
-% \begin{macro}{\@doforeachtocfile,\@@doforeachtocfile}
-% \changes{v3.09}{2011/03/01}{\cs{@currext} defined using \cs{edef} instead
-% of \cs{def}}
+% \changes{v3.41}{2023/06/28}{using \cs{NewDocumentCommand} to not need all
+% the helpers}
% This command does the second, mandatory argument for each toc-file at the
% list of toc-files. If the first, optional argument was given this will be
% done only for the toc-files of that owner. NOTE: An empty first argument
% is not the same like omitting the first argument!
-%
% While processing the second argument \cs{@currext} is the extension of
% the toc-file. The second argument will be processed with increased group
% level!
-%
% See \cs{addtoeachtocfile} for an example of usage of
% \cs{doforeachtocfile}.
% \begin{macrocode}
-\newcommand{\doforeachtocfile}{%
- \kernel at ifnextchar [%]
- \@doforeachtocfile\@@doforeachtocfile
-}
-\newcommand{\@doforeachtocfile}[2][]{%
- \def\do##1##2{%
- \edef\reserved at a{#1}\edef\reserved at b{##2}\ifx\reserved at a\reserved at b
- \edef\@currext{##1}#2%
- \fi
+\NewDocumentCommand\doforeachtocfile{o+m}{%
+ \IfValueTF{#1}{%
+ \def\do##1##2{%
+ \edef\reserved at a{#1}\edef\reserved at b{##2}%
+ \ifx\reserved at a\reserved at b \edef\@currext{##1}#2\fi
+ }%
+ }{%
+ \def\do##1##2{\edef\@currext{##1}#2}%
}%
\edef\reserved at a{%
\noexpand\tb at listoftocs
\noexpand\def\noexpand\@currext{\@currext}%
}\reserved at a
- \let\do\relax
+% \end{macrocode}
+% \changes{v3.41}{2023/05/16}{don't \cs{let}\cs{do}\cs{relax}}
+% Former versions of \KOMAScript{} have used |\let\do\relax| to undefined
+% \cs{do} after the walk-through. But some packages like \pkg{dynkin-diagrams}
+% have had problems using \cs{renewcommand} instead of \cs{def} or \cs{let} to
+% change \cs{do}. So from version 3.41 \KOMAScript{} has changed this to
+% |\let\do\noexpand|, because this is the default of \LaTeX{} after
+% |\begin{document}|. However, this is only a workaround for a
+% workaround. Best would be to remove the final change of \cs{do}. But this
+% could also break packages.
+% \begin{macrocode}
+ \let\do\noexpand
}
-\newcommand{\@@doforeachtocfile}[1]{%
- \def\do##1##2{%
- \edef\@currext{##1}#1%
- }%
- \edef\reserved at a{%
- \noexpand\tb at listoftocs
- \noexpand\def\noexpand\@currext{\@currext}%
- }\reserved at a
- \let\do\relax
-}
% \end{macrocode}
+% \begin{macro}[noprint]{\@doforeachtocfile,\@@doforeachtocfile}
+% \changes{v3.41}{2023/06/28}{removed}
% \end{macro}
% \end{command}
%
@@ -570,8 +567,8 @@
% \begin{command}{\addtoeachtocfile}
% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
% \cs{kernel at ifnextchar}}
-% \begin{macro}{\@addtoeachtocfile,\@@addtoeachtocfile}
-% \changes{v3.03b}{2009/06/08}{typo fix at usage of \cs{doforeachtocfile}}
+% \changes{v3.41}{2023/06/28}{using \cs{NewDocumentCommand} to not need all
+% the helpers}
% This command calls \cs{addtocontents} with the section, mandatory
% argument for each toc-file at the list of toc-files. If the first,
% optional argument was given this will be done only for the toc-files of
@@ -579,18 +576,14 @@
% the first argument! And don't forget to protect the commands, that should
% not be expanded, at the mandatory argument.
% \begin{macrocode}
-\newcommand{\addtoeachtocfile}{%
- \kernel at ifnextchar [%]
- \@addtoeachtocfile\@@addtoeachtocfile
-}
-\newcommand{\@addtoeachtocfile}[2][]{%
+\NewDocumentCommand\addtoeachtocfile{o+m}{%
\doforeachtocfile[{#1}]{\addtocontents{\@currext}{#2}}%
}
-\newcommand{\@@addtoeachtocfile}[1]{%
- \doforeachtocfile{\addtocontents{\@currext}{#1}}%
-}
%</body>
% \end{macrocode}
+% \begin{macro}[noprint]{\@addtoeachtocfile,\@@addtoeachtocfile}
+% \changes{v3.03b}{2009/06/08}{typo fix at usage of \cs{doforeachtocfile}}
+% \changes{v3.41}{2023/06/28}{removed}
% \end{macro}
% \end{command}
%
@@ -602,22 +595,19 @@
% \begin{command}{\addcontentslinetoeachtocfile}
% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
% \cs{kernel at ifnextchar}}
-% \begin{macro}{\@addcontentslinetoeachtocfile,\@@addcontentslinetoeachtocfile}
+% \changes{v3.41}{2023/06/28}{using \cs{NewDocumentCommand} to not need all
+% the helpers}
% Something like a combination of \cs{addtoeachtocfile} and
% \cs{addcontentsline}.
% \begin{macrocode}
%<*body>
-\newcommand{\addcontentslinetoeachtocfile}{%
- \kernel at ifnextchar [%]
- \@addcontentslinetoeachtocfile\@@addcontentslinetoeachtocfile
-}
-\newcommand{\@addcontentslinetoeachtocfile}[3][]{%
- \doforeachtocfile[{#1}]{\addcontentsline{\@currext}{#2}{#3}}%
-}
-\newcommand{\@@addcontentslinetoeachtocfile}[2]{%
- \doforeachtocfile{\addcontentsline{\@currext}{#1}{#2}}%
-}
+\NewDocumentCommand\addcontentslinetoeachtocfile{omm}{%
+ \doforeachtocfile[{#1}]{\addcontentsline{\@currext}{#2}{#3}}%
+}
% \end{macrocode}
+% \begin{macro}[noprint]{\@addcontentslinetoeachtocfile,
+% \@@addcontentslinetoeachtocfile}
+% \changes{v3.41}{2023/06/28}{removed}
% \end{macro}
% \end{command}
%
@@ -625,20 +615,14 @@
% \changes{v3.12}{2013/09/24}{added}
% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
% \cs{kernel at ifnextchar}}
-% \begin{macro}{\@addxcontentsline}
-% \changes{v3.12}{2013/09/24}{added}
+% \changes{v3.41}{2023/06/28}{using \cs{NewDocumentCommand} to not need all
+% the helpers}
% This will be used instead of \cs{addcontentsline} to generate numbered or
% not numbered entries to a toc-file. First argument is the toc-file, second
% the entry type, e.g., |chapter|, the third is the entry number or empty and
% the fourth and last is the entry text.
% \begin{macrocode}
-\newcommand*{\addxcontentsline}[2]{%
- \kernel at ifnextchar [%]
- {\@addxcontentsline{#1}{#2}}%
- {\@addxcontentsline{#1}{#2}[]}%
-}
-\newcommand*{\@addxcontentsline}{}
-\def\@addxcontentsline#1#2[#3]#4{%
+\NewDocumentCommand\addxcontentsline{mmO{}m}{%
\scr at ifundefinedorrelax{add#2#1entry}{%
\tocbasic at addxcontentsline{#1}{#2}{#3}{#4}%
}{%
@@ -646,6 +630,10 @@
}%
}
% \end{macrocode}
+% \begin{macro}[noprint]{\@addxcontentsline}
+% \changes{v3.12}{2013/09/24}{added}
+% \changes{v3.41}{2023/06/28}{removed}
+% \end{macro}
% \begin{command}{\nonumberline}
% \changes{v3.12}{2013/09/24}{added}
% Either \cs{relax} or \cs{numberline} depending on the feature
@@ -654,7 +642,7 @@
\newcommand*{\nonumberline}{}%
% \end{macrocode}
% \end{command}
-% \begin{command}{\addxcontentsline}
+% \begin{macro}{\tocbasic at addxcontentsline}
% This may be used to either use a heading type command or the general default
% one. You are not allowed to use it in the definition of a heading type
% command like \cs{addchaptertocentry}! You may use
@@ -661,14 +649,13 @@
% \cs{tocbasic at addxcontentsline} at the definition of those commands.
% \begin{macrocode}
\newcommand*{\tocbasic at addxcontentsline}[4]{%
- \if\relax\detokenize{#3}\relax
+ \IfArgIsEmpty{#3}{%
\addcontentsline{#1}{#2}{\protect\nonumberline#4}%
- \else
+ }{%
\addcontentsline{#1}{#2}{\protect\numberline{#3}#4}%
- \fi
+ }%
}
% \end{macrocode}
-% \end{command}
% \end{macro}
% \end{command}
%
@@ -676,43 +663,23 @@
% \changes{v3.12}{2013/09/24}{added}
% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
% \cs{kernel at ifnextchar}}
-% \begin{macro}{\@addxcontentslinetoeachtocfile,
-% \@@addxcontentslinetoeachtocfile}
-% \changes{v3.12}{2013/09/24}{added}
-% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-% \cs{kernel at ifnextchar}}
-% \begin{macro}{\@@@addxcontentslinetoeachtocfile,
-% \@@@@addxcontentslinetoeachtocfile}
-% \changes{v3.12}{2013/09/24}{added}
+% \changes{v3.41}{2023/06/28}{using \cs{NewDocumentCommand} to not need all
+% the helpers}
% Similar to \cs{addcontentslinetoeachtocfile} using
% \cs{addxcontentsline} instead of \cs{addcontentsline}.
% \begin{macrocode}
-\newcommand{\addxcontentslinetoeachtocfile}{%
- \kernel at ifnextchar [%]
- \@addxcontentslinetoeachtocfile\@@addxcontentslinetoeachtocfile
+\NewDocumentCommand\addxcontentslinetoeachtocfile{omom}{%
+ \doforeachtocfile[{#1}]{\addxcontentsline{\@currext}{#2}[{#3}]{#4}}
}
-\newcommand{\@addxcontentslinetoeachtocfile}[2][]{%
- \kernel at ifnextchar [%]
- {\@@@addxcontentslinetoeachtocfile[{#1}]{#2}}%
- {\@@@addxcontentslinetoeachtocfile[{#1}]{#2}[]}
-}
-\newcommand*{\@@@addxcontentslinetoeachtocfile}{}
-\def\@@@addxcontentslinetoeachtocfile[#1]#2[#3]#4{%
- \doforeachtocfile[{#1}]{\addxcontentsline{\@currext}{#2}[#3]{#4}}%
-}
-\newcommand{\@@addxcontentslinetoeachtocfile}[1]{%
- \kernel at ifnextchar [%]
- {\@@@@addxcontentslinetoeachtocfile{#1}}%
- {\@@@@addxcontentslinetoeachtocfile{#1}[]}%
-}
-\newcommand*{\@@@@addxcontentslinetoeachtocfile}{}
-\def\@@@@addxcontentslinetoeachtocfile#1[#2]#3{%
- \doforeachtocfile{\addxcontentsline{\@currext}{#1}[{#2}]{#3}}%
-}
%</body>
% \end{macrocode}
+% \begin{macro}[noprint]{\@addxcontentslinetoeachtocfile,
+% \@@addxcontentslinetoeachtocfile,
+% \@@@addxcontentslinetoeachtocfile,
+% \@@@@addxcontentslinetoeachtocfile}
+% \changes{v3.12}{2013/09/24}{added}
+% \changes{v3.41}{2023/06/28}{removed}
% \end{macro}
-% \end{macro}
% \end{command}
%
%
@@ -810,7 +777,10 @@
\g at addto@macro\tocbasic@@before at hook{#2}%
\else
\@ifundefined{tb@#1 at before@hook}{%
-%<trace> \PackageInfo{tocbasic}{defining new hook before starting `#1'}%
+%<*trace>
+ \PackageInfo{tocbasic}{defining new hook before starting
+ \IfArgIsEmpty{#1}{any toc}{`#1'}}%
+%</trace>
\expandafter\global\expandafter\let\csname tb@#1 at before@hook\endcsname
\@empty
}{}%
@@ -822,7 +792,10 @@
\g at addto@macro\tocbasic@@after at hook{#2}%
\else
\@ifundefined{tb@#1 at after@hook}{%
-%<trace> \PackageInfo{tocbasic}{defining new hook after starting `#1'}%
+%<*trace>
+ \PackageInfo{tocbasic}{defining new hook after starting
+ \IfArgIsEmpty{#1}{any toc}{`#1'}}%
+%</trace>
\expandafter\global\expandafter\let\csname tb@#1 at after@hook\endcsname
\@empty
}{}%
@@ -933,23 +906,19 @@
% \end{command}
%
% \begin{command}{\listofeachtoc}
+% \changes{v3.03b}{2009/06/08}{typo fix at usage of \cs{doforeachtocfile}}
% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
% \cs{kernel at ifnextchar}}
-% \begin{macro}{\@listofeachtoc,\@@listofeachtoc}
-% \changes{v3.03b}{2009/06/08}{typo fix at usage of \cs{doforeachtocfile}}
+% \changes{v3.41}{2023/06/28}{using \cs{NewDocumentCommand} to not need all
+% the helpers}
% Another example of using \cs{doforeachtocfile}.
% \begin{macrocode}
-\newcommand*{\listofeachtoc}{%
- \kernel at ifnextchar [%]
- \@listofeachtoc\@@listofeachtoc
-}
-\newcommand{\@listofeachtoc}[1][]{%
+\NewDocumentCommand\listofeachtoc{o}{%
\doforeachtocfile[{#1}]{\listoftoc{\@currext}}%
}
-\newcommand{\@@listofeachtoc}[1]{%
- \doforeachtocfile{\listoftoc{\@currext}}%
-}
% \end{macrocode}
+% \begin{macro}[noprint]{\@listofeachtoc,\@@listofeachtoc}
+% \changes{v3.41}{2023/06/28}{removed}
% \end{macro}
% \end{command}
%
@@ -1103,7 +1072,10 @@
% \begin{macrocode}
\newcommand{\BeforeTOCHead}[2][]{%
\@ifundefined{tb@#1 at beforehead@hook}{%
-%<trace> \PackageInfo{tocbasic}{defining new hook before heading of `#1'}%
+%<*trace>
+ \PackageInfo{tocbasic}{defining new hook before heading of
+ \IfArgIsEmpty{#1}{each toc}{`#1'}}%
+%</trace>
\expandafter\global\expandafter\let\csname tb@#1 at beforehead@hook\endcsname
\@empty
}{}%
@@ -1111,7 +1083,10 @@
}
\newcommand{\AfterTOCHead}[2][]{%
\@ifundefined{tb@#1 at afterhead@hook}{%
-%<trace> \PackageInfo{tocbasic}{defining new hook after heading of `#1'}%
+%<*trace>
+ \PackageInfo{tocbasic}{defining new hook after heading of
+ \IfArgIsEmpty{#1}{each toc}{`#1'}}%
+%</trace>
\expandafter\global\expandafter\let\csname tb@#1 at afterhead@hook\endcsname
\@empty
}{}%
@@ -1198,6 +1173,7 @@
% \changes{v3.28}{2019/11/19}{\cs{iftocfeature} renamed to \cs{Iftocfeature}}
% We need a test for the features
% \begin{macrocode}
+%<*deprecated>
\providecommand*{\iftocfeature}{%
\PackageWarning{tocbasic}{Usage of deprecated command
`\string\iftocfeature'.\MessageBreak
@@ -1207,6 +1183,7 @@
}%
\Iftocfeature
}
+%</deprecated>
\newcommand*{\Iftocfeature}[2]{%
\scr at ifundefinedorrelax{tocbasic@#1 at feature@#2}{%
\expandafter\@secondoftwo
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/DIN.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/DIN.lco 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/DIN.lco 2023-07-07 20:41:06 UTC (rev 67572)
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-letterclassoptions.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: head)
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco 2023-07-07 20:41:06 UTC (rev 67572)
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-letterclassoptions.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: head)
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco 2023-07-07 20:41:06 UTC (rev 67572)
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-letterclassoptions.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: head)
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco 2023-07-07 20:41:06 UTC (rev 67572)
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-letterclassoptions.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: head)
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco 2023-07-07 20:41:06 UTC (rev 67572)
@@ -41,7 +41,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-letterclassoptions.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: head)
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco 2023-07-07 20:41:06 UTC (rev 67572)
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: Kaku,LATE,LOW,head)
@@ -71,7 +71,7 @@
L%
L%
}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
Japanese letter-class-option]
\providecommand*\LCOWarningNoLine[2]{%
\LCOWarning{#1}{#2\@gobble}%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/NF.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/NF.lco 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/NF.lco 2023-07-07 20:41:06 UTC (rev 67572)
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-letterclassoptions.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: head)
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco 2023-07-07 20:41:06 UTC (rev 67572)
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: Ni,EARLY,HIGH,head)
@@ -71,7 +71,7 @@
E%
H%
}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
Japanese letter-class-option]
\providecommand*\LCOWarningNoLine[2]{%
\LCOWarning{#1}{#2\@gobble}%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco 2023-07-07 20:41:06 UTC (rev 67572)
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: Ni,EARLY,LOW,head)
@@ -71,7 +71,7 @@
E%
L%
}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
Japanese letter-class-option]
\providecommand*\LCOWarningNoLine[2]{%
\LCOWarning{#1}{#2\@gobble}%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco 2023-07-07 20:41:06 UTC (rev 67572)
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: Ni,LATE,HIGH,head)
@@ -71,7 +71,7 @@
L%
H%
}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
Japanese letter-class-option]
\providecommand*\LCOWarningNoLine[2]{%
\LCOWarning{#1}{#2\@gobble}%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco 2023-07-07 20:41:06 UTC (rev 67572)
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: Ni,LATE,LOW,head)
@@ -71,7 +71,7 @@
L%
L%
}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
Japanese letter-class-option]
\providecommand*\LCOWarningNoLine[2]{%
\LCOWarning{#1}{#2\@gobble}%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco 2023-07-07 20:41:06 UTC (rev 67572)
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
%%% From File: $Id: japanlco.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: Ni,RIGHT,LOW,head)
@@ -71,7 +71,7 @@
R%
L%
}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
Japanese letter-class-option]
\providecommand*\LCOWarningNoLine[2]{%
\LCOWarning{#1}{#2\@gobble}%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/SN.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/SN.lco 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/SN.lco 2023-07-07 20:41:06 UTC (rev 67572)
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-letterclassoptions.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: head)
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/SNleft.lco 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/SNleft.lco 2023-07-07 20:41:06 UTC (rev 67572)
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-letterclassoptions.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: head)
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco 2023-07-07 20:41:06 UTC (rev 67572)
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-letterclassoptions.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: head)
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco 2023-07-07 20:41:06 UTC (rev 67572)
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-letterclassoptions.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: head)
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/float.hak
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/float.hak 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/float.hak 2023-07-07 20:41:06 UTC (rev 67572)
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
-%%% 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 $
\ProvidesFile{float.hak}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
scrhack part
(hacking package
float)%
]
-%%% 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 $
\scr at ifexpected{\newfloat}{%
\long\def\newfloat#1#2#3{\@namedef{ext@#1}{#3}
\let\float at do=\relax
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/floatrow.hak
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/floatrow.hak 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/floatrow.hak 2023-07-07 20:41:06 UTC (rev 67572)
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
-%%% 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 $
\ProvidesFile{floatrow.hak}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
scrhack part
(hacking package
floatrow)%
]
-%%% 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 $
\scr at ifexpected{\DeclareNewFloatType}{%
\long\def\DeclareNewFloatType#1#2{\def\FB at captype{#1}%
\expandafter\edef\csname ftype@#1\endcsname{\the\c at float@type}%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/hyperref.hak 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/hyperref.hak 2023-07-07 20:41:06 UTC (rev 67572)
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
-%%% 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 $
\ProvidesFile{hyperref.hak}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
scrhack part
(hacking package
hyperref)%
]
-%%% 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 $
\scr at ifexpected\@schapter{%
\def\@schapter#1{%
\H at old@schapter{#1}%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/listings.hak
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/listings.hak 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/listings.hak 2023-07-07 20:41:06 UTC (rev 67572)
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
-%%% 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 $
\ProvidesFile{listings.hak}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
scrhack part
(hacking package
listings)%
]
-%%% 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 $
\newcommand*{\scr at do@hack at listings}{%
\RequirePackage{tocbasic}%
\addtotoclist[float]{lol}%
@@ -78,6 +78,20 @@
\setuptoc{lol}{chapteratlist}%
\PackageInfo{scrhack}{redefining \string\lstlistoflistings}%
\renewcommand*{\lstlistoflistings}{\listoftoc[{\lstlistlistingname}]{lol}}%
+ \providecommand*{\ext at lstlisting}{lol}%
+ \@tempswafalse
+ \xpatchcmd\lst at MakeCaption
+ {\addcontentsline{lol}}%
+ {\addcontentsline{\ext at lstlisting}}%
+ {\PackageInfo{scrhack}{patching \string\lst at MakeCaption}\@tempswatrue}%
+ {\PackageWarning{scrhack}{cannot patch \string\lst at MakeCaption}}%
+ \@whilesw\if at tempswa\fi{%
+ \xpatchcmd\lst at MakeCaption
+ {\addcontentsline{lol}}%
+ {\addcontentsline{\ext at lstlisting}}%
+ {}%
+ {\@tempswafalse}%
+ }%
\AtBeginDocument{%
\scr at ifexpected{\float at addtolists}{%
\def\float at addtolists##1{\addtocontents{lol}{##1}}%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/lscape.hak
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/lscape.hak 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/lscape.hak 2023-07-07 20:41:06 UTC (rev 67572)
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
-%%% 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 $
\ProvidesFile{lscape.hak}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
scrhack part
(hacking package
lscape)%
]
-%%% 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 $
\xpatchcmd{\landscape}{\textheight=\vsize}{%
\if at scrhack@lscape
\scrh at LT@textheight=\vsize
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/nomencl.hak
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/nomencl.hak 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/nomencl.hak 2023-07-07 20:41:06 UTC (rev 67572)
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
-%%% 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 $
\ProvidesFile{nomencl.hak}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
scrhack part
(hacking package
nomencl)%
]
-%%% 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 $
\RequirePackage{tocbasic}
\@ifpackagelater{nomencl}{2019/01/01}{%
\PackageInfo{scrhack}{only `tocbasic' loaded for `nomencl'}%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls 2023-07-07 20:41:06 UTC (rev 67572)
@@ -84,7 +84,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -106,7 +106,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
\providecommand*{\scr at clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -119,16 +119,16 @@
article%
}
\ProvidesClass{\KOMAClassName}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
document class (\ClassName)%
]
-%%% 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: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
%%% From File: $Id: scrkernel-listsof.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: prepare)
\RequirePackage{tocbasic}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
]
\addtotoclist[ToC]{toc}
\Ifstr{\ext at toc}{toc}{}{%
@@ -136,9 +136,9 @@
\expandafter[\expandafter T\expandafter o\expandafter C\expandafter ]%
\expandafter{\ext at toc}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 4060 2023-06-20 08:59:01Z kohm $
%%% (run: prepare)
-%%% From File: $Id: scrkernel-sections.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4069 2023-06-29 08:55:54Z kohm $
%%% (run: prepare)
\newcommand*{\scr at dotchangeatdocument}[1]{%
\ClassError{\KOMAClassName}{%
@@ -199,7 +199,7 @@
\newcommand*{\size at subparagraph}{}
\newcommand*{\scr at fnt@subparagraph}{\size at subparagraph}
\newcommand*{\sectfont}{\normalcolor\maybesffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 4054 2023-05-10 14:35:36Z kohm $
%%% (run: init)
\newcommand*
{\scr at compatibility}{\scr at v@last}
@@ -287,10 +287,11 @@
\@namedef{scr at v@3.38}{20}
\@namedef{scr at v@3.39}{20}
\@namedef{scr at v@3.40}{20}
-\@namedef{scr at v@last}{20}
+\@namedef{scr at v@3.41}{21}
+\@namedef{scr at v@last}{21}
%%% From File: $Id: scrkernel-typearea.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: init)
-%%% From File: $Id: scrkernel-compatibility.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 4054 2023-05-10 14:35:36Z kohm $
%%% (run: option)
\newif\if at scr@emulatestandardclasses
\let\scr at emulatestandardclassestrue\relax
@@ -925,9 +926,9 @@
\KOMA at ifkey{abstract}{@abstrt}
\KOMA at DeclareDeprecatedOption{abstracton}{abstract=true}
\KOMA at DeclareDeprecatedOption{abstractoff}{abstract=false}
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 4060 2023-06-20 08:59:01Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4069 2023-06-29 08:55:54Z kohm $
%%% (run: option)
\KOMA at key{numbers}{%
\KOMA at set@ncmdkey{numbers}{@tempa}{%
@@ -1143,7 +1144,7 @@
\KOMA at DeclareDeprecatedOption{bigheadings}{headings=big}
\KOMA at DeclareDeprecatedOption{normalheadings}{headings=normal}
\KOMA at DeclareDeprecatedOption{smallheadings}{headings=small}
-%%% From File: $Id: scrkernel-pagestyles.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 4058 2023-06-16 08:32:27Z kohm $
%%% (run: option)
\KOMA at ifkey{headsepline}{@hsl}%
\KOMA at kav@add{\KOMAClassFileName}{headsepline}{false}
@@ -1250,7 +1251,7 @@
\KOMA at DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA at DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA at DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 4054 2023-05-10 14:35:36Z kohm $
%%% (run: option)
\newif\if at captionabove\@captionabovefalse
\newif\if at tablecaptionabove\@tablecaptionabovefalse
@@ -1858,7 +1859,7 @@
\KOMA at DeclareStandardOption{openbib}{bibliography=openstyle}
\KOMA at DeclareDeprecatedOption{bibtotoc}{bibliography=totoc}
\KOMA at DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered}
-%%% From File: $Id: scrkernel-index.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 4052 2023-05-05 11:41:51Z kohm $
%%% (run: option)
\newcommand*{\idx@@heading}{%
\ifidx at leveldown
@@ -1867,6 +1868,25 @@
\expandafter\section
\fi*%
}
+\newcommand*{\idx@@forcemark}[1]{%
+ \ifidx at leveldown
+ \begingroup
+ \value{secnumdepth}=-\maxdimen
+ \subsectionmark{#1}%
+ \endgroup
+ \else
+ \@mkdouble{\MakeMarkcase{#1}}%
+ \fi
+}
+\newcommand*{\idx@@forcemarknumbered}[1]{%
+ \ifidx at leveldown
+ \subsectionmark{#1}%
+ \else
+ \sectionmark{#1}%
+ \fi
+}
+\newcommand*{\idx@@mark}{}
+\let\idx@@mark\idx@@forcemark
\newif\ifidx at leveldown
\KOMA at key{index}{%
\KOMA at set@ncmdkey{index}{@tempa}{%
@@ -1894,6 +1914,7 @@
\expandafter\section
\fi*%
}%
+ \let\idx@@mark\idx@@forcemark
\or
\KOMA at kav@remove{\KOMAClassFileName}{toc}{noindex}%
\KOMA at kav@remove{\KOMAClassFileName}{toc}{indexnumbered}%
@@ -1905,11 +1926,12 @@
\KOMA at kav@add{\KOMAClassFileName}{index}{toc}%
\renewcommand*{\idx@@heading}{%
\ifidx at leveldown
- \expandafter\subsection\expandafter*
+ \expandafter\expandafter\expandafter\subsection\expandafter*%
\else
\expandafter\addsec
\fi
}%
+ \let\idx@@mark\idx@@forcemark
\or
\KOMA at kav@remove{\KOMAClassFileName}{toc}{noindex}%
\KOMA at kav@remove{\KOMAClassFileName}{toc}{indexnumbered}%
@@ -1926,6 +1948,7 @@
\expandafter\section
\fi
}%
+ \let\idx@@mark\idx@@forcemarknumbered
\or
\KOMA at kav@remove{\KOMAClassFileName}{index}{leveldown}%
\KOMA at kav@remove{\KOMAClassFileName}{index}{standardlevel}%
@@ -1945,7 +1968,7 @@
\KOMA at DeclareDeprecatedOption{idxtotoc}{index=totoc}
%%% From File: $Id: scrkernel-listsandtabulars.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4069 2023-06-29 08:55:54Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{numbers=autoendperiod}
%%% From File: $Id: scrkernel-miscellaneous.dtx 4032 2023-04-17 09:45:11Z kohm $
@@ -1955,7 +1978,7 @@
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 4054 2023-05-10 14:35:36Z kohm $
%%% (run: body)
\AtBeginDocument{%
\begingroup
@@ -3153,10 +3176,10 @@
\newcommand*\abstractname{Abstract}
\providecaptionname{american,australian,british,canadian,english,newzealand,%
UKenglish,ukenglish,USenglish,usenglish}\abstractname{Abstract}
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 4060 2023-06-20 08:59:01Z kohm $
%%% (run: body)
\let\numberline\scr at numberline
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 4060 2023-06-20 08:59:01Z kohm $
%%% (run: class,style,part)
\CloneTOCEntryStyle{tocline}{part}
\TOCEntryStyleStartInitCode{part}{%
@@ -3170,7 +3193,7 @@
\expandafter\providecommand\expandafter*%
\csname scr at tso@#1 at beforeskip\endcsname{2.25em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 4060 2023-06-20 08:59:01Z kohm $
%%% (run: class,style,section)
\CloneTOCEntryStyle{tocline}{section}
\TOCEntryStyleStartInitCode{section}{%
@@ -3189,7 +3212,7 @@
\expandafter\providecommand\expandafter*%
\csname scr at tso@#1 at beforeskip\endcsname{1.0em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 4060 2023-06-20 08:59:01Z kohm $
%%% (run: class,style,subsection)
\CloneTOCEntryStyle{tocline}{subsection}
\TOCEntryStyleStartInitCode{subsection}{%
@@ -3196,10 +3219,10 @@
\expandafter\providecommand%
\csname scr at tso@#1 at linefill\endcsname{\TOCLineLeaderFill\relax}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 4060 2023-06-20 08:59:01Z kohm $
%%% (run: class,style,default)
\CloneTOCEntryStyle{subsection}{default}
-%%% From File: $Id: scrkernel-sections.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4069 2023-06-29 08:55:54Z kohm $
%%% (run: body)
\BeforeClosingMainAux{%
\if at autodot\if at filesw\immediate\write\@mainaux{%
@@ -3662,10 +3685,23 @@
\providecommand*\@currentlabelname{}
\FamilyStringKey[.section]{KOMAarg}{tocentry}{\@currenttocentry}
\FamilyStringKey[.section]{KOMAarg}{head}{\@currentheadentry}
+\IfLTXAtLeastTF{2020/10/01}{%
+ \NewHook{\KOMAClassName/option/section/reference/fallback}%
+}{}%
\DefineFamilyKey[.section]{KOMAarg}{reference}{%
\scr at ifundefinedorrelax{NR at gettitle}{%
\scr at ifundefinedorrelax{GetTitleString}{%
- \def\@currentlabelname{#1}%
+ \begingroup
+ \let\label\@gobble
+ \let\index\@gobble
+ \let\glossary\@gobble
+ \scr at ifundefinedorrelax{UseHook}{}{%
+ \UseHook{\KOMAClassName/option/section/reference/fallback}%
+ }%
+ \protected at edef\@currentlabelname{#1}%
+ \expandafter\expandafter\expandafter\endgroup
+ \expandafter\def\expandafter\@currentlabelname\expandafter{%
+ \@currentlabelname}%
}{%
\GetTitleString{#1}%
\let\@currentlabelname\GetTitleStringResult
@@ -5410,7 +5446,7 @@
\let\scr at mt@saved at sect\relax
\fi
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 4058 2023-06-16 08:32:27Z kohm $
%%% (run: body)
\newcommand*{\set at tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
@@ -5471,11 +5507,16 @@
\if at twoside\else\hfil\fi}}}}\hss}%
\renewcommand*{\sectionmark}[1]{%
\if at twoside\expandafter\markboth\else\expandafter\markright\fi
- {\MakeMarkcase{\Ifnumbered{section}{\sectionmarkformat}{}##1}}{}}%
+ {%
+ \Ifnumbered{section}{\MakeMarkcase{\sectionmarkformat}}{}%
+ \MakeMarkcase{##1}%
+ }{}%
+ }%
\renewcommand*{\subsectionmark}[1]{%
\if at twoside
\markright{%
- \MakeMarkcase{\Ifnumbered{subsection}{\subsectionmarkformat}{}##1}%
+ \Ifnumbered{subsection}{\MakeMarkcase{\subsectionmarkformat}}{}%
+ \MakeMarkcase{##1}%
}%
\fi
}%
@@ -5506,7 +5547,7 @@
\newcommand*{\indexpagestyle}{plain}
\pagestyle{plain}
\pagenumbering{arabic}
-%%% From File: $Id: scrlayer.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrlayer.dtx 4058 2023-06-16 08:32:27Z kohm $
%%% (run: body)
\providecommand*{\@mkleft}{%
\IfActiveMkBoth{\markleft}{\@gobble}%
@@ -5517,7 +5558,7 @@
\providecommand{\@mkdouble}[1]{%
\@mkboth{#1}{#1}%
}
-%%% From File: $Id: scrkernel-floats.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 4054 2023-05-10 14:35:36Z kohm $
%%% (run: body)
\newlength{\abovecaptionskip}
\newlength{\belowcaptionskip}
@@ -5671,15 +5712,20 @@
\dofullc at pfalse\@capbreaktrue
}
\newcommand*{\setcaphanging}{\dofullc at ptrue\@capbreakfalse}
+\expandafter\ifnum\scr at v@is at ge{3.41}%
+ \newcommand*{\captionnopagebreak}{\nopagebreak}
+\else
+ \newcommand*{\captionnopagebreak}{}
+\fi
\newcommand{\@makecaption}[2]{%
\if at captionabove
\vskip\belowcaptionskip
\else
- \vskip\abovecaptionskip
+ \captionnopagebreak\vskip\abovecaptionskip\captionnopagebreak
\fi
\@@makecaption\@firstofone{#1}{#2}%
\if at captionabove
- \vskip\abovecaptionskip
+ \captionnopagebreak\vskip\abovecaptionskip\captionnopagebreak
\else
\vskip\belowcaptionskip
\fi
@@ -6673,7 +6719,7 @@
}
\newcommand{\AfterBibliographyPreamble}{\g at addto@macro\bib at before@hook}
\newcommand{\AtEndBibliography}{\g at addto@macro\bib at after@hook}
-%%% From File: $Id: scrkernel-index.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 4052 2023-05-05 11:41:51Z kohm $
%%% (run: body)
\newcommand*{\index at preamble}{}
\let\index at preamble=\relax
@@ -6681,14 +6727,7 @@
\newcommand*{\idx at heading}{%
\twocolumn[%
\idx@@heading{\indexname}]%
- \ifidx at leveldown
- \begingroup
- \c at secnumdepth=-\maxdimen
- \subsectionmark{\indexname}%
- \endgroup
- \else
- \@mkdouble{\MakeMarkcase{\indexname}}%
- \fi
+ \idx@@mark{\indexname}%
}
\newenvironment{theindex}{%
\if at twocolumn
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls 2023-07-07 20:41:06 UTC (rev 67572)
@@ -38,7 +38,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -60,7 +60,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
\providecommand*{\scr at clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -75,7 +75,7 @@
\newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension}
\edef\KOMALongClassFileName{\KOMALongClassFileName}
\ProvidesClass{\KOMALongClassName}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
document class (\ClassName)%
]
\let\ClassName\relax
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrbase.sty 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrbase.sty 2023-07-07 20:41:06 UTC (rev 67572)
@@ -44,7 +44,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -66,19 +66,19 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
\providecommand*{\scr at pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr at pkgextension\@pkgextension
}
-%%% 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)
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{%
scrbase%
}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
package
(%
KOMA-Script-independent
@@ -304,7 +304,7 @@
\@for\CurrentOption:=\@raw at classoptionslist\do{%
\scr at trim@spaces\CurrentOption
\ifx\CurrentOption\@empty\else
- \@ifundefined{ds@\CurrentOption}{%
+ \@ifundefined{ds@\expandafter\detokenize\expandafter{\CurrentOption}}{%
\scr at ifprocess@curroption{#1}{#2}{%
\@expandtwoargs\@removeelement{%
\expandafter\@remove at eq@value\CurrentOption=\@nil}%
@@ -349,7 +349,7 @@
\else
\let\CurrentOption\reserved at a
\fi
- \@ifundefined{ds@\CurrentOption}{%
+ \@ifundefined{ds@\expandafter\detokenize\expandafter{\CurrentOption}}{%
\@use at ption
\scr at ifprocess@curroption{#1}{#2}{}\default at ds
}\@use at ption
@@ -597,7 +597,7 @@
\long\def\l at addto@macro#1#2{%
\edef#1{\unexpanded\expandafter{#1#2}}%
}%
-%%% 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: option)
\DefineFamily{KOMA}
\DefineFamilyMember{KOMA}
@@ -611,7 +611,7 @@
\FamilyProcessOptions{KOMA}\relax
%%% From File: $Id: scrkernel-language.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: option)
-%%% 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: body)
\newcommand*{\XdivY}[2]{%
\numexpr ( #1 + #2 / 2 ) / #2 - 1\relax
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrbook.cls 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrbook.cls 2023-07-07 20:41:06 UTC (rev 67572)
@@ -84,7 +84,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -106,7 +106,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
\providecommand*{\scr at clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -119,16 +119,16 @@
book%
}
\ProvidesClass{\KOMAClassName}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
document class (\ClassName)%
]
-%%% 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: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
%%% From File: $Id: scrkernel-listsof.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: prepare)
\RequirePackage{tocbasic}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
]
\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
\AtAddToTocList[ToC]{\setuptoc{\@currext}{onecolumn}}%
@@ -139,9 +139,9 @@
\expandafter{\ext at toc}%
}
\AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}%
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 4060 2023-06-20 08:59:01Z kohm $
%%% (run: prepare)
-%%% From File: $Id: scrkernel-sections.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4069 2023-06-29 08:55:54Z kohm $
%%% (run: prepare)
\newif\if at openright
\@openrighttrue
@@ -228,7 +228,7 @@
\newcommand*{\size at subparagraph}{}
\newcommand*{\scr at fnt@subparagraph}{\size at subparagraph}
\newcommand*{\sectfont}{\normalcolor\maybesffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 4054 2023-05-10 14:35:36Z kohm $
%%% (run: init)
\newcommand*
{\scr at compatibility}{\scr at v@last}
@@ -316,10 +316,11 @@
\@namedef{scr at v@3.38}{20}
\@namedef{scr at v@3.39}{20}
\@namedef{scr at v@3.40}{20}
-\@namedef{scr at v@last}{20}
+\@namedef{scr at v@3.41}{21}
+\@namedef{scr at v@last}{21}
%%% From File: $Id: scrkernel-typearea.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: init)
-%%% From File: $Id: scrkernel-compatibility.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 4054 2023-05-10 14:35:36Z kohm $
%%% (run: option)
\newif\if at scr@emulatestandardclasses
\let\scr at emulatestandardclassestrue\relax
@@ -950,9 +951,9 @@
}{titlepage}{\if at titlepage true\else false\fi}
\KOMA at DeclareStandardOption%
{notitlepage}{titlepage=false}
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 4060 2023-06-20 08:59:01Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4069 2023-06-29 08:55:54Z kohm $
%%% (run: option)
\KOMA at key{open}{%
\KOMA at set@ncmdkey{open}{@tempa}{%
@@ -1340,7 +1341,7 @@
\KOMA at DeclareDeprecatedOption{bigheadings}{headings=big}
\KOMA at DeclareDeprecatedOption{normalheadings}{headings=normal}
\KOMA at DeclareDeprecatedOption{smallheadings}{headings=small}
-%%% From File: $Id: scrkernel-pagestyles.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 4058 2023-06-16 08:32:27Z kohm $
%%% (run: option)
\KOMA at ifkey{headsepline}{@hsl}%
\KOMA at kav@add{\KOMAClassFileName}{headsepline}{false}
@@ -1447,7 +1448,7 @@
\KOMA at DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA at DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA at DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 4054 2023-05-10 14:35:36Z kohm $
%%% (run: option)
\newif\if at captionabove\@captionabovefalse
\newif\if at tablecaptionabove\@tablecaptionabovefalse
@@ -2103,7 +2104,7 @@
\KOMA at DeclareStandardOption{openbib}{bibliography=openstyle}
\KOMA at DeclareDeprecatedOption{bibtotoc}{bibliography=totoc}
\KOMA at DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered}
-%%% From File: $Id: scrkernel-index.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 4052 2023-05-05 11:41:51Z kohm $
%%% (run: option)
\newcommand*{\idx@@heading}{%
\ifidx at leveldown
@@ -2112,6 +2113,22 @@
\expandafter\chapter
\fi*%
}
+\newcommand*{\idx@@forcemark}[1]{%
+ \ifidx at leveldown
+ \addsecmark{#1}%
+ \else
+ \@mkdouble{\MakeMarkcase{#1}}%
+ \fi
+}
+\newcommand*{\idx@@forcemarknumbered}[1]{%
+ \ifidx at leveldown
+ \sectionmark{#1}%
+ \else
+ \chaptermark{#1}%
+ \fi
+}
+\newcommand*{\idx@@mark}{}
+\let\idx@@mark\idx@@forcemark
\newif\ifidx at leveldown
\KOMA at key{index}{%
\KOMA at set@ncmdkey{index}{@tempa}{%
@@ -2139,6 +2156,7 @@
\expandafter\chapter
\fi*%
}%
+ \let\idx@@mark\idx@@forcemark
\or
\KOMA at kav@remove{\KOMAClassFileName}{toc}{noindex}%
\KOMA at kav@remove{\KOMAClassFileName}{toc}{indexnumbered}%
@@ -2155,6 +2173,7 @@
\expandafter\addchap
\fi
}%
+ \let\idx@@mark\idx@@forcemark
\or
\KOMA at kav@remove{\KOMAClassFileName}{toc}{noindex}%
\KOMA at kav@remove{\KOMAClassFileName}{toc}{indexnumbered}%
@@ -2171,6 +2190,7 @@
\expandafter\chapter
\fi
}%
+ \let\idx@@mark\idx@@forcemarknumbered
\or
\KOMA at kav@remove{\KOMAClassFileName}{index}{leveldown}%
\KOMA at kav@remove{\KOMAClassFileName}{index}{standardlevel}%
@@ -2190,7 +2210,7 @@
\KOMA at DeclareDeprecatedOption{idxtotoc}{index=totoc}
%%% From File: $Id: scrkernel-listsandtabulars.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4069 2023-06-29 08:55:54Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{headings=openright}
\KOMAExecuteOptions{numbers=autoendperiod}
@@ -2201,7 +2221,7 @@
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 4054 2023-05-10 14:35:36Z kohm $
%%% (run: body)
\AtBeginDocument{%
\begingroup
@@ -3371,10 +3391,10 @@
\newcommand*{\scr at fnt@title}{\titlefont}%
\newcommand*{\subject at font}{\normalfont\normalcolor\bfseries\Large}%
\newcommand*{\scr at fnt@subject}{\subject at font}%
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 4060 2023-06-20 08:59:01Z kohm $
%%% (run: body)
\let\numberline\scr at numberline
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 4060 2023-06-20 08:59:01Z kohm $
%%% (run: class,style,part)
\CloneTOCEntryStyle{tocline}{part}
\TOCEntryStyleStartInitCode{part}{%
@@ -3388,7 +3408,7 @@
\expandafter\providecommand\expandafter*%
\csname scr at tso@#1 at beforeskip\endcsname{2.25em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 4060 2023-06-20 08:59:01Z kohm $
%%% (run: class,style,chapter)
\CloneTOCEntryStyle{tocline}{chapter}
\TOCEntryStyleStartInitCode{chapter}{%
@@ -3408,7 +3428,7 @@
\expandafter\providecommand\expandafter*%
\csname scr at tso@#1 at beforeskip\endcsname{1.0em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 4060 2023-06-20 08:59:01Z kohm $
%%% (run: class,style,section)
\CloneTOCEntryStyle{tocline}{section}
\TOCEntryStyleStartInitCode{section}{%
@@ -3415,10 +3435,10 @@
\expandafter\providecommand%
\csname scr at tso@#1 at linefill\endcsname{\TOCLineLeaderFill\relax}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 4060 2023-06-20 08:59:01Z kohm $
%%% (run: class,style,default)
\CloneTOCEntryStyle{section}{default}
-%%% From File: $Id: scrkernel-sections.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4069 2023-06-29 08:55:54Z kohm $
%%% (run: body)
\BeforeClosingMainAux{%
\if at autodot\if at filesw\immediate\write\@mainaux{%
@@ -3881,10 +3901,23 @@
\providecommand*\@currentlabelname{}
\FamilyStringKey[.section]{KOMAarg}{tocentry}{\@currenttocentry}
\FamilyStringKey[.section]{KOMAarg}{head}{\@currentheadentry}
+\IfLTXAtLeastTF{2020/10/01}{%
+ \NewHook{\KOMAClassName/option/section/reference/fallback}%
+}{}%
\DefineFamilyKey[.section]{KOMAarg}{reference}{%
\scr at ifundefinedorrelax{NR at gettitle}{%
\scr at ifundefinedorrelax{GetTitleString}{%
- \def\@currentlabelname{#1}%
+ \begingroup
+ \let\label\@gobble
+ \let\index\@gobble
+ \let\glossary\@gobble
+ \scr at ifundefinedorrelax{UseHook}{}{%
+ \UseHook{\KOMAClassName/option/section/reference/fallback}%
+ }%
+ \protected at edef\@currentlabelname{#1}%
+ \expandafter\expandafter\expandafter\endgroup
+ \expandafter\def\expandafter\@currentlabelname\expandafter{%
+ \@currentlabelname}%
}{%
\GetTitleString{#1}%
\let\@currentlabelname\GetTitleStringResult
@@ -6342,7 +6375,7 @@
\let\scr at mt@saved at sect\relax
\fi
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 4058 2023-06-16 08:32:27Z kohm $
%%% (run: body)
\newcommand*{\set at tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
@@ -6403,17 +6436,20 @@
\if at twoside\else\hfil\fi}}}}\hss}%
\renewcommand*{\chaptermark}[1]{%
\if at twoside\expandafter\markboth\else\expandafter\markright\fi
- {\MakeMarkcase{\Ifnumbered{chapter}{%
- \if at mainmatter
- \chaptermarkformat
- \fi
- }{}##1}%
+ {%
+ \Ifnumbered{chapter}{%
+ \if at mainmatter
+ \MakeMarkcase{\chaptermarkformat}%
+ \fi
+ }{}\MakeMarkcase{##1}%
}{}%
}%
\renewcommand*{\sectionmark}[1]{%
\if at twoside
- \markright{\MakeMarkcase{\Ifnumbered{section}{\sectionmarkformat}{}%
- ##1}}%
+ \markright{%
+ \Ifnumbered{section}{\MakeMarkcase{\sectionmarkformat}}{}%
+ \MakeMarkcase{##1}%
+ }%
\fi
}%
}%
@@ -6443,7 +6479,7 @@
\newcommand*{\indexpagestyle}{plain}
\pagestyle{headings}
\pagenumbering{arabic}
-%%% From File: $Id: scrlayer.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrlayer.dtx 4058 2023-06-16 08:32:27Z kohm $
%%% (run: body)
\providecommand*{\@mkleft}{%
\IfActiveMkBoth{\markleft}{\@gobble}%
@@ -6454,7 +6490,7 @@
\providecommand{\@mkdouble}[1]{%
\@mkboth{#1}{#1}%
}
-%%% From File: $Id: scrkernel-floats.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 4054 2023-05-10 14:35:36Z kohm $
%%% (run: body)
\newlength{\abovecaptionskip}
\newlength{\belowcaptionskip}
@@ -6608,15 +6644,20 @@
\dofullc at pfalse\@capbreaktrue
}
\newcommand*{\setcaphanging}{\dofullc at ptrue\@capbreakfalse}
+\expandafter\ifnum\scr at v@is at ge{3.41}%
+ \newcommand*{\captionnopagebreak}{\nopagebreak}
+\else
+ \newcommand*{\captionnopagebreak}{}
+\fi
\newcommand{\@makecaption}[2]{%
\if at captionabove
\vskip\belowcaptionskip
\else
- \vskip\abovecaptionskip
+ \captionnopagebreak\vskip\abovecaptionskip\captionnopagebreak
\fi
\@@makecaption\@firstofone{#1}{#2}%
\if at captionabove
- \vskip\abovecaptionskip
+ \captionnopagebreak\vskip\abovecaptionskip\captionnopagebreak
\else
\vskip\belowcaptionskip
\fi
@@ -7619,21 +7660,17 @@
}
\newcommand{\AfterBibliographyPreamble}{\g at addto@macro\bib at before@hook}
\newcommand{\AtEndBibliography}{\g at addto@macro\bib at after@hook}
-%%% From File: $Id: scrkernel-index.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 4052 2023-05-05 11:41:51Z kohm $
%%% (run: body)
\newcommand*{\index at preamble}{}
\let\index at preamble=\relax
\newcommand{\setindexpreamble}[1]{\def\index at preamble{#1}}
\newcommand*{\idx at heading}{%
- \if at openright\cleardoublepage\else\clearpage\fi%
+ \ifidx at leveldown\else\if at openright\cleardoublepage\else\clearpage\fi\fi
\twocolumn[%
\@chaptertolistsfalse
\idx@@heading{\indexname}]%
- \ifidx at leveldown
- \addsecmark{\indexname}%
- \else
- \@mkdouble{\MakeMarkcase{\indexname}}%
- \fi
+ \idx@@mark{\indexname}%
}
\newenvironment{theindex}{%
\if at twocolumn
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrdate.sty 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrdate.sty 2023-07-07 20:41:06 UTC (rev 67572)
@@ -43,7 +43,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,7 +65,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
\providecommand*{\scr at pkgextension}{\@pkgextension}
\AtBeginDocument{%
@@ -74,11 +74,11 @@
%%% From File: $Id: scrtime.dtx 4032 2023-04-17 09:45:11Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrdate}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
package
(day of the week)%
]
-%%% 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: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
%%% From File: $Id: scrtime.dtx 4032 2023-04-17 09:45:11Z kohm $
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrextend.sty 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrextend.sty 2023-07-07 20:41:06 UTC (rev 67572)
@@ -78,7 +78,7 @@
}%
\expandafter\endinput
\fi
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -100,7 +100,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
\providecommand*{\scr at pkgextension}{\@pkgextension}
\AtBeginDocument{%
@@ -109,7 +109,7 @@
%%% From File: $Id: scrextend.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: prepare)
\ProvidesPackage{scrextend}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
package (extend other classes with features of KOMA-Script classes)%
]
\newcommand*{\scr at ext@activate}[1]{%
@@ -133,13 +133,13 @@
\expandafter\g at addto@macro\csname scr at ext@activate@#1\endcsname
}%
}
-%%% 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: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-sections.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4069 2023-06-29 08:55:54Z kohm $
%%% (run: prepare)
\newcommand*{\sectfont}{\normalcolor\maybesffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 4054 2023-05-10 14:35:36Z kohm $
%%% (run: init)
\providecommand*
{\scr at compatibility}{\scr at v@last}
@@ -227,7 +227,8 @@
\@namedef{scr at v@3.38}{20}
\@namedef{scr at v@3.39}{20}
\@namedef{scr at v@3.40}{20}
-\@namedef{scr at v@last}{20}
+\@namedef{scr at v@3.41}{21}
+\@namedef{scr at v@last}{21}
%%% From File: $Id: scrextend.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: option)
\KOMA at key{extendedfeature}{%
@@ -252,7 +253,7 @@
\def\FamilyKeyState{Option `extendedfeature' too late}%
}%
}
-%%% From File: $Id: scrkernel-compatibility.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 4054 2023-05-10 14:35:36Z kohm $
%%% (run: option)
\KOMA at key{version}[last]{%
\scr at ifundefinedorrelax{scr at v@#1}{%
@@ -535,9 +536,9 @@
\KOMA at DeclareStandardOption%
[scrextend]%
{notitlepage}{titlepage=false}
-%%% From File: $Id: scrkernel-sections.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4069 2023-06-29 08:55:54Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-pagestyles.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 4058 2023-06-16 08:32:27Z kohm $
%%% (run: option)
\KOMA at key{cleardoublepage}{%
\begingroup
@@ -621,7 +622,7 @@
{\pagestyle{#1}\cleardoublestandardpage}}
\newcommand*{\cleardoubleemptypage}{\cleardoublepageusingstyle{empty}}
\newcommand*{\cleardoubleplainpage}{\cleardoublepageusingstyle{plain}}
-%%% From File: $Id: scrkernel-floats.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 4054 2023-05-10 14:35:36Z kohm $
%%% (run: option)
%%% From File: $Id: scrkernel-footnotes.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: option)
@@ -696,12 +697,12 @@
\relax}
%%% From File: $Id: scrkernel-listsandtabulars.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4069 2023-06-29 08:55:54Z kohm $
%%% (run: execoption)
%%% From File: $Id: scrkernel-miscellaneous.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: execoption)
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 4054 2023-05-10 14:35:36Z kohm $
%%% (run: body)
\AtBeginDocument{%
\begingroup
@@ -1516,7 +1517,7 @@
\newcommand*{\scr at fnt@title}{\titlefont}%
\newcommand*{\subject at font}{\normalfont\normalcolor\bfseries\Large}%
\newcommand*{\scr at fnt@subject}{\subject at font}%
-%%% From File: $Id: scrkernel-sections.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4069 2023-06-29 08:55:54Z kohm $
%%% (run: body)
\newcommand*{\scr at fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
@@ -1627,9 +1628,9 @@
{\m at th\ensuremath{_{\mbox{\fontsize\sf at size\z@#1}}}}%
}
\providecommand*{\scr at endstrut}{\unskip\ifhmode\nobreak\strut\fi}
-%%% From File: $Id: scrkernel-pagestyles.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 4058 2023-06-16 08:32:27Z kohm $
%%% (run: body)
-%%% From File: $Id: scrkernel-floats.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 4054 2023-05-10 14:35:36Z kohm $
%%% (run: body)
%%% From File: $Id: scrkernel-footnotes.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: body)
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty 2023-07-07 20:41:06 UTC (rev 67572)
@@ -42,7 +42,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -64,7 +64,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
\providecommand*{\scr at pkgextension}{\@pkgextension}
\AtBeginDocument{%
@@ -73,7 +73,7 @@
%%% From File: $Id: scrkernel-fonts.dtx 4034 2023-04-20 08:03:46Z kohm $
%%% (run: identify)
\ProvidesPackage{scrfontsizes}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
package (font size file generator)]
%%% From File: $Id: scrkernel-fonts.dtx 4034 2023-04-20 08:03:46Z kohm $
%%% (run: option)
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrhack.sty 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrhack.sty 2023-07-07 20:41:06 UTC (rev 67572)
@@ -43,7 +43,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,22 +65,22 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
\providecommand*{\scr at pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr at pkgextension\@pkgextension
}
-%%% 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
\ProvidesPackage{scrhack}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
package (hacking other packages)%
]
-%%% 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: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% 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,option
\KOMA at ifkey{hyperref}{@scrhack at hyperref}%
\KOMAExecuteOptions{hyperref=true}%
@@ -101,7 +101,7 @@
\KOMA at ifkey{standardsections}{@scrhack at standardsections}
\KOMAExecuteOptions{standardsections=false}
\KOMAProcessOptions\relax
-%%% 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,body
\newcommand{\scr at ifexpected}[2]{%
\begingroup
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrjura.sty 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrjura.sty 2023-07-07 20:41:06 UTC (rev 67572)
@@ -44,15 +44,15 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% 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)
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrjura}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
package
(for jurists)
]
-%%% 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: init)
\@ifpackageloaded{hyperref}{%
\PackageError{scrjura}{Package hyperref already loaded}{%
@@ -70,7 +70,7 @@
numwidth=2em,
level=\maxdimen
]{default}{cpar}
-%%% 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: options)
\KOMA at ifkey{contract}{@documentcontract}
\IfLTXAtLeastTF{2020/10/01}{%
@@ -281,10 +281,10 @@
\KOMA at DeclareDeprecatedOption[scrjura]{parcitename}{ref=parlong}
\KOMA at DeclareDeprecatedOption[scrjura]{sentencecitename}{ref=sentencelong}
}
-%%% 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: postoptions)
\KOMAProcessOptions\relax
-%%% 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: body)
\providecommand*{\DeprecatedParagraph}{%
\PackageError{scrjura}{modification of old document needed}{%
@@ -529,9 +529,9 @@
\newcommand*{\contract at paragraph@font}{\usekomafont{Clause}%
\@hangfrom}
\newcounter{@AbsClause}
-\newcommand*{\theH at AbsClause}{P-\arabic{@AbsClause}}
-\newcommand*{\theHClause}{\theH at AbsClause}
-\newcommand*{\theHSubClause}{\theH at AbsClause}
+\def\theH at AbsClause{P-\arabic{@AbsClause}}
+\def\theHClause{\theH at AbsClause}
+\def\theHSubClause{\theH at AbsClause}
\newcommand*{\contract at paragraph}[1]{%
\stepcounter{\scrjura at env@type AbsoluteClause}%
\ManualPar\parnumbertrue
@@ -560,6 +560,7 @@
\protect\@nameuse{\scrjura at env@type @Clauseformat}{\contract at number}%
}%
\protected at edef\@currentlabel{\theClause}%
+ \def\@currentcounter{Clause}%
\fi
\stepcounter{@AbsClause}%
\begingroup\expandafter\expandafter\expandafter\endgroup
@@ -618,6 +619,7 @@
\endgroup
\protected at edef\theSubClause{\theClause\contract at number}%
\protected at edef\@currentlabel{\theSubClause}%
+ \def\@currentcounter{SubClause}%
\fi
\stepcounter{@AbsClause}%
\begingroup\expandafter\expandafter\expandafter\endgroup
@@ -755,7 +757,7 @@
\newcommand*{\scrjura@@usetype}[1]{}
\newcounter{par}
\renewcommand*{\thepar}{\arabic{par}}
-\newcommand*{\theHpar}{\theH at AbsClause-\Roman{par}}
+\def\theHpar{\theH at AbsClause-\Roman{par}}
\newcommand*{\parformat}{(\thepar)}
\newcommand*{\parformatseparation}{\nobreakspace}
\newkomafont{parnumber}{}
@@ -1000,7 +1002,7 @@
}
\newcounter{sentence}[par]
\renewcommand*{\thesentence}{\arabic{sentence}}
-\newcommand*{\theHsentence}{\theHpar-\arabic{sentence}}
+\def\theHsentence{\theHpar-\arabic{sentence}}
\scr at ifundefinedorrelax{labelformat}{%
\renewcommand*{\p at sentence}{\expandafter\p@@sentence}
\newcommand*{\p@@sentence}[1]{\p at par{{\par at cite{\thepar}}%
@@ -1119,7 +1121,7 @@
}%
\fi
}
-%%% 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: final)
%%% From File: $Id: scrlogo.dtx 4032 2023-04-17 09:45:11Z kohm $
\RequirePackage{scrlogo}
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty 2023-07-07 20:41:06 UTC (rev 67572)
@@ -44,7 +44,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -66,19 +66,19 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
\providecommand*{\scr at pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr at pkgextension\@pkgextension
}
-%%% 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)
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{%
scrkbase%
}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
package
(%
KOMA-Script-dependent
@@ -242,12 +242,12 @@
}
\newcommand*{\KOMAProcessOptions}{\FamilyProcessOptions{KOMA}}
\@onlypreamble\KOMAProcessOptions
-%%% 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: option)
\KOMAProcessOptions\relax
%%% From File: $Id: scrkernel-fonts.dtx 4034 2023-04-20 08:03:46Z kohm $
%%% (run: option)
-%%% 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: body)
\newcommand*{\KOMAExecuteOptions}[1][\@currname.\@currext]{%
\Ifstrstart{#1}{.}{%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty 2023-07-07 20:41:06 UTC (rev 67572)
@@ -66,7 +66,7 @@
2023/04/17 v0.3.4032 KOMA-Script
package
(end user interface for scrlayer)]
-%%% From File: $Id: scrlayer.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrlayer.dtx 4058 2023-06-16 08:32:27Z kohm $
%%% (run: init)
\RequirePackage{scrlayer}
\scr at ifundefinedorrelax{scrlayer at AtEndOfPackage}{%
@@ -110,14 +110,14 @@
}%
\batchmode\csname @@end\endcsname\end
\fi
-%%% From File: $Id: scrlayer.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrlayer.dtx 4058 2023-06-16 08:32:27Z kohm $
%%% (run: options)
\KOMA at key{markcase}{%
\begingroup
\KOMA at set@ncmdkey{markcase}{reserved at a}{%
- {upper}{0},{lower}{1},{used}{2},%
- {ignoreuppercase}{3},{nouppercase}{3},%
- {ignoreupper}{3},{noupper}{3}%
+ {upper}{0},{lower}{1},{title}{2},{used}{3},%
+ {ignoreuppercase}{4},{nouppercase}{4},%
+ {ignoreupper}{4},{noupper}{4}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\aftergroup\FamilyKeyStateProcessed
@@ -130,6 +130,15 @@
\aftergroup\MakeLowercase
\aftergroup\scrlayer at forceignoreuppercasefalse
\or
+ \scr at ifundefinedorrelax{MakeTitlecase}{%
+ \PackageWarning{scrlayer}{`markcase=title' ignored because
+ \string\MakeTitlecase\space not available}%
+ \aftergroup\MakeMarkcase
+ }{%
+ \aftergroup\MakeTitlecase
+ }%
+ \aftergroup\scrlayer at forceignoreuppercasefalse
+ \or
\aftergroup\@firstofone
\aftergroup\scrlayer at forceignoreuppercasefalse
\else
@@ -258,7 +267,7 @@
%%% (run: options)
\KOMA at ifkey{autoclearnotecolumns}{slnc at autoclearnotecolumns}
\slnc at autoclearnotecolumnstrue
-%%% From File: $Id: scrlayer.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrlayer.dtx 4058 2023-06-16 08:32:27Z kohm $
%%% (run: body)
\KOMAProcessOptions\relax
\expandafter\let
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty 2023-07-07 20:41:06 UTC (rev 67572)
@@ -49,10 +49,10 @@
%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer-scrpage}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
package
(end user interface for scrlayer)]
-%%% From File: $Id: scrlayer.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrlayer.dtx 4058 2023-06-16 08:32:27Z kohm $
%%% (run: init)
\RequirePackage{scrlayer}
\scr at ifundefinedorrelax{scrlayer at AtEndOfPackage}{%
@@ -76,15 +76,15 @@
{pagestyleset=KOMA-Script}%
}%
}
-%%% From File: $Id: scrlayer.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrlayer.dtx 4058 2023-06-16 08:32:27Z kohm $
%%% (run: options)
\KOMA at key{markcase}{%
\scrlayer at AtEndOfPackage{%
\begingroup
\KOMA at set@ncmdkey{markcase}{reserved at a}{%
- {upper}{0},{lower}{1},{used}{2},%
- {ignoreuppercase}{3},{nouppercase}{3},%
- {ignoreupper}{3},{noupper}{3}%
+ {upper}{0},{lower}{1},{title}{2},{used}{3},%
+ {ignoreuppercase}{4},{nouppercase}{4},%
+ {ignoreupper}{4},{noupper}{4}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\aftergroup\FamilyKeyStateProcessed
@@ -97,6 +97,15 @@
\aftergroup\MakeLowercase
\aftergroup\scrlayer at forceignoreuppercasefalse
\or
+ \scr at ifundefinedorrelax{MakeTitlecase}{%
+ \PackageWarning{scrlayer}{`markcase=title' ignored because
+ \string\MakeTitlecase\space not available}%
+ \aftergroup\MakeMarkcase
+ }{%
+ \aftergroup\MakeTitlecase
+ }%
+ \aftergroup\scrlayer at forceignoreuppercasefalse
+ \or
\aftergroup\@firstofone
\aftergroup\scrlayer at forceignoreuppercasefalse
\else
@@ -635,7 +644,7 @@
\KOMA at ifkey{hmode}{sls at leavevmode}
\KOMA at ifkey{autoenlargeheadfoot}{sls at autoenlarge}
\KOMAExecuteOptions{autoenlargeheadfoot=true}
-%%% From File: $Id: scrlayer.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrlayer.dtx 4058 2023-06-16 08:32:27Z kohm $
%%% (run: body)
\KOMAProcessOptions\relax
\expandafter\let
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty 2023-07-07 20:41:06 UTC (rev 67572)
@@ -43,14 +43,14 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrlayer.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrlayer.dtx 4058 2023-06-16 08:32:27Z kohm $
%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
package
(defining layers and page styles)]
-%%% From File: $Id: scrlayer.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrlayer.dtx 4058 2023-06-16 08:32:27Z kohm $
%%% (run: init)
\newcommand*{\scrlayer@@inherited at options@cslist}{}
\newcommand*{\scrlayer@@add at inherited@option}[1]{%
@@ -145,14 +145,14 @@
\@namedef{scrlayer at deprecated@reported at for@#1}{\string #2}%
}{}%
}
-%%% From File: $Id: scrlayer.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrlayer.dtx 4058 2023-06-16 08:32:27Z kohm $
%%% (run: options)
\KOMA at key{markcase}{%
\begingroup
\KOMA at set@ncmdkey{markcase}{reserved at a}{%
- {upper}{0},{lower}{1},{used}{2},%
- {ignoreuppercase}{3},{nouppercase}{3},%
- {ignoreupper}{3},{noupper}{3}%
+ {upper}{0},{lower}{1},{title}{2},{used}{3},%
+ {ignoreuppercase}{4},{nouppercase}{4},%
+ {ignoreupper}{4},{noupper}{4}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\aftergroup\FamilyKeyStateProcessed
@@ -165,6 +165,15 @@
\aftergroup\MakeLowercase
\aftergroup\scrlayer at forceignoreuppercasefalse
\or
+ \scr at ifundefinedorrelax{MakeTitlecase}{%
+ \PackageWarning{scrlayer}{`markcase=title' ignored because
+ \string\MakeTitlecase\space not available}%
+ \aftergroup\MakeMarkcase
+ }{%
+ \aftergroup\MakeTitlecase
+ }%
+ \aftergroup\scrlayer at forceignoreuppercasefalse
+ \or
\aftergroup\@firstofone
\aftergroup\scrlayer at forceignoreuppercasefalse
\else
@@ -189,9 +198,11 @@
\KOMA at kav@replacevalue{scrlayer.sty}{markcase}{upper}%
\else\ifx\MakeMarkcase\MakeLowercase
\KOMA at kav@replacevalue{scrlayer.sty}{markcase}{lower}%
- \else\ifx\MakeMarkcase\scr at ignoreuppercase
- \KOMA at kav@replacevalue{scrlayer.sty}{markcase}{ignoreuppercase}%
-\fi\fi\fi\fi
+ \else\ifx\MakeMarkcase\MakeTitlecase
+ \KOMA at kav@replacevalue{scrlayer.sty}{markcase}{title}%
+ \else\ifx\MakeMarkcase\scr at ignoreuppercase
+ \KOMA at kav@replacevalue{scrlayer.sty}{markcase}{ignoreuppercase}%
+\fi\fi\fi\fi\fi
\DeclareRobustCommand*{\scrlayer at ignoreuppercase}[1]{%
\begingroup
\let\uppercase\@firstofone
@@ -330,7 +341,7 @@
\scrlayer@@add at inherited@option{forceoverwrite}
\KOMA at ifkey{autoremoveinterfaces}{scrlayer at autoremoveinterfaces}
\scrlayer@@add at inherited@option{autoremoveinterfaces}
-%%% From File: $Id: scrlayer.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrlayer.dtx 4058 2023-06-16 08:32:27Z kohm $
%%% (run: body)
\KOMAProcessOptions\relax
\newcommand*{\rightfirstmark}{\expandafter\@rightmark\firstmark\@empty\@empty}
@@ -470,11 +481,11 @@
\expandafter\endgroup
\if at tempswa
\@mkright{%
- \MakeMarkcase{%
- \ifnum \c at secnumdepth<\numexpr \csname #1numdepth\endcsname +0\relax
- \else\if at mainmatter \csname #1markformat\endcsname\fi\fi
- ##1%
- }%
+ \ifnum \c at secnumdepth<\numexpr \csname #1numdepth\endcsname +0\relax
+ \else
+ \if at mainmatter \MakeMarkcase{\csname #1markformat\endcsname}\fi
+ \fi
+ \MakeMarkcase{##1}%
}%
\fi
}%
@@ -489,11 +500,11 @@
\expandafter\@mkdouble
\fi
{%
- \MakeMarkcase{%
- \ifnum \c at secnumdepth<\numexpr \csname #1numdepth\endcsname +0\relax
- \else\if at mainmatter \csname #1markformat\endcsname\fi\fi
- ##1%
- }%
+ \ifnum \c at secnumdepth<\numexpr \csname #1numdepth\endcsname +0\relax
+ \else
+ \if at mainmatter \MakeMarkcase{\csname #1markformat\endcsname}\fi
+ \fi
+ \MakeMarkcase{##1}%
}{}%
}%
}{}%
@@ -509,14 +520,12 @@
= \numexpr \csname #2numdepth\endcsname +0\relax
\expandafter\def\csname #2mark\endcsname##1{%
\@mkdouble{%
- \MakeMarkcase{%
- \ifnum \c at secnumdepth<\numexpr
- \csname #2numdepth\endcsname +0\relax
- \else
- \if at mainmatter \csname #2markformat\endcsname\fi
- \fi
- ##1%
- }%
+ \ifnum \c at secnumdepth<\numexpr
+ \csname #2numdepth\endcsname +0\relax
+ \else
+ \if at mainmatter \MakeMarkcase{\csname #2markformat\endcsname}\fi
+ \fi
+ \MakeMarkcase{##1}%
}%
}%
\else
@@ -528,25 +537,23 @@
\expandafter\endgroup
\if at tempswa
\@mkleft{%
- \MakeMarkcase{%
- \ifnum \c at secnumdepth
- < \numexpr\csname #1numdepth\endcsname +0\relax
- \else
- \if at mainmatter \csname #1markformat\endcsname\fi
- \fi
- ##1%
- }%
+ \ifnum \c at secnumdepth
+ < \numexpr\csname #1numdepth\endcsname +0\relax
+ \else
+ \if at mainmatter \MakeMarkcase{\csname #1markformat\endcsname}\fi
+ \fi
+ \MakeMarkcase{##1}%
}%
\fi
}%
\expandafter\def\csname #2mark\endcsname##1{%
\@mkboth{}{%
- \MakeMarkcase{%
- \ifnum \c at secnumdepth
- < \numexpr \csname #2numdepth\endcsname +0\relax
- \else\if at mainmatter \csname #2markformat\endcsname\fi\fi
- ##1%
- }%
+ \ifnum \c at secnumdepth
+ < \numexpr \csname #2numdepth\endcsname +0\relax
+ \else
+ \if at mainmatter \MakeMarkcase{\csname #2markformat\endcsname}\fi
+ \fi
+ \MakeMarkcase{##1}%
}%
}%
\fi
@@ -2356,7 +2363,7 @@
\@ifundefined{scrlayer@#1 at onremove}{\@namedef{scrlayer@#1 at onremove}{}}{}%
\expandafter\l at addto@macro\csname scrlayer@#1 at onremove\endcsname{#2}%
}
-%%% From File: $Id: scrlayer.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrlayer.dtx 4058 2023-06-16 08:32:27Z kohm $
%%% (run: final)
\DeclareNewPageStyleByLayers{@everystyle@}{}
\RedeclarePageStyleByLayers{empty}{}
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrletter.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrletter.cls 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrletter.cls 2023-07-07 20:41:06 UTC (rev 67572)
@@ -38,7 +38,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -60,7 +60,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
\providecommand*{\scr at clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -75,7 +75,7 @@
\newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension}
\edef\KOMALongClassFileName{\KOMALongClassFileName}
\ProvidesClass{\KOMALongClassName}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
document class (\ClassName)%
]
\let\ClassName\relax
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrletter.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrletter.sty 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrletter.sty 2023-07-07 20:41:06 UTC (rev 67572)
@@ -62,7 +62,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -84,7 +84,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
\providecommand*{\scr at pkgextension}{\@pkgextension}
\AtBeginDocument{%
@@ -91,10 +91,10 @@
\let\scr at pkgextension\@pkgextension
}
\ProvidesPackage{scrletter}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
letter package extending any KOMA-Script class%
]
-%%% 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: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
%%% From File: $Id: scrkernel-miscellaneous.dtx 4032 2023-04-17 09:45:11Z kohm $
@@ -242,7 +242,7 @@
because of unknown paper size.%
}%
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 4058 2023-06-16 08:32:27Z kohm $
%%% (run: option)
%%% From File: $Id: scrkernel-notepaper.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: option)
@@ -1870,7 +1870,7 @@
Internal macro `\string\@addtoplength' is deprecated.\MessageBreak
Please use `\string\addtoplength' instead}%
\addtoplength}
-%%% From File: $Id: scrkernel-pagestyles.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 4058 2023-06-16 08:32:27Z kohm $
%%% (run: body)
\newcommand*{%
\letterpagemark
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrlfile-hook-3.34.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrlfile-hook-3.34.sty 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrlfile-hook-3.34.sty 2023-07-07 20:41:06 UTC (rev 67572)
@@ -41,7 +41,7 @@
%%
%%% From File: $Id: scrlfile-hook.dtx$
\ProvidesPackage{scrlfile-hook-3.34}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
package
(using LaTeX hooks)]
\@ifundefined{IfFormatAtLeastTF}{%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrlfile-hook.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrlfile-hook.sty 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrlfile-hook.sty 2023-07-07 20:41:06 UTC (rev 67572)
@@ -41,7 +41,7 @@
%%
%%% From File: $Id: scrlfile-hook.dtx$
\ProvidesPackage{scrlfile-hook}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
package
(using LaTeX hooks)]
\@ifundefined{IfFormatAtLeastTF}{%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrlfile-patcholdlatex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrlfile-patcholdlatex.sty 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrlfile-patcholdlatex.sty 2023-07-07 20:41:06 UTC (rev 67572)
@@ -41,7 +41,7 @@
%%
%%% From File: $Id: scrlfile-patcholdlatex.dtx 3874 2022-06-05 10:38:02Z kohm $
\ProvidesPackage{scrlfile-patcholdlatex}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
package
(patching old LaTeX kernels)]
\@ifundefined{IfFormatAtLeastTF}{}{%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty 2023-07-07 20:41:06 UTC (rev 67572)
@@ -41,7 +41,7 @@
%%
%%% From File: $Id: scrlfile.dtx 4032 2023-04-17 09:45:11Z kohm $
\ProvidesPackage{scrlfile}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
package
(file load hooks)]
\@ifundefined{IfFormatAtLeastTF}{%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrlogo.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrlogo.sty 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrlogo.sty 2023-07-07 20:41:06 UTC (rev 67572)
@@ -40,7 +40,7 @@
%%
%%% From File: $Id: scrlogo.dtx 4032 2023-04-17 09:45:11Z kohm $
\ProvidesPackage{scrlogo}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
package
(logo)]
\@ifundefined{KOMAScript}{%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls 2023-07-07 20:41:06 UTC (rev 67572)
@@ -73,7 +73,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -95,7 +95,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
\providecommand*{\scr at clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -108,13 +108,13 @@
letter%
}
\ProvidesClass{\KOMAClassName}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
document class (\ClassName)%
]
-%%% 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: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-compatibility.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 4054 2023-05-10 14:35:36Z kohm $
%%% (run: init)
\newcommand*
{\scr at compatibility}{\scr at v@last}
@@ -202,10 +202,11 @@
\@namedef{scr at v@3.38}{20}
\@namedef{scr at v@3.39}{20}
\@namedef{scr at v@3.40}{20}
-\@namedef{scr at v@last}{20}
+\@namedef{scr at v@3.41}{21}
+\@namedef{scr at v@last}{21}
%%% From File: $Id: scrkernel-typearea.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: init)
-%%% From File: $Id: scrkernel-compatibility.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 4054 2023-05-10 14:35:36Z kohm $
%%% (run: option)
\KOMA at key{version}[last]{%
\scr at ifundefinedorrelax{scr at v@#1}{%
@@ -821,7 +822,7 @@
\KOMA at DeclareDeprecatedOption{parindent}{parskip=false}
\KOMA at kav@add{\KOMAClassFileName}{parskip}{false}
\KOMA at kav@add{\KOMAClassFileName}{parskip}{absolute}
-%%% From File: $Id: scrkernel-pagestyles.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 4058 2023-06-16 08:32:27Z kohm $
%%% (run: option)
\KOMA at ifkey{headsepline}{@hsl}%
\KOMA at kav@add{\KOMAClassFileName}{headsepline}{false}
@@ -928,7 +929,7 @@
\KOMA at DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA at DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA at DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 4054 2023-05-10 14:35:36Z kohm $
%%% (run: option)
%%% From File: $Id: scrkernel-footnotes.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: option)
@@ -1567,7 +1568,7 @@
parskip=false,%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 4054 2023-05-10 14:35:36Z kohm $
%%% (run: body)
\AtBeginDocument{%
\begingroup
@@ -3488,7 +3489,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-pagestyles.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 4058 2023-06-16 08:32:27Z kohm $
%%% (run: body)
\newcommand*{\set at tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
@@ -3585,7 +3586,7 @@
}
\pagestyle{plain}
\pagenumbering{arabic}
-%%% From File: $Id: scrkernel-floats.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 4054 2023-05-10 14:35:36Z kohm $
%%% (run: body)
%%% From File: $Id: scrkernel-footnotes.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: body)
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrreport.cls 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrreport.cls 2023-07-07 20:41:06 UTC (rev 67572)
@@ -38,7 +38,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -60,7 +60,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
\providecommand*{\scr at clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -75,7 +75,7 @@
\newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension}
\edef\KOMALongClassFileName{\KOMALongClassFileName}
\ProvidesClass{\KOMALongClassName}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
document class (\ClassName)%
]
\let\ClassName\relax
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls 2023-07-07 20:41:06 UTC (rev 67572)
@@ -84,7 +84,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -106,7 +106,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
\providecommand*{\scr at clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -119,16 +119,16 @@
report%
}
\ProvidesClass{\KOMAClassName}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
document class (\ClassName)%
]
-%%% 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: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
%%% From File: $Id: scrkernel-listsof.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: prepare)
\RequirePackage{tocbasic}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
]
\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
\AtAddToTocList[ToC]{\setuptoc{\@currext}{onecolumn}}%
@@ -139,9 +139,9 @@
\expandafter{\ext at toc}%
}
\AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}%
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 4060 2023-06-20 08:59:01Z kohm $
%%% (run: prepare)
-%%% From File: $Id: scrkernel-sections.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4069 2023-06-29 08:55:54Z kohm $
%%% (run: prepare)
\newif\if at openright
\@openrightfalse
@@ -228,7 +228,7 @@
\newcommand*{\size at subparagraph}{}
\newcommand*{\scr at fnt@subparagraph}{\size at subparagraph}
\newcommand*{\sectfont}{\normalcolor\maybesffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 4054 2023-05-10 14:35:36Z kohm $
%%% (run: init)
\newcommand*
{\scr at compatibility}{\scr at v@last}
@@ -316,10 +316,11 @@
\@namedef{scr at v@3.38}{20}
\@namedef{scr at v@3.39}{20}
\@namedef{scr at v@3.40}{20}
-\@namedef{scr at v@last}{20}
+\@namedef{scr at v@3.41}{21}
+\@namedef{scr at v@last}{21}
%%% From File: $Id: scrkernel-typearea.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: init)
-%%% From File: $Id: scrkernel-compatibility.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 4054 2023-05-10 14:35:36Z kohm $
%%% (run: option)
\newif\if at scr@emulatestandardclasses
\let\scr at emulatestandardclassestrue\relax
@@ -954,9 +955,9 @@
\KOMA at ifkey{abstract}{@abstrt}
\KOMA at DeclareDeprecatedOption{abstracton}{abstract=true}
\KOMA at DeclareDeprecatedOption{abstractoff}{abstract=false}
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 4060 2023-06-20 08:59:01Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4069 2023-06-29 08:55:54Z kohm $
%%% (run: option)
\KOMA at key{open}{%
\KOMA at set@ncmdkey{open}{@tempa}{%
@@ -1344,7 +1345,7 @@
\KOMA at DeclareDeprecatedOption{bigheadings}{headings=big}
\KOMA at DeclareDeprecatedOption{normalheadings}{headings=normal}
\KOMA at DeclareDeprecatedOption{smallheadings}{headings=small}
-%%% From File: $Id: scrkernel-pagestyles.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 4058 2023-06-16 08:32:27Z kohm $
%%% (run: option)
\KOMA at ifkey{headsepline}{@hsl}%
\KOMA at kav@add{\KOMAClassFileName}{headsepline}{false}
@@ -1451,7 +1452,7 @@
\KOMA at DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA at DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA at DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 4054 2023-05-10 14:35:36Z kohm $
%%% (run: option)
\newif\if at captionabove\@captionabovefalse
\newif\if at tablecaptionabove\@tablecaptionabovefalse
@@ -2107,7 +2108,7 @@
\KOMA at DeclareStandardOption{openbib}{bibliography=openstyle}
\KOMA at DeclareDeprecatedOption{bibtotoc}{bibliography=totoc}
\KOMA at DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered}
-%%% From File: $Id: scrkernel-index.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 4052 2023-05-05 11:41:51Z kohm $
%%% (run: option)
\newcommand*{\idx@@heading}{%
\ifidx at leveldown
@@ -2116,6 +2117,22 @@
\expandafter\chapter
\fi*%
}
+\newcommand*{\idx@@forcemark}[1]{%
+ \ifidx at leveldown
+ \addsecmark{#1}%
+ \else
+ \@mkdouble{\MakeMarkcase{#1}}%
+ \fi
+}
+\newcommand*{\idx@@forcemarknumbered}[1]{%
+ \ifidx at leveldown
+ \sectionmark{#1}%
+ \else
+ \chaptermark{#1}%
+ \fi
+}
+\newcommand*{\idx@@mark}{}
+\let\idx@@mark\idx@@forcemark
\newif\ifidx at leveldown
\KOMA at key{index}{%
\KOMA at set@ncmdkey{index}{@tempa}{%
@@ -2143,6 +2160,7 @@
\expandafter\chapter
\fi*%
}%
+ \let\idx@@mark\idx@@forcemark
\or
\KOMA at kav@remove{\KOMAClassFileName}{toc}{noindex}%
\KOMA at kav@remove{\KOMAClassFileName}{toc}{indexnumbered}%
@@ -2159,6 +2177,7 @@
\expandafter\addchap
\fi
}%
+ \let\idx@@mark\idx@@forcemark
\or
\KOMA at kav@remove{\KOMAClassFileName}{toc}{noindex}%
\KOMA at kav@remove{\KOMAClassFileName}{toc}{indexnumbered}%
@@ -2175,6 +2194,7 @@
\expandafter\chapter
\fi
}%
+ \let\idx@@mark\idx@@forcemarknumbered
\or
\KOMA at kav@remove{\KOMAClassFileName}{index}{leveldown}%
\KOMA at kav@remove{\KOMAClassFileName}{index}{standardlevel}%
@@ -2194,7 +2214,7 @@
\KOMA at DeclareDeprecatedOption{idxtotoc}{index=totoc}
%%% From File: $Id: scrkernel-listsandtabulars.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4069 2023-06-29 08:55:54Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{headings=openany}
\KOMAExecuteOptions{numbers=autoendperiod}
@@ -2205,7 +2225,7 @@
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 4054 2023-05-10 14:35:36Z kohm $
%%% (run: body)
\AtBeginDocument{%
\begingroup
@@ -3404,10 +3424,10 @@
\newcommand*\abstractname{Abstract}
\providecaptionname{american,australian,british,canadian,english,newzealand,%
UKenglish,ukenglish,USenglish,usenglish}\abstractname{Abstract}
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 4060 2023-06-20 08:59:01Z kohm $
%%% (run: body)
\let\numberline\scr at numberline
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 4060 2023-06-20 08:59:01Z kohm $
%%% (run: class,style,part)
\CloneTOCEntryStyle{tocline}{part}
\TOCEntryStyleStartInitCode{part}{%
@@ -3421,7 +3441,7 @@
\expandafter\providecommand\expandafter*%
\csname scr at tso@#1 at beforeskip\endcsname{2.25em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 4060 2023-06-20 08:59:01Z kohm $
%%% (run: class,style,chapter)
\CloneTOCEntryStyle{tocline}{chapter}
\TOCEntryStyleStartInitCode{chapter}{%
@@ -3441,7 +3461,7 @@
\expandafter\providecommand\expandafter*%
\csname scr at tso@#1 at beforeskip\endcsname{1.0em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 4060 2023-06-20 08:59:01Z kohm $
%%% (run: class,style,section)
\CloneTOCEntryStyle{tocline}{section}
\TOCEntryStyleStartInitCode{section}{%
@@ -3448,10 +3468,10 @@
\expandafter\providecommand%
\csname scr at tso@#1 at linefill\endcsname{\TOCLineLeaderFill\relax}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 4060 2023-06-20 08:59:01Z kohm $
%%% (run: class,style,default)
\CloneTOCEntryStyle{section}{default}
-%%% From File: $Id: scrkernel-sections.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 4069 2023-06-29 08:55:54Z kohm $
%%% (run: body)
\BeforeClosingMainAux{%
\if at autodot\if at filesw\immediate\write\@mainaux{%
@@ -3914,10 +3934,23 @@
\providecommand*\@currentlabelname{}
\FamilyStringKey[.section]{KOMAarg}{tocentry}{\@currenttocentry}
\FamilyStringKey[.section]{KOMAarg}{head}{\@currentheadentry}
+\IfLTXAtLeastTF{2020/10/01}{%
+ \NewHook{\KOMAClassName/option/section/reference/fallback}%
+}{}%
\DefineFamilyKey[.section]{KOMAarg}{reference}{%
\scr at ifundefinedorrelax{NR at gettitle}{%
\scr at ifundefinedorrelax{GetTitleString}{%
- \def\@currentlabelname{#1}%
+ \begingroup
+ \let\label\@gobble
+ \let\index\@gobble
+ \let\glossary\@gobble
+ \scr at ifundefinedorrelax{UseHook}{}{%
+ \UseHook{\KOMAClassName/option/section/reference/fallback}%
+ }%
+ \protected at edef\@currentlabelname{#1}%
+ \expandafter\expandafter\expandafter\endgroup
+ \expandafter\def\expandafter\@currentlabelname\expandafter{%
+ \@currentlabelname}%
}{%
\GetTitleString{#1}%
\let\@currentlabelname\GetTitleStringResult
@@ -6342,7 +6375,7 @@
\let\scr at mt@saved at sect\relax
\fi
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 4058 2023-06-16 08:32:27Z kohm $
%%% (run: body)
\newcommand*{\set at tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
@@ -6403,15 +6436,18 @@
\if at twoside\else\hfil\fi}}}}\hss}%
\renewcommand*{\chaptermark}[1]{%
\if at twoside\expandafter\markboth\else\expandafter\markright\fi
- {\MakeMarkcase{\Ifnumbered{chapter}{%
- \chaptermarkformat
- }{}##1}%
+ {%
+ \Ifnumbered{chapter}{%
+ \MakeMarkcase{\chaptermarkformat}%
+ }{}\MakeMarkcase{##1}%
}{}%
}%
\renewcommand*{\sectionmark}[1]{%
\if at twoside
- \markright{\MakeMarkcase{\Ifnumbered{section}{\sectionmarkformat}{}%
- ##1}}%
+ \markright{%
+ \Ifnumbered{section}{\MakeMarkcase{\sectionmarkformat}}{}%
+ \MakeMarkcase{##1}%
+ }%
\fi
}%
}%
@@ -6441,7 +6477,7 @@
\newcommand*{\indexpagestyle}{plain}
\pagestyle{plain}
\pagenumbering{arabic}
-%%% From File: $Id: scrlayer.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrlayer.dtx 4058 2023-06-16 08:32:27Z kohm $
%%% (run: body)
\providecommand*{\@mkleft}{%
\IfActiveMkBoth{\markleft}{\@gobble}%
@@ -6452,7 +6488,7 @@
\providecommand{\@mkdouble}[1]{%
\@mkboth{#1}{#1}%
}
-%%% From File: $Id: scrkernel-floats.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 4054 2023-05-10 14:35:36Z kohm $
%%% (run: body)
\newlength{\abovecaptionskip}
\newlength{\belowcaptionskip}
@@ -6606,15 +6642,20 @@
\dofullc at pfalse\@capbreaktrue
}
\newcommand*{\setcaphanging}{\dofullc at ptrue\@capbreakfalse}
+\expandafter\ifnum\scr at v@is at ge{3.41}%
+ \newcommand*{\captionnopagebreak}{\nopagebreak}
+\else
+ \newcommand*{\captionnopagebreak}{}
+\fi
\newcommand{\@makecaption}[2]{%
\if at captionabove
\vskip\belowcaptionskip
\else
- \vskip\abovecaptionskip
+ \captionnopagebreak\vskip\abovecaptionskip\captionnopagebreak
\fi
\@@makecaption\@firstofone{#1}{#2}%
\if at captionabove
- \vskip\abovecaptionskip
+ \captionnopagebreak\vskip\abovecaptionskip\captionnopagebreak
\else
\vskip\belowcaptionskip
\fi
@@ -7617,21 +7658,17 @@
}
\newcommand{\AfterBibliographyPreamble}{\g at addto@macro\bib at before@hook}
\newcommand{\AtEndBibliography}{\g at addto@macro\bib at after@hook}
-%%% From File: $Id: scrkernel-index.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 4052 2023-05-05 11:41:51Z kohm $
%%% (run: body)
\newcommand*{\index at preamble}{}
\let\index at preamble=\relax
\newcommand{\setindexpreamble}[1]{\def\index at preamble{#1}}
\newcommand*{\idx at heading}{%
- \if at openright\cleardoublepage\else\clearpage\fi%
+ \ifidx at leveldown\else\if at openright\cleardoublepage\else\clearpage\fi\fi
\twocolumn[%
\@chaptertolistsfalse
\idx@@heading{\indexname}]%
- \ifidx at leveldown
- \addsecmark{\indexname}%
- \else
- \@mkdouble{\MakeMarkcase{\indexname}}%
- \fi
+ \idx@@mark{\indexname}%
}
\newenvironment{theindex}{%
\if at twocolumn
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo 2023-07-07 20:41:06 UTC (rev 67572)
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-fonts.dtx 4034 2023-04-20 08:03:46Z kohm $
%%% (run: 10pt)
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo 2023-07-07 20:41:06 UTC (rev 67572)
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-fonts.dtx 4034 2023-04-20 08:03:46Z kohm $
%%% (run: 11pt)
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo 2023-07-07 20:41:06 UTC (rev 67572)
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,7 +62,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-fonts.dtx 4034 2023-04-20 08:03:46Z kohm $
\ProvidesFile{%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/scrtime.sty 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/scrtime.sty 2023-07-07 20:41:06 UTC (rev 67572)
@@ -43,7 +43,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,7 +65,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
\providecommand*{\scr at pkgextension}{\@pkgextension}
\AtBeginDocument{%
@@ -74,11 +74,11 @@
%%% From File: $Id: scrtime.dtx 4032 2023-04-17 09:45:11Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrtime}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
package
(time of LaTeX run)%
]
-%%% 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: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
%%% From File: $Id: scrtime.dtx 4032 2023-04-17 09:45:11Z kohm $
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/setspace.hak
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/setspace.hak 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/setspace.hak 2023-07-07 20:41:06 UTC (rev 67572)
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
-%%% 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 $
\ProvidesFile{setspace.hak}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
scrhack part
(hacking package
setspace)%
]
-%%% 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 $
\scr at ifexpected{\onehalfspacing}{%
\long\def\onehalfspacing{%
\setstretch{1.25}% default
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/standardsections.hak
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/standardsections.hak 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/standardsections.hak 2023-07-07 20:41:06 UTC (rev 67572)
@@ -40,7 +40,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,15 +62,15 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
-%%% 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 $
\ProvidesFile{standardsections.hak}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
scrhack part
(defining standard LaTeX class section headings)%
]
-%%% 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 $
\PackageWarningNoLine{scrhack}{%
You are loosing every kind of support because of\MessageBreak
using the dangerous standard classes sections hack!\MessageBreak
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty 2023-07-07 20:41:06 UTC (rev 67572)
@@ -6,10 +6,9 @@
%%
%% tocbasic.dtx (with options: `package,identify')
%% tocbasic.dtx (with options: `package,prepare')
-%% scrkernel-tocstyle.dtx (with options: `package,prepare')
%% tocbasic.dtx (with options: `package,option')
-%% scrkernel-tocstyle.dtx (with options: `package,option')
-%% tocbasic.dtx (with options: `package,body')
+%% tocbasic.dtx (with options: `package,execoption')
+%% tocbasic.dtx (with options: `package,body,deprecated')
%% scrkernel-tocstyle.dtx (with options: `package,body')
%% scrkernel-tocstyle.dtx (with options: `package,style,gobble')
%% scrkernel-tocstyle.dtx (with options: `package,style,dottedtocline')
@@ -53,26 +52,27 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: tocbasic.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: tocbasic.dtx 4067 2023-06-28 14:37:03Z kohm $
%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{tocbasic}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
package
(handling toc-files)%
]
-%%% From File: $Id: tocbasic.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: tocbasic.dtx 4067 2023-06-28 14:37:03Z kohm $
%%% (run: prepare)
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
-%%% (run: prepare)
-%%% From File: $Id: tocbasic.dtx 4032 2023-04-17 09:45:11Z kohm $
+\RequirePackage{scrbase}
+\scr at ifundefinedorrelax{NewDocumentCommand}{%
+ \RequirePackage{xparse}[2018-04-12]%
+}{}
+%%% From File: $Id: tocbasic.dtx 4067 2023-06-28 14:37:03Z kohm $
%%% (run: option)
+%%% From File: $Id: tocbasic.dtx 4067 2023-06-28 14:37:03Z kohm $
+%%% (run: execoption)
\ProcessOptions\relax
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
-%%% (run: option)
-%%% From File: $Id: tocbasic.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: tocbasic.dtx 4067 2023-06-28 14:37:03Z kohm $
%%% (run: body)
-\RequirePackage{scrbase}
\AfterPackage*{multitoc}{%
\@ifpackagelater{multitoc}{2022/02/10}{}{%
\PackageWarningNoLine{tocbasic}{%
@@ -116,19 +116,17 @@
\if at tempswa\aftergroup\@firstoftwo\else\aftergroup\@secondoftwo\fi
\endgroup
}
-\newcommand*{\addtotoclist}{%
- \kernel at ifnextchar [%]
- \scr@@addtotoclist\scr at addtotoclist
+\newcommand*{\tb at optowner}[1]{%
+ \IfValueTF{#1}{%
+ #1%
+ }{%
+ \ifx\@currname\@empty\else
+ \@currname.\@currext%
+ \fi
+ }%
}
-\newcommand*{\scr at addtotoclist}{%
- \ifx\@currname\@empty
- \def\reserved at a{\scr@@addtotoclist[]}%
- \else
- \edef\reserved at a{\noexpand\scr@@addtotoclist[\@currname.\@currext]}%
- \fi
- \reserved at a
-}
-\newcommand*{\scr@@addtotoclist}[2][]{%
+\NewDocumentCommand\addtotoclist{om}{%
+ \edef\reserved at b{\tb at optowner{#1}}%
\Ifattoclist{#2}{%
\PackageError{tocbasic}{%
file extension `#2' cannot be used twice
@@ -142,15 +140,15 @@
}%
}{%
\begingroup
- \protected at edef\reserved at a{%
+ \edef\reserved at a{%
\noexpand\g at addto@macro\noexpand\tb at listoftocs{%
- \noexpand\do{#2}{#1}}}\reserved at a
+ \noexpand\do{#2}{\reserved at b}}}\reserved at a
\endgroup
- \ifx\relax #1\relax\else
- \@ifundefined{tb@#1 at add@hook}{}{%
+ \ifx\reserved at b\@empty\else
+ \@ifundefined{tb@\reserved at b @add at hook}{}{%
\edef\reserved at a{%
\noexpand\def\noexpand\@currext{#2}%
- \noexpand\@nameuse{tb@#1 at add@hook}%
+ \noexpand\@nameuse{tb@\reserved at b @add at hook}%
\noexpand\def\noexpand\@currext{\@currext}%
}\reserved at a
}%
@@ -170,22 +168,13 @@
\reserved at a
}
\newcommand*{\categoryoftoc}{\owneroftoc}
-\newcommand*{\AtAddToTocList}{%
- \kernel at ifnextchar [%]
- \@@AtAddToTocList\@AtAddToTocList
+\NewDocumentCommand\AtAddToTocList{o}{%
+ \edef\reserved at a{\tb at optowner{#1}}%
+ \@ifundefined{tb@\reserved at a @add at hook}%
+ {\@namedef{tb@\reserved at a @add at hook}{}}%
+ {}%
+ \expandafter\g at addto@macro\csname tb@\reserved at a @add at hook\endcsname
}
-\newcommand*{\@AtAddToTocList}{%
- \ifx\@currname\@empty
- \def\reserved at a{\@@AtAddToTocList[]}%
- \else
- \edef\reserved at a{\noexpand\@@AtAddToTocList[\@currname.\@currext]}%
- \fi
- \reserved at a
-}
-\newcommand*{\@@AtAddToTocList}[1][]{%
- \@ifundefined{tb@#1 at add@hook}{\@namedef{tb@#1 at add@hook}{}}{}%
- \expandafter\g at addto@macro\csname tb@#1 at add@hook\endcsname
-}
\newcommand*{\tocbasic at extend@babel}[1]{%
\Iftocfeature{#1}{nobabel}{%
\PackageInfo{tocbasic}{omitting babel extension for `#1'\MessageBreak
@@ -219,99 +208,53 @@
}%
}
\AtAddToTocList[]{\expandafter\tocbasic at extend@babel\expandafter{\@currext}}
-\newcommand*{\removefromtoclist}{%
- \kernel at ifnextchar [%]
- \scr at removefromtoclist\scr@@removefromtoclist
-}
-\newcommand*{\scr at removefromtoclist}[2][]{%
+\NewDocumentCommand\removefromtoclist{om}{%
\begingroup
\let\tb at oldlist\tb at listoftocs
+ \edef\reserved at b{#2}%
+ \global\let\tb at listoftocs\empty
\def\do##1##2{%
\edef\reserved at a{##1}%
\ifx\reserved at a\reserved at b
- \begingroup
- \edef\@currext{##2}%
- \edef\reserved at b{#1}%
- \ifx\@currext\reserved at b
- \else
- \g at addto@macro\tb at listoftocs{\do{##1}{##2}}%
- \fi
- \endgroup
+ \IfValueT{#1}{%
+ \begingroup
+ \edef\@currext{##2}%
+ \edef\reserved at b{#1}%
+ \ifx\@currext\reserved at b
+ \else
+ \g at addto@macro\tb at listoftocs{\do{##1}{##2}}%
+ \fi
+ \endgroup
+ }%
\else
\g at addto@macro\tb at listoftocs{\do{##1}{##2}}%
\fi
}%
- \edef\reserved at b{#2}\global\let\tb at listoftocs\@empty
\tb at oldlist
\endgroup
}
-\newcommand*{\scr@@removefromtoclist}[1]{%
- \begingroup
- \let\tb at oldlist\tb at listoftocs
+\NewDocumentCommand\doforeachtocfile{o+m}{%
+ \IfValueTF{#1}{%
\def\do##1##2{%
- \edef\reserved at a{##1}%
- \ifx\reserved at a\reserved at b
- \else
- \g at addto@macro\tb at listoftocs{\do{##1}{##2}}%
- \fi
+ \edef\reserved at a{#1}\edef\reserved at b{##2}%
+ \ifx\reserved at a\reserved at b \edef\@currext{##1}#2\fi
}%
- \edef\reserved at b{#1}\global\let\tb at listoftocs\@empty
- \tb at oldlist
- \endgroup
-}
-\newcommand{\doforeachtocfile}{%
- \kernel at ifnextchar [%]
- \@doforeachtocfile\@@doforeachtocfile
-}
-\newcommand{\@doforeachtocfile}[2][]{%
- \def\do##1##2{%
- \edef\reserved at a{#1}\edef\reserved at b{##2}\ifx\reserved at a\reserved at b
- \edef\@currext{##1}#2%
- \fi
+ }{%
+ \def\do##1##2{\edef\@currext{##1}#2}%
}%
\edef\reserved at a{%
\noexpand\tb at listoftocs
\noexpand\def\noexpand\@currext{\@currext}%
}\reserved at a
- \let\do\relax
+ \let\do\noexpand
}
-\newcommand{\@@doforeachtocfile}[1]{%
- \def\do##1##2{%
- \edef\@currext{##1}#1%
- }%
- \edef\reserved at a{%
- \noexpand\tb at listoftocs
- \noexpand\def\noexpand\@currext{\@currext}%
- }\reserved at a
- \let\do\relax
-}
-\newcommand{\addtoeachtocfile}{%
- \kernel at ifnextchar [%]
- \@addtoeachtocfile\@@addtoeachtocfile
-}
-\newcommand{\@addtoeachtocfile}[2][]{%
+\NewDocumentCommand\addtoeachtocfile{o+m}{%
\doforeachtocfile[{#1}]{\addtocontents{\@currext}{#2}}%
}
-\newcommand{\@@addtoeachtocfile}[1]{%
- \doforeachtocfile{\addtocontents{\@currext}{#1}}%
+\NewDocumentCommand\addcontentslinetoeachtocfile{omm}{%
+ \doforeachtocfile[{#1}]{\addcontentsline{\@currext}{#2}{#3}}%
}
-\newcommand{\addcontentslinetoeachtocfile}{%
- \kernel at ifnextchar [%]
- \@addcontentslinetoeachtocfile\@@addcontentslinetoeachtocfile
-}
-\newcommand{\@addcontentslinetoeachtocfile}[3][]{%
- \doforeachtocfile[{#1}]{\addcontentsline{\@currext}{#2}{#3}}%
-}
-\newcommand{\@@addcontentslinetoeachtocfile}[2]{%
- \doforeachtocfile{\addcontentsline{\@currext}{#1}{#2}}%
-}
-\newcommand*{\addxcontentsline}[2]{%
- \kernel at ifnextchar [%]
- {\@addxcontentsline{#1}{#2}}%
- {\@addxcontentsline{#1}{#2}[]}%
-}
-\newcommand*{\@addxcontentsline}{}
-\def\@addxcontentsline#1#2[#3]#4{%
+\NewDocumentCommand\addxcontentsline{mmO{}m}{%
\scr at ifundefinedorrelax{add#2#1entry}{%
\tocbasic at addxcontentsline{#1}{#2}{#3}{#4}%
}{%
@@ -320,34 +263,15 @@
}
\newcommand*{\nonumberline}{}%
\newcommand*{\tocbasic at addxcontentsline}[4]{%
- \if\relax\detokenize{#3}\relax
+ \IfArgIsEmpty{#3}{%
\addcontentsline{#1}{#2}{\protect\nonumberline#4}%
- \else
+ }{%
\addcontentsline{#1}{#2}{\protect\numberline{#3}#4}%
- \fi
+ }%
}
-\newcommand{\addxcontentslinetoeachtocfile}{%
- \kernel at ifnextchar [%]
- \@addxcontentslinetoeachtocfile\@@addxcontentslinetoeachtocfile
+\NewDocumentCommand\addxcontentslinetoeachtocfile{omom}{%
+ \doforeachtocfile[{#1}]{\addxcontentsline{\@currext}{#2}[{#3}]{#4}}
}
-\newcommand{\@addxcontentslinetoeachtocfile}[2][]{%
- \kernel at ifnextchar [%]
- {\@@@addxcontentslinetoeachtocfile[{#1}]{#2}}%
- {\@@@addxcontentslinetoeachtocfile[{#1}]{#2}[]}
-}
-\newcommand*{\@@@addxcontentslinetoeachtocfile}{}
-\def\@@@addxcontentslinetoeachtocfile[#1]#2[#3]#4{%
- \doforeachtocfile[{#1}]{\addxcontentsline{\@currext}{#2}[#3]{#4}}%
-}
-\newcommand{\@@addxcontentslinetoeachtocfile}[1]{%
- \kernel at ifnextchar [%]
- {\@@@@addxcontentslinetoeachtocfile{#1}}%
- {\@@@@addxcontentslinetoeachtocfile{#1}[]}%
-}
-\newcommand*{\@@@@addxcontentslinetoeachtocfile}{}
-\def\@@@@addxcontentslinetoeachtocfile#1[#2]#3{%
- \doforeachtocfile{\addxcontentsline{\@currext}{#1}[{#2}]{#3}}%
-}
\newcommand*{\tocbasic at starttoc}[1]{%
\begingroup
\tocbasic at reentrant@warning
@@ -478,16 +402,9 @@
}%
}
\newcommand*{\listofname}{List of}
-\newcommand*{\listofeachtoc}{%
- \kernel at ifnextchar [%]
- \@listofeachtoc\@@listofeachtoc
-}
-\newcommand{\@listofeachtoc}[1][]{%
+\NewDocumentCommand\listofeachtoc{o}{%
\doforeachtocfile[{#1}]{\listoftoc{\@currext}}%
}
-\newcommand{\@@listofeachtoc}[1]{%
- \doforeachtocfile{\listoftoc{\@currext}}%
-}
\providecommand*{\ext at toc}{toc}
\newcommand*{\tocbasic at listhead}[1]{%
\@ifundefined{tocbasic at listhead@\@currext}{%
@@ -1095,7 +1012,7 @@
}%
}
\newcommand*{\tb at nt@autofloattype}{16}
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 4060 2023-06-20 08:59:01Z kohm $
%%% (run: body)
\newcommand*{\scr at numberline}[1]{%
\numberline at box{%
@@ -1587,12 +1504,13 @@
\do{#2}{#3}{#4}{#5}%
}%
}
-\newcommand{\TOCEntryStyleInitCode}[1]{%
- \scr at ifundefinedorrelax{scr at dte@#1 at init}{%
- \expandafter\providecommand\expandafter*%
- \csname scr at dte@#1 at init\endcsname[1]%
+\NewDocumentCommand\TOCEntryStyleInitCode{sm}{%
+ \IfBooleanT{#1}{\expandafter\let\csname scr at dte@#2 at init\endcsname\relax}%
+ \scr at ifundefinedorrelax{scr at dte@#2 at init}{%
+ \expandafter\newcommand\expandafter*%
+ \csname scr at dte@#2 at init\endcsname[1]%
}{%
- \expandafter\l at addto@macro at a\csname scr at dte@#1 at init\endcsname
+ \expandafter\l at addto@macro at a\csname scr at dte@#2 at init\endcsname
}%
}
\newcommand{\TOCEntryStyleStartInitCode}[1]{%
@@ -1635,6 +1553,16 @@
}
\newcommand*{\DeclareTOCStyleEntry}[3][]{%
\scr at ifundefinedorrelax{scr at dte@def at l@#2}{%
+ \IfFileExists{tocbasic-tocstyle-#2.def}{%
+ \edef\reserved at a{%
+ \unexpanded{%
+ \makeatletter
+ \input{tocbasic-tocstyle-#2.def}%
+ \catcode`\@=}\the\catcode`\@\relax
+ }\reserved at a
+ }{}%
+ }{}%
+ \scr at ifundefinedorrelax{scr at dte@def at l@#2}{%
\PackageError{tocbasic}{toc entry style `#2' undefined}{%
Somebody told me to define toc entry `#3' with style `#2',\MessageBreak
but I do not know style `#2'.\MessageBreak
@@ -1731,7 +1659,7 @@
\TOC at EntryEndHook{##1}%
}%
}%
- \TOCEntryStyleInitCode{#1}{%
+ \TOCEntryStyleInitCode*{#1}{%
\DefineTOCEntryNumberOption{level}{}{tocdepth}{toc entry level}%
#2%
}%
@@ -1747,10 +1675,10 @@
\providecommand*\@pnumwidth{1.55em}
\providecommand*\@tocrmarg {2.55em}
\providecommand*\@dotsep {4.5}
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 4060 2023-06-20 08:59:01Z kohm $
%%% (run: style,gobble)
\DeclareTOCEntryStyle{gobble}{}%
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 4060 2023-06-20 08:59:01Z kohm $
%%% (run: style,dottedtocline)
\DeclareTOCEntryStyle{dottedtocline}[{%
\DefineTOCEntryLengthOption{indent}%
@@ -1894,7 +1822,7 @@
{\@nameuse{scr at tso@#1 at numwidth}}{##1}{##2}%
}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 4060 2023-06-20 08:59:01Z kohm $
%%% (run: style,undottedtocline)
\DeclareTOCEntryStyle{undottedtocline}[{%
\DefineTOCEntryLengthOption{indent}%
@@ -2064,7 +1992,7 @@
\endgroup
\fi
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 4060 2023-06-20 08:59:01Z kohm $
%%% (run: style, largetocline)
\DeclareTOCEntryStyle{largetocline}[{%
\DefineTOCEntryLengthOption{indent}%
@@ -2185,7 +2113,7 @@
\endgroup
\fi
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 4060 2023-06-20 08:59:01Z kohm $
%%% (run: style,tocline)
\DeclareTOCEntryStyle{tocline}[{%
\DefineTOCEntryLengthOption{beforeskip}%
@@ -2726,7 +2654,7 @@
\mkern \@dotsep mu\hbox{#1}\mkern \@dotsep
mu$}\hfill
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 4060 2023-06-20 08:59:01Z kohm $
%%% (run: style,toctext)
\DeclareTOCEntryStyle{toctext}[{%
\DefineTOCEntryLengthOption{beforeskip}%
@@ -2978,10 +2906,10 @@
\newcommand*{\scr at dte@toctext at raggedright}{}
\newcommand*{\scr at dte@toctext at parend}{}
\newcommand*{\scr at dte@toctext at lastend}{}
-%%% From File: $Id: scrkernel-tocstyle.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 4060 2023-06-20 08:59:01Z kohm $
%%% (run: style,dottedtocline)
\CloneTOCEntryStyle{dottedtocline}{default}
-%%% From File: $Id: tocbasic.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: tocbasic.dtx 4067 2023-06-28 14:37:03Z kohm $
%%% (run: exit)
\AtBeginDocument{%
\@ifundefined{MakeMarkcase}{%
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/typearea.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/typearea.sty 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/typearea.sty 2023-07-07 20:41:06 UTC (rev 67572)
@@ -48,7 +48,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -70,7 +70,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
\providecommand*{\scr at pkgextension}{\@pkgextension}
\AtBeginDocument{%
@@ -80,13 +80,13 @@
%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{typearea}[%
- 2023/04/24 v3.40 KOMA-Script
+ 2023/07/07 v3.41 KOMA-Script
package
(type area)]
-%%% 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: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-compatibility.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 4054 2023-05-10 14:35:36Z kohm $
%%% (run: init)
\providecommand*
{\scr at compatibility}{\scr at v@last}
@@ -175,13 +175,14 @@
\@namedef{scr at v@3.38}{20}
\@namedef{scr at v@3.39}{20}
\@namedef{scr at v@3.40}{20}
-\@namedef{scr at v@last}{20}
+\@namedef{scr at v@3.41}{21}
+\@namedef{scr at v@last}{21}
%%% From File: $Id: scrkernel-typearea.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: init)
\providecommand\ta at divlist{{}{}{}{}{}{}{}{}{}{8}{10}{12}}
\providecommand\ta at divlistelse{1}
\newcommand*{\@lastdiv}{\z@}\let\@lastdiv\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 4054 2023-05-10 14:35:36Z kohm $
%%% (run: option)
\KOMA at key{version}[last]{%
\scr at ifundefinedorrelax{scr at v@#1}{%
@@ -1044,7 +1045,7 @@
\KOMAExecuteOptions{twoside=false}
\fi
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 4032 2023-04-17 09:45:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 4054 2023-05-10 14:35:36Z kohm $
%%% (run: body)
%%% From File: $Id: scrkernel-typearea.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: body)
Modified: trunk/Master/texmf-dist/tex/latex/koma-script/visualize.lco
===================================================================
--- trunk/Master/texmf-dist/tex/latex/koma-script/visualize.lco 2023-07-07 20:40:43 UTC (rev 67571)
+++ trunk/Master/texmf-dist/tex/latex/koma-script/visualize.lco 2023-07-07 20:41:06 UTC (rev 67572)
@@ -41,7 +41,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 4038 2023-04-24 07:06:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 4070 2023-07-07 07:08:40Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -63,7 +63,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2023/04/24 v3.40 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2023/07/07 v3.41 KOMA-Script}%
\endgroup
%%% From File: $Id: scrkernel-letterclassoptions.dtx 4032 2023-04-17 09:45:11Z kohm $
%%% (run: head)
More information about the tex-live-commits
mailing list.